diff --git a/.gitignore b/.gitignore index 864e8ffe..740393fa 100644 --- a/.gitignore +++ b/.gitignore @@ -183,3 +183,6 @@ configs/*.py /knowledge_base/samples/content/202311-D平台项目工作大纲参数，人员中间库表结构说明V1.1(1).docx /knowledge_base/samples/content/imi_temeplate.txt +/chatchat/configs/*.py +/chatchat/configs/*.yaml +chatchat/data \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 2653c894..2d789924 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "knowledge_base/samples/content/wiki"] - path = data/knowledge_base/samples/content/wiki + path = chatchat/data/knowledge_base/samples/content/wiki url = https://github.com/chatchat-space/Langchain-Chatchat.wiki.git diff --git a/README.md b/README.md index 2e97dc65..c39f5a4c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![](img/logo-long-chatchat-trans-v2.png) +![](chatchat/img/logo-long-chatchat-trans-v2.png) 🌍 [READ THIS IN ENGLISH](README_en.md) 🌍 [日本語で読む](README_ja.md) @@ -47,11 +47,11 @@ OpenAI GPT API 的调用，并将在后续持续扩充对各类模型及模型 A 📺 [原理介绍视频](https://www.bilibili.com/video/BV13M4y1e7cN/?share_source=copy_web&vd_source=e6c5aafe684f30fbe41925d61ca6d514) -![实现原理图](img/langchain+chatglm.png) +![实现原理图](chatchat/img/langchain+chatglm.png) 从文档处理角度来看，实现流程如下： -![实现原理图2](img/langchain+chatglm2.png) +![实现原理图2](chatchat/img/langchain+chatglm2.png) 🚩 本项目未涉及微调、训练过程，但可利用微调或训练对本项目效果进行优化。 @@ -152,17 +152,17 @@ $ python startup.py -a 1. FastAPI Docs 界面 -![](img/fastapi_docs_026.png) +![](chatchat/img/fastapi_docs_026.png) 2. Web UI 启动界面示例： - Web UI 对话界面： -![img](img/LLM_success.png) +![img](chatchat/img/LLM_success.png) - Web UI 知识库管理页面： -![](img/init_knowledge_base.jpg) +![](chatchat/img/init_knowledge_base.jpg) ### 注意 @@ -193,12 +193,12 @@ $ python startup.py -a [![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white "langchain-chatglm")](https://t.me/+RjliQ3jnJ1YyN2E9) ### 项目交流群 -二维码 +二维码 🎉 Langchain-Chatchat 项目微信交流群，如果你也对本项目感兴趣，欢迎加入群聊参与讨论交流。 ### 公众号 -二维码 +二维码 🎉 Langchain-Chatchat 项目官方公众号，欢迎扫码关注。 diff --git a/README_en.md b/README_en.md index 5e0c89d3..b7f2c322 100644 --- a/README_en.md +++ b/README_en.md @@ -1,4 +1,4 @@ -![](img/logo-long-chatchat-trans-v2.png) +![](chatchat/img/logo-long-chatchat-trans-v2.png) 🌍 [中文文档](README.md) 🌍 [日本語で読む](README_ja.md) @@ -53,11 +53,11 @@ to `LLM` to generate an answer. 📺[video introduction](https://www.bilibili.com/video/BV13M4y1e7cN/?share_source=copy_web&vd_source=e6c5aafe684f30fbe41925d61ca6d514) -![实现原理图](img/langchain+chatglm.png) +![实现原理图](chatchat/img/langchain+chatglm.png) The main process analysis from the aspect of document process: -![实现原理图2](img/langchain+chatglm2.png) +![实现原理图2](chatchat/img/langchain+chatglm2.png) 🚩 The training or fine-tuning are not involved in the project, but still, one always can improve performance by do these. @@ -147,17 +147,17 @@ $ python startup.py -a 1. FastAPI docs interface -![](img/fastapi_docs_026.png) +![](chatchat/img/fastapi_docs_026.png) 2. webui page - Web UI dialog page: -![img](img/LLM_success.png) +![img](chatchat/img/LLM_success.png) - Web UI knowledge base management page: -![](img/init_knowledge_base.jpg) +![](chatchat/img/init_knowledge_base.jpg) ### Note @@ -192,8 +192,8 @@ please refer to the [Wiki](https://github.com/chatchat-space/Langchain-Chatchat/ ### WeChat Group -二维码 +二维码 ### WeChat Official Account -图片 +图片 diff --git a/README_ja.md b/README_ja.md index 90336a97..e3f79c8d 100644 --- a/README_ja.md +++ b/README_ja.md @@ -1,4 +1,4 @@ -![](img/logo-long-chatchat-trans-v2.png) +![](chatchat/img/logo-long-chatchat-trans-v2.png) 🌍 [中文文档](README.md) 🌍 [READ THIS IN ENGLISH](README_en.md) @@ -54,11 +54,11 @@ Q&A）ソリューションを構築することです。 📺[video introduction](https://www.bilibili.com/video/BV13M4y1e7cN/?share_source=copy_web&vd_source=e6c5aafe684f30fbe41925d61ca6d514) -![实现原理图](img/langchain+chatglm.png) +![实现原理图](chatchat/img/langchain+chatglm.png) 文書プロセスの側面からの主なプロセス分析: -![实现原理图2](img/langchain+chatglm2.png) +![实现原理图2](chatchat/img/langchain+chatglm2.png) 🚩 トレーニングやファインチューニングはプロジェクトには含まれないが、これらを行うことで必ずパフォーマンスを向上させることができます。 @@ -144,17 +144,17 @@ $ python startup.py -a 1. FastAPI docs インターフェース -![](img/fastapi_docs_026.png) +![](chatchat/img/fastapi_docs_026.png) 2. webui ページ - Web UI ダイアログページ: -![img](img/LLM_success.png) +![img](chatchat/img/LLM_success.png) - Web UI ナレッジベースマネジメントページ: -![](img/init_knowledge_base.jpg) +![](chatchat/img/init_knowledge_base.jpg) ### 注 @@ -185,8 +185,8 @@ $ python startup.py -a ### WeChat グループ -二维码 +二维码 ### WeChat 公式アカウント -图片 +图片 diff --git a/chatchat-server/README.md b/chatchat-server/README.md new file mode 100644 index 00000000..e228127c --- /dev/null +++ b/chatchat-server/README.md @@ -0,0 +1,37 @@ + + +git mv .\chatchat-server\agent .\chatchat_server\ +git mv .\chatchat-server\api_server .\chatchat_server\ +git mv .\chatchat-server\callback_handler .\chatchat_server\ +git mv .\chatchat-server\chat .\chatchat_server\ +git mv .\chatchat-server\db .\chatchat_server\ +git mv .\chatchat-server\document_loaders .\chatchat_server\ +git mv .\chatchat-server\knowledge_base .\chatchat_server\ +git mv .\chatchat-server\memory .\chatchat_server\ +git mv .\chatchat-server\reranker .\chatchat_server\ +git mv .\chatchat-server\text_splitter .\chatchat_server\ +git mv .\chatchat-server\__init__.py .\chatchat_server\ +git mv .\chatchat-server\api_allinone_stale.py .\chatchat_server\ +git mv .\chatchat-server\llm_api_shutdown.py .\chatchat_server\ +git mv .\chatchat-server\llm_api_stale.py .\chatchat_server\ +git mv .\chatchat-server\localai_embeddings.py .\chatchat_server\ +git mv .\chatchat-server\minx_chat_openai.py .\chatchat_server\ +git mv .\chatchat-server\pydantic_types.py .\chatchat_server\ +git mv .\chatchat-server\utils.py .\chatchat_server\ +git mv .\chatchat-server\webui_allinone_stale.py .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ +git mv .\chatchat-server\ .\chatchat_server\ diff --git a/model_providers/model_providers/__init__.py b/chatchat-server/chatchat_server/__init__.py similarity index 100% rename from model_providers/model_providers/__init__.py rename to chatchat-server/chatchat_server/__init__.py diff --git a/server/agent/agent_factory/__init__.py b/chatchat-server/chatchat_server/agent/agent_factory/__init__.py similarity index 100% rename from server/agent/agent_factory/__init__.py rename to chatchat-server/chatchat_server/agent/agent_factory/__init__.py diff --git a/server/agent/agent_factory/agents_registry.py b/chatchat-server/chatchat_server/agent/agent_factory/agents_registry.py similarity index 89% rename from server/agent/agent_factory/agents_registry.py rename to chatchat-server/chatchat_server/agent/agent_factory/agents_registry.py index 1fdd2d5c..6f484931 100644 --- a/server/agent/agent_factory/agents_registry.py +++ b/chatchat-server/chatchat_server/agent/agent_factory/agents_registry.py @@ -8,8 +8,8 @@ from langchain_core.messages import SystemMessage from langchain_core.prompts import ChatPromptTemplate from langchain_core.tools import BaseTool -from server.agent.agent_factory import ( create_structured_qwen_chat_agent) -from server.agent.agent_factory.glm3_agent import create_structured_glm3_chat_agent +from chatchat_server.agent.agent_factory import ( create_structured_qwen_chat_agent) +from chatchat_server.agent.agent_factory.glm3_agent import create_structured_glm3_chat_agent def agents_registry( diff --git a/server/agent/agent_factory/glm3_agent.py b/chatchat-server/chatchat_server/agent/agent_factory/glm3_agent.py similarity index 98% rename from server/agent/agent_factory/glm3_agent.py rename to chatchat-server/chatchat_server/agent/agent_factory/glm3_agent.py index d4173e5f..45f10488 100644 --- a/server/agent/agent_factory/glm3_agent.py +++ b/chatchat-server/chatchat_server/agent/agent_factory/glm3_agent.py @@ -16,7 +16,7 @@ from langchain.output_parsers import OutputFixingParser from langchain.schema import AgentAction, AgentFinish, OutputParserException from langchain.schema.language_model import BaseLanguageModel from langchain.tools.base import BaseTool -from server.pydantic_types import Field, typing, model_schema +from chatchat_server.pydantic_types import Field, typing, model_schema logger = logging.getLogger(__name__) diff --git a/server/agent/agent_factory/qwen_agent.py b/chatchat-server/chatchat_server/agent/agent_factory/qwen_agent.py similarity index 99% rename from server/agent/agent_factory/qwen_agent.py rename to chatchat-server/chatchat_server/agent/agent_factory/qwen_agent.py index fc708b71..c6b7a5df 100644 --- a/server/agent/agent_factory/qwen_agent.py +++ b/chatchat-server/chatchat_server/agent/agent_factory/qwen_agent.py @@ -16,7 +16,7 @@ from langchain.schema import (AgentAction, AgentFinish, OutputParserException, HumanMessage, SystemMessage, AIMessage) from langchain.schema.language_model import BaseLanguageModel from langchain.tools.base import BaseTool -from server.utils import get_prompt_template +from chatchat_server.utils import get_prompt_template logger = logging.getLogger(__name__) diff --git a/server/agent/agent_instruct.md b/chatchat-server/chatchat_server/agent/agent_instruct.md similarity index 100% rename from server/agent/agent_instruct.md rename to chatchat-server/chatchat_server/agent/agent_instruct.md diff --git a/server/agent/container.py b/chatchat-server/chatchat_server/agent/container.py similarity index 100% rename from server/agent/container.py rename to chatchat-server/chatchat_server/agent/container.py diff --git a/server/agent/tools_factory/__init__.py b/chatchat-server/chatchat_server/agent/tools_factory/__init__.py similarity index 100% rename from server/agent/tools_factory/__init__.py rename to chatchat-server/chatchat_server/agent/tools_factory/__init__.py diff --git a/server/agent/tools_factory/arxiv.py b/chatchat-server/chatchat_server/agent/tools_factory/arxiv.py similarity index 81% rename from server/agent/tools_factory/arxiv.py rename to chatchat-server/chatchat_server/agent/tools_factory/arxiv.py index 97eae161..de0df82e 100644 --- a/server/agent/tools_factory/arxiv.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/arxiv.py @@ -1,5 +1,5 @@ # LangChain 的 ArxivQueryRun 工具 -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field from langchain.tools.arxiv.tool import ArxivQueryRun diff --git a/server/agent/tools_factory/audio_factory/__init__.py b/chatchat-server/chatchat_server/agent/tools_factory/audio_factory/__init__.py similarity index 100% rename from server/agent/tools_factory/audio_factory/__init__.py rename to chatchat-server/chatchat_server/agent/tools_factory/audio_factory/__init__.py diff --git a/server/agent/tools_factory/audio_factory/aqa.py b/chatchat-server/chatchat_server/agent/tools_factory/audio_factory/aqa.py similarity index 88% rename from server/agent/tools_factory/audio_factory/aqa.py rename to chatchat-server/chatchat_server/agent/tools_factory/audio_factory/aqa.py index 337090d9..e50b6638 100644 --- a/server/agent/tools_factory/audio_factory/aqa.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/audio_factory/aqa.py @@ -1,6 +1,6 @@ import base64 import os -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field def save_base64_audio(base64_audio, file_path): audio_data = base64.b64decode(base64_audio) @@ -15,7 +15,7 @@ def aqa_run(model, tokenizer, query): def aqa_processor(query: str): - from server.agent.container import container + from chatchat_server.agent.container import container if container.metadata["audios"]: file_path = "temp_audio.mp3" save_base64_audio(container.metadata["audios"][0], file_path) diff --git a/server/agent/tools_factory/calculate.py b/chatchat-server/chatchat_server/agent/tools_factory/calculate.py similarity index 100% rename from server/agent/tools_factory/calculate.py rename to chatchat-server/chatchat_server/agent/tools_factory/calculate.py diff --git a/server/agent/tools_factory/search_internet.py b/chatchat-server/chatchat_server/agent/tools_factory/search_internet.py similarity index 98% rename from server/agent/tools_factory/search_internet.py rename to chatchat-server/chatchat_server/agent/tools_factory/search_internet.py index 1e53644b..1342e470 100644 --- a/server/agent/tools_factory/search_internet.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/search_internet.py @@ -1,4 +1,4 @@ -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field from langchain.utilities.bing_search import BingSearchAPIWrapper from langchain.utilities.duckduckgo_search import DuckDuckGoSearchAPIWrapper from configs import TOOL_CONFIG diff --git a/server/agent/tools_factory/search_local_knowledgebase.py b/chatchat-server/chatchat_server/agent/tools_factory/search_local_knowledgebase.py similarity index 91% rename from server/agent/tools_factory/search_local_knowledgebase.py rename to chatchat-server/chatchat_server/agent/tools_factory/search_local_knowledgebase.py index c3205709..18bdec62 100644 --- a/server/agent/tools_factory/search_local_knowledgebase.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/search_local_knowledgebase.py @@ -1,7 +1,7 @@ from urllib.parse import urlencode -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field -from server.knowledge_base.kb_doc_api import search_docs +from chatchat_server.knowledge_base.kb_doc_api import search_docs from configs import TOOL_CONFIG diff --git a/server/agent/tools_factory/search_youtube.py b/chatchat-server/chatchat_server/agent/tools_factory/search_youtube.py similarity index 80% rename from server/agent/tools_factory/search_youtube.py rename to chatchat-server/chatchat_server/agent/tools_factory/search_youtube.py index 3b5b939e..99d40268 100644 --- a/server/agent/tools_factory/search_youtube.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/search_youtube.py @@ -1,5 +1,5 @@ from langchain_community.tools import YouTubeSearchTool -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field def search_youtube(query: str): diff --git a/server/agent/tools_factory/shell.py b/chatchat-server/chatchat_server/agent/tools_factory/shell.py similarity index 80% rename from server/agent/tools_factory/shell.py rename to chatchat-server/chatchat_server/agent/tools_factory/shell.py index ea902f78..6251e382 100644 --- a/server/agent/tools_factory/shell.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/shell.py @@ -1,5 +1,5 @@ # LangChain 的 Shell 工具 -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field from langchain_community.tools import ShellTool diff --git a/server/agent/tools_factory/text2image.py b/chatchat-server/chatchat_server/agent/tools_factory/text2image.py similarity index 96% rename from server/agent/tools_factory/text2image.py rename to chatchat-server/chatchat_server/agent/tools_factory/text2image.py index 5e5800b5..55ffa541 100644 --- a/server/agent/tools_factory/text2image.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/text2image.py @@ -6,11 +6,11 @@ from typing import List import uuid from langchain.agents import tool -from server.pydantic_types import Field, FieldInfo +from chatchat_server.pydantic_types import Field, FieldInfo import openai from configs.basic_config import MEDIA_PATH -from server.utils import MsgType +from chatchat_server.utils import MsgType def get_image_model_config() -> dict: diff --git a/server/agent/tools_factory/tools_registry.py b/chatchat-server/chatchat_server/agent/tools_factory/tools_registry.py similarity index 97% rename from server/agent/tools_factory/tools_registry.py rename to chatchat-server/chatchat_server/agent/tools_factory/tools_registry.py index 7934adc7..4d8c9667 100644 --- a/server/agent/tools_factory/tools_registry.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/tools_registry.py @@ -1,5 +1,5 @@ from langchain_core.tools import StructuredTool -from server.agent.tools_factory import * +from chatchat_server.agent.tools_factory import * from configs import KB_INFO template = "Use local knowledgebase from one or more of these:\n{KB_info}\n to get information，Only local data on this knowledge use this tool. The 'database' should be one of the above [{key}]." diff --git a/server/agent/tools_factory/vision_factory/__init__.py b/chatchat-server/chatchat_server/agent/tools_factory/vision_factory/__init__.py similarity index 100% rename from server/agent/tools_factory/vision_factory/__init__.py rename to chatchat-server/chatchat_server/agent/tools_factory/vision_factory/__init__.py diff --git a/server/agent/tools_factory/vision_factory/vqa.py b/chatchat-server/chatchat_server/agent/tools_factory/vision_factory/vqa.py similarity index 97% rename from server/agent/tools_factory/vision_factory/vqa.py rename to chatchat-server/chatchat_server/agent/tools_factory/vision_factory/vqa.py index f39aa593..16b6024c 100644 --- a/server/agent/tools_factory/vision_factory/vqa.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/vision_factory/vqa.py @@ -4,10 +4,10 @@ Method Use cogagent to generate response for a given image and query. import base64 from io import BytesIO from PIL import Image, ImageDraw -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field from configs import TOOL_CONFIG import re -from server.agent.container import container +from chatchat_server.agent.container import container def extract_between_markers(text, start_marker, end_marker): diff --git a/server/agent/tools_factory/weather_check.py b/chatchat-server/chatchat_server/agent/tools_factory/weather_check.py similarity index 93% rename from server/agent/tools_factory/weather_check.py rename to chatchat-server/chatchat_server/agent/tools_factory/weather_check.py index b15f90e6..4ea81547 100644 --- a/server/agent/tools_factory/weather_check.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/weather_check.py @@ -1,7 +1,7 @@ """ 简单的单参数输入工具实现，用于查询现在天气的情况 """ -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field import requests def weather(location: str, api_key: str): diff --git a/server/agent/tools_factory/wolfram.py b/chatchat-server/chatchat_server/agent/tools_factory/wolfram.py similarity index 86% rename from server/agent/tools_factory/wolfram.py rename to chatchat-server/chatchat_server/agent/tools_factory/wolfram.py index 785d07e7..287aea60 100644 --- a/server/agent/tools_factory/wolfram.py +++ b/chatchat-server/chatchat_server/agent/tools_factory/wolfram.py @@ -1,6 +1,6 @@ # Langchain 自带的 Wolfram Alpha API 封装 from langchain.utilities.wolfram_alpha import WolframAlphaAPIWrapper -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field wolfram_alpha_appid = "your key" diff --git a/server/api_allinone_stale.py b/chatchat-server/chatchat_server/api_allinone_stale.py similarity index 100% rename from server/api_allinone_stale.py rename to chatchat-server/chatchat_server/api_allinone_stale.py diff --git a/server/api_server/api_schemas.py b/chatchat-server/chatchat_server/api_server/api_schemas.py similarity index 97% rename from server/api_server/api_schemas.py rename to chatchat-server/chatchat_server/api_server/api_schemas.py index 280f69af..e182db72 100644 --- a/server/api_server/api_schemas.py +++ b/chatchat-server/chatchat_server/api_server/api_schemas.py @@ -4,7 +4,7 @@ import re from typing import Dict, List, Literal, Optional, Union from fastapi import UploadFile -from server.pydantic_types import BaseModel, Field, AnyUrl, root_validator +from chatchat_server.pydantic_types import BaseModel, Field, AnyUrl, root_validator from openai.types.chat import ( ChatCompletionMessageParam, ChatCompletionToolChoiceOptionParam, diff --git a/server/api_server/chat_routes.py b/chatchat-server/chatchat_server/api_server/chat_routes.py similarity index 75% rename from server/api_server/chat_routes.py rename to chatchat-server/chatchat_server/api_server/chat_routes.py index 50a1a84c..70949160 100644 --- a/server/api_server/chat_routes.py +++ b/chatchat-server/chatchat_server/api_server/chat_routes.py @@ -4,9 +4,9 @@ from typing import List from fastapi import APIRouter, Request -from server.chat.chat import chat -from server.chat.feedback import chat_feedback -from server.chat.file_chat import file_chat +from chatchat_server.chat.chat import chat +from chatchat_server.chat.feedback import chat_feedback +from chatchat_server.chat.file_chat import file_chat chat_router = APIRouter(prefix="/chat", tags=["ChatChat 对话"]) diff --git a/server/api_server/kb_routes.py b/chatchat-server/chatchat_server/api_server/kb_routes.py similarity index 84% rename from server/api_server/kb_routes.py rename to chatchat-server/chatchat_server/api_server/kb_routes.py index c482bba9..a88f4228 100644 --- a/server/api_server/kb_routes.py +++ b/chatchat-server/chatchat_server/api_server/kb_routes.py @@ -4,15 +4,15 @@ from typing import List from fastapi import APIRouter, Request -from server.chat.file_chat import upload_temp_docs -from server.knowledge_base.kb_api import list_kbs, create_kb, delete_kb -from server.knowledge_base.kb_doc_api import (list_files, upload_docs, delete_docs, +from chatchat_server.chat.file_chat import upload_temp_docs +from chatchat_server.knowledge_base.kb_api import list_kbs, create_kb, delete_kb +from chatchat_server.knowledge_base.kb_doc_api import (list_files, upload_docs, delete_docs, update_docs, download_doc, recreate_vector_store, search_docs, update_info) -from server.knowledge_base.kb_summary_api import (summary_file_to_vector_store, recreate_summary_vector_store, +from chatchat_server.knowledge_base.kb_summary_api import (summary_file_to_vector_store, recreate_summary_vector_store, summary_doc_ids_to_vector_store) -from server.knowledge_base.model.kb_document_model import DocumentWithVSId -from server.utils import BaseResponse, ListResponse +from chatchat_server.knowledge_base.model.kb_document_model import DocumentWithVSId +from chatchat_server.utils import BaseResponse, ListResponse kb_router = APIRouter(prefix="/knowledge_base", tags=["Knowledge Base Management"]) diff --git a/server/api_server/openai_routes.py b/chatchat-server/chatchat_server/api_server/openai_routes.py similarity index 98% rename from server/api_server/openai_routes.py rename to chatchat-server/chatchat_server/api_server/openai_routes.py index 69d663cb..f56ff68f 100644 --- a/server/api_server/openai_routes.py +++ b/chatchat-server/chatchat_server/api_server/openai_routes.py @@ -10,7 +10,7 @@ from sse_starlette.sse import EventSourceResponse from .api_schemas import * from configs import logger -from server.utils import get_model_info, get_config_platforms, get_OpenAIClient +from chatchat_server.utils import get_model_info, get_config_platforms, get_OpenAIClient DEFAULT_API_CONCURRENCIES = 5 # 默认单个模型最大并发数 diff --git a/server/api_server/server_app.py b/chatchat-server/chatchat_server/api_server/server_app.py similarity index 86% rename from server/api_server/server_app.py rename to chatchat-server/chatchat_server/api_server/server_app.py index 5caf4e46..ed4ed8a7 100644 --- a/server/api_server/server_app.py +++ b/chatchat-server/chatchat_server/api_server/server_app.py @@ -9,13 +9,13 @@ import uvicorn from configs import VERSION, MEDIA_PATH from configs.server_config import OPEN_CROSS_DOMAIN -from server.api_server.chat_routes import chat_router -from server.api_server.kb_routes import kb_router -from server.api_server.openai_routes import openai_router -from server.api_server.server_routes import server_router -from server.api_server.tool_routes import tool_router -from server.chat.completion import completion -from server.utils import MakeFastAPIOffline +from chatchat_server.api_server.chat_routes import chat_router +from chatchat_server.api_server.kb_routes import kb_router +from chatchat_server.api_server.openai_routes import openai_router +from chatchat_server.api_server.server_routes import server_router +from chatchat_server.api_server.tool_routes import tool_router +from chatchat_server.chat.completion import completion +from chatchat_server.utils import MakeFastAPIOffline def create_app(run_mode: str=None): diff --git a/server/api_server/server_routes.py b/chatchat-server/chatchat_server/api_server/server_routes.py similarity index 90% rename from server/api_server/server_routes.py rename to chatchat-server/chatchat_server/api_server/server_routes.py index be215ef7..8778ffdb 100644 --- a/server/api_server/server_routes.py +++ b/chatchat-server/chatchat_server/api_server/server_routes.py @@ -2,7 +2,7 @@ from typing import Literal from fastapi import APIRouter, Body -from server.utils import get_server_configs, get_prompt_template +from chatchat_server.utils import get_server_configs, get_prompt_template server_router = APIRouter(prefix="/server", tags=["Server State"]) diff --git a/server/api_server/static/favicon.png b/chatchat-server/chatchat_server/api_server/static/favicon.png similarity index 100% rename from server/api_server/static/favicon.png rename to chatchat-server/chatchat_server/api_server/static/favicon.png diff --git a/server/api_server/static/redoc.standalone.js b/chatchat-server/chatchat_server/api_server/static/redoc.standalone.js similarity index 100% rename from server/api_server/static/redoc.standalone.js rename to chatchat-server/chatchat_server/api_server/static/redoc.standalone.js diff --git a/server/api_server/static/swagger-ui-bundle.js b/chatchat-server/chatchat_server/api_server/static/swagger-ui-bundle.js similarity index 100% rename from server/api_server/static/swagger-ui-bundle.js rename to chatchat-server/chatchat_server/api_server/static/swagger-ui-bundle.js diff --git a/server/api_server/static/swagger-ui.css b/chatchat-server/chatchat_server/api_server/static/swagger-ui.css similarity index 100% rename from server/api_server/static/swagger-ui.css rename to chatchat-server/chatchat_server/api_server/static/swagger-ui.css diff --git a/server/api_server/tool_routes.py b/chatchat-server/chatchat_server/api_server/tool_routes.py similarity index 86% rename from server/api_server/tool_routes.py rename to chatchat-server/chatchat_server/api_server/tool_routes.py index 49441612..53ce69a2 100644 --- a/server/api_server/tool_routes.py +++ b/chatchat-server/chatchat_server/api_server/tool_routes.py @@ -5,7 +5,7 @@ from typing import List from fastapi import APIRouter, Request, Body from configs import logger -from server.utils import BaseResponse +from chatchat_server.utils import BaseResponse tool_router = APIRouter(prefix="/tools", tags=["Toolkits"]) @@ -14,7 +14,7 @@ tool_router = APIRouter(prefix="/tools", tags=["Toolkits"]) @tool_router.get("/", response_model=BaseResponse) async def list_tools(): import importlib - from server.agent.tools_factory import tools_registry + from chatchat_server.agent.tools_factory import tools_registry importlib.reload(tools_registry) data = {t.name: {"name": t.name, "description": t.description, "args": t.args} for t in tools_registry.all_tools} @@ -27,7 +27,7 @@ async def call_tool( kwargs: dict = Body({}, examples=[{"a":1,"b":2,"operator":"+"}]), ): import importlib - from server.agent.tools_factory import tools_registry + from chatchat_server.agent.tools_factory import tools_registry importlib.reload(tools_registry) tool_names = {t.name: t for t in tools_registry.all_tools} diff --git a/server/callback_handler/agent_callback_handler.py b/chatchat-server/chatchat_server/callback_handler/agent_callback_handler.py similarity index 100% rename from server/callback_handler/agent_callback_handler.py rename to chatchat-server/chatchat_server/callback_handler/agent_callback_handler.py diff --git a/server/callback_handler/conversation_callback_handler.py b/chatchat-server/chatchat_server/callback_handler/conversation_callback_handler.py similarity index 94% rename from server/callback_handler/conversation_callback_handler.py rename to chatchat-server/chatchat_server/callback_handler/conversation_callback_handler.py index ab926a55..b240440f 100644 --- a/server/callback_handler/conversation_callback_handler.py +++ b/chatchat-server/chatchat_server/callback_handler/conversation_callback_handler.py @@ -2,7 +2,7 @@ from typing import Any, Dict, List from langchain.callbacks.base import BaseCallbackHandler from langchain.schema import LLMResult -from server.db.repository import update_message +from chatchat_server.db.repository import update_message class ConversationCallbackHandler(BaseCallbackHandler): diff --git a/server/chat/chat.py b/chatchat-server/chatchat_server/chat/chat.py similarity index 91% rename from server/chat/chat.py rename to chatchat-server/chatchat_server/chat/chat.py index 80e28f2e..07aa6d1d 100644 --- a/server/chat/chat.py +++ b/chatchat-server/chatchat_server/chat/chat.py @@ -10,15 +10,15 @@ from langchain_core.messages import AIMessage, HumanMessage from langchain.chains import LLMChain from langchain.prompts.chat import ChatPromptTemplate from langchain.prompts import PromptTemplate -from server.agent.agent_factory.agents_registry import agents_registry -from server.agent.tools_factory.tools_registry import all_tools -from server.agent.container import container +from chatchat_server.agent.agent_factory.agents_registry import agents_registry +from chatchat_server.agent.tools_factory.tools_registry import all_tools +from chatchat_server.agent.container import container -from server.utils import wrap_done, get_ChatOpenAI, get_prompt_template, MsgType -from server.chat.utils import History -from server.memory.conversation_db_buffer_memory import ConversationBufferDBMemory -from server.db.repository import add_message_to_db -from server.callback_handler.agent_callback_handler import AgentExecutorAsyncIteratorCallbackHandler, AgentStatus +from chatchat_server.utils import wrap_done, get_ChatOpenAI, get_prompt_template, MsgType +from chatchat_server.chat.utils import History +from chatchat_server.memory.conversation_db_buffer_memory import ConversationBufferDBMemory +from chatchat_server.db.repository import add_message_to_db +from chatchat_server.callback_handler.agent_callback_handler import AgentExecutorAsyncIteratorCallbackHandler, AgentStatus def create_models_from_config(configs, callbacks, stream): diff --git a/server/chat/completion.py b/chatchat-server/chatchat_server/chat/completion.py similarity index 96% rename from server/chat/completion.py rename to chatchat-server/chatchat_server/chat/completion.py index 02092bc7..8f04d7b9 100644 --- a/server/chat/completion.py +++ b/chatchat-server/chatchat_server/chat/completion.py @@ -1,13 +1,13 @@ from fastapi import Body from sse_starlette.sse import EventSourceResponse -from server.utils import wrap_done, get_OpenAI +from chatchat_server.utils import wrap_done, get_OpenAI from langchain.chains import LLMChain from langchain.callbacks import AsyncIteratorCallbackHandler from typing import AsyncIterable, Optional import asyncio from langchain.prompts import PromptTemplate -from server.utils import get_prompt_template +from chatchat_server.utils import get_prompt_template async def completion(query: str = Body(..., description="用户输入", examples=["恼羞成怒"]), diff --git a/server/chat/feedback.py b/chatchat-server/chatchat_server/chat/feedback.py similarity index 87% rename from server/chat/feedback.py rename to chatchat-server/chatchat_server/chat/feedback.py index 7303dec4..e46f22af 100644 --- a/server/chat/feedback.py +++ b/chatchat-server/chatchat_server/chat/feedback.py @@ -1,7 +1,7 @@ from fastapi import Body from configs import logger, log_verbose -from server.utils import BaseResponse -from server.db.repository import feedback_message_to_db +from chatchat_server.utils import BaseResponse +from chatchat_server.db.repository import feedback_message_to_db def chat_feedback(message_id: str = Body("", max_length=32, description="聊天记录id"), score: int = Body(0, max=100, description="用户评分，满分100，越大表示评价越高"), diff --git a/server/chat/file_chat.py b/chatchat-server/chatchat_server/chat/file_chat.py similarity index 96% rename from server/chat/file_chat.py rename to chatchat-server/chatchat_server/chat/file_chat.py index 3d243769..cf1bd686 100644 --- a/server/chat/file_chat.py +++ b/chatchat-server/chatchat_server/chat/file_chat.py @@ -1,16 +1,16 @@ from fastapi import Body, File, Form, UploadFile from fastapi.responses import StreamingResponse from configs import (VECTOR_SEARCH_TOP_K, SCORE_THRESHOLD, CHUNK_SIZE, OVERLAP_SIZE, ZH_TITLE_ENHANCE) -from server.utils import (wrap_done, get_ChatOpenAI, get_Embeddings, +from chatchat_server.utils import (wrap_done, get_ChatOpenAI, get_Embeddings, BaseResponse, get_prompt_template, get_temp_dir, run_in_thread_pool) -from server.knowledge_base.kb_cache.faiss_cache import memo_faiss_pool +from chatchat_server.knowledge_base.kb_cache.faiss_cache import memo_faiss_pool from langchain.chains import LLMChain from langchain.callbacks import AsyncIteratorCallbackHandler from typing import AsyncIterable, List, Optional import asyncio from langchain.prompts.chat import ChatPromptTemplate -from server.chat.utils import History -from server.knowledge_base.utils import KnowledgeFile +from chatchat_server.chat.utils import History +from chatchat_server.knowledge_base.utils import KnowledgeFile import json import os diff --git a/server/chat/utils.py b/chatchat-server/chatchat_server/chat/utils.py similarity index 95% rename from server/chat/utils.py rename to chatchat-server/chatchat_server/chat/utils.py index 87d61559..bf23b541 100644 --- a/server/chat/utils.py +++ b/chatchat-server/chatchat_server/chat/utils.py @@ -1,5 +1,5 @@ from functools import lru_cache -from server.pydantic_types import BaseModel, Field +from chatchat_server.pydantic_types import BaseModel, Field from langchain.prompts.chat import ChatMessagePromptTemplate from configs import logger, log_verbose from typing import List, Tuple, Dict, Union diff --git a/model_providers/model_providers/core/entities/__init__.py b/chatchat-server/chatchat_server/db/__init__.py similarity index 100% rename from model_providers/model_providers/core/entities/__init__.py rename to chatchat-server/chatchat_server/db/__init__.py diff --git a/server/db/base.py b/chatchat-server/chatchat_server/db/base.py similarity index 100% rename from server/db/base.py rename to chatchat-server/chatchat_server/db/base.py diff --git a/model_providers/model_providers/core/model_runtime/__init__.py b/chatchat-server/chatchat_server/db/models/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/__init__.py rename to chatchat-server/chatchat_server/db/models/__init__.py diff --git a/server/db/models/base.py b/chatchat-server/chatchat_server/db/models/base.py similarity index 100% rename from server/db/models/base.py rename to chatchat-server/chatchat_server/db/models/base.py diff --git a/server/db/models/conversation_model.py b/chatchat-server/chatchat_server/db/models/conversation_model.py similarity index 93% rename from server/db/models/conversation_model.py rename to chatchat-server/chatchat_server/db/models/conversation_model.py index c9a53bbc..cb7c04db 100644 --- a/server/db/models/conversation_model.py +++ b/chatchat-server/chatchat_server/db/models/conversation_model.py @@ -1,5 +1,5 @@ from sqlalchemy import Column, Integer, String, DateTime, JSON, func -from server.db.base import Base +from chatchat_server.db.base import Base class ConversationModel(Base): diff --git a/server/db/models/knowledge_base_model.py b/chatchat-server/chatchat_server/db/models/knowledge_base_model.py similarity index 95% rename from server/db/models/knowledge_base_model.py rename to chatchat-server/chatchat_server/db/models/knowledge_base_model.py index f9035af4..d45031ca 100644 --- a/server/db/models/knowledge_base_model.py +++ b/chatchat-server/chatchat_server/db/models/knowledge_base_model.py @@ -1,6 +1,6 @@ from sqlalchemy import Column, Integer, String, DateTime, func -from server.db.base import Base +from chatchat_server.db.base import Base class KnowledgeBaseModel(Base): diff --git a/server/db/models/knowledge_file_model.py b/chatchat-server/chatchat_server/db/models/knowledge_file_model.py similarity index 97% rename from server/db/models/knowledge_file_model.py rename to chatchat-server/chatchat_server/db/models/knowledge_file_model.py index 2937dfa7..a2360c3a 100644 --- a/server/db/models/knowledge_file_model.py +++ b/chatchat-server/chatchat_server/db/models/knowledge_file_model.py @@ -1,6 +1,6 @@ from sqlalchemy import Column, Integer, String, DateTime, Float, Boolean, JSON, func -from server.db.base import Base +from chatchat_server.db.base import Base class KnowledgeFileModel(Base): diff --git a/server/db/models/knowledge_metadata_model.py b/chatchat-server/chatchat_server/db/models/knowledge_metadata_model.py similarity index 97% rename from server/db/models/knowledge_metadata_model.py rename to chatchat-server/chatchat_server/db/models/knowledge_metadata_model.py index 03f42009..fd86cfdf 100644 --- a/server/db/models/knowledge_metadata_model.py +++ b/chatchat-server/chatchat_server/db/models/knowledge_metadata_model.py @@ -1,6 +1,6 @@ from sqlalchemy import Column, Integer, String, DateTime, Float, Boolean, JSON, func -from server.db.base import Base +from chatchat_server.db.base import Base class SummaryChunkModel(Base): diff --git a/server/db/models/message_model.py b/chatchat-server/chatchat_server/db/models/message_model.py similarity index 96% rename from server/db/models/message_model.py rename to chatchat-server/chatchat_server/db/models/message_model.py index de0bc340..de8f8527 100644 --- a/server/db/models/message_model.py +++ b/chatchat-server/chatchat_server/db/models/message_model.py @@ -1,6 +1,6 @@ from sqlalchemy import Column, Integer, String, DateTime, JSON, func -from server.db.base import Base +from chatchat_server.db.base import Base class MessageModel(Base): diff --git a/server/db/repository/__init__.py b/chatchat-server/chatchat_server/db/repository/__init__.py similarity index 100% rename from server/db/repository/__init__.py rename to chatchat-server/chatchat_server/db/repository/__init__.py diff --git a/server/db/repository/conversation_repository.py b/chatchat-server/chatchat_server/db/repository/conversation_repository.py similarity index 72% rename from server/db/repository/conversation_repository.py rename to chatchat-server/chatchat_server/db/repository/conversation_repository.py index 4569d7b2..59484ede 100644 --- a/server/db/repository/conversation_repository.py +++ b/chatchat-server/chatchat_server/db/repository/conversation_repository.py @@ -1,6 +1,6 @@ -from server.db.session import with_session +from chatchat_server.db.session import with_session import uuid -from server.db.models.conversation_model import ConversationModel +from chatchat_server.db.models.conversation_model import ConversationModel @with_session diff --git a/server/db/repository/knowledge_base_repository.py b/chatchat-server/chatchat_server/db/repository/knowledge_base_repository.py similarity index 93% rename from server/db/repository/knowledge_base_repository.py rename to chatchat-server/chatchat_server/db/repository/knowledge_base_repository.py index b39c8c57..b5f384c4 100644 --- a/server/db/repository/knowledge_base_repository.py +++ b/chatchat-server/chatchat_server/db/repository/knowledge_base_repository.py @@ -1,5 +1,5 @@ -from server.db.models.knowledge_base_model import KnowledgeBaseModel -from server.db.session import with_session +from chatchat_server.db.models.knowledge_base_model import KnowledgeBaseModel +from chatchat_server.db.session import with_session @with_session diff --git a/server/db/repository/knowledge_file_repository.py b/chatchat-server/chatchat_server/db/repository/knowledge_file_repository.py similarity index 96% rename from server/db/repository/knowledge_file_repository.py rename to chatchat-server/chatchat_server/db/repository/knowledge_file_repository.py index 125c1bb0..63b53659 100644 --- a/server/db/repository/knowledge_file_repository.py +++ b/chatchat-server/chatchat_server/db/repository/knowledge_file_repository.py @@ -1,7 +1,7 @@ -from server.db.models.knowledge_base_model import KnowledgeBaseModel -from server.db.models.knowledge_file_model import KnowledgeFileModel, FileDocModel -from server.db.session import with_session -from server.knowledge_base.utils import KnowledgeFile +from chatchat_server.db.models.knowledge_base_model import KnowledgeBaseModel +from chatchat_server.db.models.knowledge_file_model import KnowledgeFileModel, FileDocModel +from chatchat_server.db.session import with_session +from chatchat_server.knowledge_base.utils import KnowledgeFile from typing import List, Dict diff --git a/server/db/repository/knowledge_metadata_repository.py b/chatchat-server/chatchat_server/db/repository/knowledge_metadata_repository.py similarity index 93% rename from server/db/repository/knowledge_metadata_repository.py rename to chatchat-server/chatchat_server/db/repository/knowledge_metadata_repository.py index 20725e3c..67dbdaee 100644 --- a/server/db/repository/knowledge_metadata_repository.py +++ b/chatchat-server/chatchat_server/db/repository/knowledge_metadata_repository.py @@ -1,5 +1,5 @@ -from server.db.models.knowledge_metadata_model import SummaryChunkModel -from server.db.session import with_session +from chatchat_server.db.models.knowledge_metadata_model import SummaryChunkModel +from chatchat_server.db.session import with_session from typing import List, Dict diff --git a/server/db/repository/message_repository.py b/chatchat-server/chatchat_server/db/repository/message_repository.py similarity index 94% rename from server/db/repository/message_repository.py rename to chatchat-server/chatchat_server/db/repository/message_repository.py index 02f29979..b8cff49f 100644 --- a/server/db/repository/message_repository.py +++ b/chatchat-server/chatchat_server/db/repository/message_repository.py @@ -1,7 +1,7 @@ -from server.db.session import with_session +from chatchat_server.db.session import with_session from typing import Dict, List import uuid -from server.db.models.message_model import MessageModel +from chatchat_server.db.models.message_model import MessageModel @with_session diff --git a/server/db/session.py b/chatchat-server/chatchat_server/db/session.py similarity index 94% rename from server/db/session.py rename to chatchat-server/chatchat_server/db/session.py index 0f461d5d..93f628bd 100644 --- a/server/db/session.py +++ b/chatchat-server/chatchat_server/db/session.py @@ -1,6 +1,6 @@ from functools import wraps from contextlib import contextmanager -from server.db.base import SessionLocal +from chatchat_server.db.base import SessionLocal from sqlalchemy.orm import Session diff --git a/server/document_loaders/FilteredCSVloader.py b/chatchat-server/chatchat_server/document_loaders/FilteredCSVloader.py similarity index 100% rename from server/document_loaders/FilteredCSVloader.py rename to chatchat-server/chatchat_server/document_loaders/FilteredCSVloader.py diff --git a/server/document_loaders/__init__.py b/chatchat-server/chatchat_server/document_loaders/__init__.py similarity index 100% rename from server/document_loaders/__init__.py rename to chatchat-server/chatchat_server/document_loaders/__init__.py diff --git a/server/document_loaders/mydocloader.py b/chatchat-server/chatchat_server/document_loaders/mydocloader.py similarity index 100% rename from server/document_loaders/mydocloader.py rename to chatchat-server/chatchat_server/document_loaders/mydocloader.py diff --git a/server/document_loaders/myimgloader.py b/chatchat-server/chatchat_server/document_loaders/myimgloader.py similarity index 93% rename from server/document_loaders/myimgloader.py rename to chatchat-server/chatchat_server/document_loaders/myimgloader.py index 9e0b0c72..18090d91 100644 --- a/server/document_loaders/myimgloader.py +++ b/chatchat-server/chatchat_server/document_loaders/myimgloader.py @@ -1,6 +1,6 @@ from typing import List from langchain_community.document_loaders.unstructured import UnstructuredFileLoader -from server.document_loaders.ocr import get_ocr +from chatchat_server.document_loaders.ocr import get_ocr class RapidOCRLoader(UnstructuredFileLoader): diff --git a/server/document_loaders/mypdfloader.py b/chatchat-server/chatchat_server/document_loaders/mypdfloader.py similarity index 98% rename from server/document_loaders/mypdfloader.py rename to chatchat-server/chatchat_server/document_loaders/mypdfloader.py index e0f11c5a..25fb9bf6 100644 --- a/server/document_loaders/mypdfloader.py +++ b/chatchat-server/chatchat_server/document_loaders/mypdfloader.py @@ -4,7 +4,7 @@ import cv2 from PIL import Image import numpy as np from configs import PDF_OCR_THRESHOLD -from server.document_loaders.ocr import get_ocr +from chatchat_server.document_loaders.ocr import get_ocr import tqdm diff --git a/server/document_loaders/mypptloader.py b/chatchat-server/chatchat_server/document_loaders/mypptloader.py similarity index 100% rename from server/document_loaders/mypptloader.py rename to chatchat-server/chatchat_server/document_loaders/mypptloader.py diff --git a/server/document_loaders/ocr.py b/chatchat-server/chatchat_server/document_loaders/ocr.py similarity index 100% rename from server/document_loaders/ocr.py rename to chatchat-server/chatchat_server/document_loaders/ocr.py diff --git a/server/knowledge_base/__init__.py b/chatchat-server/chatchat_server/knowledge_base/__init__.py similarity index 100% rename from server/knowledge_base/__init__.py rename to chatchat-server/chatchat_server/knowledge_base/__init__.py diff --git a/server/knowledge_base/kb_api.py b/chatchat-server/chatchat_server/knowledge_base/kb_api.py similarity index 89% rename from server/knowledge_base/kb_api.py rename to chatchat-server/chatchat_server/knowledge_base/kb_api.py index a4850556..1c7bf985 100644 --- a/server/knowledge_base/kb_api.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_api.py @@ -1,8 +1,8 @@ import urllib -from server.utils import BaseResponse, ListResponse -from server.knowledge_base.utils import validate_kb_name -from server.knowledge_base.kb_service.base import KBServiceFactory -from server.db.repository.knowledge_base_repository import list_kbs_from_db +from chatchat_server.utils import BaseResponse, ListResponse +from chatchat_server.knowledge_base.utils import validate_kb_name +from chatchat_server.knowledge_base.kb_service.base import KBServiceFactory +from chatchat_server.db.repository.knowledge_base_repository import list_kbs_from_db from configs import DEFAULT_EMBEDDING_MODEL, logger, log_verbose from fastapi import Body diff --git a/server/knowledge_base/kb_cache/base.py b/chatchat-server/chatchat_server/knowledge_base/kb_cache/base.py similarity index 100% rename from server/knowledge_base/kb_cache/base.py rename to chatchat-server/chatchat_server/knowledge_base/kb_cache/base.py diff --git a/server/knowledge_base/kb_cache/faiss_cache.py b/chatchat-server/chatchat_server/knowledge_base/kb_cache/faiss_cache.py similarity index 97% rename from server/knowledge_base/kb_cache/faiss_cache.py rename to chatchat-server/chatchat_server/knowledge_base/kb_cache/faiss_cache.py index 067ba37a..93846b3c 100644 --- a/server/knowledge_base/kb_cache/faiss_cache.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_cache/faiss_cache.py @@ -1,7 +1,7 @@ from configs import CACHED_VS_NUM, CACHED_MEMO_VS_NUM -from server.knowledge_base.kb_cache.base import * -from server.utils import get_Embeddings -from server.knowledge_base.utils import get_vs_path +from chatchat_server.knowledge_base.kb_cache.base import * +from chatchat_server.utils import get_Embeddings +from chatchat_server.knowledge_base.utils import get_vs_path from langchain.vectorstores.faiss import FAISS from langchain.docstore.in_memory import InMemoryDocstore from langchain.schema import Document diff --git a/server/knowledge_base/kb_doc_api.py b/chatchat-server/chatchat_server/knowledge_base/kb_doc_api.py similarity index 97% rename from server/knowledge_base/kb_doc_api.py rename to chatchat-server/chatchat_server/knowledge_base/kb_doc_api.py index 8b200254..35f40c91 100644 --- a/server/knowledge_base/kb_doc_api.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_doc_api.py @@ -5,16 +5,16 @@ from configs import (DEFAULT_VS_TYPE, DEFAULT_EMBEDDING_MODEL, VECTOR_SEARCH_TOP_K, SCORE_THRESHOLD, CHUNK_SIZE, OVERLAP_SIZE, ZH_TITLE_ENHANCE, logger, log_verbose, ) -from server.utils import BaseResponse, ListResponse, run_in_thread_pool -from server.knowledge_base.utils import (validate_kb_name, list_files_from_folder, get_file_path, +from chatchat_server.utils import BaseResponse, ListResponse, run_in_thread_pool +from chatchat_server.knowledge_base.utils import (validate_kb_name, list_files_from_folder, get_file_path, files2docs_in_thread, KnowledgeFile) from fastapi.responses import FileResponse from sse_starlette import EventSourceResponse import json -from server.knowledge_base.kb_service.base import KBServiceFactory -from server.db.repository.knowledge_file_repository import get_file_detail +from chatchat_server.knowledge_base.kb_service.base import KBServiceFactory +from chatchat_server.db.repository.knowledge_file_repository import get_file_detail from langchain.docstore.document import Document -from server.knowledge_base.model.kb_document_model import DocumentWithVSId +from chatchat_server.knowledge_base.model.kb_document_model import DocumentWithVSId from typing import List, Dict diff --git a/model_providers/model_providers/core/model_runtime/callbacks/__init__.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/callbacks/__init__.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/__init__.py diff --git a/server/knowledge_base/kb_service/base.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/base.py similarity index 92% rename from server/knowledge_base/kb_service/base.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/base.py index 3e252fd7..7518e27f 100644 --- a/server/knowledge_base/kb_service/base.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_service/base.py @@ -5,11 +5,11 @@ import os from pathlib import Path from langchain.docstore.document import Document -from server.db.repository.knowledge_base_repository import ( +from chatchat_server.db.repository.knowledge_base_repository import ( add_kb_to_db, delete_kb_from_db, list_kbs_from_db, kb_exists, load_kb_from_db, get_kb_detail, ) -from server.db.repository.knowledge_file_repository import ( +from chatchat_server.db.repository.knowledge_file_repository import ( add_file_to_db, delete_file_from_db, delete_files_from_db, file_exists_in_db, count_files_from_db, list_files_from_db, get_file_detail, delete_file_from_db, list_docs_from_db, @@ -17,14 +17,14 @@ from server.db.repository.knowledge_file_repository import ( from configs import (kbs_config, VECTOR_SEARCH_TOP_K, SCORE_THRESHOLD, DEFAULT_EMBEDDING_MODEL, KB_INFO) -from server.knowledge_base.utils import ( +from chatchat_server.knowledge_base.utils import ( get_kb_path, get_doc_path, KnowledgeFile, list_kbs_from_folder, list_files_from_folder, ) from typing import List, Union, Dict, Optional, Tuple -from server.knowledge_base.model.kb_document_model import DocumentWithVSId +from chatchat_server.knowledge_base.model.kb_document_model import DocumentWithVSId class SupportedVSType: @@ -286,29 +286,29 @@ class KBServiceFactory: if isinstance(vector_store_type, str): vector_store_type = getattr(SupportedVSType, vector_store_type.upper()) if SupportedVSType.FAISS == vector_store_type: - from server.knowledge_base.kb_service.faiss_kb_service import FaissKBService + from chatchat_server.knowledge_base.kb_service.faiss_kb_service import FaissKBService return FaissKBService(kb_name, embed_model=embed_model) elif SupportedVSType.PG == vector_store_type: - from server.knowledge_base.kb_service.pg_kb_service import PGKBService + from chatchat_server.knowledge_base.kb_service.pg_kb_service import PGKBService return PGKBService(kb_name, embed_model=embed_model) elif SupportedVSType.MILVUS == vector_store_type: - from server.knowledge_base.kb_service.milvus_kb_service import MilvusKBService + from chatchat_server.knowledge_base.kb_service.milvus_kb_service import MilvusKBService return MilvusKBService(kb_name, embed_model=embed_model) elif SupportedVSType.ZILLIZ == vector_store_type: - from server.knowledge_base.kb_service.zilliz_kb_service import ZillizKBService + from chatchat_server.knowledge_base.kb_service.zilliz_kb_service import ZillizKBService return ZillizKBService(kb_name, embed_model=embed_model) elif SupportedVSType.DEFAULT == vector_store_type: - from server.knowledge_base.kb_service.milvus_kb_service import MilvusKBService + from chatchat_server.knowledge_base.kb_service.milvus_kb_service import MilvusKBService return MilvusKBService(kb_name, embed_model=embed_model) # other milvus parameters are set in model_config.kbs_config elif SupportedVSType.ES == vector_store_type: - from server.knowledge_base.kb_service.es_kb_service import ESKBService + from chatchat_server.knowledge_base.kb_service.es_kb_service import ESKBService return ESKBService(kb_name, embed_model=embed_model) elif SupportedVSType.CHROMADB == vector_store_type: - from server.knowledge_base.kb_service.chromadb_kb_service import ChromaKBService + from chatchat_server.knowledge_base.kb_service.chromadb_kb_service import ChromaKBService return ChromaKBService(kb_name, embed_model=embed_model) elif SupportedVSType.DEFAULT == vector_store_type: # kb_exists of default kbservice is False, to make validation easier. - from server.knowledge_base.kb_service.default_kb_service import DefaultKBService + from chatchat_server.knowledge_base.kb_service.default_kb_service import DefaultKBService return DefaultKBService(kb_name) @staticmethod diff --git a/server/knowledge_base/kb_service/chromadb_kb_service.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/chromadb_kb_service.py similarity index 94% rename from server/knowledge_base/kb_service/chromadb_kb_service.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/chromadb_kb_service.py index aa83f5e3..f38d2946 100644 --- a/server/knowledge_base/kb_service/chromadb_kb_service.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_service/chromadb_kb_service.py @@ -6,9 +6,9 @@ from chromadb.api.types import (GetResult, QueryResult) from langchain.docstore.document import Document from configs import SCORE_THRESHOLD -from server.knowledge_base.kb_service.base import KBService, SupportedVSType -from server.knowledge_base.utils import KnowledgeFile, get_kb_path, get_vs_path -from server.utils import get_Embeddings +from chatchat_server.knowledge_base.kb_service.base import KBService, SupportedVSType +from chatchat_server.knowledge_base.utils import KnowledgeFile, get_kb_path, get_vs_path +from chatchat_server.utils import get_Embeddings def _get_result_to_documents(get_result: GetResult) -> List[Document]: diff --git a/server/knowledge_base/kb_service/default_kb_service.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/default_kb_service.py similarity index 89% rename from server/knowledge_base/kb_service/default_kb_service.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/default_kb_service.py index a68d59c5..12b9c42c 100644 --- a/server/knowledge_base/kb_service/default_kb_service.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_service/default_kb_service.py @@ -3,7 +3,7 @@ from typing import List from langchain.embeddings.base import Embeddings from langchain.schema import Document -from server.knowledge_base.kb_service.base import KBService +from chatchat_server.knowledge_base.kb_service.base import KBService class DefaultKBService(KBService): diff --git a/server/knowledge_base/kb_service/es_kb_service.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/es_kb_service.py similarity index 97% rename from server/knowledge_base/kb_service/es_kb_service.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/es_kb_service.py index a00dafc9..7df23f0f 100644 --- a/server/knowledge_base/kb_service/es_kb_service.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_service/es_kb_service.py @@ -3,9 +3,9 @@ import os import shutil from langchain.schema import Document from langchain_community.vectorstores.elasticsearch import ElasticsearchStore, ApproxRetrievalStrategy -from server.knowledge_base.kb_service.base import KBService, SupportedVSType -from server.knowledge_base.utils import KnowledgeFile -from server.utils import get_Embeddings +from chatchat_server.knowledge_base.kb_service.base import KBService, SupportedVSType +from chatchat_server.knowledge_base.utils import KnowledgeFile +from chatchat_server.utils import get_Embeddings from elasticsearch import Elasticsearch, BadRequestError from configs import logger, kbs_config, KB_ROOT_PATH diff --git a/server/knowledge_base/kb_service/faiss_kb_service.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/faiss_kb_service.py similarity index 92% rename from server/knowledge_base/kb_service/faiss_kb_service.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/faiss_kb_service.py index 268f81a0..30f07e01 100644 --- a/server/knowledge_base/kb_service/faiss_kb_service.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_service/faiss_kb_service.py @@ -2,10 +2,10 @@ import os import shutil from configs import SCORE_THRESHOLD -from server.knowledge_base.kb_service.base import KBService, SupportedVSType -from server.knowledge_base.kb_cache.faiss_cache import kb_faiss_pool, ThreadSafeFaiss -from server.knowledge_base.utils import KnowledgeFile, get_kb_path, get_vs_path -from server.utils import get_Embeddings +from chatchat_server.knowledge_base.kb_service.base import KBService, SupportedVSType +from chatchat_server.knowledge_base.kb_cache.faiss_cache import kb_faiss_pool, ThreadSafeFaiss +from chatchat_server.knowledge_base.utils import KnowledgeFile, get_kb_path, get_vs_path +from chatchat_server.utils import get_Embeddings from langchain.docstore.document import Document from typing import List, Dict, Optional, Tuple diff --git a/server/knowledge_base/kb_service/milvus_kb_service.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/milvus_kb_service.py similarity index 92% rename from server/knowledge_base/kb_service/milvus_kb_service.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/milvus_kb_service.py index f3dbda31..b798230c 100644 --- a/server/knowledge_base/kb_service/milvus_kb_service.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_service/milvus_kb_service.py @@ -5,12 +5,12 @@ from langchain.vectorstores.milvus import Milvus import os from configs import kbs_config -from server.db.repository import list_file_num_docs_id_by_kb_name_and_file_name +from chatchat_server.db.repository import list_file_num_docs_id_by_kb_name_and_file_name -from server.knowledge_base.kb_service.base import KBService, SupportedVSType, \ +from chatchat_server.knowledge_base.kb_service.base import KBService, SupportedVSType, \ score_threshold_process -from server.knowledge_base.utils import KnowledgeFile -from server.utils import get_Embeddings +from chatchat_server.knowledge_base.utils import KnowledgeFile +from chatchat_server.utils import get_Embeddings class MilvusKBService(KBService): @@ -106,7 +106,7 @@ class MilvusKBService(KBService): if __name__ == '__main__': # 测试建表使用 - from server.db.base import Base, engine + from chatchat_server.db.base import Base, engine Base.metadata.create_all(bind=engine) milvusService = MilvusKBService("test") diff --git a/server/knowledge_base/kb_service/pg_kb_service.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/pg_kb_service.py similarity index 93% rename from server/knowledge_base/kb_service/pg_kb_service.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/pg_kb_service.py index a9d578d4..257b8a8e 100644 --- a/server/knowledge_base/kb_service/pg_kb_service.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_service/pg_kb_service.py @@ -7,10 +7,10 @@ from sqlalchemy import text from configs import kbs_config -from server.knowledge_base.kb_service.base import SupportedVSType, KBService, \ +from chatchat_server.knowledge_base.kb_service.base import SupportedVSType, KBService, \ score_threshold_process -from server.knowledge_base.utils import KnowledgeFile -from server.utils import get_Embeddings +from chatchat_server.knowledge_base.utils import KnowledgeFile +from chatchat_server.utils import get_Embeddings import shutil import sqlalchemy from sqlalchemy.engine.base import Engine @@ -85,7 +85,7 @@ class PGKBService(KBService): if __name__ == '__main__': - from server.db.base import Base, engine + from chatchat_server.db.base import Base, engine # Base.metadata.create_all(bind=engine) pGKBService = PGKBService("test") diff --git a/server/knowledge_base/kb_service/zilliz_kb_service.py b/chatchat-server/chatchat_server/knowledge_base/kb_service/zilliz_kb_service.py similarity index 92% rename from server/knowledge_base/kb_service/zilliz_kb_service.py rename to chatchat-server/chatchat_server/knowledge_base/kb_service/zilliz_kb_service.py index f0fd0fc7..d450244c 100644 --- a/server/knowledge_base/kb_service/zilliz_kb_service.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_service/zilliz_kb_service.py @@ -3,10 +3,10 @@ from langchain.embeddings.base import Embeddings from langchain.schema import Document from langchain.vectorstores import Zilliz from configs import kbs_config -from server.knowledge_base.kb_service.base import KBService, SupportedVSType, \ +from chatchat_server.knowledge_base.kb_service.base import KBService, SupportedVSType, \ score_threshold_process -from server.knowledge_base.utils import KnowledgeFile -from server.utils import get_Embeddings +from chatchat_server.knowledge_base.utils import KnowledgeFile +from chatchat_server.utils import get_Embeddings class ZillizKBService(KBService): @@ -92,7 +92,7 @@ class ZillizKBService(KBService): if __name__ == '__main__': - from server.db.base import Base, engine + from chatchat_server.db.base import Base, engine Base.metadata.create_all(bind=engine) zillizService = ZillizKBService("test") diff --git a/model_providers/model_providers/core/model_runtime/entities/__init__.py b/chatchat-server/chatchat_server/knowledge_base/kb_summary/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/entities/__init__.py rename to chatchat-server/chatchat_server/knowledge_base/kb_summary/__init__.py diff --git a/server/knowledge_base/kb_summary/base.py b/chatchat-server/chatchat_server/knowledge_base/kb_summary/base.py similarity index 91% rename from server/knowledge_base/kb_summary/base.py rename to chatchat-server/chatchat_server/knowledge_base/kb_summary/base.py index dae3dc9e..0851f075 100644 --- a/server/knowledge_base/kb_summary/base.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_summary/base.py @@ -5,10 +5,10 @@ from configs import ( KB_ROOT_PATH) from abc import ABC, abstractmethod -from server.knowledge_base.kb_cache.faiss_cache import kb_faiss_pool, ThreadSafeFaiss +from chatchat_server.knowledge_base.kb_cache.faiss_cache import kb_faiss_pool, ThreadSafeFaiss import os import shutil -from server.db.repository.knowledge_metadata_repository import add_summary_to_db, delete_summary_from_db +from chatchat_server.db.repository.knowledge_metadata_repository import add_summary_to_db, delete_summary_from_db from langchain.docstore.document import Document diff --git a/server/knowledge_base/kb_summary/summary_chunk.py b/chatchat-server/chatchat_server/knowledge_base/kb_summary/summary_chunk.py similarity index 99% rename from server/knowledge_base/kb_summary/summary_chunk.py rename to chatchat-server/chatchat_server/knowledge_base/kb_summary/summary_chunk.py index 7c2aaf47..ebae3514 100644 --- a/server/knowledge_base/kb_summary/summary_chunk.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_summary/summary_chunk.py @@ -2,7 +2,7 @@ from typing import List, Optional from langchain.schema.language_model import BaseLanguageModel -from server.knowledge_base.model.kb_document_model import DocumentWithVSId +from chatchat_server.knowledge_base.model.kb_document_model import DocumentWithVSId from configs import (logger) from langchain.chains import StuffDocumentsChain, LLMChain from langchain.prompts import PromptTemplate diff --git a/server/knowledge_base/kb_summary_api.py b/chatchat-server/chatchat_server/knowledge_base/kb_summary_api.py similarity index 94% rename from server/knowledge_base/kb_summary_api.py rename to chatchat-server/chatchat_server/knowledge_base/kb_summary_api.py index 7ee42956..95cbdf8b 100644 --- a/server/knowledge_base/kb_summary_api.py +++ b/chatchat-server/chatchat_server/knowledge_base/kb_summary_api.py @@ -2,15 +2,15 @@ from fastapi import Body from configs import (DEFAULT_VS_TYPE, DEFAULT_EMBEDDING_MODEL, OVERLAP_SIZE, logger, log_verbose, ) -from server.knowledge_base.utils import (list_files_from_folder) +from chatchat_server.knowledge_base.utils import (list_files_from_folder) from sse_starlette import EventSourceResponse import json -from server.knowledge_base.kb_service.base import KBServiceFactory +from chatchat_server.knowledge_base.kb_service.base import KBServiceFactory from typing import List, Optional -from server.knowledge_base.kb_summary.base import KBSummaryService -from server.knowledge_base.kb_summary.summary_chunk import SummaryAdapter -from server.utils import wrap_done, get_ChatOpenAI, BaseResponse -from server.knowledge_base.model.kb_document_model import DocumentWithVSId +from chatchat_server.knowledge_base.kb_summary.base import KBSummaryService +from chatchat_server.knowledge_base.kb_summary.summary_chunk import SummaryAdapter +from chatchat_server.utils import wrap_done, get_ChatOpenAI, BaseResponse +from chatchat_server.knowledge_base.model.kb_document_model import DocumentWithVSId def recreate_summary_vector_store( diff --git a/server/knowledge_base/migrate.py b/chatchat-server/chatchat_server/knowledge_base/migrate.py similarity index 92% rename from server/knowledge_base/migrate.py rename to chatchat-server/chatchat_server/knowledge_base/migrate.py index a4817476..8658c25d 100644 --- a/server/knowledge_base/migrate.py +++ b/chatchat-server/chatchat_server/knowledge_base/migrate.py @@ -3,19 +3,19 @@ from configs import ( CHUNK_SIZE, OVERLAP_SIZE, logger, log_verbose ) -from server.knowledge_base.utils import ( +from chatchat_server.knowledge_base.utils import ( get_file_path, list_kbs_from_folder, list_files_from_folder, files2docs_in_thread, KnowledgeFile ) -from server.knowledge_base.kb_service.base import KBServiceFactory -from server.db.models.conversation_model import ConversationModel -from server.db.models.message_model import MessageModel -from server.db.repository.knowledge_file_repository import add_file_to_db # ensure Models are imported -from server.db.repository.knowledge_metadata_repository import add_summary_to_db +from chatchat_server.knowledge_base.kb_service.base import KBServiceFactory +from chatchat_server.db.models.conversation_model import ConversationModel +from chatchat_server.db.models.message_model import MessageModel +from chatchat_server.db.repository.knowledge_file_repository import add_file_to_db # ensure Models are imported +from chatchat_server.db.repository.knowledge_metadata_repository import add_summary_to_db -from server.db.base import Base, engine -from server.db.session import session_scope +from chatchat_server.db.base import Base, engine +from chatchat_server.db.session import session_scope import os from dateutil.parser import parse from typing import Literal, List diff --git a/server/knowledge_base/model/kb_document_model.py b/chatchat-server/chatchat_server/knowledge_base/model/kb_document_model.py similarity index 100% rename from server/knowledge_base/model/kb_document_model.py rename to chatchat-server/chatchat_server/knowledge_base/model/kb_document_model.py diff --git a/server/knowledge_base/utils.py b/chatchat-server/chatchat_server/knowledge_base/utils.py similarity index 99% rename from server/knowledge_base/utils.py rename to chatchat-server/chatchat_server/knowledge_base/utils.py index 5e7b905d..a4ae053b 100644 --- a/server/knowledge_base/utils.py +++ b/chatchat-server/chatchat_server/knowledge_base/utils.py @@ -11,12 +11,12 @@ from configs import ( TEXT_SPLITTER_NAME, ) import importlib -from server.text_splitter import zh_title_enhance as func_zh_title_enhance +from chatchat_server.text_splitter import zh_title_enhance as func_zh_title_enhance import langchain_community.document_loaders from langchain.docstore.document import Document from langchain.text_splitter import TextSplitter, MarkdownHeaderTextSplitter from pathlib import Path -from server.utils import run_in_thread_pool, run_in_process_pool +from chatchat_server.utils import run_in_thread_pool, run_in_process_pool import json from typing import List, Union, Dict, Tuple, Generator import chardet diff --git a/server/llm_api_shutdown.py b/chatchat-server/chatchat_server/llm_api_shutdown.py similarity index 100% rename from server/llm_api_shutdown.py rename to chatchat-server/chatchat_server/llm_api_shutdown.py diff --git a/server/llm_api_stale.py b/chatchat-server/chatchat_server/llm_api_stale.py similarity index 100% rename from server/llm_api_stale.py rename to chatchat-server/chatchat_server/llm_api_stale.py diff --git a/server/localai_embeddings.py b/chatchat-server/chatchat_server/localai_embeddings.py similarity index 99% rename from server/localai_embeddings.py rename to chatchat-server/chatchat_server/localai_embeddings.py index 44939319..6e18799d 100644 --- a/server/localai_embeddings.py +++ b/chatchat-server/chatchat_server/localai_embeddings.py @@ -27,7 +27,7 @@ from tenacity import ( stop_after_attempt, wait_exponential, ) -from server.utils import run_in_thread_pool +from chatchat_server.utils import run_in_thread_pool logger = logging.getLogger(__name__) diff --git a/server/memory/conversation_db_buffer_memory.py b/chatchat-server/chatchat_server/memory/conversation_db_buffer_memory.py similarity index 94% rename from server/memory/conversation_db_buffer_memory.py rename to chatchat-server/chatchat_server/memory/conversation_db_buffer_memory.py index 29a1a7b4..fc9191b4 100644 --- a/server/memory/conversation_db_buffer_memory.py +++ b/chatchat-server/chatchat_server/memory/conversation_db_buffer_memory.py @@ -4,8 +4,8 @@ from typing import Any, List, Dict from langchain.memory.chat_memory import BaseChatMemory from langchain.schema import get_buffer_string, BaseMessage, HumanMessage, AIMessage from langchain.schema.language_model import BaseLanguageModel -from server.db.repository.message_repository import filter_message -from server.db.models.message_model import MessageModel +from chatchat_server.db.repository.message_repository import filter_message +from chatchat_server.db.models.message_model import MessageModel class ConversationBufferDBMemory(BaseChatMemory): diff --git a/server/minx_chat_openai.py b/chatchat-server/chatchat_server/minx_chat_openai.py similarity index 100% rename from server/minx_chat_openai.py rename to chatchat-server/chatchat_server/minx_chat_openai.py diff --git a/server/pydantic_types.py b/chatchat-server/chatchat_server/pydantic_types.py similarity index 100% rename from server/pydantic_types.py rename to chatchat-server/chatchat_server/pydantic_types.py diff --git a/server/reranker/reranker.py b/chatchat-server/chatchat_server/reranker/reranker.py similarity index 100% rename from server/reranker/reranker.py rename to chatchat-server/chatchat_server/reranker/reranker.py diff --git a/server/text_splitter/__init__.py b/chatchat-server/chatchat_server/text_splitter/__init__.py similarity index 100% rename from server/text_splitter/__init__.py rename to chatchat-server/chatchat_server/text_splitter/__init__.py diff --git a/server/text_splitter/ali_text_splitter.py b/chatchat-server/chatchat_server/text_splitter/ali_text_splitter.py similarity index 100% rename from server/text_splitter/ali_text_splitter.py rename to chatchat-server/chatchat_server/text_splitter/ali_text_splitter.py diff --git a/server/text_splitter/chinese_recursive_text_splitter.py b/chatchat-server/chatchat_server/text_splitter/chinese_recursive_text_splitter.py similarity index 100% rename from server/text_splitter/chinese_recursive_text_splitter.py rename to chatchat-server/chatchat_server/text_splitter/chinese_recursive_text_splitter.py diff --git a/server/text_splitter/chinese_text_splitter.py b/chatchat-server/chatchat_server/text_splitter/chinese_text_splitter.py similarity index 100% rename from server/text_splitter/chinese_text_splitter.py rename to chatchat-server/chatchat_server/text_splitter/chinese_text_splitter.py diff --git a/server/text_splitter/zh_title_enhance.py b/chatchat-server/chatchat_server/text_splitter/zh_title_enhance.py similarity index 100% rename from server/text_splitter/zh_title_enhance.py rename to chatchat-server/chatchat_server/text_splitter/zh_title_enhance.py diff --git a/server/utils.py b/chatchat-server/chatchat_server/utils.py similarity index 98% rename from server/utils.py rename to chatchat-server/chatchat_server/utils.py index 969a7c6b..c8462bbe 100644 --- a/server/utils.py +++ b/chatchat-server/chatchat_server/utils.py @@ -5,6 +5,8 @@ import os import sys import multiprocessing as mp from concurrent.futures import ThreadPoolExecutor, ProcessPoolExecutor, as_completed + +from langchain_core.embeddings import Embeddings from langchain_openai.chat_models import ChatOpenAI from langchain_openai.llms import OpenAI import httpx @@ -25,8 +27,8 @@ import logging from configs import (logger, log_verbose, HTTPX_DEFAULT_TIMEOUT, DEFAULT_LLM_MODEL, DEFAULT_EMBEDDING_MODEL, TEMPERATURE) -from server.pydantic_types import BaseModel, Field -from server.minx_chat_openai import MinxChatOpenAI # TODO: still used? +from chatchat_server.pydantic_types import BaseModel, Field +from chatchat_server.minx_chat_openai import MinxChatOpenAI # TODO: still used? async def wrap_done(fn: Awaitable, event: asyncio.Event): @@ -200,7 +202,7 @@ def get_Embeddings( local_wrap: bool = False, # use local wrapped api ) -> Embeddings: from langchain_community.embeddings.openai import OpenAIEmbeddings - from server.localai_embeddings import LocalAIEmbeddings # TODO: fork of lc pr #17154 + from chatchat_server.localai_embeddings import LocalAIEmbeddings # TODO: fork of lc pr #17154 model_info = get_model_info(model_name=embed_model) params = dict(model=embed_model) diff --git a/server/webui_allinone_stale.py b/chatchat-server/chatchat_server/webui_allinone_stale.py similarity index 92% rename from server/webui_allinone_stale.py rename to chatchat-server/chatchat_server/webui_allinone_stale.py index 627f956f..8f98209d 100644 --- a/server/webui_allinone_stale.py +++ b/chatchat-server/chatchat_server/webui_allinone_stale.py @@ -16,13 +16,13 @@ python webui_alline.py --model-path-address model@host@port --num-gpus 2 --gpus """ import streamlit as st -from webui_pages.utils import * +from chatchat_webui_pages.utils import * from streamlit_option_menu import option_menu -from webui_pages import * +from chatchat_webui_pages import * import os -from server.llm_api_stale import string_args,launch_all,controller_args,worker_args,server_args,LOG_PATH +from chatchat_server.llm_api_stale import string_args,launch_all,controller_args,worker_args,server_args,LOG_PATH -from server.api_allinone_stale import parser, api_args +from chatchat_server.api_allinone_stale import parser, api_args import subprocess parser.add_argument("--use-remote-api",action="store_true") diff --git a/model_providers/poetry.toml b/chatchat-server/poetry.toml similarity index 100% rename from model_providers/poetry.toml rename to chatchat-server/poetry.toml diff --git a/chatchat-server/pyproject.toml b/chatchat-server/pyproject.toml new file mode 100644 index 00000000..2c8248ad --- /dev/null +++ b/chatchat-server/pyproject.toml @@ -0,0 +1,218 @@ +[tool.poetry] +name = "chatchat-server" +version = "0.3.0" +description = "" +authors = ["chatchat"] +readme = "README.md" + +[tool.poetry.dependencies] +python = ">=3.9,<4.0,!=3.9.7" +chatchat-model-providers = "^0.3.0" +langchain = "0.1.5" +langchainhub = "0.1.14" +langchain-community = "0.0.17" +langchain-openai = "0.0.5" +langchain-experimental = "0.0.50" +fastapi = "0.109.2" +sse_starlette = "~1.8.2" +nltk = "~3.8.1" +uvicorn = ">=0.27.0.post1" +unstructured = "~0.11.0" +python-magic-bin = {version = "*", platform = "win32"} +SQLAlchemy = "~2.0.25" +faiss-cpu = "~1.7.4" +# accelerate = "~0.24.1" +# spacy = "~3.7.2" +PyMuPDF = "~1.23.16" +rapidocr_onnxruntime = "~1.3.8" +requests = "~2.31.0" +pathlib = "~1.0.1" +pytest = "~7.4.3" +pyjwt = "2.8.0" +elasticsearch = "*" +numexpr = ">=2.8.8" +strsimpy = ">=0.2.1" +markdownify = ">=0.11.6" +tqdm = ">=4.66.1" +websockets = ">=12.0" +numpy = ">=1.26.3" +pandas = "~2.1.4" +pydantic = "1.10.14" +httpx = {version = ">=0.25.2", extras = ["brotli", "http2", "socks"]} +python-multipart = "0.0.9" + + +[tool.poetry.group.test] +optional = true + +[tool.poetry.group.test.dependencies] +# The only dependencies that should be added are +# dependencies used for running tests (e.g., pytest, freezegun, response). +# Any dependencies that do not meet that criteria will be removed. +pytest = "^7.3.0" +pytest-cov = "^4.0.0" +pytest-dotenv = "^0.5.2" +duckdb-engine = "^0.7.0" +pytest-watcher = "^0.2.6" +freezegun = "^1.2.2" +responses = "^0.22.0" +pytest-asyncio = "^0.20.3" +lark = "^1.1.5" +pandas = "^2.0.0" +pytest-mock = "^3.10.0" +pytest-socket = "^0.6.0" +syrupy = "^4.0.2" +chatchat-model-providers = { path = "../model-providers", develop = true } + + +[tool.poetry.group.lint] +optional = true + +[tool.poetry.group.lint.dependencies] +ruff = "^0.1.5" + + + +[tool.poetry.group.dev] +optional = true + +[tool.poetry.group.dev.dependencies] +jupyter = "^1.0.0" +setuptools = "^67.6.1" +chatchat-model-providers = { path = "../model-providers", develop = true } + +[tool.poetry.extras] +cli = ["typer"] + +# An extra used to be able to add extended testing. +# Please use new-line on formatting to make it easier to add new packages without +# merge-conflicts +extended_testing = [ + "aleph-alpha-client", + "aiosqlite", + "assemblyai", + "beautifulsoup4", + "bibtexparser", + "cassio", + "chardet", + "datasets", + "google-cloud-documentai", + "esprima", + "jq", + "pdfminer-six", + "pgvector", + "pypdf", + "pymupdf", + "pypdfium2", + "tqdm", + "lxml", + "atlassian-python-api", + "mwparserfromhell", + "mwxml", + "msal", + "pandas", + "telethon", + "psychicapi", + "gql", + "gradientai", + "requests-toolbelt", + "html2text", + "numexpr", + "py-trello", + "scikit-learn", + "streamlit", + "pyspark", + "openai", + "sympy", + "rapidfuzz", + "jsonschema", + "rank-bm25", + "geopandas", + "jinja2", + "gitpython", + "newspaper3k", + "nvidia-riva-client", + "feedparser", + "xata", + "xmltodict", + "faiss-cpu", + "openapi-pydantic", + "markdownify", + "arxiv", + "sqlite-vss", + "rapidocr-onnxruntime", + "motor", + "timescale-vector", + "anthropic", + "upstash-redis", + "rspace_client", + "fireworks-ai", + "javelin-sdk", + "hologres-vector", + "praw", + "databricks-vectorsearch", + "cloudpickle", + "dgml-utils", + "cohere", + "tree-sitter", + "tree-sitter-languages", + "azure-ai-documentintelligence", + "oracle-ads", + "zhipuai", + "httpx", + "elasticsearch", + "hdbcli", + "oci", + "rdflib", + "tidb-vector", + "cloudpickle", + "friendli-client" +] + +[tool.ruff] +exclude = [ + "tests/examples/non-utf8-encoding.py", + "tests/integration_tests/examples/non-utf8-encoding.py", +] + +[tool.ruff.lint] +select = [ + "E", # pycodestyle + "F", # pyflakes + "I", # isort + "T201", # print +] + +[tool.mypy] +ignore_missing_imports = "True" +disallow_untyped_defs = "True" +exclude = ["notebooks", "examples", "example_data"] + +[tool.coverage.run] +omit = [ + "tests/*", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.pytest.ini_options] +# --strict-markers will raise errors on unknown marks. +# https://docs.pytest.org/en/7.1.x/how-to/mark.html#raising-errors-on-unknown-marks +# +# https://docs.pytest.org/en/7.1.x/reference/reference.html +# --strict-config any warnings encountered while parsing the `pytest` +# section of the configuration file raise errors. +# +# https://github.com/tophat/syrupy +# --snapshot-warn-unused Prints a warning on unused snapshots rather than fail the test suite. +addopts = "--strict-markers --strict-config --durations=5 --snapshot-warn-unused -vv" +# Registering custom markers. +# https://docs.pytest.org/en/7.1.x/example/markers.html#registering-markers +markers = [ + "requires: mark tests as requiring a specific library", + "scheduled: mark tests to run in scheduled testing", + "compile: mark placeholder test used to compile integration tests without running them" +] +asyncio_mode = "auto" \ No newline at end of file diff --git a/chatchat/README.md b/chatchat/README.md new file mode 100644 index 00000000..a4004072 --- /dev/null +++ b/chatchat/README.md @@ -0,0 +1,19 @@ + +### 加入开发 +项目需要使用python3.9打包,如果您有conda环境我们建议您使用它创建一个新的python3.9环境。 + +#### 安装 Poetry +Install Poetry: [documentation on how to install it.](https://python-poetry.org/docs/#installing-with-pipx) + +#### 本地开发环境安装 + +- 选择主项目目录 +``` +cd chatchat +``` + +- 安装chatchat依赖(for running chatchat lint\tests): + +``` +poetry install --with lint,test +``` \ No newline at end of file diff --git a/configs/__init__.py b/chatchat/configs/__init__.py similarity index 100% rename from configs/__init__.py rename to chatchat/configs/__init__.py diff --git a/configs/loom.yaml.example b/chatchat/configs/loom.yaml.example similarity index 100% rename from configs/loom.yaml.example rename to chatchat/configs/loom.yaml.example diff --git a/configs/model_config.py.example b/chatchat/configs/model_config.py.example similarity index 100% rename from configs/model_config.py.example rename to chatchat/configs/model_config.py.example diff --git a/configs/openai-plugins-list.json b/chatchat/configs/openai-plugins-list.json similarity index 100% rename from configs/openai-plugins-list.json rename to chatchat/configs/openai-plugins-list.json diff --git a/configs/prompt_config.py.example b/chatchat/configs/prompt_config.py.example similarity index 100% rename from configs/prompt_config.py.example rename to chatchat/configs/prompt_config.py.example diff --git a/configs/server_config.py.example b/chatchat/configs/server_config.py.example similarity index 100% rename from configs/server_config.py.example rename to chatchat/configs/server_config.py.example diff --git a/copy_config_example.py b/chatchat/copy_config_example.py similarity index 100% rename from copy_config_example.py rename to chatchat/copy_config_example.py diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-124076-270516.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-124076-270516.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-124076-270516.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-124076-270516.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-20096-279847.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-20096-279847.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-20096-279847.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-20096-279847.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-220157-552735.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-220157-552735.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-220157-552735.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-220157-552735.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-36114-765327.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-36114-765327.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-36114-765327.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-36114-765327.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-392521-261326.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-392521-261326.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-392521-261326.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-392521-261326.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-42284-124759.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-42284-124759.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-42284-124759.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-42284-124759.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-57107-679259.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-57107-679259.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-57107-679259.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-57107-679259.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-618350-869132.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-618350-869132.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-618350-869132.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-618350-869132.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-838373-426344.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-838373-426344.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-838373-426344.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-838373-426344.jpg diff --git a/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-906937-836104.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-906937-836104.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-906937-836104.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/分布式训练技术原理-幕布图片-906937-836104.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-108319-429731.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-108319-429731.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-108319-429731.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-108319-429731.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-580318-260070.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-580318-260070.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-580318-260070.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-580318-260070.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-793118-735987.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-793118-735987.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-793118-735987.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-793118-735987.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-918388-323086.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-918388-323086.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-918388-323086.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型应用技术原理-幕布图片-918388-323086.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-19929-302935.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-19929-302935.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-19929-302935.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-19929-302935.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-299768-254064.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-299768-254064.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-299768-254064.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-299768-254064.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-454007-940199.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-454007-940199.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-454007-940199.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-454007-940199.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-628857-182232.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-628857-182232.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-628857-182232.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-628857-182232.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-729151-372321.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-729151-372321.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-729151-372321.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-729151-372321.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-81470-404273.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-81470-404273.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-81470-404273.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型技术栈-算法与原理-幕布图片-81470-404273.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-17565-176537.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-17565-176537.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-17565-176537.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-17565-176537.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-349153-657791.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-349153-657791.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-349153-657791.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-349153-657791.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-350029-666381.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-350029-666381.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-350029-666381.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-350029-666381.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-759487-923925.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-759487-923925.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-759487-923925.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-759487-923925.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-805089-731888.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-805089-731888.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-805089-731888.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-805089-731888.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-95996-523276.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-95996-523276.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-95996-523276.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型指令对齐训练原理-幕布图片-95996-523276.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-276446-401476.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-276446-401476.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-276446-401476.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-276446-401476.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-380552-579242.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-380552-579242.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-380552-579242.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-380552-579242.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-590671-36787.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-590671-36787.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-590671-36787.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-590671-36787.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-699343-219844.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-699343-219844.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-699343-219844.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-699343-219844.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-789705-122117.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-789705-122117.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-789705-122117.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-789705-122117.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-923924-83386.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-923924-83386.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-923924-83386.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-923924-83386.jpg diff --git a/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-930255-616209.jpg b/chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-930255-616209.jpg similarity index 100% rename from data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-930255-616209.jpg rename to chatchat/data/knowledge_base/samples/content/llm/img/大模型推理优化策略-幕布图片-930255-616209.jpg diff --git a/data/knowledge_base/samples/content/llm/分布式训练技术原理.md b/chatchat/data/knowledge_base/samples/content/llm/分布式训练技术原理.md similarity index 100% rename from data/knowledge_base/samples/content/llm/分布式训练技术原理.md rename to chatchat/data/knowledge_base/samples/content/llm/分布式训练技术原理.md diff --git a/data/knowledge_base/samples/content/llm/大模型应用技术原理.md b/chatchat/data/knowledge_base/samples/content/llm/大模型应用技术原理.md similarity index 100% rename from data/knowledge_base/samples/content/llm/大模型应用技术原理.md rename to chatchat/data/knowledge_base/samples/content/llm/大模型应用技术原理.md diff --git a/data/knowledge_base/samples/content/llm/大模型技术栈-实战与应用.md b/chatchat/data/knowledge_base/samples/content/llm/大模型技术栈-实战与应用.md similarity index 100% rename from data/knowledge_base/samples/content/llm/大模型技术栈-实战与应用.md rename to chatchat/data/knowledge_base/samples/content/llm/大模型技术栈-实战与应用.md diff --git a/data/knowledge_base/samples/content/llm/大模型技术栈-算法与原理.md b/chatchat/data/knowledge_base/samples/content/llm/大模型技术栈-算法与原理.md similarity index 100% rename from data/knowledge_base/samples/content/llm/大模型技术栈-算法与原理.md rename to chatchat/data/knowledge_base/samples/content/llm/大模型技术栈-算法与原理.md diff --git a/data/knowledge_base/samples/content/llm/大模型指令对齐训练原理.md b/chatchat/data/knowledge_base/samples/content/llm/大模型指令对齐训练原理.md similarity index 100% rename from data/knowledge_base/samples/content/llm/大模型指令对齐训练原理.md rename to chatchat/data/knowledge_base/samples/content/llm/大模型指令对齐训练原理.md diff --git a/data/knowledge_base/samples/content/llm/大模型推理优化策略.md b/chatchat/data/knowledge_base/samples/content/llm/大模型推理优化策略.md similarity index 100% rename from data/knowledge_base/samples/content/llm/大模型推理优化策略.md rename to chatchat/data/knowledge_base/samples/content/llm/大模型推理优化策略.md diff --git a/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.csv b/chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.csv similarity index 100% rename from data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.csv rename to chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.csv diff --git a/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.jsonl b/chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.jsonl similarity index 100% rename from data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.jsonl rename to chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.jsonl diff --git a/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.xlsx b/chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.xlsx similarity index 100% rename from data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.xlsx rename to chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_closed.xlsx diff --git a/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.csv b/chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.csv similarity index 100% rename from data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.csv rename to chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.csv diff --git a/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.jsonl b/chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.jsonl similarity index 100% rename from data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.jsonl rename to chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.jsonl diff --git a/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.xlsx b/chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.xlsx similarity index 100% rename from data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.xlsx rename to chatchat/data/knowledge_base/samples/content/test_files/langchain-ChatGLM_open.xlsx diff --git a/data/knowledge_base/samples/content/test_files/langchain.pdf b/chatchat/data/knowledge_base/samples/content/test_files/langchain.pdf similarity index 100% rename from data/knowledge_base/samples/content/test_files/langchain.pdf rename to chatchat/data/knowledge_base/samples/content/test_files/langchain.pdf diff --git a/data/knowledge_base/samples/content/test_files/test.txt b/chatchat/data/knowledge_base/samples/content/test_files/test.txt similarity index 100% rename from data/knowledge_base/samples/content/test_files/test.txt rename to chatchat/data/knowledge_base/samples/content/test_files/test.txt diff --git a/data/knowledge_base/samples/content/wiki b/chatchat/data/knowledge_base/samples/content/wiki similarity index 100% rename from data/knowledge_base/samples/content/wiki rename to chatchat/data/knowledge_base/samples/content/wiki diff --git a/data/nltk_data/corpora/cmudict/README b/chatchat/data/nltk_data/corpora/cmudict/README similarity index 100% rename from data/nltk_data/corpora/cmudict/README rename to chatchat/data/nltk_data/corpora/cmudict/README diff --git a/data/nltk_data/corpora/cmudict/cmudict b/chatchat/data/nltk_data/corpora/cmudict/cmudict similarity index 100% rename from data/nltk_data/corpora/cmudict/cmudict rename to chatchat/data/nltk_data/corpora/cmudict/cmudict diff --git a/data/nltk_data/taggers/averaged_perceptron_tagger/averaged_perceptron_tagger.pickle b/chatchat/data/nltk_data/taggers/averaged_perceptron_tagger/averaged_perceptron_tagger.pickle similarity index 100% rename from data/nltk_data/taggers/averaged_perceptron_tagger/averaged_perceptron_tagger.pickle rename to chatchat/data/nltk_data/taggers/averaged_perceptron_tagger/averaged_perceptron_tagger.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/README b/chatchat/data/nltk_data/tokenizers/punkt/PY3/README similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/README rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/README diff --git a/data/nltk_data/tokenizers/punkt/PY3/czech.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/czech.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/czech.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/czech.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/danish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/danish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/danish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/danish.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/dutch.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/dutch.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/dutch.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/dutch.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/english.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/english.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/english.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/english.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/estonian.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/estonian.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/estonian.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/estonian.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/finnish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/finnish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/finnish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/finnish.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/french.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/french.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/french.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/french.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/german.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/german.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/german.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/german.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/greek.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/greek.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/greek.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/greek.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/italian.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/italian.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/italian.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/italian.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/malayalam.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/malayalam.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/malayalam.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/malayalam.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/norwegian.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/norwegian.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/norwegian.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/norwegian.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/polish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/polish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/polish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/polish.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/portuguese.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/portuguese.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/portuguese.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/portuguese.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/russian.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/russian.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/russian.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/russian.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/slovene.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/slovene.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/slovene.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/slovene.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/spanish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/spanish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/spanish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/spanish.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/swedish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/swedish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/swedish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/swedish.pickle diff --git a/data/nltk_data/tokenizers/punkt/PY3/turkish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/PY3/turkish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/PY3/turkish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/PY3/turkish.pickle diff --git a/data/nltk_data/tokenizers/punkt/README b/chatchat/data/nltk_data/tokenizers/punkt/README similarity index 100% rename from data/nltk_data/tokenizers/punkt/README rename to chatchat/data/nltk_data/tokenizers/punkt/README diff --git a/data/nltk_data/tokenizers/punkt/czech.pickle b/chatchat/data/nltk_data/tokenizers/punkt/czech.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/czech.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/czech.pickle diff --git a/data/nltk_data/tokenizers/punkt/danish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/danish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/danish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/danish.pickle diff --git a/data/nltk_data/tokenizers/punkt/dutch.pickle b/chatchat/data/nltk_data/tokenizers/punkt/dutch.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/dutch.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/dutch.pickle diff --git a/data/nltk_data/tokenizers/punkt/english.pickle b/chatchat/data/nltk_data/tokenizers/punkt/english.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/english.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/english.pickle diff --git a/data/nltk_data/tokenizers/punkt/estonian.pickle b/chatchat/data/nltk_data/tokenizers/punkt/estonian.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/estonian.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/estonian.pickle diff --git a/data/nltk_data/tokenizers/punkt/finnish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/finnish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/finnish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/finnish.pickle diff --git a/data/nltk_data/tokenizers/punkt/french.pickle b/chatchat/data/nltk_data/tokenizers/punkt/french.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/french.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/french.pickle diff --git a/data/nltk_data/tokenizers/punkt/german.pickle b/chatchat/data/nltk_data/tokenizers/punkt/german.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/german.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/german.pickle diff --git a/data/nltk_data/tokenizers/punkt/greek.pickle b/chatchat/data/nltk_data/tokenizers/punkt/greek.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/greek.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/greek.pickle diff --git a/data/nltk_data/tokenizers/punkt/italian.pickle b/chatchat/data/nltk_data/tokenizers/punkt/italian.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/italian.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/italian.pickle diff --git a/data/nltk_data/tokenizers/punkt/malayalam.pickle b/chatchat/data/nltk_data/tokenizers/punkt/malayalam.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/malayalam.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/malayalam.pickle diff --git a/data/nltk_data/tokenizers/punkt/norwegian.pickle b/chatchat/data/nltk_data/tokenizers/punkt/norwegian.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/norwegian.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/norwegian.pickle diff --git a/data/nltk_data/tokenizers/punkt/polish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/polish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/polish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/polish.pickle diff --git a/data/nltk_data/tokenizers/punkt/portuguese.pickle b/chatchat/data/nltk_data/tokenizers/punkt/portuguese.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/portuguese.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/portuguese.pickle diff --git a/data/nltk_data/tokenizers/punkt/russian.pickle b/chatchat/data/nltk_data/tokenizers/punkt/russian.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/russian.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/russian.pickle diff --git a/data/nltk_data/tokenizers/punkt/slovene.pickle b/chatchat/data/nltk_data/tokenizers/punkt/slovene.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/slovene.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/slovene.pickle diff --git a/data/nltk_data/tokenizers/punkt/spanish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/spanish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/spanish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/spanish.pickle diff --git a/data/nltk_data/tokenizers/punkt/swedish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/swedish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/swedish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/swedish.pickle diff --git a/data/nltk_data/tokenizers/punkt/turkish.pickle b/chatchat/data/nltk_data/tokenizers/punkt/turkish.pickle similarity index 100% rename from data/nltk_data/tokenizers/punkt/turkish.pickle rename to chatchat/data/nltk_data/tokenizers/punkt/turkish.pickle diff --git a/img/LLM_success.png b/chatchat/img/LLM_success.png similarity index 100% rename from img/LLM_success.png rename to chatchat/img/LLM_success.png diff --git a/img/agent_continue.png b/chatchat/img/agent_continue.png similarity index 100% rename from img/agent_continue.png rename to chatchat/img/agent_continue.png diff --git a/img/agent_success.png b/chatchat/img/agent_success.png similarity index 100% rename from img/agent_success.png rename to chatchat/img/agent_success.png diff --git a/img/chatchat-qrcode.jpg b/chatchat/img/chatchat-qrcode.jpg similarity index 100% rename from img/chatchat-qrcode.jpg rename to chatchat/img/chatchat-qrcode.jpg diff --git a/img/chatchat_icon_blue_square_v2.png b/chatchat/img/chatchat_icon_blue_square_v2.png similarity index 100% rename from img/chatchat_icon_blue_square_v2.png rename to chatchat/img/chatchat_icon_blue_square_v2.png diff --git a/img/docker_logs.png b/chatchat/img/docker_logs.png similarity index 100% rename from img/docker_logs.png rename to chatchat/img/docker_logs.png diff --git a/img/fastapi_docs_026.png b/chatchat/img/fastapi_docs_026.png similarity index 100% rename from img/fastapi_docs_026.png rename to chatchat/img/fastapi_docs_026.png diff --git a/img/init_knowledge_base.jpg b/chatchat/img/init_knowledge_base.jpg similarity index 100% rename from img/init_knowledge_base.jpg rename to chatchat/img/init_knowledge_base.jpg diff --git a/img/knowledge_base_success.jpg b/chatchat/img/knowledge_base_success.jpg similarity index 100% rename from img/knowledge_base_success.jpg rename to chatchat/img/knowledge_base_success.jpg diff --git a/img/langchain+chatglm.png b/chatchat/img/langchain+chatglm.png similarity index 100% rename from img/langchain+chatglm.png rename to chatchat/img/langchain+chatglm.png diff --git a/img/langchain+chatglm2.png b/chatchat/img/langchain+chatglm2.png similarity index 100% rename from img/langchain+chatglm2.png rename to chatchat/img/langchain+chatglm2.png diff --git a/img/logo-long-chatchat-trans-v2.png b/chatchat/img/logo-long-chatchat-trans-v2.png similarity index 100% rename from img/logo-long-chatchat-trans-v2.png rename to chatchat/img/logo-long-chatchat-trans-v2.png diff --git a/img/official_account_qr.png b/chatchat/img/official_account_qr.png similarity index 100% rename from img/official_account_qr.png rename to chatchat/img/official_account_qr.png diff --git a/img/official_wechat_mp_account.png b/chatchat/img/official_wechat_mp_account.png similarity index 100% rename from img/official_wechat_mp_account.png rename to chatchat/img/official_wechat_mp_account.png diff --git a/img/partners/autodl.svg b/chatchat/img/partners/autodl.svg similarity index 100% rename from img/partners/autodl.svg rename to chatchat/img/partners/autodl.svg diff --git a/img/partners/aws.svg b/chatchat/img/partners/aws.svg similarity index 100% rename from img/partners/aws.svg rename to chatchat/img/partners/aws.svg diff --git a/img/partners/chatglm.svg b/chatchat/img/partners/chatglm.svg similarity index 100% rename from img/partners/chatglm.svg rename to chatchat/img/partners/chatglm.svg diff --git a/img/partners/zhenfund.svg b/chatchat/img/partners/zhenfund.svg similarity index 100% rename from img/partners/zhenfund.svg rename to chatchat/img/partners/zhenfund.svg diff --git a/img/qr_code_90.jpg b/chatchat/img/qr_code_90.jpg similarity index 100% rename from img/qr_code_90.jpg rename to chatchat/img/qr_code_90.jpg diff --git a/img/qr_code_90.png b/chatchat/img/qr_code_90.png similarity index 100% rename from img/qr_code_90.png rename to chatchat/img/qr_code_90.png diff --git a/img/qr_code_91.jpg b/chatchat/img/qr_code_91.jpg similarity index 100% rename from img/qr_code_91.jpg rename to chatchat/img/qr_code_91.jpg diff --git a/img/qr_code_92.jpg b/chatchat/img/qr_code_92.jpg similarity index 100% rename from img/qr_code_92.jpg rename to chatchat/img/qr_code_92.jpg diff --git a/img/qr_code_93.jpg b/chatchat/img/qr_code_93.jpg similarity index 100% rename from img/qr_code_93.jpg rename to chatchat/img/qr_code_93.jpg diff --git a/img/qr_code_94.jpg b/chatchat/img/qr_code_94.jpg similarity index 100% rename from img/qr_code_94.jpg rename to chatchat/img/qr_code_94.jpg diff --git a/img/qr_code_95.jpg b/chatchat/img/qr_code_95.jpg similarity index 100% rename from img/qr_code_95.jpg rename to chatchat/img/qr_code_95.jpg diff --git a/img/qr_code_96.jpg b/chatchat/img/qr_code_96.jpg similarity index 100% rename from img/qr_code_96.jpg rename to chatchat/img/qr_code_96.jpg diff --git a/img/qrcode_90_2.jpg b/chatchat/img/qrcode_90_2.jpg similarity index 100% rename from img/qrcode_90_2.jpg rename to chatchat/img/qrcode_90_2.jpg diff --git a/init_database.py b/chatchat/init_database.py similarity index 96% rename from init_database.py rename to chatchat/init_database.py index f2e2dc59..2f742e58 100644 --- a/init_database.py +++ b/chatchat/init_database.py @@ -1,6 +1,6 @@ import sys -sys.path.append(".") -from server.knowledge_base.migrate import (create_tables, reset_tables, import_from_db, +sys.path.append("chatchat") +from chatchat_server.knowledge_base.migrate import (create_tables, reset_tables, import_from_db, folder2db, prune_db_docs, prune_folder_files) from configs.model_config import DEFAULT_EMBEDDING_MODEL from datetime import datetime diff --git a/model_loaders/xinference_manager.py b/chatchat/model_loaders/xinference_manager.py similarity index 100% rename from model_loaders/xinference_manager.py rename to chatchat/model_loaders/xinference_manager.py diff --git a/chatchat/poetry.toml b/chatchat/poetry.toml new file mode 100644 index 00000000..42159b24 --- /dev/null +++ b/chatchat/poetry.toml @@ -0,0 +1,5 @@ +[virtualenvs] +in-project = true + +[installer] +modern-installation = false diff --git a/chatchat/pyproject.toml b/chatchat/pyproject.toml new file mode 100644 index 00000000..0ec13250 --- /dev/null +++ b/chatchat/pyproject.toml @@ -0,0 +1,194 @@ +[tool.poetry] +name = "chatchat" +version = "0.3.0" +description = "" +authors = ["chatchat"] +readme = "README.md" + + +[tool.poetry.dependencies] +python = ">=3.9,<4.0,!=3.9.7" +chatchat-model-providers = "^0.3.0" +chatchat-server = "^0.3.0" +chatchat-webui-pages = "^0.3.0" +tqdm = {version = ">=4.48.0", optional = true} +tiktoken = {version = ">=0.3.2,<0.6.0", optional = true, python=">=3.9"} + + +[tool.poetry.group.test] +optional = true + +[tool.poetry.group.test.dependencies] +# The only dependencies that should be added are +# dependencies used for running tests (e.g., pytest, freezegun, response). +# Any dependencies that do not meet that criteria will be removed. +pytest = "^7.3.0" +pytest-cov = "^4.0.0" +pytest-dotenv = "^0.5.2" +duckdb-engine = "^0.7.0" +pytest-watcher = "^0.2.6" +freezegun = "^1.2.2" +responses = "^0.22.0" +pytest-asyncio = "^0.20.3" +lark = "^1.1.5" +pandas = "^2.0.0" +pytest-mock = "^3.10.0" +pytest-socket = "^0.6.0" +syrupy = "^4.0.2" +chatchat-model-providers = { path = "../model-providers", develop = true } +chatchat-server = { path = "../chatchat-server", develop = true } +chatchat-webui-pages = { path = "../webui-pages", develop = true } + + +[tool.poetry.group.lint] +optional = true + +[tool.poetry.group.lint.dependencies] +ruff = "^0.1.5" + + + +[tool.poetry.group.dev] +optional = true + +[tool.poetry.group.dev.dependencies] +jupyter = "^1.0.0" +setuptools = "^67.6.1" +chatchat-model-providers = { path = "../model-providers", develop = true } +chatchat-server = { path = "../chatchat-server", develop = true } + +[tool.poetry.extras] +cli = ["typer"] + +# An extra used to be able to add extended testing. +# Please use new-line on formatting to make it easier to add new packages without +# merge-conflicts +extended_testing = [ + "aleph-alpha-client", + "aiosqlite", + "assemblyai", + "beautifulsoup4", + "bibtexparser", + "cassio", + "chardet", + "datasets", + "google-cloud-documentai", + "esprima", + "jq", + "pdfminer-six", + "pgvector", + "pypdf", + "pymupdf", + "pypdfium2", + "tqdm", + "lxml", + "atlassian-python-api", + "mwparserfromhell", + "mwxml", + "msal", + "pandas", + "telethon", + "psychicapi", + "gql", + "gradientai", + "requests-toolbelt", + "html2text", + "numexpr", + "py-trello", + "scikit-learn", + "streamlit", + "pyspark", + "openai", + "sympy", + "rapidfuzz", + "jsonschema", + "rank-bm25", + "geopandas", + "jinja2", + "gitpython", + "newspaper3k", + "nvidia-riva-client", + "feedparser", + "xata", + "xmltodict", + "faiss-cpu", + "openapi-pydantic", + "markdownify", + "arxiv", + "sqlite-vss", + "rapidocr-onnxruntime", + "motor", + "timescale-vector", + "anthropic", + "upstash-redis", + "rspace_client", + "fireworks-ai", + "javelin-sdk", + "hologres-vector", + "praw", + "databricks-vectorsearch", + "cloudpickle", + "dgml-utils", + "cohere", + "tree-sitter", + "tree-sitter-languages", + "azure-ai-documentintelligence", + "oracle-ads", + "zhipuai", + "httpx", + "elasticsearch", + "hdbcli", + "oci", + "rdflib", + "tidb-vector", + "cloudpickle", + "friendli-client" +] + +[tool.ruff] +exclude = [ + "tests/examples/non-utf8-encoding.py", + "tests/integration_tests/examples/non-utf8-encoding.py", +] + +[tool.ruff.lint] +select = [ + "E", # pycodestyle + "F", # pyflakes + "I", # isort + "T201", # print +] + +[tool.mypy] +ignore_missing_imports = "True" +disallow_untyped_defs = "True" +exclude = ["notebooks", "examples", "example_data"] + +[tool.coverage.run] +omit = [ + "tests/*", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.pytest.ini_options] +# --strict-markers will raise errors on unknown marks. +# https://docs.pytest.org/en/7.1.x/how-to/mark.html#raising-errors-on-unknown-marks +# +# https://docs.pytest.org/en/7.1.x/reference/reference.html +# --strict-config any warnings encountered while parsing the `pytest` +# section of the configuration file raise errors. +# +# https://github.com/tophat/syrupy +# --snapshot-warn-unused Prints a warning on unused snapshots rather than fail the test suite. +addopts = "--strict-markers --strict-config --durations=5 --snapshot-warn-unused -vv" +# Registering custom markers. +# https://docs.pytest.org/en/7.1.x/example/markers.html#registering-markers +markers = [ + "requires: mark tests as requiring a specific library", + "scheduled: mark tests to run in scheduled testing", + "compile: mark placeholder test used to compile integration tests without running them" +] +asyncio_mode = "auto" \ No newline at end of file diff --git a/startup.py b/chatchat/startup.py similarity index 95% rename from startup.py rename to chatchat/startup.py index 85947d24..eeef005e 100644 --- a/startup.py +++ b/chatchat/startup.py @@ -25,8 +25,8 @@ from configs import ( API_SERVER, WEBUI_SERVER, ) -from server.utils import FastAPI -from server.knowledge_base.migrate import create_tables +from chatchat_server.utils import FastAPI +from chatchat_server.knowledge_base.migrate import create_tables import argparse from typing import List, Dict from configs import VERSION @@ -42,9 +42,9 @@ def _set_app_event(app: FastAPI, started_event: mp.Event = None): def run_api_server(started_event: mp.Event = None, run_mode: str = None): - from server.api_server.server_app import create_app + from chatchat_server.api_server.server_app import create_app import uvicorn - from server.utils import set_httpx_config + from chatchat_server.utils import set_httpx_config set_httpx_config() app = create_app(run_mode=run_mode) @@ -57,7 +57,7 @@ def run_api_server(started_event: mp.Event = None, run_mode: str = None): def run_webui(started_event: mp.Event = None, run_mode: str = None): - from server.utils import set_httpx_config + from chatchat_server.utils import set_httpx_config set_httpx_config() host = WEBUI_SERVER["host"] @@ -137,7 +137,7 @@ def parse_args() -> argparse.ArgumentParser: def dump_server_info(after_start=False, args=None): import platform import langchain - from server.utils import api_address, webui_address + from chatchat_server.utils import api_address, webui_address print("\n") print("=" * 30 + "Langchain-Chatchat Configuration" + "=" * 30) diff --git a/tests/api/test_kb_api.py b/chatchat/tests/api/test_kb_api.py similarity index 98% rename from tests/api/test_kb_api.py rename to chatchat/tests/api/test_kb_api.py index 10a07fdb..aeb89390 100644 --- a/tests/api/test_kb_api.py +++ b/chatchat/tests/api/test_kb_api.py @@ -5,9 +5,9 @@ from pathlib import Path root_path = Path(__file__).parent.parent.parent sys.path.append(str(root_path)) -from server.utils import api_address +from chatchat_server.utils import api_address from configs import VECTOR_SEARCH_TOP_K -from server.knowledge_base.utils import get_kb_path, get_file_path +from chatchat_server.knowledge_base.utils import get_kb_path, get_file_path from pprint import pprint diff --git a/tests/api/test_kb_api_request.py b/chatchat/tests/api/test_kb_api_request.py similarity index 96% rename from tests/api/test_kb_api_request.py rename to chatchat/tests/api/test_kb_api_request.py index 400b1c6b..66a8f7fe 100644 --- a/tests/api/test_kb_api_request.py +++ b/chatchat/tests/api/test_kb_api_request.py @@ -5,10 +5,10 @@ from pathlib import Path root_path = Path(__file__).parent.parent.parent sys.path.append(str(root_path)) -from server.utils import api_address +from chatchat_server.utils import api_address from configs import VECTOR_SEARCH_TOP_K -from server.knowledge_base.utils import get_kb_path, get_file_path -from webui_pages.utils import ApiRequest +from chatchat_server.knowledge_base.utils import get_kb_path, get_file_path +from chatchat_webui_pages.utils import ApiRequest from pprint import pprint diff --git a/tests/api/test_kb_summary_api.py b/chatchat/tests/api/test_kb_summary_api.py similarity index 97% rename from tests/api/test_kb_summary_api.py rename to chatchat/tests/api/test_kb_summary_api.py index 9f85d614..6f8a9b2f 100644 --- a/tests/api/test_kb_summary_api.py +++ b/chatchat/tests/api/test_kb_summary_api.py @@ -5,7 +5,7 @@ from pathlib import Path root_path = Path(__file__).parent.parent.parent sys.path.append(str(root_path)) -from server.utils import api_address +from chatchat_server.utils import api_address api_base_url = api_address() diff --git a/tests/api/test_openai_wrap.py b/chatchat/tests/api/test_openai_wrap.py similarity index 94% rename from tests/api/test_openai_wrap.py rename to chatchat/tests/api/test_openai_wrap.py index 342f8ced..e104a242 100644 --- a/tests/api/test_openai_wrap.py +++ b/chatchat/tests/api/test_openai_wrap.py @@ -7,7 +7,7 @@ import requests import openai from configs import DEFAULT_LLM_MODEL, DEFAULT_EMBEDDING_MODEL -from server.utils import api_address +from chatchat_server.utils import api_address api_base_url = f"{api_address()}/v1" diff --git a/tests/api/test_server_state_api.py b/chatchat/tests/api/test_server_state_api.py similarity index 90% rename from tests/api/test_server_state_api.py rename to chatchat/tests/api/test_server_state_api.py index 851b1aee..3004d1d2 100644 --- a/tests/api/test_server_state_api.py +++ b/chatchat/tests/api/test_server_state_api.py @@ -3,7 +3,7 @@ from pathlib import Path root_path = Path(__file__).parent.parent.parent sys.path.append(str(root_path)) -from webui_pages.utils import ApiRequest +from chatchat_webui_pages.utils import ApiRequest import pytest from pprint import pprint diff --git a/tests/api/test_stream_chat_api.py b/chatchat/tests/api/test_stream_chat_api.py similarity index 97% rename from tests/api/test_stream_chat_api.py rename to chatchat/tests/api/test_stream_chat_api.py index daacc560..f761947d 100644 --- a/tests/api/test_stream_chat_api.py +++ b/chatchat/tests/api/test_stream_chat_api.py @@ -5,7 +5,7 @@ from pathlib import Path sys.path.append(str(Path(__file__).parent.parent.parent)) from configs import BING_SUBSCRIPTION_KEY -from server.utils import api_address +from chatchat_server.utils import api_address from pprint import pprint diff --git a/tests/api/test_stream_chat_api_thread.py b/chatchat/tests/api/test_stream_chat_api_thread.py similarity index 97% rename from tests/api/test_stream_chat_api_thread.py rename to chatchat/tests/api/test_stream_chat_api_thread.py index 7c9a1d1b..819a3080 100644 --- a/tests/api/test_stream_chat_api_thread.py +++ b/chatchat/tests/api/test_stream_chat_api_thread.py @@ -5,7 +5,7 @@ from pathlib import Path sys.path.append(str(Path(__file__).parent.parent.parent)) from configs import BING_SUBSCRIPTION_KEY -from server.utils import api_address +from chatchat_server.utils import api_address from pprint import pprint from concurrent.futures import ThreadPoolExecutor, as_completed diff --git a/tests/api/test_tools.py b/chatchat/tests/api/test_tools.py similarity index 93% rename from tests/api/test_tools.py rename to chatchat/tests/api/test_tools.py index 810f4c68..8877492a 100644 --- a/tests/api/test_tools.py +++ b/chatchat/tests/api/test_tools.py @@ -5,7 +5,7 @@ sys.path.append(str(Path(__file__).parent.parent.parent)) from pprint import pprint import requests -from server.utils import api_address +from chatchat_server.utils import api_address api_base_url = f"{api_address()}/tools" diff --git a/tests/custom_splitter/test_different_splitter.py b/chatchat/tests/custom_splitter/test_different_splitter.py similarity index 95% rename from tests/custom_splitter/test_different_splitter.py rename to chatchat/tests/custom_splitter/test_different_splitter.py index 2111bae1..52ce36f1 100644 --- a/tests/custom_splitter/test_different_splitter.py +++ b/chatchat/tests/custom_splitter/test_different_splitter.py @@ -9,7 +9,7 @@ from configs import ( OVERLAP_SIZE ) -from server.knowledge_base.utils import make_text_splitter +from chatchat_server.knowledge_base.utils import make_text_splitter def text(splitter_name): from langchain import document_loaders diff --git a/tests/document_loader/test_imgloader.py b/chatchat/tests/document_loader/test_imgloader.py similarity index 100% rename from tests/document_loader/test_imgloader.py rename to chatchat/tests/document_loader/test_imgloader.py diff --git a/tests/document_loader/test_pdfloader.py b/chatchat/tests/document_loader/test_pdfloader.py similarity index 100% rename from tests/document_loader/test_pdfloader.py rename to chatchat/tests/document_loader/test_pdfloader.py diff --git a/model_providers/model_providers/core/model_runtime/errors/__init__.py b/chatchat/tests/kb_vector_db/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/errors/__init__.py rename to chatchat/tests/kb_vector_db/__init__.py diff --git a/tests/kb_vector_db/test_faiss_kb.py b/chatchat/tests/kb_vector_db/test_faiss_kb.py similarity index 73% rename from tests/kb_vector_db/test_faiss_kb.py rename to chatchat/tests/kb_vector_db/test_faiss_kb.py index 0264c89d..cad482d6 100644 --- a/tests/kb_vector_db/test_faiss_kb.py +++ b/chatchat/tests/kb_vector_db/test_faiss_kb.py @@ -1,6 +1,6 @@ -from server.knowledge_base.kb_service.faiss_kb_service import FaissKBService -from server.knowledge_base.migrate import create_tables -from server.knowledge_base.utils import KnowledgeFile +from chatchat_server.knowledge_base.kb_service.faiss_kb_service import FaissKBService +from chatchat_server.knowledge_base.migrate import create_tables +from chatchat_server.knowledge_base.utils import KnowledgeFile kbService = FaissKBService("test") diff --git a/tests/kb_vector_db/test_milvus_db.py b/chatchat/tests/kb_vector_db/test_milvus_db.py similarity index 58% rename from tests/kb_vector_db/test_milvus_db.py rename to chatchat/tests/kb_vector_db/test_milvus_db.py index ed723806..1373b7e2 100644 --- a/tests/kb_vector_db/test_milvus_db.py +++ b/chatchat/tests/kb_vector_db/test_milvus_db.py @@ -1,8 +1,8 @@ -from server.knowledge_base.kb_service.faiss_kb_service import FaissKBService -from server.knowledge_base.kb_service.milvus_kb_service import MilvusKBService -from server.knowledge_base.kb_service.pg_kb_service import PGKBService -from server.knowledge_base.migrate import create_tables -from server.knowledge_base.utils import KnowledgeFile +from chatchat_server.knowledge_base.kb_service.faiss_kb_service import FaissKBService +from chatchat_server.knowledge_base.kb_service.milvus_kb_service import MilvusKBService +from chatchat_server.knowledge_base.kb_service.pg_kb_service import PGKBService +from chatchat_server.knowledge_base.migrate import create_tables +from chatchat_server.knowledge_base.utils import KnowledgeFile kbService = MilvusKBService("test") diff --git a/tests/kb_vector_db/test_pg_db.py b/chatchat/tests/kb_vector_db/test_pg_db.py similarity index 64% rename from tests/kb_vector_db/test_pg_db.py rename to chatchat/tests/kb_vector_db/test_pg_db.py index 12448d05..6262aa9a 100644 --- a/tests/kb_vector_db/test_pg_db.py +++ b/chatchat/tests/kb_vector_db/test_pg_db.py @@ -1,7 +1,7 @@ -from server.knowledge_base.kb_service.faiss_kb_service import FaissKBService -from server.knowledge_base.kb_service.pg_kb_service import PGKBService -from server.knowledge_base.migrate import create_tables -from server.knowledge_base.utils import KnowledgeFile +from chatchat_server.knowledge_base.kb_service.faiss_kb_service import FaissKBService +from chatchat_server.knowledge_base.kb_service.pg_kb_service import PGKBService +from chatchat_server.knowledge_base.migrate import create_tables +from chatchat_server.knowledge_base.utils import KnowledgeFile kbService = PGKBService("test") diff --git a/tests/samples/ocr_test.docx b/chatchat/tests/samples/ocr_test.docx similarity index 100% rename from tests/samples/ocr_test.docx rename to chatchat/tests/samples/ocr_test.docx diff --git a/tests/samples/ocr_test.jpg b/chatchat/tests/samples/ocr_test.jpg similarity index 100% rename from tests/samples/ocr_test.jpg rename to chatchat/tests/samples/ocr_test.jpg diff --git a/tests/samples/ocr_test.pdf b/chatchat/tests/samples/ocr_test.pdf similarity index 100% rename from tests/samples/ocr_test.pdf rename to chatchat/tests/samples/ocr_test.pdf diff --git a/tests/samples/ocr_test.pptx b/chatchat/tests/samples/ocr_test.pptx similarity index 100% rename from tests/samples/ocr_test.pptx rename to chatchat/tests/samples/ocr_test.pptx diff --git a/tests/test_migrate.py b/chatchat/tests/test_migrate.py similarity index 92% rename from tests/test_migrate.py rename to chatchat/tests/test_migrate.py index 0a967d13..0071feea 100644 --- a/tests/test_migrate.py +++ b/chatchat/tests/test_migrate.py @@ -6,9 +6,9 @@ import sys root_path = Path(__file__).parent.parent sys.path.append(str(root_path)) -from server.knowledge_base.kb_service.base import KBServiceFactory -from server.knowledge_base.utils import get_kb_path, get_doc_path, KnowledgeFile -from server.knowledge_base.migrate import folder2db, prune_db_docs, prune_folder_files +from chatchat_server.knowledge_base.kb_service.base import KBServiceFactory +from chatchat_server.knowledge_base.utils import get_kb_path, get_doc_path, KnowledgeFile +from chatchat_server.knowledge_base.migrate import folder2db, prune_db_docs, prune_folder_files # setup test knowledge base diff --git a/tests/test_qwen_agent.py b/chatchat/tests/test_qwen_agent.py similarity index 90% rename from tests/test_qwen_agent.py rename to chatchat/tests/test_qwen_agent.py index 9d7e93a5..b2494f24 100644 --- a/tests/test_qwen_agent.py +++ b/chatchat/tests/test_qwen_agent.py @@ -6,10 +6,10 @@ import asyncio import json from pprint import pprint from langchain.agents import AgentExecutor -from server.agent.tools_factory.tools_registry import all_tools -from server.agent.agent_factory.qwen_agent import create_structured_qwen_chat_agent -from server.callback_handler.agent_callback_handler import AgentExecutorAsyncIteratorCallbackHandler -from server.utils import get_ChatOpenAI +from chatchat_server.agent.tools_factory.tools_registry import all_tools +from chatchat_server.agent.agent_factory.qwen_agent import create_structured_qwen_chat_agent +from chatchat_server.callback_handler.agent_callback_handler import AgentExecutorAsyncIteratorCallbackHandler +from chatchat_server.utils import get_ChatOpenAI from langchain import globals # globals.set_debug(True) @@ -32,7 +32,7 @@ async def test1(): async def test_server_chat(): - from server.chat.chat import chat + from chatchat_server.chat.chat import chat mc={'preprocess_model': { 'qwen': { @@ -79,7 +79,7 @@ async def test_server_chat(): async def test_text2image(): - from server.chat.chat import chat + from chatchat_server.chat.chat import chat mc={'preprocess_model': { 'qwen-api': { diff --git a/webui.py b/chatchat/webui.py similarity index 87% rename from webui.py rename to chatchat/webui.py index b305f96a..5520a9cf 100644 --- a/webui.py +++ b/chatchat/webui.py @@ -1,15 +1,15 @@ import streamlit as st -# from webui_pages.loom_view_client import update_store -# from webui_pages.openai_plugins import openai_plugins_page -from webui_pages.utils import * +# from chatchat_webui_pages.loom_view_client import update_store +# from chatchat_webui_pages.openai_plugins import openai_plugins_page +from chatchat_webui_pages.utils import * from streamlit_option_menu import option_menu -from webui_pages.dialogue.dialogue import dialogue_page, chat_box -from webui_pages.knowledge_base.knowledge_base import knowledge_base_page +from chatchat_webui_pages.dialogue.dialogue import dialogue_page, chat_box +from chatchat_webui_pages.knowledge_base.knowledge_base import knowledge_base_page import os import sys from configs import VERSION -from server.utils import api_address +from chatchat_server.utils import api_address # def on_change(key): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/__init__.py b/model-providers/README.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/__init__.py rename to model-providers/README.md diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/__init__.py b/model-providers/chatchat_model_providers/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/__init__.py rename to model-providers/chatchat_model_providers/__init__.py diff --git a/model_providers/model_providers/__main__.py b/model-providers/chatchat_model_providers/__main__.py similarity index 81% rename from model_providers/model_providers/__main__.py rename to model-providers/chatchat_model_providers/__main__.py index c08e76c5..fca23638 100644 --- a/model_providers/model_providers/__main__.py +++ b/model-providers/chatchat_model_providers/__main__.py @@ -1,9 +1,9 @@ import os from typing import cast, Generator -from model_providers.core.model_runtime.entities.llm_entities import LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import UserPromptMessage, AssistantPromptMessage -from model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import UserPromptMessage, AssistantPromptMessage +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType if __name__ == '__main__': # 基于配置管理器创建的模型实例 @@ -20,7 +20,7 @@ if __name__ == '__main__': # model=model_config.model, # ) # 直接通过模型加载器创建的模型实例 - from model_providers.core.model_runtime.model_providers import model_provider_factory + from chatchat_model_providers.core.model_runtime.model_providers import model_provider_factory model_provider_factory.get_providers(provider_name='openai') provider_instance = model_provider_factory.get_provider_instance('openai') model_type_instance = provider_instance.get_model_instance(ModelType.LLM) diff --git a/model_providers/model_providers/bootstrap_web/openai_bootstrap_web.py b/model-providers/chatchat_model_providers/bootstrap_web/openai_bootstrap_web.py similarity index 90% rename from model_providers/model_providers/bootstrap_web/openai_bootstrap_web.py rename to model-providers/chatchat_model_providers/bootstrap_web/openai_bootstrap_web.py index 7e5ef088..a4f2c590 100644 --- a/model_providers/model_providers/bootstrap_web/openai_bootstrap_web.py +++ b/model-providers/chatchat_model_providers/bootstrap_web/openai_bootstrap_web.py @@ -10,11 +10,11 @@ from fastapi import (APIRouter, status ) import logging -from model_providers.core.bootstrap import OpenAIBootstrapBaseWeb +from chatchat_model_providers.core.bootstrap import OpenAIBootstrapBaseWeb import json import pprint import tiktoken -from model_providers.core.bootstrap.openai_protocol import ChatCompletionRequest, EmbeddingsRequest, \ +from chatchat_model_providers.core.bootstrap.openai_protocol import ChatCompletionRequest, EmbeddingsRequest, \ ChatCompletionResponse, ModelList, EmbeddingsResponse, ChatCompletionStreamResponse, FunctionAvailable from uvicorn import Config, Server from fastapi.middleware.cors import CORSMiddleware @@ -22,13 +22,13 @@ import multiprocessing as mp import threading from sse_starlette import EventSourceResponse -from model_providers.core.model_runtime.entities.message_entities import UserPromptMessage -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.utils.generic import dictify, jsonify +from chatchat_model_providers.core.model_runtime.entities.message_entities import UserPromptMessage +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.utils.generic import dictify, jsonify -from model_providers.core.model_runtime.model_providers import model_provider_factory +from chatchat_model_providers.core.model_runtime.model_providers import model_provider_factory logger = logging.getLogger(__name__) diff --git a/model-providers/chatchat_model_providers/core/bootstrap/__init__.py b/model-providers/chatchat_model_providers/core/bootstrap/__init__.py new file mode 100644 index 00000000..663c9f15 --- /dev/null +++ b/model-providers/chatchat_model_providers/core/bootstrap/__init__.py @@ -0,0 +1,8 @@ + +from chatchat_model_providers.core.bootstrap.base import Bootstrap, OpenAIBootstrapBaseWeb +from chatchat_model_providers.core.bootstrap.bootstrap_register import bootstrap_register +__all__ = [ + "bootstrap_register", + "Bootstrap", + "OpenAIBootstrapBaseWeb", +] diff --git a/model_providers/model_providers/core/bootstrap/base.py b/model-providers/chatchat_model_providers/core/bootstrap/base.py similarity index 100% rename from model_providers/model_providers/core/bootstrap/base.py rename to model-providers/chatchat_model_providers/core/bootstrap/base.py diff --git a/model_providers/model_providers/core/bootstrap/bootstrap_register.py b/model-providers/chatchat_model_providers/core/bootstrap/bootstrap_register.py similarity index 95% rename from model_providers/model_providers/core/bootstrap/bootstrap_register.py rename to model-providers/chatchat_model_providers/core/bootstrap/bootstrap_register.py index ef78184a..a97661e6 100644 --- a/model_providers/model_providers/core/bootstrap/bootstrap_register.py +++ b/model-providers/chatchat_model_providers/core/bootstrap/bootstrap_register.py @@ -1,4 +1,4 @@ -from model_providers.core.bootstrap import Bootstrap +from chatchat_model_providers.core.bootstrap import Bootstrap class BootstrapRegister: diff --git a/model_providers/model_providers/core/bootstrap/openai_protocol.py b/model-providers/chatchat_model_providers/core/bootstrap/openai_protocol.py similarity index 100% rename from model_providers/model_providers/core/bootstrap/openai_protocol.py rename to model-providers/chatchat_model_providers/core/bootstrap/openai_protocol.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/__init__.py b/model-providers/chatchat_model_providers/core/entities/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/__init__.py rename to model-providers/chatchat_model_providers/core/entities/__init__.py diff --git a/model_providers/model_providers/core/entities/agent_entities.py b/model-providers/chatchat_model_providers/core/entities/agent_entities.py similarity index 100% rename from model_providers/model_providers/core/entities/agent_entities.py rename to model-providers/chatchat_model_providers/core/entities/agent_entities.py diff --git a/model_providers/model_providers/core/entities/application_entities.py b/model-providers/chatchat_model_providers/core/entities/application_entities.py similarity index 95% rename from model_providers/model_providers/core/entities/application_entities.py rename to model-providers/chatchat_model_providers/core/entities/application_entities.py index c9a72176..8eee58f9 100644 --- a/model_providers/model_providers/core/entities/application_entities.py +++ b/model-providers/chatchat_model_providers/core/entities/application_entities.py @@ -3,10 +3,10 @@ from typing import Any, Literal, Optional, Union from pydantic import BaseModel -from model_providers.core.entities.provider_configuration import ProviderModelBundle -from model_providers.core.file.file_obj import FileObj -from model_providers.core.model_runtime.entities.message_entities import PromptMessageRole -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity +from chatchat_model_providers.core.entities.provider_configuration import ProviderModelBundle +from chatchat_model_providers.core.file.file_obj import FileObj +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessageRole +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity class ModelConfigEntity(BaseModel): diff --git a/model_providers/model_providers/core/entities/message_entities.py b/model-providers/chatchat_model_providers/core/entities/message_entities.py similarity index 98% rename from model_providers/model_providers/core/entities/message_entities.py rename to model-providers/chatchat_model_providers/core/entities/message_entities.py index d9217512..5d6b45a7 100644 --- a/model_providers/model_providers/core/entities/message_entities.py +++ b/model-providers/chatchat_model_providers/core/entities/message_entities.py @@ -4,7 +4,7 @@ from typing import Any, cast from langchain.schema import AIMessage, BaseMessage, FunctionMessage, HumanMessage, SystemMessage from pydantic import BaseModel -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, ImagePromptMessageContent, PromptMessage, diff --git a/model_providers/model_providers/core/entities/model_entities.py b/model-providers/chatchat_model_providers/core/entities/model_entities.py similarity index 84% rename from model_providers/model_providers/core/entities/model_entities.py rename to model-providers/chatchat_model_providers/core/entities/model_entities.py index 2ae3bcd9..4d7494af 100644 --- a/model_providers/model_providers/core/entities/model_entities.py +++ b/model-providers/chatchat_model_providers/core/entities/model_entities.py @@ -3,9 +3,9 @@ from typing import Optional from pydantic import BaseModel -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import ModelType, ProviderModel -from model_providers.core.model_runtime.entities.provider_entities import ProviderEntity +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType, ProviderModel +from chatchat_model_providers.core.model_runtime.entities.provider_entities import ProviderEntity class ModelStatus(Enum): diff --git a/model_providers/model_providers/core/entities/provider_configuration.py b/model-providers/chatchat_model_providers/core/entities/provider_configuration.py similarity index 96% rename from model_providers/model_providers/core/entities/provider_configuration.py rename to model-providers/chatchat_model_providers/core/entities/provider_configuration.py index 823c7cf9..8f9c203b 100644 --- a/model_providers/model_providers/core/entities/provider_configuration.py +++ b/model-providers/chatchat_model_providers/core/entities/provider_configuration.py @@ -7,21 +7,21 @@ from typing import Optional from pydantic import BaseModel -from model_providers.core.entities.model_entities import ModelStatus, ModelWithProviderEntity, SimpleModelProviderEntity -from model_providers.core.entities.provider_entities import CustomConfiguration, SystemConfiguration, SystemConfigurationStatus -from model_providers.core.helper import encrypter -from model_providers.core.helper.model_provider_cache import ProviderCredentialsCache, ProviderCredentialsCacheType -from model_providers.core.model_runtime.entities.model_entities import FetchFrom, ModelType -from model_providers.core.model_runtime.entities.provider_entities import ( +from chatchat_model_providers.core.entities.model_entities import ModelStatus, ModelWithProviderEntity, SimpleModelProviderEntity +from chatchat_model_providers.core.entities.provider_entities import CustomConfiguration, SystemConfiguration, SystemConfigurationStatus +from chatchat_model_providers.core.helper import encrypter +from chatchat_model_providers.core.helper.model_provider_cache import ProviderCredentialsCache, ProviderCredentialsCacheType +from chatchat_model_providers.core.model_runtime.entities.model_entities import FetchFrom, ModelType +from chatchat_model_providers.core.model_runtime.entities.provider_entities import ( ConfigurateMethod, CredentialFormSchema, FormType, ProviderEntity, ) -from model_providers.core.model_runtime.model_providers import model_provider_factory -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider -from model_providers.extensions.ext_database import db +from chatchat_model_providers.core.model_runtime.model_providers import model_provider_factory +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.extensions.ext_database import db from models.provider import Provider, ProviderModel, ProviderType, TenantPreferredModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/entities/provider_entities.py b/model-providers/chatchat_model_providers/core/entities/provider_entities.py similarity index 94% rename from model_providers/model_providers/core/entities/provider_entities.py rename to model-providers/chatchat_model_providers/core/entities/provider_entities.py index 08013af1..fb39255a 100644 --- a/model_providers/model_providers/core/entities/provider_entities.py +++ b/model-providers/chatchat_model_providers/core/entities/provider_entities.py @@ -3,7 +3,7 @@ from typing import Optional from pydantic import BaseModel -from model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType from models.provider import ProviderQuotaType diff --git a/model_providers/model_providers/core/entities/queue_entities.py b/model-providers/chatchat_model_providers/core/entities/queue_entities.py similarity index 96% rename from model_providers/model_providers/core/entities/queue_entities.py rename to model-providers/chatchat_model_providers/core/entities/queue_entities.py index cd5e8267..38f6a1f5 100644 --- a/model_providers/model_providers/core/entities/queue_entities.py +++ b/model-providers/chatchat_model_providers/core/entities/queue_entities.py @@ -3,7 +3,7 @@ from typing import Any from pydantic import BaseModel -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk class QueueEvent(Enum): diff --git a/model_providers/model_providers/core/model_runtime/README.md b/model-providers/chatchat_model_providers/core/model_runtime/README.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/README.md rename to model-providers/chatchat_model_providers/core/model_runtime/README.md diff --git a/model_providers/model_providers/core/model_runtime/README_CN.md b/model-providers/chatchat_model_providers/core/model_runtime/README_CN.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/README_CN.md rename to model-providers/chatchat_model_providers/core/model_runtime/README_CN.md diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/callbacks/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/callbacks/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/callbacks/base_callback.py b/model-providers/chatchat_model_providers/core/model_runtime/callbacks/base_callback.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/callbacks/base_callback.py rename to model-providers/chatchat_model_providers/core/model_runtime/callbacks/base_callback.py index a5103ab3..52b17c77 100644 --- a/model_providers/model_providers/core/model_runtime/callbacks/base_callback.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/callbacks/base_callback.py @@ -1,9 +1,9 @@ from abc import ABC from typing import Optional -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk -from model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel _TEXT_COLOR_MAPPING = { "blue": "36;1", diff --git a/model_providers/model_providers/core/model_runtime/callbacks/logging_callback.py b/model-providers/chatchat_model_providers/core/model_runtime/callbacks/logging_callback.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/callbacks/logging_callback.py rename to model-providers/chatchat_model_providers/core/model_runtime/callbacks/logging_callback.py index 1ee0b740..c77e4f8d 100644 --- a/model_providers/model_providers/core/model_runtime/callbacks/logging_callback.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/callbacks/logging_callback.py @@ -3,10 +3,10 @@ import logging import sys from typing import Optional -from model_providers.core.model_runtime.callbacks.base_callback import Callback -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk -from model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.callbacks.base_callback import Callback +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210143654461.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210143654461.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210143654461.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210143654461.png diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210144229650.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210144229650.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210144229650.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210144229650.png diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210144814617.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210144814617.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210144814617.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210144814617.png diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210151548521.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210151548521.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210151548521.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210151548521.png diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210151628992.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210151628992.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210151628992.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210151628992.png diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210165243632.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210165243632.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/images/index/image-20231210165243632.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/images/index/image-20231210165243632.png diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/interfaces.md b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/interfaces.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/interfaces.md rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/interfaces.md diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/provider_scale_out.md b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/provider_scale_out.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/provider_scale_out.md rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/provider_scale_out.md diff --git a/model_providers/model_providers/core/model_runtime/docs/en_US/schema.md b/model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/schema.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/en_US/schema.md rename to model-providers/chatchat_model_providers/core/model_runtime/docs/en_US/schema.md diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/customizable_model_scale_out.md b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/customizable_model_scale_out.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/customizable_model_scale_out.md rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/customizable_model_scale_out.md diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-1.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-1.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-1.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-1.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-2.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-2.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-2.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-2.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210143654461.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210143654461.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210143654461.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210143654461.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210144229650.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210144229650.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210144229650.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210144229650.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210144814617.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210144814617.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210144814617.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210144814617.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210151548521.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210151548521.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210151548521.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210151548521.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210151628992.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210151628992.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210151628992.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210151628992.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210165243632.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210165243632.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210165243632.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-20231210165243632.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-3.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-3.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image-3.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image-3.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image.png b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/images/index/image.png rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/images/index/image.png diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/interfaces.md b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/interfaces.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/interfaces.md rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/interfaces.md diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/predefined_model_scale_out.md b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/predefined_model_scale_out.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/predefined_model_scale_out.md rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/predefined_model_scale_out.md diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/provider_scale_out.md b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/provider_scale_out.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/provider_scale_out.md rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/provider_scale_out.md diff --git a/model_providers/model_providers/core/model_runtime/docs/zh_Hans/schema.md b/model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/schema.md similarity index 100% rename from model_providers/model_providers/core/model_runtime/docs/zh_Hans/schema.md rename to model-providers/chatchat_model_providers/core/model_runtime/docs/zh_Hans/schema.md diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/entities/common_entities.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/common_entities.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/entities/common_entities.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/common_entities.py diff --git a/model_providers/model_providers/core/model_runtime/entities/defaults.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/defaults.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/entities/defaults.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/defaults.py index 438aaa3d..6d14786b 100644 --- a/model_providers/model_providers/core/model_runtime/entities/defaults.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/entities/defaults.py @@ -1,5 +1,5 @@ -from model_providers.core.model_runtime.entities.model_entities import DefaultParameterName +from chatchat_model_providers.core.model_runtime.entities.model_entities import DefaultParameterName PARAMETER_RULE_TEMPLATE: dict[DefaultParameterName, dict] = { DefaultParameterName.TEMPERATURE: { diff --git a/model_providers/model_providers/core/model_runtime/entities/llm_entities.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/llm_entities.py similarity index 91% rename from model_providers/model_providers/core/model_runtime/entities/llm_entities.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/llm_entities.py index 99f37500..7cb27d37 100644 --- a/model_providers/model_providers/core/model_runtime/entities/llm_entities.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/entities/llm_entities.py @@ -4,8 +4,8 @@ from typing import Optional from pydantic import BaseModel -from model_providers.core.model_runtime.entities.message_entities import AssistantPromptMessage, PromptMessage -from model_providers.core.model_runtime.entities.model_entities import ModelUsage, PriceInfo +from chatchat_model_providers.core.model_runtime.entities.message_entities import AssistantPromptMessage, PromptMessage +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelUsage, PriceInfo class LLMMode(Enum): diff --git a/model_providers/model_providers/core/model_runtime/entities/message_entities.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/message_entities.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/entities/message_entities.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/message_entities.py diff --git a/model_providers/model_providers/core/model_runtime/entities/model_entities.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/model_entities.py similarity index 98% rename from model_providers/model_providers/core/model_runtime/entities/model_entities.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/model_entities.py index 50b822d5..ac96ff36 100644 --- a/model_providers/model_providers/core/model_runtime/entities/model_entities.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/entities/model_entities.py @@ -4,7 +4,7 @@ from typing import Any, Optional from pydantic import BaseModel -from model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject class ModelType(Enum): diff --git a/model_providers/model_providers/core/model_runtime/entities/provider_entities.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/provider_entities.py similarity index 94% rename from model_providers/model_providers/core/model_runtime/entities/provider_entities.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/provider_entities.py index e71ca0f1..80a82e6b 100644 --- a/model_providers/model_providers/core/model_runtime/entities/provider_entities.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/entities/provider_entities.py @@ -3,8 +3,8 @@ from typing import Optional from pydantic import BaseModel -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, ModelType, ProviderModel +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, ModelType, ProviderModel class ConfigurateMethod(Enum): diff --git a/model_providers/model_providers/core/model_runtime/entities/rerank_entities.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/rerank_entities.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/entities/rerank_entities.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/rerank_entities.py diff --git a/model_providers/model_providers/core/model_runtime/entities/text_embedding_entities.py b/model-providers/chatchat_model_providers/core/model_runtime/entities/text_embedding_entities.py similarity index 83% rename from model_providers/model_providers/core/model_runtime/entities/text_embedding_entities.py rename to model-providers/chatchat_model_providers/core/model_runtime/entities/text_embedding_entities.py index a67c63b6..38be0ab0 100644 --- a/model_providers/model_providers/core/model_runtime/entities/text_embedding_entities.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/entities/text_embedding_entities.py @@ -2,7 +2,7 @@ from decimal import Decimal from pydantic import BaseModel -from model_providers.core.model_runtime.entities.model_entities import ModelUsage +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelUsage class EmbeddingUsage(ModelUsage): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/speech2text/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/errors/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/speech2text/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/errors/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/errors/invoke.py b/model-providers/chatchat_model_providers/core/model_runtime/errors/invoke.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/errors/invoke.py rename to model-providers/chatchat_model_providers/core/model_runtime/errors/invoke.py diff --git a/model_providers/model_providers/core/model_runtime/errors/validate.py b/model-providers/chatchat_model_providers/core/model_runtime/errors/validate.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/errors/validate.py rename to model-providers/chatchat_model_providers/core/model_runtime/errors/validate.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/ai_model.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/ai_model.py similarity index 95% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/ai_model.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/ai_model.py index e26686bb..17174e36 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/ai_model.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/ai_model.py @@ -5,9 +5,9 @@ from typing import Optional import yaml -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, DefaultParameterName, FetchFrom, @@ -16,9 +16,9 @@ from model_providers.core.model_runtime.entities.model_entities import ( PriceInfo, PriceType, ) -from model_providers.core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError -from model_providers.core.model_runtime.model_providers.__base.tokenizers.gpt2_tokenzier import GPT2Tokenizer -from model_providers.core.utils.position_helper import get_position_map, sort_by_position_map +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError +from chatchat_model_providers.core.model_runtime.model_providers.__base.tokenizers.gpt2_tokenzier import GPT2Tokenizer +from chatchat_model_providers.core.utils.position_helper import get_position_map, sort_by_position_map class AIModel(ABC): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/audio.mp3 b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/audio.mp3 similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/audio.mp3 rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/audio.mp3 diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/large_language_model.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/large_language_model.py similarity index 98% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/large_language_model.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/large_language_model.py index 72b72f1b..bcad4382 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/large_language_model.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/large_language_model.py @@ -6,24 +6,24 @@ from abc import abstractmethod from collections.abc import Generator from typing import Optional, Union -from model_providers.core.model_runtime.callbacks.base_callback import Callback -from model_providers.core.model_runtime.callbacks.logging_callback import LoggingCallback -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.callbacks.base_callback import Callback +from chatchat_model_providers.core.model_runtime.callbacks.logging_callback import LoggingCallback +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( ModelPropertyKey, ModelType, ParameterRule, ParameterType, PriceType, ) -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/model_provider.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/model_provider.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/model_provider.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/model_provider.py index 9814ac06..2ebb240f 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/model_provider.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/model_provider.py @@ -4,9 +4,9 @@ from abc import ABC, abstractmethod import yaml -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, ModelType -from model_providers.core.model_runtime.entities.provider_entities import ProviderEntity -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, ModelType +from chatchat_model_providers.core.model_runtime.entities.provider_entities import ProviderEntity +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel class ModelProvider(ABC): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/moderation_model.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/moderation_model.py similarity index 87% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/moderation_model.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/moderation_model.py index 21cc7e1c..407b69cc 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/moderation_model.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/moderation_model.py @@ -2,8 +2,8 @@ import time from abc import abstractmethod from typing import Optional -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel class ModerationModel(AIModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/rerank_model.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/rerank_model.py similarity index 85% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/rerank_model.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/rerank_model.py index e38cc837..4209d5da 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/rerank_model.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/rerank_model.py @@ -2,9 +2,9 @@ import time from abc import abstractmethod from typing import Optional -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.entities.rerank_entities import RerankResult -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.entities.rerank_entities import RerankResult +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel class RerankModel(AIModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/speech2text_model.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/speech2text_model.py similarity index 89% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/speech2text_model.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/speech2text_model.py index eaed8282..e8fa42d0 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/speech2text_model.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/speech2text_model.py @@ -2,8 +2,8 @@ import os from abc import abstractmethod from typing import IO, Optional -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel class Speech2TextModel(AIModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/text2img_model.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/text2img_model.py similarity index 88% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/text2img_model.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/text2img_model.py index 4139cfc1..b888a538 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/text2img_model.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/text2img_model.py @@ -1,8 +1,8 @@ from abc import abstractmethod from typing import IO, Optional -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel class Text2ImageModel(AIModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/text_embedding_model.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/text_embedding_model.py similarity index 89% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/text_embedding_model.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/text_embedding_model.py index 20ce474b..a218df64 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/text_embedding_model.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/text_embedding_model.py @@ -2,9 +2,9 @@ import time from abc import abstractmethod from typing import Optional -from model_providers.core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType -from model_providers.core.model_runtime.entities.text_embedding_entities import TextEmbeddingResult -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel class TextEmbeddingModel(AIModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/tts/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/tts/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/merges.txt b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/merges.txt similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/merges.txt rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/merges.txt diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/special_tokens_map.json b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/special_tokens_map.json similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/special_tokens_map.json rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/special_tokens_map.json diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/tokenizer_config.json b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/tokenizer_config.json similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/tokenizer_config.json rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/tokenizer_config.json diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/vocab.json b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/vocab.json similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/vocab.json rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2/vocab.json diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenzier.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenzier.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenzier.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenzier.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__base/tts_model.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tts_model.py similarity index 95% rename from model_providers/model_providers/core/model_runtime/model_providers/__base/tts_model.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tts_model.py index b99f3c79..2791269f 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/__base/tts_model.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__base/tts_model.py @@ -4,9 +4,9 @@ import uuid from abc import abstractmethod from typing import Optional -from model_providers.core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType -from model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel class TTSModel(AIModel): diff --git a/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__init__.py new file mode 100644 index 00000000..c9c05abc --- /dev/null +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/__init__.py @@ -0,0 +1,3 @@ +from chatchat_model_providers.core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory + +model_provider_factory = ModelProviderFactory() diff --git a/model_providers/model_providers/core/model_runtime/model_providers/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/anthropic.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/anthropic.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/anthropic.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/anthropic.py index 3f5b9507..64d16094 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/anthropic.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/anthropic.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/anthropic.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/anthropic.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/anthropic.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/anthropic.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-2.1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-2.1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-2.1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-2.1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-2.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-2.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-2.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-2.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-haiku-20240307.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-haiku-20240307.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-haiku-20240307.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-haiku-20240307.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-opus-20240229.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-opus-20240229.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-opus-20240229.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-opus-20240229.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-sonnet-20240229.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-sonnet-20240229.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-sonnet-20240229.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-3-sonnet-20240229.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-instant-1.2.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-instant-1.2.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-instant-1.2.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-instant-1.2.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-instant-1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-instant-1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/claude-instant-1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/claude-instant-1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py index 6eda2ffd..6566fbed 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py @@ -17,9 +17,9 @@ from anthropic.types import ( ) from httpx import Timeout -from model_providers.core.model_runtime.callbacks.base_callback import Callback -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.callbacks.base_callback import Callback +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, ImagePromptMessageContent, PromptMessage, @@ -29,7 +29,7 @@ from model_providers.core.model_runtime.entities.message_entities import ( TextPromptMessageContent, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -37,8 +37,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel ANTHROPIC_BLOCK_MODE_PROMPT = """You should always follow the instructions and output a valid {{block}} object. The structure of the {{block}} object you can found in the instructions, use {"answer": "$your_answer"} as the default structure diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_assets/icon_l_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_assets/icon_l_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_assets/icon_l_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_assets/icon_l_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_common.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_common.py similarity index 88% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_common.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_common.py index b480efc6..49756d4b 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_common.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_common.py @@ -1,7 +1,7 @@ import openai from httpx import Timeout -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -9,7 +9,7 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.model_providers.azure_openai._constant import AZURE_OPENAI_API_VERSION +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._constant import AZURE_OPENAI_API_VERSION class _CommonAzureOpenAI: diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_constant.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_constant.py similarity index 99% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_constant.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_constant.py index c73e8fd8..683763cd 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/_constant.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/_constant.py @@ -1,8 +1,8 @@ from pydantic import BaseModel -from model_providers.core.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE -from model_providers.core.model_runtime.entities.llm_entities import LLMMode -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, DefaultParameterName, FetchFrom, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.py similarity index 63% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.py index 7e3e3fb0..a0ee3a25 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/azure_openai.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py index 56fbb72c..e6f76625 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py @@ -10,8 +10,8 @@ from openai.types.chat import ChatCompletion, ChatCompletionChunk, ChatCompletio from openai.types.chat.chat_completion_chunk import ChoiceDeltaFunctionCall, ChoiceDeltaToolCall from openai.types.chat.chat_completion_message import FunctionCall -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, ImagePromptMessageContent, PromptMessage, @@ -22,11 +22,11 @@ from model_providers.core.model_runtime.entities.message_entities import ( ToolPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.azure_openai._common import _CommonAzureOpenAI -from model_providers.core.model_runtime.model_providers.azure_openai._constant import LLM_BASE_MODELS, AzureBaseModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._common import _CommonAzureOpenAI +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._constant import LLM_BASE_MODELS, AzureBaseModel logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/speech2text/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/speech2text/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/speech2text/speech2text.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/speech2text/speech2text.py similarity index 82% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/speech2text/speech2text.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/speech2text/speech2text.py index 227edbec..262ba843 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/speech2text/speech2text.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/speech2text/speech2text.py @@ -3,11 +3,11 @@ from typing import IO, Optional from openai import AzureOpenAI -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel -from model_providers.core.model_runtime.model_providers.azure_openai._common import _CommonAzureOpenAI -from model_providers.core.model_runtime.model_providers.azure_openai._constant import SPEECH2TEXT_BASE_MODELS, AzureBaseModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._common import _CommonAzureOpenAI +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._constant import SPEECH2TEXT_BASE_MODELS, AzureBaseModel class AzureOpenAISpeech2TextModel(_CommonAzureOpenAI, Speech2TextModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py similarity index 90% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py index 8f0420b1..a2132001 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py @@ -7,12 +7,12 @@ import numpy as np import tiktoken from openai import AzureOpenAI -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.azure_openai._common import _CommonAzureOpenAI -from model_providers.core.model_runtime.model_providers.azure_openai._constant import EMBEDDING_BASE_MODELS, AzureBaseModel +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._common import _CommonAzureOpenAI +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._constant import EMBEDDING_BASE_MODELS, AzureBaseModel class AzureOpenAITextEmbeddingModel(_CommonAzureOpenAI, TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/tts/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/tts/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/tts/tts.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/tts/tts.py similarity index 91% rename from model_providers/model_providers/core/model_runtime/model_providers/azure_openai/tts/tts.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/tts/tts.py index 4475b16e..ddd22b38 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/azure_openai/tts/tts.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/azure_openai/tts/tts.py @@ -7,13 +7,13 @@ from fastapi.responses import StreamingResponse from openai import AzureOpenAI from pydub import AudioSegment -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity -from model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.tts_model import TTSModel -from model_providers.core.model_runtime.model_providers.azure_openai._common import _CommonAzureOpenAI -from model_providers.core.model_runtime.model_providers.azure_openai._constant import TTS_BASE_MODELS, AzureBaseModel -from model_providers.extensions.ext_storage import storage +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.tts_model import TTSModel +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._common import _CommonAzureOpenAI +from chatchat_model_providers.core.model_runtime.model_providers.azure_openai._constant import TTS_BASE_MODELS, AzureBaseModel +from chatchat_model_providers.extensions.ext_storage import storage class AzureOpenAIText2SpeechModel(_CommonAzureOpenAI, TTSModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/baichuan.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/baichuan.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/baichuan.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/baichuan.py index 731b6efc..11433533 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/baichuan.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/baichuan.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/baichuan.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/baichuan.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/baichuan.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/baichuan.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-53b.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-53b.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-53b.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-53b.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-turbo-192k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-turbo-192k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-turbo-192k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-turbo-192k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-turbo.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-turbo.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-turbo.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan2-turbo.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_tokenizer.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_tokenizer.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_tokenizer.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_tokenizer.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py similarity index 98% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py index a57fdd2b..7b3a12e8 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py @@ -6,7 +6,7 @@ from typing import Any, Union from requests import post -from model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import ( +from chatchat_model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import ( BadRequestError, InsufficientAccountBalance, InternalServerError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo_errors.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo_errors.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo_errors.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo_errors.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py similarity index 90% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py index 80399a30..64ec63a2 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py @@ -1,15 +1,15 @@ from collections.abc import Generator from typing import cast -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -17,11 +17,11 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_tokenizer import BaichuanTokenizer -from model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_turbo import BaichuanMessage, BaichuanModel -from model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import ( +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_tokenizer import BaichuanTokenizer +from chatchat_model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_turbo import BaichuanMessage, BaichuanModel +from chatchat_model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import ( BadRequestError, InsufficientAccountBalance, InternalServerError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/text_embedding/baichuan-text-embedding.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/text_embedding/baichuan-text-embedding.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/text_embedding/baichuan-text-embedding.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/text_embedding/baichuan-text-embedding.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py similarity index 90% rename from model_providers/model_providers/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py index ae706de3..93f79b7b 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py @@ -4,9 +4,9 @@ from typing import Optional from requests import post -from model_providers.core.model_runtime.entities.model_entities import PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -14,10 +14,10 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_tokenizer import BaichuanTokenizer -from model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import ( +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_tokenizer import BaichuanTokenizer +from chatchat_model_providers.core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import ( BadRequestError, InsufficientAccountBalance, InternalServerError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/bedrock.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/bedrock.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/bedrock.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/bedrock.py index 82e56ab6..0ec8bc48 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/bedrock.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/bedrock.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/bedrock.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/bedrock.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/bedrock.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/bedrock.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/google/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/ai21.j2-mid-v1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/ai21.j2-mid-v1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/ai21.j2-mid-v1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/ai21.j2-mid-v1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/ai21.j2-ultra-v1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/ai21.j2-ultra-v1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/ai21.j2-ultra-v1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/ai21.j2-ultra-v1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/amazon.titan-text-express-v1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/amazon.titan-text-express-v1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/amazon.titan-text-express-v1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/amazon.titan-text-express-v1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/amazon.titan-text-lite-v1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/amazon.titan-text-lite-v1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/amazon.titan-text-lite-v1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/amazon.titan-text-lite-v1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-instant-v1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-instant-v1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-instant-v1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-instant-v1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v2.1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v2.1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v2.1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v2.1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v2.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v2.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v2.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/anthropic.claude-v2.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/cohere.command-light-text-v14.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/cohere.command-light-text-v14.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/cohere.command-light-text-v14.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/cohere.command-light-text-v14.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/cohere.command-text-v14.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/cohere.command-text-v14.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/cohere.command-text-v14.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/cohere.command-text-v14.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/llm.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/llm.py index c99d8d2a..34629ddb 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/llm.py @@ -13,15 +13,15 @@ from botocore.exceptions import ( UnknownServiceError, ) -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -29,8 +29,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/meta.llama2-13b-chat-v1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/meta.llama2-13b-chat-v1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/meta.llama2-13b-chat-v1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/meta.llama2-13b-chat-v1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/meta.llama2-70b-chat-v1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/meta.llama2-70b-chat-v1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/bedrock/llm/meta.llama2-70b-chat-v1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/bedrock/llm/meta.llama2-70b-chat-v1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/google/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/chatglm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/chatglm.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/chatglm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/chatglm.py index 1e48e52c..c72678c5 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/chatglm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/chatglm.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/chatglm.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/chatglm.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/chatglm.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/chatglm.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm2-6b-32k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm2-6b-32k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm2-6b-32k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm2-6b-32k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm2-6b.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm2-6b.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm2-6b.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm2-6b.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm3-6b-32k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm3-6b-32k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm3-6b-32k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm3-6b-32k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm3-6b.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm3-6b.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm3-6b.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/chatglm3-6b.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/llm.py similarity index 96% rename from model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/llm.py index 6c58362b..10c81f36 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/chatglm/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/chatglm/llm/llm.py @@ -20,8 +20,8 @@ from openai import ( from openai.types.chat import ChatCompletion, ChatCompletionChunk from openai.types.chat.chat_completion_message import FunctionCall -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, @@ -29,7 +29,7 @@ from model_providers.core.model_runtime.entities.message_entities import ( ToolPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -37,9 +37,9 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.utils import helper +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.utils import helper logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/cohere.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/cohere.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/cohere.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/cohere.py index 6a2b91cd..27a93e43 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/cohere/cohere.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/cohere.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/cohere.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/cohere.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/cohere.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/cohere.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-chat.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-chat.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-chat.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-chat.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-light-chat.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-light-chat.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-light-chat.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-light-chat.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-light-nightly-chat.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-light-nightly-chat.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-light-nightly-chat.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-light-nightly-chat.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-light-nightly.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-light-nightly.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-light-nightly.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-light-nightly.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-light.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-light.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-light.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-light.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-nightly-chat.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-nightly-chat.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-nightly-chat.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-nightly-chat.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-nightly.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-nightly.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command-nightly.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command-nightly.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/command.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/command.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/llm.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/llm.py index ad611f11..badd4c42 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/cohere/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/llm/llm.py @@ -7,8 +7,8 @@ from cohere.responses import Chat, Generations from cohere.responses.chat import StreamEnd, StreamingChat, StreamTextGeneration from cohere.responses.generation import StreamingGenerations, StreamingText -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageContentType, @@ -17,8 +17,8 @@ from model_providers.core.model_runtime.entities.message_entities import ( TextPromptMessageContent, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, I18nObject, ModelType -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, I18nObject, ModelType +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -26,8 +26,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank-english-v2.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/rerank-english-v2.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank-english-v2.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/rerank-english-v2.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank-multilingual-v2.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/rerank-multilingual-v2.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank-multilingual-v2.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/rerank-multilingual-v2.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py similarity index 90% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py index b3691ee2..1826309d 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py @@ -2,8 +2,8 @@ from typing import Optional import cohere -from model_providers.core.model_runtime.entities.rerank_entities import RerankDocument, RerankResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.rerank_entities import RerankDocument, RerankResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -11,8 +11,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.rerank_model import RerankModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.rerank_model import RerankModel class CohereRerankModel(RerankModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-light-v2.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-light-v2.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-light-v2.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-light-v2.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-light-v3.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-light-v3.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-light-v3.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-light-v3.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-v2.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-v2.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-v2.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-v2.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-v3.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-v3.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-v3.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-english-v3.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-light-v3.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-light-v3.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-light-v3.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-light-v3.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-v2.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-v2.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-v2.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-v2.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-v3.0.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-v3.0.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-v3.0.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/embed-multilingual-v3.0.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/text_embedding.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/text_embedding.py index 56a73601..93914432 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/cohere/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/cohere/text_embedding/text_embedding.py @@ -5,9 +5,9 @@ import cohere import numpy as np from cohere.responses import Tokens -from model_providers.core.model_runtime.entities.model_entities import PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -15,8 +15,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel class CohereTextEmbeddingModel(TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/google/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/google/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/google.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/google.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/model_providers/google/google.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/google.py index fa426593..a375d429 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/google/google.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/google.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/google.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/google.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/google/google.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/google.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/rerank/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/rerank/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/llm/gemini-pro-vision.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/gemini-pro-vision.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/google/llm/gemini-pro-vision.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/gemini-pro-vision.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/llm/gemini-pro.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/gemini-pro.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/google/llm/gemini-pro.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/gemini-pro.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/google/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/llm.py similarity index 96% rename from model_providers/model_providers/core/model_runtime/model_providers/google/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/llm.py index 4fecd526..70a1d8e4 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/google/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/google/llm/llm.py @@ -8,8 +8,8 @@ import google.generativeai.client as client from google.generativeai.types import ContentType, GenerateContentResponse, HarmBlockThreshold, HarmCategory from google.generativeai.types.content_types import to_part -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageContentType, @@ -18,7 +18,7 @@ from model_providers.core.model_runtime.entities.message_entities import ( SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -26,8 +26,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/groq.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/groq.py similarity index 73% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/groq.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/groq.py index b4dca94b..ed67ee57 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/groq/groq.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/groq.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/groq.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/groq.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/groq.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/groq.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/llm/llama2-70b-4096.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/llama2-70b-4096.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/llm/llama2-70b-4096.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/llama2-70b-4096.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/llm.py similarity index 75% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/llm.py index 73e3894f..c350c4a9 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/groq/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/llm.py @@ -1,9 +1,9 @@ from collections.abc import Generator from typing import Optional, Union -from model_providers.core.model_runtime.entities.llm_entities import LLMResult -from model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool -from model_providers.core.model_runtime.model_providers.openai_api_compatible.llm.llm import OAIAPICompatLargeLanguageModel +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool +from chatchat_model_providers.core.model_runtime.model_providers.openai_api_compatible.llm.llm import OAIAPICompatLargeLanguageModel class GroqLargeLanguageModel(OAIAPICompatLargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/groq/llm/mixtral-8x7b-instruct-v0.1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/mixtral-8x7b-instruct-v0.1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/groq/llm/mixtral-8x7b-instruct-v0.1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/groq/llm/mixtral-8x7b-instruct-v0.1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py similarity index 76% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py index ecfa9008..700e5df6 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py @@ -1,6 +1,6 @@ from huggingface_hub.utils import BadRequestError, HfHubHTTPError -from model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError, InvokeError +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError, InvokeError class _CommonHuggingfaceHub: diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.py similarity index 63% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.py index 027fc87f..f5a38799 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/huggingface_hub.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py index d427492a..2429eb55 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py @@ -5,17 +5,17 @@ from huggingface_hub import InferenceClient from huggingface_hub.hf_api import HfApi from huggingface_hub.utils import BadRequestError -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, DefaultParameterName, FetchFrom, @@ -23,9 +23,9 @@ from model_providers.core.model_runtime.entities.model_entities import ( ModelType, ParameterRule, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.huggingface_hub._common import _CommonHuggingfaceHub +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.huggingface_hub._common import _CommonHuggingfaceHub class HuggingfaceHubLargeLanguageModel(_CommonHuggingfaceHub, LargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py similarity index 91% rename from model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py index 2b3297f8..c20fb1da 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py @@ -6,12 +6,12 @@ import numpy as np import requests from huggingface_hub import HfApi, InferenceClient -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType, PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.huggingface_hub._common import _CommonHuggingfaceHub +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType, PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.huggingface_hub._common import _CommonHuggingfaceHub HUGGINGFACE_ENDPOINT_API = 'https://api.endpoints.huggingface.cloud/v2/endpoint/' diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/jina.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/jina.py similarity index 76% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/jina.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/jina.py index 65cf6fc1..8dcad645 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/jina/jina.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/jina.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/jina.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/jina.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/jina.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/jina.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/rerank/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/rerank/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/rerank/jina-reranker-v1-base-en.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/rerank/jina-reranker-v1-base-en.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/rerank/jina-reranker-v1-base-en.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/rerank/jina-reranker-v1-base-en.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py similarity index 90% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py index 18137c69..9e0b6db7 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py @@ -2,8 +2,8 @@ from typing import Optional import httpx -from model_providers.core.model_runtime.entities.rerank_entities import RerankDocument, RerankResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.rerank_entities import RerankDocument, RerankResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -11,8 +11,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.rerank_model import RerankModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.rerank_model import RerankModel class JinaRerankModel(RerankModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-de.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-de.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-de.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-de.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-en.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-en.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-en.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-en.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-zh.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-zh.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-zh.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-base-zh.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-small-en.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-small-en.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-small-en.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina-embeddings-v2-small-en.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina_tokenizer.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina_tokenizer.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/jina_tokenizer.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/jina_tokenizer.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py similarity index 89% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py index 6815c6a7..f853fff7 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py @@ -4,9 +4,9 @@ from typing import Optional from requests import post -from model_providers.core.model_runtime.entities.model_entities import PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -14,9 +14,9 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.jina.text_embedding.jina_tokenizer import JinaTokenizer +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.jina.text_embedding.jina_tokenizer import JinaTokenizer class JinaTextEmbeddingModel(TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/tokenizer/tokenizer.json b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/tokenizer/tokenizer.json similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/tokenizer/tokenizer.json rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/tokenizer/tokenizer.json diff --git a/model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/tokenizer/tokenizer_config.json b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/tokenizer/tokenizer_config.json similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/tokenizer/tokenizer_config.json rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/jina/text_embedding/tokenizer/tokenizer_config.json diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/llm/llm.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/llm/llm.py index 3c5545b9..9d874cd4 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/localai/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/llm/llm.py @@ -20,16 +20,16 @@ from openai.types.chat.chat_completion_message import FunctionCall from openai.types.completion import Completion from yarl import URL -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, FetchFrom, ModelPropertyKey, @@ -37,7 +37,7 @@ from model_providers.core.model_runtime.entities.model_entities import ( ParameterRule, ParameterType, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -45,9 +45,9 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.utils import helper +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.utils import helper class LocalAILarguageModel(LargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/localai.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/localai.py similarity index 62% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/localai.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/localai.py index c4ccd3bc..1c182eeb 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/localai/localai.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/localai.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/localai.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/localai.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/localai.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/localai.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py similarity index 90% rename from model_providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py index 14d82034..4362fcb5 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py @@ -5,10 +5,10 @@ from typing import Optional from requests import post from yarl import URL -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelPropertyKey, ModelType, PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelPropertyKey, ModelType, PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -16,8 +16,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel class LocalAITextEmbeddingModel(TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/_assets/icon_l_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/_assets/icon_l_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/_assets/icon_l_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/_assets/icon_l_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/_assets/icon_s_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/_assets/icon_s_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/_assets/icon_s_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/_assets/icon_s_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/abab5-chat.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/abab5-chat.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/abab5-chat.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/abab5-chat.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/abab5.5-chat.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/abab5.5-chat.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/abab5.5-chat.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/abab5.5-chat.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/abab5.5s-chat.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/abab5.5s-chat.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/abab5.5s-chat.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/abab5.5s-chat.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/abab6-chat.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/abab6-chat.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/abab6-chat.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/abab6-chat.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py similarity index 96% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py index 279f9d3b..5a1c9aa0 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py @@ -4,7 +4,7 @@ from typing import Any, Union from requests import Response, post -from model_providers.core.model_runtime.model_providers.minimax.llm.errors import ( +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.errors import ( BadRequestError, InsufficientAccountBalanceError, InternalServerError, @@ -12,7 +12,7 @@ from model_providers.core.model_runtime.model_providers.minimax.llm.errors impor InvalidAuthenticationError, RateLimitReachedError, ) -from model_providers.core.model_runtime.model_providers.minimax.llm.types import MinimaxMessage +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.types import MinimaxMessage class MinimaxChatCompletion: diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py index ee54baaa..315d5253 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py @@ -4,7 +4,7 @@ from typing import Any, Union from requests import Response, post -from model_providers.core.model_runtime.model_providers.minimax.llm.errors import ( +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.errors import ( BadRequestError, InsufficientAccountBalanceError, InternalServerError, @@ -12,7 +12,7 @@ from model_providers.core.model_runtime.model_providers.minimax.llm.errors impor InvalidAuthenticationError, RateLimitReachedError, ) -from model_providers.core.model_runtime.model_providers.minimax.llm.types import MinimaxMessage +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.types import MinimaxMessage class MinimaxChatCompletionPro: diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/errors.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/errors.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/errors.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/errors.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/llm.py similarity index 91% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/llm.py index d827b49e..74dfd3f3 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/llm.py @@ -1,7 +1,7 @@ from collections.abc import Generator -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, @@ -9,7 +9,7 @@ from model_providers.core.model_runtime.entities.message_entities import ( ToolPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -17,11 +17,11 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.minimax.llm.chat_completion import MinimaxChatCompletion -from model_providers.core.model_runtime.model_providers.minimax.llm.chat_completion_pro import MinimaxChatCompletionPro -from model_providers.core.model_runtime.model_providers.minimax.llm.errors import ( +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.chat_completion import MinimaxChatCompletion +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.chat_completion_pro import MinimaxChatCompletionPro +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.errors import ( BadRequestError, InsufficientAccountBalanceError, InternalServerError, @@ -29,7 +29,7 @@ from model_providers.core.model_runtime.model_providers.minimax.llm.errors impor InvalidAuthenticationError, RateLimitReachedError, ) -from model_providers.core.model_runtime.model_providers.minimax.llm.types import MinimaxMessage +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.types import MinimaxMessage class MinimaxLargeLanguageModel(LargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/types.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/types.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/llm/types.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/llm/types.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/minimax.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/minimax.py similarity index 75% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/minimax.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/minimax.py index d85b2293..39d968ee 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/minimax/minimax.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/minimax.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/minimax.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/minimax.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/minimax.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/minimax.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/embo-01.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/text_embedding/embo-01.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/embo-01.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/text_embedding/embo-01.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py similarity index 90% rename from model_providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py index 9c065b37..2c0fdaef 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py @@ -4,9 +4,9 @@ from typing import Optional from requests import post -from model_providers.core.model_runtime.entities.model_entities import PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -14,9 +14,9 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.minimax.llm.errors import ( +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.minimax.llm.errors import ( BadRequestError, InsufficientAccountBalanceError, InternalServerError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/_assets/icon_l_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/_assets/icon_l_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/_assets/icon_l_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/_assets/icon_l_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/_assets/icon_s_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/_assets/icon_s_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/_assets/icon_s_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/_assets/icon_s_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py similarity index 76% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py index 224db4c4..79796459 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py @@ -1,9 +1,9 @@ from collections.abc import Generator from typing import Optional, Union -from model_providers.core.model_runtime.entities.llm_entities import LLMResult -from model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool -from model_providers.core.model_runtime.model_providers.openai_api_compatible.llm.llm import OAIAPICompatLargeLanguageModel +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool +from chatchat_model_providers.core.model_runtime.model_providers.openai_api_compatible.llm.llm import OAIAPICompatLargeLanguageModel class MistralAILargeLanguageModel(OAIAPICompatLargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-large-latest.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-large-latest.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-large-latest.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-large-latest.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-medium-latest.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-medium-latest.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-medium-latest.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-medium-latest.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-small-latest.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-small-latest.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-small-latest.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/mistral-small-latest.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/open-mistral-7b.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/open-mistral-7b.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/open-mistral-7b.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/open-mistral-7b.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/open-mixtral-8x7b.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/open-mixtral-8x7b.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/llm/open-mixtral-8x7b.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/llm/open-mixtral-8x7b.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/mistralai.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/mistralai.py similarity index 73% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/mistralai.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/mistralai.py index 239556be..1ff0d020 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/mistralai.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/mistralai.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/mistralai/mistralai.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/mistralai.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/mistralai/mistralai.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/mistralai/mistralai.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/model_provider_factory.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/model_provider_factory.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/model_providers/model_provider_factory.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/model_provider_factory.py index ed46dc30..100c32af 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/model_provider_factory.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/model_provider_factory.py @@ -5,12 +5,12 @@ from typing import Optional from pydantic import BaseModel -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.entities.provider_entities import ProviderConfig, ProviderEntity, SimpleProviderEntity -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider -from model_providers.core.model_runtime.schema_validators.model_credential_schema_validator import ModelCredentialSchemaValidator -from model_providers.core.model_runtime.schema_validators.provider_credential_schema_validator import ProviderCredentialSchemaValidator -from model_providers.core.utils.position_helper import get_position_map, sort_to_dict_by_position_map +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.entities.provider_entities import ProviderConfig, ProviderEntity, SimpleProviderEntity +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.schema_validators.model_credential_schema_validator import ModelCredentialSchemaValidator +from chatchat_model_providers.core.model_runtime.schema_validators.provider_credential_schema_validator import ProviderCredentialSchemaValidator +from chatchat_model_providers.core.utils.position_helper import get_position_map, sort_to_dict_by_position_map logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/moderation/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/moderation/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/_assets/icon_l_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/_assets/icon_l_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/_assets/icon_l_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/_assets/icon_l_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/_assets/icon_s_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/_assets/icon_s_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/_assets/icon_s_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/_assets/icon_s_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/speech2text/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/speech2text/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py similarity index 75% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py index f4fae7f6..ce0bdd4b 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py @@ -1,9 +1,9 @@ from collections.abc import Generator from typing import Optional, Union -from model_providers.core.model_runtime.entities.llm_entities import LLMResult -from model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool -from model_providers.core.model_runtime.model_providers.openai_api_compatible.llm.llm import OAIAPICompatLargeLanguageModel +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool +from chatchat_model_providers.core.model_runtime.model_providers.openai_api_compatible.llm.llm import OAIAPICompatLargeLanguageModel class MoonshotLargeLanguageModel(OAIAPICompatLargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-128k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-128k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-128k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-128k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-32k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-32k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-32k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-32k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-8k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-8k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-8k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/llm/moonshot-v1-8k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/moonshot.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/moonshot.py similarity index 73% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/moonshot.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/moonshot.py index d8369bba..6932c77d 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/moonshot.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/moonshot.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/moonshot/moonshot.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/moonshot.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/moonshot/moonshot.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/moonshot/moonshot.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/tts/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/tts/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/llm/llm.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/llm/llm.py index 8132afad..5573b7c1 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/llm/llm.py @@ -8,8 +8,8 @@ from urllib.parse import urljoin import requests -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, ImagePromptMessageContent, PromptMessage, @@ -19,7 +19,7 @@ from model_providers.core.model_runtime.entities.message_entities import ( TextPromptMessageContent, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, DefaultParameterName, FetchFrom, @@ -31,7 +31,7 @@ from model_providers.core.model_runtime.entities.model_entities import ( ParameterType, PriceConfig, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -39,8 +39,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/ollama.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/ollama.py similarity index 78% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/ollama.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/ollama.py index 9701248e..c6c5f8cf 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/ollama/ollama.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/ollama.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/ollama.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/ollama.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/ollama.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/ollama.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py similarity index 92% rename from model_providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py index 3376a081..7f753260 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py @@ -8,8 +8,8 @@ from urllib.parse import urljoin import numpy as np import requests -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, FetchFrom, ModelPropertyKey, @@ -17,8 +17,8 @@ from model_providers.core.model_runtime.entities.model_entities import ( PriceConfig, PriceType, ) -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -26,8 +26,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/_common.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/_common.py similarity index 96% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/_common.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/_common.py index 81676b07..23bebe66 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai/_common.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/_common.py @@ -1,7 +1,7 @@ import openai from httpx import Timeout -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-0125.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-0125.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-0125.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-0125.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-0613.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-0613.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-0613.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-0613.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-1106.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-1106.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-1106.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-1106.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-16k-0613.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-16k-0613.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-16k-0613.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-16k-0613.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-16k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-16k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-16k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-16k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-instruct.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-instruct.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-instruct.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo-instruct.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-3.5-turbo.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-0125-preview.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-0125-preview.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-0125-preview.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-0125-preview.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-1106-preview.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-1106-preview.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-1106-preview.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-1106-preview.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-32k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-32k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-32k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-32k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-turbo-preview.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-turbo-preview.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-turbo-preview.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-turbo-preview.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-vision-preview.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-vision-preview.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-vision-preview.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4-vision-preview.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/gpt-4.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/gpt-4.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/llm.py similarity index 98% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/llm.py index 4fd03630..d639d1a7 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/llm.py @@ -9,9 +9,9 @@ from openai.types.chat import ChatCompletion, ChatCompletionChunk, ChatCompletio from openai.types.chat.chat_completion_chunk import ChoiceDeltaFunctionCall, ChoiceDeltaToolCall from openai.types.chat.chat_completion_message import FunctionCall -from model_providers.core.model_runtime.callbacks.base_callback import Callback -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.callbacks.base_callback import Callback +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, ImagePromptMessageContent, PromptMessage, @@ -22,10 +22,10 @@ from model_providers.core.model_runtime.entities.message_entities import ( ToolPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, I18nObject, ModelType, PriceConfig -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, I18nObject, ModelType, PriceConfig +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/llm/text-davinci-003.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/text-davinci-003.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/llm/text-davinci-003.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/llm/text-davinci-003.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/moderation/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/moderation/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py similarity index 89% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py index 7301399c..87673338 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py @@ -3,10 +3,10 @@ from typing import Optional from openai import OpenAI from openai.types import ModerationCreateResponse -from model_providers.core.model_runtime.entities.model_entities import ModelPropertyKey -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.moderation_model import ModerationModel -from model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelPropertyKey +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.moderation_model import ModerationModel +from chatchat_model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI class OpenAIModerationModel(_CommonOpenAI, ModerationModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/moderation/text-moderation-stable.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/moderation/text-moderation-stable.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/moderation/text-moderation-stable.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/moderation/text-moderation-stable.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/openai.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/openai.py similarity index 76% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/openai.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/openai.py index a6fe87e4..6c7b3f63 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai/openai.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/openai.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/openai.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/openai.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/openai.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/openai.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/speech2text/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/speech2text/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/speech2text/speech2text.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/speech2text/speech2text.py similarity index 84% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/speech2text/speech2text.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/speech2text/speech2text.py index 0570d55f..71dcab2e 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai/speech2text/speech2text.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/speech2text/speech2text.py @@ -2,9 +2,9 @@ from typing import IO, Optional from openai import OpenAI -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel -from model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel +from chatchat_model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI class OpenAISpeech2TextModel(_CommonOpenAI, Speech2TextModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/speech2text/whisper-1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/speech2text/whisper-1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/speech2text/whisper-1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/speech2text/whisper-1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-3-large.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-3-large.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-3-large.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-3-large.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-3-small.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-3-small.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-3-small.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-3-small.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-ada-002.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-ada-002.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-ada-002.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text-embedding-ada-002.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py similarity index 92% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py index 14f95eed..0bc3108e 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py @@ -6,11 +6,11 @@ import numpy as np import tiktoken from openai import OpenAI -from model_providers.core.model_runtime.entities.model_entities import PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI +from chatchat_model_providers.core.model_runtime.entities.model_entities import PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI class OpenAITextEmbeddingModel(_CommonOpenAI, TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/tts/tts-1-hd.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/tts-1-hd.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/tts/tts-1-hd.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/tts-1-hd.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/tts/tts-1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/tts-1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/tts/tts-1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/tts-1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai/tts/tts.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/tts.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/model_providers/openai/tts/tts.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/tts.py index c44b6ca7..6b796de5 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai/tts/tts.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai/tts/tts.py @@ -6,11 +6,11 @@ from typing import Optional from openai import OpenAI from pydub import AudioSegment from fastapi.responses import StreamingResponse -from model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.tts_model import TTSModel -from model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI -from model_providers.extensions.ext_storage import storage +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.tts_model import TTSModel +from chatchat_model_providers.core.model_runtime.model_providers.openai._common import _CommonOpenAI +from chatchat_model_providers.extensions.ext_storage import storage class OpenAIText2SpeechModel(_CommonOpenAI, TTSModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py similarity index 95% rename from model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py index 81bb3267..c14979d3 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py @@ -1,7 +1,7 @@ import requests -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py index e33c185d..9dfe080b 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py @@ -7,9 +7,9 @@ from urllib.parse import urljoin import requests -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, ImagePromptMessageContent, PromptMessage, @@ -21,7 +21,7 @@ from model_providers.core.model_runtime.entities.message_entities import ( ToolPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, DefaultParameterName, FetchFrom, @@ -32,11 +32,11 @@ from model_providers.core.model_runtime.entities.model_entities import ( ParameterType, PriceConfig, ) -from model_providers.core.model_runtime.errors.invoke import InvokeError -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.openai_api_compatible._common import _CommonOAI_API_Compat -from model_providers.core.model_runtime.utils import helper +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeError +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.openai_api_compatible._common import _CommonOAI_API_Compat +from chatchat_model_providers.core.model_runtime.utils import helper logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.py similarity index 62% rename from model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.py index 84e48463..cc105ec9 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py similarity index 92% rename from model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py index 78a0846e..c5ea9b32 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py @@ -7,8 +7,8 @@ from urllib.parse import urljoin import numpy as np import requests -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, FetchFrom, ModelPropertyKey, @@ -16,10 +16,10 @@ from model_providers.core.model_runtime.entities.model_entities import ( PriceConfig, PriceType, ) -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.openai_api_compatible._common import _CommonOAI_API_Compat +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.openai_api_compatible._common import _CommonOAI_API_Compat class OAICompatEmbeddingModel(_CommonOAI_API_Compat, TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/togetherai/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/llm.py similarity index 91% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/llm.py index 84177585..8815bf54 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/llm.py @@ -1,14 +1,14 @@ from collections.abc import Generator -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, FetchFrom, ModelPropertyKey, @@ -16,7 +16,7 @@ from model_providers.core.model_runtime.entities.model_entities import ( ParameterRule, ParameterType, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -24,10 +24,10 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.openllm.llm.openllm_generate import OpenLLMGenerate, OpenLLMGenerateMessage -from model_providers.core.model_runtime.model_providers.openllm.llm.openllm_generate_errors import ( +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.openllm.llm.openllm_generate import OpenLLMGenerate, OpenLLMGenerateMessage +from chatchat_model_providers.core.model_runtime.model_providers.openllm.llm.openllm_generate_errors import ( BadRequestError, InsufficientAccountBalanceError, InternalServerError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate.py similarity index 98% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate.py index 79d0c478..3fc62d33 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate.py @@ -6,7 +6,7 @@ from typing import Any, Union from requests import Response, post from requests.exceptions import ConnectionError, InvalidSchema, MissingSchema -from model_providers.core.model_runtime.model_providers.openllm.llm.openllm_generate_errors import ( +from chatchat_model_providers.core.model_runtime.model_providers.openllm.llm.openllm_generate_errors import ( BadRequestError, InternalServerError, InvalidAuthenticationError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate_errors.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate_errors.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate_errors.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate_errors.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/openllm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/openllm.py similarity index 62% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/openllm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/openllm.py index 21c5fc22..33ccf483 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openllm/openllm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/openllm.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/openllm.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/openllm.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/openllm.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/openllm.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/togetherai/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/openllm/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/text_embedding/text_embedding.py similarity index 91% rename from model_providers/model_providers/core/model_runtime/model_providers/openllm/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/text_embedding/text_embedding.py index 920bfccc..2fbf8dfb 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/openllm/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/openllm/text_embedding/text_embedding.py @@ -5,9 +5,9 @@ from typing import Optional from requests import post from requests.exceptions import ConnectionError, InvalidSchema, MissingSchema -from model_providers.core.model_runtime.entities.model_entities import PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -15,8 +15,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel class OpenLLMTextEmbeddingModel(TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/_common.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/_common.py similarity index 75% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/_common.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/_common.py index 80a057fa..b4ecaadd 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/replicate/_common.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/_common.py @@ -1,6 +1,6 @@ from replicate.exceptions import ModelError, ReplicateError -from model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError, InvokeError +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError, InvokeError class _CommonReplicate: diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/llm/llm.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/llm/llm.py index 96be85e4..e119c7d2 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/replicate/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/llm/llm.py @@ -5,9 +5,9 @@ from replicate import Client as ReplicateClient from replicate.exceptions import ReplicateError from replicate.prediction import Prediction -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageRole, @@ -15,16 +15,16 @@ from model_providers.core.model_runtime.entities.message_entities import ( SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, FetchFrom, ModelPropertyKey, ModelType, ParameterRule, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.replicate._common import _CommonReplicate +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.replicate._common import _CommonReplicate class ReplicateLargeLanguageModel(_CommonReplicate, LargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/replicate.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/replicate.py similarity index 62% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/replicate.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/replicate.py index 77c0aca9..100e233b 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/replicate/replicate.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/replicate.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/replicate.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/replicate.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/replicate.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/replicate.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/tts/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/tts/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/replicate/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/text_embedding/text_embedding.py similarity index 88% rename from model_providers/model_providers/core/model_runtime/model_providers/replicate/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/text_embedding/text_embedding.py index 4a957a32..b0ac83ff 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/replicate/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/replicate/text_embedding/text_embedding.py @@ -4,12 +4,12 @@ from typing import Optional from replicate import Client as ReplicateClient -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType, PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.replicate._common import _CommonReplicate +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType, PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.replicate._common import _CommonReplicate class ReplicateEmbeddingModel(_CommonReplicate, TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/_assets/icon_l_zh.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/_assets/icon_l_zh.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/_assets/icon_l_zh.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/_assets/icon_l_zh.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/_client.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/_client.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/llm/_client.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/_client.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/_position.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/_position.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/llm/_position.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/_position.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/llm.py similarity index 94% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/llm.py index 383fb7c7..7c1958ad 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/llm.py @@ -2,15 +2,15 @@ import threading from collections.abc import Generator from typing import Optional, Union -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -18,8 +18,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel from ._client import SparkLLMClient diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/spark-1.5.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/spark-1.5.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/llm/spark-1.5.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/spark-1.5.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/spark-2.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/spark-2.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/llm/spark-2.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/spark-2.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/spark-3.5.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/spark-3.5.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/llm/spark-3.5.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/spark-3.5.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/llm/spark-3.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/spark-3.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/llm/spark-3.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/llm/spark-3.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/spark.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/spark.py similarity index 81% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/spark.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/spark.py index 247d83bb..cb45c98d 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/spark/spark.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/spark.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/spark/spark.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/spark.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/spark/spark.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/spark/spark.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/_assets/togetherai.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/_assets/togetherai.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/togetherai/_assets/togetherai.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/_assets/togetherai.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/_assets/togetherai_square.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/_assets/togetherai_square.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/togetherai/_assets/togetherai_square.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/_assets/togetherai_square.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/llm/llm.py similarity index 83% rename from model_providers/model_providers/core/model_runtime/model_providers/togetherai/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/llm/llm.py index 782ec228..54ffd1ee 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/llm/llm.py @@ -1,10 +1,10 @@ from collections.abc import Generator from typing import Optional, Union -from model_providers.core.model_runtime.entities.llm_entities import LLMResult -from model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity -from model_providers.core.model_runtime.model_providers.openai_api_compatible.llm.llm import OAIAPICompatLargeLanguageModel +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity +from chatchat_model_providers.core.model_runtime.model_providers.openai_api_compatible.llm.llm import OAIAPICompatLargeLanguageModel class TogetherAILargeLanguageModel(OAIAPICompatLargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/togetherai.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/togetherai.py similarity index 62% rename from model_providers/model_providers/core/model_runtime/model_providers/togetherai/togetherai.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/togetherai.py index 6226e9b8..2a561194 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/togetherai.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/togetherai.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/togetherai/togetherai.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/togetherai.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/togetherai/togetherai.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/togetherai/togetherai.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/rerank/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/rerank/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_l_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_l_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_l_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_l_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_l_zh.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_l_zh.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_l_zh.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_l_zh.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_s_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_s_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_s_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_assets/icon_s_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/_common.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_common.py similarity index 88% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/_common.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_common.py index aa2bf5c9..7b58e814 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/_common.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/_common.py @@ -1,4 +1,4 @@ -from model_providers.core.model_runtime.errors.invoke import InvokeError +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeError class _CommonTongyi: diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/_client.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/_client.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/_client.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/_client.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/llm.py similarity index 96% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/llm.py index f571ad76..5db29e27 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/llm.py @@ -13,16 +13,16 @@ from dashscope.common.error import ( ) from langchain.llms.tongyi import generate_with_retry, stream_generate_with_retry -from model_providers.core.model_runtime.callbacks.base_callback import Callback -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.callbacks.base_callback import Callback +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -30,8 +30,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel from ._client import EnhanceTongyi diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max-1201.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max-1201.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max-1201.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max-1201.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max-longcontext.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max-longcontext.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max-longcontext.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max-longcontext.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-max.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-plus.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-plus.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-plus.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-plus.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-turbo.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-turbo.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-turbo.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/llm/qwen-turbo.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/tongyi.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tongyi.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/tongyi.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tongyi.py index 25c7a2cf..2a15aef3 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/tongyi.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tongyi.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/tongyi.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tongyi.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/tongyi.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tongyi.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tts/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tts/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/tts/tts-1.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tts/tts-1.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/tts/tts-1.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tts/tts-1.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/tts/tts.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tts/tts.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/model_providers/tongyi/tts/tts.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tts/tts.py index 7818ec3f..62f94e61 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/tongyi/tts/tts.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/tongyi/tts/tts.py @@ -6,11 +6,11 @@ from typing import Optional import dashscope from pydub import AudioSegment from fastapi.responses import StreamingResponse -from model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.tts_model import TTSModel -from model_providers.core.model_runtime.model_providers.tongyi._common import _CommonTongyi -from model_providers.extensions.ext_storage import storage +from chatchat_model_providers.core.model_runtime.errors.invoke import InvokeBadRequestError +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.tts_model import TTSModel +from chatchat_model_providers.core.model_runtime.model_providers.tongyi._common import _CommonTongyi +from chatchat_model_providers.extensions.ext_storage import storage class TongyiText2SpeechModel(_CommonTongyi, TTSModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_l_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_l_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_l_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_l_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_l_zh.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_l_zh.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_l_zh.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_l_zh.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_s_en.png b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_s_en.png similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_s_en.png rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/_assets/icon_s_en.png diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-4.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-4.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-4.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-4.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-8k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-8k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-8k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-8k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-turbo.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-turbo.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-turbo.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot-turbo.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie-bot.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot.py similarity index 98% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot.py index e3fcd9db..ac22c1a9 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot.py @@ -7,8 +7,8 @@ from typing import Any, Union from requests import Response, post -from model_providers.core.model_runtime.entities.message_entities import PromptMessageTool -from model_providers.core.model_runtime.model_providers.wenxin.llm.ernie_bot_errors import ( +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessageTool +from chatchat_model_providers.core.model_runtime.model_providers.wenxin.llm.ernie_bot_errors import ( BadRequestError, InternalServerError, InvalidAPIKeyError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot_errors.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot_errors.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot_errors.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/ernie_bot_errors.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/llm.py similarity index 93% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/llm.py index 952dbbbf..6a64b888 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/llm/llm.py @@ -1,16 +1,16 @@ from collections.abc import Generator from typing import Optional, Union, cast -from model_providers.core.model_runtime.callbacks.base_callback import Callback -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.callbacks.base_callback import Callback +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -18,10 +18,10 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.wenxin.llm.ernie_bot import BaiduAccessToken, ErnieBotModel, ErnieMessage -from model_providers.core.model_runtime.model_providers.wenxin.llm.ernie_bot_errors import ( +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.wenxin.llm.ernie_bot import BaiduAccessToken, ErnieBotModel, ErnieMessage +from chatchat_model_providers.core.model_runtime.model_providers.wenxin.llm.ernie_bot_errors import ( BadRequestError, InsufficientAccountBalance, InternalServerError, diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/wenxin.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/wenxin.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/wenxin.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/wenxin.py index 01e194b5..570eb1a5 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/wenxin.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/wenxin.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/wenxin/wenxin.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/wenxin.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/wenxin/wenxin.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/wenxin/wenxin.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/llm/llm.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/llm/llm.py index 98d2d175..8a9d865b 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/xinference/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/llm/llm.py @@ -24,9 +24,9 @@ from xinference_client.client.restful.restful_client import ( RESTfulGenerateModelHandle, ) -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageTool, @@ -34,7 +34,7 @@ from model_providers.core.model_runtime.entities.message_entities import ( ToolPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.entities.model_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ( AIModelEntity, FetchFrom, ModelFeature, @@ -43,7 +43,7 @@ from model_providers.core.model_runtime.entities.model_entities import ( ParameterRule, ParameterType, ) -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -51,13 +51,13 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.xinference.xinference_helper import ( +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.xinference.xinference_helper import ( XinferenceHelper, XinferenceModelExtraParameter, ) -from model_providers.core.model_runtime.utils import helper +from chatchat_model_providers.core.model_runtime.utils import helper class XinferenceAILargeLanguageModel(LargeLanguageModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/rerank/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/rerank/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/rerank/rerank.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/rerank/rerank.py similarity index 89% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/rerank/rerank.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/rerank/rerank.py index 6d9fdb0f..c93efac4 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/xinference/rerank/rerank.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/rerank/rerank.py @@ -2,10 +2,10 @@ from typing import Optional from xinference_client.client.restful.restful_client import Client, RESTfulRerankModelHandle -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType -from model_providers.core.model_runtime.entities.rerank_entities import RerankDocument, RerankResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType +from chatchat_model_providers.core.model_runtime.entities.rerank_entities import RerankDocument, RerankResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -13,8 +13,8 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.rerank_model import RerankModel +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.rerank_model import RerankModel class XinferenceRerankModel(RerankModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py similarity index 89% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py index d56047a5..e8a0963a 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py @@ -3,10 +3,10 @@ from typing import Optional from xinference_client.client.restful.restful_client import Client, RESTfulEmbeddingModelHandle -from model_providers.core.model_runtime.entities.common_entities import I18nObject -from model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelPropertyKey, ModelType, PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.entities.common_entities import I18nObject +from chatchat_model_providers.core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelPropertyKey, ModelType, PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, @@ -14,9 +14,9 @@ from model_providers.core.model_runtime.errors.invoke import ( InvokeRateLimitError, InvokeServerUnavailableError, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.xinference.xinference_helper import XinferenceHelper +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.xinference.xinference_helper import XinferenceHelper class XinferenceTextEmbeddingModel(TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/xinference.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/xinference.py similarity index 63% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/xinference.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/xinference.py index 20fc4a5a..d7033316 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/xinference/xinference.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/xinference.py @@ -1,6 +1,6 @@ import logging -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/xinference.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/xinference.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/xinference.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/xinference.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/xinference/xinference_helper.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/xinference_helper.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/xinference/xinference_helper.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/xinference/xinference_helper.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_l_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_l_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_l_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_l_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_l_zh.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_l_zh.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_l_zh.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_l_zh.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_s_en.svg b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_s_en.svg similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_s_en.svg rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_assets/icon_s_en.svg diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_common.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_common.py similarity index 94% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_common.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_common.py index 840af233..939407b0 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/_common.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/_common.py @@ -1,4 +1,4 @@ -from model_providers.core.model_runtime.errors.invoke import ( +from chatchat_model_providers.core.model_runtime.errors.invoke import ( InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError, diff --git a/model_providers/model_providers/core/model_runtime/schema_validators/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/schema_validators/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_lite.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_lite.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_lite.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_lite.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_lite_32k.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_lite_32k.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_lite_32k.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_lite_32k.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_pro.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_pro.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_pro.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_pro.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_std.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_std.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_std.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_std.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_turbo.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_turbo.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_turbo.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/chatglm_turbo.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_3_turbo.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_3_turbo.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_3_turbo.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_3_turbo.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_4.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_4.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_4.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_4.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_4v.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_4v.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_4v.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/glm_4v.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/llm.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/llm.py similarity index 95% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/llm.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/llm.py index 8e64f283..5f3101d0 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/llm/llm.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/llm/llm.py @@ -1,8 +1,8 @@ from collections.abc import Generator from typing import Optional, Union -from model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta -from model_providers.core.model_runtime.entities.message_entities import ( +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta +from chatchat_model_providers.core.model_runtime.entities.message_entities import ( AssistantPromptMessage, PromptMessage, PromptMessageContentType, @@ -11,13 +11,13 @@ from model_providers.core.model_runtime.entities.message_entities import ( SystemPromptMessage, UserPromptMessage, ) -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.zhipuai._common import _CommonZhipuaiAI -from model_providers.core.model_runtime.model_providers.zhipuai.zhipuai_sdk._client import ZhipuAI -from model_providers.core.model_runtime.model_providers.zhipuai.zhipuai_sdk.types.chat.chat_completion import Completion -from model_providers.core.model_runtime.model_providers.zhipuai.zhipuai_sdk.types.chat.chat_completion_chunk import ChatCompletionChunk -from model_providers.core.model_runtime.utils import helper +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.zhipuai._common import _CommonZhipuaiAI +from chatchat_model_providers.core.model_runtime.model_providers.zhipuai.zhipuai_sdk._client import ZhipuAI +from chatchat_model_providers.core.model_runtime.model_providers.zhipuai.zhipuai_sdk.types.chat.chat_completion import Completion +from chatchat_model_providers.core.model_runtime.model_providers.zhipuai.zhipuai_sdk.types.chat.chat_completion_chunk import ChatCompletionChunk +from chatchat_model_providers.core.model_runtime.utils import helper GLM_JSON_MODE_PROMPT = """You should always follow the instructions and output a valid JSON object. The structure of the JSON object you can found in the instructions, use {"answer": "$your_answer"} as the default structure diff --git a/model_providers/model_providers/core/model_runtime/utils/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/utils/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.py similarity index 86% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.py index 6d3df778..868fd8ce 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.py @@ -1,12 +1,12 @@ import time from typing import Optional -from model_providers.core.model_runtime.entities.model_entities import PriceType -from model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.zhipuai._common import _CommonZhipuaiAI -from model_providers.core.model_runtime.model_providers.zhipuai.zhipuai_sdk._client import ZhipuAI +from chatchat_model_providers.core.model_runtime.entities.model_entities import PriceType +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.zhipuai._common import _CommonZhipuaiAI +from chatchat_model_providers.core.model_runtime.model_providers.zhipuai.zhipuai_sdk._client import ZhipuAI class ZhipuAITextEmbeddingModel(_CommonZhipuaiAI, TextEmbeddingModel): diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.py similarity index 73% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.py index ca53d988..f59a3357 100644 --- a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.py @@ -1,8 +1,8 @@ import logging -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.errors.validate import CredentialsValidateFailedError +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.yaml b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.yaml similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.yaml rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai.yaml diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__version__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__version__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__version__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__version__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/__init__.py diff --git a/server/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/__init__.py similarity index 100% rename from server/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/async_completions.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/async_completions.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/async_completions.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/async_completions.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/chat.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/chat.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/chat.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/chat.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/completions.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/completions.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/completions.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/completions.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/embeddings.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/embeddings.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/embeddings.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/embeddings.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/files.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/files.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/files.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/files.py diff --git a/server/db/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/__init__.py similarity index 100% rename from server/db/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/fine_tuning.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/fine_tuning.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/fine_tuning.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/fine_tuning.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/jobs.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/jobs.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/jobs.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/jobs.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/images.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/images.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/images.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/images.py diff --git a/server/db/models/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/__init__.py similarity index 100% rename from server/db/models/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_api.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_api.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_api.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_api.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_type.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_type.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_type.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_type.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_errors.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_errors.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_errors.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_errors.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_files.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_files.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_files.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_files.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_http_client.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_http_client.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_http_client.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_http_client.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_jwt_token.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_jwt_token.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_jwt_token.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_jwt_token.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_request_opt.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_request_opt.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_request_opt.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_request_opt.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_response.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_response.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_response.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_response.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_utils.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_utils.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_utils.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_utils.py diff --git a/server/knowledge_base/kb_service/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/__init__.py similarity index 100% rename from server/knowledge_base/kb_service/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/__init__.py diff --git a/server/knowledge_base/kb_summary/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/__init__.py similarity index 100% rename from server/knowledge_base/kb_summary/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/async_chat_completion.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/async_chat_completion.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/async_chat_completion.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/async_chat_completion.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completion.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completion.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completion.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completion.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completion_chunk.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completion_chunk.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completion_chunk.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completion_chunk.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completions_create_param.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completions_create_param.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completions_create_param.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/chat/chat_completions_create_param.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/embeddings.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/embeddings.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/embeddings.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/embeddings.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/file_object.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/file_object.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/file_object.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/file_object.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/__init__.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job_event.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job_event.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job_event.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job_event.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/job_create_params.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/job_create_params.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/job_create_params.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/job_create_params.py diff --git a/model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/image.py b/model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/image.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/image.py rename to model-providers/chatchat_model_providers/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/image.py diff --git a/tests/kb_vector_db/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/schema_validators/__init__.py similarity index 100% rename from tests/kb_vector_db/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/schema_validators/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/schema_validators/common_validator.py b/model-providers/chatchat_model_providers/core/model_runtime/schema_validators/common_validator.py similarity index 97% rename from model_providers/model_providers/core/model_runtime/schema_validators/common_validator.py rename to model-providers/chatchat_model_providers/core/model_runtime/schema_validators/common_validator.py index fc8e4480..89977960 100644 --- a/model_providers/model_providers/core/model_runtime/schema_validators/common_validator.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/schema_validators/common_validator.py @@ -1,6 +1,6 @@ from typing import Optional -from model_providers.core.model_runtime.entities.provider_entities import CredentialFormSchema, FormType +from chatchat_model_providers.core.model_runtime.entities.provider_entities import CredentialFormSchema, FormType class CommonValidator: diff --git a/model_providers/model_providers/core/model_runtime/schema_validators/model_credential_schema_validator.py b/model-providers/chatchat_model_providers/core/model_runtime/schema_validators/model_credential_schema_validator.py similarity index 74% rename from model_providers/model_providers/core/model_runtime/schema_validators/model_credential_schema_validator.py rename to model-providers/chatchat_model_providers/core/model_runtime/schema_validators/model_credential_schema_validator.py index f65c56a1..8627311d 100644 --- a/model_providers/model_providers/core/model_runtime/schema_validators/model_credential_schema_validator.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/schema_validators/model_credential_schema_validator.py @@ -1,6 +1,6 @@ -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.entities.provider_entities import ModelCredentialSchema -from model_providers.core.model_runtime.schema_validators.common_validator import CommonValidator +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.entities.provider_entities import ModelCredentialSchema +from chatchat_model_providers.core.model_runtime.schema_validators.common_validator import CommonValidator class ModelCredentialSchemaValidator(CommonValidator): diff --git a/model_providers/model_providers/core/model_runtime/schema_validators/provider_credential_schema_validator.py b/model-providers/chatchat_model_providers/core/model_runtime/schema_validators/provider_credential_schema_validator.py similarity index 76% rename from model_providers/model_providers/core/model_runtime/schema_validators/provider_credential_schema_validator.py rename to model-providers/chatchat_model_providers/core/model_runtime/schema_validators/provider_credential_schema_validator.py index 4c121a94..0ffd7566 100644 --- a/model_providers/model_providers/core/model_runtime/schema_validators/provider_credential_schema_validator.py +++ b/model-providers/chatchat_model_providers/core/model_runtime/schema_validators/provider_credential_schema_validator.py @@ -1,5 +1,5 @@ -from model_providers.core.model_runtime.entities.provider_entities import ProviderCredentialSchema -from model_providers.core.model_runtime.schema_validators.common_validator import CommonValidator +from chatchat_model_providers.core.model_runtime.entities.provider_entities import ProviderCredentialSchema +from chatchat_model_providers.core.model_runtime.schema_validators.common_validator import CommonValidator class ProviderCredentialSchemaValidator(CommonValidator): diff --git a/webui_pages/__init__.py b/model-providers/chatchat_model_providers/core/model_runtime/utils/__init__.py similarity index 100% rename from webui_pages/__init__.py rename to model-providers/chatchat_model_providers/core/model_runtime/utils/__init__.py diff --git a/model_providers/model_providers/core/model_runtime/utils/_compat.py b/model-providers/chatchat_model_providers/core/model_runtime/utils/_compat.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/utils/_compat.py rename to model-providers/chatchat_model_providers/core/model_runtime/utils/_compat.py diff --git a/model_providers/model_providers/core/model_runtime/utils/encoders.py b/model-providers/chatchat_model_providers/core/model_runtime/utils/encoders.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/utils/encoders.py rename to model-providers/chatchat_model_providers/core/model_runtime/utils/encoders.py diff --git a/model_providers/model_providers/core/model_runtime/utils/helper.py b/model-providers/chatchat_model_providers/core/model_runtime/utils/helper.py similarity index 100% rename from model_providers/model_providers/core/model_runtime/utils/helper.py rename to model-providers/chatchat_model_providers/core/model_runtime/utils/helper.py diff --git a/model_providers/model_providers/core/utils/generic.py b/model-providers/chatchat_model_providers/core/utils/generic.py similarity index 100% rename from model_providers/model_providers/core/utils/generic.py rename to model-providers/chatchat_model_providers/core/utils/generic.py diff --git a/model_providers/model_providers/core/utils/json_dumps.py b/model-providers/chatchat_model_providers/core/utils/json_dumps.py similarity index 100% rename from model_providers/model_providers/core/utils/json_dumps.py rename to model-providers/chatchat_model_providers/core/utils/json_dumps.py diff --git a/model_providers/model_providers/core/utils/position_helper.py b/model-providers/chatchat_model_providers/core/utils/position_helper.py similarity index 100% rename from model_providers/model_providers/core/utils/position_helper.py rename to model-providers/chatchat_model_providers/core/utils/position_helper.py diff --git a/model_providers/model_providers/extensions/ext_redis.py b/model-providers/chatchat_model_providers/extensions/ext_redis.py similarity index 100% rename from model_providers/model_providers/extensions/ext_redis.py rename to model-providers/chatchat_model_providers/extensions/ext_redis.py diff --git a/model_providers/model_providers/extensions/ext_storage.py b/model-providers/chatchat_model_providers/extensions/ext_storage.py similarity index 100% rename from model_providers/model_providers/extensions/ext_storage.py rename to model-providers/chatchat_model_providers/extensions/ext_storage.py diff --git a/model-providers/poetry.toml b/model-providers/poetry.toml new file mode 100644 index 00000000..42159b24 --- /dev/null +++ b/model-providers/poetry.toml @@ -0,0 +1,5 @@ +[virtualenvs] +in-project = true + +[installer] +modern-installation = false diff --git a/model-providers/pyproject.toml b/model-providers/pyproject.toml new file mode 100644 index 00000000..264e1d42 --- /dev/null +++ b/model-providers/pyproject.toml @@ -0,0 +1,191 @@ +[tool.poetry] +name = "chatchat-model-providers" +version = "0.3.0" +description = "" +authors = ["glide-the <2533736852@qq.com>"] +readme = "README.md" + +[tool.poetry.dependencies] +python = ">=3.9,<4.0,!=3.9.7" +transformers = "4.31.0" +fastapi = "^0.109.2" +uvicorn = ">=0.27.0.post1" +sse-starlette = "^1.8.2" +pyyaml = "6.0.1" +pydantic = "1.10.14" +redis = "4.5.4" +# modle_runtime +openai = "1.13.3" +tiktoken = "0.5.2" +pydub = "0.25.1" +boto3 = "1.28.17" +[tool.poetry.group.test.dependencies] +# The only dependencies that should be added are +# dependencies used for running tests (e.g., pytest, freezegun, response). +# Any dependencies that do not meet that criteria will be removed. +pytest = "^7.3.0" +pytest-cov = "^4.0.0" +pytest-dotenv = "^0.5.2" +duckdb-engine = "^0.7.0" +pytest-watcher = "^0.2.6" +freezegun = "^1.2.2" +responses = "^0.22.0" +pytest-asyncio = "^0.20.3" +lark = "^1.1.5" +pandas = "^2.0.0" +pytest-mock = "^3.10.0" +pytest-socket = "^0.6.0" +syrupy = "^4.0.2" + + + +[tool.poetry.group.lint] +optional = true + +[tool.poetry.group.lint.dependencies] +ruff = "^0.1.5" + + + +[tool.poetry.group.dev] +optional = true + +[tool.poetry.group.dev.dependencies] +jupyter = "^1.0.0" +setuptools = "^67.6.1" + +[tool.poetry.extras] +cli = ["typer"] + +# An extra used to be able to add extended testing. +# Please use new-line on formatting to make it easier to add new packages without +# merge-conflicts +extended_testing = [ + "aleph-alpha-client", + "aiosqlite", + "assemblyai", + "beautifulsoup4", + "bibtexparser", + "cassio", + "chardet", + "datasets", + "google-cloud-documentai", + "esprima", + "jq", + "pdfminer-six", + "pgvector", + "pypdf", + "pymupdf", + "pypdfium2", + "tqdm", + "lxml", + "atlassian-python-api", + "mwparserfromhell", + "mwxml", + "msal", + "pandas", + "telethon", + "psychicapi", + "gql", + "gradientai", + "requests-toolbelt", + "html2text", + "numexpr", + "py-trello", + "scikit-learn", + "streamlit", + "pyspark", + "openai", + "sympy", + "rapidfuzz", + "jsonschema", + "rank-bm25", + "geopandas", + "jinja2", + "gitpython", + "newspaper3k", + "nvidia-riva-client", + "feedparser", + "xata", + "xmltodict", + "faiss-cpu", + "openapi-pydantic", + "markdownify", + "arxiv", + "sqlite-vss", + "rapidocr-onnxruntime", + "motor", + "timescale-vector", + "anthropic", + "upstash-redis", + "rspace_client", + "fireworks-ai", + "javelin-sdk", + "hologres-vector", + "praw", + "databricks-vectorsearch", + "cloudpickle", + "dgml-utils", + "cohere", + "tree-sitter", + "tree-sitter-languages", + "azure-ai-documentintelligence", + "oracle-ads", + "zhipuai", + "httpx", + "elasticsearch", + "hdbcli", + "oci", + "rdflib", + "tidb-vector", + "cloudpickle", + "friendli-client" +] + +[tool.ruff] +exclude = [ + "tests/examples/non-utf8-encoding.py", + "tests/integration_tests/examples/non-utf8-encoding.py", +] + +[tool.ruff.lint] +select = [ + "E", # pycodestyle + "F", # pyflakes + "I", # isort + "T201", # print +] + +[tool.mypy] +ignore_missing_imports = "True" +disallow_untyped_defs = "True" +exclude = ["notebooks", "examples", "example_data"] + +[tool.coverage.run] +omit = [ + "tests/*", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.pytest.ini_options] +# --strict-markers will raise errors on unknown marks. +# https://docs.pytest.org/en/7.1.x/how-to/mark.html#raising-errors-on-unknown-marks +# +# https://docs.pytest.org/en/7.1.x/reference/reference.html +# --strict-config any warnings encountered while parsing the `pytest` +# section of the configuration file raise errors. +# +# https://github.com/tophat/syrupy +# --snapshot-warn-unused Prints a warning on unused snapshots rather than fail the test suite. +addopts = "--strict-markers --strict-config --durations=5 --snapshot-warn-unused -vv" +# Registering custom markers. +# https://docs.pytest.org/en/7.1.x/example/markers.html#registering-markers +markers = [ + "requires: mark tests as requiring a specific library", + "scheduled: mark tests to run in scheduled testing", + "compile: mark placeholder test used to compile integration tests without running them" +] +asyncio_mode = "auto" \ No newline at end of file diff --git a/model_providers/model_providers/core/bootstrap/__init__.py b/model_providers/model_providers/core/bootstrap/__init__.py deleted file mode 100644 index 1d45692b..00000000 --- a/model_providers/model_providers/core/bootstrap/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ - -from model_providers.core.bootstrap.base import Bootstrap, OpenAIBootstrapBaseWeb -from model_providers.core.bootstrap.bootstrap_register import bootstrap_register -__all__ = [ - "bootstrap_register", - "Bootstrap", - "OpenAIBootstrapBaseWeb", -] diff --git a/model_providers/model_providers/core/model_runtime/model_providers/__init__.py b/model_providers/model_providers/core/model_runtime/model_providers/__init__.py deleted file mode 100644 index f3578b0f..00000000 --- a/model_providers/model_providers/core/model_runtime/model_providers/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from model_providers.core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory - -model_provider_factory = ModelProviderFactory() diff --git a/model_providers/pyproject.toml b/model_providers/pyproject.toml deleted file mode 100644 index 58546f71..00000000 --- a/model_providers/pyproject.toml +++ /dev/null @@ -1,60 +0,0 @@ -[tool.poetry] -name = "model_providers" -version = "0.1.0" -description = "" -authors = ["glide-the <2533736852@qq.com>"] -readme = "README.md" - -[tool.poetry.dependencies] -python = "^3.10" -transformers = "4.31.0" -fastapi = "^0.108" -uvicorn = "0.25.0" -sse-starlette = "^1.8.2" -pyyaml = "6.0.1" -pydantic = "1.10.14" -redis = "4.5.4" -# modle_runtime -openai = "1.13.3" -tiktoken = "0.5.2" -pydub = "0.25.1" -boto3 = "1.28.17" -[tool.poetry.group.test.dependencies] -# The only dependencies that should be added are -# dependencies used for running tests (e.g., pytest, freezegun, response). -# Any dependencies that do not meet that criteria will be removed. -pytest = "^7.3.0" -pytest-cov = "^4.0.0" -pytest-dotenv = "^0.5.2" -duckdb-engine = "^0.7.0" -pytest-watcher = "^0.2.6" -freezegun = "^1.2.2" -responses = "^0.22.0" -pytest-asyncio = "^0.20.3" -lark = "^1.1.5" -pandas = "^2.0.0" -pytest-mock = "^3.10.0" -pytest-socket = "^0.6.0" -syrupy = "^4.0.2" - -[build-system] -requires = ["poetry-core"] -build-backend = "poetry.core.masonry.api" - -[tool.pytest.ini_options] -# --strict-markers will raise errors on unknown marks. -# https://docs.pytest.org/en/7.1.x/how-to/mark.html#raising-errors-on-unknown-marks -# -# https://docs.pytest.org/en/7.1.x/reference/reference.html -# --strict-config any warnings encountered while parsing the `pytest` -# section of the configuration file raise errors. -# -# https://github.com/tophat/syrupy -# --snapshot-warn-unused Prints a warning on unused snapshots rather than fail the test suite. -addopts = "--strict-markers --strict-config --durations=5 --snapshot-warn-unused" -# Registering custom markers. -# https://docs.pytest.org/en/7.1.x/example/markers.html#registering-markers -markers = [ - "requires: mark tests as requiring a specific library", - "scheduled: mark tests to run in scheduled testing", -] diff --git a/poetry.toml b/poetry.toml new file mode 100644 index 00000000..42159b24 --- /dev/null +++ b/poetry.toml @@ -0,0 +1,5 @@ +[virtualenvs] +in-project = true + +[installer] +modern-installation = false diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..805beab5 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,51 @@ +[tool.poetry] +name = "Langchain-Chatchat" +version = "0.3.0" +description = "Langchain-Chatchat" +authors = ["chatchat"] +license = "MIT" +readme = "README.md" +repository = "https://github.com/chatchat-space/Langchain-Chatchat.git" + + +[tool.poetry.dependencies] +python = ">=3.9,<4.0,!=3.9.7" + + +[tool.poetry.group.lint.dependencies] +ruff = "^0.1.5" +chatchat-model-providers = { path = "model-providers", develop = true } +chatchat-server = { path = "chatchat-server", develop = true } +chatchat-webui-pages = { path = "webui-pages", develop = true } +chatchat = { path = "chatchat", develop = true } + + + +[tool.poetry.group.dev.dependencies] +chatchat-model-providers = { path = "model-providers", develop = true } +chatchat-server = { path = "chatchat-server", develop = true } +chatchat = { path = "chatchat", develop = true } +ipykernel = "^6.29.2" + +[tool.poetry.group.test.dependencies] + + +[tool.ruff] +extend-include = ["*.ipynb"] +extend-exclude = [ + "docs/docs/expression_language/why.ipynb" # TODO: look into why linter errors +] + +[tool.ruff.lint.per-file-ignores] +"**/{cookbook,docs}/*" = [ + "E402", # allow imports to appear anywhere in docs + "F401", # allow "imported but unused" example code + "F811", # allow re-importing the same module, so that cells can stay independent + "F841", # allow assignments to variables that are never read -- it's example code +] + +# These files were failing the listed rules at the time ruff was adopted for notebooks. +# Don't require them to change at once, though we should look into them eventually. +"cookbook/gymnasium_agent_simulation.ipynb" = ["F821"] +"docs/docs/integrations/document_loaders/tensorflow_datasets.ipynb" = ["F821"] + diff --git a/webui-pages/README.md b/webui-pages/README.md new file mode 100644 index 00000000..52a2b73b --- /dev/null +++ b/webui-pages/README.md @@ -0,0 +1,10 @@ +git mv .\chatchat\chatchat\webui_pages\dialogue .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\knowledge_base .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\model_config .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\openai_plugins .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\__init__.py .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\loom_view_client.py .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\utils.py .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\ .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\ .\webui-pages\chatchat_webui_pages\ +git mv .\chatchat\chatchat\webui_pages\ .\webui-pages\chatchat_webui_pages\ diff --git a/webui_pages/dialogue/__init__.py b/webui-pages/chatchat_webui_pages/__init__.py similarity index 100% rename from webui_pages/dialogue/__init__.py rename to webui-pages/chatchat_webui_pages/__init__.py diff --git a/webui-pages/chatchat_webui_pages/dialogue/__init__.py b/webui-pages/chatchat_webui_pages/dialogue/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/webui_pages/dialogue/dialogue.py b/webui-pages/chatchat_webui_pages/dialogue/dialogue.py similarity index 97% rename from webui_pages/dialogue/dialogue.py rename to webui-pages/chatchat_webui_pages/dialogue/dialogue.py index 134d6e14..a3387526 100644 --- a/webui_pages/dialogue/dialogue.py +++ b/webui-pages/chatchat_webui_pages/dialogue/dialogue.py @@ -3,10 +3,10 @@ import base64 import streamlit as st from streamlit_antd_components.utils import ParseItems -from webui_pages.dialogue.utils import process_files -# from webui_pages.loom_view_client import build_providers_model_plugins_name, find_menu_items_by_index, set_llm_select, \ +from chatchat_webui_pages.dialogue.utils import process_files +# from chatchat_webui_pages.loom_view_client import build_providers_model_plugins_name, find_menu_items_by_index, set_llm_select, \ # get_select_model_endpoint -from webui_pages.utils import * +from chatchat_webui_pages.utils import * from streamlit_chatbox import * from streamlit_modal import Modal from datetime import datetime @@ -14,8 +14,8 @@ import os import re import time from configs import (LLM_MODEL_CONFIG, SUPPORT_AGENT_MODELS, MODEL_PLATFORMS, TOOL_CONFIG) -from server.callback_handler.agent_callback_handler import AgentStatus -from server.utils import MsgType, get_config_models +from chatchat_server.callback_handler.agent_callback_handler import AgentStatus +from chatchat_server.utils import MsgType, get_config_models import uuid from typing import List, Dict diff --git a/webui_pages/dialogue/utils.py b/webui-pages/chatchat_webui_pages/dialogue/utils.py similarity index 100% rename from webui_pages/dialogue/utils.py rename to webui-pages/chatchat_webui_pages/dialogue/utils.py diff --git a/webui_pages/knowledge_base/__init__.py b/webui-pages/chatchat_webui_pages/knowledge_base/__init__.py similarity index 100% rename from webui_pages/knowledge_base/__init__.py rename to webui-pages/chatchat_webui_pages/knowledge_base/__init__.py diff --git a/webui_pages/knowledge_base/knowledge_base.py b/webui-pages/chatchat_webui_pages/knowledge_base/knowledge_base.py similarity index 97% rename from webui_pages/knowledge_base/knowledge_base.py rename to webui-pages/chatchat_webui_pages/knowledge_base/knowledge_base.py index e6212063..0c28b0ea 100644 --- a/webui_pages/knowledge_base/knowledge_base.py +++ b/webui-pages/chatchat_webui_pages/knowledge_base/knowledge_base.py @@ -1,18 +1,18 @@ import streamlit as st from streamlit_antd_components.utils import ParseItems -# from webui_pages.loom_view_client import build_providers_embedding_plugins_name, find_menu_items_by_index, \ +# from chatchat_webui_pages.loom_view_client import build_providers_embedding_plugins_name, find_menu_items_by_index, \ # set_llm_select, set_embed_select, get_select_embed_endpoint -from webui_pages.utils import * +from chatchat_webui_pages.utils import * from st_aggrid import AgGrid, JsCode from st_aggrid.grid_options_builder import GridOptionsBuilder import pandas as pd -from server.knowledge_base.utils import get_file_path, LOADER_DICT -from server.knowledge_base.kb_service.base import get_kb_details, get_kb_file_details +from chatchat_server.knowledge_base.utils import get_file_path, LOADER_DICT +from chatchat_server.knowledge_base.kb_service.base import get_kb_details, get_kb_file_details from typing import Literal, Dict, Tuple from configs import (kbs_config, DEFAULT_VS_TYPE, CHUNK_SIZE, OVERLAP_SIZE, ZH_TITLE_ENHANCE) -from server.utils import get_config_models +from chatchat_server.utils import get_config_models import streamlit_antd_components as sac import os diff --git a/webui_pages/loom_view_client.py b/webui-pages/chatchat_webui_pages/loom_view_client.py similarity index 100% rename from webui_pages/loom_view_client.py rename to webui-pages/chatchat_webui_pages/loom_view_client.py diff --git a/webui_pages/model_config/__init__.py b/webui-pages/chatchat_webui_pages/model_config/__init__.py similarity index 100% rename from webui_pages/model_config/__init__.py rename to webui-pages/chatchat_webui_pages/model_config/__init__.py diff --git a/webui_pages/model_config/model_config.py b/webui-pages/chatchat_webui_pages/model_config/model_config.py similarity index 63% rename from webui_pages/model_config/model_config.py rename to webui-pages/chatchat_webui_pages/model_config/model_config.py index 119a6ca4..19aade26 100644 --- a/webui_pages/model_config/model_config.py +++ b/webui-pages/chatchat_webui_pages/model_config/model_config.py @@ -1,5 +1,5 @@ import streamlit as st -from webui_pages.utils import * +from chatchat_webui_pages.utils import * def model_config_page(api: ApiRequest): pass \ No newline at end of file diff --git a/webui_pages/openai_plugins/__init__.py b/webui-pages/chatchat_webui_pages/openai_plugins/__init__.py similarity index 100% rename from webui_pages/openai_plugins/__init__.py rename to webui-pages/chatchat_webui_pages/openai_plugins/__init__.py diff --git a/webui_pages/openai_plugins/base.py b/webui-pages/chatchat_webui_pages/openai_plugins/base.py similarity index 96% rename from webui_pages/openai_plugins/base.py rename to webui-pages/chatchat_webui_pages/openai_plugins/base.py index ffe85455..c529b4c8 100644 --- a/webui_pages/openai_plugins/base.py +++ b/webui-pages/chatchat_webui_pages/openai_plugins/base.py @@ -1,8 +1,8 @@ import streamlit as st from loom_openai_plugins_frontend import loom_openai_plugins_frontend -from webui_pages.utils import ApiRequest -from webui_pages.loom_view_client import ( +from chatchat_webui_pages.utils import ApiRequest +from chatchat_webui_pages.loom_view_client import ( update_store, start_plugin, start_worker, diff --git a/webui_pages/utils.py b/webui-pages/chatchat_webui_pages/utils.py similarity index 99% rename from webui_pages/utils.py rename to webui-pages/chatchat_webui_pages/utils.py index 8ff988a7..ff622b97 100644 --- a/webui_pages/utils.py +++ b/webui-pages/chatchat_webui_pages/utils.py @@ -20,7 +20,7 @@ import contextlib import json import os from io import BytesIO -from server.utils import set_httpx_config, api_address, get_httpx_client +from chatchat_server.utils import set_httpx_config, api_address, get_httpx_client from pprint import pprint diff --git a/webui-pages/poetry.toml b/webui-pages/poetry.toml new file mode 100644 index 00000000..42159b24 --- /dev/null +++ b/webui-pages/poetry.toml @@ -0,0 +1,5 @@ +[virtualenvs] +in-project = true + +[installer] +modern-installation = false diff --git a/webui-pages/pyproject.toml b/webui-pages/pyproject.toml new file mode 100644 index 00000000..22fc7d07 --- /dev/null +++ b/webui-pages/pyproject.toml @@ -0,0 +1,194 @@ +[tool.poetry] +name = "chatchat-webui-pages" +version = "0.3.0" +description = "" +authors = ["chatchat"] +readme = "README.md" + +[tool.poetry.dependencies] +python = ">=3.9,<4.0,!=3.9.7" +chatchat-model-providers = "^0.3.0" +chatchat-server = "^0.3.0" +streamlit = "1.30.0" +streamlit-option-menu = "0.3.12" +streamlit-antd-components = "0.3.1" +streamlit-chatbox = "1.1.11" +streamlit-modal = "0.1.0" +streamlit-aggrid = "0.3.4.post3" + + +[tool.poetry.group.test] +optional = true + +[tool.poetry.group.test.dependencies] +# The only dependencies that should be added are +# dependencies used for running tests (e.g., pytest, freezegun, response). +# Any dependencies that do not meet that criteria will be removed. +pytest = "^7.3.0" +pytest-cov = "^4.0.0" +pytest-dotenv = "^0.5.2" +duckdb-engine = "^0.7.0" +pytest-watcher = "^0.2.6" +freezegun = "^1.2.2" +responses = "^0.22.0" +pytest-asyncio = "^0.20.3" +lark = "^1.1.5" +pandas = "^2.0.0" +pytest-mock = "^3.10.0" +pytest-socket = "^0.6.0" +syrupy = "^4.0.2" +chatchat-model-providers = { path = "../model-providers", develop = true } +chatchat-server = { path = "../chatchat-server", develop = true } + +[tool.poetry.group.lint] +optional = true + +[tool.poetry.group.lint.dependencies] +ruff = "^0.1.5" + + + +[tool.poetry.group.dev] +optional = true + +[tool.poetry.group.dev.dependencies] +jupyter = "^1.0.0" +setuptools = "^67.6.1" +chatchat-model-providers = { path = "../model_providers", develop = true } +chatchat-server = { path = "../chatchat-server", develop = true } + +[tool.poetry.extras] +cli = ["typer"] + +# An extra used to be able to add extended testing. +# Please use new-line on formatting to make it easier to add new packages without +# merge-conflicts +extended_testing = [ + "aleph-alpha-client", + "aiosqlite", + "assemblyai", + "beautifulsoup4", + "bibtexparser", + "cassio", + "chardet", + "datasets", + "google-cloud-documentai", + "esprima", + "jq", + "pdfminer-six", + "pgvector", + "pypdf", + "pymupdf", + "pypdfium2", + "tqdm", + "lxml", + "atlassian-python-api", + "mwparserfromhell", + "mwxml", + "msal", + "pandas", + "telethon", + "psychicapi", + "gql", + "gradientai", + "requests-toolbelt", + "html2text", + "numexpr", + "py-trello", + "scikit-learn", + "streamlit", + "pyspark", + "openai", + "sympy", + "rapidfuzz", + "jsonschema", + "rank-bm25", + "geopandas", + "jinja2", + "gitpython", + "newspaper3k", + "nvidia-riva-client", + "feedparser", + "xata", + "xmltodict", + "faiss-cpu", + "openapi-pydantic", + "markdownify", + "arxiv", + "sqlite-vss", + "rapidocr-onnxruntime", + "motor", + "timescale-vector", + "anthropic", + "upstash-redis", + "rspace_client", + "fireworks-ai", + "javelin-sdk", + "hologres-vector", + "praw", + "databricks-vectorsearch", + "cloudpickle", + "dgml-utils", + "cohere", + "tree-sitter", + "tree-sitter-languages", + "azure-ai-documentintelligence", + "oracle-ads", + "zhipuai", + "httpx", + "elasticsearch", + "hdbcli", + "oci", + "rdflib", + "tidb-vector", + "cloudpickle", + "friendli-client" +] + +[tool.ruff] +exclude = [ + "tests/examples/non-utf8-encoding.py", + "tests/integration_tests/examples/non-utf8-encoding.py", +] + +[tool.ruff.lint] +select = [ + "E", # pycodestyle + "F", # pyflakes + "I", # isort + "T201", # print +] + +[tool.mypy] +ignore_missing_imports = "True" +disallow_untyped_defs = "True" +exclude = ["notebooks", "examples", "example_data"] + +[tool.coverage.run] +omit = [ + "tests/*", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.pytest.ini_options] +# --strict-markers will raise errors on unknown marks. +# https://docs.pytest.org/en/7.1.x/how-to/mark.html#raising-errors-on-unknown-marks +# +# https://docs.pytest.org/en/7.1.x/reference/reference.html +# --strict-config any warnings encountered while parsing the `pytest` +# section of the configuration file raise errors. +# +# https://github.com/tophat/syrupy +# --snapshot-warn-unused Prints a warning on unused snapshots rather than fail the test suite. +addopts = "--strict-markers --strict-config --durations=5 --snapshot-warn-unused -vv" +# Registering custom markers. +# https://docs.pytest.org/en/7.1.x/example/markers.html#registering-markers +markers = [ + "requires: mark tests as requiring a specific library", + "scheduled: mark tests to run in scheduled testing", + "compile: mark placeholder test used to compile integration tests without running them" +] +asyncio_mode = "auto" \ No newline at end of file