From 9e51ec752c93d850db15cd61a7a3463d8fe94344 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 06 十二月 2024 10:10:09 +0800
Subject: [PATCH] 问题处理
---
app/models/agent_model.py | 4 +++-
requirements.txt | 0
app/config/config.py | 2 ++
app/task/fetch_agent.py | 14 +++++++++-----
app/config/config.yaml | 2 +-
app/models/base_model.py | 17 ++++++++++++++---
app/api/auth.py | 6 ++++--
7 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 880d744..2fc3ea7 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -131,15 +131,17 @@
await update_token(db, user.id, access_token, token_dict)
result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
db_app_token = result.scalars().first()
+ if isinstance(access_token, bytes):
+ access_token = access_token.decode()
if not db_app_token:
app_token_str = json.dumps(token_dict)
# print(app_token_str)
- app_token = AppToken(id=user.id, token=access_token.decode(), app_token=app_token_str)
+ app_token = AppToken(id=user.id, token=access_token, app_token=app_token_str)
pdb.add(app_token)
await pdb.commit()
await pdb.refresh(app_token)
else:
- db_app_token.token = access_token.decode()
+ db_app_token.token = access_token
db_app_token.app_token = json.dumps(token_dict)
await pdb.commit()
await pdb.refresh(db_app_token)
diff --git a/app/config/config.py b/app/config/config.py
index ad703ba..42037c9 100644
--- a/app/config/config.py
+++ b/app/config/config.py
@@ -31,6 +31,8 @@
kwargs['fwr_base_url'] = kwargs.get('fwr_base_url', '').replace('127.0.0.1', host_ip)
kwargs['sgb_db_url'] = kwargs.get('sgb_db_url', '').replace('127.0.0.1', host_ip)
kwargs['fwr_db_url'] = kwargs.get('fwr_db_url', '').replace('127.0.0.1', host_ip)
+ kwargs['dify_base_url'] = kwargs.get('dify_base_url', '').replace('127.0.0.1', host_ip)
+ kwargs['basic_base_url'] = kwargs.get('basic_base_url', '').replace('127.0.0.1', host_ip)
# Check if all required fields are provided and set them
for field in self.__annotations__.keys():
if field not in kwargs:
diff --git a/app/config/config.yaml b/app/config/config.yaml
index ca150af..eb9c91d 100644
--- a/app/config/config.yaml
+++ b/app/config/config.yaml
@@ -2,7 +2,7 @@
sgb_base_url: http://192.168.20.119:13001
sgb_websocket_url: ws://192.168.20.119:13001
fwr_base_url: http://192.168.20.119:11080
-database_url: mysql+pymysql://root:infini_rag_flow@192.168.20.119:5455/rag_basic
+database_url: mysql+pymysql://root:infini_rag_flow@192.168.20.119:5455/199c90c51171
sgb_db_url: mysql+pymysql://root:1234@192.168.20.119:13306/bisheng
fwr_db_url: mysql+pymysql://root:infini_rag_flow@192.168.20.119:15455/rag_flow
PUBLIC_KEY: |
diff --git a/app/models/agent_model.py b/app/models/agent_model.py
index f914cdd..67323e3 100644
--- a/app/models/agent_model.py
+++ b/app/models/agent_model.py
@@ -130,4 +130,6 @@
@staticmethod
def is_type(record_id, t):
record = UnifiedAgentModel.get_by_id(record_id)
- return record and record.type == t
\ No newline at end of file
+ return record and record.type == t
+
+
diff --git a/app/models/base_model.py b/app/models/base_model.py
index b8efcb8..470f473 100644
--- a/app/models/base_model.py
+++ b/app/models/base_model.py
@@ -1,10 +1,10 @@
import os
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, text
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker, Session
-
from app.config.config import settings
+# from app.models.agent_model import AgentModel
DATABASE_URL = os.getenv('DATABASE_URL') or settings.database_url
@@ -16,6 +16,12 @@
# 鍒涘缓鎵�鏈夎〃锛堝鏋滄湁鏂扮殑妯″瀷绫伙紝浼氳嚜鍔ㄥ垱寤虹浉搴旂殑琛級
def init_db():
+ try:
+ sql = text('DROP TABLE IF EXISTS agent;')
+ engine.execute(sql)
+ except Exception as e:
+ print(e)
+
Base.metadata.create_all(bind=engine)
@@ -24,4 +30,9 @@
try:
yield db
finally:
- db.close()
\ No newline at end of file
+ db.close()
+
+
+# def drop_table():
+# sql = text('DROP TABLE IF EXISTS agent;')
+# engine.execute(sql)
\ No newline at end of file
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index f9aed22..9e91f8f 100644
--- a/app/task/fetch_agent.py
+++ b/app/task/fetch_agent.py
@@ -108,17 +108,21 @@
try:
count = db.query(AgentModel).count()
if count > 0:
- return
+ # 鍒犻櫎琛ㄤ腑鐨勬墍鏈夋暟鎹�
+ result = db.query(AgentModel).delete()
+ db.commit() # 鎻愪氦浜嬪姟
+
initial_agents = [
('80ee430a-e396-48c4-a12c-7c7cdf5eda51', 1, '鎶ュ憡鐢熸垚', 'BISHENG', 'report'),
('basic_excel_merge', 2, '鎶ヨ〃鍚堝苟', 'BASIC', 'excelMerge'),
('bfd090d589d811efb3630242ac190006', 4, '鏂囨。鏅鸿兘', 'BISHENG', 'report'),
('da3451da89d911efb9490242ac190006', 3, '鐭ヨ瘑闂瓟', 'RAGFLOW', 'knowledgeQA'),
('e96eb7a589db11ef87d20242ac190006', 5, '鏅鸿兘闂瓟', 'RAGFLOW', 'chat'),
- ('basic_excel_talk', 6, '鏅鸿兘鏁版嵁', 'BASIC', 'excelTalk'),
- ('basic_question_talk', 7, '鍑洪缁勫嵎', 'BASIC', 'questionTalk'),
- ('9d75142a-66eb-4e23-b7d4-03efe4584915', 8, '灏忔暟缁樺浘', 'DIFY', 'imageTalk'),
- ('basic_paper_talk', 8, '鏂囨。鍑哄嵎', 'BASIC', 'paperTalk')
+ ('basic_report_clean', 6, '鏂囨。鎶ュ憡', 'DIFY', 'reportWorkflow')
+ # ('basic_excel_talk', 6, '鏅鸿兘鏁版嵁', 'BASIC', 'excelTalk'),
+ # ('basic_question_talk', 7, '鍑洪缁勫嵎', 'BASIC', 'questionTalk'),
+ # ('9d75142a-66eb-4e23-b7d4-03efe4584915', 8, '灏忔暟缁樺浘', 'DIFY', 'imageTalk'),
+ # ('basic_paper_talk', 8, '鏂囨。鍑哄嵎', 'BASIC', 'paperTalk')
]
for agent in initial_agents:
diff --git a/requirements.txt b/requirements.txt
index a400033..29ba9db 100644
--- a/requirements.txt
+++ b/requirements.txt
Binary files differ
--
Gitblit v1.8.0