From 056c66b46bb69220f1924ea04a2cd25c072f068a Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Thu, 27 Mar 2025 09:47:06 +0800 Subject: [PATCH] 'commit' --- AI/WxMini/Start.py | 11 ++++++++--- AI/WxMini/Utils/ImageUtil.py | 4 ++-- AI/WxMini/Utils/MySQLUtil.py | 6 ++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/AI/WxMini/Start.py b/AI/WxMini/Start.py index 3733f2a4..8661a0de 100644 --- a/AI/WxMini/Start.py +++ b/AI/WxMini/Start.py @@ -380,8 +380,9 @@ async def get_chat_log( :param page_size: 每页记录数 :return: 分页数据 """ + logger.info(f"current_user={current_user['login_name']}") # 调用 get_chat_log_by_session 方法 - result = await get_chat_log_by_session(app.state.mysql_pool, current_user, person_id, page, page_size) + result = await get_chat_log_by_session(app.state.mysql_pool, person_id, page, page_size) return result @@ -401,6 +402,7 @@ async def get_risk_chat_logs( :param page_size: 每页记录数 :return: 分页数据 """ + logger.info(f"current_user={current_user['login_name']}") # 计算分页偏移量 offset = (page - 1) * page_size @@ -518,10 +520,13 @@ async def process_image(image_url: str, current_user: dict = Depends(get_current try: if await is_text_dominant(client, image_url): logger.info("检测到图片主要是文字内容,开始识别文字:") - return StreamingResponse(recognize_text(client,app.state.mysql_pool, image_url), media_type="text/plain") + return StreamingResponse(recognize_text(client, app.state.mysql_pool, current_user['person_id'], image_url), + media_type="text/plain") else: print("检测到图片主要是物体/场景,开始识别内容:") - return StreamingResponse(recognize_content(client,app.state.mysql_pool, image_url), media_type="text/plain") + return StreamingResponse( + recognize_content(client, app.state.mysql_pool, current_user['person_id'], image_url), + media_type="text/plain") except Exception as e: raise HTTPException(status_code=500, detail=str(e)) diff --git a/AI/WxMini/Utils/ImageUtil.py b/AI/WxMini/Utils/ImageUtil.py index f25e5e5f..aadddc39 100644 --- a/AI/WxMini/Utils/ImageUtil.py +++ b/AI/WxMini/Utils/ImageUtil.py @@ -35,7 +35,7 @@ async def is_text_dominant(client, image_url): return True -async def recognize_text(client, pool, image_url): +async def recognize_text(client, pool,person_id, image_url): """ 识别图片中的文字,流式输出 """ @@ -65,7 +65,7 @@ async def recognize_text(client, pool, image_url): time.sleep(0.1) -async def recognize_content(client, pool, image_url): +async def recognize_content(client, pool,person_id, image_url): """ 识别图片中的内容,流式输出 """ diff --git a/AI/WxMini/Utils/MySQLUtil.py b/AI/WxMini/Utils/MySQLUtil.py index 6215b79b..5c7088ef 100644 --- a/AI/WxMini/Utils/MySQLUtil.py +++ b/AI/WxMini/Utils/MySQLUtil.py @@ -51,7 +51,7 @@ from aiomysql import DictCursor # 分页查询聊天记录 -async def get_chat_log_by_session(mysql_pool, current_user, person_id, page=1, page_size=10): +async def get_chat_log_by_session(mysql_pool, person_id, page=1, page_size=10): """ 根据 person_id 查询聊天记录,并按 id 降序分页 :param mysql_pool: MySQL 连接池 @@ -110,9 +110,7 @@ async def get_chat_log_by_session(mysql_pool, current_user, person_id, page=1, p "total": total, "page": page, "page_size": page_size, - "total_pages": total_pages, - "login_name": current_user["login_name"], - "person_name": current_user["person_name"] + "total_pages": total_pages }