@chatluna/v1-shared-adapter 1.0.11 → 1.0.13

package/lib/index.cjs

@@ -442,6 +442,7 @@ __name(convertDeltaToMessageChunk, "convertDeltaToMessageChunk");
 // src/requester.ts
 var import_messages2 = require("@langchain/core/messages");
 var import_string2 = require("koishi-plugin-chatluna/utils/string");
+var import_logger = require("koishi-plugin-chatluna/utils/logger");
 async function buildChatCompletionParams(params, plugin, enableGoogleSearch, supportImageInput2) {
   const base = {
     model: params.model,
@@ -511,6 +512,20 @@ async function* processStreamResponse(requestContext, iterator) {
         );
       }
       const choice = data.choices?.[0];
+      if (data.usage) {
+        yield new import_outputs.ChatGenerationChunk({
+          message: new import_messages2.AIMessageChunk(""),
+          text: "",
+          generationInfo: {
+            tokenUsage: {
+              promptTokens: data.usage.prompt_tokens,
+              completionTokens: data.usage.completion_tokens,
+              totalTokens: data.usage.total_tokens
+            }
+          }
+        });
+        continue;
+      }
       if (!choice) continue;
       const { delta } = choice;
       const messageChunk = convertDeltaToMessageChunk(delta, defaultRole);
@@ -523,16 +538,6 @@ 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(
@@ -604,15 +609,16 @@ async function processResponse(requestContext, response) {
 __name(processResponse, "processResponse");
 async function* completionStream(requestContext, params, completionUrl = "chat/completions", enableGoogleSearch, supportImageInput2) {
   const { modelRequester } = requestContext;
+  const chatCompletionParams = await buildChatCompletionParams(
+    params,
+    requestContext.plugin,
+    enableGoogleSearch ?? false,
+    supportImageInput2 ?? true
+  );
   try {
     const response = await modelRequester.post(
       completionUrl,
-      await buildChatCompletionParams(
-        params,
-        requestContext.plugin,
-        enableGoogleSearch ?? false,
-        supportImageInput2 ?? true
-      ),
+      chatCompletionParams,
       {
         signal: params.signal
       }
@@ -620,6 +626,13 @@ async function* completionStream(requestContext, params, completionUrl = "chat/c
     const iterator = (0, import_sse.sseIterable)(response);
     yield* processStreamResponse(requestContext, iterator);
   } catch (e) {
+    if (requestContext.ctx.chatluna.config.isLog) {
+      await (0, import_logger.trackLogToLocal)(
+        "Request",
+        JSON.stringify(chatCompletionParams),
+        requestContext.ctx.logger("")
+      );
+    }
     if (e instanceof import_error.ChatLunaError) {
       throw e;
     } else {
@@ -647,6 +660,13 @@ async function completion(requestContext, params, completionUrl = "chat/completi
     );
     return await processResponse(requestContext, response);
   } catch (e) {
+    if (requestContext.ctx.chatluna.config.isLog) {
+      await (0, import_logger.trackLogToLocal)(
+        "Request",
+        JSON.stringify(chatCompletionParams),
+        requestContext.ctx.logger("")
+      );
+    }
     if (e instanceof import_error.ChatLunaError) {
       throw e;
     } else {

package/lib/index.mjs

@@ -412,6 +412,7 @@ __name(convertDeltaToMessageChunk, "convertDeltaToMessageChunk");
 // src/requester.ts
 import { AIMessageChunk as AIMessageChunk2 } from "@langchain/core/messages";
 import { getMessageContent } from "koishi-plugin-chatluna/utils/string";
+import { trackLogToLocal } from "koishi-plugin-chatluna/utils/logger";
 async function buildChatCompletionParams(params, plugin, enableGoogleSearch, supportImageInput2) {
   const base = {
     model: params.model,
@@ -481,6 +482,20 @@ async function* processStreamResponse(requestContext, iterator) {
         );
       }
       const choice = data.choices?.[0];
+      if (data.usage) {
+        yield new ChatGenerationChunk({
+          message: new AIMessageChunk2(""),
+          text: "",
+          generationInfo: {
+            tokenUsage: {
+              promptTokens: data.usage.prompt_tokens,
+              completionTokens: data.usage.completion_tokens,
+              totalTokens: data.usage.total_tokens
+            }
+          }
+        });
+        continue;
+      }
       if (!choice) continue;
       const { delta } = choice;
       const messageChunk = convertDeltaToMessageChunk(delta, defaultRole);
@@ -493,16 +508,6 @@ 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(
@@ -574,15 +579,16 @@ async function processResponse(requestContext, response) {
 __name(processResponse, "processResponse");
 async function* completionStream(requestContext, params, completionUrl = "chat/completions", enableGoogleSearch, supportImageInput2) {
   const { modelRequester } = requestContext;
+  const chatCompletionParams = await buildChatCompletionParams(
+    params,
+    requestContext.plugin,
+    enableGoogleSearch ?? false,
+    supportImageInput2 ?? true
+  );
   try {
     const response = await modelRequester.post(
       completionUrl,
-      await buildChatCompletionParams(
-        params,
-        requestContext.plugin,
-        enableGoogleSearch ?? false,
-        supportImageInput2 ?? true
-      ),
+      chatCompletionParams,
       {
         signal: params.signal
       }
@@ -590,6 +596,13 @@ async function* completionStream(requestContext, params, completionUrl = "chat/c
     const iterator = sseIterable(response);
     yield* processStreamResponse(requestContext, iterator);
   } catch (e) {
+    if (requestContext.ctx.chatluna.config.isLog) {
+      await trackLogToLocal(
+        "Request",
+        JSON.stringify(chatCompletionParams),
+        requestContext.ctx.logger("")
+      );
+    }
     if (e instanceof ChatLunaError) {
       throw e;
     } else {
@@ -617,6 +630,13 @@ async function completion(requestContext, params, completionUrl = "chat/completi
     );
     return await processResponse(requestContext, response);
   } catch (e) {
+    if (requestContext.ctx.chatluna.config.isLog) {
+      await trackLogToLocal(
+        "Request",
+        JSON.stringify(chatCompletionParams),
+        requestContext.ctx.logger("")
+      );
+    }
     if (e instanceof ChatLunaError) {
       throw e;
     } else {

package/lib/utils.d.ts

@@ -9,5 +9,5 @@ export declare function messageTypeToOpenAIRole(type: MessageType): ChatCompleti
 export declare function formatToolsToOpenAITools(tools: StructuredTool[], includeGoogleSearch: boolean): ChatCompletionTool[];
 export declare function formatToolToOpenAITool(tool: StructuredTool): ChatCompletionTool;
 export declare function removeAdditionalProperties(schema: JsonSchema7Type): JsonSchema7Type;
-export declare function convertMessageToMessageChunk(message: ChatCompletionResponseMessage): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
-export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): HumanMessageChunk | AIMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+export declare function convertMessageToMessageChunk(message: ChatCompletionResponseMessage): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;
+export declare function convertDeltaToMessageChunk(delta: Record<string, any>, defaultRole?: ChatCompletionResponseMessageRoleEnum): AIMessageChunk | HumanMessageChunk | SystemMessageChunk | FunctionMessageChunk | ToolMessageChunk | ChatMessageChunk;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -22,13 +22,13 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/ChatLunaLab/chatluna.git",
-    "directory": "packages/openai-like-adapter"
+    "directory": "packages/shared-adapter"
   },
   "license": "AGPL-3.0",
   "bugs": {
     "url": "https://github.com/ChatLunaLab/chatluna/issues"
   },
-  "homepage": "https://github.com/ChatLunaLab/chatluna/tree/v1-dev/packages/openai-like-adapter#readme",
+  "homepage": "https://github.com/ChatLunaLab/chatluna/tree/v1-dev/packages/shared-adapter#readme",
   "scripts": {
     "build": "atsc -b"
   },
@@ -62,14 +62,14 @@
   "dependencies": {
     "@langchain/core": "0.3.62",
     "zod": "3.25.76",
-    "zod-to-json-schema": "^3.24.5"
+    "zod-to-json-schema": "^3.24.6"
   },
   "devDependencies": {
     "atsc": "^2.1.0",
-    "koishi": "^4.18.7"
+    "koishi": "^4.18.9"
   },
   "peerDependencies": {
-    "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.45"
+    "koishi": "^4.18.9",
+    "koishi-plugin-chatluna": "^1.3.0-alpha.56"
   }
 }