add image extractor

app.py

@@ -90,112 +90,109 @@ def find_by_hash(file_hash: str) -> Optional[Dict]:
 
 def submit_to_datadrones(model_path: Path, metadata: Dict) -> bool:
     """Submit file to datadrones.com"""
+    image_url = None
+    model_versions = None
+    base_model = None
+    tags = None
+    model_type = None
+    # Start with model name if available
+    description = ""
+    model_name = None
+
     try:
         print(f"🚀 Starting upload of {model_path.name} to datadrones.com...")
         
-        # Extract metadata fields
-        description = ""
-        model_name = None
-        base_model = None
-        tags = None
-        model_type = None
-        is_nsfw = False
-
-        # Process metadata structure
-        model_name = (metadata.get("model_name") or 
-                     metadata.get("civitai", {}).get("name") or 
-                     metadata.get("name"))
+        model_name = (metadata.get("model_name")
+                      or metadata.get("civitai").get("name")
+                      or metadata.get("name"))
 
+        # Add civitai description if available
         civitai = metadata.get("civitai", {})
-        
-        if civitai:
-            is_nsfw = civitai.get("nsfw", False)
-            
-            # Handle model versions
-            if "modelVersions" in civitai:
-                model_versions = civitai.get("modelVersions")
-                if model_versions:
-                    base_model = model_versions[0].get("baseModel")
-            
-            # Handle direct model data
-            if "model" in civitai:
-                model = civitai["model"]
-                model_type = model.get("type")
-                is_nsfw = model.get("nsfw", False)
-                model_name = model.get("name")
-                model_description = model.get("description")
-                tags = model.get("tags")
-                if model_description:
-                    description += f"{model_description}\n"
-            
-            if "type" in civitai:
-                model_type = civitai.get("type")
-            
-            if "baseModel" in civitai:
-                base_model = civitai.get("baseModel")
-                if base_model == "Hunyuan Video":
-                    base_model = "HunyuanVideo"
-            
-            if "description" in civitai:
-                description += f"{civitai['description']}\n"
+        is_nsfw = civitai.get("nsfw", False)
+
+        if civitai and "modelVersions" in civitai:
+            model_versions = civitai.get("modelVersions")
+
+        # Add image if available
+        if civitai and "images" in civitai and len(civitai["images"]) > 0:
+            image_url = civitai["images"][0].get("url")
+        if not image_url and model_versions:
+            # try in model versions
+            image_url = model_versions[0]["images"][0].get("url")
+        if image_url:
+            description += f"\n\n![Preview]({image_url})"
+
+        if civitai and "type" in civitai:
+            model_type = civitai.get("type")
+
+        # could be version id api
+        if civitai and "model" in civitai:
+            model = civitai["model"]
+            model_type = model.get("type")
+            is_nsfw = model.get("nsfw")
+            model_name = model.get("name")
+            model_description = model.get("description")
+            tags = model.get("tags")
+            if model_description:
+                description += f"\n\n{model_description}"
 
         if model_name:
-            description = f"{model_name}\n{description}"
+            description = f"{model_name} \n" + description
+        if civitai and "description" in civitai:
+            if description:
+                description += f"\n\n{civitai['description']}"
 
-        if not description.strip():
-            description = "Model uploaded via bulk uploader"
+        if not description:
+            description = "Possibly deleted"
 
-        # Handle tags
         if not tags and metadata.get("tags"):
             tags = ",".join(metadata.get("tags", []))
-        elif isinstance(tags, list):
-            tags = ",".join(tags)
+        if not tags and civitai and "tags" in civitai:
+            tags = ",".join(civitai.get("tags", []))
+
+        if civitai and "baseModel" in civitai:
+            base_model = civitai.get("baseModel")
+        if civitai and "modelVersions" in civitai:
+            model_versions = civitai.get("modelVersions")
+            if model_versions:
+                base_model = model_versions[0]["baseModel"]
+                if base_model == "Hunyuan Video":
+                    base_model = "HunyuanVideo"
 
-        # Prepare form data
+        # Prepare form data for submission
         data = {
-            "description": description.strip(),
+            "description": description,
             "base_model": base_model if base_model else "Other",
             "tags": tags if tags else "",
             "model_type": model_type if model_type else "LoRA",
             "is_nsfw": is_nsfw,
         }
-        
+
         print(f"📋 Upload data for {model_path.name}:")
         print(f"   - Model name: {model_name}")
         print(f"   - Model type: {data['model_type']}")
         print(f"   - Base model: {data['base_model']}")
         print(f"   - NSFW: {data['is_nsfw']}")
         print(f"   - Tags: {data['tags']}")
+        print(f"   - Image URL: {image_url}")
         print(f"   - Description length: {len(data['description'])} chars")
         print(f"   - File size: {model_path.stat().st_size / (1024*1024):.1f} MB")
 
+        # Submit to datadrones.com, bypass cloudflare
         with open(model_path, "rb") as f:
             files = {"file": f}
             headers = {'Host': 'up.datadrones.com'}
             
             print(f"🌐 Making POST request to https://up.datadrones.com/upload for {model_path.name}...")
             
-            response = requests.post(
-                "https://up.datadrones.com/upload", 
-                files=files, 
-                data=data, 
-                headers=headers,
-                timeout=300  # 5 minute timeout for large files
-            )
+            response = requests.post("https://up.datadrones.com/upload", files=files, data=data, headers=headers, timeout=300)
             
             print(f"📡 Response for {model_path.name}:")
             print(f"   - Status code: {response.status_code}")
-            print(f"   - Response headers: {dict(response.headers)}")
-            print(f"   - Response text (first 500 chars): {response.text[:500]}")
-            
-            success = response.status_code == 200
-            if success:
-                print(f"✅ Upload successful for {model_path.name}")
-            else:
-                print(f"❌ Upload failed for {model_path.name} - Status: {response.status_code}")
-                print(f"   - Full response: {response.text}")
-            
-            return success
+            if response.status_code != 200:
+                print(f"   - Response text: {response.text}")
+
+        return response.status_code == 200
 
     except Exception as e:
         print(f"💥 Exception during upload of {model_path.name}: {e}")