@chatluna/v1-shared-adapter 1.0.7 → 1.0.9

package/lib/index.cjs

@@ -138,7 +138,7 @@ var import_sse = require("koishi-plugin-chatluna/utils/sse");
 var import_messages = require("@langchain/core/messages");
 var import_zod_to_json_schema = require("zod-to-json-schema");
 var import_string = require("koishi-plugin-chatluna/utils/string");
-var import_zod = require("zod");
+var import_types = require("@langchain/core/utils/types");
 async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInput2, removeSystemMessage) {
   const result = [];
   for (const rawMessage of messages) {
@@ -294,7 +294,7 @@ function formatToolsToOpenAITools(tools, includeGoogleSearch) {
 __name(formatToolsToOpenAITools, "formatToolsToOpenAITools");
 function formatToolToOpenAITool(tool) {
   const parameters = removeAdditionalProperties(
-    tool.schema instanceof import_zod.ZodSchema ? (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema, {
+    (0, import_types.isZodSchemaV3)(tool.schema) ? (0, import_zod_to_json_schema.zodToJsonSchema)(tool.schema, {
       allowedAdditionalProperties: void 0
     }) : tool.schema
   );
@@ -513,16 +513,6 @@ async function* processStreamResponse(requestContext, iterator) {
           new Error("Error when calling completion, Result: " + chunk)
         );
       }
-      if (data.usage) {
-        yield new import_outputs.ChatGenerationChunk({
-          message: new import_messages2.AIMessageChunk(""),
-          text: "",
-          generationInfo: {
-            tokenUsage: data.usage
-          }
-        });
-        continue;
-      }
       const choice = data.choices?.[0];
       if (!choice) continue;
       const { delta } = choice;
@@ -536,6 +526,16 @@ async function* processStreamResponse(requestContext, iterator) {
         message: messageChunk,
         text: messageChunk.content
       });
+      if (data.usage) {
+        yield new import_outputs.ChatGenerationChunk({
+          message: new import_messages2.AIMessageChunk(""),
+          text: "",
+          generationInfo: {
+            tokenUsage: data.usage
+          }
+        });
+        continue;
+      }
     } catch (e) {
       if (errorCount > 5) {
         requestContext.modelRequester.logger.error(
@@ -673,21 +673,29 @@ async function createEmbeddings(requestContext, params, embeddingUrl = "embeddin
     }
     throw new Error(`Call Embedding Error: ${JSON.stringify(data)}`);
   } catch (e) {
-    requestContext.modelRequester.logger.debug(e);
+    if (e instanceof import_error.ChatLunaError) {
+      throw e;
+    }
     throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
   }
 }
 __name(createEmbeddings, "createEmbeddings");
-async function getModels(requestContext) {
+async function getModels(requestContext, config) {
   const { modelRequester } = requestContext;
   let data;
   try {
-    const response = await modelRequester.get("models");
+    const response = await modelRequester.get(
+      "models",
+      {},
+      { signal: config?.signal }
+    );
     data = await response.text();
     data = JSON.parse(data);
     return data.data.map((model) => model.id);
   } catch (e) {
-    requestContext.modelRequester.logger.error(e);
+    if (e instanceof import_error.ChatLunaError) {
+      throw e;
+    }
     throw new Error(
       "error when listing openai models, Result: " + JSON.stringify(data)
     );

package/lib/index.mjs

@@ -108,7 +108,7 @@ import {
   getImageMimeType,
   isMessageContentImageUrl
 } from "koishi-plugin-chatluna/utils/string";
-import { ZodSchema } from "zod";
+import { isZodSchemaV3 } from "@langchain/core/utils/types";
 async function langchainMessageToOpenAIMessage(messages, plugin, model, supportImageInput2, removeSystemMessage) {
   const result = [];
   for (const rawMessage of messages) {
@@ -264,7 +264,7 @@ function formatToolsToOpenAITools(tools, includeGoogleSearch) {
 __name(formatToolsToOpenAITools, "formatToolsToOpenAITools");
 function formatToolToOpenAITool(tool) {
   const parameters = removeAdditionalProperties(
-    tool.schema instanceof ZodSchema ? zodToJsonSchema(tool.schema, {
+    isZodSchemaV3(tool.schema) ? zodToJsonSchema(tool.schema, {
       allowedAdditionalProperties: void 0
     }) : tool.schema
   );
@@ -483,16 +483,6 @@ async function* processStreamResponse(requestContext, iterator) {
           new Error("Error when calling completion, Result: " + chunk)
         );
       }
-      if (data.usage) {
-        yield new ChatGenerationChunk({
-          message: new AIMessageChunk2(""),
-          text: "",
-          generationInfo: {
-            tokenUsage: data.usage
-          }
-        });
-        continue;
-      }
       const choice = data.choices?.[0];
       if (!choice) continue;
       const { delta } = choice;
@@ -506,6 +496,16 @@ async function* processStreamResponse(requestContext, iterator) {
         message: messageChunk,
         text: messageChunk.content
       });
+      if (data.usage) {
+        yield new ChatGenerationChunk({
+          message: new AIMessageChunk2(""),
+          text: "",
+          generationInfo: {
+            tokenUsage: data.usage
+          }
+        });
+        continue;
+      }
     } catch (e) {
       if (errorCount > 5) {
         requestContext.modelRequester.logger.error(
@@ -643,21 +643,29 @@ async function createEmbeddings(requestContext, params, embeddingUrl = "embeddin
     }
     throw new Error(`Call Embedding Error: ${JSON.stringify(data)}`);
   } catch (e) {
-    requestContext.modelRequester.logger.debug(e);
+    if (e instanceof ChatLunaError) {
+      throw e;
+    }
     throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
   }
 }
 __name(createEmbeddings, "createEmbeddings");
-async function getModels(requestContext) {
+async function getModels(requestContext, config) {
   const { modelRequester } = requestContext;
   let data;
   try {
-    const response = await modelRequester.get("models");
+    const response = await modelRequester.get(
+      "models",
+      {},
+      { signal: config?.signal }
+    );
     data = await response.text();
     data = JSON.parse(data);
     return data.data.map((model) => model.id);
   } catch (e) {
-    requestContext.modelRequester.logger.error(e);
+    if (e instanceof ChatLunaError) {
+      throw e;
+    }
     throw new Error(
       "error when listing openai models, Result: " + JSON.stringify(data)
     );

package/lib/requester.d.ts

@@ -5,6 +5,7 @@ import { SSEEvent } from 'koishi-plugin-chatluna/utils/sse';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 import { Context } from 'koishi';
 import { Response } from 'undici/types/fetch';
+import { RunnableConfig } from '@langchain/core/runnables';
 interface RequestContext<T extends ClientConfig = ClientConfig, R extends ChatLunaPlugin.Config = ChatLunaPlugin.Config> {
     ctx: Context;
     config: T;
@@ -43,6 +44,6 @@ export declare function processResponse<T extends ClientConfig, R extends ChatLu
 export declare function completionStream<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: ModelRequestParams, completionUrl?: string, enableGoogleSearch?: boolean, supportImageInput?: boolean): AsyncGenerator<ChatGenerationChunk>;
 export declare function completion<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: ModelRequestParams, completionUrl?: string, enableGoogleSearch?: boolean, supportImageInput?: boolean): Promise<ChatGenerationChunk>;
 export declare function createEmbeddings<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: EmbeddingsRequestParams, embeddingUrl?: string): Promise<number[] | number[][]>;
-export declare function getModels<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>): Promise<string[]>;
+export declare function getModels<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, config?: RunnableConfig): Promise<string[]>;
 export declare function createRequestContext<T extends ClientConfig, R extends ChatLunaPlugin.Config>(ctx: Context, config: T, pluginConfig: R, plugin: ChatLunaPlugin, modelRequester: ModelRequester<T, R>): RequestContext<T, R>;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -37,16 +37,16 @@
   },
   "resolutions": {
     "@langchain/core": "0.3.62",
-    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.19"
+    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.21"
   },
   "overrides": {
     "@langchain/core": "0.3.62",
-    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.19"
+    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.21"
   },
   "pnpm": {
     "overrides": {
       "@langchain/core": "0.3.62",
-      "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.19"
+      "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.21"
     }
   },
   "keywords": [
@@ -70,6 +70,6 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.28"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.42"
   }
 }