From 7f1b4f4a59d7b290d1208e8742fb1332e8831db6 Mon Sep 17 00:00:00 2001 From: Wenjie Zhang Date: Mon, 11 Aug 2025 15:40:41 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4qianfan=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E5=92=8C=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 1 - src/models/__init__.py | 4 ---- src/models/chat_model.py | 40 -------------------------------------- web/src/utils/modelIcon.js | 2 -- 4 files changed, 47 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 35d0197d..b7767f32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,6 @@ dependencies = [ "python-jose[cryptography]>=3.4.0", "python-multipart>=0.0.20", "pyyaml>=6.0.2", - "qianfan>=0.4.12.3", "rapidocr-onnxruntime>=1.4.4", "tavily-python>=0.7.0", "unstructured>=0.17.2", diff --git a/src/models/__init__.py b/src/models/__init__.py index 1c5f6360..a900c394 100644 --- a/src/models/__init__.py +++ b/src/models/__init__.py @@ -14,10 +14,6 @@ def select_model(model_provider, model_name=None): logger.info(f"Selecting model from `{model_provider}` with `{model_name}`") - if model_provider == "qianfan": - from src.models.chat_model import Qianfan - return Qianfan(model_name) - if model_provider == "openai": from src.models.chat_model import OpenModel return OpenModel(model_name) diff --git a/src/models/chat_model.py b/src/models/chat_model.py index e3a97c79..609173da 100644 --- a/src/models/chat_model.py +++ b/src/models/chat_model.py @@ -83,45 +83,5 @@ class GeneralResponse: self.content = content self.is_full = False - -class Qianfan(OpenAIBase): - """弃用""" - - def __init__(self, model_name="ernie_speed") -> None: - import qianfan - self.model_name = model_name - access_key = os.getenv("QIANFAN_ACCESS_KEY") - secret_key = os.getenv("QIANFAN_SECRET_KEY") - self.client = qianfan.ChatCompletion(ak=access_key, sk=secret_key) - - def predict(self, message, stream=False): - if isinstance(message, str): - messages=[{"role": "user", "content": message}] - else: - messages = message - - if stream: - return self._stream_response(messages) - else: - return self._get_response(messages) - - def _stream_response(self, messages): - response = self.client.do( - model=self.model_name, - messages=messages, - stream=True, - ) - for chunk in response: - yield GeneralResponse(chunk["body"]["result"]) - - def _get_response(self, messages): - response = self.client.do( - model=self.model_name, - messages=messages, - stream=False, - ) - return GeneralResponse(response["body"]["result"]) - - if __name__ == "__main__": pass diff --git a/web/src/utils/modelIcon.js b/web/src/utils/modelIcon.js index a35fceed..74d1c51f 100644 --- a/web/src/utils/modelIcon.js +++ b/web/src/utils/modelIcon.js @@ -1,5 +1,4 @@ import openaiIcon from '@/assets/providers/openai.png' -import qianfanIcon from '@/assets/providers/qianfan.png' import dashscopeIcon from '@/assets/providers/dashscope.png' import togetherIcon from '@/assets/providers/together.ai.png' import deepseekIcon from '@/assets/providers/deepseek.png' @@ -11,7 +10,6 @@ import defaultIcon from '@/assets/providers/default.png' export const modelIcons = { openai: openaiIcon, - qianfan: qianfanIcon, dashscope: dashscopeIcon, together: togetherIcon, deepseek: deepseekIcon,