@lobehub/chat 1.111.6 → 1.111.7

package/src/app/(backend)/webapi/models/[provider]/pull/route.ts

@@ -1,7 +1,7 @@
+import { ChatCompletionErrorPayload, PullModelParams } from '@lobechat/model-runtime';
 import { ChatErrorType } from '@lobechat/types';
 
 import { checkAuth } from '@/app/(backend)/middleware/auth';
-import { ChatCompletionErrorPayload, PullModelParams } from '@/libs/model-runtime';
 import { initModelRuntimeWithUserPayload } from '@/server/modules/ModelRuntime';
 import { createErrorResponse } from '@/utils/errorResponse';
 

package/src/app/(backend)/webapi/models/[provider]/route.ts

@@ -1,8 +1,8 @@
+import { ChatCompletionErrorPayload, ModelProvider } from '@lobechat/model-runtime';
 import { ChatErrorType } from '@lobechat/types';
 import { NextResponse } from 'next/server';
 
 import { checkAuth } from '@/app/(backend)/middleware/auth';
-import { ChatCompletionErrorPayload, ModelProvider } from '@/libs/model-runtime';
 import { initModelRuntimeWithUserPayload } from '@/server/modules/ModelRuntime';
 import { createErrorResponse } from '@/utils/errorResponse';
 

package/src/app/(backend)/webapi/plugin/gateway/route.ts

@@ -1,11 +1,11 @@
-import { ChatErrorType, ErrorType , TraceNameMap } from '@lobechat/types';
+import { AgentRuntimeError } from '@lobechat/model-runtime';
+import { ChatErrorType, ErrorType, TraceNameMap } from '@lobechat/types';
 import { PluginRequestPayload } from '@lobehub/chat-plugin-sdk';
 import { createGatewayOnEdgeRuntime } from '@lobehub/chat-plugins-gateway';
 
 import { LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED, enableNextAuth } from '@/const/auth';
 import { LOBE_CHAT_TRACE_ID } from '@/const/trace';
 import { getAppConfig } from '@/envs/app';
-import { AgentRuntimeError } from '@/libs/model-runtime';
 import { TraceClient } from '@/libs/traces';
 import { createErrorResponse } from '@/utils/errorResponse';
 import { getXorPayload } from '@/utils/server/xor';

package/src/app/(backend)/webapi/text-to-image/[provider]/route.ts

@@ -1,8 +1,8 @@
+import { ChatCompletionErrorPayload } from '@lobechat/model-runtime';
 import { ChatErrorType } from '@lobechat/types';
 import { NextResponse } from 'next/server';
 
 import { checkAuth } from '@/app/(backend)/middleware/auth';
-import { ChatCompletionErrorPayload } from '@/libs/model-runtime';
 import { TextToImagePayload } from '@/libs/model-runtime/types';
 import { initModelRuntimeWithUserPayload } from '@/server/modules/ModelRuntime';
 import { createErrorResponse } from '@/utils/errorResponse';

package/src/app/[variants]/(main)/settings/llm/ProviderList/Azure/index.tsx

@@ -1,11 +1,11 @@
 'use client';
 
+import { ModelProvider } from '@lobechat/model-runtime';
 import { AutoComplete, Input, InputPassword, Markdown } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { useTranslation } from 'react-i18next';
 
 import { AzureProviderCard } from '@/config/modelProviders';
-import { ModelProvider } from '@/libs/model-runtime';
 import { useUserStore } from '@/store/user';
 import { modelProviderSelectors } from '@/store/user/selectors';
 

package/src/app/[variants]/(main)/settings/provider/(detail)/azure/page.tsx

@@ -1,12 +1,12 @@
 'use client';
 
+import { ModelProvider } from '@lobechat/model-runtime';
 import { AutoComplete, Markdown } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
 import { AzureProviderCard } from '@/config/modelProviders';
-import { ModelProvider } from '@/libs/model-runtime';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { modelProviderSelectors } from '@/store/user/selectors';

package/src/app/[variants]/(main)/settings/provider/(detail)/azureai/page.tsx

@@ -1,10 +1,10 @@
 'use client';
 
+import { ModelProvider } from '@lobechat/model-runtime';
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
 import { AzureAIProviderCard } from '@/config/modelProviders';
-import { ModelProvider } from '@/libs/model-runtime';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';

package/src/components/InvalidAPIKey/APIKeyForm/Bedrock.tsx

@@ -1,3 +1,4 @@
+import { ModelProvider } from '@lobechat/model-runtime';
 import { Aws } from '@lobehub/icons';
 import { Button, Icon, InputPassword, Select } from '@lobehub/ui';
 import { useTheme } from 'antd-style';
@@ -6,7 +7,6 @@ import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FormAction } from '@/features/Conversation/Error/style';
-import { ModelProvider } from '@/libs/model-runtime';
 import { useUserStore } from '@/store/user';
 import { keyVaultsConfigSelectors } from '@/store/user/selectors';
 

package/src/components/InvalidAPIKey/APIKeyForm/index.tsx

@@ -1,10 +1,10 @@
+import { ModelProvider } from '@lobechat/model-runtime';
 import { ProviderIcon } from '@lobehub/icons';
 import { Button } from '@lobehub/ui';
 import { memo, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Center, Flexbox } from 'react-layout-kit';
 
-import { ModelProvider } from '@/libs/model-runtime';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import BedrockForm from './Bedrock';

package/src/const/settings/llm.ts

@@ -1,4 +1,5 @@
-import { ModelProvider } from '@/libs/model-runtime';
+import { ModelProvider } from '@lobechat/model-runtime';
+
 import { genUserLLMConfig } from '@/utils/genUserLLMConfig';
 
 export const DEFAULT_LLM_CONFIG = genUserLLMConfig({

package/src/database/models/__tests__/aiProvider.test.ts

@@ -1,9 +1,9 @@
 // @vitest-environment node
+import { ModelProvider } from '@lobechat/model-runtime';
 import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';
-import { ModelProvider } from '@/libs/model-runtime';
 import { sleep } from '@/utils/sleep';
 
 import { aiProviders, users } from '../../schemas';

package/src/database/models/aiProvider.ts

@@ -1,9 +1,9 @@
+import { ModelProvider } from '@lobechat/model-runtime';
 import { and, asc, desc, eq } from 'drizzle-orm';
 import { isEmpty } from 'lodash-es';
 
 import { DEFAULT_MODEL_PROVIDER_LIST } from '@/config/modelProviders';
 import { LobeChatDatabase } from '@/database/type';
-import { ModelProvider } from '@/libs/model-runtime';
 import {
   AiProviderDetailItem,
   AiProviderListItem,

package/src/features/Conversation/Error/index.tsx

@@ -1,3 +1,4 @@
+import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '@lobechat/model-runtime';
 import { ChatErrorType, ErrorType } from '@lobechat/types';
 import { IPluginErrorType } from '@lobehub/chat-plugin-sdk';
 import type { AlertProps } from '@lobehub/ui';
@@ -7,7 +8,6 @@ import { Suspense, memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useProviderName } from '@/hooks/useProviderName';
-import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '@/libs/model-runtime';
 import { ChatMessage, ChatMessageError } from '@/types/message';
 
 import ChatInvalidAPIKey from './ChatInvalidApiKey';

package/src/libs/trpc/client/lambda.ts

@@ -1,10 +1,10 @@
+import { ModelProvider } from '@lobechat/model-runtime';
 import { createTRPCClient, httpBatchLink } from '@trpc/client';
 import { createTRPCReact } from '@trpc/react-query';
 import debug from 'debug';
 import superjson from 'superjson';
 
 import { isDesktop } from '@/const/version';
-import { ModelProvider } from '@/libs/model-runtime';
 import type { LambdaRouter } from '@/server/routers/lambda';
 
 import { ErrorResponse } from './types';

package/src/server/globalConfig/_deprecated.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
 import { genServerLLMConfig } from './_deprecated';
 
 // Mock ModelProvider enum
-vi.mock('@/libs/model-runtime', () => ({
+vi.mock('@lobechat/model-runtime', () => ({
   ModelProvider: {
     Azure: 'azure',
     Bedrock: 'bedrock',

package/src/server/globalConfig/_deprecated.ts

@@ -1,6 +1,7 @@
+import { ModelProvider } from '@lobechat/model-runtime';
+
 import { getLLMConfig } from '@/config/llm';
 import * as ProviderCards from '@/config/modelProviders';
-import { ModelProvider } from '@/libs/model-runtime';
 import { ModelProviderCard } from '@/types/llm';
 import { extractEnabledModels, transformToChatModelCards } from '@/utils/_deprecated/parseModels';
 

package/src/server/globalConfig/genServerAiProviderConfig.test.ts

@@ -212,7 +212,7 @@ describe('genServerAiProvidersConfig Error Handling', () => {
     }));
 
     // Mock ModelProvider to include the missing provider
-    vi.doMock('@/libs/model-runtime', () => ({
+    vi.doMock('@lobechat/model-runtime', () => ({
       ModelProvider: {
         openai: 'openai', // This exists in enum
         anthropic: 'anthropic', // This exists in both enum and aiModels

package/src/server/globalConfig/genServerAiProviderConfig.ts

@@ -1,6 +1,7 @@
+import { ModelProvider } from '@lobechat/model-runtime';
+
 import * as AiModels from '@/config/aiModels';
 import { getLLMConfig } from '@/config/llm';
-import { ModelProvider } from '@/libs/model-runtime';
 import { AiFullModelCard } from '@/types/aiModel';
 import { ProviderConfig } from '@/types/user/settings';
 import { extractEnabledModels, transformToAiModelList } from '@/utils/parseModels';

package/src/server/modules/ModelRuntime/index.test.ts

@@ -1,7 +1,4 @@
 // @vitest-environment node
-import { describe, expect, it, vi } from 'vitest';
-
-import { ClientSecretPayload } from '@/const/auth';
 import {
   LobeAnthropicAI,
   LobeAzureOpenAI,
@@ -22,8 +19,11 @@ import {
   LobeZeroOneAI,
   LobeZhipuAI,
   ModelProvider,
-} from '@/libs/model-runtime';
-import { ModelRuntime } from '@/libs/model-runtime';
+} from '@lobechat/model-runtime';
+import { ModelRuntime } from '@lobechat/model-runtime';
+import { describe, expect, it, vi } from 'vitest';
+
+import { ClientSecretPayload } from '@/const/auth';
 import { LobeStepfunAI } from '@/libs/model-runtime/stepfun';
 
 import { initModelRuntimeWithUserPayload } from './index';
@@ -60,14 +60,17 @@ vi.mock('@/config/llm', () => ({
 
 /**
  * Test cases for function initModelRuntimeWithUserPayload
- * this method will use ModelRuntime from `@/libs/model-runtime`
+ * this method will use ModelRuntime from `@lobechat/model-runtime`
  * and method `getLlmOptionsFromPayload` to initialize runtime
  * with user payload. Test case below will test both the methods
  */
 describe('initModelRuntimeWithUserPayload method', () => {
   describe('should initialize with options correctly', () => {
     it('OpenAI provider: with apikey and endpoint', async () => {
-      const jwtPayload: ClientSecretPayload = { apiKey: 'user-openai-key', baseURL: 'user-endpoint' };
+      const jwtPayload: ClientSecretPayload = {
+        apiKey: 'user-openai-key',
+        baseURL: 'user-endpoint',
+      };
       const runtime = await initModelRuntimeWithUserPayload(ModelProvider.OpenAI, jwtPayload);
       expect(runtime).toBeInstanceOf(ModelRuntime);
       expect(runtime['_runtime']).toBeInstanceOf(LobeOpenAI);

package/src/server/modules/ModelRuntime/index.ts

@@ -1,6 +1,7 @@
+import { ModelProvider, ModelRuntime } from '@lobechat/model-runtime';
+
 import { getLLMConfig } from '@/config/llm';
 import { ClientSecretPayload } from '@/const/auth';
-import { ModelProvider, ModelRuntime } from '@/libs/model-runtime';
 
 import apiKeyManager from './apiKeyManager';
 

package/src/server/modules/ModelRuntime/trace.ts

@@ -1,9 +1,9 @@
+import { ChatStreamCallbacks, ChatStreamPayload } from '@lobechat/model-runtime';
 import { TracePayload, TraceTagMap } from '@lobechat/types';
 import { after } from 'next/server';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import { LOBE_CHAT_OBSERVATION_ID, LOBE_CHAT_TRACE_ID } from '@/const/trace';
-import { ChatStreamCallbacks, ChatStreamPayload } from '@/libs/model-runtime';
 import { TraceClient } from '@/libs/traces';
 
 export interface AgentChatOptions {

package/src/server/routers/async/ragEval.ts

@@ -1,3 +1,4 @@
+import { ModelProvider } from '@lobechat/model-runtime';
 import { TRPCError } from '@trpc/server';
 import OpenAI from 'openai';
 import { z } from 'zod';
@@ -12,7 +13,6 @@ import {
   EvalEvaluationModel,
   EvaluationRecordModel,
 } from '@/database/server/models/ragEval';
-import { ModelProvider } from '@/libs/model-runtime';
 import { asyncAuthedProcedure, asyncRouter as router } from '@/libs/trpc/async';
 import { initModelRuntimeWithUserPayload } from '@/server/modules/ModelRuntime';
 import { ChunkService } from '@/server/services/chunk';

package/src/services/__tests__/_auth.test.ts

@@ -1,7 +1,7 @@
+import { ModelProvider } from '@lobechat/model-runtime';
 import { act } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 
-import { ModelProvider } from '@/libs/model-runtime';
 import { useUserStore } from '@/store/user';
 import {
   GlobalLLMProviderKey,

package/src/services/__tests__/chat.test.ts

@@ -1,12 +1,3 @@
-import { ChatErrorType } from '@lobechat/types';
-import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
-import { act } from '@testing-library/react';
-import { merge } from 'lodash-es';
-import OpenAI from 'openai';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { DEFAULT_USER_AVATAR } from '@/const/meta';
-import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import {
   LobeAnthropicAI,
   LobeAzureOpenAI,
@@ -26,8 +17,17 @@ import {
   LobeZeroOneAI,
   LobeZhipuAI,
   ModelProvider,
-} from '@/libs/model-runtime';
-import { ModelRuntime } from '@/libs/model-runtime';
+} from '@lobechat/model-runtime';
+import { ModelRuntime } from '@lobechat/model-runtime';
+import { ChatErrorType } from '@lobechat/types';
+import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
+import { act } from '@testing-library/react';
+import { merge } from 'lodash-es';
+import OpenAI from 'openai';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { DEFAULT_USER_AVATAR } from '@/const/meta';
+import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { agentChatConfigSelectors } from '@/store/agent/selectors';
 import { aiModelSelectors } from '@/store/aiInfra';
 import { useToolStore } from '@/store/tool';

package/src/services/_auth.ts

@@ -1,6 +1,7 @@
+import { ModelProvider } from '@lobechat/model-runtime';
+
 import { ClientSecretPayload, LOBE_CHAT_AUTH_HEADER } from '@/const/auth';
 import { isDeprecatedEdition } from '@/const/version';
-import { ModelProvider } from '@/libs/model-runtime';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { keyVaultsConfigSelectors, userProfileSelectors } from '@/store/user/selectors';

package/src/services/chat.ts

@@ -1,3 +1,9 @@
+import {
+  AgentRuntimeError,
+  ChatCompletionErrorPayload,
+  ModelProvider,
+  ModelRuntime,
+} from '@lobechat/model-runtime';
 import { ChatErrorType, TracePayload, TraceTagMap } from '@lobechat/types';
 import { PluginRequestPayload, createHeadersWithPluginSettings } from '@lobehub/chat-plugin-sdk';
 import { produce } from 'immer';
@@ -8,12 +14,6 @@ import { INBOX_GUIDE_SYSTEMROLE } from '@/const/guide';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { isDeprecatedEdition, isDesktop, isServerMode } from '@/const/version';
-import {
-  AgentRuntimeError,
-  ChatCompletionErrorPayload,
-  ModelProvider,
-  ModelRuntime,
-} from '@/libs/model-runtime';
 import { parseDataUri } from '@/libs/model-runtime/utils/uriParser';
 import { filesPrompts } from '@/prompts/files';
 import { BuiltinSystemRolePrompts } from '@/prompts/systemRole';

package/src/services/textToImage.ts

@@ -1,4 +1,5 @@
-import { ModelProvider } from '@/libs/model-runtime';
+import { ModelProvider } from '@lobechat/model-runtime';
+
 import { createHeaderWithAuth } from '@/services/_auth';
 import { OpenAIImagePayload } from '@/types/openai/image';
 

package/src/store/image/slices/generationConfig/initialState.ts

@@ -1,6 +1,7 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix, typescript-sort-keys/interface */
+import { ModelProvider } from '@lobechat/model-runtime';
+
 import { gptImage1ParamsSchema } from '@/config/aiModels/openai';
-import { ModelProvider } from '@/libs/model-runtime/types/type';
 import {
   ModelParamsSchema,
   RuntimeImageGenParams,

package/src/store/user/slices/modelList/action.ts

@@ -1,8 +1,8 @@
+import { ModelProvider } from '@lobechat/model-runtime';
 import { produce } from 'immer';
 import useSWR, { SWRResponse } from 'swr';
 import type { StateCreator } from 'zustand/vanilla';
 
-import { ModelProvider } from '@/libs/model-runtime';
 import { UserStore } from '@/store/user';
 import type { ChatModelCard, ModelProviderCard } from '@/types/llm';
 import type {

package/src/utils/errorResponse.test.ts

@@ -1,8 +1,7 @@
+import { AgentRuntimeErrorType } from '@lobechat/model-runtime';
 import { ChatErrorType } from '@lobechat/types';
 import { describe, expect, it, vi } from 'vitest';
 
-import { AgentRuntimeErrorType } from '@/libs/model-runtime';
-
 import { createErrorResponse } from './errorResponse';
 
 describe('createErrorResponse', () => {

package/src/utils/errorResponse.ts

@@ -1,7 +1,6 @@
+import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '@lobechat/model-runtime';
 import { ChatErrorType, ErrorResponse, ErrorType } from '@lobechat/types';
 
-import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '@/libs/model-runtime';
-
 const getStatus = (errorType: ILobeAgentRuntimeErrorType | ErrorType) => {
   // InvalidAccessCode / InvalidAzureAPIKey / InvalidOpenAIAPIKey / InvalidZhipuAPIKey ....
   if (errorType.toString().includes('Invalid')) return 401;

package/src/utils/fetch/fetchSSE.ts

@@ -1,8 +1,8 @@
+import { parseToolCalls } from '@lobechat/model-runtime';
 import { ChatErrorType } from '@lobechat/types';
 
 import { MESSAGE_CANCEL_FLAT } from '@/const/message';
 import { LOBE_CHAT_OBSERVATION_ID, LOBE_CHAT_TRACE_ID } from '@/const/trace';
-import { parseToolCalls } from '@/libs/model-runtime';
 import { ResponseAnimation, ResponseAnimationStyle } from '@/types/llm';
 import {
   ChatMessageError,

package/src/utils/genUserLLMConfig.test.ts

@@ -5,7 +5,7 @@ import { ModelProviderCard } from '@/types/llm';
 import { genUserLLMConfig } from './genUserLLMConfig';
 
 // Mock ModelProvider enum
-vi.mock('@/libs/model-runtime', () => ({
+vi.mock('@lobechat/model-runtime', () => ({
   ModelProvider: {
     Ollama: 'ollama',
     OpenAI: 'openai',

package/src/utils/genUserLLMConfig.ts

@@ -1,5 +1,6 @@
+import { ModelProvider } from '@lobechat/model-runtime';
+
 import * as ProviderCards from '@/config/modelProviders';
-import { ModelProvider } from '@/libs/model-runtime';
 import { ModelProviderCard } from '@/types/llm';
 import { UserModelProviderConfig } from '@/types/user/settings';
 

package/tsconfig.json

@@ -18,6 +18,8 @@
     "baseUrl": ".",
     "types": ["vitest/globals", "@serwist/next/typings"],
     "paths": {
+      "@/libs/model-runtime": ["./packages/model-runtime/src/index.ts"],
+      "@/libs/model-runtime/*": ["./packages/model-runtime/src/*"],
       "@/types/*": ["./packages/types/src/*", "./src/types/*"],
       "@/*": ["./src/*"],
       "~test-utils": ["./tests/utils.tsx"]

package/vitest.config.ts

@@ -9,6 +9,7 @@ export default defineConfig({
   test: {
     alias: {
       /* eslint-disable sort-keys-fix/sort-keys-fix */
+      '@/libs/model-runtime': resolve(__dirname, './packages/model-runtime/src'),
       '@/types': resolve(__dirname, './packages/types/src'),
       '@': resolve(__dirname, './src'),
       '~test-utils': resolve(__dirname, './tests/utils.tsx'),