From 124bfc93ed2d3702cf9d9af9ff9b5985ec2b7b45 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期二, 18 二月 2025 15:51:23 +0800 Subject: [PATCH] commit --- app/models/knowledge_model.py | 4 +++- app/task/fetch_agent.py | 5 +++-- main.py | 1 + app/service/knowledge.py | 1 + app/service/v2/app_driver/chat_data.py | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/models/knowledge_model.py b/app/models/knowledge_model.py index adc82a0..c3c5bb2 100644 --- a/app/models/knowledge_model.py +++ b/app/models/knowledge_model.py @@ -24,6 +24,7 @@ documents = Column(Integer, default=0) # 鏂囨。 icon = Column(String(128)) # 鏂囨。 knowledge_type = Column(String(1)) # 鐭ヨ瘑搴撳钩鍙� + embd_id = Column(String(128)) def get_id(self): @@ -40,7 +41,8 @@ 'description': self.description, 'status': self.status, 'documents': self.documents if self.documents else 0, - 'icon': self.icon + 'icon': self.icon, + 'embd_id': self.embd_id } def __repr__(self): return '<Knowledge name:%r url:%r>\n' % (self.name, self.id) diff --git a/app/service/knowledge.py b/app/service/knowledge.py index e175f87..4fb834f 100644 --- a/app/service/knowledge.py +++ b/app/service/knowledge.py @@ -52,6 +52,7 @@ knowledge.permission = app_knowledge["permission"] knowledge.documents = app_knowledge["doc_num"] knowledge.status = app_knowledge["status"] + knowledge.embd_id = app_knowledge["embd_id"] knowledge.update_date = datetime.now() db.add(knowledge) db.commit() diff --git a/app/service/v2/app_driver/chat_data.py b/app/service/v2/app_driver/chat_data.py index 2dd4434..45919cb 100644 --- a/app/service/v2/app_driver/chat_data.py +++ b/app/service/v2/app_driver/chat_data.py @@ -91,7 +91,8 @@ ping_url = "http://192.168.20.116:11080/v1/system/version" # ping_url = "http://192.168.20.119:13002/console/api/workspaces" - user_token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiNjEzNzdiYzctZTViYy00YjhiLTgxYTYtNWZkOTVhODVlMmE4IiwiZXhwIjoxNzM5MjU3Njk1LCJpc3MiOiJTRUxGX0hPU1RFRCIsInN1YiI6IkNvbnNvbGUgQVBJIFBhc3Nwb3J0In0.w7xQrepd1dYR4iPXcbuthIZjdm45bTJFbolOM_SE9aQ" + user_token = "eyJhbG|ciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiNjEzNzdiYzctZTViYy00YjhiLTgxYTYtNWZkOTVhODVlMmE4IiwiZXhwIjoxNzM5MjU3Njk1LCJpc3MiOiJTRUxGX0hPU1RFRCIsInN1YiI6IkNvbnNvbGUgQVBJIFBhc3Nwb3J0In0.w7xQrepd1dYR4iPXcbuthIZjdm45bTJFbolOM_SE9aQ" + user_token = "IjhkYTliMGE4ZWRjMjExZWY5OGI4MDI0MmFjMTIwMDA2Ig.Z7QqNA.8aN6VhyxupQdsb5Vlp7mwqTT4sA" # token = "Bearer {}" token = "{}" res = await chat.chat_ping(ping_url, {}, await chat.get_chat_headers(token.format(user_token))) diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py index bee4790..c753f55 100644 --- a/app/task/fetch_agent.py +++ b/app/task/fetch_agent.py @@ -64,6 +64,7 @@ description = Column(Text) # 璇存槑 status = Column(String(1)) # 鐘舵�� doc_num = Column(Integer) # 鏂囨。 + embd_id = Column(String(128)) # 鏂囨。 class RgUserTenant(Base): @@ -396,10 +397,10 @@ try: row = db.query(RgKnowledge.id, RgKnowledge.name, RgKnowledge.description, RgKnowledge.status, - RgKnowledge.tenant_id, RgKnowledge.doc_num, RgKnowledge.permission).filter( + RgKnowledge.tenant_id, RgKnowledge.doc_num, RgKnowledge.permission, RgKnowledge.embd_id).filter( RgKnowledge.id == klg_id).first() return {"id": row[0], "name": row[1], "description": row[2], "status": str(row[3]), - "user_id": str(row[4]), "doc_num": row[5], "permission": row[6]} if row else {} + "user_id": str(row[4]), "doc_num": row[5], "permission": row[6], "embd_id": row[7]} if row else {} finally: db.close() diff --git a/main.py b/main.py index 3351960..bcee8b5 100644 --- a/main.py +++ b/main.py @@ -47,6 +47,7 @@ sync_agents_v2() sync_knowledge() sync_resources_from_json() + start_sync_token_task() yield # 鍦ㄥ簲鐢ㄥ叧闂椂鎵ц娓呯悊鎿嶄綔锛堝鏋滈渶瑕侊級 pass -- Gitblit v1.8.0