@lobehub/chat 1.106.1 → 1.106.3

package/src/libs/model-runtime/utils/modelParse.ts

@@ -7,7 +7,7 @@ export interface ModelProcessorConfig {
   visionKeywords?: readonly string[];
 }
 
-// 模型标签关键词配置
+// 模型能力标签关键词配置
 export const MODEL_LIST_CONFIGS = {
   anthropic: {
     functionCallKeywords: ['claude'],
@@ -64,7 +64,7 @@ export const MODEL_LIST_CONFIGS = {
   },
   zhipu: {
     functionCallKeywords: ['glm-4', 'glm-z1'],
-    reasoningKeywords: ['glm-zero', 'glm-z1'],
+    reasoningKeywords: ['glm-zero', 'glm-z1', 'glm-4.5'],
     visionKeywords: ['glm-4v'],
   },
 } as const;

package/src/libs/model-runtime/zhipu/index.ts

@@ -1,6 +1,8 @@
 import { ModelProvider } from '../types';
 import { MODEL_LIST_CONFIGS, processModelList } from '../utils/modelParse';
 import { createOpenAICompatibleRuntime } from '../utils/openaiCompatibleFactory';
+import { OpenAIStream } from '../utils/streams/openai';
+import { convertIterableToStream } from '../utils/streams/protocol';
 
 export interface ZhipuModelCard {
   description: string;
@@ -12,7 +14,8 @@ export const LobeZhipuAI = createOpenAICompatibleRuntime({
   baseURL: 'https://open.bigmodel.cn/api/paas/v4',
   chatCompletion: {
     handlePayload: (payload) => {
-      const { enabledSearch, max_tokens, model, temperature, tools, top_p, ...rest } = payload;
+      const { enabledSearch, max_tokens, model, temperature, thinking, tools, top_p, ...rest } =
+        payload;
 
       const zhipuTools = enabledSearch
         ? [
@@ -39,6 +42,7 @@ export const LobeZhipuAI = createOpenAICompatibleRuntime({
               max_tokens,
         model,
         stream: true,
+        thinking: model.includes('-4.5') ? { type: thinking?.type } : undefined,
         tools: zhipuTools,
         ...(model === 'glm-4-alltools'
           ? {
@@ -54,6 +58,58 @@ export const LobeZhipuAI = createOpenAICompatibleRuntime({
             }),
       } as any;
     },
+    handleStream: (stream, { callbacks, inputStartAt }) => {
+      const readableStream =
+        stream instanceof ReadableStream ? stream : convertIterableToStream(stream);
+
+      // GLM-4.5 系列模型在 tool_calls 中返回的 index 为 -1，需要在进入 OpenAIStream 之前修正
+      // 因为 OpenAIStream 内部会过滤掉 index < 0 的 tool_calls (openai.ts:58-60)
+      const preprocessedStream = readableStream.pipeThrough(
+        new TransformStream({
+          transform(chunk, controller) {
+            // 处理原始的 OpenAI ChatCompletionChunk 格式
+            if (chunk.choices && chunk.choices[0]) {
+              const choice = chunk.choices[0];
+              if (choice.delta?.tool_calls && Array.isArray(choice.delta.tool_calls)) {
+                // 修正负数 index，将 -1 转换为基于数组位置的正数 index
+                const fixedToolCalls = choice.delta.tool_calls.map(
+                  (toolCall: any, globalIndex: number) => ({
+                    ...toolCall,
+                    index: toolCall.index < 0 ? globalIndex : toolCall.index,
+                  }),
+                );
+
+                // 创建修正后的 chunk
+                const fixedChunk = {
+                  ...chunk,
+                  choices: [
+                    {
+                      ...choice,
+                      delta: {
+                        ...choice.delta,
+                        tool_calls: fixedToolCalls,
+                      },
+                    },
+                  ],
+                };
+
+                controller.enqueue(fixedChunk);
+              } else {
+                controller.enqueue(chunk);
+              }
+            } else {
+              controller.enqueue(chunk);
+            }
+          },
+        }),
+      );
+
+      return OpenAIStream(preprocessedStream, {
+        callbacks,
+        inputStartAt,
+        provider: 'zhipu',
+      });
+    },
   },
   debug: {
     chatCompletion: () => process.env.DEBUG_ZHIPU_CHAT_COMPLETION === '1',

package/src/utils/server/correctOIDCUrl.ts

@@ -0,0 +1,61 @@
+import debug from 'debug';
+import { NextRequest } from 'next/server';
+
+const log = debug('lobe-oidc:correctOIDCUrl');
+
+/**
+ * 修复 OIDC 重定向 URL 在代理环境下的问题
+ * @param req - Next.js 请求对象
+ * @param url - 要修复的 URL 对象
+ * @returns 修复后的 URL 对象
+ */
+export const correctOIDCUrl = (req: NextRequest, url: URL): URL => {
+  const requestHost = req.headers.get('host');
+  const forwardedHost = req.headers.get('x-forwarded-host');
+  const forwardedProto =
+    req.headers.get('x-forwarded-proto') || req.headers.get('x-forwarded-protocol');
+
+  log('Input URL: %s', url.toString());
+  log(
+    'Request headers - host: %s, x-forwarded-host: %s, x-forwarded-proto: %s',
+    requestHost,
+    forwardedHost,
+    forwardedProto,
+  );
+
+  // 确定实际的主机名和协议，提供后备值
+  const actualHost = forwardedHost || requestHost;
+  const actualProto = forwardedProto || (url.protocol === 'https:' ? 'https' : 'http');
+
+  // 如果无法确定有效的主机名，直接返回原URL
+  if (!actualHost || actualHost === 'null') {
+    log('Warning: Cannot determine valid host, returning original URL');
+    return url;
+  }
+
+  // 如果 URL 指向本地地址，或者主机名与实际请求主机不匹配，则修正 URL
+  const needsCorrection =
+    url.hostname === 'localhost' ||
+    url.hostname === '127.0.0.1' ||
+    url.hostname === '0.0.0.0' ||
+    url.hostname !== actualHost;
+
+  if (needsCorrection) {
+    log('URL needs correction. Original hostname: %s, correcting to: %s', url.hostname, actualHost);
+
+    try {
+      const correctedUrl = new URL(url.toString());
+      correctedUrl.protocol = actualProto + ':';
+      correctedUrl.host = actualHost;
+
+      log('Corrected URL: %s', correctedUrl.toString());
+      return correctedUrl;
+    } catch (error) {
+      log('Error creating corrected URL, returning original: %O', error);
+      return url;
+    }
+  }
+
+  log('URL does not need correction, returning original: %s', url.toString());
+  return url;
+};