add --port arg to ep logs

Author: Dylan Huang

eval_protocol/cli.py

@@ -289,6 +289,7 @@ def parse_args(args=None):
 
     # Logs command
     logs_parser = subparsers.add_parser("logs", help="Serve logs with file watching and real-time updates")
+    logs_parser.add_argument("--port", type=int, default=8000, help="Port to bind to (default: 8000)")
 
     # Run command (for Hydra-based evaluations)
     # This subparser intentionally defines no arguments itself.

eval_protocol/cli_commands/logs.py

@@ -11,15 +11,16 @@
 def logs_command(args):
     """Serve logs with file watching and real-time updates"""
 
+    port = args.port
     print(f"🚀 Starting Eval Protocol Logs Server")
-    print(f"🌐 URL: http://localhost:8000")
-    print(f"🔌 WebSocket: ws://localhost:8000/ws")
+    print(f"🌐 URL: http://localhost:{port}")
+    print(f"🔌 WebSocket: ws://localhost:{port}/ws")
     print(f"👀 Watching paths: {['current directory']}")
     print("Press Ctrl+C to stop the server")
     print("-" * 50)
 
     try:
-        serve_logs()
+        serve_logs(port=args.port)
         return 0
     except KeyboardInterrupt:
         print("\n🛑 Server stopped by user")

eval_protocol/utils/logs_server.py

@@ -319,20 +319,52 @@ def run(self):
         asyncio.run(self.run_async())
 
 
-server = LogsServer()
-app = server.app
+def create_app(host: str = "localhost", port: int = 8000, build_dir: Optional[str] = None) -> FastAPI:
+    """
+    Factory function to create a FastAPI app instance.
+
+    This allows uvicorn to call it with parameters and avoids top-level variable instantiation.
+
+    Args:
+        host: Host to bind to
+        port: Port to bind to
+        build_dir: Optional custom build directory path
+
+    Returns:
+        FastAPI app instance
+    """
+    if build_dir is None:
+        build_dir = os.path.abspath(
+            os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "vite-app", "dist")
+        )
 
+    server = LogsServer(host=host, port=port, build_dir=build_dir)
+    return server.app
 
-def serve_logs():
+
+# For backward compatibility and direct usage
+def serve_logs(port: Optional[int] = None):
     """
     Convenience function to create and run a LogsServer.
     """
-    global server, app
-    if server is None:
-        server = LogsServer()
-        app = server.app
+    server = LogsServer(port=port)
     server.run()
 
 
 if __name__ == "__main__":
-    serve_logs()
+    import argparse
+
+    parser = argparse.ArgumentParser(description="Start the evaluation logs server")
+    parser.add_argument("--host", default="localhost", help="Host to bind to (default: localhost)")
+    parser.add_argument("--port", type=int, default=8000, help="Port to bind to (default: 8000)")
+    parser.add_argument("--build-dir", help="Path to Vite build directory")
+
+    args = parser.parse_args()
+
+    # Create server with command line arguments
+    if args.build_dir:
+        server = LogsServer(host=args.host, port=args.port, build_dir=args.build_dir)
+    else:
+        server = LogsServer(host=args.host, port=args.port)
+
+    server.run()

eval_protocol/utils/vite_server.py

@@ -5,7 +5,7 @@
 
 import uvicorn
 from fastapi import FastAPI, HTTPException
-from fastapi.responses import FileResponse
+from fastapi.responses import FileResponse, HTMLResponse
 from fastapi.staticfiles import StaticFiles
 
 logger = logging.getLogger(__name__)
@@ -57,6 +57,40 @@ def __init__(
         # Setup routes
         self._setup_routes()
 
+    def _inject_config_into_html(self, html_content: str) -> str:
+        """Inject server configuration into the HTML content."""
+        config_script = f"""
+<script>
+// Server-injected configuration
+window.SERVER_CONFIG = {{
+    host: "{self.host}",
+    port: "{self.port}",
+    protocol: "ws",
+    apiProtocol: "http"
+}};
+</script>
+"""
+
+        # Insert the config script before the closing </head> tag
+        if "</head>" in html_content:
+            return html_content.replace("</head>", f"{config_script}</head>")
+        else:
+            # If no </head> tag, insert at the beginning
+            return f"{config_script}{html_content}"
+
+    def _serve_index_with_config(self) -> HTMLResponse:
+        """Serve the index.html file with injected configuration."""
+        index_path = self.build_dir / self.index_file
+        if index_path.exists():
+            with open(index_path, "r", encoding="utf-8") as f:
+                html_content = f.read()
+
+            # Inject server configuration
+            enhanced_html = self._inject_config_into_html(html_content)
+            return HTMLResponse(content=enhanced_html)
+
+        raise HTTPException(status_code=404, detail="Index file not found")
+
     def _setup_routes(self):
         """Set up the API routes for serving the SPA."""
 
@@ -81,18 +115,15 @@ async def serve_spa(path: str):
             # For SPA routing, serve index.html for non-existent routes
             # but exclude API routes and asset requests
             if not path.startswith(("api/", "assets/")):
-                index_path = self.build_dir / self.index_file
-                if index_path.exists():
-                    return FileResponse(index_path)
+                return self._serve_index_with_config()
 
             # If we get here, the file doesn't exist and it's not a SPA route
             raise HTTPException(status_code=404, detail="File not found")
 
         @self.app.get("/")
         async def root():
-            """Serve the main index.html file."""
-            index_path = self.build_dir / self.index_file
-            return FileResponse(index_path)
+            """Serve the main index.html file with injected configuration."""
+            return self._serve_index_with_config()
 
         @self.app.get("/health")
         async def health():