@lobehub/lobehub 2.0.0-next.105 → 2.0.0-next.107

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

@@ -1,10 +1,13 @@
 import type { ChatModelCard } from '@lobechat/types';
+import { omit } from 'lodash-es';
 import { AiModelType, CHAT_MODEL_IMAGE_GENERATION_PARAMS } from 'model-bank';
 
 // Whitelist for automatic image model generation
 export const IMAGE_GENERATION_MODEL_WHITELIST = [
   'gemini-2.5-flash-image-preview',
   'gemini-2.5-flash-image-preview:free',
+  'gemini-3-pro-image-preview',
+  'gemini-3-pro-image-preview:free',
   // More models can be added in the future
 ] as const;
 
@@ -41,19 +44,18 @@ export async function postProcessModelList(
     const matchingModels = finalModels.filter((model) => model.id.endsWith(whitelistPattern));
 
     for (const model of matchingModels) {
-      // Blacklist: remove unnecessary properties, keep the rest
-      const {
-        files,           // drop
-        functionCall,    // drop
-        reasoning,       // drop
-        search,          // drop
-        imageOutput,     // drop
-        video,           // drop
-        vision,          // drop
-        type: _dropType, // will be overwritten
-        parameters: _dropParams, // will be overwritten
-        ...rest
-      } = model;
+      // Remove unnecessary properties, keep the rest
+      const rest = omit(model, [
+        'files',
+        'functionCall',
+        'reasoning',
+        'search',
+        'imageOutput',
+        'video',
+        'vision',
+        'type',
+        'parameters',
+      ]);
 
       imageModels.push({
         ...rest, // Keep other fields (such as displayName, pricing, enabled, contextWindowTokens, etc.)

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

@@ -65,6 +65,7 @@ const checkAbortSignal = (signal: AbortSignal) => {
 const categorizeError = (
   error: any,
   isAborted: boolean,
+  isEditingImage: boolean,
 ): { errorMessage: string; errorType: AsyncTaskErrorType } => {
   log('🔥🔥🔥 [ASYNC] categorizeError called:', {
     errorMessage: error?.message,
@@ -73,6 +74,7 @@ const categorizeError = (
     errorType: error?.errorType,
     fullError: JSON.stringify(error, null, 2),
     isAborted,
+    isEditingImage,
   });
   // Handle Comfy UI errors
   if (error.errorType === AgentRuntimeErrorType.ComfyUIServiceUnavailable) {
@@ -127,6 +129,15 @@ const categorizeError = (
     };
   }
 
+  if (error.errorType === AgentRuntimeErrorType.ProviderNoImageGenerated) {
+    return {
+      errorMessage: isEditingImage
+        ? 'Provider returned no image (maybe content review). Try a safer source image or milder prompt.'
+        : 'Provider returned no image (maybe content review). Try a milder prompt or another model.',
+      errorType: AsyncTaskErrorType.ServerError,
+    };
+  }
+
   // FIXME: 401 的问题应该放到 agentRuntime 中处理会更好
   if (error.errorType === AgentRuntimeErrorType.InvalidProviderAPIKey || error?.status === 401) {
     return {
@@ -195,11 +206,14 @@ export const imageRouter = router({
     const abortController = new AbortController();
     let timeoutId: ReturnType<typeof setTimeout> | null = null;
 
+    const isEditingImage =
+      Boolean((params as any).imageUrl) || Boolean(params.imageUrls && params.imageUrls.length > 0);
+
     try {
       const imageGenerationPromise = async (signal: AbortSignal) => {
         log('Initializing agent runtime for provider: %s', provider);
 
-        const agentRuntime = await initModelRuntimeWithUserPayload(provider, ctx.jwtPayload);
+        const agentRuntime = initModelRuntimeWithUserPayload(provider, ctx.jwtPayload);
 
         // Check if operation has been cancelled
         checkAbortSignal(signal);
@@ -328,7 +342,11 @@ export const imageRouter = router({
       });
 
       // Improved error categorization logic
-      const { errorType, errorMessage } = categorizeError(error, abortController.signal.aborted);
+      const { errorType, errorMessage } = categorizeError(
+        error,
+        abortController.signal.aborted,
+        isEditingImage,
+      );
 
       await ctx.asyncTaskModel.update(taskId, {
         error: new AsyncTaskError(errorType, errorMessage),