Update app.py

app.py

@@ -50,7 +50,7 @@ class UserCreate(BaseModel):
 class APIResponse(BaseModel):
     success: bool
     data: Any = None
-    error: str = None
+    error: Optional[str] = None
     timestamp: datetime = datetime.now()
 
 # ----------------- Enhanced Logger -----------------
@@ -324,14 +324,20 @@ class GemmaSaaSService:
             
             return APIResponse(
                 success=success,
-                data={"api_key": api_key} if success else None,
+                data={"api_key": api_key, "message": message} if success else None,
                 error=message if not success else None
             )
         except ValidationError as e:
-            return APIResponse(success=False, error=f"Validation error: {e}")
+            return APIResponse(
+                success=False, 
+                error=f"Validation error: {str(e)}"
+            )
         except Exception as e:
             logger.error(f"Service error creating user: {e}")
-            return APIResponse(success=False, error="Internal service error")
+            return APIResponse(
+                success=False, 
+                error="Internal service error"
+            )
     
     async def generate_text(self, prompt: str, api_key: str, **kwargs) -> APIResponse:
         """Generate text with authentication and rate limiting"""
@@ -339,11 +345,17 @@ class GemmaSaaSService:
             # Validate API key
             user = await self.db.validate_api_key(api_key)
             if not user:
-                return APIResponse(success=False, error="⚠️ Invalid API key")
+                return APIResponse(
+                    success=False, 
+                    error="⚠️ Invalid API key"
+                )
             
             # Check rate limit
             if not await self.db.check_rate_limit(user['id']):
-                return APIResponse(success=False, error="⚠️ Rate limit exceeded. Try again later.")
+                return APIResponse(
+                    success=False, 
+                    error="⚠️ Rate limit exceeded. Try again later."
+                )
             
             # Generate text
             request = GenerationRequest(prompt=prompt, **kwargs)
@@ -362,18 +374,27 @@ class GemmaSaaSService:
                     }
                 )
             else:
-                return APIResponse(success=False, error=text)
+                return APIResponse(
+                    success=False, 
+                    error=text
+                )
                 
         except Exception as e:
             logger.error(f"Service error generating text: {e}")
-            return APIResponse(success=False, error="Internal service error")
+            return APIResponse(
+                success=False, 
+                error="Internal service error"
+            )
     
     async def get_user_stats(self, api_key: str) -> APIResponse:
         """Get user statistics"""
         try:
             user = await self.db.validate_api_key(api_key)
             if not user:
-                return APIResponse(success=False, error="Invalid API key")
+                return APIResponse(
+                    success=False, 
+                    error="Invalid API key"
+                )
             
             stats = {
                 "name": user.get('name'),
@@ -391,7 +412,10 @@ class GemmaSaaSService:
             
         except Exception as e:
             logger.error(f"Error getting user stats: {e}")
-            return APIResponse(success=False, error="Error retrieving stats")
+            return APIResponse(
+                success=False, 
+                error="Error retrieving stats"
+            )
 
 # ----------------- Enhanced UI -----------------
 class GradioInterface:
@@ -803,6 +827,20 @@ class GradioInterface:
                     return response.error, {}, False
             
             async def handle_user_creation(name, email, plan):
+                if not name or not name.strip():
+                    return (
+                        f'<div class="alert-error">❌ Name is required</div>',
+                        "",
+                        False
+                    )
+                
+                if not email or not email.strip():
+                    return (
+                        f'<div class="alert-error">❌ Email is required</div>',
+                        "",
+                        False
+                    )
+                
                 response = await self.service.create_user(name, email, plan)
                 
                 if response.success: