From 713805394c9684b7e025706b0b8336da0d20f42e Mon Sep 17 00:00:00 2001 From: perf3ct Date: Wed, 26 Mar 2025 19:10:16 +0000 Subject: [PATCH] move providers.ts into providers folder --- src/routes/api/embeddings.ts | 2 +- src/routes/api/llm.ts | 2 +- src/services/llm/ai_service_manager.ts | 2 +- src/services/llm/context/modules/provider_manager.ts | 2 +- src/services/llm/embeddings/init.ts | 2 +- src/services/llm/embeddings/queue.ts | 2 +- src/services/llm/index_service.ts | 2 +- .../llm/{embeddings => providers}/providers.ts | 10 +++++----- 8 files changed, 12 insertions(+), 12 deletions(-) rename src/services/llm/{embeddings => providers}/providers.ts (96%) diff --git a/src/routes/api/embeddings.ts b/src/routes/api/embeddings.ts index 88bee65b8..4a82ee657 100644 --- a/src/routes/api/embeddings.ts +++ b/src/routes/api/embeddings.ts @@ -1,6 +1,6 @@ import options from "../../services/options.js"; import vectorStore from "../../services/llm/embeddings/index.js"; -import providerManager from "../../services/llm/embeddings/providers.js"; +import providerManager from "../../services/llm/providers/providers.js"; import indexService from "../../services/llm/index_service.js"; import becca from "../../becca/becca.js"; import type { Request, Response } from "express"; diff --git a/src/routes/api/llm.ts b/src/routes/api/llm.ts index c4bf97603..f91373984 100644 --- a/src/routes/api/llm.ts +++ b/src/routes/api/llm.ts @@ -5,7 +5,7 @@ import options from "../../services/options.js"; import { v4 as uuidv4 } from 'uuid'; import becca from "../../becca/becca.js"; import vectorStore from "../../services/llm/embeddings/index.js"; -import providerManager from "../../services/llm/embeddings/providers.js"; +import providerManager from "../../services/llm/providers/providers.js"; import type { Message, ChatCompletionOptions } from "../../services/llm/ai_interface.js"; // Import this way to prevent immediate instantiation import * as aiServiceManagerModule from "../../services/llm/ai_service_manager.js"; diff --git a/src/services/llm/ai_service_manager.ts b/src/services/llm/ai_service_manager.ts index b4d761f5c..d2abf3de1 100644 --- a/src/services/llm/ai_service_manager.ts +++ b/src/services/llm/ai_service_manager.ts @@ -7,7 +7,7 @@ import log from '../log.js'; import { ContextExtractor } from './context/index.js'; import contextService from './context_service.js'; import indexService from './index_service.js'; -import { getEmbeddingProvider, getEnabledEmbeddingProviders } from './embeddings/providers.js'; +import { getEmbeddingProvider, getEnabledEmbeddingProviders } from './providers/providers.js'; import agentTools from './agent_tools/index.js'; type ServiceProviders = 'openai' | 'anthropic' | 'ollama'; diff --git a/src/services/llm/context/modules/provider_manager.ts b/src/services/llm/context/modules/provider_manager.ts index df2d1bf15..8fca25c59 100644 --- a/src/services/llm/context/modules/provider_manager.ts +++ b/src/services/llm/context/modules/provider_manager.ts @@ -1,6 +1,6 @@ import options from '../../../options.js'; import log from '../../../log.js'; -import { getEmbeddingProvider, getEnabledEmbeddingProviders } from '../../embeddings/providers.js'; +import { getEmbeddingProvider, getEnabledEmbeddingProviders } from '../../providers/providers.js'; /** * Manages embedding providers for context services diff --git a/src/services/llm/embeddings/init.ts b/src/services/llm/embeddings/init.ts index d56b88398..50724c05e 100644 --- a/src/services/llm/embeddings/init.ts +++ b/src/services/llm/embeddings/init.ts @@ -1,7 +1,7 @@ import log from "../../log.js"; import options from "../../options.js"; import { initEmbeddings } from "./index.js"; -import providerManager from "./providers.js"; +import providerManager from "../providers/providers.js"; import sqlInit from "../../sql_init.js"; import sql from "../../sql.js"; diff --git a/src/services/llm/embeddings/queue.ts b/src/services/llm/embeddings/queue.ts index 31617dfb3..5ee386905 100644 --- a/src/services/llm/embeddings/queue.ts +++ b/src/services/llm/embeddings/queue.ts @@ -3,7 +3,7 @@ import dateUtils from "../../../services/date_utils.js"; import log from "../../../services/log.js"; import becca from "../../../becca/becca.js"; import options from "../../../services/options.js"; -import { getEnabledEmbeddingProviders } from "./providers.js"; +import { getEnabledEmbeddingProviders } from "../providers/providers.js"; import { getNoteEmbeddingContext } from "./content_processing.js"; import { deleteNoteEmbeddings } from "./storage.js"; import type { QueueItem } from "./types.js"; diff --git a/src/services/llm/index_service.ts b/src/services/llm/index_service.ts index a5446244f..050925c72 100644 --- a/src/services/llm/index_service.ts +++ b/src/services/llm/index_service.ts @@ -13,7 +13,7 @@ import log from "../log.js"; import options from "../options.js"; import becca from "../../becca/becca.js"; import vectorStore from "./embeddings/index.js"; -import providerManager from "./embeddings/providers.js"; +import providerManager from "./providers/providers.js"; import { ContextExtractor } from "./context/index.js"; import eventService from "../events.js"; import type { NoteEmbeddingContext } from "./embeddings/embeddings_interface.js"; diff --git a/src/services/llm/embeddings/providers.ts b/src/services/llm/providers/providers.ts similarity index 96% rename from src/services/llm/embeddings/providers.ts rename to src/services/llm/providers/providers.ts index a9da71df0..ad8f9e4f4 100644 --- a/src/services/llm/embeddings/providers.ts +++ b/src/services/llm/providers/providers.ts @@ -3,11 +3,11 @@ import log from "../../log.js"; import sql from "../../sql.js"; import dateUtils from "../../date_utils.js"; import { randomString } from "../../utils.js"; -import type { EmbeddingProvider, EmbeddingConfig } from "./embeddings_interface.js"; -import { NormalizationStatus } from "./embeddings_interface.js"; -import { OpenAIEmbeddingProvider } from "./providers/openai.js"; -import { OllamaEmbeddingProvider } from "./providers/ollama.js"; -import { VoyageEmbeddingProvider } from "./providers/voyage.js"; +import type { EmbeddingProvider, EmbeddingConfig } from "../embeddings/embeddings_interface.js"; +import { NormalizationStatus } from "../embeddings/embeddings_interface.js"; +import { OpenAIEmbeddingProvider } from "../embeddings/providers/openai.js"; +import { OllamaEmbeddingProvider } from "../embeddings/providers/ollama.js"; +import { VoyageEmbeddingProvider } from "../embeddings/providers/voyage.js"; import type { OptionDefinitions } from "../../options_interface.js"; /**