From c2b32a370b5cb84a0925f3516435515dd3ea2ad4 Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Mon, 10 Jun 2024 22:34:35 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=BC=96=E5=86=99=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/chatchat-server/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/chatchat-server/README.md b/libs/chatchat-server/README.md index 9345087a..7e00a061 100644 --- a/libs/chatchat-server/README.md +++ b/libs/chatchat-server/README.md @@ -22,6 +22,7 @@ options: -f FORMAT, --format FORMAT 日志格式 --clear 清除配置 + --show 显示配置 ``` > 查看配置 ```shell From 86e04f2d43c1e485faf8e6cba728e197447c3b9a Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Mon, 10 Jun 2024 22:40:33 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=BC=96=E5=86=99=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/chatchat-server/README_dev.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/chatchat-server/README_dev.md b/libs/chatchat-server/README_dev.md index b82bbaf3..8950866b 100644 --- a/libs/chatchat-server/README_dev.md +++ b/libs/chatchat-server/README_dev.md @@ -5,6 +5,10 @@ git clone https://github.com/chatchat-space/Langchain-Chatchat.git ``` +- 初始化开发环境 + +> [Code](../../docs/contributing/code.md): 源码配置可以帮助我们更快的寻找bug，或者改进基础设施。 + - 关于chatchat-config > chatchat-config由ConfigWorkSpace接口提供知识库配置载入存储 > @@ -33,10 +37,6 @@ ConfigWorkSpace是一个配置工作空间的抽象类，提供基础的配置 > 详细配置请参考[README.md](../model-providers/README.md) -- 初始化开发环境 - -> [Code](../../docs/contributing/code.md): 源码配置可以帮助我们更快的寻找bug，或者改进基础设施。 - - 初始化仓库 > 请注意：这个命令会清空数据库，如果您有重要数据，请备份 ```shell From b104aafe5042bb87527c8fcb22aaf3d16fd40766 Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Mon, 10 Jun 2024 22:53:42 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/chatchat-server/README.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/libs/chatchat-server/README.md b/libs/chatchat-server/README.md index 7e00a061..3ce95c58 100644 --- a/libs/chatchat-server/README.md +++ b/libs/chatchat-server/README.md @@ -42,8 +42,14 @@ options: ``` +### 模型服务配置 + 如果您已经有了一个openai endpoint的能力的地址，可以在`configs._model_config.py`文件中MODEL_PLATFORMS直接配置 + - platform_name 可以任意填写，不要重复即可 + - platform_type 以后可能根据平台类型做一些功能区分,与platform_name一致即可 + - 将框架部署的模型填写到对应列表即可。不同框架可以加载同名模型，项目会自动做负载均衡。 - - 自定义平台加载 +### 自定义平台加载 +可以通过 model_providers 提供转换不同平台的接口为openai endpoint的能力，启动后下面变量会自动增加相应的平台 > 配置*CHATCHAT_ROOT*文件夹configs中的`model_providers.yaml`文件，即可完成自定义平台加载 ```shell @@ -54,12 +60,20 @@ vim model_providers.yaml > > 详细配置请参考[README.md](../model-providers/README.md) -- 初始化知识库 +### 初始化知识库 ```shell chatchat-kb -r ``` -- 启动服务 +### 启动服务 ```shell chatchat -a ``` + +### 模型？ +```text +chatchat 0.3版本中，为保证平台、模型、及本地服务的兼容，在保证可扩展性的同时， +我们对模型的加载进行了重新设计. chatchat 0.3之后的版本，我们将分离模型加载和服务启动. 您可以使用提供了`openaiEndpoint`任何服务, +可以在`configs._model_config.py`文件中MODEL_PLATFORMS直接配置 + +``` From 322a6fda8d09945d707b3df7cf51eb4a3070241c Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Mon, 10 Jun 2024 22:56:00 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/chatchat-server/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/chatchat-server/README.md b/libs/chatchat-server/README.md index 3ce95c58..eba4bd1b 100644 --- a/libs/chatchat-server/README.md +++ b/libs/chatchat-server/README.md @@ -49,7 +49,7 @@ options: - 将框架部署的模型填写到对应列表即可。不同框架可以加载同名模型，项目会自动做负载均衡。 ### 自定义平台加载 -可以通过 model_providers 提供转换不同平台的接口为openai endpoint的能力，启动后下面变量会自动增加相应的平台 +可以通过 model_providers 提供转换不同平台的接口为openai endpoint的能力 > 配置*CHATCHAT_ROOT*文件夹configs中的`model_providers.yaml`文件，即可完成自定义平台加载 ```shell From fa0e058fb0f4c9a82308df093a338c6a1c73acf9 Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Mon, 10 Jun 2024 23:08:33 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/chatchat-server/pyproject.toml | 2 +- libs/model-providers/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/chatchat-server/pyproject.toml b/libs/chatchat-server/pyproject.toml index f97d07aa..49dd0be4 100644 --- a/libs/chatchat-server/pyproject.toml +++ b/libs/chatchat-server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langchain-chatchat" -version = "0.3.0.20240606" +version = "0.3.0.20240610" description = "" authors = ["chatchat"] readme = "README.md" diff --git a/libs/model-providers/pyproject.toml b/libs/model-providers/pyproject.toml index 14976752..1c4c7543 100644 --- a/libs/model-providers/pyproject.toml +++ b/libs/model-providers/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "model-providers" -version = "0.3.0.20240606" +version = "0.3.0.20240610" description = "" authors = ["glide-the <2533736852@qq.com>"] readme = "README.md" From b46ca3ed0b795cbf2e60b38a615451e64dab657b Mon Sep 17 00:00:00 2001 From: liunux4odoo Date: Mon, 10 Jun 2024 23:13:08 +0800 Subject: [PATCH 6/9] update tiktoken --- libs/model-providers/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/model-providers/pyproject.toml b/libs/model-providers/pyproject.toml index 1c4c7543..1613193b 100644 --- a/libs/model-providers/pyproject.toml +++ b/libs/model-providers/pyproject.toml @@ -17,7 +17,7 @@ pydantic ="~2.6.4" omegaconf = "~2.0.6" # modle_runtime openai = "~1.13.3" -tiktoken = "~0.5.2" +tiktoken = "~0.7.0" pydub = "~0.25.1" boto3 = "~1.28.17" From b68e1fc4c822332c97f01fc6f44bf1a5a9e057cf Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Tue, 11 Jun 2024 00:18:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?webui=E5=90=AF=E5=8A=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/chatchat-server/chatchat/startup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/chatchat-server/chatchat/startup.py b/libs/chatchat-server/chatchat/startup.py index 992864b3..a5fa7b54 100644 --- a/libs/chatchat-server/chatchat/startup.py +++ b/libs/chatchat-server/chatchat/startup.py @@ -133,7 +133,7 @@ def run_webui(model_platforms_shard: Dict, from streamlit.web import bootstrap except ImportError: from streamlit import bootstrap - + bootstrap.load_config_options(flag_options=flag_options) bootstrap.run(script_dir, False, args, flag_options) started_event.set() From 5d69298f2ae5559c9b2bc17b1919ffee6557c02f Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Tue, 11 Jun 2024 00:25:01 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/chatchat-server/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/chatchat-server/pyproject.toml b/libs/chatchat-server/pyproject.toml index 49dd0be4..4920a624 100644 --- a/libs/chatchat-server/pyproject.toml +++ b/libs/chatchat-server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langchain-chatchat" -version = "0.3.0.20240610" +version = "0.3.0.20240610.1" description = "" authors = ["chatchat"] readme = "README.md" From 117bc9c3e87509fbbe9f6924f24f3c6541c2a01b Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Tue, 11 Jun 2024 00:27:03 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/chatchat-server/pyproject.toml | 1 - libs/model-providers/pyproject.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/libs/chatchat-server/pyproject.toml b/libs/chatchat-server/pyproject.toml index 4920a624..00e986d7 100644 --- a/libs/chatchat-server/pyproject.toml +++ b/libs/chatchat-server/pyproject.toml @@ -121,7 +121,6 @@ extended_testing = [ "xmltodict", "faiss-cpu", "openapi-pydantic", - "markdownify", "arxiv", "sqlite-vss", "rapidocr-onnxruntime", diff --git a/libs/model-providers/pyproject.toml b/libs/model-providers/pyproject.toml index 1613193b..474216fd 100644 --- a/libs/model-providers/pyproject.toml +++ b/libs/model-providers/pyproject.toml @@ -113,7 +113,6 @@ extended_testing = [ "xmltodict", "faiss-cpu", "openapi-pydantic", - "markdownify", "arxiv", "sqlite-vss", "rapidocr-onnxruntime",