Amir/patch 2 (#9)

* FIX import

* FIX Route front -> back

cua2-core/src/cua2_core/app.py

@@ -55,12 +55,7 @@ app = FastAPI(
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[
-        "http://localhost:3000",  # React dev server
-        "http://localhost:5173",  # Vite dev server
-        "http://localhost:8080",  # Alternative frontend port
-        "http://127.0.0.1:3000",
-        "http://127.0.0.1:5173",
-        "http://127.0.0.1:8080",
+        "*",
     ],
     allow_credentials=True,
     allow_methods=["*"],

cua2-core/src/cua2_core/main.py

@@ -6,7 +6,7 @@ from cua2_core.routes.routes import router
 from cua2_core.routes.websocket import router as websocket_router
 
 # Include routes
-app.include_router(router, prefix="/api/v1")
+app.include_router(router, prefix="/api")
 app.include_router(websocket_router)
 
 

cua2-front/src/App.tsx

@@ -1,19 +1,20 @@
+import { CssBaseline, ThemeProvider } from '@mui/material';
 import { useMemo } from 'react';
-import { BrowserRouter, Routes, Route } from "react-router-dom";
-import { ThemeProvider, CssBaseline } from '@mui/material';
-import getTheme from './theme';
-import Welcome from "./pages/Welcome";
-import Task from "./pages/Task";
-import { useAgentStore, selectIsDarkMode } from './stores/agentStore';
+import { BrowserRouter, Route, Routes } from "react-router-dom";
+import { getWebSocketUrl } from './config/api';
 import { useAgentWebSocket } from './hooks/useAgentWebSocket';
-import { config } from './config';
+import Task from "./pages/Task";
+import Welcome from "./pages/Welcome";
+import { selectIsDarkMode, useAgentStore } from './stores/agentStore';
+import getTheme from './theme';
 
 const App = () => {
   const isDarkMode = useAgentStore(selectIsDarkMode);
   const theme = useMemo(() => getTheme(isDarkMode ? 'dark' : 'light'), [isDarkMode]);
 
   // Initialize WebSocket connection at app level so it persists across route changes
-  useAgentWebSocket({ url: config.wsUrl });
+
+  useAgentWebSocket({ url: getWebSocketUrl() });
 
   return (
     <ThemeProvider theme={theme}>

cua2-front/src/services/api.ts

@@ -1,10 +1,10 @@
-import { config } from '@/config';
+import { getApiBaseUrl } from '@/config/api';
 
 /**
  * Fetch available models from the backend
  */
 export async function fetchAvailableModels(): Promise<string[]> {
-  const response = await fetch(`${config.apiBaseUrl}/models`);
+  const response = await fetch(`${getApiBaseUrl()}/models`);
   if (!response.ok) {
     throw new Error('Failed to fetch models');
   }
@@ -16,7 +16,7 @@ export async function fetchAvailableModels(): Promise<string[]> {
  * Generate a random instruction from the backend
  */
 export async function generateRandomQuestion(modelId: string): Promise<string> {
-  const response = await fetch(`${config.apiBaseUrl}/generate-instruction`, {
+  const response = await fetch(`${getApiBaseUrl()}/generate-instruction`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -40,7 +40,7 @@ export async function updateStepEvaluation(
   stepId: string,
   evaluation: 'like' | 'dislike' | 'neutral'
 ): Promise<void> {
-  const response = await fetch(`${config.apiBaseUrl}/traces/${traceId}/steps/${stepId}`, {
+  const response = await fetch(`${getApiBaseUrl()}/traces/${traceId}/steps/${stepId}`, {
     method: 'PATCH',
     headers: {
       'Content-Type': 'application/json',