@lobehub/chat 1.124.0 → 1.124.2

package/packages/model-runtime/src/utils/streams/openai/openai.ts

@@ -1,7 +1,7 @@
 import OpenAI from 'openai';
 import type { Stream } from 'openai/streaming';
 
-import { ChatMessageError, CitationItem } from '@/types/message';
+import { ChatCitationItem, ChatMessageError } from '@/types/message';
 
 import { ChatStreamCallbacks } from '../../../types';
 import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '../../../types/error';
@@ -21,24 +21,24 @@ import {
 } from '../protocol';
 
 // Process markdown base64 images: extract URLs and clean text in one pass
-const processMarkdownBase64Images = (text: string): { cleanedText: string, urls: string[]; } => {
+const processMarkdownBase64Images = (text: string): { cleanedText: string; urls: string[] } => {
   if (!text) return { cleanedText: text, urls: [] };
-  
+
   const urls: string[] = [];
   const mdRegex = /!\[[^\]]*]\(\s*(data:image\/[\d+.A-Za-z-]+;base64,[^\s)]+)\s*\)/g;
   let cleanedText = text;
   let m: RegExpExecArray | null;
-  
+
   // Reset regex lastIndex to ensure we start from the beginning
   mdRegex.lastIndex = 0;
-  
+
   while ((m = mdRegex.exec(text)) !== null) {
     if (m[1]) urls.push(m[1]);
   }
-  
+
   // Remove all markdown base64 image segments
   cleanedText = text.replaceAll(mdRegex, '').trim();
-  
+
   return { cleanedText, urls };
 };
 
@@ -159,14 +159,17 @@ const transformOpenAIStream = (
           return { data: null, id: chunk.id, type: 'text' };
         }
 
-
         const text = item.delta.content as string;
         const { urls: images, cleanedText: cleaned } = processMarkdownBase64Images(text);
         if (images.length > 0) {
           const arr: StreamProtocolChunk[] = [];
           if (cleaned) arr.push({ data: cleaned, id: chunk.id, type: 'text' });
           arr.push(
-            ...images.map((url: string) => ({ data: url, id: chunk.id, type: 'base64_image' as const })),
+            ...images.map((url: string) => ({
+              data: url,
+              id: chunk.id,
+              type: 'base64_image' as const,
+            })),
           );
           return arr;
         }
@@ -187,7 +190,7 @@ const transformOpenAIStream = (
                   ({
                     title: item.url_citation.title,
                     url: item.url_citation.url,
-                  }) as CitationItem,
+                  }) as ChatCitationItem,
               ),
             },
             id: chunk.id,
@@ -209,7 +212,7 @@ const transformOpenAIStream = (
                   ({
                     title: item.url,
                     url: item.url,
-                  }) as CitationItem,
+                  }) as ChatCitationItem,
               ),
             },
             id: chunk.id,
@@ -236,7 +239,7 @@ const transformOpenAIStream = (
                   ({
                     title: item,
                     url: item,
-                  }) as CitationItem,
+                  }) as ChatCitationItem,
               ),
             },
             id: chunk.id,
@@ -348,7 +351,11 @@ const transformOpenAIStream = (
             const arr: StreamProtocolChunk[] = [];
             if (cleaned) arr.push({ data: cleaned, id: chunk.id, type: 'text' });
             arr.push(
-              ...urls.map((url: string) => ({ data: url, id: chunk.id, type: 'base64_image' as const })),
+              ...urls.map((url: string) => ({
+                data: url,
+                id: chunk.id,
+                type: 'base64_image' as const,
+              })),
             );
             return arr;
           }

package/packages/model-runtime/src/utils/streams/openai/responsesStream.test.ts

@@ -1,7 +1,6 @@
+import { AgentRuntimeErrorType } from '@lobechat/model-runtime';
 import { describe, expect, it, vi } from 'vitest';
 
-import { AgentRuntimeErrorType } from '@/libs/model-runtime';
-
 import { FIRST_CHUNK_ERROR_KEY } from '../protocol';
 import { createReadableStream, readStreamChunk } from '../utils';
 import { OpenAIResponsesStream } from './responsesStream';

package/packages/model-runtime/src/utils/streams/openai/responsesStream.ts

@@ -1,7 +1,7 @@
 import OpenAI from 'openai';
 import type { Stream } from 'openai/streaming';
 
-import { ChatMessageError, CitationItem } from '@/types/message';
+import { ChatCitationItem, ChatMessageError } from '@/types/message';
 
 import { AgentRuntimeErrorType } from '../../../types/error';
 import { convertResponseUsage } from '../../usageConverter';
@@ -126,7 +126,7 @@ const transformOpenAIStream = (
           streamContext.returnedCitationArray.push({
             title: citations.title,
             url: citations.url,
-          } as CitationItem);
+          } as ChatCitationItem);
         }
 
         return { data: null, id: chunk.item_id, type: 'text' };

package/packages/model-runtime/src/utils/streams/protocol.ts

@@ -1,4 +1,4 @@
-import { CitationItem, ModelSpeed, ModelTokensUsage } from '@/types/message';
+import { ChatCitationItem, ModelSpeed, ModelTokensUsage } from '@/types/message';
 
 import { parseToolCalls } from '../../helpers';
 import { ChatStreamCallbacks } from '../../types';
@@ -23,7 +23,7 @@ export interface StreamContext {
    * relevant to that specific portion of the generated content.
    * This array accumulates all citation items received during the streaming response.
    */
-  returnedCitationArray?: CitationItem[];
+  returnedCitationArray?: ChatCitationItem[];
   /**
    * O series models need a condition to separate part
    */

package/packages/model-runtime/src/wenxin/index.test.ts

@@ -1,9 +1,8 @@
 // @vitest-environment node
+import { LobeOpenAICompatibleRuntime, ModelProvider } from '@lobechat/model-runtime';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { LobeOpenAICompatibleRuntime, ModelProvider } from '@/libs/model-runtime';
-import { testProvider } from '@/libs/model-runtime/providerTestUtils';
-
+import { testProvider } from '../providerTestUtils';
 import { LobeWenxinAI } from './index';
 
 testProvider({

package/packages/model-runtime/src/xai/index.test.ts

@@ -1,7 +1,7 @@
 // @vitest-environment node
-import { ModelProvider } from '@/libs/model-runtime';
-import { testProvider } from '@/libs/model-runtime/providerTestUtils';
+import { ModelProvider } from '@lobechat/model-runtime';
 
+import { testProvider } from '../providerTestUtils';
 import { LobeXAI } from './index';
 
 testProvider({

package/packages/model-runtime/src/zeroone/index.test.ts

@@ -1,6 +1,5 @@
 // @vitest-environment node
-import { testProvider } from '@/libs/model-runtime/providerTestUtils';
-
+import { testProvider } from '../providerTestUtils';
 import { LobeZeroOneAI } from './index';
 
 testProvider({

package/packages/model-runtime/src/zhipu/index.test.ts

@@ -1,10 +1,9 @@
 // @vitest-environment node
+import { ChatStreamCallbacks, LobeOpenAICompatibleRuntime } from '@lobechat/model-runtime';
 import { OpenAI } from 'openai';
 import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { ChatStreamCallbacks, LobeOpenAI, LobeOpenAICompatibleRuntime } from '@/libs/model-runtime';
-import * as debugStreamModule from '@/libs/model-runtime/utils/debugStream';
-
+import * as debugStreamModule from '../utils/debugStream';
 import { LobeZhipuAI } from './index';
 
 const bizErrorType = 'ProviderBizError';

package/packages/model-runtime/vitest.config.mts

@@ -4,14 +4,7 @@ import { defineConfig } from 'vitest/config';
 export default defineConfig({
   test: {
     alias: {
-      /* eslint-disable sort-keys-fix/sort-keys-fix */
-      '@/libs/model-runtime': resolve(__dirname, './src'),
-      '@/types': resolve(__dirname, '../types/src'),
-      '@/utils/errorResponse': resolve(__dirname, '../../src/utils/errorResponse'),
-      '@/utils': resolve(__dirname, '../utils/src'),
-      '@/const': resolve(__dirname, '../const/src'),
       '@': resolve(__dirname, '../../src'),
-      /* eslint-enable */
     },
     coverage: {
       reporter: ['text', 'json', 'lcov', 'text-summary'],

package/packages/types/src/index.ts

@@ -14,6 +14,7 @@ export * from './llm';
 export * from './message';
 export * from './meta';
 export * from './rag';
+export * from './search';
 export * from './serverConfig';
 export * from './session';
 export * from './topic';
@@ -22,5 +23,6 @@ export * from './user/settings';
 // FIXME: I think we need a refactor for the "openai" types
 // it more likes the UI message payload
 export * from './openai/chat';
+export * from './openai/plugin';
 export * from './trace';
 export * from './zustand';

package/packages/types/src/message/base.ts

@@ -16,7 +16,7 @@ export interface ChatMessageError {
   type: ErrorType | IPluginErrorType | ILobeAgentRuntimeErrorType;
 }
 
-export interface CitationItem {
+export interface ChatCitationItem {
   id?: string;
   onlyUrl?: boolean;
   title?: string;

package/packages/types/src/openai/chat.ts

@@ -1,6 +1,5 @@
-import { LLMRoleType } from '@/types/llm';
-import { MessageToolCall } from '@/types/message';
-
+import { LLMRoleType } from '../llm';
+import { MessageToolCall } from '../message';
 import { OpenAIFunctionCall } from './functionCall';
 
 interface UserMessageContentPartText {

package/packages/utils/package.json

@@ -13,7 +13,8 @@
   },
   "dependencies": {
     "@lobechat/const": "workspace:*",
-    "@lobechat/types": "workspace:*"
+    "@lobechat/types": "workspace:*",
+    "dayjs": "^1.11.18"
   },
   "devDependencies": {
     "vitest-canvas-mock": "^0.3.3"

package/packages/utils/src/_deprecated/parseModels.test.ts

@@ -1,7 +1,7 @@
+import { ChatModelCard } from '@lobechat/types';
 import { describe, expect, it } from 'vitest';
 
 import { LOBE_DEFAULT_MODEL_LIST, OpenAIProviderCard } from '@/config/modelProviders';
-import { ChatModelCard } from '@/types/llm';
 
 import { parseModelString, transformToChatModelCards } from './parseModels';
 

package/packages/utils/src/_deprecated/parseModels.ts

@@ -1,7 +1,7 @@
+import { ChatModelCard } from '@lobechat/types';
 import { produce } from 'immer';
 
 import { LOBE_DEFAULT_MODEL_LIST } from '@/config/modelProviders';
-import { ChatModelCard } from '@/types/llm';
 
 /**
  * Parse model string to add or remove models.

package/packages/utils/src/client/topic.test.ts

@@ -1,8 +1,7 @@
+import { ChatTopic } from '@lobechat/types';
 import dayjs from 'dayjs';
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 
-import { ChatTopic } from '@/types/topic';
-
 import { groupTopicsByTime } from './topic';
 
 // Mock current date to ensure consistent test results

package/packages/utils/src/client/topic.ts

@@ -1,9 +1,8 @@
+import { ChatTopic, GroupedTopic, TimeGroupId } from '@lobechat/types';
 import dayjs from 'dayjs';
 import isToday from 'dayjs/plugin/isToday';
 import isYesterday from 'dayjs/plugin/isYesterday';
 
-import { ChatTopic, GroupedTopic, TimeGroupId } from '@/types/topic';
-
 // 初始化 dayjs 插件
 dayjs.extend(isToday);
 dayjs.extend(isYesterday);

package/packages/utils/src/electron/desktopRemoteRPCFetch.ts

@@ -1,7 +1,7 @@
+import { isDesktop } from '@lobechat/const';
 import { ProxyTRPCRequestParams, dispatch, streamInvoke } from '@lobechat/electron-client-ipc';
 import debug from 'debug';
 
-import { isDesktop } from '@/const/version';
 import { getElectronStoreState } from '@/store/electron';
 import { electronSyncSelectors } from '@/store/electron/selectors';
 import { getRequestBody, headersToRecord } from '@/utils/fetch';

package/packages/utils/src/fetch/fetchSSE.ts

@@ -1,20 +1,19 @@
+import { LOBE_CHAT_OBSERVATION_ID, LOBE_CHAT_TRACE_ID, MESSAGE_CANCEL_FLAT } from '@lobechat/const';
 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 { ResponseAnimation, ResponseAnimationStyle } from '@lobechat/types';
 import {
+  ChatErrorType,
+  ChatImageChunk,
   ChatMessageError,
+  GroundingSearch,
   MessageToolCall,
   MessageToolCallChunk,
   MessageToolCallSchema,
   ModelReasoning,
   ModelSpeed,
   ModelTokensUsage,
-} from '@/types/message';
-import { ChatImageChunk } from '@/types/message/image';
-import { GroundingSearch } from '@/types/search';
+  ResponseAnimation,
+  ResponseAnimationStyle,
+} from '@lobechat/types';
 
 import { nanoid } from '../uuid';
 import { fetchEventSource } from './fetchEventSource';

package/packages/utils/src/fetch/parseError.ts

@@ -1,8 +1,6 @@
-import { ErrorResponse, ErrorType } from '@lobechat/types';
+import { ChatMessageError, ErrorResponse, ErrorType } from '@lobechat/types';
 import { t } from 'i18next';
 
-import { ChatMessageError } from '@/types/message';
-
 export const getMessageError = async (response: Response) => {
   let chatMessageError: ChatMessageError;
 

package/packages/utils/src/format.test.ts

@@ -1,8 +1,7 @@
+import { USD_TO_CNY } from '@lobechat/const';
 import dayjs from 'dayjs';
 import { describe, expect, it } from 'vitest';
 
-import { USD_TO_CNY } from '@/const/currency';
-
 import {
   formatDate,
   formatIntergerNumber,

package/packages/utils/src/index.ts

@@ -7,4 +7,5 @@ export * from './object';
 export * from './parseModels';
 export * from './pricing';
 export * from './safeParseJSON';
+export * from './sleep';
 export * from './uuid';

package/packages/utils/src/toolManifest.ts

@@ -1,9 +1,8 @@
+import { ChatCompletionTool , OpenAIPluginManifest } from '@lobechat/types';
 import { LobeChatPluginManifest, pluginManifestSchema } from '@lobehub/chat-plugin-sdk';
 import { uniqBy } from 'lodash-es';
 
 import { API_ENDPOINTS } from '@/services/_url';
-import { ChatCompletionTool } from '@/types/openai/chat';
-import { OpenAIPluginManifest } from '@/types/openai/plugin';
 import { genToolCallingName } from '@/utils/toolCall';
 
 const fetchJSON = async <T = any>(url: string, proxy = false): Promise<T> => {

package/packages/utils/src/trace.ts

@@ -1,4 +1,4 @@
-import { LOBE_CHAT_TRACE_HEADER, LOBE_CHAT_TRACE_ID, TracePayload } from '@/const/trace';
+import { LOBE_CHAT_TRACE_HEADER, LOBE_CHAT_TRACE_ID, TracePayload } from '@lobechat/const';
 
 export const getTracePayload = (req: Request): TracePayload | undefined => {
   const header = req.headers.get(LOBE_CHAT_TRACE_HEADER);

package/packages/utils/vitest.config.mts

@@ -7,11 +7,11 @@ export default defineConfig({
       /* eslint-disable sort-keys-fix/sort-keys-fix */
       '@/types': resolve(__dirname, '../types/src'),
       '@/const': resolve(__dirname, '../const/src'),
-      '@/libs/model-runtime': resolve(__dirname, '../model-runtime/src'),
       '@': resolve(__dirname, '../../src'),
       /* eslint-enable */
     },
     coverage: {
+      all: false,
       reporter: ['text', 'json', 'lcov', 'text-summary'],
     },
     environment: 'happy-dom',