From f279613f5dce7e77c88acf7a724a324be38ee72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=87=AF?= Date: Fri, 12 Jun 2026 15:48:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roundtable-planning/components/Step2Panel.tsx | 1 + offline-backend-20260512/backend/config.yaml | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/frontend-web/src/roundtable-planning/components/Step2Panel.tsx b/frontend-web/src/roundtable-planning/components/Step2Panel.tsx index 37409cb3..7903cd73 100644 --- a/frontend-web/src/roundtable-planning/components/Step2Panel.tsx +++ b/frontend-web/src/roundtable-planning/components/Step2Panel.tsx @@ -48,6 +48,7 @@ import { const SHOW_BACKGROUND_SUSPEND = true; import { useLocalSettings } from "@/core/settings"; +import { cn } from "@/lib/utils"; import type { MessageMetric } from "@/components/workspace/messages/use-message-metrics"; import { DialogueSpeedMeter } from "@/roundtable-planning/components/DialogueSpeedMeter"; diff --git a/offline-backend-20260512/backend/config.yaml b/offline-backend-20260512/backend/config.yaml index 495243bf..022ddd63 100644 --- a/offline-backend-20260512/backend/config.yaml +++ b/offline-backend-20260512/backend/config.yaml @@ -10,20 +10,6 @@ gateway: port: 8001 models: -<<<<<<< Updated upstream - # - name: deepseek-chat - # display_name: DeepSeek Chat - # use: langchain_openai:ChatOpenAI - # model: deepseek-chat - # api_key: sk-3fee562f834a4c08bb0d471ef44cb445 - # base_url: https://api.deepseek.com - # request_timeout: 600.0 - # max_retries: 2 - # max_tokens: 4096 - # temperature: 1.0 - # supports_vision: false - # supports_thinking: true -======= - name: deepseek-chat display_name: DeepSeek Chat use: langchain_openai:ChatOpenAI @@ -36,7 +22,6 @@ models: temperature: 1.0 supports_vision: false supports_thinking: true ->>>>>>> Stashed changes # - name: zai-org/GLM-5-FP8 # display_name: zai-org/GLM-5-FP8