koishi-plugin-chatluna-google-gemini-adapter 1.2.17 → 1.2.19

package/lib/index.cjs

@@ -210,7 +210,8 @@ function formatToolsToGeminiAITools(tools, config, model) {
   ];
   const imageGenerationModels = [
     "gemini-2.0-flash-exp",
-    "gemini-2.0-flash-exp-image-generation"
+    "gemini-2.0-flash-exp-image-generation",
+    "gemini-2.5-flash-image-preview"
   ];
   let googleSearch = config.googleSearch;
   let codeExecution = config.codeExecution;
@@ -344,6 +345,10 @@ var GeminiRequester = class extends import_api.ModelRequester {
       } else if (thinkingBudget >= 0 && thinkingBudget < 128) {
         thinkingBudget = 128;
       }
+      let imageGeneration = this._pluginConfig.imageGeneration ?? false;
+      if (imageGeneration) {
+        imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("gemini-2.5-flash-image");
+      }
       const response = await this._post(
         `models/${model}:streamGenerateContent?alt=sse`,
         {
@@ -375,10 +380,7 @@ var GeminiRequester = class extends import_api.ModelRequester {
             temperature: params.temperature,
             maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
             topP: params.topP,
-            responseModalities: params.model.includes(
-              // TODO: Wait for google release to all models
-              "gemini-2.0-flash-exp"
-            ) && this._pluginConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
+            responseModalities: imageGeneration ? ["TEXT", "IMAGE"] : void 0,
             thinkingConfig: enabledThinking != null || this._pluginConfig.includeThoughts ? {
               thinkingBudget,
               includeThoughts: this._pluginConfig.includeThoughts
@@ -419,11 +421,14 @@ var GeminiRequester = class extends import_api.ModelRequester {
           }
           for (const candidate of transformValue.candidates) {
             const parts = candidate.content?.parts;
-            if ((parts == null || parts.length < 1) && candidate.finishReason !== "STOP") {
+            if ((parts == null || parts.length < 1) && candidate.finishReason !== "STOP" && candidate.content === null) {
               throw new Error(chunk);
             } else if (candidate.finishReason === "STOP" && parts == null) {
               continue;
             }
+            if (parts == null) {
+              continue;
+            }
             for (const part of parts) {
               controller.enqueue(part);
             }
@@ -694,7 +699,7 @@ var GeminiClient = class extends import_client.PlatformModelAndEmbeddingsClient
           functionCall: !model.name.includes("vision"),
           supportMode: ["all"]
         };
-        if (model.name.includes("gemini-2.5") && !model.name.includes("pro")) {
+        if (model.name.includes("gemini-2.5") && !model.name.includes("pro") && !model.name.includes("image")) {
           if (!model.name.includes("-thinking")) {
             models.push(
               { ...info, name: model.name + "-nonthinking" },
@@ -781,7 +786,7 @@ var Config4 = import_koishi.Schema.intersect([
   }),
   import_koishi.Schema.object({
     maxTokens: import_koishi.Schema.number().min(16).max(2097e3).step(16).default(8064),
-    temperature: import_koishi.Schema.percent().min(0).max(2).step(0.1).default(0.8),
+    temperature: import_koishi.Schema.percent().min(0).max(2).step(0.1).default(1),
     googleSearch: import_koishi.Schema.boolean().default(false),
     codeExecution: import_koishi.Schema.boolean().default(false),
     urlContext: import_koishi.Schema.boolean().default(false),

package/lib/index.mjs

@@ -203,7 +203,8 @@ function formatToolsToGeminiAITools(tools, config, model) {
   ];
   const imageGenerationModels = [
     "gemini-2.0-flash-exp",
-    "gemini-2.0-flash-exp-image-generation"
+    "gemini-2.0-flash-exp-image-generation",
+    "gemini-2.5-flash-image-preview"
   ];
   let googleSearch = config.googleSearch;
   let codeExecution = config.codeExecution;
@@ -337,6 +338,10 @@ var GeminiRequester = class extends ModelRequester {
       } else if (thinkingBudget >= 0 && thinkingBudget < 128) {
         thinkingBudget = 128;
       }
+      let imageGeneration = this._pluginConfig.imageGeneration ?? false;
+      if (imageGeneration) {
+        imageGeneration = params.model.includes("gemini-2.0-flash-exp") || params.model.includes("gemini-2.5-flash-image");
+      }
       const response = await this._post(
         `models/${model}:streamGenerateContent?alt=sse`,
         {
@@ -368,10 +373,7 @@ var GeminiRequester = class extends ModelRequester {
             temperature: params.temperature,
             maxOutputTokens: params.model.includes("vision") ? void 0 : params.maxTokens,
             topP: params.topP,
-            responseModalities: params.model.includes(
-              // TODO: Wait for google release to all models
-              "gemini-2.0-flash-exp"
-            ) && this._pluginConfig.imageGeneration ? ["TEXT", "IMAGE"] : void 0,
+            responseModalities: imageGeneration ? ["TEXT", "IMAGE"] : void 0,
             thinkingConfig: enabledThinking != null || this._pluginConfig.includeThoughts ? {
               thinkingBudget,
               includeThoughts: this._pluginConfig.includeThoughts
@@ -412,11 +414,14 @@ var GeminiRequester = class extends ModelRequester {
           }
           for (const candidate of transformValue.candidates) {
             const parts = candidate.content?.parts;
-            if ((parts == null || parts.length < 1) && candidate.finishReason !== "STOP") {
+            if ((parts == null || parts.length < 1) && candidate.finishReason !== "STOP" && candidate.content === null) {
               throw new Error(chunk);
             } else if (candidate.finishReason === "STOP" && parts == null) {
               continue;
             }
+            if (parts == null) {
+              continue;
+            }
             for (const part of parts) {
               controller.enqueue(part);
             }
@@ -687,7 +692,7 @@ var GeminiClient = class extends PlatformModelAndEmbeddingsClient {
           functionCall: !model.name.includes("vision"),
           supportMode: ["all"]
         };
-        if (model.name.includes("gemini-2.5") && !model.name.includes("pro")) {
+        if (model.name.includes("gemini-2.5") && !model.name.includes("pro") && !model.name.includes("image")) {
           if (!model.name.includes("-thinking")) {
             models.push(
               { ...info, name: model.name + "-nonthinking" },
@@ -774,7 +779,7 @@ var Config4 = Schema.intersect([
   }),
   Schema.object({
     maxTokens: Schema.number().min(16).max(2097e3).step(16).default(8064),
-    temperature: Schema.percent().min(0).max(2).step(0.1).default(0.8),
+    temperature: Schema.percent().min(0).max(2).step(0.1).default(1),
     googleSearch: Schema.boolean().default(false),
     codeExecution: Schema.boolean().default(false),
     urlContext: Schema.boolean().default(false),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-google-gemini-adapter",
   "description": "google-gemini adapter for chatluna",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -62,10 +62,10 @@
     "adapter"
   ],
   "dependencies": {
+    "@chatluna/v1-shared-adapter": "^1.0.2",
     "@langchain/core": "^0.3.43",
     "zod": "^3.25.0-canary.20250211T214501",
-    "zod-to-json-schema": "^3.24.5",
-    "@chatluna/v1-shared-adapter": "^1.0.2"
+    "zod-to-json-schema": "^3.24.5"
   },
   "devDependencies": {
     "atsc": "^2.1.0",
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.11"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.13"
   },
   "koishi": {
     "description": {