@lobehub/lobehub 2.0.0-next.310 → 2.0.0-next.312

package/src/server/services/toolExecution/builtin.ts

@@ -1,13 +1,14 @@
 import { WebBrowsingManifest } from '@lobechat/builtin-tool-web-browsing';
 import { WebBrowsingExecutionRuntime } from '@lobechat/builtin-tool-web-browsing/executionRuntime';
+import { type LobeChatDatabase } from '@lobechat/database';
 import { type ChatToolPayload } from '@lobechat/types';
 import { safeParseJSON } from '@lobechat/utils';
 import debug from 'debug';
 
-import { LobehubSkillService } from '@/server/services/lobehubSkill';
+import { MarketService } from '@/server/services/market';
 import { SearchService } from '@/server/services/search';
 
-import { type IToolExecutor, type ToolExecutionContext, type ToolExecutionResult } from './types';
+import { type IToolExecutor, type ToolExecutionResult } from './types';
 
 const log = debug('lobe-server:builtin-tools-executor');
 
@@ -16,10 +17,12 @@ const BuiltinToolServerRuntimes: Record<string, any> = {
 };
 
 export class BuiltinToolsExecutor implements IToolExecutor {
-  async execute(
-    payload: ChatToolPayload,
-    context: ToolExecutionContext,
-  ): Promise<ToolExecutionResult> {
+  private marketService: MarketService;
+
+  constructor(db: LobeChatDatabase, userId: string) {
+    this.marketService = new MarketService({ userInfo: { userId } });
+  }
+  async execute(payload: ChatToolPayload): Promise<ToolExecutionResult> {
     const { identifier, apiName, arguments: argsStr, source } = payload;
     const args = safeParseJSON(argsStr) || {};
 
@@ -31,18 +34,9 @@ export class BuiltinToolsExecutor implements IToolExecutor {
       args,
     );
 
-    // Route LobeHub Skills to dedicated service
+    // Route LobeHub Skills to MarketService
     if (source === 'lobehubSkill') {
-      if (!context.serverDB || !context.userId) {
-        return {
-          content: 'Server context not available for LobeHub Skills execution.',
-          error: { code: 'CONTEXT_NOT_AVAILABLE' },
-          success: false,
-        };
-      }
-
-      const skillService = new LobehubSkillService(context.serverDB, context.userId);
-      return skillService.execute({
+      return this.marketService.executeLobehubSkill({
         args,
         provider: identifier,
         toolName: apiName,

package/src/server/services/toolExecution/index.ts

@@ -4,7 +4,11 @@ import debug from 'debug';
 import { type MCPService } from '../mcp';
 import { type PluginGatewayService } from '../pluginGateway';
 import { type BuiltinToolsExecutor } from './builtin';
-import { type ToolExecutionContext, type ToolExecutionResult, type ToolExecutionResultResponse } from './types';
+import {
+  type ToolExecutionContext,
+  type ToolExecutionResult,
+  type ToolExecutionResultResponse,
+} from './types';
 
 const log = debug('lobe-server:tool-execution-service');
 
@@ -43,7 +47,7 @@ export class ToolExecutionService {
       let data: ToolExecutionResult;
       switch (typeStr) {
         case 'builtin': {
-          data = await this.builtinToolsExecutor.execute(payload, context);
+          data = await this.builtinToolsExecutor.execute(payload);
           break;
         }
 

package/src/server/sitemap.test.ts

@@ -59,7 +59,7 @@ describe('Sitemap', () => {
       );
       expect(pageSitemap).toContainEqual(
         expect.objectContaining({
-          url: getCanonicalUrl('/community/assistant'),
+          url: getCanonicalUrl('/community/agent'),
           changeFrequency: 'daily',
           priority: 0.7,
         }),
@@ -85,13 +85,13 @@ describe('Sitemap', () => {
       expect(assistantsSitemap.length).toBe(LOCALE_COUNT);
       expect(assistantsSitemap).toContainEqual(
         expect.objectContaining({
-          url: getCanonicalUrl('/community/assistant/test-assistant'),
+          url: getCanonicalUrl('/community/agent/test-assistant'),
           lastModified: '2023-01-01T00:00:00.000Z',
         }),
       );
       expect(assistantsSitemap).toContainEqual(
         expect.objectContaining({
-          url: getCanonicalUrl('/community/assistant/test-assistant?hl=zh-CN'),
+          url: getCanonicalUrl('/community/agent/test-assistant?hl=zh-CN'),
           lastModified: '2023-01-01T00:00:00.000Z',
         }),
       );
@@ -113,7 +113,7 @@ describe('Sitemap', () => {
       expect(firstPageSitemap.length).toBe(100 * LOCALE_COUNT); // 100 items * LOCALE_COUNT locales
       expect(firstPageSitemap).toContainEqual(
         expect.objectContaining({
-          url: getCanonicalUrl('/community/assistant/test-assistant-0'),
+          url: getCanonicalUrl('/community/agent/test-assistant-0'),
           lastModified: '2023-01-01T00:00:00.000Z',
         }),
       );
@@ -123,7 +123,7 @@ describe('Sitemap', () => {
       expect(secondPageSitemap.length).toBe(50 * LOCALE_COUNT); // 50 items * LOCALE_COUNT locales
       expect(secondPageSitemap).toContainEqual(
         expect.objectContaining({
-          url: getCanonicalUrl('/community/assistant/test-assistant-100'),
+          url: getCanonicalUrl('/community/agent/test-assistant-100'),
           lastModified: '2023-01-01T00:00:00.000Z',
         }),
       );

package/src/server/sitemap.ts

@@ -213,7 +213,7 @@ export class Sitemap {
       const sitmap = pageAssistants
         .filter((item) => item.identifier) // Filter out items with empty identifiers
         .map((item) =>
-          this._genSitemap(urlJoin('/community/assistant', item.identifier), {
+          this._genSitemap(urlJoin('/community/agent', item.identifier), {
             lastModified: item?.lastModified || LAST_MODIFIED,
           }),
         );
@@ -224,7 +224,7 @@ export class Sitemap {
     const sitmap = list
       .filter((item) => item.identifier) // 过滤掉 identifier 为空的项目
       .map((item) =>
-        this._genSitemap(urlJoin('/community/assistant', item.identifier), {
+        this._genSitemap(urlJoin('/community/agent', item.identifier), {
           lastModified: item?.lastModified || LAST_MODIFIED,
         }),
       );
@@ -311,7 +311,7 @@ export class Sitemap {
 
       /* ↑ cloud slot ↑ */
       ...this._genSitemap('/community', { changeFrequency: 'daily', priority: 0.7 }),
-      ...this._genSitemap('/community/assistant', { changeFrequency: 'daily', priority: 0.7 }),
+      ...this._genSitemap('/community/agent', { changeFrequency: 'daily', priority: 0.7 }),
       ...this._genSitemap('/community/mcp', { changeFrequency: 'daily', priority: 0.7 }),
       ...this._genSitemap('/community/plugin', { changeFrequency: 'daily', priority: 0.7 }),
       ...this._genSitemap('/community/model', { changeFrequency: 'daily', priority: 0.7 }),

package/src/services/codeInterpreter.ts

@@ -5,16 +5,6 @@ import type {
   ExportAndUploadFileInput,
   ExportAndUploadFileResult,
 } from '@/server/routers/tools/market';
-import { useUserStore } from '@/store/user';
-import { settingsSelectors } from '@/store/user/slices/settings/selectors/settings';
-
-/**
- * Get Market access token from user settings (stored by MarketAuthProvider)
- */
-const getMarketAccessToken = (): string | undefined => {
-  const settings = settingsSelectors.currentSettings(useUserStore.getState());
-  return settings.market?.accessToken;
-};
 
 class CodeInterpreterService {
   /**
@@ -28,10 +18,7 @@ class CodeInterpreterService {
     params: Record<string, any>,
     context: { topicId: string; userId: string },
   ): Promise<CallToolResult> {
-    const marketAccessToken = getMarketAccessToken();
-
     const input: CallCodeInterpreterToolInput = {
-      marketAccessToken,
       params,
       toolName,
       topicId: context.topicId,

package/packages/model-runtime/src/types/textToImage.ts

@@ -1,36 +0,0 @@
-export type DallEImageQuality = 'standard' | 'hd';
-export type DallEImageStyle = 'vivid' | 'natural';
-export type DallEImageSize = '1792x1024' | '1024x1024' | '1024x1792';
-
-export interface TextToImagePayload {
-  model: string;
-  /**
-   * The number of images to generate. Must be between 1 and 10.
-   */
-  n?: number;
-  /**
-   * A text description of the desired image(s).
-   * The maximum length is 1000 characters.
-   */
-  prompt: string;
-  /**
-   * The quality of the image that will be generated.
-   * hd creates images with finer details and greater consistency across the image.
-   * This param is only supported for dall-e-3.
-   */
-  quality?: DallEImageQuality;
-  /**
-   * The size of the generated images.
-   * Must be one of '1792x1024' , '1024x1024' , '1024x1792'
-   */
-  size?: DallEImageSize;
-
-  /**
-   * The style of the generated images. Must be one of vivid or natural.
-   * Vivid causes the model to lean towards generating hyper-real and dramatic images.
-   * Natural causes the model to produce more natural, less hyper-real looking images.
-   * This param is only supported for dall-e-3.
-   * @default vivid
-   */
-  style?: DallEImageStyle;
-}

package/src/server/services/lobehubSkill/index.ts

@@ -1,109 +0,0 @@
-import { type LobeChatDatabase } from '@lobechat/database';
-import { MarketSDK } from '@lobehub/market-sdk';
-import debug from 'debug';
-
-import { UserModel } from '@/database/models/user';
-import { generateTrustedClientToken } from '@/libs/trusted-client';
-
-const log = debug('lobe-server:lobehub-skill-service');
-
-export interface LobehubSkillExecuteParams {
-  args: Record<string, any>;
-  provider: string;
-  toolName: string;
-}
-
-export interface LobehubSkillExecuteResult {
-  content: string;
-  error?: { code: string; message?: string };
-  success: boolean;
-}
-
-export class LobehubSkillService {
-  private db: LobeChatDatabase;
-  private userId: string;
-  private marketSDK?: MarketSDK;
-
-  constructor(db: LobeChatDatabase, userId: string) {
-    this.db = db;
-    this.userId = userId;
-  }
-
-  /**
-   * Initialize MarketSDK with trusted client token
-   */
-  private async getMarketSDK(): Promise<MarketSDK | null> {
-    if (this.marketSDK) return this.marketSDK;
-
-    try {
-      const user = await UserModel.findById(this.db, this.userId);
-      if (!user?.email) {
-        log('getMarketSDK: user email not found');
-        return null;
-      }
-
-      const trustedClientToken = generateTrustedClientToken({
-        email: user.email,
-        name: user.fullName || user.firstName || undefined,
-        userId: this.userId,
-      });
-
-      if (!trustedClientToken) {
-        log('getMarketSDK: trusted client not configured');
-        return null;
-      }
-
-      this.marketSDK = new MarketSDK({
-        baseURL: process.env.NEXT_PUBLIC_MARKET_BASE_URL,
-        trustedClientToken,
-      });
-
-      return this.marketSDK;
-    } catch (error) {
-      log('getMarketSDK: error creating SDK: %O', error);
-      return null;
-    }
-  }
-
-  /**
-   * Execute a LobeHub Skill tool
-   */
-  async execute(params: LobehubSkillExecuteParams): Promise<LobehubSkillExecuteResult> {
-    const { provider, toolName, args } = params;
-
-    log('execute: %s/%s with args: %O', provider, toolName, args);
-
-    const sdk = await this.getMarketSDK();
-    if (!sdk) {
-      return {
-        content:
-          'MarketSDK not available. Please ensure you are authenticated with LobeHub Market.',
-        error: { code: 'MARKET_SDK_NOT_AVAILABLE' },
-        success: false,
-      };
-    }
-
-    try {
-      const response = await sdk.skills.callTool(provider, {
-        args,
-        tool: toolName,
-      });
-
-      log('execute: response: %O', response);
-
-      return {
-        content: typeof response.data === 'string' ? response.data : JSON.stringify(response.data),
-        success: response.success,
-      };
-    } catch (error) {
-      const err = error as Error;
-      console.error('LobehubSkillService.execute error %s/%s: %O', provider, toolName, err);
-
-      return {
-        content: err.message,
-        error: { code: 'LOBEHUB_SKILL_ERROR', message: err.message },
-        success: false,
-      };
-    }
-  }
-}