From 252e2fcd29bfa1cc53f07eb8bb88ce590fe6cff2 Mon Sep 17 00:00:00 2001 From: Enrico Ros Date: Sat, 22 Nov 2025 22:48:47 -0800 Subject: [PATCH] LLMs: Access extraction rewires --- src/modules/aix/server/api/aix.wiretypes.ts | 8 ++++---- .../chatGenerate/adapters/openai.chatCompletions.ts | 2 +- .../chatGenerate/adapters/openai.responsesCreate.ts | 2 +- .../server/dispatch/chatGenerate/chatGenerate.dispatch.ts | 8 ++++---- src/modules/llms/server/listModels.dispatch.ts | 8 ++++---- src/modules/llms/server/openai/models/xai.models.ts | 2 +- src/modules/llms/vendors/alibaba/alibaba.vendor.ts | 2 +- src/modules/llms/vendors/anthropic/anthropic.vendor.ts | 2 +- src/modules/llms/vendors/azure/azure.vendor.ts | 2 +- src/modules/llms/vendors/deepseek/deepseekai.vendor.ts | 2 +- src/modules/llms/vendors/gemini/gemini.vendor.ts | 3 ++- src/modules/llms/vendors/groq/groq.vendor.ts | 2 +- src/modules/llms/vendors/lmstudio/lmstudio.vendor.ts | 2 +- src/modules/llms/vendors/localai/LocalAIAdmin.tsx | 2 +- src/modules/llms/vendors/localai/localai.vendor.ts | 2 +- src/modules/llms/vendors/mistral/mistral.vendor.ts | 2 +- src/modules/llms/vendors/moonshot/moonshot.vendor.ts | 2 +- src/modules/llms/vendors/ollama/OllamaAdministration.tsx | 2 +- src/modules/llms/vendors/ollama/ollama.vendor.ts | 2 +- src/modules/llms/vendors/openai/openai.vendor.ts | 2 +- src/modules/llms/vendors/openpipe/openpipe.vendor.ts | 2 +- src/modules/llms/vendors/openrouter/openrouter.vendor.ts | 2 +- src/modules/llms/vendors/perplexity/perplexity.vendor.ts | 2 +- src/modules/llms/vendors/togetherai/togetherai.vendor.ts | 2 +- src/modules/llms/vendors/xai/xai.vendor.ts | 2 +- src/modules/t2i/dalle/openaiGenerateImages.ts | 2 +- 26 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/modules/aix/server/api/aix.wiretypes.ts b/src/modules/aix/server/api/aix.wiretypes.ts index 1aebc5582..890e51756 100644 --- a/src/modules/aix/server/api/aix.wiretypes.ts +++ b/src/modules/aix/server/api/aix.wiretypes.ts @@ -3,10 +3,10 @@ import * as z from 'zod/v4'; // Used to align Particles to the Typescript definitions from the frontend-side, on 'chat.fragments.ts' import type { DMessageToolResponsePart } from '~/common/stores/chat/chat.fragments'; -import { anthropicAccessSchema } from '~/modules/llms/server/anthropic/anthropic.router'; -import { geminiAccessSchema } from '~/modules/llms/server/gemini/gemini.router'; -import { ollamaAccessSchema } from '~/modules/llms/server/ollama/ollama.router'; -import { openAIAccessSchema } from '~/modules/llms/server/openai/openai.router'; +import { anthropicAccessSchema } from '~/modules/llms/server/anthropic/anthropic.access'; +import { geminiAccessSchema } from '~/modules/llms/server/gemini/gemini.access'; +import { ollamaAccessSchema } from '~/modules/llms/server/ollama/ollama.access'; +import { openAIAccessSchema } from '~/modules/llms/server/openai/openai.access'; // diff --git a/src/modules/aix/server/dispatch/chatGenerate/adapters/openai.chatCompletions.ts b/src/modules/aix/server/dispatch/chatGenerate/adapters/openai.chatCompletions.ts index a8d210443..2432cc017 100644 --- a/src/modules/aix/server/dispatch/chatGenerate/adapters/openai.chatCompletions.ts +++ b/src/modules/aix/server/dispatch/chatGenerate/adapters/openai.chatCompletions.ts @@ -1,4 +1,4 @@ -import type { OpenAIDialects } from '~/modules/llms/server/openai/openai.router'; +import type { OpenAIDialects } from '~/modules/llms/server/openai/openai.access'; import { AixAPI_Model, AixAPIChatGenerate_Request, AixMessages_ChatMessage, AixMessages_SystemMessage, AixParts_DocPart, AixParts_InlineAudioPart, AixParts_MetaInReferenceToPart, AixTools_ToolDefinition, AixTools_ToolsPolicy } from '../../../api/aix.wiretypes'; import { OpenAIWire_API_Chat_Completions, OpenAIWire_ContentParts, OpenAIWire_Messages } from '../../wiretypes/openai.wiretypes'; diff --git a/src/modules/aix/server/dispatch/chatGenerate/adapters/openai.responsesCreate.ts b/src/modules/aix/server/dispatch/chatGenerate/adapters/openai.responsesCreate.ts index 6c786cd66..0c1106061 100644 --- a/src/modules/aix/server/dispatch/chatGenerate/adapters/openai.responsesCreate.ts +++ b/src/modules/aix/server/dispatch/chatGenerate/adapters/openai.responsesCreate.ts @@ -1,4 +1,4 @@ -import type { OpenAIDialects } from '~/modules/llms/server/openai/openai.router'; +import type { OpenAIDialects } from '~/modules/llms/server/openai/openai.access'; import { AixAPI_Model, AixAPIChatGenerate_Request, AixMessages_ChatMessage, AixMessages_SystemMessage, AixTools_ToolDefinition, AixTools_ToolsPolicy } from '../../../api/aix.wiretypes'; import { OpenAIWire_API_Responses, OpenAIWire_Responses_Items, OpenAIWire_Responses_Tools } from '../../wiretypes/openai.wiretypes'; diff --git a/src/modules/aix/server/dispatch/chatGenerate/chatGenerate.dispatch.ts b/src/modules/aix/server/dispatch/chatGenerate/chatGenerate.dispatch.ts index 6a256cfa5..eb767bc9e 100644 --- a/src/modules/aix/server/dispatch/chatGenerate/chatGenerate.dispatch.ts +++ b/src/modules/aix/server/dispatch/chatGenerate/chatGenerate.dispatch.ts @@ -1,7 +1,7 @@ -import { anthropicAccess } from '~/modules/llms/server/anthropic/anthropic.router'; -import { geminiAccess } from '~/modules/llms/server/gemini/gemini.router'; -import { ollamaAccess } from '~/modules/llms/server/ollama/ollama.router'; -import { openAIAccess } from '~/modules/llms/server/openai/openai.router'; +import { anthropicAccess } from '~/modules/llms/server/anthropic/anthropic.access'; +import { geminiAccess } from '~/modules/llms/server/gemini/gemini.access'; +import { ollamaAccess } from '~/modules/llms/server/ollama/ollama.access'; +import { openAIAccess } from '~/modules/llms/server/openai/openai.access'; import type { AixAPI_Access, AixAPI_Model, AixAPI_ResumeHandle, AixAPIChatGenerate_Request } from '../../api/aix.wiretypes'; import type { AixDemuxers } from '../stream.demuxers'; diff --git a/src/modules/llms/server/listModels.dispatch.ts b/src/modules/llms/server/listModels.dispatch.ts index b37a03ab3..aafea47ab 100644 --- a/src/modules/llms/server/listModels.dispatch.ts +++ b/src/modules/llms/server/listModels.dispatch.ts @@ -12,16 +12,16 @@ import type { ModelDescriptionSchema } from './llm.server.types'; // protocol: Anthropic import { AnthropicWire_API_Models_List, hardcodedAnthropicModels, hardcodedAnthropicVariants, llmsAntCreatePlaceholderModel, llmsAntDevCheckForObsoletedModels_DEV, llmsAntInjectWebSearchInterface } from './anthropic/anthropic.models'; -import { anthropicAccess } from './anthropic/anthropic.router'; +import { anthropicAccess } from './anthropic/anthropic.access'; // protocol: Gemini import { GeminiWire_API_Models_List } from '~/modules/aix/server/dispatch/wiretypes/gemini.wiretypes'; -import { geminiAccess } from './gemini/gemini.router'; +import { geminiAccess } from './gemini/gemini.access'; import { geminiDevCheckForParserMisses_DEV, geminiDevCheckForSuperfluousModels_DEV, geminiFilterModels, geminiModelsAddVariants, geminiModelToModelDescription, geminiSortModels } from './gemini/gemini.models'; // protocol: Ollama import { OLLAMA_BASE_MODELS } from './ollama/ollama.models'; -import { ollamaAccess } from './ollama/ollama.router'; +import { ollamaAccess } from './ollama/ollama.access'; import { wireOllamaListModelsSchema, wireOllamaModelInfoSchema } from './ollama/ollama.wiretypes'; // protocol: OpenAI-compatible @@ -37,7 +37,7 @@ import { lmStudioModelToModelDescription } from './openai/models/lmstudio.models import { localAIModelSortFn, localAIModelToModelDescription } from './openai/models/localai.models'; import { mistralModels } from './openai/models/mistral.models'; import { moonshotModelFilter, moonshotModelSortFn, moonshotModelToModelDescription } from './openai/models/moonshot.models'; -import { openAIAccess } from './openai/openai.router'; +import { openAIAccess } from './openai/openai.access'; import { openPipeModelDescriptions, openPipeModelSort, openPipeModelToModelDescriptions } from './openai/models/openpipe.models'; import { openRouterInjectVariants, openRouterModelFamilySortFn, openRouterModelToModelDescription } from './openai/models/openrouter.models'; import { openaiDevCheckForModelsOverlap_DEV, openAIInjectVariants, openAIModelFilter, openAIModelToModelDescription, openAISortModels } from './openai/models/openai.models'; diff --git a/src/modules/llms/server/openai/models/xai.models.ts b/src/modules/llms/server/openai/models/xai.models.ts index 0c3accbf0..8b8ef6b93 100644 --- a/src/modules/llms/server/openai/models/xai.models.ts +++ b/src/modules/llms/server/openai/models/xai.models.ts @@ -6,7 +6,7 @@ import { LLM_IF_OAI_Chat, LLM_IF_OAI_Fn, LLM_IF_OAI_Json, LLM_IF_OAI_Reasoning, import type { ModelDescriptionSchema } from '../../llm.server.types'; import { fromManualMapping, KnownModel, ManualMappings } from '../../models.mappings'; -import { openAIAccess, OpenAIAccessSchema } from '../openai.router'; +import { openAIAccess, OpenAIAccessSchema } from '../openai.access'; // Known xAI Models - Manual Mappings diff --git a/src/modules/llms/vendors/alibaba/alibaba.vendor.ts b/src/modules/llms/vendors/alibaba/alibaba.vendor.ts index 71e9f4095..92f9f592c 100644 --- a/src/modules/llms/vendors/alibaba/alibaba.vendor.ts +++ b/src/modules/llms/vendors/alibaba/alibaba.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/anthropic/anthropic.vendor.ts b/src/modules/llms/vendors/anthropic/anthropic.vendor.ts index 4c67d321c..bc74ffcb5 100644 --- a/src/modules/llms/vendors/anthropic/anthropic.vendor.ts +++ b/src/modules/llms/vendors/anthropic/anthropic.vendor.ts @@ -1,6 +1,6 @@ import { apiAsync } from '~/common/util/trpc.client'; -import type { AnthropicAccessSchema } from '../../server/anthropic/anthropic.router'; +import type { AnthropicAccessSchema } from '../../server/anthropic/anthropic.access'; import type { IModelVendor } from '../IModelVendor'; diff --git a/src/modules/llms/vendors/azure/azure.vendor.ts b/src/modules/llms/vendors/azure/azure.vendor.ts index 82dc5e8d3..ce823cdc6 100644 --- a/src/modules/llms/vendors/azure/azure.vendor.ts +++ b/src/modules/llms/vendors/azure/azure.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/deepseek/deepseekai.vendor.ts b/src/modules/llms/vendors/deepseek/deepseekai.vendor.ts index 6ae886960..67f91872c 100644 --- a/src/modules/llms/vendors/deepseek/deepseekai.vendor.ts +++ b/src/modules/llms/vendors/deepseek/deepseekai.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/gemini/gemini.vendor.ts b/src/modules/llms/vendors/gemini/gemini.vendor.ts index 33d00c0ae..35f5f004c 100644 --- a/src/modules/llms/vendors/gemini/gemini.vendor.ts +++ b/src/modules/llms/vendors/gemini/gemini.vendor.ts @@ -1,7 +1,8 @@ import { apiAsync } from '~/common/util/trpc.client'; -import type { GeminiAccessSchema } from '../../server/gemini/gemini.router'; import type { GeminiWire_Safety } from '~/modules/aix/server/dispatch/wiretypes/gemini.wiretypes'; + +import type { GeminiAccessSchema } from '../../server/gemini/gemini.access'; import type { IModelVendor } from '../IModelVendor'; diff --git a/src/modules/llms/vendors/groq/groq.vendor.ts b/src/modules/llms/vendors/groq/groq.vendor.ts index f8e7578dd..20786d2ae 100644 --- a/src/modules/llms/vendors/groq/groq.vendor.ts +++ b/src/modules/llms/vendors/groq/groq.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/lmstudio/lmstudio.vendor.ts b/src/modules/llms/vendors/lmstudio/lmstudio.vendor.ts index e475ca44c..d2238c068 100644 --- a/src/modules/llms/vendors/lmstudio/lmstudio.vendor.ts +++ b/src/modules/llms/vendors/lmstudio/lmstudio.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/localai/LocalAIAdmin.tsx b/src/modules/llms/vendors/localai/LocalAIAdmin.tsx index 8cb7f24eb..c7ae10254 100644 --- a/src/modules/llms/vendors/localai/LocalAIAdmin.tsx +++ b/src/modules/llms/vendors/localai/LocalAIAdmin.tsx @@ -11,7 +11,7 @@ import { Link } from '~/common/components/Link'; import { apiQuery } from '~/common/util/trpc.client'; import { capitalizeFirstLetter } from '~/common/util/textUtils'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; function ListItemSwitch(props: { title: string, checked: boolean, onChange: (checked: boolean) => void }) { diff --git a/src/modules/llms/vendors/localai/localai.vendor.ts b/src/modules/llms/vendors/localai/localai.vendor.ts index 1388a4c9b..17a6dbbd2 100644 --- a/src/modules/llms/vendors/localai/localai.vendor.ts +++ b/src/modules/llms/vendors/localai/localai.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/mistral/mistral.vendor.ts b/src/modules/llms/vendors/mistral/mistral.vendor.ts index d491067b2..1b2b5ac3e 100644 --- a/src/modules/llms/vendors/mistral/mistral.vendor.ts +++ b/src/modules/llms/vendors/mistral/mistral.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { DOpenAIServiceSettings, ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/moonshot/moonshot.vendor.ts b/src/modules/llms/vendors/moonshot/moonshot.vendor.ts index f5875997b..be0d3661a 100644 --- a/src/modules/llms/vendors/moonshot/moonshot.vendor.ts +++ b/src/modules/llms/vendors/moonshot/moonshot.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/ollama/OllamaAdministration.tsx b/src/modules/llms/vendors/ollama/OllamaAdministration.tsx index 96cfec57a..b824818cd 100644 --- a/src/modules/llms/vendors/ollama/OllamaAdministration.tsx +++ b/src/modules/llms/vendors/ollama/OllamaAdministration.tsx @@ -11,7 +11,7 @@ import { InlineError } from '~/common/components/InlineError'; import { Link } from '~/common/components/Link'; import { apiQuery } from '~/common/util/trpc.client'; -import type { OllamaAccessSchema } from '../../server/ollama/ollama.router'; +import type { OllamaAccessSchema } from '../../server/ollama/ollama.access'; // configuration diff --git a/src/modules/llms/vendors/ollama/ollama.vendor.ts b/src/modules/llms/vendors/ollama/ollama.vendor.ts index 8bfec776e..f44baa4f7 100644 --- a/src/modules/llms/vendors/ollama/ollama.vendor.ts +++ b/src/modules/llms/vendors/ollama/ollama.vendor.ts @@ -1,7 +1,7 @@ import { apiAsync } from '~/common/util/trpc.client'; import type { IModelVendor } from '../IModelVendor'; -import type { OllamaAccessSchema } from '../../server/ollama/ollama.router'; +import type { OllamaAccessSchema } from '../../server/ollama/ollama.access'; interface DOllamaServiceSettings { diff --git a/src/modules/llms/vendors/openai/openai.vendor.ts b/src/modules/llms/vendors/openai/openai.vendor.ts index 5e47e49aa..a22754bc2 100644 --- a/src/modules/llms/vendors/openai/openai.vendor.ts +++ b/src/modules/llms/vendors/openai/openai.vendor.ts @@ -1,7 +1,7 @@ import { apiAsync } from '~/common/util/trpc.client'; import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; // special symbols diff --git a/src/modules/llms/vendors/openpipe/openpipe.vendor.ts b/src/modules/llms/vendors/openpipe/openpipe.vendor.ts index 1d1bb3f7e..2d191ae75 100644 --- a/src/modules/llms/vendors/openpipe/openpipe.vendor.ts +++ b/src/modules/llms/vendors/openpipe/openpipe.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/openrouter/openrouter.vendor.ts b/src/modules/llms/vendors/openrouter/openrouter.vendor.ts index 12d44dfc5..b158e63a5 100644 --- a/src/modules/llms/vendors/openrouter/openrouter.vendor.ts +++ b/src/modules/llms/vendors/openrouter/openrouter.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { getLLMPricing } from '~/common/stores/llms/llms.types'; diff --git a/src/modules/llms/vendors/perplexity/perplexity.vendor.ts b/src/modules/llms/vendors/perplexity/perplexity.vendor.ts index 34ef61e6f..169707432 100644 --- a/src/modules/llms/vendors/perplexity/perplexity.vendor.ts +++ b/src/modules/llms/vendors/perplexity/perplexity.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/togetherai/togetherai.vendor.ts b/src/modules/llms/vendors/togetherai/togetherai.vendor.ts index 5170f04e0..6e19612ea 100644 --- a/src/modules/llms/vendors/togetherai/togetherai.vendor.ts +++ b/src/modules/llms/vendors/togetherai/togetherai.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/llms/vendors/xai/xai.vendor.ts b/src/modules/llms/vendors/xai/xai.vendor.ts index b51d3fd2d..d402b9868 100644 --- a/src/modules/llms/vendors/xai/xai.vendor.ts +++ b/src/modules/llms/vendors/xai/xai.vendor.ts @@ -1,5 +1,5 @@ import type { IModelVendor } from '../IModelVendor'; -import type { OpenAIAccessSchema } from '../../server/openai/openai.router'; +import type { OpenAIAccessSchema } from '../../server/openai/openai.access'; import { ModelVendorOpenAI } from '../openai/openai.vendor'; diff --git a/src/modules/t2i/dalle/openaiGenerateImages.ts b/src/modules/t2i/dalle/openaiGenerateImages.ts index 55d648a67..f4e7c9c39 100644 --- a/src/modules/t2i/dalle/openaiGenerateImages.ts +++ b/src/modules/t2i/dalle/openaiGenerateImages.ts @@ -4,7 +4,7 @@ import type { DModelsServiceId } from '~/common/stores/llms/llms.service.types'; import { apiStream } from '~/common/util/trpc.client'; import { formatModelsCost } from '~/common/util/costUtils'; -import type { OpenAIAccessSchema } from '~/modules/llms/server/openai/openai.router'; +import type { OpenAIAccessSchema } from '~/modules/llms/server/openai/openai.access'; import { findServiceAccessOrThrow } from '~/modules/llms/vendors/vendor.helpers'; import type { T2iCreateImageOutput, T2iGenerateOptions } from '../t2i.server';