fx

app.py

@@ -885,51 +885,12 @@ async def generate_piclet(image, hf_token: str) -> dict:
         # Step 5: Save new discovery if needed
         print("Step 5/5: Saving to dataset...")
         if discovery_status == 'new':
-                # Create new canonical
-                type_id = f"{PicletDiscoveryService.normalize_object_name(object_name)}_canonical"
-                canonical_data = {
-                    "canonical": {
-                        "objectName": object_name,
-                        "typeId": type_id,
-                        "discoveredBy": user_info['preferred_username'],
-                        "discovererSub": user_info['sub'],
-                        "discovererUsername": user_info['preferred_username'],
-                        "discovererName": user_info.get('name'),
-                        "discovererPicture": user_info.get('picture'),
-                        "discoveredAt": datetime.now().isoformat(),
-                        "scanCount": scan_count,
-                        "picletData": {
-                            "typeId": type_id,
-                            "nickname": stats['name'],
-                            "stats": stats,
-                            "imageUrl": image_result['imageUrl'],
-                            "imageCaption": caption,
-                            "concept": concept_text,
-                            "imagePrompt": image_prompt,
-                            "createdAt": datetime.now().isoformat()
-                        }
-                    },
-                    "variations": []
-                }
-                canonical_id = type_id
-
-                PicletDiscoveryService.save_piclet_data(object_name, canonical_data)
-
-                # Update user profile
-                user_profile["discoveries"].append(type_id)
-                user_profile["uniqueFinds"] = user_profile.get("uniqueFinds", 0) + 1
-                user_profile["totalFinds"] = user_profile.get("totalFinds", 0) + 1
-                user_profile["rarityScore"] = user_profile.get("rarityScore", 0) + 100
-                PicletDiscoveryService.save_user_data(user_info['sub'], user_profile)
-
-            elif discovery_status == 'variation':
-                # Create new variation
-                existing_data = PicletDiscoveryService.load_piclet_data(object_name)
-                variation_id = f"{PicletDiscoveryService.normalize_object_name(object_name)}_{len(existing_data['variations']) + 1:03d}"
-
-                variation_data = {
-                    "typeId": variation_id,
-                    "attributes": attributes,
+            # Create new canonical
+            type_id = f"{PicletDiscoveryService.normalize_object_name(object_name)}_canonical"
+            canonical_data = {
+                "canonical": {
+                    "objectName": object_name,
+                    "typeId": type_id,
                     "discoveredBy": user_info['preferred_username'],
                     "discovererSub": user_info['sub'],
                     "discovererUsername": user_info['preferred_username'],
@@ -938,7 +899,7 @@ async def generate_piclet(image, hf_token: str) -> dict:
                     "discoveredAt": datetime.now().isoformat(),
                     "scanCount": scan_count,
                     "picletData": {
-                        "typeId": variation_id,
+                        "typeId": type_id,
                         "nickname": stats['name'],
                         "stats": stats,
                         "imageUrl": image_result['imageUrl'],
@@ -947,65 +908,90 @@ async def generate_piclet(image, hf_token: str) -> dict:
                         "imagePrompt": image_prompt,
                         "createdAt": datetime.now().isoformat()
                     }
-                }
+                },
+                "variations": []
+            }
+            canonical_id = type_id
 
-                existing_data['variations'].append(variation_data)
-                PicletDiscoveryService.save_piclet_data(object_name, existing_data)
+            PicletDiscoveryService.save_piclet_data(object_name, canonical_data)
 
-                # Update user profile
-                user_profile["discoveries"].append(variation_id)
-                user_profile["totalFinds"] = user_profile.get("totalFinds", 0) + 1
-                user_profile["rarityScore"] = user_profile.get("rarityScore", 0) + 50
-                PicletDiscoveryService.save_user_data(user_info['sub'], user_profile)
-
-            # Build complete response
-            piclet_data = {
-                "typeId": canonical_id,
-                "nickname": stats['name'],
-                "stats": stats,
-                "imageUrl": image_result['imageUrl'],
-                "imageCaption": caption,
-                "concept": concept_text,
-                "imagePrompt": image_prompt,
-                "objectName": object_name,
+            # Update user profile
+            user_profile["discoveries"].append(type_id)
+            user_profile["uniqueFinds"] = user_profile.get("uniqueFinds", 0) + 1
+            user_profile["totalFinds"] = user_profile.get("totalFinds", 0) + 1
+            user_profile["rarityScore"] = user_profile.get("rarityScore", 0) + 100
+            PicletDiscoveryService.save_user_data(user_info['sub'], user_profile)
+
+        elif discovery_status == 'variation':
+            # Create new variation
+            existing_data = PicletDiscoveryService.load_piclet_data(object_name)
+            variation_id = f"{PicletDiscoveryService.normalize_object_name(object_name)}_{len(existing_data['variations']) + 1:03d}"
+
+            variation_data = {
+                "typeId": variation_id,
                 "attributes": attributes,
-                "discoveryStatus": discovery_status,
+                "discoveredBy": user_info['preferred_username'],
+                "discovererSub": user_info['sub'],
+                "discovererUsername": user_info['preferred_username'],
+                "discovererName": user_info.get('name'),
+                "discovererPicture": user_info.get('picture'),
+                "discoveredAt": datetime.now().isoformat(),
                 "scanCount": scan_count,
-                "createdAt": datetime.now().isoformat()
+                "picletData": {
+                    "typeId": variation_id,
+                    "nickname": stats['name'],
+                    "stats": stats,
+                    "imageUrl": image_result['imageUrl'],
+                    "imageCaption": caption,
+                    "concept": concept_text,
+                    "imagePrompt": image_prompt,
+                    "createdAt": datetime.now().isoformat()
+                }
             }
 
-            messages = {
-                'new': f"Congratulations! You discovered the first {object_name} Piclet!",
-                'variation': f"You found a new variation of {object_name}!",
-                'existing': f"You encountered a known {object_name} Piclet."
-            }
+            existing_data['variations'].append(variation_data)
+            PicletDiscoveryService.save_piclet_data(object_name, existing_data)
 
-            return {
-                "success": True,
-                "piclet": piclet_data,
-                "discoveryStatus": discovery_status,
-                "canonicalId": canonical_id,
-                "message": messages.get(discovery_status, "Piclet generated!")
-            }
+            # Update user profile
+            user_profile["discoveries"].append(variation_id)
+            user_profile["totalFinds"] = user_profile.get("totalFinds", 0) + 1
+            user_profile["rarityScore"] = user_profile.get("rarityScore", 0) + 50
+            PicletDiscoveryService.save_user_data(user_info['sub'], user_profile)
 
-        except Exception as e:
-            print(f"Failed to generate Piclet: {e}")
-            import traceback
-            traceback.print_exc()
-            return {
-                "success": False,
-                "error": str(e)
-            }
-        finally:
-            # Clean up temporary image file
-            if os.path.exists(temp_image_path):
-                try:
-                    os.unlink(temp_image_path)
-                except:
-                    pass
+        # Build complete response
+        piclet_data = {
+            "typeId": canonical_id,
+            "nickname": stats['name'],
+            "stats": stats,
+            "imageUrl": image_result['imageUrl'],
+            "imageCaption": caption,
+            "concept": concept_text,
+            "imagePrompt": image_prompt,
+            "objectName": object_name,
+            "attributes": attributes,
+            "discoveryStatus": discovery_status,
+            "scanCount": scan_count,
+            "createdAt": datetime.now().isoformat()
+        }
+
+        messages = {
+            'new': f"Congratulations! You discovered the first {object_name} Piclet!",
+            'variation': f"You found a new variation of {object_name}!",
+            'existing': f"You encountered a known {object_name} Piclet."
+        }
+
+        return {
+            "success": True,
+            "piclet": piclet_data,
+            "discoveryStatus": discovery_status,
+            "canonicalId": canonical_id,
+            "message": messages.get(discovery_status, "Piclet generated!")
+        }
 
     except Exception as e:
-        print(f"Failed to process image: {e}")
+        print(f"Failed to generate Piclet: {e}")
+        import traceback
+        traceback.print_exc()
         return {
             "success": False,
             "error": str(e)