@retrivora-ai/rag-engine 2.1.1 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrivora-ai/rag-engine",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Retrivora AI is a plug-and-play AI engine for RAG chat experiences — generic vector DB + LLM provider, embeddable or standalone.",
   "author": "Abhinav Alkuchi",
   "license": "UNLICENSED",

package/src/config/serverConfig.ts

@@ -171,20 +171,20 @@ export function getEnvConfig(env: Record<string, string | undefined> = process.e
     }
   })();
 
-  const DEFAULT_FREE_GATEWAY = 'https://llm.retrivora.com/api/v1';
+  const defaultGatewayUrl = readString(env, 'LITELLM_BASE_URL') ?? readString(env, 'LLM_BASE_URL') ?? 'https://llm.retrivora.com/api/v1';
 
   const defaultLlmProvider = isFreeTier ? 'universal_rest' : 'universal_rest';
   const llmProvider = (readEnum(env, 'LLM_PROVIDER', defaultLlmProvider, LLM_PROVIDERS) ?? base?.llm?.provider ?? defaultLlmProvider) as LLMProvider;
-  const llmBaseUrl = readString(env, 'LLM_BASE_URL') ?? base?.llm?.baseUrl ?? DEFAULT_FREE_GATEWAY;
+  const llmBaseUrl = readString(env, 'LITELLM_BASE_URL') ?? readString(env, 'LLM_BASE_URL') ?? base?.llm?.baseUrl ?? defaultGatewayUrl;
   const llmModel = readString(env, 'LLM_MODEL') ?? base?.llm?.model ?? (isFreeTier ? 'llama-3.1-8b-instant' : (DEFAULT_MODEL_BY_PROVIDER[llmProvider] ?? 'gpt-4o'));
-  const llmApiKey = llmApiKeyByProvider[llmProvider] ?? readString(env, 'LLM_API_KEY') ?? base?.llm?.apiKey ?? 'sk-retrivora-cancer-280590';
+  const llmApiKey = llmApiKeyByProvider[llmProvider] ?? readString(env, 'LLM_API_KEY') ?? readString(env, 'LITELLM_MASTER_KEY') ?? readString(env, 'LITELLM_API_KEY') ?? base?.llm?.apiKey ?? licenseKey;
   const llmProfile = readString(env, 'LLM_UNIVERSAL_PROFILE') ?? (base?.llm?.options?.profile as string) ?? 'litellm';
 
   const defaultEmbeddingProvider = isFreeTier ? 'universal_rest' : 'universal_rest';
   const embeddingProvider = (readEnum(env, 'EMBEDDING_PROVIDER', defaultEmbeddingProvider, EMBEDDING_PROVIDERS) ?? base?.embedding?.provider ?? defaultEmbeddingProvider) as EmbeddingProvider;
-  const embeddingBaseUrl = readString(env, 'EMBEDDING_BASE_URL') ?? base?.embedding?.baseUrl ?? DEFAULT_FREE_GATEWAY;
+  const embeddingBaseUrl = readString(env, 'LITELLM_BASE_URL') ?? readString(env, 'EMBEDDING_BASE_URL') ?? readString(env, 'LLM_BASE_URL') ?? base?.embedding?.baseUrl ?? defaultGatewayUrl;
   const embeddingModel = readString(env, 'EMBEDDING_MODEL') ?? base?.embedding?.model ?? 'text-embedding-004';
-  const embeddingApiKey = embeddingApiKeyByProvider[embeddingProvider] ?? readString(env, 'EMBEDDING_API_KEY') ?? readString(env, 'LLM_API_KEY') ?? base?.embedding?.apiKey ?? 'sk-retrivora-cancer-280590';
+  const embeddingApiKey = embeddingApiKeyByProvider[embeddingProvider] ?? readString(env, 'EMBEDDING_API_KEY') ?? readString(env, 'LLM_API_KEY') ?? readString(env, 'LITELLM_MASTER_KEY') ?? readString(env, 'LITELLM_API_KEY') ?? base?.embedding?.apiKey ?? licenseKey;
   const embeddingProfile = readString(env, 'EMBEDDING_UNIVERSAL_PROFILE') ?? (base?.embedding?.options?.profile as string) ?? 'litellm';
 
   return {

package/src/llm/providers/UniversalLLMAdapter.ts

@@ -112,8 +112,17 @@ export class UniversalLLMAdapter implements ILLMProvider {
       };
     }
 
-    const isSelfHost = this.baseUrl.includes('retrivora.com') || this.baseUrl.includes('localhost');
-    if (isSelfHost || Boolean(process.env.VERCEL)) {
+    // Try direct HTTP POST request to llm.retrivora.com first
+    try {
+      const { data } = await this.http.post(path, payload);
+      const extractPath = this.opts.responseExtractPath ?? 'choices[0].message.content';
+      const result = resolvePath(data, extractPath) ?? extractContent(data);
+      if (result !== undefined) {
+        return String(result);
+      }
+    } catch (httpErr: any) {
+      console.warn(`[UniversalLLMAdapter] Direct HTTP POST to ${this.baseUrl}${path} failed (${httpErr.message}). Attempting in-process gateway dispatch fallback...`);
+      
       const _g = globalThis as any;
       let dispatch = _g.__retrivoraDispatchChat;
       if (typeof dispatch !== 'function') {
@@ -128,25 +137,19 @@ export class UniversalLLMAdapter implements ILLMProvider {
       }
 
       if (typeof dispatch === 'function') {
-        try {
-          const res = await dispatch({
-            model: this.model,
-            messages: formattedMessages as any,
-            max_tokens: this.maxTokens,
-            temperature: this.temperature,
-          }, this.apiKey);
-
-          const content = extractContent(res?.response);
-          if (content !== undefined) {
-            return content;
-          }
-          throw new Error(`[UniversalLLMAdapter] In-process dispatch returned empty content for model: ${this.model}`);
-        } catch (dispatchErr) {
-          throw dispatchErr;
+        const res = await dispatch({
+          model: this.model,
+          messages: formattedMessages as any,
+          max_tokens: this.maxTokens,
+          temperature: this.temperature,
+        }, this.apiKey);
+
+        const content = extractContent(res?.response);
+        if (content !== undefined) {
+          return content;
         }
-      } else {
-        throw new Error(`[UniversalLLMAdapter] In-process gateway dispatch not registered. Direct self-referential HTTP calls to ${this.baseUrl} are disabled on Vercel to prevent HTTP 508 Loop Detected.`);
       }
+      throw httpErr;
     }
 
     const { data } = await this.http.post(path, payload);
@@ -328,8 +331,17 @@ export class UniversalLLMAdapter implements ILLMProvider {
       };
     }
 
-    const isSelfHost = this.baseUrl.includes('retrivora.com') || this.baseUrl.includes('localhost');
-    if (isSelfHost || Boolean(process.env.VERCEL)) {
+    // Try direct HTTP POST request to llm.retrivora.com first
+    try {
+      const { data } = await this.http.post(path, payload);
+      const extractPath = this.opts.embedExtractPath ?? 'data[0].embedding';
+      const vector = resolvePath(data, extractPath);
+      if (Array.isArray(vector)) {
+        return vector as number[];
+      }
+    } catch (httpErr: any) {
+      console.warn(`[UniversalLLMAdapter] Direct HTTP embedding POST to ${this.baseUrl}${path} failed (${httpErr.message}). Attempting in-process gateway dispatch fallback...`);
+
       const _g = globalThis as any;
       let dispatch = _g.__retrivoraDispatchEmbedding;
       if (typeof dispatch !== 'function') {
@@ -344,22 +356,16 @@ export class UniversalLLMAdapter implements ILLMProvider {
       }
 
       if (typeof dispatch === 'function') {
-        try {
-          const res = await dispatch({
-            model: this.model,
-            input: text,
-          }, this.apiKey);
+        const res = await dispatch({
+          model: this.model,
+          input: text,
+        }, this.apiKey);
 
-          if (res?.data?.[0]?.embedding) {
-            return res.data[0].embedding;
-          }
-          throw new Error(`[UniversalLLMAdapter] In-process embedding dispatch returned invalid vector for model: ${this.model}`);
-        } catch (dispatchErr) {
-          throw dispatchErr;
+        if (res?.data?.[0]?.embedding) {
+          return res.data[0].embedding;
         }
-      } else {
-        throw new Error(`[UniversalLLMAdapter] In-process gateway dispatch not registered. Direct self-referential HTTP calls to ${this.baseUrl} are disabled on Vercel to prevent HTTP 508 Loop Detected.`);
       }
+      throw httpErr;
     }
 
     const { data } = await this.http.post(path, payload);