diff --git a/src-tauri/src/core/server.rs b/src-tauri/src/core/server.rs index 734d4aa3a..5f7bf73cc 100644 --- a/src-tauri/src/core/server.rs +++ b/src-tauri/src/core/server.rs @@ -348,7 +348,7 @@ async fn proxy_request( let sessions_guard = sessions.lock().await; if sessions_guard.is_empty() { - log::warn!("Request for model '{}' but no backend servers are running.", model_id); + log::warn!("Request for model '{}' but no models are running.", model_id); let mut error_response = Response::builder().status(StatusCode::SERVICE_UNAVAILABLE); error_response = add_cors_headers_with_host_and_origin( error_response, @@ -356,7 +356,7 @@ async fn proxy_request( &origin_header, &config.trusted_hosts, ); - return Ok(error_response.body(Body::from("No backend model servers are available")).unwrap()); + return Ok(error_response.body(Body::from("No models are available")).unwrap()); } if let Some(session) = sessions_guard @@ -366,9 +366,8 @@ async fn proxy_request( target_port = Some(session.info.port); session_api_key = Some(session.info.api_key.clone()); log::debug!( - "Found session for model_id {} on port {}", + "Found session for model_id {}", model_id, - session.info.port ); } else { log::warn!("No running session found for model_id: {}", model_id); @@ -382,7 +381,7 @@ async fn proxy_request( ); return Ok(error_response .body(Body::from(format!( - "No running server found for model '{}'", + "No running session found for model '{}'", model_id ))) .unwrap()); @@ -457,7 +456,7 @@ async fn proxy_request( &origin_header, &config.trusted_hosts, ); - + return Ok(response_builder.body(Body::from(body_str)).unwrap()); } _ => { @@ -494,7 +493,7 @@ async fn proxy_request( let port = match target_port { Some(p) => p, None => { - log::error!("Internal routing error: target_port is None after successful lookup"); + log::error!("Internal API server routing error: target is None after successful lookup"); let mut error_response = Response::builder().status(StatusCode::INTERNAL_SERVER_ERROR); error_response = add_cors_headers_with_host_and_origin( error_response, @@ -509,7 +508,6 @@ async fn proxy_request( }; let upstream_url = format!("http://127.0.0.1:{}{}", port, destination_path); - log::debug!("Proxying request to: {}", upstream_url); let mut outbound_req = client.request(method.clone(), &upstream_url); @@ -587,7 +585,7 @@ async fn proxy_request( Ok(builder.body(body).unwrap()) } Err(e) => { - let error_msg = format!("Proxy request to {} failed: {}", upstream_url, e); + let error_msg = format!("Proxy request to model failed: {}", e); log::error!("{}", error_msg); let mut error_response = Response::builder().status(StatusCode::BAD_GATEWAY); error_response = add_cors_headers_with_host_and_origin( @@ -726,7 +724,7 @@ pub async fn start_server( }); let server = Server::bind(&addr).serve(make_svc); - log::info!("Proxy server started on http://{}", addr); + log::info!("Jan API server started on http://{}", addr); let server_task = tokio::spawn(async move { if let Err(e) = server.await { @@ -748,9 +746,9 @@ pub async fn stop_server( if let Some(handle) = handle_guard.take() { handle.abort(); *handle_guard = None; - log::info!("Proxy server stopped"); + log::info!("Jan API server stopped"); } else { - log::debug!("No server was running"); + log::debug!("Server was not running"); } Ok(()) diff --git a/web-app/src/constants/localStorage.ts b/web-app/src/constants/localStorage.ts index cef01b0fd..bd5e82ca2 100644 --- a/web-app/src/constants/localStorage.ts +++ b/web-app/src/constants/localStorage.ts @@ -19,4 +19,5 @@ export const localStorageKey = { mcpGlobalPermissions: 'mcp-global-permissions', lastUsedModel: 'last-used-model', lastUsedAssistant: 'last-used-assistant', + setupCompleted: 'setup-completed', } diff --git a/web-app/src/containers/SetupScreen.tsx b/web-app/src/containers/SetupScreen.tsx index 4144e4e0a..e9867b38a 100644 --- a/web-app/src/containers/SetupScreen.tsx +++ b/web-app/src/containers/SetupScreen.tsx @@ -5,6 +5,7 @@ import { route } from '@/constants/routes' import HeaderPage from './HeaderPage' import { isProd } from '@/lib/version' import { useTranslation } from '@/i18n/react-i18next-compat' +import { localStorageKey } from '@/constants/localStorage' function SetupScreen() { const { t } = useTranslation() @@ -12,6 +13,10 @@ function SetupScreen() { const firstItemRemoteProvider = providers.length > 0 ? providers[1].provider : 'openai' + // Check if setup tour has been completed + const isSetupCompleted = + localStorage.getItem(localStorageKey.setupCompleted) === 'true' + return (
@@ -50,7 +55,9 @@ function SetupScreen() { providerName: firstItemRemoteProvider, }} search={{ - step: 'setup_remote_provider', + ...(!isSetupCompleted + ? { step: 'setup_remote_provider' } + : {}), }} >

diff --git a/web-app/src/routes/settings/providers/$providerName.tsx b/web-app/src/routes/settings/providers/$providerName.tsx index 326500273..f8e6b57c8 100644 --- a/web-app/src/routes/settings/providers/$providerName.tsx +++ b/web-app/src/routes/settings/providers/$providerName.tsx @@ -15,7 +15,6 @@ import { import { createFileRoute, Link, - useNavigate, useParams, useSearch, } from '@tanstack/react-router' @@ -32,6 +31,7 @@ import { CustomTooltipJoyRide } from '@/containers/CustomeTooltipJoyRide' import { route } from '@/constants/routes' import DeleteProvider from '@/containers/dialogs/DeleteProvider' import { updateSettings, fetchModelsFromProvider } from '@/services/providers' +import { localStorageKey } from '@/constants/localStorage' import { Button } from '@/components/ui/button' import { IconFolderPlus, IconLoader, IconRefresh } from '@tabler/icons-react' import { getProviders } from '@/services/providers' @@ -83,7 +83,6 @@ function ProviderDetail() { const { getProviderByName, setProviders, updateProvider } = useModelProvider() const provider = getProviderByName(providerName) const isSetup = step === 'setup_remote_provider' - const navigate = useNavigate() // Check if llamacpp provider needs backend configuration const needsBackendConfig = @@ -137,9 +136,7 @@ function ProviderDetail() { const { status } = data if (status === STATUS.FINISHED) { - navigate({ - to: route.home, - }) + localStorage.setItem(localStorageKey.setupCompleted, 'true') } }