Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
65f42bbf43 | ||
|
|
2b8e4ea059 | ||
|
|
a5dab4279b | ||
|
|
08e9cc476c |
@@ -12,7 +12,11 @@ export class LMStudioEmbedder implements Embedder {
|
|||||||
private model: string;
|
private model: string;
|
||||||
|
|
||||||
constructor(config: EmbeddingConfig) {
|
constructor(config: EmbeddingConfig) {
|
||||||
const baseURL = config.baseURL ?? config.url ?? DEFAULT_BASE_URL;
|
const baseURL =
|
||||||
|
config.baseURL ??
|
||||||
|
config.url ??
|
||||||
|
process.env.LMSTUDIO_BASE_URL ??
|
||||||
|
DEFAULT_BASE_URL;
|
||||||
const apiKey = config.apiKey || DEFAULT_LMSTUDIO_API_KEY;
|
const apiKey = config.apiKey || DEFAULT_LMSTUDIO_API_KEY;
|
||||||
this.openai = new OpenAI({ apiKey, baseURL: String(baseURL) });
|
this.openai = new OpenAI({ apiKey, baseURL: String(baseURL) });
|
||||||
this.model = config.model || DEFAULT_MODEL;
|
this.model = config.model || DEFAULT_MODEL;
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ export class LMStudioLLM extends OpenAILLM {
|
|||||||
super({
|
super({
|
||||||
...config,
|
...config,
|
||||||
apiKey: config.apiKey || DEFAULT_LMSTUDIO_API_KEY,
|
apiKey: config.apiKey || DEFAULT_LMSTUDIO_API_KEY,
|
||||||
baseURL: config.baseURL ?? DEFAULT_BASE_URL,
|
baseURL:
|
||||||
|
config.baseURL ?? process.env.LMSTUDIO_BASE_URL ?? DEFAULT_BASE_URL,
|
||||||
model: config.model || DEFAULT_MODEL,
|
model: config.model || DEFAULT_MODEL,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,14 +10,64 @@ const mockCreate = jest.fn().mockResolvedValue({
|
|||||||
data: [{ embedding: mockEmbedding }],
|
data: [{ embedding: mockEmbedding }],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let capturedConstructorArgs: any;
|
||||||
|
|
||||||
jest.mock("openai", () => {
|
jest.mock("openai", () => {
|
||||||
return jest.fn().mockImplementation(() => ({
|
return jest.fn().mockImplementation((args: any) => {
|
||||||
embeddings: { create: mockCreate },
|
capturedConstructorArgs = args;
|
||||||
}));
|
return {
|
||||||
|
embeddings: { create: mockCreate },
|
||||||
|
};
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("LMStudioEmbedder (unit)", () => {
|
describe("LMStudioEmbedder (unit)", () => {
|
||||||
beforeEach(() => mockCreate.mockClear());
|
beforeEach(() => {
|
||||||
|
mockCreate.mockClear();
|
||||||
|
capturedConstructorArgs = undefined;
|
||||||
|
delete process.env.LMSTUDIO_BASE_URL;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
delete process.env.LMSTUDIO_BASE_URL;
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses the default base URL when neither config nor env var is set", async () => {
|
||||||
|
const embedder = new LMStudioEmbedder({ model: "test-model" });
|
||||||
|
|
||||||
|
await embedder.embed("hello");
|
||||||
|
|
||||||
|
expect(capturedConstructorArgs).toMatchObject({
|
||||||
|
baseURL: "http://localhost:1234/v1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses LMSTUDIO_BASE_URL when config does not provide a base URL", async () => {
|
||||||
|
process.env.LMSTUDIO_BASE_URL = "http://example.test:5678/v1";
|
||||||
|
|
||||||
|
const embedder = new LMStudioEmbedder({ model: "test-model" });
|
||||||
|
|
||||||
|
await embedder.embed("hello");
|
||||||
|
|
||||||
|
expect(capturedConstructorArgs).toMatchObject({
|
||||||
|
baseURL: "http://example.test:5678/v1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("prefers an explicit config baseURL over LMSTUDIO_BASE_URL", async () => {
|
||||||
|
process.env.LMSTUDIO_BASE_URL = "http://example.test:5678/v1";
|
||||||
|
|
||||||
|
const embedder = new LMStudioEmbedder({
|
||||||
|
model: "test-model",
|
||||||
|
baseURL: "http://config.test:9999/v1",
|
||||||
|
});
|
||||||
|
|
||||||
|
await embedder.embed("hello");
|
||||||
|
|
||||||
|
expect(capturedConstructorArgs).toMatchObject({
|
||||||
|
baseURL: "http://config.test:9999/v1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it("embed() calls OpenAI with encoding_format float and returns vector", async () => {
|
it("embed() calls OpenAI with encoding_format float and returns vector", async () => {
|
||||||
const embedder = new LMStudioEmbedder({
|
const embedder = new LMStudioEmbedder({
|
||||||
|
|||||||
@@ -5,16 +5,56 @@
|
|||||||
|
|
||||||
import { LMStudioLLM } from "../src/llms/lmstudio";
|
import { LMStudioLLM } from "../src/llms/lmstudio";
|
||||||
|
|
||||||
|
let capturedConstructorArgs: any;
|
||||||
const mockCreate = jest.fn();
|
const mockCreate = jest.fn();
|
||||||
|
|
||||||
jest.mock("openai", () => {
|
jest.mock("openai", () => {
|
||||||
return jest.fn().mockImplementation(() => ({
|
return jest.fn().mockImplementation((args: any) => {
|
||||||
chat: { completions: { create: mockCreate } },
|
capturedConstructorArgs = args;
|
||||||
}));
|
return {
|
||||||
|
chat: { completions: { create: mockCreate } },
|
||||||
|
};
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("LMStudioLLM (unit)", () => {
|
describe("LMStudioLLM (unit)", () => {
|
||||||
beforeEach(() => mockCreate.mockClear());
|
beforeEach(() => {
|
||||||
|
mockCreate.mockClear();
|
||||||
|
capturedConstructorArgs = undefined;
|
||||||
|
delete process.env.LMSTUDIO_BASE_URL;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
delete process.env.LMSTUDIO_BASE_URL;
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses the default base URL when neither config nor env var is set", () => {
|
||||||
|
new LMStudioLLM({});
|
||||||
|
|
||||||
|
expect(capturedConstructorArgs).toMatchObject({
|
||||||
|
baseURL: "http://localhost:1234/v1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses LMSTUDIO_BASE_URL when config does not provide a base URL", () => {
|
||||||
|
process.env.LMSTUDIO_BASE_URL = "http://example.test:5678/v1";
|
||||||
|
|
||||||
|
new LMStudioLLM({});
|
||||||
|
|
||||||
|
expect(capturedConstructorArgs).toMatchObject({
|
||||||
|
baseURL: "http://example.test:5678/v1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("prefers an explicit config baseURL over LMSTUDIO_BASE_URL", () => {
|
||||||
|
process.env.LMSTUDIO_BASE_URL = "http://example.test:5678/v1";
|
||||||
|
|
||||||
|
new LMStudioLLM({ baseURL: "http://config.test:9999/v1" });
|
||||||
|
|
||||||
|
expect(capturedConstructorArgs).toMatchObject({
|
||||||
|
baseURL: "http://config.test:9999/v1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it("generateResponse() returns a text response", async () => {
|
it("generateResponse() returns a text response", async () => {
|
||||||
mockCreate.mockResolvedValueOnce({
|
mockCreate.mockResolvedValueOnce({
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class BaseEmbedderConfig(ABC):
|
|||||||
# Gemini specific
|
# Gemini specific
|
||||||
output_dimensionality: Optional[str] = None,
|
output_dimensionality: Optional[str] = None,
|
||||||
# LM Studio specific
|
# LM Studio specific
|
||||||
lmstudio_base_url: Optional[str] = "http://localhost:1234/v1",
|
lmstudio_base_url: Optional[str] = None,
|
||||||
# AWS Bedrock specific
|
# AWS Bedrock specific
|
||||||
aws_access_key_id: Optional[str] = None,
|
aws_access_key_id: Optional[str] = None,
|
||||||
aws_secret_access_key: Optional[str] = None,
|
aws_secret_access_key: Optional[str] = None,
|
||||||
@@ -70,7 +70,8 @@ class BaseEmbedderConfig(ABC):
|
|||||||
:type memory_update_embedding_type: Optional[str], optional
|
:type memory_update_embedding_type: Optional[str], optional
|
||||||
:param memory_search_embedding_type: The type of embedding to use for the search memory action, defaults to None
|
:param memory_search_embedding_type: The type of embedding to use for the search memory action, defaults to None
|
||||||
:type memory_search_embedding_type: Optional[str], optional
|
:type memory_search_embedding_type: Optional[str], optional
|
||||||
:param lmstudio_base_url: LM Studio base URL to be use, defaults to "http://localhost:1234/v1"
|
:param lmstudio_base_url: LM Studio base URL to be use, defaults to None
|
||||||
|
(resolved by the provider from LMSTUDIO_BASE_URL, then "http://localhost:1234/v1")
|
||||||
:type lmstudio_base_url: Optional[str], optional
|
:type lmstudio_base_url: Optional[str], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ class LMStudioConfig(BaseLlmConfig):
|
|||||||
vision_details: Vision detail level, defaults to "auto"
|
vision_details: Vision detail level, defaults to "auto"
|
||||||
http_client_proxies: HTTP client proxy settings, defaults to None
|
http_client_proxies: HTTP client proxy settings, defaults to None
|
||||||
lmstudio_base_url: LM Studio base URL, defaults to None
|
lmstudio_base_url: LM Studio base URL, defaults to None
|
||||||
|
(resolved by the provider from LMSTUDIO_BASE_URL, then "http://localhost:1234/v1")
|
||||||
lmstudio_response_format: LM Studio response format, defaults to None
|
lmstudio_response_format: LM Studio response format, defaults to None
|
||||||
"""
|
"""
|
||||||
# Initialize base parameters
|
# Initialize base parameters
|
||||||
@@ -55,5 +56,5 @@ class LMStudioConfig(BaseLlmConfig):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# LM Studio-specific parameters
|
# LM Studio-specific parameters
|
||||||
self.lmstudio_base_url = lmstudio_base_url or "http://localhost:1234/v1"
|
self.lmstudio_base_url = lmstudio_base_url
|
||||||
self.lmstudio_response_format = lmstudio_response_format
|
self.lmstudio_response_format = lmstudio_response_format
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import os
|
||||||
from typing import Literal, Optional
|
from typing import Literal, Optional
|
||||||
|
|
||||||
from openai import OpenAI
|
from openai import OpenAI
|
||||||
@@ -13,6 +14,9 @@ class LMStudioEmbedding(EmbeddingBase):
|
|||||||
self.config.model = self.config.model or "nomic-ai/nomic-embed-text-v1.5-GGUF/nomic-embed-text-v1.5.f16.gguf"
|
self.config.model = self.config.model or "nomic-ai/nomic-embed-text-v1.5-GGUF/nomic-embed-text-v1.5.f16.gguf"
|
||||||
self.config.embedding_dims = self.config.embedding_dims or 1536
|
self.config.embedding_dims = self.config.embedding_dims or 1536
|
||||||
self.config.api_key = self.config.api_key or "lm-studio"
|
self.config.api_key = self.config.api_key or "lm-studio"
|
||||||
|
self.config.lmstudio_base_url = (
|
||||||
|
self.config.lmstudio_base_url or os.getenv("LMSTUDIO_BASE_URL") or "http://localhost:1234/v1"
|
||||||
|
)
|
||||||
|
|
||||||
self.client = OpenAI(base_url=self.config.lmstudio_base_url, api_key=self.config.api_key)
|
self.client = OpenAI(base_url=self.config.lmstudio_base_url, api_key=self.config.api_key)
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import json
|
import json
|
||||||
|
import os
|
||||||
from typing import Dict, List, Optional, Union
|
from typing import Dict, List, Optional, Union
|
||||||
|
|
||||||
from openai import OpenAI
|
from openai import OpenAI
|
||||||
@@ -37,6 +38,9 @@ class LMStudioLLM(LLMBase):
|
|||||||
or "lmstudio-community/Meta-Llama-3.1-70B-Instruct-GGUF/Meta-Llama-3.1-70B-Instruct-IQ2_M.gguf"
|
or "lmstudio-community/Meta-Llama-3.1-70B-Instruct-GGUF/Meta-Llama-3.1-70B-Instruct-IQ2_M.gguf"
|
||||||
)
|
)
|
||||||
self.config.api_key = self.config.api_key or "lm-studio"
|
self.config.api_key = self.config.api_key or "lm-studio"
|
||||||
|
self.config.lmstudio_base_url = (
|
||||||
|
self.config.lmstudio_base_url or os.getenv("LMSTUDIO_BASE_URL") or "http://localhost:1234/v1"
|
||||||
|
)
|
||||||
|
|
||||||
self.client = OpenAI(base_url=self.config.lmstudio_base_url, api_key=self.config.api_key)
|
self.client = OpenAI(base_url=self.config.lmstudio_base_url, api_key=self.config.api_key)
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ from mem0.configs.embeddings.base import BaseEmbedderConfig
|
|||||||
from mem0.embeddings.lmstudio import LMStudioEmbedding
|
from mem0.embeddings.lmstudio import LMStudioEmbedding
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def mock_lm_studio_client():
|
def mock_lm_studio_client():
|
||||||
with patch("mem0.embeddings.lmstudio.OpenAI") as mock_openai:
|
with patch("mem0.embeddings.lmstudio.OpenAI") as mock_openai:
|
||||||
@@ -80,3 +79,31 @@ def test_embed_batch_count_mismatch_raises(mock_lm_studio_client):
|
|||||||
|
|
||||||
with pytest.raises(ValueError, match="returned 1 embeddings for 2 texts"):
|
with pytest.raises(ValueError, match="returned 1 embeddings for 2 texts"):
|
||||||
embedder.embed_batch(["first text", "second text"])
|
embedder.embed_batch(["first text", "second text"])
|
||||||
|
|
||||||
|
|
||||||
|
def test_base_url_honors_lmstudio_base_url_env(mock_lm_studio_client, monkeypatch):
|
||||||
|
monkeypatch.setenv("LMSTUDIO_BASE_URL", "http://lmstudio.internal:9000/v1")
|
||||||
|
|
||||||
|
with patch("mem0.embeddings.lmstudio.OpenAI") as mock_openai:
|
||||||
|
LMStudioEmbedding(BaseEmbedderConfig())
|
||||||
|
|
||||||
|
assert mock_openai.call_args.kwargs["base_url"] == "http://lmstudio.internal:9000/v1"
|
||||||
|
|
||||||
|
|
||||||
|
def test_base_url_prefers_explicit_config_over_env(mock_lm_studio_client, monkeypatch):
|
||||||
|
monkeypatch.setenv("LMSTUDIO_BASE_URL", "http://lmstudio.internal:9000/v1")
|
||||||
|
|
||||||
|
with patch("mem0.embeddings.lmstudio.OpenAI") as mock_openai:
|
||||||
|
LMStudioEmbedding(BaseEmbedderConfig(lmstudio_base_url="http://explicit:1234/v1"))
|
||||||
|
|
||||||
|
assert mock_openai.call_args.kwargs["base_url"] == "http://explicit:1234/v1"
|
||||||
|
|
||||||
|
|
||||||
|
def test_base_url_falls_back_to_localhost_default(mock_lm_studio_client, monkeypatch):
|
||||||
|
monkeypatch.delenv("LMSTUDIO_BASE_URL", raising=False)
|
||||||
|
|
||||||
|
with patch("mem0.embeddings.lmstudio.OpenAI") as mock_openai:
|
||||||
|
embedder = LMStudioEmbedding(BaseEmbedderConfig())
|
||||||
|
|
||||||
|
assert mock_openai.call_args.kwargs["base_url"] == "http://localhost:1234/v1"
|
||||||
|
assert embedder.config.lmstudio_base_url == "http://localhost:1234/v1"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ from unittest.mock import Mock, patch
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from mem0.configs.llms.base import BaseLlmConfig
|
||||||
from mem0.configs.llms.lmstudio import LMStudioConfig
|
from mem0.configs.llms.lmstudio import LMStudioConfig
|
||||||
from mem0.llms.lmstudio import LMStudioLLM
|
from mem0.llms.lmstudio import LMStudioLLM
|
||||||
|
|
||||||
@@ -70,3 +71,40 @@ def test_generate_response_specifying_response_format(mock_lm_studio_client):
|
|||||||
)
|
)
|
||||||
|
|
||||||
assert response == "I'm doing well, thank you for asking!"
|
assert response == "I'm doing well, thank you for asking!"
|
||||||
|
|
||||||
|
|
||||||
|
def test_base_url_honors_lmstudio_base_url_env(monkeypatch):
|
||||||
|
monkeypatch.setenv("LMSTUDIO_BASE_URL", "http://lmstudio.internal:9000/v1")
|
||||||
|
|
||||||
|
with patch("mem0.llms.lmstudio.OpenAI") as mock_openai:
|
||||||
|
LMStudioLLM(LMStudioConfig())
|
||||||
|
|
||||||
|
assert mock_openai.call_args.kwargs["base_url"] == "http://lmstudio.internal:9000/v1"
|
||||||
|
|
||||||
|
|
||||||
|
def test_base_url_prefers_explicit_config_over_env(monkeypatch):
|
||||||
|
monkeypatch.setenv("LMSTUDIO_BASE_URL", "http://lmstudio.internal:9000/v1")
|
||||||
|
|
||||||
|
with patch("mem0.llms.lmstudio.OpenAI") as mock_openai:
|
||||||
|
LMStudioLLM(LMStudioConfig(lmstudio_base_url="http://explicit:1234/v1"))
|
||||||
|
|
||||||
|
assert mock_openai.call_args.kwargs["base_url"] == "http://explicit:1234/v1"
|
||||||
|
|
||||||
|
|
||||||
|
def test_base_url_falls_back_to_localhost_default(monkeypatch):
|
||||||
|
monkeypatch.delenv("LMSTUDIO_BASE_URL", raising=False)
|
||||||
|
|
||||||
|
with patch("mem0.llms.lmstudio.OpenAI") as mock_openai:
|
||||||
|
llm = LMStudioLLM(LMStudioConfig())
|
||||||
|
|
||||||
|
assert mock_openai.call_args.kwargs["base_url"] == "http://localhost:1234/v1"
|
||||||
|
assert llm.config.lmstudio_base_url == "http://localhost:1234/v1"
|
||||||
|
|
||||||
|
|
||||||
|
def test_base_url_honors_env_via_base_llm_config(monkeypatch):
|
||||||
|
monkeypatch.setenv("LMSTUDIO_BASE_URL", "http://lmstudio.internal:9000/v1")
|
||||||
|
|
||||||
|
with patch("mem0.llms.lmstudio.OpenAI") as mock_openai:
|
||||||
|
LMStudioLLM(BaseLlmConfig(model="some-model"))
|
||||||
|
|
||||||
|
assert mock_openai.call_args.kwargs["base_url"] == "http://lmstudio.internal:9000/v1"
|
||||||
|
|||||||
Reference in New Issue
Block a user