Update app.py

app.py

@@ -8,10 +8,10 @@ import os
 from datetime import datetime
 import re
 import tempfile
+import time
 
 # Try to import your existing OCI connector for direct access
 try:
-    # This will work if we're in the same app context
     from app import oci_connector
     DIRECT_OCI_ACCESS = True
     print("✅ Direct OCI access available - using existing OCI connector")
@@ -27,7 +27,7 @@ def load_model():
         pipe = StableDiffusionPipeline.from_pretrained(
             "runwayml/stable-diffusion-v1-5", 
             torch_dtype=torch.float32,
-            safety_checker=None,  # Disable for better performance
+            safety_checker=None,
             requires_safety_checker=False
         ).to("cpu")
         print("✅ Model loaded successfully!")
@@ -39,8 +39,39 @@ def load_model():
 # Load the model once at startup
 pipe = load_model()
 
+def verify_oci_upload(object_name):
+    """Verify that the file actually exists in OCI"""
+    try:
+        if DIRECT_OCI_ACCESS:
+            # Use direct OCI client to check if file exists
+            namespace = oci_connector.config.get('namespace')
+            bucket_name = oci_connector.config.get('bucket_name')
+            
+            if not namespace or not bucket_name:
+                return False, "Namespace or bucket name not configured"
+            
+            try:
+                response = oci_connector.client.head_object(
+                    namespace_name=namespace,
+                    bucket_name=bucket_name,
+                    object_name=object_name
+                )
+                return True, "✅ File verified in OCI"
+            except oci.exceptions.ServiceError as e:
+                if e.status == 404:
+                    return False, "❌ File not found in OCI (404)"
+                else:
+                    return False, f"❌ OCI Error: {e.message}"
+        
+        else:
+            # For API mode, we can't easily verify, so just return optimistic
+            return True, "✅ Upload reported successful (verification not available)"
+            
+    except Exception as e:
+        return False, f"❌ Verification failed: {str(e)}"
+
 def save_to_oci_direct(image, prompt):
-    """Save image using direct OCI connector access"""
+    """Save image using direct OCI connector access with verification"""
     try:
         # Create temporary file
         with tempfile.NamedTemporaryFile(suffix='.png', delete=False) as tmp:
@@ -55,6 +86,8 @@ def save_to_oci_direct(image, prompt):
         # Use project-based directory structure
         object_name = f"storybook-generator/childrens-books/{filename}"
         
+        print(f"📤 Uploading to OCI: {object_name}")
+        
         # Upload using existing OCI connector
         success, message = oci_connector.upload_file(temp_path, object_name, None)
         
@@ -62,7 +95,13 @@ def save_to_oci_direct(image, prompt):
         os.unlink(temp_path)
         
         if success:
-            return f"✅ {message}"
+            # Verify the upload actually worked
+            print("🔍 Verifying OCI upload...")
+            verified, verify_msg = verify_oci_upload(object_name)
+            if verified:
+                return f"✅ {message} | {verify_msg}"
+            else:
+                return f"⚠️  {message} BUT {verify_msg}"
         else:
             return f"❌ {message}"
             
@@ -70,11 +109,12 @@ def save_to_oci_direct(image, prompt):
         return f"❌ Direct upload failed: {str(e)}"
 
 def save_to_oci_via_api(image, prompt):
-    """Save image using the OCI API endpoint"""
+    """Save image using the OCI API endpoint with better error handling"""
     try:
         # Convert image to bytes
         img_bytes = io.BytesIO()
         image.save(img_bytes, format='PNG')
+        img_data = img_bytes.getvalue()
         img_bytes.seek(0)
         
         # Create filename
@@ -82,22 +122,22 @@ def save_to_oci_via_api(image, prompt):
         safe_prompt = "".join(c for c in prompt[:30] if c.isalnum() or c in (' ', '-', '_')).rstrip()
         filename = f"story_{timestamp}_{safe_prompt}.png"
         
-        # Your OCI API endpoint URL
-        # Use relative URL since we're in the same space
+        # Use relative URL for same-space API calls
         api_url = "/api/upload"
         
-        # For Hugging Face deployment, we need to handle different URL formats
+        # For Hugging Face deployment, use absolute URL if needed
         try:
-            # Try to get the space URL from environment
-            space_name = os.environ.get('SPACE_NAME', 'yukee1992-oci-video-storage')
-            api_url = f"https://{space_name}.hf.space/api/upload"
+            space_name = os.environ.get('SPACE_NAME', 'yukee1992-sd-xl-book-illustrator')
+            if 'HF_SPACE_ID' in os.environ:
+                api_url = f"https://{space_name}.hf.space/api/upload"
         except:
-            # Fallback to relative URL
             pass
         
+        print(f"🌐 Calling OCI API: {api_url}")
+        
         # Prepare form data for API request
         files = {
-            'file': (filename, img_bytes.getvalue(), 'image/png')
+            'file': (filename, img_data, 'image/png')
         }
         
         data = {
@@ -105,23 +145,33 @@ def save_to_oci_via_api(image, prompt):
             'subfolder': 'childrens-books'
         }
         
-        # Make the API request
-        response = requests.post(api_url, files=files, data=data)
+        # Make the API request with timeout
+        response = requests.post(api_url, files=files, data=data, timeout=30)
+        
+        print(f"📨 API Response: {response.status_code}")
         
         if response.status_code == 200:
             result = response.json()
             if result['status'] == 'success':
-                return f"✅ {result['message']}"
+                # Try to verify the file exists
+                object_name = result.get('object_name', f"storybook-generator/childrens-books/{filename}")
+                verified, verify_msg = verify_oci_upload(object_name)
+                return f"✅ {result['message']} | {verify_msg}"
             else:
                 return f"❌ API Error: {result.get('message', 'Unknown error')}"
         else:
             return f"❌ HTTP Error: {response.status_code} - {response.text}"
             
+    except requests.exceptions.Timeout:
+        return "❌ API call timed out (30s)"
+    except requests.exceptions.ConnectionError:
+        return "❌ Cannot connect to OCI API"
     except Exception as e:
         return f"❌ API upload failed: {str(e)}"
 
 def save_to_oci(image, prompt):
     """Main function to save image to OCI using best available method"""
+    print("💾 Starting OCI save process...")
     if DIRECT_OCI_ACCESS:
         return save_to_oci_direct(image, prompt)
     else:
@@ -130,6 +180,9 @@ def save_to_oci(image, prompt):
 def generate_storybook_image(prompt):
     """Generate an image from text prompt and save to OCI"""
     try:
+        if not prompt or not prompt.strip():
+            return None, "❌ Please enter a scene description"
+        
         # Enhance the prompt for better children's book style
         enhanced_prompt = f"children's book illustration, colorful, whimsical, cute, {prompt}"
         
@@ -138,8 +191,10 @@ def generate_storybook_image(prompt):
         # Generate image
         image = pipe(
             enhanced_prompt,
-            num_inference_steps=20,  # Faster generation
-            guidance_scale=7.5
+            num_inference_steps=20,
+            guidance_scale=7.5,
+            width=512,
+            height=512
         ).images[0]
         
         print("✅ Image generated successfully!")
@@ -147,99 +202,75 @@ def generate_storybook_image(prompt):
         # Save to OCI
         print("💾 Saving image to OCI storage...")
         save_status = save_to_oci(image, prompt)
-        print(save_status)
+        print(f"Save status: {save_status}")
         
         return image, save_status
         
     except Exception as e:
         error_msg = f"❌ Generation failed: {str(e)}"
         print(error_msg)
+        import traceback
+        print(f"Traceback: {traceback.format_exc()}")
         return None, error_msg
 
-def batch_generate_storybook(scenes):
-    """Generate multiple images for a storybook"""
-    if not scenes:
-        return [], "❌ Please provide at least one scene"
-    
-    results = []
-    status_messages = []
-    
-    for i, scene in enumerate(scenes):
-        if not scene.strip():
-            continue
-            
-        print(f"📖 Generating scene {i+1}/{len(scenes)}: {scene}")
-        image, status = generate_storybook_image(scene)
-        
-        if image:
-            results.append((f"Scene {i+1}: {scene}", image))
-        status_messages.append(f"Scene {i+1}: {status}")
-    
-    return results, "\n".join(status_messages)
-
 # Create the Gradio interface
 with gr.Blocks(title="Children's Book Illustrator", theme="soft") as demo:
     gr.Markdown("# 📚 Children's Book Illustrator")
     gr.Markdown("Generate beautiful storybook images and automatically save them to your OCI storage")
     
-    with gr.Tab("Single Image Generation"):
-        with gr.Row():
-            with gr.Column():
-                prompt_input = gr.Textbox(
-                    label="Scene Description",
-                    placeholder="Describe a scene for your storybook...\nExample: A dragon reading a book under a magical tree",
-                    lines=3
-                )
-                generate_btn = gr.Button("🎨 Generate Image", variant="primary")
-            
-            with gr.Column():
-                image_output = gr.Image(label="Generated Image", height=400)
-                status_output = gr.Textbox(label="Status", interactive=False)
-    
-    with gr.Tab("Batch Storybook Generation"):
-        with gr.Row():
-            with gr.Column():
-                scenes_input = gr.Textbox(
-                    label="Story Scenes (One per line)",
-                    placeholder="Enter each scene on a separate line...\nExample:\nA brave knight approaches the castle\nThe dragon guards a treasure chest\nChildren celebrating with the villagers",
-                    lines=6
-                )
-                batch_generate_btn = gr.Button("📖 Generate Storybook", variant="primary")
-            
-            with gr.Column():
-                batch_status = gr.Textbox(label="Generation Status", interactive=False, lines=10)
+    with gr.Row():
+        with gr.Column():
+            prompt_input = gr.Textbox(
+                label="Scene Description",
+                placeholder="Describe a scene for your storybook...\nExample: A dragon reading a book under a magical tree",
+                lines=3
+            )
+            generate_btn = gr.Button("🎨 Generate Image", variant="primary")
         
-        # Gallery for batch results
-        gallery_output = gr.Gallery(
-            label="Generated Storybook Scenes",
-            columns=2,
-            height=600
-        )
+        with gr.Column():
+            image_output = gr.Image(label="Generated Image", height=400)
+            status_output = gr.Textbox(label="Status", interactive=False, lines=3)
     
-    with gr.Tab("About & Help"):
+    # Debug section
+    with gr.Accordion("🔧 Debug Information", open=False):
         gr.Markdown("""
-        ## 🎯 How to Use
-        
-        1. **Single Image**: Enter a scene description and click "Generate Image"
-        2. **Storybook**: Enter multiple scenes (one per line) for a complete story
-        3. **Auto-Save**: All images are automatically saved to your OCI storage
+        **Current Configuration:**
+        - OCI Access: **{oci_mode}**
+        - Model: Stable Diffusion v1.5
+        - Storage Path: `storybook-generator/childrens-books/`
+        """.format(oci_mode="Direct" if DIRECT_OCI_ACCESS else "API"))
         
-        ## 📁 Storage Location
-        
-        Images are saved to: `storybook-generator/childrens-books/`
-        
-        ## 💡 Prompt Tips
-        
-        - Be descriptive: "A dragon reading a book under a magical tree"
-        - Add style: "watercolor style, cute, whimsical"
-        - Specify characters: "little mouse exploring a giant forest"
-        
-        ## 🔧 Technical Details
-        
-        - Uses Stable Diffusion v1.5
-        - Saves to OCI Object Storage
-        - Automatic image organization
-        """)
+        debug_btn = gr.Button("🔄 Check OCI Connection", variant="secondary")
+        debug_output = gr.Textbox(label="Debug Info", interactive=False, lines=6)
+    
+    def check_oci_connection():
+        """Check OCI connection status"""
+        try:
+            if DIRECT_OCI_ACCESS:
+                # Test direct OCI connection
+                namespace = oci_connector.config.get('namespace', 'Not set')
+                bucket = oci_connector.config.get('bucket_name', 'Not set')
+                client_status = "✅ Connected" if oci_connector.client else "❌ Disconnected"
+                
+                return f"""**Direct OCI Connection:**
+- Client: {client_status}
+- Namespace: {namespace}
+- Bucket: {bucket}
+- Initialization Error: {oci_connector.initialization_error or 'None'}"""
+            else:
+                # Test API connection
+                try:
+                    api_url = "/api/health"
+                    response = requests.get(api_url, timeout=10)
+                    if response.status_code == 200:
+                        return "✅ API Connection: Healthy"
+                    else:
+                        return f"❌ API Connection: HTTP {response.status_code}"
+                except Exception as e:
+                    return f"❌ API Connection: {str(e)}"
+                    
+        except Exception as e:
+            return f"❌ Connection check failed: {str(e)}"
     
     # Connect buttons to functions
     generate_btn.click(
@@ -248,23 +279,17 @@ with gr.Blocks(title="Children's Book Illustrator", theme="soft") as demo:
         outputs=[image_output, status_output]
     )
     
-    batch_generate_btn.click(
-        fn=batch_generate_storybook,
-        inputs=scenes_input,
-        outputs=[gallery_output, batch_status]
+    debug_btn.click(
+        fn=check_oci_connection,
+        inputs=None,
+        outputs=debug_output
     )
 
 # For Hugging Face Spaces deployment
 def get_app():
-    """Return the Gradio app for Hugging Face"""
     return demo
 
-# For local testing
 if __name__ == "__main__":
     print("🚀 Starting Children's Book Illustrator...")
     print(f"📦 OCI Access: {'Direct' if DIRECT_OCI_ACCESS else 'API'}")
-    demo.launch(server_name="0.0.0.0", server_port=7860)
-else:
-    # For Hugging Face deployment
-    print("📦 Hugging Face Space detected")
-    print(f"🔧 OCI Access: {'Direct' if DIRECT_OCI_ACCESS else 'API'}")
+    demo.launch(server_name="0.0.0.0", server_port=7860)