From 66434942959d009cd3868d3d3ec05da0a73999ca Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 16 一月 2025 13:40:51 +0800
Subject: [PATCH] 查询排序异常优化
---
app/models/session_model.py | 2
app/models/dialog_model.py | 2
app/api/files.py | 12 ++-
alembic/versions/3091a16c34a6_sessions_add_index_update_time.py | 139 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 148 insertions(+), 7 deletions(-)
diff --git a/alembic/versions/3091a16c34a6_sessions_add_index_update_time.py b/alembic/versions/3091a16c34a6_sessions_add_index_update_time.py
new file mode 100644
index 0000000..16eb4f3
--- /dev/null
+++ b/alembic/versions/3091a16c34a6_sessions_add_index_update_time.py
@@ -0,0 +1,139 @@
+"""sessions add index update_time
+
+Revision ID: 3091a16c34a6
+Revises:
+Create Date: 2025-01-15 18:07:00.151468
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision: str = '3091a16c34a6'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_table('knowledgebase')
+ op.drop_table('user_tenant')
+ op.drop_table('apps')
+ op.drop_table('flow')
+ op.create_index(op.f('ix_sessions_update_date'), 'sessions', ['update_date'], unique=False)
+ # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_index(op.f('ix_sessions_update_date'), table_name='sessions')
+ op.add_column('dialogs', sa.Column('parameters', mysql.TEXT(), nullable=True))
+ op.create_table('flow',
+ sa.Column('id', mysql.VARCHAR(length=255), nullable=False),
+ sa.Column('name', mysql.VARCHAR(length=255), nullable=False),
+ sa.Column('status', mysql.INTEGER(), autoincrement=False, nullable=False),
+ sa.Column('description', mysql.VARCHAR(length=255), nullable=False),
+ sa.Column('user_id', mysql.INTEGER(), autoincrement=False, nullable=False),
+ sa.PrimaryKeyConstraint('id'),
+ mysql_collate='utf8mb4_0900_ai_ci',
+ mysql_default_charset='utf8mb4',
+ mysql_engine='InnoDB'
+ )
+ op.create_table('apps',
+ sa.Column('id', mysql.VARCHAR(length=36), nullable=False),
+ sa.Column('name', mysql.VARCHAR(length=255), nullable=False),
+ sa.Column('status', mysql.VARCHAR(length=16), nullable=False),
+ sa.Column('description', mysql.TEXT(), nullable=False),
+ sa.Column('tenant_id', mysql.VARCHAR(length=36), nullable=False),
+ sa.Column('mode', mysql.VARCHAR(length=36), nullable=False),
+ sa.PrimaryKeyConstraint('id'),
+ mysql_collate='utf8mb4_0900_ai_ci',
+ mysql_default_charset='utf8mb4',
+ mysql_engine='InnoDB'
+ )
+ op.create_table('user_tenant',
+ sa.Column('id', mysql.VARCHAR(length=36), nullable=False),
+ sa.Column('tenant_id', mysql.VARCHAR(length=32), nullable=True),
+ sa.Column('user_id', mysql.VARCHAR(length=32), nullable=True),
+ sa.Column('role', mysql.VARCHAR(length=32), nullable=True),
+ sa.PrimaryKeyConstraint('id'),
+ mysql_collate='utf8mb4_0900_ai_ci',
+ mysql_default_charset='utf8mb4',
+ mysql_engine='InnoDB'
+ )
+ op.create_table('knowledgebase',
+ sa.Column('id', mysql.VARCHAR(length=36), nullable=False),
+ sa.Column('name', mysql.VARCHAR(length=128), nullable=True),
+ sa.Column('permission', mysql.VARCHAR(length=32), nullable=True),
+ sa.Column('tenant_id', mysql.VARCHAR(length=32), nullable=True),
+ sa.Column('description', mysql.TEXT(), nullable=True),
+ sa.Column('status', mysql.VARCHAR(length=1), nullable=True),
+ sa.Column('doc_num', mysql.INTEGER(), autoincrement=False, nullable=True),
+ sa.PrimaryKeyConstraint('id'),
+ mysql_collate='utf8mb4_0900_ai_ci',
+ mysql_default_charset='utf8mb4',
+ mysql_engine='InnoDB'
+ )
+ op.create_table('chat_sessions',
+ sa.Column('id', mysql.VARCHAR(length=36), nullable=False),
+ sa.Column('name', mysql.VARCHAR(length=255), nullable=True),
+ sa.Column('agent_id', mysql.VARCHAR(length=255), nullable=True),
+ sa.Column('agent_type', mysql.INTEGER(), autoincrement=False, nullable=True),
+ sa.Column('create_date', mysql.DATETIME(), nullable=True),
+ sa.Column('update_date', mysql.DATETIME(), nullable=True),
+ sa.Column('tenant_id', mysql.INTEGER(), autoincrement=False, nullable=True),
+ sa.Column('message', mysql.TEXT(), nullable=True),
+ sa.Column('reference', mysql.TEXT(), nullable=True),
+ sa.Column('conversation_id', mysql.VARCHAR(length=36), nullable=True),
+ sa.Column('event_type', mysql.VARCHAR(length=16), nullable=True),
+ sa.Column('session_type', mysql.VARCHAR(length=16), nullable=True),
+ sa.PrimaryKeyConstraint('id'),
+ mysql_collate='utf8mb4_0900_ai_ci',
+ mysql_default_charset='utf8mb4',
+ mysql_engine='InnoDB'
+ )
+ op.create_index('ix_chat_sessions_update_date', 'chat_sessions', ['update_date'], unique=False)
+ op.create_index('ix_chat_sessions_tenant_id', 'chat_sessions', ['tenant_id'], unique=False)
+ op.create_index('ix_chat_sessions_conversation_id', 'chat_sessions', ['conversation_id'], unique=False)
+ op.create_table('dialog',
+ sa.Column('id', mysql.VARCHAR(length=255), nullable=False),
+ sa.Column('name', mysql.VARCHAR(length=255), nullable=False),
+ sa.Column('status', mysql.VARCHAR(length=1), nullable=False),
+ sa.Column('description', mysql.VARCHAR(length=255), nullable=False),
+ sa.Column('tenant_id', mysql.VARCHAR(length=36), nullable=False),
+ sa.PrimaryKeyConstraint('id'),
+ mysql_collate='utf8mb4_0900_ai_ci',
+ mysql_default_charset='utf8mb4',
+ mysql_engine='InnoDB'
+ )
+ op.create_table('chat_api_tokens',
+ sa.Column('id', mysql.VARCHAR(charset='utf8mb3', collation='utf8mb3_general_ci', length=36), nullable=False),
+ sa.Column('app_id', mysql.VARCHAR(charset='utf8mb3', collation='utf8mb3_general_ci', length=36), nullable=True),
+ sa.Column('type', mysql.VARCHAR(charset='utf8mb3', collation='utf8mb3_general_ci', length=16), nullable=True),
+ sa.Column('token', mysql.VARCHAR(charset='utf8mb3', collation='utf8mb3_general_ci', length=255), nullable=True),
+ sa.Column('created_at', mysql.DATETIME(), nullable=True),
+ sa.Column('last_used_at', mysql.DATETIME(), nullable=True),
+ sa.PrimaryKeyConstraint('id'),
+ mysql_default_charset='utf8mb3',
+ mysql_engine='InnoDB',
+ mysql_row_format='DYNAMIC'
+ )
+ op.create_index('ix_chat_api_tokens_app_id', 'chat_api_tokens', ['app_id'], unique=False)
+ op.create_table('user_token',
+ sa.Column('id', mysql.VARCHAR(length=16), nullable=False),
+ sa.Column('account', mysql.VARCHAR(length=255), nullable=True),
+ sa.Column('password', mysql.VARCHAR(length=255), nullable=True),
+ sa.Column('access_token', mysql.VARCHAR(length=1000), nullable=True),
+ sa.Column('refresh_token', mysql.VARCHAR(length=1000), nullable=True),
+ sa.Column('created_at', mysql.DATETIME(), nullable=True),
+ sa.Column('updated_at', mysql.DATETIME(), nullable=True),
+ sa.PrimaryKeyConstraint('id'),
+ mysql_collate='utf8mb4_0900_ai_ci',
+ mysql_default_charset='utf8mb4',
+ mysql_engine='InnoDB'
+ )
+ # ### end Alembic commands ###
diff --git a/app/api/files.py b/app/api/files.py
index 380ea9c..c9f0524 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -151,22 +151,24 @@
file_type: Optional[str] = Query(None, description="Optional file type for basic agents"),
db: Session = Depends(get_db)
):
- agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ # agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ agent = db.query(MenuCapacityModel).filter(MenuCapacityModel.chat_id == agent_id).first()
+
if not agent:
return Response(code=404, msg="Agent not found")
-
- if agent.agent_type == AgentType.BISHENG:
+ agent_type = int(agent.capacity_type)
+ if agent_type == AgentType.BISHENG:
url = urllib.parse.unquote(url)
# 浠� URL 涓彁鍙栨枃浠跺悕
parsed_url = urllib.parse.urlparse(url)
filename = urllib.parse.unquote(parsed_url.path.split('/')[-1])
url = url.replace("http://minio:9000", settings.sgb_base_url)
- elif agent.agent_type == AgentType.RAGFLOW:
+ elif agent_type == AgentType.RAGFLOW:
if not doc_id:
return Response(code=400, msg="doc_id is required")
url = f"{settings.fwr_base_url}/v1/document/get/{doc_id}"
filename = doc_name
- elif agent.agent_type == AgentType.BASIC:
+ elif agent_type == AgentType.BASIC:
if agent_id == "basic_excel_talk":
return await download_basic_file(file_id, file_type)
diff --git a/app/models/dialog_model.py b/app/models/dialog_model.py
index 4a6a29e..f9340ef 100644
--- a/app/models/dialog_model.py
+++ b/app/models/dialog_model.py
@@ -49,7 +49,7 @@
create_date = Column(DateTime) # 鍒涘缓鏃堕棿
create_time = Column(BigInteger)
update_date = Column(DateTime) # 鏇存柊鏃堕棿
- update_time = Column(BigInteger)
+ update_time = Column(BigInteger, index=True)
tenant_id = Column(Integer) # 鍒涘缓浜�
dialog_id = Column(String(32))
name = Column(String(255)) # 鍚嶇О
diff --git a/app/models/session_model.py b/app/models/session_model.py
index b7fae97..87f63b7 100644
--- a/app/models/session_model.py
+++ b/app/models/session_model.py
@@ -20,7 +20,7 @@
agent_id = Column(String(255))
agent_type = Column(SQLAlchemyEnum(AgentType), nullable=False) # 鐩墠鍙瓨basic鐨勶紝ragflow鍜宐isheng鐨勮皟鎺ュ彛鑾峰彇
create_date = Column(DateTime, default=current_time) # 鍒涘缓鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿
- update_date = Column(DateTime, default=current_time, onupdate=current_time) # 鏇存柊鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿锛屾洿鏂版椂鑷姩鏇存柊
+ update_date = Column(DateTime, default=current_time, onupdate=current_time, index=True) # 鏇存柊鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿锛屾洿鏂版椂鑷姩鏇存柊
tenant_id = Column(Integer) # 鍒涘缓浜�
message = Column(TEXT) # 璇存槑
conversation_id = Column(String(64))
--
Gitblit v1.8.0