From e12107646fe7574622fe94db6f18cda6e532105d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Sep 2025 18:14:50 +0800 Subject: [PATCH 1/7] perf: Formatting of Assistant Workspace ID --- backend/apps/system/middleware/auth.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/apps/system/middleware/auth.py b/backend/apps/system/middleware/auth.py index 9a2e3fe1..3ea720c6 100644 --- a/backend/apps/system/middleware/auth.py +++ b/backend/apps/system/middleware/auth.py @@ -115,13 +115,13 @@ class TokenMiddleware(BaseHTTPMiddleware): assistant_info = AssistantHeader.model_validate(assistant_info.model_dump(exclude_unset=True)) if assistant_info and assistant_info.type == 0: if payload['oid']: - session_user.oid = payload['oid'] + session_user.oid = int(payload['oid']) else: assistant_oid = 1 configuration = assistant_info.configuration config_obj = json.loads(configuration) if configuration else {} assistant_oid = config_obj.get('oid', 1) - session_user.oid = assistant_oid + session_user.oid = int(assistant_oid) return True, session_user, assistant_info except Exception as e: From 8b66889727ab5fe8b3944ae64e89da584da3d007 Mon Sep 17 00:00:00 2001 From: ulleo Date: Wed, 3 Sep 2025 18:18:53 +0800 Subject: [PATCH 2/7] feat: remove models in default qwen config --- frontend/src/entity/supplier.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/frontend/src/entity/supplier.ts b/frontend/src/entity/supplier.ts index cd9ba5d6..75e9434c 100644 --- a/frontend/src/entity/supplier.ts +++ b/frontend/src/entity/supplier.ts @@ -49,17 +49,8 @@ export const supplierList: Array<{ { name: 'qwen-max-latest' }, { name: 'qwen-turbo' }, { name: 'qwen-turbo-latest' }, - { name: 'qwq-plus' }, - { name: 'qwq-plus-latest' }, { name: 'qwen-long' }, { name: 'qwen-long-latest' }, - { name: 'qwen-omni-turbo' }, - /* { name: 'qwen-omni-turbo-realtime' }, - { name: 'qwen-omni-turbo-realtime-latest' }, */ - /* { name: 'qvq-max' }, - { name: 'qvq-max-latest' }, - { name: 'qvq-plus' }, - { name: 'qvq-plus-latest' }, */ ], }, }, From 8fad448bbd5b7aae2e37eb327c637bc231a5a0ba Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Sep 2025 18:52:49 +0800 Subject: [PATCH 3/7] perf: Upgrade the version number to 1.1.0 --- backend/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/pyproject.toml b/backend/pyproject.toml index d031d8be..b2f69369 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "sqlbot" -version = "1.0.1" +version = "1.1.0" description = "" requires-python = "==3.11.*" dependencies = [ @@ -39,7 +39,7 @@ dependencies = [ "pyyaml (>=6.0.2,<7.0.0)", "fastapi-mcp (>=0.3.4,<0.4.0)", "tabulate>=0.9.0", - "sqlbot-xpack>=0.0.3.20,<1.0.0", + "sqlbot-xpack>=0.0.3.31,<1.0.0", "fastapi-cache2>=0.2.2", "sqlparse>=0.5.3", "redis>=6.2.0", From cd3054ed3849a9df70ce790e8b4f80aa4a50d55d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Sep 2025 18:57:56 +0800 Subject: [PATCH 4/7] perf: The advanced assistant application does not enable AES encryption by default --- backend/apps/system/crud/assistant.py | 2 +- frontend/src/views/system/embedded/iframe.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/apps/system/crud/assistant.py b/backend/apps/system/crud/assistant.py index 8e8f5745..b5d6381b 100644 --- a/backend/apps/system/crud/assistant.py +++ b/backend/apps/system/crud/assistant.py @@ -177,7 +177,7 @@ class AssistantOutDs: def convert2schema(self, ds_dict: dict, config: dict[any]) -> AssistantOutDsSchema: id_marker: str = '' attr_list = ['name', 'type', 'host', 'port', 'user', 'dataBase', 'schema'] - if config.get('encrypt', True): + if config.get('encrypt', False): key = config.get('aes_key', None) iv = config.get('aes_iv', None) aes_attrs = ['host', 'user', 'password', 'dataBase', 'db_schema'] diff --git a/frontend/src/views/system/embedded/iframe.vue b/frontend/src/views/system/embedded/iframe.vue index 0c050f76..1f6ca562 100644 --- a/frontend/src/views/system/embedded/iframe.vue +++ b/frontend/src/views/system/embedded/iframe.vue @@ -79,7 +79,7 @@ const certificateForm = reactive(cloneDeep(defaultCertificateForm)) const defaultUrlForm = { endpoint: '', - encrypt: true, + encrypt: false, aes_key: '', aes_iv: '', certificate: [] as any, From 110af92af60a5e4136d01ae005b9c91ce6435c50 Mon Sep 17 00:00:00 2001 From: junjun <752696511@qq.com> Date: Wed, 3 Sep 2025 21:34:04 +0800 Subject: [PATCH 5/7] build: allinone --- installer/install.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/installer/install.conf b/installer/install.conf index 53211023..7aaaabee 100644 --- a/installer/install.conf +++ b/installer/install.conf @@ -5,6 +5,20 @@ SQLBOT_BASE=/opt SQLBOT_WEB_PORT=8000 SQLBOT_MCP_PORT=8001 +# 数据库配置 +## 是否使用外部数据库 +SQLBOT_EXTERNAL_DB=false +## 数据库地址 +SQLBOT_DB_HOST=localhost +## 数据库端口 (仅使用外部数据库时才生效) +SQLBOT_DB_PORT=5432 +## SQLBot 数据库库名 +SQLBOT_DB_DB=sqlbot +## 数据库用户名 +SQLBOT_DB_USER=root +## 数据库密码，密码如包含特殊字符，请用双引号引起来，例如 SQLBOT_DB_PASSWORD="Test@4&^%*^" +SQLBOT_DB_PASSWORD=Password123@pg + # 其他配置 ## 普通用户默认密码 SQLBOT_DEFAULT_PWD=SQLBot@123456 From a02f9b6fa330a8f8bac08a5964949f7af36373ca Mon Sep 17 00:00:00 2001 From: junjun <752696511@qq.com> Date: Wed, 3 Sep 2025 21:50:43 +0800 Subject: [PATCH 6/7] build: allinone --- Dockerfile | 10 +++++----- installer/install.conf | 14 -------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4cd4ca77..8f84e1c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,11 +54,11 @@ ENV SQLBOT_HOME=/opt/sqlbot ENV PYTHONPATH=${SQLBOT_HOME}/app ENV PATH="${SQLBOT_HOME}/app/.venv/bin:$PATH" -ENV SQLBOT_DB_HOST=localhost -ENV SQLBOT_DB_PORT=5432 -ENV SQLBOT_DB_DB=sqlbot -ENV SQLBOT_DB_USER=root -ENV SQLBOT_DB_PASSWORD=Password123@pg +ENV POSTGRES_SERVER=localhost +ENV POSTGRES_PORT=5432 +ENV POSTGRES_DB=sqlbot +ENV POSTGRES_USER=root +ENV POSTGRES_PASSWORD=Password123@pg # Copy necessary files from builder COPY start.sh /opt/sqlbot/app/start.sh diff --git a/installer/install.conf b/installer/install.conf index 7aaaabee..53211023 100644 --- a/installer/install.conf +++ b/installer/install.conf @@ -5,20 +5,6 @@ SQLBOT_BASE=/opt SQLBOT_WEB_PORT=8000 SQLBOT_MCP_PORT=8001 -# 数据库配置 -## 是否使用外部数据库 -SQLBOT_EXTERNAL_DB=false -## 数据库地址 -SQLBOT_DB_HOST=localhost -## 数据库端口 (仅使用外部数据库时才生效) -SQLBOT_DB_PORT=5432 -## SQLBot 数据库库名 -SQLBOT_DB_DB=sqlbot -## 数据库用户名 -SQLBOT_DB_USER=root -## 数据库密码，密码如包含特殊字符，请用双引号引起来，例如 SQLBOT_DB_PASSWORD="Test@4&^%*^" -SQLBOT_DB_PASSWORD=Password123@pg - # 其他配置 ## 普通用户默认密码 SQLBOT_DEFAULT_PWD=SQLBot@123456 From 143ab1fc384bda0b9ae8b6a34e41d5168f6884ea Mon Sep 17 00:00:00 2001 From: junjun <752696511@qq.com> Date: Wed, 3 Sep 2025 22:13:31 +0800 Subject: [PATCH 7/7] build: allinone --- Dockerfile | 10 +++++----- installer/install.conf | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f84e1c2..930b6350 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,11 +54,11 @@ ENV SQLBOT_HOME=/opt/sqlbot ENV PYTHONPATH=${SQLBOT_HOME}/app ENV PATH="${SQLBOT_HOME}/app/.venv/bin:$PATH" -ENV POSTGRES_SERVER=localhost -ENV POSTGRES_PORT=5432 -ENV POSTGRES_DB=sqlbot -ENV POSTGRES_USER=root -ENV POSTGRES_PASSWORD=Password123@pg +# ENV POSTGRES_SERVER=localhost +# ENV POSTGRES_PORT=5432 +# ENV POSTGRES_DB=sqlbot +# ENV POSTGRES_USER=root +# ENV POSTGRES_PASSWORD=Password123@pg # Copy necessary files from builder COPY start.sh /opt/sqlbot/app/start.sh diff --git a/installer/install.conf b/installer/install.conf index 53211023..7aaaabee 100644 --- a/installer/install.conf +++ b/installer/install.conf @@ -5,6 +5,20 @@ SQLBOT_BASE=/opt SQLBOT_WEB_PORT=8000 SQLBOT_MCP_PORT=8001 +# 数据库配置 +## 是否使用外部数据库 +SQLBOT_EXTERNAL_DB=false +## 数据库地址 +SQLBOT_DB_HOST=localhost +## 数据库端口 (仅使用外部数据库时才生效) +SQLBOT_DB_PORT=5432 +## SQLBot 数据库库名 +SQLBOT_DB_DB=sqlbot +## 数据库用户名 +SQLBOT_DB_USER=root +## 数据库密码，密码如包含特殊字符，请用双引号引起来，例如 SQLBOT_DB_PASSWORD="Test@4&^%*^" +SQLBOT_DB_PASSWORD=Password123@pg + # 其他配置 ## 普通用户默认密码 SQLBOT_DEFAULT_PWD=SQLBot@123456