Update app.py

app.py

@@ -9,6 +9,10 @@ from datetime import datetime
 import re
 import tempfile
 import time
+import base64
+
+# External OCI API URL - THIS IS THE KEY FIX
+OCI_API_BASE_URL = "https://yukee1992-oci-video-storage.hf.space"
 
 # Try to import your existing OCI connector for direct access
 try:
@@ -17,7 +21,7 @@ try:
     print("✅ Direct OCI access available - using existing OCI connector")
 except ImportError:
     DIRECT_OCI_ACCESS = False
-    print("⚠️  Direct OCI access not available - using API endpoint")
+    print("⚠️  Direct OCI access not available - using external API endpoint")
 
 # Initialize the Stable Diffusion model
 def load_model():
@@ -109,31 +113,22 @@ 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 with better error handling"""
+    """Save image using the EXTERNAL OCI API endpoint"""
     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
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
         safe_prompt = "".join(c for c in prompt[:30] if c.isalnum() or c in (' ', '-', '_')).rstrip()
         filename = f"story_{timestamp}_{safe_prompt}.png"
         
-        # Use relative URL for same-space API calls
-        api_url = "/api/upload"
-        
-        # For Hugging Face deployment, use absolute URL if needed
-        try:
-            space_name = os.environ.get('SPACE_NAME', 'yukee1992-oci-story-book')
-            if 'HF_SPACE_ID' in os.environ:
-                api_url = f"https://{space_name}.hf.space/api/upload"
-        except:
-            pass
+        # Use the EXTERNAL API URL - THIS IS THE FIX
+        api_url = f"{OCI_API_BASE_URL}/api/upload"
         
-        print(f"🌐 Calling OCI API: {api_url}")
+        print(f"🌐 Calling EXTERNAL OCI API: {api_url}")
         
         # Prepare form data for API request
         files = {
@@ -149,14 +144,62 @@ def save_to_oci_via_api(image, prompt):
         response = requests.post(api_url, files=files, data=data, timeout=30)
         
         print(f"📨 API Response: {response.status_code}")
+        if response.text:
+            print(f"📨 API Response Text: {response.text[:200]}...")
         
         if response.status_code == 200:
             result = response.json()
             if result['status'] == 'success':
-                # 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}"
+                return f"✅ {result['message']}"
+            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_via_api_text(image, prompt):
+    """Alternative: Save image using the external OCI API text endpoint"""
+    try:
+        # Convert image to base64
+        img_bytes = io.BytesIO()
+        image.save(img_bytes, format='PNG')
+        img_base64 = base64.b64encode(img_bytes.getvalue()).decode('utf-8')
+        
+        # Create filename
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        safe_prompt = "".join(c for c in prompt[:30] if c.isalnum() or c in (' ', '-', '_')).rstrip()
+        filename = f"story_{timestamp}_{safe_prompt}.png"
+        
+        # Use the EXTERNAL API text endpoint
+        api_url = f"{OCI_API_BASE_URL}/api/upload-text"
+        
+        print(f"🌐 Calling EXTERNAL OCI API (text): {api_url}")
+        
+        # Prepare data for text endpoint
+        data = {
+            'project_id': 'storybook-generator',
+            'subfolder': 'childrens-books',
+            'filename': filename,
+            'content': img_base64  # Base64 encoded image
+        }
+        
+        # Make the API request with timeout
+        response = requests.post(api_url, data=data, timeout=30)
+        
+        print(f"📨 API Response: {response.status_code}")
+        if response.text:
+            print(f"📨 API Response Text: {response.text[:200]}...")
+        
+        if response.status_code == 200:
+            result = response.json()
+            if result['status'] == 'success':
+                return f"✅ {result['message']}"
             else:
                 return f"❌ API Error: {result.get('message', 'Unknown error')}"
         else:
@@ -175,7 +218,13 @@ def save_to_oci(image, prompt):
     if DIRECT_OCI_ACCESS:
         return save_to_oci_direct(image, prompt)
     else:
-        return save_to_oci_via_api(image, prompt)
+        # Try regular upload first, fallback to text upload if needed
+        result = save_to_oci_via_api(image, prompt)
+        if "❌" in result and "upload-text" not in result:
+            # If regular upload fails, try text endpoint
+            print("🔄 Regular upload failed, trying text endpoint...")
+            return save_to_oci_via_api_text(image, prompt)
+        return result
 
 def generate_storybook_image(prompt):
     """Generate an image from text prompt and save to OCI"""
@@ -213,6 +262,42 @@ def generate_storybook_image(prompt):
         print(f"Traceback: {traceback.format_exc()}")
         return None, error_msg
 
+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 EXTERNAL API connection
+            try:
+                api_url = f"{OCI_API_BASE_URL}/api/health"
+                print(f"🔗 Testing EXTERNAL API: {api_url}")
+                
+                response = requests.get(api_url, timeout=10)
+                if response.status_code == 200:
+                    result = response.json()
+                    return f"✅ EXTERNAL API Connection: Healthy - {result.get('status', 'No status')}"
+                else:
+                    return f"❌ EXTERNAL API Connection: HTTP {response.status_code} - {response.text}"
+            except requests.exceptions.ConnectionError:
+                return "❌ EXTERNAL API Connection: Cannot connect (ConnectionError)"
+            except requests.exceptions.Timeout:
+                return "❌ EXTERNAL API Connection: Timeout after 10 seconds"
+            except Exception as e:
+                return f"❌ EXTERNAL API Connection Error: {str(e)}"
+                
+    except Exception as e:
+        return f"❌ Connection check failed: {str(e)}"
+
 # Create the Gradio interface
 with gr.Blocks(title="Children's Book Illustrator", theme="soft") as demo:
     gr.Markdown("# 📚 Children's Book Illustrator")
@@ -233,44 +318,16 @@ with gr.Blocks(title="Children's Book Illustrator", theme="soft") as demo:
     
     # Debug section
     with gr.Accordion("🔧 Debug Information", open=False):
-        gr.Markdown("""
+        gr.Markdown(f"""
         **Current Configuration:**
-        - OCI Access: **{oci_mode}**
+        - OCI Access: **{'Direct' if DIRECT_OCI_ACCESS else 'External API'}**
+        - API URL: {OCI_API_BASE_URL}
         - Model: Stable Diffusion v1.5
         - Storage Path: `storybook-generator/childrens-books/`
-        """.format(oci_mode="Direct" if DIRECT_OCI_ACCESS else "API"))
+        """)
         
         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)}"
+        debug_output = gr.Textbox(label="Debug Info", interactive=False, lines=8)
     
     # Connect buttons to functions
     generate_btn.click(
@@ -291,5 +348,6 @@ def get_app():
 
 if __name__ == "__main__":
     print("🚀 Starting Children's Book Illustrator...")
-    print(f"📦 OCI Access: {'Direct' if DIRECT_OCI_ACCESS else 'API'}")
+    print(f"📦 OCI Access: {'Direct' if DIRECT_OCI_ACCESS else 'External API'}")
+    print(f"🌐 API URL: {OCI_API_BASE_URL}")
     demo.launch(server_name="0.0.0.0", server_port=7860)