@lobehub/chat 1.114.2 → 1.114.4

package/{src/database → packages/database/src}/server/models/ragEval/evaluation.ts

@@ -1,3 +1,4 @@
+import { EvalEvaluationStatus, RAGEvalEvaluationItem } from '@lobechat/types';
 import { SQL, and, count, desc, eq, inArray } from 'drizzle-orm';
 
 import {
@@ -5,9 +6,8 @@ import {
   evalDatasets,
   evalEvaluation,
   evaluationRecords,
-} from '@/database/schemas';
-import { LobeChatDatabase } from '@/database/type';
-import { EvalEvaluationStatus, RAGEvalEvaluationItem } from '@/types/eval';
+} from '../../../schemas';
+import { LobeChatDatabase } from '../../../type';
 
 export class EvalEvaluationModel {
   private userId: string;

package/{src/database → packages/database/src}/server/models/ragEval/evaluationRecord.ts

@@ -1,7 +1,7 @@
 import { and, eq } from 'drizzle-orm';
 
-import { NewEvaluationRecordsItem, evaluationRecords } from '@/database/schemas';
-import { LobeChatDatabase } from '@/database/type';
+import { LobeChatDatabase } from '../../../type';
+import { NewEvaluationRecordsItem, evaluationRecords } from '../../../schemas';
 
 export class EvaluationRecordModel {
   private userId: string;

package/{src/database → packages/database/src}/utils/idGenerator.ts

@@ -1,6 +1,9 @@
+// generate('1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', 16); //=> "4f90d13a42"
+import { customAlphabet } from 'nanoid/non-secure';
 import { generate } from 'random-words';
 
-import { createNanoId } from '@/utils/uuid';
+export const createNanoId = (size = 8) =>
+  customAlphabet('1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', size);
 
 const prefixes = {
   agents: 'agt',

package/{vitest.config.server.ts → packages/database/vitest.config.ts}

@@ -5,9 +5,12 @@ export default defineConfig({
   test: {
     alias: {
       /* eslint-disable sort-keys-fix/sort-keys-fix */
-      '@/const': resolve(__dirname, './packages/const/src'),
-      '@/types': resolve(__dirname, './packages/types/src'),
-      '@': resolve(__dirname, './src'),
+      '@/const': resolve(__dirname, '../const/src'),
+      '@/utils/errorResponse': resolve(__dirname, '../../src/utils/errorResponse'),
+      '@/utils': resolve(__dirname, '../utils/src'),
+      '@/database': resolve(__dirname, '../database/src'),
+      '@/types': resolve(__dirname, '../types/src'),
+      '@': resolve(__dirname, '../../src'),
       /* eslint-enable */
     },
     coverage: {
@@ -15,18 +18,16 @@ export default defineConfig({
       exclude: [
         // https://github.com/lobehub/lobe-chat/pull/7265
         ...coverageConfigDefaults.exclude,
-        'src/database/server/core/dbForTest.ts',
+        'src/server/core/dbForTest.ts',
       ],
-      include: ['src/database/models/**/*.ts', 'src/database/server/**/*.ts'],
+      include: ['src/models/**/*.ts', 'src/server/**/*.ts'],
       provider: 'v8',
       reporter: ['text', 'json', 'lcov', 'text-summary'],
-      reportsDirectory: './coverage/server',
     },
     env: {
       TEST_SERVER_DB: '1',
     },
     environment: 'node',
-    include: ['src/database/models/**/**/*.test.ts', 'src/database/server/**/**/*.test.ts'],
     poolOptions: {
       forks: {
         singleFork: true,

package/packages/model-runtime/package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "@aws-sdk/client-bedrock-runtime": "^3.862.0",
     "@lobechat/types": "workspace:*",
+    "@lobechat/utils": "workspace:*",
     "debug": "^4.4.1",
     "openai": "^4.104.0"
   }

package/packages/model-runtime/src/bfl/createImage.test.ts

@@ -7,7 +7,7 @@ import { createBflImage } from './createImage';
 import { BflStatusResponse } from './types';
 
 // Mock external dependencies
-vi.mock('@/utils/imageToBase64', () => ({
+vi.mock('@lobechat/utils', () => ({
   imageUrlToBase64: vi.fn(),
 }));
 
@@ -188,7 +188,7 @@ describe('createBflImage', () => {
     it('should convert single imageUrl to image_prompt base64', async () => {
       // Arrange
       const { parseDataUri } = await import('../utils/uriParser');
-      const { imageUrlToBase64 } = await import('@/utils/imageToBase64');
+      const { imageUrlToBase64 } = await import('@lobechat/utils');
       const { asyncifyPolling } = await import('../utils/asyncifyPolling');
 
       const mockParseDataUri = vi.mocked(parseDataUri);
@@ -291,7 +291,7 @@ describe('createBflImage', () => {
     it('should convert multiple imageUrls for Kontext models', async () => {
       // Arrange
       const { parseDataUri } = await import('../utils/uriParser');
-      const { imageUrlToBase64 } = await import('@/utils/imageToBase64');
+      const { imageUrlToBase64 } = await import('@lobechat/utils');
       const { asyncifyPolling } = await import('../utils/asyncifyPolling');
 
       const mockParseDataUri = vi.mocked(parseDataUri);
@@ -351,7 +351,7 @@ describe('createBflImage', () => {
     it('should limit imageUrls to maximum 4 images', async () => {
       // Arrange
       const { parseDataUri } = await import('../utils/uriParser');
-      const { imageUrlToBase64 } = await import('@/utils/imageToBase64');
+      const { imageUrlToBase64 } = await import('@lobechat/utils');
       const { asyncifyPolling } = await import('../utils/asyncifyPolling');
 
       const mockParseDataUri = vi.mocked(parseDataUri);

package/packages/model-runtime/src/bfl/createImage.ts

@@ -1,7 +1,7 @@
+import { imageUrlToBase64 } from '@lobechat/utils';
 import createDebug from 'debug';
 
 import { RuntimeImageGenParamsValue } from '@/libs/standard-parameters/index';
-import { imageUrlToBase64 } from '@/utils/imageToBase64';
 
 import { AgentRuntimeErrorType } from '../error';
 import { CreateImagePayload, CreateImageResponse } from '../types/image';

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

@@ -1,12 +1,12 @@
 // @vitest-environment edge-runtime
 import { GenerateContentResponse, Tool } from '@google/genai';
+import * as imageToBase64Module from '@lobechat/utils';
 import OpenAI from 'openai';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { OpenAIChatMessage } from '@/libs/model-runtime';
 import { CreateImagePayload } from '@/libs/model-runtime/types/image';
 import { ChatStreamPayload } from '@/types/openai/chat';
-import * as imageToBase64Module from '@/utils/imageToBase64';
 
 import * as debugStreamModule from '../utils/debugStream';
 import { LobeGoogleAI } from './index';

package/packages/model-runtime/src/google/index.ts

@@ -9,9 +9,7 @@ import {
   Type as SchemaType,
   ThinkingConfig,
 } from '@google/genai';
-
-import { imageUrlToBase64 } from '@/utils/imageToBase64';
-import { safeParseJSON } from '@/utils/safeParseJSON';
+import { imageUrlToBase64, safeParseJSON } from '@lobechat/utils';
 
 import { LobeRuntimeAI } from '../BaseAI';
 import { AgentRuntimeErrorType } from '../error';

package/packages/model-runtime/src/ollama/index.ts

@@ -1,8 +1,7 @@
+import { ChatModelCard } from '@lobechat/types';
 import { Ollama, Tool } from 'ollama/browser';
 import { ClientOptions } from 'openai';
 
-import { ModelRequestOptions, OpenAIChatMessage } from '@/libs/model-runtime';
-import { ChatModelCard } from '@/types/llm';
 import { createErrorResponse } from '@/utils/errorResponse';
 
 import { LobeRuntimeAI } from '../BaseAI';
@@ -13,6 +12,8 @@ import {
   Embeddings,
   EmbeddingsPayload,
   ModelProvider,
+  ModelRequestOptions,
+  OpenAIChatMessage,
   PullModelParams,
 } from '../types';
 import { AgentRuntimeError } from '../utils/createError';

package/packages/model-runtime/src/utils/anthropicHelpers.test.ts

@@ -1,8 +1,7 @@
+import { imageUrlToBase64 } from '@lobechat/utils';
 import { OpenAI } from 'openai';
 import { describe, expect, it, vi } from 'vitest';
 
-import { imageUrlToBase64 } from '@/utils/imageToBase64';
-
 import { OpenAIChatMessage, UserMessageContentPart } from '../types/chat';
 import {
   buildAnthropicBlock,
@@ -20,7 +19,7 @@ vi.mock('./uriParser', () => ({
     type: 'base64',
   }),
 }));
-vi.mock('@/utils/imageToBase64');
+vi.mock('@lobechat/utils');
 
 describe('anthropicHelpers', () => {
   describe('buildAnthropicBlock', () => {

package/packages/model-runtime/src/utils/anthropicHelpers.ts

@@ -1,8 +1,7 @@
 import Anthropic from '@anthropic-ai/sdk';
+import { imageUrlToBase64 } from '@lobechat/utils';
 import OpenAI from 'openai';
 
-import { imageUrlToBase64 } from '@/utils/imageToBase64';
-
 import { OpenAIChatMessage, UserMessageContentPart } from '../types';
 import { parseDataUri } from './uriParser';
 

package/packages/model-runtime/src/utils/openaiCompatibleFactory/index.ts

@@ -1,3 +1,4 @@
+import { getModelPropertyWithFallback } from '@lobechat/utils';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import createDebug from 'debug';
@@ -7,7 +8,6 @@ import { Stream } from 'openai/streaming';
 import { LOBE_DEFAULT_MODEL_LIST } from '@/config/aiModels';
 import { RuntimeImageGenParamsValue } from '@/libs/standard-parameters/index';
 import type { ChatModelCard } from '@/types/llm';
-import { getModelPropertyWithFallback } from '@/utils/getFallbackModelProperty';
 
 import { LobeRuntimeAI } from '../../BaseAI';
 import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '../../error';

package/packages/model-runtime/src/utils/openaiHelpers.test.ts

@@ -1,8 +1,7 @@
+import { imageUrlToBase64 } from '@lobechat/utils';
 import OpenAI from 'openai';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { imageUrlToBase64 } from '@/utils/imageToBase64';
-
 import {
   convertImageUrlToFile,
   convertMessageContent,
@@ -12,7 +11,7 @@ import {
 import { parseDataUri } from './uriParser';
 
 // 模拟依赖
-vi.mock('@/utils/imageToBase64');
+vi.mock('@lobechat/utils');
 vi.mock('./uriParser');
 
 describe('convertMessageContent', () => {

package/packages/model-runtime/src/utils/openaiHelpers.ts

@@ -1,8 +1,8 @@
+import { imageUrlToBase64 } from '@lobechat/utils';
 import OpenAI, { toFile } from 'openai';
 
 import { disableStreamModels, systemToUserModels } from '@/const/models';
 import { ChatStreamPayload, OpenAIChatMessage } from '@/libs/model-runtime';
-import { imageUrlToBase64 } from '@/utils/imageToBase64';
 
 import { parseDataUri } from './uriParser';
 
@@ -103,7 +103,7 @@ export const convertOpenAIResponseInputs = async (
 export const pruneReasoningPayload = (payload: ChatStreamPayload) => {
   const shouldStream = !disableStreamModels.has(payload.model);
   const { stream_options, ...cleanedPayload } = payload as any;
-  
+
   return {
     ...cleanedPayload,
     frequency_penalty: 0,

package/packages/model-runtime/src/utils/streams/bedrock/claude.ts

@@ -1,6 +1,5 @@
 import { InvokeModelWithResponseStreamResponse } from '@aws-sdk/client-bedrock-runtime';
-
-import { nanoid } from '@/utils/uuid';
+import { nanoid } from '@lobechat/utils';
 
 import { ChatStreamCallbacks } from '../../../types';
 import { transformAnthropicStream } from '../anthropic';

package/packages/model-runtime/src/utils/streams/bedrock/llama.test.ts

@@ -1,9 +1,8 @@
 import { InvokeModelWithResponseStreamResponse } from '@aws-sdk/client-bedrock-runtime';
+import * as uuidModule from '@lobechat/utils';
 import { Readable } from 'stream';
 import { describe, expect, it, vi } from 'vitest';
 
-import * as uuidModule from '@/utils/uuid';
-
 import { AWSBedrockLlamaStream } from './llama';
 
 describe('AWSBedrockLlamaStream', () => {

package/packages/model-runtime/src/utils/streams/bedrock/llama.ts

@@ -1,6 +1,5 @@
 import { InvokeModelWithResponseStreamResponse } from '@aws-sdk/client-bedrock-runtime';
-
-import { nanoid } from '@/utils/uuid';
+import { nanoid } from '@lobechat/utils';
 
 import { ChatStreamCallbacks } from '../../../types';
 import {

package/packages/model-runtime/src/utils/streams/google-ai.test.ts

@@ -1,8 +1,7 @@
 import { GenerateContentResponse } from '@google/genai';
+import * as uuidModule from '@lobechat/utils';
 import { describe, expect, it, vi } from 'vitest';
 
-import * as uuidModule from '@/utils/uuid';
-
 import { GoogleGenerativeAIStream } from './google-ai';
 
 describe('GoogleGenerativeAIStream', () => {

package/packages/model-runtime/src/utils/streams/google-ai.ts

@@ -1,9 +1,9 @@
 import { GenerateContentResponse } from '@google/genai';
+import { nanoid } from '@lobechat/utils';
 
 import errorLocale from '@/locales/default/error';
 import { ModelTokensUsage } from '@/types/message';
 import { GroundingSearch } from '@/types/search';
-import { nanoid } from '@/utils/uuid';
 
 import { ChatStreamCallbacks } from '../../types';
 import {

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

@@ -1,8 +1,7 @@
+import * as uuidModule from '@lobechat/utils';
 import { ChatResponse } from 'ollama/browser';
 import { describe, expect, it, vi } from 'vitest';
 
-import * as uuidModule from '@/utils/uuid';
-
 import { OllamaStream } from './ollama';
 
 describe('OllamaStream', () => {

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

@@ -1,7 +1,7 @@
+import { nanoid } from '@lobechat/utils';
 import { ChatResponse } from 'ollama/browser';
 
 import { ChatStreamCallbacks } from '@/libs/model-runtime';
-import { nanoid } from '@/utils/uuid';
 
 import {
   StreamContext,

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

@@ -1,6 +1,6 @@
+import { nanoid, safeParseJSON } from '@lobechat/utils';
+
 import { CitationItem, ModelSpeed, ModelTokensUsage } from '@/types/message';
-import { safeParseJSON } from '@/utils/safeParseJSON';
-import { nanoid } from '@/utils/uuid';
 
 import { AgentRuntimeErrorType } from '../../error';
 import { parseToolCalls } from '../../helpers';

package/packages/model-runtime/src/utils/streams/vertex-ai.test.ts

@@ -1,7 +1,6 @@
+import * as uuidModule from '@lobechat/utils';
 import { describe, expect, it, vi } from 'vitest';
 
-import * as uuidModule from '@/utils/uuid';
-
 import { VertexAIStream } from './vertex-ai';
 
 describe('VertexAIStream', () => {

package/packages/model-runtime/src/utils/streams/vertex-ai.ts

@@ -1,8 +1,8 @@
 import { GenerateContentResponse } from '@google/genai';
+import { nanoid } from '@lobechat/utils';
 
 import { ModelTokensUsage } from '@/types/message';
 import { GroundingSearch } from '@/types/search';
-import { nanoid } from '@/utils/uuid';
 
 import { type GoogleAIStreamOptions } from './google-ai';
 import {

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

@@ -7,6 +7,8 @@ export default defineConfig({
       /* 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 */

package/packages/types/src/index.ts

@@ -1,10 +1,15 @@
 export * from './artifact';
 export * from './chunk';
 export * from './clientDB';
+export * from './eval';
 export * from './fetch';
 export * from './knowledgeBase';
+export * from './llm';
 export * from './message';
+export * from './user';
+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 './trace';
+export * from './zustand';

package/packages/utils/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@lobechat/utils",
+  "version": "1.0.0",
+  "private": true,
+  "main": "./src/index.ts",
+  "scripts": {
+    "test": "vitest",
+    "test:coverage": "vitest --coverage"
+  },
+  "dependencies": {
+    "@lobechat/const": "workspace:*",
+    "@lobechat/types": "workspace:*"
+  },
+  "devDependencies": {
+    "vitest-canvas-mock": "^0.3.3"
+  }
+}

package/{src/utils → packages/utils/src}/client/cookie.test.ts

@@ -1,9 +1,7 @@
 import dayjs from 'dayjs';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { COOKIE_CACHE_DAYS } from '@/const/settings';
-
-import { setCookie } from './cookie';
+import { COOKIE_CACHE_DAYS, setCookie } from './cookie';
 
 describe('setCookie', () => {
   // Mock document.cookie since we're in a test environment

package/{src/utils → packages/utils/src}/client/cookie.ts

@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 
-import { COOKIE_CACHE_DAYS } from '@/const/settings';
+export const COOKIE_CACHE_DAYS = 30;
 
 export const setCookie = (
   key: string,

package/{src/utils → packages/utils/src}/client/parserPlaceholder.test.ts

@@ -1,9 +1,9 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { VARIABLE_GENERATORS, parsePlaceholderVariablesMessages } from './parserPlaceholder';
+import { parsePlaceholderVariablesMessages } from './parserPlaceholder';
 
 // Mock dependencies
-vi.mock('@/utils/uuid', () => ({
+vi.mock('../uuid', () => ({
   uuid: () => 'mocked-uuid-12345',
 }));