Update app.py

app.py

@@ -116,56 +116,6 @@ widget:
     with open(f"{folder}/README.md", "w") as file:
         file.write(readme_content)
 
-
-def upload_civit_to_hf(profile: Optional[gr.OAuthProfile], url, progress=gr.Progress(track_tqdm=True)):
-    if not profile.name:
-        return gr.Error("Are you sure you are logged in?")
-    
-    folder = str(uuid.uuid4())
-    os.makedirs(folder, exist_ok=False)
-    info, downloaded_files = process_url(url, folder=folder)
-    create_readme(info, downloaded_files, folder=folder)
-    try:
-        api = HfApi(token=os.environ["HUGGING_FACE_HUB_TOKEN"])
-        username = api.whoami()["name"]
-        slug_name = slugify(info["name"])
-        repo_id = f"{username}/{profile.preferred_username}-{slug_name}"
-        api.create_repo(repo_id=repo_id, private=True, exist_ok=True)
-        api.upload_folder(
-            folder_path=folder,
-            repo_id=repo_id,
-            repo_type="model",
-        )
-        api.update_repo_visibility(repo_id=repo_id, private=False)
-    except:
-        raise gr.Error("something went wrong")
-        
-    transfer_repos = gr.load("multimodalart/transfer_repos", hf_token=os.environ["HUGGING_FACE_HUB_TOKEN"], src="spaces")
-    user_repo_id = f"{profile.preferred_username}/{slug_name}"
-    response_code = transfer_repos(repo_id, user_repo_id)
-    i = 0
-    while response_code != "200":
-        message = None
-        if response_code == "409":
-            if i < 3:
-                user_repo_id = f"{profile.preferred_username}/{slug_name}-{i}"
-                response_code = transfer_repos(repo_id, user_repo_id)
-                i += 1
-            else:
-                message = "It seems this model has been uploaded already in your account."
-        elif response_code == "404":
-            message = "Something went wrong with the model upload. Try again."
-        else:
-            message = f"Unexpected response code: {response_code}."
-    
-        if message:
-            api.delete_repo(repo_id=repo_id, repo_type="model")
-            raise gr.Error(message)
-
-    return f'''# Model uploaded to 🤗!
-    ## Access it here [{user_repo_id}](https://huggingface.co/{user_repo_id}) '''
-
-
 def get_creator(username):
     url = f"https://civitai.com/api/trpc/user.getCreator?input=%7B%22json%22%3A%7B%22username%22%3A%22{username}%22%2C%22authed%22%3Atrue%7D%7D"
     headers = {
@@ -206,12 +156,12 @@ def check_civit_link(profile: Optional[gr.OAuthProfile], url):
     attributes_methods = dir(profile)
     if(not hf_username):
         no_username_text = f'Model by <b>{info["creator"]}</b> 🤗, if you are {info["creator"]}, hi! Your CivitAI profile seems to not have information about your Hugging Face account. Please visit <a href="https://civitai.com/user/account">https://civitai.com/user/account</a> and include it there<br><img width="60%" src="https://i.imgur.com/hCbo9uL.png" /><br>(if you are not {info["creator"]}, you cannot submit their model at this time)'
-        return no_username_text, gr.update(interactive=False), gr.update(visible=True)
+        return no_username_text, gr.update(interactive=False), gr.update(visible=True), hf_username
     if(profile.preferred_username != hf_username):
         unmatched_username_text = '<h4>Oops, the Hugging Face account in your CivitAI profile seems to be different than the one your are using here. Please visit <a href="https://civitai.com/user/account">https://civitai.com/user/account</a> and update it there<br><img src="https://i.imgur.com/hCbo9uL.png" /></h4>'
-        return unmatched_username_text, gr.update(interactive=False), gr.update(visible=True)
+        return unmatched_username_text, gr.update(interactive=False), gr.update(visible=True), hf_username
     else:
-        return '', gr.update(interactive=True), gr.update(visible=False)
+        return '', gr.update(interactive=True), gr.update(visible=False), hf_username
         
 def swap_fill(profile: Optional[gr.OAuthProfile]):
     if profile is None:
@@ -221,6 +171,58 @@ def swap_fill(profile: Optional[gr.OAuthProfile]):
 
 def show_output():
     return gr.update(visible=True)
+    
+def upload_civit_to_hf(profile: Optional[gr.OAuthProfile], url, civit_username, progress=gr.Progress(track_tqdm=True)):
+    if not profile.name:
+        return gr.Error("Are you sure you are logged in?")
+    if civit_username != profile.preferred_username:
+        return gr.Error("You are not the model author")
+    
+    folder = str(uuid.uuid4())
+    os.makedirs(folder, exist_ok=False)
+    info, downloaded_files = process_url(url, folder=folder)
+    create_readme(info, downloaded_files, folder=folder)
+    try:
+        api = HfApi(token=os.environ["HUGGING_FACE_HUB_TOKEN"])
+        username = api.whoami()["name"]
+        slug_name = slugify(info["name"])
+        repo_id = f"{username}/{profile.preferred_username}-{slug_name}"
+        api.create_repo(repo_id=repo_id, private=True, exist_ok=True)
+        api.upload_folder(
+            folder_path=folder,
+            repo_id=repo_id,
+            repo_type="model",
+        )
+        api.update_repo_visibility(repo_id=repo_id, private=False)
+    except:
+        raise gr.Error("something went wrong")
+        
+    transfer_repos = gr.load("multimodalart/transfer_repos", hf_token=os.environ["HUGGING_FACE_HUB_TOKEN"], src="spaces")
+    user_repo_id = f"{profile.preferred_username}/{slug_name}"
+    response_code = transfer_repos(repo_id, user_repo_id)
+    i = 0
+    while response_code != "200":
+        message = None
+        if response_code == "409":
+            if i < 3:
+                user_repo_id = f"{profile.preferred_username}/{slug_name}-{i}"
+                response_code = transfer_repos(repo_id, user_repo_id)
+                i += 1
+            else:
+                message = "It seems this model has been uploaded already in your account."
+        elif response_code == "404":
+            message = "Something went wrong with the model upload. Try again."
+        else:
+            message = f"Unexpected response code: {response_code}."
+    
+        if message:
+            api.delete_repo(repo_id=repo_id, repo_type="model")
+            raise gr.Error(message)
+
+    return f'''# Model uploaded to 🤗!
+    ## Access it here [{user_repo_id}](https://huggingface.co/{user_repo_id}) '''
+
+
 css = '''
 #login {
     font-size: 0px;
@@ -271,11 +273,12 @@ Get diffusers compatibility, a free GPU-based Inference Widget and possibility t
         try_again_button = gr.Button("I have added my HF profile to my account", visible=False)
         submit_button_civit = gr.Button("Upload model to Hugging Face", interactive=False)
         output = gr.Markdown(label="Output progress", visible=False)
-   
+
+    civit_username = gr.State()
     demo.load(fn=swap_fill, outputs=[disabled_area, enabled_area])
-    submit_source_civit.change(fn=check_civit_link, inputs=[submit_source_civit], outputs=[instructions, submit_button_civit, try_again_button])
+    submit_source_civit.change(fn=check_civit_link, inputs=[submit_source_civit], outputs=[instructions, submit_button_civit, try_again_button, civit_username])
     try_again_button.click(fn=check_civit_link, inputs=[submit_source_civit], outputs=[instructions, submit_button_civit, try_again_button])
-    submit_button_civit.click(fn=show_output, inputs=[], outputs=[output]).then(fn=upload_civit_to_hf, inputs=[submit_source_civit], outputs=[output])
+    submit_button_civit.click(fn=show_output, inputs=[], outputs=[output]).then(fn=upload_civit_to_hf, inputs=[submit_source_civit, civit_username], outputs=[output])
     gr.LogoutButton(elem_id="logout")
 demo.queue()
 demo.launch()