Update app.py

app.py

@@ -29,29 +29,54 @@ def extract_from_readme(readme_path):
 def clone_and_create(profile: gr.OAuthProfile, token: gr.OAuthToken,
                      repo_url, repo_type, private, space_sdk, sdk_version,
                      space_id, space_title, space_description):
-    folder = str(uuid.uuid4())  # Create a unique folder name
-    Repo.clone_from(repo_url, folder)  # Clone the git repository
+
+    # README.md から情報を抽出する関数
+    def extract_from_readme(readme_path):
+        import re
+        title = None
+        description = None
+        port = None
+        if os.path.exists(readme_path):
+            with open(readme_path, encoding="utf-8") as f:
+                content = f.read()
+                match_title = re.search(r'title:\s*(.*)', content)
+                match_desc = re.search(r'short_description:\s*(.*)', content)
+                match_port = re.search(r'app_port:\s*(\d+)', content)
+                if match_title:
+                    title = match_title.group(1).strip()
+                if match_desc:
+                    description = match_desc.group(1).strip()
+                if match_port:
+                    port = match_port.group(1).strip()
+        return title, description, port
+
+    folder = str(uuid.uuid4())  # ユニークなフォルダ名作成
+    Repo.clone_from(repo_url, folder)  # Gitリポジトリをクローン
 
     hf_api = HfApi(token=token.token)
 
-    # Auto-fill info by extracting from README.md
+    # README.md から自動情報取得
     title_from_readme, desc_from_readme, port_from_readme = extract_from_readme(os.path.join(folder, "README.md"))
 
-    # Determine final repo ID, title, description
+    # 最終的なID, タイトル, 説明を決定
     final_id = slugify(space_id) if space_id else slugify(repo_url.split("/")[-1])
     final_title = space_title or title_from_readme or final_id
     final_description = space_description or desc_from_readme
     repo_visibility = "private" if private else "public"
 
-    # Create Hugging Face repo
+    # リポジトリ作成時の引数設定
     if repo_type == "space":
-        hf_api.create_repo(
+        create_kwargs = dict(
             repo_id=f"{profile.username}/{final_id}",
             repo_type="space",
             space_sdk=space_sdk,
-            space_sdk_version=sdk_version if sdk_version else None,
-            private=private
+            private=private,
         )
+        # gradio, streamlit の場合のみバージョンを渡す
+        if space_sdk in ["gradio", "streamlit"] and sdk_version:
+            create_kwargs["space_sdk_version"] = sdk_version
+
+        hf_api.create_repo(**create_kwargs)
     else:
         hf_api.create_repo(
             repo_id=f"{profile.username}/{final_id}",
@@ -59,7 +84,7 @@ def clone_and_create(profile: gr.OAuthProfile, token: gr.OAuthToken,
             private=private
         )
 
-    # Append missing info to README.md if needed
+    # README.md に不足情報を追記
     readme_path = os.path.join(folder, "README.md")
     with open(readme_path, "a", encoding="utf-8") as f:
         if space_title and not title_from_readme:
@@ -69,15 +94,17 @@ def clone_and_create(profile: gr.OAuthProfile, token: gr.OAuthToken,
         if port_from_readme:
             f.write(f"\napp_port: {port_from_readme}")
 
-    # Upload folder contents to the Hugging Face repo
+    # フォルダ内容をHugging Faceにアップロード
     hf_api.upload_folder(
         folder_path=folder,
         repo_id=f"{profile.username}/{final_id}",
         repo_type=repo_type
     )
 
-    # Return URL to created Hugging Face repo
-    return f"https://huggingface.co/{repo_type + 's' if repo_type != 'model' else 'models'}/{profile.username}/{final_id}"
+    # 作成したURLを返す
+    base_url = "spaces" if repo_type == "space" else (repo_type + "s" if repo_type != "model" else "models")
+    return f"https://huggingface.co/{base_url}/{profile.username}/{final_id}"
+
 
 # Define Gradio UI
 with gr.Blocks() as demo: