From 00545db2021c965b728a9a32a1d858bac0c0bba0 Mon Sep 17 00:00:00 2001 From: lychang <632945494@qq.com> Date: Thu, 13 Nov 2025 23:59:28 +0800 Subject: [PATCH] update code --- app.py | 41 +++++++++++++++++++++++++++++++---- chat_session.py | 45 ++++++++++++++++++++++++++++----------- db/{data.sqlite => data} | Bin file.py | 4 ++-- 4 files changed, 72 insertions(+), 18 deletions(-) rename db/{data.sqlite => data} (100%) diff --git a/app.py b/app.py index 3f80b39..9dc1947 100644 --- a/app.py +++ b/app.py @@ -3,15 +3,16 @@ from flask import Flask, render_template, jsonify, request import sqlite3 import json import os +import time -from chat_session import agent +from chat_session import agent, ChatSessionManager from tools import TimeUtils, now, from_string, from_datetime, format_timestamp class DatabaseManager: """数据库管理类""" - def __init__(self, db_path='db/data.sqlite'): + def __init__(self, db_path='db/data'): self.db_path = db_path def get_connection(self): @@ -504,6 +505,7 @@ app.template_folder = 'templates' db_manager = DatabaseManager() report_service = ReportService() message_processor = MessageRender() +chat_session = ChatSessionManager() def api_response(success=True, data=None, error=None, status_code=200): @@ -541,6 +543,36 @@ def daily_report_page(): return render_template('daily_report.html') +@app.route('/db/update') +def db_update(): + current_time = time.localtime(time.time() - 24 * 60 * 60) + day = current_time.tm_mday + month = current_time.tm_mon + year = current_time.tm_year + if chat_session.status() == f"{year}-{month:02d}-{day:02d}-23": + return api_response(success=False, error="数据库已更新", status_code=400) + for hour in range(24): + chat_session.process_chat_session(year, month, day, hour) + start = f"{year}-{month:02d}-{day:02d} 00:00:00" + end = f"{year}-{month:02d}-{day:02d} 23:59:59" + + chat_session.update_qa_data(start, end) + chat_session.upload_db() + return api_response(success=True, data={'message': '数据库更新成功'}) + + +@app.route('/db/upload') +def db_upload(): + chat_session.upload_db() + return api_response(success=True, data={'message': '数据库上传成功'}) + + +@app.route('/db/download') +def db_download(): + chat_session.download_db() + return api_response(success=True, data={'message': '数据库下载成功'}) + + # API路由 - 消息相关 @app.route('/api/messages_by_ids', methods=['POST']) def get_messages_by_ids(): @@ -1008,9 +1040,10 @@ def generate_weekly_report(): if __name__ == '__main__': # 检查数据库文件是否存在 - if not os.path.exists('db/data.sqlite'): + if not os.path.exists('db/data'): print(f"错误: 数据库文件 db/data.sqlite 不存在") - print("请确保data.sqlite文件在当前目录下") + chat_session.download_db() + print("正在下载云端数据库") else: print("启动聊天网页服务...") print("访问地址: http://127.0.0.1:5000") diff --git a/chat_session.py b/chat_session.py index a8bfae4..893908a 100644 --- a/chat_session.py +++ b/chat_session.py @@ -162,21 +162,22 @@ agent = AIAgent(max_retries=1, timeout=180) class ChatSessionManager: """聊天会话管理器类""" - def __init__(self, chat_history_dir: str = "./"): + def __init__(self, online_db_uri: str = "zysl-log/wework/chat_msg/db/data.db"): """ 初始化聊天会话管理器 Args: - chat_history_dir: 聊天历史文件目录 + online_db_uri: 在线数据库URI """ - self.chat_history_dir = chat_history_dir - self.files_dir = os.path.join(chat_history_dir, "files") - self.messages_dir = os.path.join(chat_history_dir, "messages") - self.db_path = os.path.join("db", "data.sqlite") + self.online_db_uri = online_db_uri + self.files_dir = os.path.join("", "files") + self.messages_dir = os.path.join("", "messages") + self.db_path = os.path.join("db", "data") self.cache_path = None # 初始化文件管理器 self.obj = ObjectFileManager() self.lfm = LocalFileManager(self.files_dir) + self.dbm = LocalFileManager("db") self.users = [] self.groups = [] self.members = {} @@ -190,6 +191,23 @@ class ChatSessionManager: os.makedirs(self.files_dir, exist_ok=True) os.makedirs(self.messages_dir, exist_ok=True) + def upload_db(self): + file = self.dbm.get_file("data") + self.obj.upload_file(self.online_db_uri, file) + + def download_db(self): + file = self.obj.get_file(self.online_db_uri) + l = self.dbm.upload_file("data", file) + + def status(self): + cursor = self.conn.cursor() + cursor.execute("SELECT datetime FROM information order by datetime desc limit 1") + row = cursor.fetchone() + if row: + return row[0] + else: + return None + def download_chat_history(self, year: int, month: int, day: int, hour: int) -> bool: """ 下载指定时间的聊天历史 @@ -621,9 +639,11 @@ class ChatSessionManager: data = [] cursor = self.conn.cursor() index_id = cursor.execute('''select id - from qa order by id desc limit 1''').fetchone()[0] + from qa + order by id desc + limit 1''').fetchone()[0] - for r in group_qa: + for r in group_qa: qas = group_qa.get(r, {}) for qa in qas: Q = qa["question"] @@ -679,11 +699,12 @@ class ChatSessionManager: if __name__ == '__main__': chat_session = ChatSessionManager() - + chat_session.upload_db() + chat_session.download_db() # for day in range(11,13): # for hour in range(24): # chat_session.process_chat_session(2025,11,day,hour) - start = "2025-11-11 00:00:00" + # start = "2025-11-11 00:00:00" # end = "2025-11-13 00:00:00" - end = "2025-11-12 23:59:59" - chat_session.update_qa_data(start, end) \ No newline at end of file + # + # chat_session.update_qa_data(start, end) diff --git a/db/data.sqlite b/db/data similarity index 100% rename from db/data.sqlite rename to db/data diff --git a/file.py b/file.py index ba29532..ab44431 100644 --- a/file.py +++ b/file.py @@ -25,7 +25,7 @@ class BaseFileManager(ABC): if headers is None: headers = {} resp = requests.put(url, data=raw, headers=headers) - if resp.status_code != 201: + if resp.status_code != 201 or resp.status_code != 200: return {} return resp.json() @@ -146,7 +146,7 @@ class LocalFileManager(BaseFileManager): @staticmethod def _write(file_path: str, file_content: bytes): try: - with open(file_path, "wb", encoding="utf-8") as f: + with open(file_path, "wb") as f: f.write(file_content) return True except Exception as e: