Rename multimodalart-app.py to app.py

multimodalart-app.py → app.py

@@ -76,37 +76,28 @@ def get_json_data(url):
         gr.Warning(f"Error fetching data from Civitai API for {url_split[4]}: {e}")
         return None
 
-def check_nsfw(json_data: Dict[str, Any], profile: Optional[gr.OAuthProfile]) -> bool:
-    if not json_data:
-        return False # Should not happen if get_json_data succeeded
+def check_nsfw(json_data: Dict[str, Any]) -> bool:
+    """
+    Returns True if the model or any of its versions/images are NSFW.
+    We no longer block NSFW, only tag it.
+    """
+    nsfw_flag = False
 
-    # Overall model boolean flag - highest priority
     if json_data.get("nsfw", False):
-        print("Model flagged as NSFW by 'nsfw: true'.")
-        gr.Info("Reason: Model explicitly flagged as NSFW on Civitai.")
-        return False # Unsafe
-
-    # Overall model numeric nsfwLevel - second priority. Max allowed is 5 (nsfwLevel < 6).
-    # nsfwLevel definitions: None (1), Mild (2), Mature (4), Adult (5), X (8), R (16), XXX (32)
-    model_nsfw_level = json_data.get("nsfwLevel", 0)
-    if model_nsfw_level > 5: # Anything above "Adult"
-        print(f"Model's overall nsfwLevel ({model_nsfw_level}) is > 5. Blocking.")
-        gr.Info(f"Reason: Model's overall NSFW Level ({model_nsfw_level}) is above the allowed threshold (5).")
-        return False # Unsafe
-
-    # If uploader is trusted and the above checks passed, they bypass further version/image checks.
-    if profile and profile.username in TRUSTED_UPLOADERS:
-        print(f"User {profile.username} is trusted. Model 'nsfw' is false and overall nsfwLevel ({model_nsfw_level}) is <= 5. Allowing.")
-        return True
-
-    # For non-trusted users, check nsfwLevel of model versions and individual images/videos
+        nsfw_flag = True
+
+    if json_data.get("nsfwLevel", 0) > 0:
+        nsfw_flag = True
+
     for model_version in json_data.get("modelVersions", []):
-        version_nsfw_level = model_version.get("nsfwLevel", 0)
-        if version_nsfw_level > 5:
-            print(f"Model version nsfwLevel ({version_nsfw_level}) is > 5 for non-trusted user. Blocking.")
-            gr.Info(f"Reason: A model version's NSFW Level ({version_nsfw_level}) is above 5.")
-            return False
-    return True # Safe for non-trusted user if all checks pass
+        if model_version.get("nsfwLevel", 0) > 0:
+            nsfw_flag = True
+        for image_obj in model_version.get("images", []):
+            if image_obj.get("nsfwLevel", 0) > 0:
+                nsfw_flag = True
+
+    return nsfw_flag
+
 
 
 def get_prompts_from_image(image_id_str: str):
@@ -288,22 +279,24 @@ def download_file_with_auth(url, filename, folder="."):
 def process_url(url, profile, do_download=True, folder=".", hunyuan_type: Optional[str] = None):
     json_data = get_json_data(url)
     if json_data:
-        if check_nsfw(json_data, profile):
-            info = extract_info(json_data, hunyuan_type=hunyuan_type)
-            if info:
-                downloaded_files_summary = {}
-                if do_download:
-                    gr.Info(f"Downloading files for {info['name']}...")
-                    downloaded_files_summary = download_files(info, folder)
-                    gr.Info(f"Finished downloading files for {info['name']}.")
-                return info, downloaded_files_summary
-            else:
-                raise gr.Error("LoRA extraction failed. The base model might not be supported, or it's not a LoRA model, or no suitable files found in the version.")
+        # Always extract info, even if NSFW
+        info = extract_info(json_data, hunyuan_type=hunyuan_type)
+        if info:
+            # Detect NSFW but do not block
+            nsfw_flag = check_nsfw(json_data)
+            info["nsfw_flag"] = nsfw_flag
+
+            downloaded_files_summary = {}
+            if do_download:
+                gr.Info(f"Downloading files for {info['name']}...")
+                downloaded_files_summary = download_files(info, folder)
+                gr.Info(f"Finished downloading files for {info['name']}.")
+
+            return info, downloaded_files_summary
         else:
-            # check_nsfw now prints detailed reasons via gr.Info/print
-            raise gr.Error("This model has content tagged as unsafe by CivitAI or exceeds NSFW level limits.")
+            raise gr.Error("LoRA extraction failed. The base model might not be supported, or it's not a LoRA model, or no suitable files found in the version.")
     else:
-        raise gr.Error("Failed to fetch model data from CivitAI API. Please check the URL and Civitai's status.")
+        raise gr.Error("Failed to fetch model data from CivitAI API. Please check the URL and CivitAI's status.")
 
 
 def create_readme(info: Dict[str, Any], downloaded_files: Dict[str, Any], user_repo_id: str, link_civit: bool = False, is_author: bool = True, folder: str = "."):