more stuff

app.py

@@ -9,16 +9,14 @@ import random
 import time
 
 api=HfApi()
-FILE_TYPES = ["Embedding", "Model", "Lora", "Lycoris"]
+FILE_TYPES = ["Embedding", "Stable Diffusion Model", "Lora", "Lycoris"]
 
-def duplicate(source_url, preview_url, model_id, dst_repo, token, dst_repo_path, repo_type):
+def duplicate(source_url, preview_url, model_id, dst_repo, token, repo_type, nsfw, make_pr):
     try:
         _ = whoami(token)
         # ^ this will throw if token is invalid
 
         # make sure the user fills out the other required paths.
-        if not dst_repo_path[len(dst_repo_path)-1] == '/':
-                raise Exception("Your destination path *must* end with a /")
         if not source_url:
                 raise Exception("You haven't chosen a file to download!")
         if not dst_repo:
@@ -37,7 +35,7 @@ def duplicate(source_url, preview_url, model_id, dst_repo, token, dst_repo_path,
         match repo_type:
                 case "Embedding":
                         repopath="/embeddings"
-                case "Model":
+                case "Stable Diffusion Model":
                         repopath="/models/Stable-diffusion"
                 case "Lora":
                         repopath="/models/Lora/Lora"
@@ -48,10 +46,11 @@ def duplicate(source_url, preview_url, model_id, dst_repo, token, dst_repo_path,
                 repopath=repopath+"/nsfw"
 
         api.upload_folder(
-                path_or_fileobj=dir,
+                folder_path=dir,
                 path_in_repo=repopath,
                 repo_id=dst_repo,
-                repo_type=repo_type
+                repo_type=repo_type,
+                create_pr=make_pr
         )
 
         # now clean up
@@ -88,13 +87,14 @@ def duplicate(source_url, preview_url, model_id, dst_repo, token, dst_repo_path,
 interface = gr.Interface(
     fn=duplicate,
     inputs=[
-        gr.Textbox(placeholder="Source URL for model (e.g. civitai.com/api/download/models/4324322534)"),
-        gr.Textbox(placeholder="Preview URL for model (e.g. https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/df8e24d7-4094-42cf-0d8f-a50afd28f800/width=450,optimized=true/00143-3805918203.jpeg)"),
-        gr.Textbox(placeholder="model ID (e.g. 4324322534)"),
-        gr.Textbox(placeholder="Destination repository (e.g. osanseviero/dst)",value="spaces/mirroring/civitai_mirror/"),
-        gr.Textbox(placeholder="Write access token", type="password"),
-        gr.Textbox(placeholder="Destination for your file within your repo. Don't include the filename, end path with a / (e.g. /models/Stable-diffusion/)"),
-        gr.Dropdown(choices=FILE_TYPES, value="Model"),
+        gr.Textbox(label="Source URL", info="Source URL for model file. FP32 unpruned preferred, but you can upload multiple versions. Safetensors preferred, but not really important.", placeholder="https://civitai.com/api/download/models/4324322534?garbageextrastuff"),
+        gr.Textbox(label="Preview URL", info="URL for model preview on civitai. High resolution with generation data preferred, you can upload an alternate separately without the .preview part in the filename, this will override the preview. Will be renamed to modelprefix.preview.png, regardless of actual format; this is what civitai unofficial extemsion wants.", placeholder="https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/df8e24d7-4094-42cf-0d8f-a50afd28f800/00143-3805918203.jpeg"),
+        gr.Textbox(label="Model ID", info="You can get this from the source URL", placeholder="model ID (e.g. 4324322534)"),
+        gr.Textbox(label="Destination repository",value="spaces/mirroring/civitai_mirror/"),
+        gr.Textbox(label="Access Token", info="Write access token (write access required)", type="password"),
+        gr.Dropdown(label="File type", info="What type of model is this? If it's not a stable diffusion model, Lora, lycoris, or embedding, upload it separately. (for example, if you've got a VAE)", choices=FILE_TYPES, value="Stable Diffusion Model"),
+        gr.Checkbox(label="NSFW model?", info="check if the model is intended for nsfw, or creates such images on its own. Places file in the /nsfw subdirectory.",value=False),
+        gr.Checkbox(label="Pull Request?", info="uncheck if you have write access and want to merge your file directly",value=True),
     ],
     outputs=[
         gr.Markdown(label="output"),