Merge branch 'main' into update/torch-291

Author: dadmobile

src/renderer/App.tsx

@@ -222,14 +222,22 @@ function AppContent({
 const INITIAL_LOGS_DRAWER_HEIGHT = 200; // Default height for logs drawer when first opened
 
 export default function App() {
-  // Normalize TL_API_URL - ensure it's either a valid URL or empty string
+  // Normalize TL_API_URL - ensure it's either a valid URL or default to same host as frontend
   const initialApiUrl = (() => {
     const envUrl = process.env?.TL_API_URL;
-    // If undefined, null, or the string "default", use empty string
+    // If undefined, null, or the string "default", use same host as frontend with API port
     if (!envUrl || envUrl === 'default' || envUrl.trim() === '') {
-      return '';
+      // Use the same protocol and hostname as the frontend, but with API port 8338
+      const protocol = window.location.protocol;
+      const hostname = window.location.hostname;
+      return `${protocol}//${hostname}:8338/`;
     }
-    return envUrl;
+    // Ensure the URL has a trailing slash
+    let url = envUrl.trim();
+    if (!url.endsWith('/')) {
+      url = url + '/';
+    }
+    return url;
   })();
 
   const [connection, setConnection] = useState(initialApiUrl);

src/renderer/components/Login/LoginPage.tsx

@@ -135,7 +135,7 @@ export default function LoginPage() {
           const envUrl = process.env.TL_API_URL;
           let apiUrl =
             !envUrl || envUrl === 'default' || envUrl.trim() === ''
-              ? 'http://localhost:8338'
+              ? `${window.location.protocol}//${window.location.hostname}:8338`
               : envUrl;
           apiUrl = apiUrl.replace(/\/$/, '');
           const url = `${apiUrl}/auth/verify`;

src/renderer/lib/api-client/functions.ts

@@ -89,7 +89,8 @@ export async function downloadModelFromGallery(
 export async function activeModels() {
   let response;
   try {
-    response = await authenticatedFetch(`${API_URL()}v1/models`);
+    // Pass just the path - fetchWithAuth will handle prepending the base URL
+    response = await authenticatedFetch('v1/models');
     // console.log('response ok?' + response.ok);
     const result = await response.json();
     return result;
@@ -104,7 +105,8 @@ export async function activeModels() {
 export async function apiHealthz() {
   let response;
   try {
-    response = await authenticatedFetch(`${API_URL()}healthz`);
+    // Pass just the path - fetchWithAuth will handle prepending the base URL
+    response = await authenticatedFetch('healthz');
     // console.log('response ok?' + response.ok);
     const result = await response.json();
     return result;
@@ -118,7 +120,8 @@ export async function controllerHealthz() {
   let response;
   try {
     // For now we hard code the worker to the default FastChat API port of 21002
-    response = await authenticatedFetch(API_URL() + 'v1/models', {
+    // Pass just the path - fetchWithAuth will handle prepending the base URL
+    response = await authenticatedFetch('v1/models', {
       method: 'GET',
     });
     if (response.ok) {
@@ -135,7 +138,8 @@ export async function controllerHealthz() {
 export async function localaiHealthz() {
   let response;
   try {
-    response = await authenticatedFetch(API_URL() + 'v1/models');
+    // Pass just the path - fetchWithAuth will handle prepending the base URL
+    response = await authenticatedFetch('v1/models');
     // console.log('response ok?' + response.ok);
     const result = await response.json();
     return result;
@@ -148,7 +152,8 @@ export async function localaiHealthz() {
 export async function getComputerInfo() {
   let response;
   try {
-    response = await authenticatedFetch(API_URL() + 'server/info');
+    // Pass just the path - fetchWithAuth will handle prepending the base URL
+    response = await authenticatedFetch('server/info');
     // console.log('response ok?' + response.ok);
     const result = await response.json();
     return result;
@@ -181,21 +186,9 @@ export async function activateWorker(
   const paramsJSON = JSON.stringify(parameters);
 
   try {
-    response = await authenticatedFetch(
-      API_URL() +
-        'server/worker_start?model_name=' +
-        model +
-        '&adaptor=' +
-        adaptorName +
-        '&model_architecture=' +
-        modelArchitecture +
-        '&engine=' +
-        engine +
-        '&experiment_id=' +
-        experimentId +
-        '&parameters=' +
-        paramsJSON,
-    );
+    // Pass just the path with query params - fetchWithAuth will handle prepending the base URL
+    const queryString = `server/worker_start?model_name=${model}&adaptor=${adaptorName}&model_architecture=${modelArchitecture}&engine=${engine}&experiment_id=${experimentId}&parameters=${paramsJSON}`;
+    response = await authenticatedFetch(queryString);
     const result = await response.json();
     return result;
   } catch (error) {
@@ -207,7 +200,8 @@ export async function activateWorker(
 export async function killWorker() {
   let response;
   try {
-    response = await authenticatedFetch(API_URL() + 'server/worker_stop');
+    // Pass just the path - fetchWithAuth will handle prepending the base URL
+    response = await authenticatedFetch('server/worker_stop');
     const result = await response.json();
     return result;
   } catch (error) {

src/renderer/lib/authContext.ts

@@ -215,7 +215,23 @@ export async function fetchWithAuth(url: string, options: RequestInit = {}) {
 
   // Handle cases where url might be partial or full
   // Ideally fetchWithAuth is passed a relative path, but we handle both.
-  const fullUrl = url.startsWith('http') ? url : `${API_URL()}${url}`;
+  let fullUrl: string;
+  if (url.startsWith('http')) {
+    fullUrl = url;
+  } else {
+    const baseUrl = API_URL();
+    if (baseUrl === null) {
+      // Default to same host as frontend with API port if API_URL is not set
+      // Ensure URL doesn't start with / (baseUrl already has trailing slash)
+      const cleanPath = url.startsWith('/') ? url.slice(1) : url;
+      const protocol = window.location.protocol;
+      const hostname = window.location.hostname;
+      fullUrl = `${protocol}//${hostname}:8338/${cleanPath}`;
+    } else {
+      // baseUrl already has trailing slash from API_URL()
+      fullUrl = `${baseUrl}${url}`;
+    }
+  }
 
   const headers: Record<string, string> = {
     ...((options.headers as Record<string, string>) || {}),