Spaces:

usamabhatticoder
/

omni-agent-core

Sleeping

App Files Files Community

USAMA BHATTI commited on Jan 14

Commit

3f23aac

1 Parent(s): ba2fc46

Fix: Universal Port Configuration for Deployment

Browse files

Files changed (4) hide show

Dockerfile +3 -2
Procfile +1 -2
backend/src/main.py +16 -12
frontend/visual_search_test.html +32 -27

Dockerfile CHANGED Viewed

@@ -34,5 +34,6 @@ ENV PYTHONPATH=/app:$PYTHONPATH
 # 7. Expose Port
 EXPOSE 8000
-# 8. Run Command (Ye line Docker Compose se Override ho jayegi)
-CMD ["uvicorn", "backend.src.main:app", "--host", "0.0.0.0", "--port", "8000"]

 # 7. Expose Port
 EXPOSE 8000
+# 8. Run Command (Universal Logic)
+# Yeh check karega: Agar server ne PORT diya hai to wo use karo, warna 8000 use karo.
+CMD uvicorn backend.src.main:app --host 0.0.0.0 --port ${PORT:-8000}

Procfile CHANGED Viewed

	@@ -1,2 +1 @@
1	-
2	- web: uvicorn backend.src.main:app --host 0.0.0.0 --port $PORT


1	+ web: uvicorn backend.src.main:app --host 0.0.0.0 --port $PORT

backend/src/main.py CHANGED Viewed

@@ -2,14 +2,14 @@
 # --- EXTERNAL IMPORTS ---
 import os
 import asyncio
-import sys # <--- 1. Import asyncio
 from fastapi import FastAPI
-from fastapi.staticfiles import StaticFiles # <--- New Import
 from fastapi.middleware.cors import CORSMiddleware
 from backend.src.core.config import settings
-from backend.src.api.routes import visual
 # --- API Route Imports ---
-from backend.src.api.routes import chat, ingestion, auth, settings as settings_route
 # ==========================================
 # 🔥 WINDOWS FIX FOR DB TIMEOUTS 🔥
@@ -25,21 +25,18 @@ app = FastAPI(
 )
 # 2. CORS Setup (Security)
-# Frontend ko Backend se baat karne ki ijazat dena
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["*"], # Production mein hum isay specific domain karenge
     allow_credentials=False,
     allow_methods=["*"],
     allow_headers=["*"],
 )
-# 3. Mount Static Files (Chat Widget ke liye) 🎨
-# Ye check karta hai ke 'static' folder hai ya nahi, agar nahi to banata hai
 if not os.path.exists("static"):
     os.makedirs("static")
-# Is line ka matlab hai: Jo bhi file 'static' folder mein hogi, wo '/static/filename' par milegi
 app.mount("/static", StaticFiles(directory="static"), name="static")
 # 4. Health Check Route
@@ -48,7 +45,7 @@ async def root():
     return {
         "message": "Welcome to OmniAgent Core 🚀",
         "status": "active",
-        "widget_url": "/static/widget.js" # Widget ka link bhi bata diya
     }
 # 5. API Router Includes
@@ -58,7 +55,14 @@ app.include_router(chat.router, prefix=settings.API_V1_STR, tags=["Chat"])
 app.include_router(ingestion.router, prefix=settings.API_V1_STR, tags=["Ingestion"])
 app.include_router(visual.router, prefix=settings.API_V1_STR, tags=["Visual Search"])
 if __name__ == "__main__":
     import uvicorn
-    # Server Run command (Debugging ke liye)
-    uvicorn.run("backend.src.main:app", host="0.0.0.0", port=8000, reload=True)

 # --- EXTERNAL IMPORTS ---
 import os
 import asyncio
+import sys
 from fastapi import FastAPI
+from fastapi.staticfiles import StaticFiles
 from fastapi.middleware.cors import CORSMiddleware
 from backend.src.core.config import settings
 # --- API Route Imports ---
+from backend.src.api.routes import visual, chat, ingestion, auth, settings as settings_route
 # ==========================================
 # 🔥 WINDOWS FIX FOR DB TIMEOUTS 🔥
 )
 # 2. CORS Setup (Security)
 app.add_middleware(
     CORSMiddleware,
+    allow_origins=["*"],
     allow_credentials=False,
     allow_methods=["*"],
     allow_headers=["*"],
 )
+# 3. Mount Static Files
 if not os.path.exists("static"):
     os.makedirs("static")
 app.mount("/static", StaticFiles(directory="static"), name="static")
 # 4. Health Check Route
     return {
         "message": "Welcome to OmniAgent Core 🚀",
         "status": "active",
+        "widget_url": "/static/widget.js"
     }
 # 5. API Router Includes
 app.include_router(ingestion.router, prefix=settings.API_V1_STR, tags=["Ingestion"])
 app.include_router(visual.router, prefix=settings.API_V1_STR, tags=["Visual Search"])
+# ==========================================
+# 🔥 UNIVERSAL START LOGIC 🔥
+# ==========================================
 if __name__ == "__main__":
     import uvicorn
+    # Environment se PORT uthao, agar na mile to 8000 use karo
+    # Yeh logic Local + Deployment dono jagah chalegi
+    port = int(os.environ.get("PORT", 8000))
+    print(f"🚀 Starting Server on Port: {port}")
+    uvicorn.run("backend.src.main:app", host="0.0.0.0", port=port, reload=True)

frontend/visual_search_test.html CHANGED Viewed

@@ -3,32 +3,26 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>OmniAgent Visual Search Tester (API Key Mode)</title>
     <style>
-        body { font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; background-color: #f4f7f9; color: #333; margin: 0; padding: 40px; display: flex; justify-content: center; }
         .container { width: 100%; max-width: 900px; background: #fff; padding: 30px; border-radius: 12px; box-shadow: 0 10px 30px rgba(0,0,0,0.1); }
         h1 { color: #2c3e50; text-align: center; margin-bottom: 10px; }
-        .subtitle { text-align: center; color: #7f8c8d; margin-bottom: 30px; font-size: 0.9em; }
         .input-group { display: flex; flex-direction: column; gap: 15px; margin-bottom: 20px; }
-        .input-group label { font-weight: bold; margin-bottom: -10px; font-size: 0.9em; color: #555; }
         .input-group input, .input-group button { padding: 12px; border-radius: 6px; border: 1px solid #ccc; font-size: 16px; }
-        .input-group button { background-color: #3498db; color: white; border: none; cursor: pointer; transition: background-color 0.3s; font-weight: bold; }
-        .input-group button:hover { background-color: #2980b9; }
         .input-group button:disabled { background-color: #bdc3c7; cursor: not-allowed; }
-        #auth-status { text-align: center; padding: 15px; background: #f8f9fa; border-radius: 6px; margin-bottom: 20px; border-left: 5px solid #bdc3c7; }
         #search-results-container { margin-top: 30px; display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 20px; }
-        .result-card { background-color: #fff; border: 1px solid #eee; border-radius: 8px; overflow: hidden; transition: transform 0.2s, box-shadow 0.2s; }
-        .result-card:hover { transform: translateY(-5px); box-shadow: 0 5px 15px rgba(0,0,0,0.1); }
-        .result-card img { width: 100%; height: 200px; object-fit: cover; display: block; border-bottom: 1px solid #eee; }
-        .card-content { padding: 12px; text-align: center; }
-        .similarity-badge { background: #27ae60; color: white; padding: 4px 8px; border-radius: 12px; font-size: 12px; font-weight: bold; }
-        .info-message { grid-column: 1 / -1; text-align: center; font-size: 16px; color: #777; margin-top: 20px; }
         .loader { border: 4px solid #f3f3f3; border-top: 4px solid #3498db; border-radius: 50%; width: 40px; height: 40px; animation: spin 1s linear infinite; margin: 20px auto; display: none; }
         @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
     </style>
@@ -36,33 +30,44 @@
 <body>
     <div class="container">
         <h1>OmniAgent Visual Search</h1>
-        <p class="subtitle">Production Test Interface (API Key Secured)</p>
         <div id="auth-status">
-            <p style="margin:0"><strong>Status:</strong> Waiting for API Key...</p>
         </div>
         <div class="input-group">
-            <label for="api-key-input">1. Enter API Key (Get from Dashboard)</label>
-            <input type="text" id="api-key-input" placeholder="omni_xxxxxxxxxxxxxxxxxxxxxxxx...">
-            <label for="image-upload-input">2. Upload Query Image</label>
             <input type="file" id="image-upload-input" accept="image/*">
             <button id="search-button" disabled>🔍 Search Products</button>
         </div>
         <div id="loader" class="loader"></div>
-        <div id="search-results-container">
-            <p class="info-message">Results will appear here...</p>
-        </div>
     </div>
     <script src="visual_search_test.js"></script>
     <script>
-        // Backend URL (Ensure Port is Correct)
-        const API_ENDPOINT = "http://127.0.0.1:8000/api/v1/visual/search";
-        VisualSearchTester.init(API_ENDPOINT);
     </script>
 </body>
 </html>

 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>OmniAgent Visual Search Tester</title>
     <style>
+        body { font-family: 'Segoe UI', sans-serif; background-color: #f4f7f9; color: #333; margin: 0; padding: 40px; display: flex; justify-content: center; }
         .container { width: 100%; max-width: 900px; background: #fff; padding: 30px; border-radius: 12px; box-shadow: 0 10px 30px rgba(0,0,0,0.1); }
         h1 { color: #2c3e50; text-align: center; margin-bottom: 10px; }
+        .subtitle { text-align: center; color: #7f8c8d; margin-bottom: 30px; }
         .input-group { display: flex; flex-direction: column; gap: 15px; margin-bottom: 20px; }
+        .input-group label { font-weight: bold; font-size: 0.9em; color: #555; }
         .input-group input, .input-group button { padding: 12px; border-radius: 6px; border: 1px solid #ccc; font-size: 16px; }
+        .input-group button { background-color: #3498db; color: white; border: none; cursor: pointer; font-weight: bold; }
         .input-group button:disabled { background-color: #bdc3c7; cursor: not-allowed; }
+        #auth-status { text-align: center; padding: 15px; background: #f8f9fa; border-radius: 6px; border-left: 5px solid #bdc3c7; }
         #search-results-container { margin-top: 30px; display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 20px; }
+        .result-card { background: #fff; border: 1px solid #eee; border-radius: 8px; overflow: hidden; }
+        .result-card img { width: 100%; height: 200px; object-fit: cover; }
+        .card-content { padding: 10px; text-align: center; }
+        .similarity-badge { background: #27ae60; color: white; padding: 4px 8px; border-radius: 12px; font-size: 12px; }
         .loader { border: 4px solid #f3f3f3; border-top: 4px solid #3498db; border-radius: 50%; width: 40px; height: 40px; animation: spin 1s linear infinite; margin: 20px auto; display: none; }
         @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
     </style>
 <body>
     <div class="container">
         <h1>OmniAgent Visual Search</h1>
+        <p class="subtitle">Universal Tester (Local & Production)</p>
         <div id="auth-status">
+            <p style="margin:0"><strong>Status:</strong> Waiting for inputs...</p>
         </div>
         <div class="input-group">
+            <!-- 🔥 NEW: Dynamic URL Input -->
+            <label for="api-url-input">1. Backend URL (Local or Production)</label>
+            <input type="text" id="api-url-input" value="http://127.0.0.1:8000">
+            <label for="api-key-input">2. API Key</label>
+            <input type="text" id="api-key-input" placeholder="omni_...">
+            <label for="image-upload-input">3. Upload Image</label>
             <input type="file" id="image-upload-input" accept="image/*">
             <button id="search-button" disabled>🔍 Search Products</button>
         </div>
         <div id="loader" class="loader"></div>
+        <div id="search-results-container"></div>
     </div>
     <script src="visual_search_test.js"></script>
     <script>
+        // Init with value from input box
+        const urlInput = document.getElementById('api-url-input');
+        // Initial Init
+        VisualSearchTester.init(urlInput.value + "/api/v1/visual/search");
+        // Update init when URL changes
+        urlInput.addEventListener('input', function() {
+            // Remove trailing slash if user adds it
+            let cleanUrl = this.value.replace(/\/$/, "");
+            VisualSearchTester.init(cleanUrl + "/api/v1/visual/search");
+        });
     </script>
 </body>
 </html>