Fix url building when using a provider (#1187)

Author: sceuick

common/providers.ts

@@ -201,6 +201,9 @@ export function getPresetConnection(
   if (provider) {
     const conn = getProviderConnection(provider)
 
+    // We always disable this feature when using a provider
+    copy.thirdPartyUrlNoSuffix = false
+
     if (conn.service) {
       copy.service = conn.service
       copy.thirdPartyFormat = undefined

common/requests/util.ts

@@ -166,7 +166,9 @@ export function getOaiCompatibleUrl(
   isThirdParty?: boolean
 ) {
   if (isThirdParty && preset.thirdPartyUrl) {
-    if (preset.thirdPartyUrlNoSuffix) return { url: preset.thirdPartyUrl, changed: true }
+    if (!preset.providerId && preset.thirdPartyUrlNoSuffix) {
+      return { url: preset.thirdPartyUrl, changed: true }
+    }
 
     // If the user provides a versioned API URL for their third-party API, use that. Otherwise
     // fall back to the standard /v1 URL.

srv/adapter/kobold.ts

@@ -151,11 +151,12 @@ async function dispatch(opts: AdapterProps, body: any) {
     case 'llamacpp':
     case 'vllm': {
       body.messages = opts.imageData ? opts.messages : undefined
-      const url = opts.gen.thirdPartyUrlNoSuffix
-        ? baseURL
-        : body.messages
-        ? `${baseURL}/v1/chat/completions`
-        : `${baseURL}/v1/completions`
+      const url =
+        !opts.gen.providerId && opts.gen.thirdPartyUrlNoSuffix
+          ? baseURL
+          : body.messages
+          ? `${baseURL}/v1/chat/completions`
+          : `${baseURL}/v1/completions`
       return opts.gen.streamResponse
         ? streamGenerator({ ...base, url, format: opts.gen.thirdPartyFormat })
         : fullCompletion({ ...base, url, service: opts.gen.thirdPartyFormat })
@@ -229,12 +230,13 @@ async function dispatch(opts: AdapterProps, body: any) {
         body.messages = opts.messages
       }
       const url = getOaiCompatibleUrl(opts.gen, true)
-      const fullUrl = opts.gen.thirdPartyUrlNoSuffix
-        ? url.url
-        : joinUrl(
-            url.url,
-            opts.gen.thirdPartyFormat === 'openai' ? 'completions' : 'chat/completions'
-          )
+      const fullUrl =
+        !opts.gen.providerId && opts.gen.thirdPartyUrlNoSuffix
+          ? url.url
+          : joinUrl(
+              url.url,
+              opts.gen.thirdPartyFormat === 'openai' ? 'completions' : 'chat/completions'
+            )
 
       return opts.gen.streamResponse
         ? streamGenerator({ ...base, url: fullUrl, format: opts.gen.thirdPartyFormat })

srv/adapter/openai.ts

@@ -170,11 +170,12 @@ export const handleOAI: ModelAdapter = async function* (opts) {
     log.debug(body, 'OpenAI payload')
   }
 
-  const url = gen.thirdPartyUrlNoSuffix
-    ? base.url
-    : useChat
-    ? joinUrl(base.url, 'chat/completions')
-    : joinUrl(base.url, 'completions')
+  const url =
+    !gen.providerId && !!gen.thirdPartyUrlNoSuffix
+      ? base.url
+      : useChat
+      ? joinUrl(base.url, 'chat/completions')
+      : joinUrl(base.url, 'completions')
 
   if (opts.conn.provider?.provider === 'known-mistral' && body.messages) {
     const merged = ensureMessagesAlternate(body.messages, { userFirst: true, userLast: true })

srv/db/util.ts

@@ -7,6 +7,7 @@ import { defaultChars } from '../../common/characters'
 const ALGO = 'aes-192-cbc'
 const KEY = crypto.scryptSync(config.jwtSecret, 'salt', 24)
 const KEY_LB = crypto.scryptSync(`${config.jwtSecret}\n`, 'salt', 24)
+// const KEY_TRIM = crypto.scryptSync(`${config.jwtSecret}\\n`, 'salt', 24)
 
 export function now() {
   return new Date().toISOString()
@@ -41,6 +42,11 @@ export function decryptText(text: string, noError?: boolean) {
     throw new Error('IV not found')
   }
 
+  // try {
+  //   const decipher = crypto.createDecipheriv(ALGO, KEY_TRIM as any, Buffer.from(iv, 'hex') as any)
+  //   return decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8')
+  // } catch (ex) {}
+
   try {
     const decipher = crypto.createDecipheriv(ALGO, KEY as any, Buffer.from(iv, 'hex') as any)
     return decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8')