358bbf86 · permissionBRICK/SillyTavern

src/endpoints/backends/chat-completions.js+4 -3 Viewed

     mergeObjectWithYaml,
     excludeKeysByYaml,
     color,
+    trimTrailingSlash,
 } from '../../util.js';
 import {
     convertClaudeMessages,

         headers = {};
     } else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.MAKERSUITE) {
         apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.MAKERSUITE);
-        apiUrl = new URL(request.body.reverse_proxy || API_MAKERSUITE);
+        apiUrl = trimTrailingSlash(request.body.reverse_proxy || API_MAKERSUITE);
         const apiVersion = getConfigValue('gemini.apiVersion', 'v1beta');
         const modelsUrl = !apiKey && request.body.reverse_proxy
-            ? `${apiUrl.origin}/${apiVersion}/models`
+            ? `${apiUrl}/${apiVersion}/models`
-            : `${apiUrl.origin}/${apiVersion}/models?key=${apiKey}`;
+            : `${apiUrl}/${apiVersion}/models?key=${apiKey}`;
         if (!apiKey && !request.body.reverse_proxy) {
             console.warn('Google AI Studio API key is missing.');

src/endpoints/google.js+7 -6 Viewed

 import { readSecret, SECRET_KEYS } from './secrets.js';
 import { GEMINI_SAFETY } from '../constants.js';
+import { trimTrailingSlash } from '../util.js';
 const API_MAKERSUITE = 'https://generativelanguage.googleapis.com';
 const API_VERTEX_AI = 'https://us-central1-aiplatform.googleapis.com';

             if (authType === 'express') {
                 // Express mode: use API key parameter
                 const keyParam = authHeader.replace('Bearer ', '');
-                const apiUrl = new URL(request.body.reverse_proxy || API_VERTEX_AI);
+                const apiUrl = trimTrailingSlash(request.body.reverse_proxy || API_VERTEX_AI);
-                url = `${apiUrl.origin}/v1/publishers/google/models/${model}:generateContent?key=${keyParam}`;
+                url = `${apiUrl}/v1/publishers/google/models/${model}:generateContent?key=${keyParam}`;
             } else if (authType === 'full') {
                 // Full mode: use project-specific URL with Authorization header
                 // Get project ID from Service Account JSON

                 headers['Authorization'] = authHeader;
             } else {
                 // Proxy mode: use Authorization header
-                const apiUrl = new URL(request.body.reverse_proxy || API_VERTEX_AI);
+                const apiUrl = trimTrailingSlash(request.body.reverse_proxy || API_VERTEX_AI);
-                url = `${apiUrl.origin}/v1/publishers/google/models/${model}:generateContent`;
+                url = `${apiUrl}/v1/publishers/google/models/${model}:generateContent`;
                 headers['Authorization'] = authHeader;
+            }
         } else {
             // Google AI Studio
             const apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.MAKERSUITE);
-            const apiUrl = new URL(request.body.reverse_proxy || API_MAKERSUITE);
+            const apiUrl = trimTrailingSlash(request.body.reverse_proxy || API_MAKERSUITE);
-            url = `${apiUrl.origin}/v1beta/models/${model}:generateContent?key=${apiKey}`;
+            url = `${apiUrl}/v1beta/models/${model}:generateContent?key=${apiKey}`;
+        }
         const body = {
             contents: [{

src/util.js+9 -0 Viewed

+}
 /**
+ * Removes trailing slash from a string.
+ * @param {string} str Input string
+ * @returns {string} String with trailing slash removed
+ */
+export function trimTrailingSlash(str) {
+    return String(str ?? '').replace(/\/$/, '');
+}
+/**
  * Simple TTL memory cache.
  */
 export class Cache {

src/vectors/makersuite-vectors.js+3 -2 Viewed

 import fetch from 'node-fetch';
 import { SECRET_KEYS, readSecret } from '../endpoints/secrets.js';
+import { trimTrailingSlash } from '../util.js';
 const API_MAKERSUITE = 'https://generativelanguage.googleapis.com';
 /**

         throw new Error('No Google AI Studio key found');
+    }
-    const apiUrl = new URL(API_MAKERSUITE);
+    const apiUrl = trimTrailingSlash(API_MAKERSUITE);
     const model = 'text-embedding-004';
-    const url = `${apiUrl.origin}/v1beta/models/${model}:embedContent?key=${key}`;
+    const url = `${apiUrl}/v1beta/models/${model}:embedContent?key=${key}`;
     const body = {
         content: {
             parts: [

Replace url.origin with trimTrailingSlash (#4118) * Replace url.origin with trimV1 * Replace url.origin with trimTrailingSlash