Update app.py

app.py

@@ -12,11 +12,19 @@ from google.cloud import storage
 from google.oauth2 import service_account
 import json
 import shutil
+import logging
 
-API_HOST = os.environ.get("FACESWAP_API_HOST") 
-API_PORT = os.environ.get("FACESWAP_API_PORT") 
+# Set up logging
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
+# Get API endpoint from environment variables with fallback
+API_HOST = os.environ.get("FACESWAP_API_HOST", "162.243.118.138")
+API_PORT = os.environ.get("FACESWAP_API_PORT", "8080")
 API_URL = f"http://{API_HOST}:{API_PORT}/faceswap"
 
+logger.info(f"Using API endpoint: {API_URL}")
+
 def setup_gcs_auth():
     """Set up GCS authentication using service account from environment variable"""
     service_account_json = os.environ.get("SERVICE_ACCOUNT")
@@ -26,7 +34,7 @@ def setup_gcs_auth():
             credentials = service_account.Credentials.from_service_account_info(service_account_info)
             return credentials
         except Exception as e:
-            print(f"Error setting up GCS auth: {e}")
+            logger.error(f"Error setting up GCS auth: {e}")
             return None
     return None
 
@@ -54,7 +62,7 @@ def download_from_gcs(gcs_url):
             urllib.request.urlretrieve(gcs_url, temp_file.name)
             return temp_file.name
     except Exception as e:
-        print(f"Error downloading from GCS: {e}")
+        logger.error(f"Error downloading from GCS: {e}")
         return None
 
 def faceswap_process(gif_file, face_file):
@@ -66,36 +74,37 @@ def faceswap_process(gif_file, face_file):
     temp_face = tempfile.NamedTemporaryFile(suffix='.jpg', delete=False)
     
     try:
-        if hasattr(gif_file, 'name'):
-            if isinstance(gif_file, str):
-                shutil.copy(gif_file, temp_gif.name)
-            else: 
-                with open(temp_gif.name, 'wb') as f:
-                    f.write(gif_file.read())
-        else:
+        # Handle gif_file - could be a PIL Image (from gr.Image) or a filepath
+        if isinstance(gif_file, str):
+            # It's a filepath
+            shutil.copy(gif_file, temp_gif.name)
+        elif hasattr(gif_file, 'save'):
+            # It's a PIL Image
+            gif_file.save(temp_gif.name, 'GIF')
+        elif hasattr(gif_file, 'read'):
+            # It's a file-like object
             with open(temp_gif.name, 'wb') as f:
-                if hasattr(gif_file, 'read'):  
-                    f.write(gif_file.read())
-                elif isinstance(gif_file, str):
-                    shutil.copy(gif_file, temp_gif.name)
-                else: 
-                    f.write(open(gif_file, 'rb').read())
-        
+                f.write(gif_file.read())
+        else:
+            # Try as numpy array 
+            from PIL import Image
+            Image.fromarray(gif_file).save(temp_gif.name, 'GIF')
         
-        if hasattr(face_file, 'name'): 
-            if isinstance(face_file, str):  
-                shutil.copy(face_file, temp_face.name)
-            else: 
-                with open(temp_face.name, 'wb') as f:
-                    f.write(face_file.read())
-        else: 
+        # Handle face_file - could be a PIL Image (from gr.Image) or a filepath
+        if isinstance(face_file, str):
+            # It's a filepath
+            shutil.copy(face_file, temp_face.name)
+        elif hasattr(face_file, 'save'):
+            # It's a PIL Image
+            face_file.save(temp_face.name, 'JPEG')
+        elif hasattr(face_file, 'read'):
+            # It's a file-like object
             with open(temp_face.name, 'wb') as f:
-                if hasattr(face_file, 'read'):  
-                    f.write(face_file.read())
-                elif isinstance(face_file, str): 
-                    shutil.copy(face_file, temp_face.name)
-                else:  
-                    f.write(open(face_file, 'rb').read())
+                f.write(face_file.read())
+        else:
+            # Try as numpy array
+            from PIL import Image
+            Image.fromarray(face_file).save(temp_face.name, 'JPEG')
         
         files = {
             'gif_file': ('input.gif', open(temp_gif.name, 'rb'), 'image/gif'),
@@ -142,6 +151,7 @@ def faceswap_process(gif_file, face_file):
         except:
             pass
         
+        logger.exception("Error in faceswap_process")
         return None, f"❌ Error: {str(e)}"
 
 # Custom CSS
@@ -197,8 +207,13 @@ with gr.Blocks(title="Easel x GifSwap", css=custom_css) as demo:
         
         with gr.Row():
             with gr.Column():
-                gif_input = gr.File(label="Upload GIF", file_types=[".gif"])
-                face_input = gr.File(label="Upload Face Image", file_types=[".jpg", ".jpeg", ".png"])
+                # Use gr.Image instead of gr.File to show thumbnails
+                gif_input = gr.Image(label="Upload GIF", type="filepath", 
+                                    image_mode="RGB", sources=["upload"], 
+                                    elem_id="gif_input")
+                face_input = gr.Image(label="Upload Face Image", type="filepath", 
+                                     image_mode="RGB", sources=["upload"], 
+                                     elem_id="face_input")
                 submit_btn = gr.Button("Swap Face", variant="primary")
             
             with gr.Column(elem_classes="output-container"):
@@ -281,4 +296,4 @@ with gr.Blocks(title="Easel x GifSwap", css=custom_css) as demo:
 
 # Launch the app
 if __name__ == "__main__":
-    demo.launch(server_name="0.0.0.0", server_port=7860)
+    demo.launch(server_name="0.0.0.0", server_port=7860)