@chatluna/v1-shared-adapter 1.0.34 → 1.0.35

package/lib/client.d.ts

@@ -10,5 +10,6 @@ export declare function normalizeOpenAIModelName(modelName: string): string;
 export declare function isEmbeddingModel(modelName: string): boolean;
 export declare function isNonLLMModel(modelName: string): boolean;
 export declare function isImageGenerationModel(modelName: string): boolean;
+export declare function isRerankerModel(modelName: string): boolean;
 export declare function getModelMaxContextSize(info: ModelInfo): number;
 export declare function supportImageInput(modelName: string): boolean;

package/lib/index.cjs

@@ -28,6 +28,7 @@ __export(index_exports, {
   convertMessageToMessageChunk: () => convertMessageToMessageChunk,
   createEmbeddings: () => createEmbeddings,
   createRequestContext: () => createRequestContext,
+  createRerank: () => createRerank,
   createUsageMetadata: () => createUsageMetadata,
   expandReasoningEffortModelVariants: () => expandReasoningEffortModelVariants,
   fetchFileLikeUrl: () => fetchFileLikeUrl,
@@ -40,6 +41,7 @@ __export(index_exports, {
   isEmbeddingModel: () => isEmbeddingModel,
   isImageGenerationModel: () => isImageGenerationModel,
   isNonLLMModel: () => isNonLLMModel,
+  isRerankerModel: () => isRerankerModel,
   langchainMessageToOpenAIMessage: () => langchainMessageToOpenAIMessage,
   langchainMessageToResponseInput: () => langchainMessageToResponseInput,
   messageTypeToOpenAIRole: () => messageTypeToOpenAIRole,
@@ -118,7 +120,7 @@ function isNonLLMModel(modelName) {
   if (modelName.includes("gemini") && modelName.includes("image")) {
     return false;
   }
-  return ["whisper", "tts", "dall-e", "image", "rerank"].some(
+  return ["whisper", "tts", "dall-e", "image"].some(
     (keyword) => modelName.includes(keyword)
   );
 }
@@ -127,6 +129,10 @@ function isImageGenerationModel(modelName) {
   return isNonLLMModel(modelName) && ["dall-e", "image"].some((keyword) => modelName.includes(keyword));
 }
 __name(isImageGenerationModel, "isImageGenerationModel");
+function isRerankerModel(modelName) {
+  return modelName.includes("rerank");
+}
+__name(isRerankerModel, "isRerankerModel");
 function getModelMaxContextSize(info) {
   const maxTokens = info.maxTokens;
   if (maxTokens != null) {
@@ -214,6 +220,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_langchain = require("koishi-plugin-chatluna/utils/langchain");
 var import_types = require("@langchain/core/utils/types");
 function createUsageMetadata(data) {
   const inputTokenDetails = {
@@ -513,11 +520,20 @@ function processInterleavedThinkMessages(convertedMessages, originalMessages) {
   let lastTurnStartIndex = -1;
   for (let i = originalMessages.length - 1; i >= 0; i--) {
     const message = originalMessages[i];
-    if (message.getType() === "human") {
+    if ((0, import_langchain.isChatLunaUserMessage)(message)) {
       lastTurnStartIndex = i;
       break;
     }
   }
+  if (lastTurnStartIndex === -1) {
+    for (let i = originalMessages.length - 1; i >= 0; i--) {
+      const message = originalMessages[i];
+      if (message.getType() === "human") {
+        lastTurnStartIndex = i;
+        break;
+      }
+    }
+  }
   if (lastTurnStartIndex === -1) {
     lastTurnStartIndex = 0;
   }
@@ -1405,6 +1421,42 @@ async function createEmbeddings(requestContext, params, embeddingUrl = "embeddin
   }
 }
 __name(createEmbeddings, "createEmbeddings");
+async function createRerank(requestContext, params, rerankUrl = "rerank") {
+  const { modelRequester } = requestContext;
+  try {
+    const response = await modelRequester.post(
+      rerankUrl,
+      {
+        model: params.model,
+        query: params.query,
+        documents: params.documents,
+        top_n: params.topN,
+        max_chunks_per_doc: params.maxChunksPerDoc,
+        return_documents: false
+      },
+      {
+        signal: params.signal
+      }
+    );
+    const data = await response.json();
+    if (data.results == null) {
+      throw new import_error.ChatLunaError(
+        import_error.ChatLunaErrorCode.API_REQUEST_FAILED,
+        new Error(`Call Rerank Error: ${JSON.stringify(data)}`)
+      );
+    }
+    return data.results.map((item) => ({
+      index: item.index,
+      relevanceScore: item.relevance_score
+    }));
+  } catch (e) {
+    if (e instanceof import_error.ChatLunaError) {
+      throw e;
+    }
+    throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
+  }
+}
+__name(createRerank, "createRerank");
 async function getModels(requestContext, config) {
   const { modelRequester } = requestContext;
   let data;
@@ -1467,6 +1519,7 @@ __name(createRequestContext, "createRequestContext");
   convertMessageToMessageChunk,
   createEmbeddings,
   createRequestContext,
+  createRerank,
   createUsageMetadata,
   expandReasoningEffortModelVariants,
   fetchFileLikeUrl,
@@ -1479,6 +1532,7 @@ __name(createRequestContext, "createRequestContext");
   isEmbeddingModel,
   isImageGenerationModel,
   isNonLLMModel,
+  isRerankerModel,
   langchainMessageToOpenAIMessage,
   langchainMessageToResponseInput,
   messageTypeToOpenAIRole,

package/lib/index.mjs

@@ -53,7 +53,7 @@ function isNonLLMModel(modelName) {
   if (modelName.includes("gemini") && modelName.includes("image")) {
     return false;
   }
-  return ["whisper", "tts", "dall-e", "image", "rerank"].some(
+  return ["whisper", "tts", "dall-e", "image"].some(
     (keyword) => modelName.includes(keyword)
   );
 }
@@ -62,6 +62,10 @@ function isImageGenerationModel(modelName) {
   return isNonLLMModel(modelName) && ["dall-e", "image"].some((keyword) => modelName.includes(keyword));
 }
 __name(isImageGenerationModel, "isImageGenerationModel");
+function isRerankerModel(modelName) {
+  return modelName.includes("rerank");
+}
+__name(isRerankerModel, "isRerankerModel");
 function getModelMaxContextSize(info) {
   const maxTokens = info.maxTokens;
   if (maxTokens != null) {
@@ -163,6 +167,7 @@ import {
   getMimeTypeFromSource,
   isMessageContentImageUrl
 } from "koishi-plugin-chatluna/utils/string";
+import { isChatLunaUserMessage } from "koishi-plugin-chatluna/utils/langchain";
 import { isZodSchemaV3 } from "@langchain/core/utils/types";
 function createUsageMetadata(data) {
   const inputTokenDetails = {
@@ -462,11 +467,20 @@ function processInterleavedThinkMessages(convertedMessages, originalMessages) {
   let lastTurnStartIndex = -1;
   for (let i = originalMessages.length - 1; i >= 0; i--) {
     const message = originalMessages[i];
-    if (message.getType() === "human") {
+    if (isChatLunaUserMessage(message)) {
       lastTurnStartIndex = i;
       break;
     }
   }
+  if (lastTurnStartIndex === -1) {
+    for (let i = originalMessages.length - 1; i >= 0; i--) {
+      const message = originalMessages[i];
+      if (message.getType() === "human") {
+        lastTurnStartIndex = i;
+        break;
+      }
+    }
+  }
   if (lastTurnStartIndex === -1) {
     lastTurnStartIndex = 0;
   }
@@ -1354,6 +1368,42 @@ async function createEmbeddings(requestContext, params, embeddingUrl = "embeddin
   }
 }
 __name(createEmbeddings, "createEmbeddings");
+async function createRerank(requestContext, params, rerankUrl = "rerank") {
+  const { modelRequester } = requestContext;
+  try {
+    const response = await modelRequester.post(
+      rerankUrl,
+      {
+        model: params.model,
+        query: params.query,
+        documents: params.documents,
+        top_n: params.topN,
+        max_chunks_per_doc: params.maxChunksPerDoc,
+        return_documents: false
+      },
+      {
+        signal: params.signal
+      }
+    );
+    const data = await response.json();
+    if (data.results == null) {
+      throw new ChatLunaError(
+        ChatLunaErrorCode.API_REQUEST_FAILED,
+        new Error(`Call Rerank Error: ${JSON.stringify(data)}`)
+      );
+    }
+    return data.results.map((item) => ({
+      index: item.index,
+      relevanceScore: item.relevance_score
+    }));
+  } catch (e) {
+    if (e instanceof ChatLunaError) {
+      throw e;
+    }
+    throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
+  }
+}
+__name(createRerank, "createRerank");
 async function getModels(requestContext, config) {
   const { modelRequester } = requestContext;
   let data;
@@ -1415,6 +1465,7 @@ export {
   convertMessageToMessageChunk,
   createEmbeddings,
   createRequestContext,
+  createRerank,
   createUsageMetadata,
   expandReasoningEffortModelVariants,
   fetchFileLikeUrl,
@@ -1427,6 +1478,7 @@ export {
   isEmbeddingModel,
   isImageGenerationModel,
   isNonLLMModel,
+  isRerankerModel,
   langchainMessageToOpenAIMessage,
   langchainMessageToResponseInput,
   messageTypeToOpenAIRole,

package/lib/requester.d.ts

@@ -1,5 +1,5 @@
 import { ChatGenerationChunk } from '@langchain/core/outputs';
-import { EmbeddingsRequestParams, ModelRequester, ModelRequestParams } from 'koishi-plugin-chatluna/llm-core/platform/api';
+import { EmbeddingsRequestParams, ModelRequester, ModelRequestParams, RerankerRequestParams, RerankerResult } from 'koishi-plugin-chatluna/llm-core/platform/api';
 import { ClientConfig } from 'koishi-plugin-chatluna/llm-core/platform/config';
 import { SSEEvent } from 'koishi-plugin-chatluna/utils/sse';
 import { type ResponseBuiltinTool, ResponseObject, ResponseOutputItem } from './types';
@@ -73,6 +73,7 @@ export declare function completion<T extends ClientConfig, R extends ChatLunaPlu
 export declare function responseApiCompletionStream<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: ModelRequestParams, opts?: ResponseToolOptions, supportImageInput?: boolean, imageProvider?: ResponseImageProvider): AsyncGenerator<ChatGenerationChunk>;
 export declare function responseApiCompletion<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: ModelRequestParams, opts?: ResponseToolOptions, supportImageInput?: boolean, imageProvider?: ResponseImageProvider): 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 createRerank<T extends ClientConfig, R extends ChatLunaPlugin.Config>(requestContext: RequestContext<T, R>, params: RerankerRequestParams, rerankUrl?: string): Promise<RerankerResult[]>;
 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/lib/types.d.ts

@@ -325,3 +325,27 @@ export interface CreateEmbeddingResponseUsage {
     total_tokens: number;
 }
 export type ChatCompletionResponseMessageRoleEnum = 'system' | 'assistant' | 'user' | 'function' | 'tool';
+export interface CreateRerankRequest {
+    model: string;
+    query: string;
+    documents: string[];
+    top_n?: number;
+    max_chunks_per_doc?: number;
+    return_documents?: boolean;
+}
+export interface RerankResultItem {
+    index: number;
+    relevance_score: number;
+    document?: {
+        text: string;
+    };
+}
+export interface CreateRerankResponse {
+    id?: string;
+    model?: string;
+    results: RerankResultItem[];
+    usage?: {
+        prompt_tokens?: number;
+        total_tokens?: number;
+    };
+}

package/lib/utils.d.ts

@@ -71,6 +71,6 @@ 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;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chatluna/v1-shared-adapter",
   "description": "chatluna shared adapter",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -70,6 +70,6 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.9",
-    "koishi-plugin-chatluna": "^1.4.0-alpha.9"
+    "koishi-plugin-chatluna": "^1.4.0-alpha.10"
   }
 }