Update app.py

app.py

@@ -1,67 +1,117 @@
 import gradio as gr
-import os, shutil, tempfile
-from huggingface_hub import HfApi, whoami
+from huggingface_hub import HfApi
 from git import Repo
+from slugify import slugify
+import uuid
+import os
+import re
 
-api = HfApi()
-
-def create_from_repo(oauth_token: gr.OAuthToken | None,
-                     git_url, repo_type, private,
-                     space_id, port, title, description):
-    if oauth_token is None:
-        return "⚠️ Hugging Face にログインしてください。"
-    token = oauth_token.token
-    if not git_url.strip():
-        return "Git リポジトリの URL を入力してください。"
-    temp_dir = tempfile.mkdtemp()
-    try:
-        Repo.clone_from(git_url, temp_dir)
-        if not space_id.strip():
-            space_id = git_url.rstrip("/").split("/")[-1].replace(".git","")
-        user = whoami(token=token)
-        repo_id = f"{user['name']}/{space_id}"
-        api.create_repo(repo_id=repo_id, repo_type=repo_type,
-                        private=private, token=token, exist_ok=False)
-        if repo_type == "space":
-            readme = []
-            if title.strip(): readme.append(f"# {title.strip()}")
-            if description.strip(): readme.append(f"\n{description.strip()}")
-            if port.strip(): readme.append(f"\napp_port: {port.strip()}")
-            if readme:
-                with open(os.path.join(temp_dir,"README.md"),"w",encoding="utf‑8") as f:
-                    f.write("\n".join(readme))
-        api.upload_folder(folder_path=temp_dir, repo_id=repo_id,
-                          repo_type=repo_type, token=token)
-        return f"✅ {repo_type} を作成しました: https://huggingface.co/{repo_id}"
-    except Exception as e:
-        return f"❌ エラー: {e}"
-    finally:
-        shutil.rmtree(temp_dir)
+def extract_from_readme(readme_path):
+    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
+
+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())
+    Repo.clone_from(repo_url, folder)
+
+    hf_api = HfApi(token=token.token)
+
+    # 自動補完
+    title_from_readme, desc_from_readme, port_from_readme = extract_from_readme(os.path.join(folder, "README.md"))
+
+    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"
+
+    # スペースの場合
+    if repo_type == "space":
+        hf_api.create_repo(
+            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
+        )
+    else:
+        hf_api.create_repo(
+            repo_id=f"{profile.username}/{final_id}",
+            repo_type=repo_type,
+            private=private
+        )
+
+    # 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:
+            f.write(f"\ntitle: {space_title}")
+        if space_description and not desc_from_readme:
+            f.write(f"\nshort_description: {space_description}")
+        if port_from_readme:
+            f.write(f"\napp_port: {port_from_readme}")
+
+    # アップロード
+    hf_api.upload_folder(
+        folder_path=folder,
+        repo_id=f"{profile.username}/{final_id}",
+        repo_type=repo_type
+    )
+
+    # URL
+    return f"https://huggingface.co/{repo_type + 's' if repo_type != 'model' else 'models'}/{profile.username}/{final_id}"
 
 with gr.Blocks() as demo:
-    gr.Markdown("## Hugging Face に Space / Dataset / Model を作成")
-    login = gr.LoginButton()
-    with gr.Column():
-        git_url = gr.Textbox(label="Git リポジトリ URL", placeholder="https://...")
-        repo_type = gr.Radio(["space","dataset","model"], label="タイプ", value="space")
-        private = gr.Checkbox(label="非公開にする", value=False)
-        space_id = gr.Textbox(label="Space ID（空欄で自動生成）", visible=True)
-        port = gr.Textbox(label="起動ポート（README）", visible=True)
-        title = gr.Textbox(label="スペース名", visible=True)
-        description = gr.Textbox(label="説明文", visible=True)
-        output = gr.Textbox(label="出力", lines=4)
-    def toggle_spaceopts(rtype):
-        vis = (rtype=="space")
-        return {space_id: gr.update(visible=vis),
-                port: gr.update(visible=vis),
-                title: gr.update(visible=vis),
-                description: gr.update(visible=vis)}
-    repo_type.change(toggle_spaceopts, inputs=repo_type,
-                     outputs=[space_id, port, title, description])
-
-    login.click(create_from_repo,
-                inputs=[gr.OAuthToken(), git_url, repo_type, private,
-                        space_id, port, title, description],
-                outputs=output)
-
-demo.launch()
+    gr.Markdown("# 🚀 Gitリポジトリ → Hugging Face クローンツール")
+    gr.LoginButton()
+
+    with gr.Row():
+        with gr.Column():
+            repo_url = gr.Textbox(label="GitリポジトリURL（GitHub等）")
+            repo_type = gr.Dropdown(choices=["space", "dataset", "model"], value="space", label="Hugging Faceの種類")
+            private = gr.Checkbox(label="非公開にする", value=False)
+            space_sdk = gr.Dropdown(choices=["gradio", "streamlit", "docker", "static"], label="スペースSDK", visible=True)
+            sdk_version = gr.Textbox(label="SDKバージョン（任意）", visible=True)
+            space_id = gr.Textbox(label="Hugging Face ID（空欄なら自動）")
+            space_title = gr.Textbox(label="スペースのタイトル（空欄ならREADMEやIDから）")
+            space_description = gr.Textbox(label="スペースの説明（空欄ならREADMEの内容を使用）")
+
+        with gr.Column():
+            output = gr.Textbox(label="作成されたHugging Face URL")
+
+    def toggle_space_fields(repo_type_val):
+        visible = repo_type_val == "space"
+        return {
+            space_sdk: gr.update(visible=visible),
+            sdk_version: gr.update(visible=visible),
+            space_id: gr.update(visible=True),
+            space_title: gr.update(visible=True),
+            space_description: gr.update(visible=True),
+        }
+
+    repo_type.change(fn=toggle_space_fields, inputs=repo_type, outputs=[space_sdk, sdk_version, space_id, space_title, space_description])
+
+    btn = gr.Button("クローンして作成！")
+    btn.click(
+        fn=clone_and_create,
+        inputs=[repo_url, repo_type, private, space_sdk, sdk_version, space_id, space_title, space_description],
+        outputs=output
+    )
+
+if __name__ == "__main__":
+    demo.launch()