custom-request: Pass api-url for Z.AI and Vertex and fix if omitted in profile (#4859)

8ca836c3a15f7886e492c292c37a10acef2dc3cf

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
Parents: 090c8ec56062f85ad098208689c3b7ffdfc2d5d0
2 files changed, +8 -0Showing whitespace changes
public/scripts/custom-request.js+6 -0
@@ -590,6 +590,12 @@ export class ChatCompletionService {
590 settings[settingToUpdate[1]] = value;590 settings[settingToUpdate[1]] = value;
591 }591 }
592592
593 // Ensure api-url is properly applied for all sources that accept it
594 ['custom_url', 'vertexai_region', 'zai_endpoint'].forEach(field => {
595 // The order is: connection profile => CC preset => CC settings
596 overridePayload[field] = overridePayload[field] || settings[field] || oai_settings[field];
597 });
598
593 // Convert from settings to generation payload599 // Convert from settings to generation payload
594 const data = await createGenerationParameters(settings, overridePayload.model, 'quiet', overridePayload.messages);600 const data = await createGenerationParameters(settings, overridePayload.model, 'quiet', overridePayload.messages);
595 const payload = data.generate_data;601 const payload = data.generate_data;
public/scripts/extensions/shared.js+2 -0
@@ -417,6 +417,8 @@ export class ConnectionManagerRequestService {
417 model: profile.model,417 model: profile.model,
418 chat_completion_source: selectedApiMap.source,418 chat_completion_source: selectedApiMap.source,
419 custom_url: profile['api-url'],419 custom_url: profile['api-url'],
420 vertexai_region: profile['api-url'],
421 zai_endpoint: profile['api-url'],
420 reverse_proxy: proxyPreset?.url,422 reverse_proxy: proxyPreset?.url,
421 proxy_password: proxyPreset?.password,423 proxy_password: proxyPreset?.password,
422 custom_prompt_post_processing: profile['prompt-post-processing'],424 custom_prompt_post_processing: profile['prompt-post-processing'],