Merge branch 'main' of https://github.com/dataease/SQLBot

Author: dataeaseShu

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

backend/apps/system/crud/assistant.py

@@ -177,7 +177,7 @@ def get_ds(self, ds_id: int):
     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']

backend/apps/system/middleware/auth.py

@@ -115,13 +115,13 @@ async def validateAssistant(self, assistantToken: Optional[str], trans: I18n) ->
                 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:

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",

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' }, */
         ],
       },
     },

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,

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