这是indexloc提供的服务，不要输入任何密码
Skip to content

Make native embedder the fallback for all LLMs #1427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2024
Merged

Make native embedder the fallback for all LLMs #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions server/utils/AiProviders/anthropic/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const {
writeResponseChunk,
clientAbortedHandler,
} = require("../../helpers/chat/responses");
const { NativeEmbedder } = require("../../EmbeddingEngines/native");

class AnthropicLLM {
constructor(embedder = null, modelPreference = null) {
Expand All @@ -23,11 +24,7 @@ class AnthropicLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
throw new Error(
"INVALID ANTHROPIC SETUP. No embedding engine has been set. Go to instance settings and set up an embedding interface to use Anthropic as your LLM."
);
this.embedder = embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
}

Expand Down
8 changes: 2 additions & 6 deletions server/utils/AiProviders/azureOpenAi/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { AzureOpenAiEmbedder } = require("../../EmbeddingEngines/azureOpenAi");
const { NativeEmbedder } = require("../../EmbeddingEngines/native");
const {
writeResponseChunk,
clientAbortedHandler,
Expand All @@ -23,11 +23,7 @@ class AzureOpenAiLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
console.warn(
"No embedding provider defined for AzureOpenAiLLM - falling back to AzureOpenAiEmbedder for embedding!"
);
this.embedder = !embedder ? new AzureOpenAiEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
}

Expand Down
3 changes: 2 additions & 1 deletion server/utils/AiProviders/cohere/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ class CohereLLM {
system: this.promptWindowLimit() * 0.15,
user: this.promptWindowLimit() * 0.7,
};
this.embedder = !!embedder ? embedder : new NativeEmbedder();

this.embedder = embedder ?? new NativeEmbedder();
}

#appendContext(contextTexts = []) {
Expand Down
7 changes: 2 additions & 5 deletions server/utils/AiProviders/gemini/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { NativeEmbedder } = require("../../EmbeddingEngines/native");
const {
writeResponseChunk,
clientAbortedHandler,
Expand Down Expand Up @@ -26,11 +27,7 @@ class GeminiLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
throw new Error(
"INVALID GEMINI LLM SETUP. No embedding engine has been set. Go to instance settings and set up an embedding interface to use Gemini as your LLM."
);
this.embedder = embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7; // not used for Gemini
}

Expand Down
6 changes: 1 addition & 5 deletions server/utils/AiProviders/genericOpenAi/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ class GenericOpenAiLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
console.warn(
"No embedding provider defined for GenericOpenAiLLM - falling back to NativeEmbedder for embedding!"
);
this.embedder = !embedder ? new NativeEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
this.log(`Inference API: ${this.basePath} Model: ${this.model}`);
}
Expand Down
2 changes: 1 addition & 1 deletion server/utils/AiProviders/groq/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class GroqLLM {
user: this.promptWindowLimit() * 0.7,
};

this.embedder = !embedder ? new NativeEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
}

Expand Down
7 changes: 1 addition & 6 deletions server/utils/AiProviders/huggingface/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const { NativeEmbedder } = require("../../EmbeddingEngines/native");
const { OpenAiEmbedder } = require("../../EmbeddingEngines/openAi");
const {
handleDefaultStreamResponseV2,
} = require("../../helpers/chat/responses");
Expand All @@ -26,11 +25,7 @@ class HuggingFaceLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
console.warn(
"No embedding provider defined for HuggingFaceLLM - falling back to Native for embedding!"
);
this.embedder = !embedder ? new OpenAiEmbedder() : new NativeEmbedder();
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.2;
}

Expand Down
6 changes: 1 addition & 5 deletions server/utils/AiProviders/koboldCPP/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ class KoboldCPPLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
console.warn(
"No embedding provider defined for KoboldCPPLLM - falling back to NativeEmbedder for embedding!"
);
this.embedder = !embedder ? new NativeEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
this.log(`Inference API: ${this.basePath} Model: ${this.model}`);
}
Expand Down
6 changes: 1 addition & 5 deletions server/utils/AiProviders/liteLLM/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ class LiteLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
console.warn(
"No embedding provider defined for LiteLLM - falling back to NativeEmbedder for embedding!"
);
this.embedder = !embedder ? new NativeEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
this.log(`Inference API: ${this.basePath} Model: ${this.model}`);
}
Expand Down
7 changes: 2 additions & 5 deletions server/utils/AiProviders/lmStudio/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { NativeEmbedder } = require("../../EmbeddingEngines/native");
const {
handleDefaultStreamResponseV2,
} = require("../../helpers/chat/responses");
Expand Down Expand Up @@ -27,11 +28,7 @@ class LMStudioLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
throw new Error(
"INVALID LM STUDIO SETUP. No embedding engine has been set. Go to instance settings and set up an embedding interface to use LMStudio as your LLM."
);
this.embedder = embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
}

Expand Down
7 changes: 2 additions & 5 deletions server/utils/AiProviders/localAi/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { NativeEmbedder } = require("../../EmbeddingEngines/native");
const {
handleDefaultStreamResponseV2,
} = require("../../helpers/chat/responses");
Expand All @@ -19,11 +20,7 @@ class LocalAiLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
throw new Error(
"INVALID LOCAL AI SETUP. No embedding engine has been set. Go to instance settings and set up an embedding interface to use LocalAI as your LLM."
);
this.embedder = embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
}

Expand Down
7 changes: 2 additions & 5 deletions server/utils/AiProviders/mistral/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { NativeEmbedder } = require("../../EmbeddingEngines/native");
const {
handleDefaultStreamResponseV2,
} = require("../../helpers/chat/responses");
Expand All @@ -20,11 +21,7 @@ class MistralLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
console.warn(
"No embedding provider defined for MistralLLM - falling back to OpenAiEmbedder for embedding!"
);
this.embedder = embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.0;
}

Expand Down
2 changes: 1 addition & 1 deletion server/utils/AiProviders/native/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class NativeLLM {
system: this.promptWindowLimit() * 0.15,
user: this.promptWindowLimit() * 0.7,
};
this.embedder = embedder || new NativeEmbedder();
this.embedder = embedder ?? new NativeEmbedder();
this.cacheDir = path.resolve(
process.env.STORAGE_DIR
? path.resolve(process.env.STORAGE_DIR, "models", "downloaded")
Expand Down
7 changes: 2 additions & 5 deletions server/utils/AiProviders/ollama/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const {
writeResponseChunk,
clientAbortedHandler,
} = require("../../helpers/chat/responses");
const { NativeEmbedder } = require("../../EmbeddingEngines/native");

// Docs: https://github.com/jmorganca/ollama/blob/main/docs/api.md
class OllamaAILLM {
Expand All @@ -18,11 +19,7 @@ class OllamaAILLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
throw new Error(
"INVALID OLLAMA SETUP. No embedding engine has been set. Go to instance settings and set up an embedding interface to use Ollama as your LLM."
);
this.embedder = embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
}

Expand Down
8 changes: 2 additions & 6 deletions server/utils/AiProviders/openAi/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { OpenAiEmbedder } = require("../../EmbeddingEngines/openAi");
const { NativeEmbedder } = require("../../EmbeddingEngines/native");
const {
handleDefaultStreamResponseV2,
} = require("../../helpers/chat/responses");
Expand All @@ -18,11 +18,7 @@ class OpenAiLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
console.warn(
"No embedding provider defined for OpenAiLLM - falling back to OpenAiEmbedder for embedding!"
);
this.embedder = !embedder ? new OpenAiEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
}

Expand Down
2 changes: 1 addition & 1 deletion server/utils/AiProviders/openRouter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class OpenRouterLLM {
user: this.promptWindowLimit() * 0.7,
};

this.embedder = !embedder ? new NativeEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;

if (!fs.existsSync(cacheFolder))
Expand Down
2 changes: 1 addition & 1 deletion server/utils/AiProviders/perplexity/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class PerplexityLLM {
user: this.promptWindowLimit() * 0.7,
};

this.embedder = !embedder ? new NativeEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
}

Expand Down
2 changes: 1 addition & 1 deletion server/utils/AiProviders/textGenWebUI/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class TextGenWebUILLM {
user: this.promptWindowLimit() * 0.7,
};

this.embedder = !embedder ? new NativeEmbedder() : embedder;
this.embedder = embedder ?? new NativeEmbedder();
this.defaultTemp = 0.7;
this.log(`Inference API: ${this.basePath} Model: ${this.model}`);
}
Expand Down
7 changes: 2 additions & 5 deletions server/utils/AiProviders/togetherAi/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { NativeEmbedder } = require("../../EmbeddingEngines/native");
const {
handleDefaultStreamResponseV2,
} = require("../../helpers/chat/responses");
Expand All @@ -23,11 +24,7 @@ class TogetherAiLLM {
user: this.promptWindowLimit() * 0.7,
};

if (!embedder)
throw new Error(
"INVALID TOGETHER AI SETUP. No embedding engine has been set. Go to instance settings and set up an embedding interface to use Together AI as your LLM."
);
this.embedder = embedder;
this.embedder = !embedder ? new NativeEmbedder() : embedder;
this.defaultTemp = 0.7;
}

Expand Down