Derive Vertex AI Project ID from Service Account JSON This commit refactors the Vertex AI integration to automatically derive the Project ID from the provided Service Account JSON. This simplifies the configuration process for users in "Full" (service account) authentication mode by removing the need to specify the Project ID separately.

75e3f599e6e808d7858176f382af2baabafa7b0c

InterestingDarkness <computeridiot999@gmail.com>

Parents: 9f698dd6e33622b925d11ca0577a793ec93f7f04

public/index.html+0 -6 Viewed

                                     </a>
                                 </h4>
-                                <!-- Project ID -->
-                                <div class="flex-container">
-                                    <label for="vertexai_project_id" data-i18n="Project ID">Project ID:</label>
-                                    <input id="vertexai_project_id" name="vertexai_project_id" class="text_pole flex1" value="" type="text" autocomplete="off" placeholder="your-gcp-project-id">
-                                </div>
                                 <!-- Region -->
                                 <div class="flex-container">
                                     <label for="vertexai_region" data-i18n="Region">Region:</label>

public/scripts/extensions/shared.js+1 -4 Viewed

@@ -180,13 +180,10 @@ function throwIfInvalidModel(useReverseProxy) {
180	throw new Error('Google Vertex AI API key is not set for Express mode.');	180	throw new Error('Google Vertex AI API key is not set for Express mode.');
181	}	181	}
182	} else if (authMode === 'full') {	182	} else if (authMode === 'full') {
183	// Full mode requires Service Account JSON and project settings	183	// Full mode requires Service Account JSON and region settings
184	if (!secret_state[SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT]) {	184	if (!secret_state[SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT]) {
185	throw new Error('Service Account JSON is required for Vertex AI Full mode. Please validate and save your Service Account JSON.');	185	throw new Error('Service Account JSON is required for Vertex AI Full mode. Please validate and save your Service Account JSON.');
186	}	186	}
187	if (!secret_state[SECRET_KEYS.VERTEXAI_PROJECT_ID]) {
188	throw new Error('Project ID is required for Vertex AI Full mode.');
189	}
190	if (!oai_settings.vertexai_region) {	187	if (!oai_settings.vertexai_region) {
191	throw new Error('Region is required for Vertex AI Full mode.');	188	throw new Error('Region is required for Vertex AI Full mode.');
192	}	189	}

public/scripts/openai.js+1 -15 Viewed

     $('#claude_use_sysprompt').prop('checked', oai_settings.claude_use_sysprompt);
     $('#use_makersuite_sysprompt').prop('checked', oai_settings.use_makersuite_sysprompt);
     $('#vertexai_auth_mode').val(oai_settings.vertexai_auth_mode);
-    // Don't display Project ID in input - it's stored in backend secrets
-    $('#vertexai_project_id').val('');
     $('#vertexai_region').val(oai_settings.vertexai_region);
     // Don't display Service Account JSON in textarea - it's stored in backend secrets
     $('#vertexai_service_account_json').val('');

+            }
         } else {
             // Full version - use service account
-            // Check if we have a saved project ID, otherwise use the input value
+            // Project ID will be extracted from the Service Account JSON
-            const savedProjectId = secret_state[SECRET_KEYS.VERTEXAI_PROJECT_ID];
-            const inputProjectId = String($('#vertexai_project_id').val()).trim();
-            if (!savedProjectId && !inputProjectId) {
-                toastr.error(t`Project ID is required for Vertex AI full version`);
-                return;
-            }
-            // Save project ID to secrets if we have an input value
-            if (inputProjectId.length) {
-                await writeSecret(SECRET_KEYS.VERTEXAI_PROJECT_ID, inputProjectId);
-            }
             // Check if service account JSON is saved in backend
             if (!secret_state[SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT]) {

public/scripts/secrets.js+0 -1 Viewed

     SERPER: 'api_key_serper',
     FALAI: 'api_key_falai',
     XAI: 'api_key_xai',
-    VERTEXAI_PROJECT_ID: 'vertexai_project_id',
     VERTEXAI_SERVICE_ACCOUNT: 'vertexai_service_account_json',
 };

src/endpoints/backends/chat-completions.js+14 -5 Viewed

     webTokenizers,
     getWebTokenizer,
 } from '../tokenizers.js';
-import { getVertexAIAuth } from '../google.js';
+import { getVertexAIAuth, getProjectIdFromServiceAccount } from '../google.js';
 const API_OPENAI = 'https://api.openai.com/v1';
 const API_CLAUDE = 'https://api.anthropic.com/v1';

                 url = `${apiUrl.toString().replace(/\/$/, '')}/v1/publishers/google/models/${model}:${responseType}?key=${keyParam}${stream ? '&alt=sse' : ''}`;
             } else if (authType === 'full') {
                 // For Full mode (service account authentication), use project-specific URL
-                // Only use project ID from secrets
+                // Get project ID from Service Account JSON
-                const projectId = readSecret(request.user.directories, SECRET_KEYS.VERTEXAI_PROJECT_ID);
+                const serviceAccountJson = readSecret(request.user.directories, SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT);
-                if (!projectId) {
+                if (!serviceAccountJson) {
-                    console.warn('Vertex AI project ID is missing.');
+                    console.warn('Vertex AI Service Account JSON is missing.');
+                    return response.status(400).send({ error: true });
+                }
+                let projectId;
+                try {
+                    const serviceAccount = JSON.parse(serviceAccountJson);
+                    projectId = getProjectIdFromServiceAccount(serviceAccount);
+                } catch (error) {
+                    console.error('Failed to extract project ID from Service Account JSON:', error);
                     return response.status(400).send({ error: true });
+                }
                 const region = request.body.vertexai_region || 'us-central1';

src/endpoints/google.js+32 -3 Viewed

     return data.access_token;
+}
+/**
+ * Extracts the project ID from a Service Account JSON object.
+ * @param {object} serviceAccount Service account JSON object
+ * @returns {string} Project ID
+ * @throws {Error} If project ID is not found in the service account
+ */
+export function getProjectIdFromServiceAccount(serviceAccount) {
+    if (!serviceAccount || typeof serviceAccount !== 'object') {
+        throw new Error('Invalid service account object');
+    }
+    const projectId = serviceAccount.project_id;
+    if (!projectId || typeof projectId !== 'string') {
+        throw new Error('Project ID not found in service account JSON');
+    }
+    return projectId;
+}
 export const router = express.Router();
 router.post('/caption-image', async (request, response) => {

                 url = `${apiUrl.origin}/v1/publishers/google/models/${model}:generateContent?key=${keyParam}`;
             } else if (authType === 'full') {
                 // Full mode: use project-specific URL with Authorization header
-                const projectId = readSecret(request.user.directories, SECRET_KEYS.VERTEXAI_PROJECT_ID);
+                // Get project ID from Service Account JSON
-                if (!projectId) {
+                const serviceAccountJson = readSecret(request.user.directories, SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT);
-                    console.warn('Vertex AI project ID is missing.');
+                if (!serviceAccountJson) {
+                    console.warn('Vertex AI Service Account JSON is missing.');
+                    return response.status(400).send({ error: true });
+                }
+                let projectId;
+                try {
+                    const serviceAccount = JSON.parse(serviceAccountJson);
+                    projectId = getProjectIdFromServiceAccount(serviceAccount);
+                } catch (error) {
+                    console.error('Failed to extract project ID from Service Account JSON:', error);
                     return response.status(400).send({ error: true });
+                }
                 const region = request.body.vertexai_region || 'us-central1';

src/endpoints/secrets.js+0 -1 Viewed

     DEEPSEEK: 'api_key_deepseek',
     SERPER: 'api_key_serper',
     XAI: 'api_key_xai',
-    VERTEXAI_PROJECT_ID: 'vertexai_project_id',
     VERTEXAI_SERVICE_ACCOUNT: 'vertexai_service_account_json',
 };