From e2eeeab982c66be4e8b1c7d5a7c9bb276618057c Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 28 Mar 2025 20:23:33 +0800
Subject: [PATCH] 'commit'

---
 AI/WxMini/Start.py                            |  17 +++++++++++++++--
 AI/WxMini/Test/T1_GenerateTuPian.py           |   3 +--
 AI/WxMini/Utils/ImageUtil.py                  |   7 +++----
 .../__pycache__/ImageUtil.cpython-310.pyc     | Bin 1804 -> 1741 bytes
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/AI/WxMini/Start.py b/AI/WxMini/Start.py
index 7e058d08..30d2299a 100644
--- a/AI/WxMini/Start.py
+++ b/AI/WxMini/Start.py
@@ -246,6 +246,21 @@ async def reply(person_id: str = Form(...),
                 "message": "请输入内容",
                 "success": False
             }
+
+        if '生成图片' in prompt or '生图' in prompt:
+            success, key = generate_image(prompt)
+            if success:
+                # 记录聊天数据到 MySQL
+                await save_chat_to_mysql(app.state.mysql_pool, person_id, prompt,
+                                         key, '', 0)
+                # 返回数据
+                return {
+                    "success": True,
+                    "url": None,
+                    "duration": 0,  # 返回大模型的回复时长
+                    "response": key,  # 返回大模型的回复
+                }
+
         # 从连接池中获取一个连接
         connection = milvus_pool.get_connection()
 
@@ -374,8 +389,6 @@ async def reply(person_id: str = Form(...),
                 "search_time": end_time - start_time,  # 返回查询耗时
                 "duration": duration,  # 返回大模型的回复时长
                 "response": result,  # 返回大模型的回复
-                "login_name": current_user["login_name"],
-                "person_name": current_user["person_name"]
             }
         else:
             raise HTTPException(status_code=500, detail="大模型未返回有效结果")
diff --git a/AI/WxMini/Test/T1_GenerateTuPian.py b/AI/WxMini/Test/T1_GenerateTuPian.py
index 986e2c9f..e4dd3388 100644
--- a/AI/WxMini/Test/T1_GenerateTuPian.py
+++ b/AI/WxMini/Test/T1_GenerateTuPian.py
@@ -4,5 +4,4 @@ from WxMini.Utils.ImageUtil import generate_image
 if __name__ == '__main__':
     prompt = "武松打虎"
     success, message = generate_image(prompt)
-    if not success:
-        print(f"生成失败: {message}")
+    print(message)
diff --git a/AI/WxMini/Utils/ImageUtil.py b/AI/WxMini/Utils/ImageUtil.py
index 5eb10090..b279bee3 100644
--- a/AI/WxMini/Utils/ImageUtil.py
+++ b/AI/WxMini/Utils/ImageUtil.py
@@ -8,7 +8,6 @@ import oss2
 from WxMini.Milvus.Config.MulvusConfig import *
 
 
-
 def generate_image(prompt, model="wanx2.1-t2i-turbo", n=1, size='1024*1024'):
     # 初始化 OSS 客户端
     auth = oss2.Auth(ACCESS_KEY_ID, ACCESS_KEY_SECRET)
@@ -33,9 +32,9 @@ def generate_image(prompt, model="wanx2.1-t2i-turbo", n=1, size='1024*1024'):
                 # 生成 OSS 文件名
                 file_name = PurePosixPath(unquote(urlparse(image_url).path)).parts[-1]
                 # 上传到 OSS
-                bucket.put_object('Upload/' + file_name, image_data)
-                print(f"图片已上传到 OSS，文件名: Upload/{file_name}")
-            return True, "图片生成并上传成功"
+                key = 'Upload/' + file_name
+                bucket.put_object(key, image_data)
+            return True, f'{OSS_PREFIX}{key}'
         else:
             # 生成失败，返回错误信息
             error_message = f"同步调用失败，状态码: {rsp.status_code}, 错误码: {rsp.code}, 错误信息: {rsp.message}"
diff --git a/AI/WxMini/Utils/__pycache__/ImageUtil.cpython-310.pyc b/AI/WxMini/Utils/__pycache__/ImageUtil.cpython-310.pyc
index acc5e99d0f4029a7a0ea3ec6ccdd65ae283ef5dc..9fe4acf1d5273e34c4de5d5592adca01498c2491 100644
GIT binary patch
delta 472
zcmZ8d&rcIU6n<}Jce~x)*+ipJ+X_^ou#tnQ{s&S57a^4JD<O?x#-&AQolb(7shSWH
z4{{oBjR_n*a`5DVzkrjsJsbZD4$MLzgm-w~`|*9>OWybRl(7zD0odsM_@6e9nTK&~
zyL|LIpGKyNBhMFAq3x@pMh%*1%JIPMd)jLUDr`raM82^#YsZtYRyFT&;tQubcmVxS
zyN3^TsEbDg;ln6*)T06DZ~#BaJF)}~;BIa*0G^wbEEX)5?cVE0s-mMkMBu)TF4+#K
z$GiIoeTMMqJ};^v&Gs;NyTvYBa}QR4Tk2<K&s^XR?m!Zl7o>&@<~Ql$uz5!RzFG}t
z8;$1Ne0^$WIdj%KTx5kU(d)fUMdo&8Yg=W-`p0$ARjtl;Mte#ov8g)qCAukgGbW_$
z$mW#*#V?R!=9@E#p*eLbC7;B27c11q0Aq}akN433O3q|rsQU*e%!xbwWXyhAUZinb
sWp`4cX13C$7FQe7qLpr_mnQMbSTl8Rzm(+U+O^__*8KCHQW}k)1F$=EX#fBK

delta 535
zcmX@h+r!73&&$ij00jRgK1*M?k(Z5;j~B=T2{{9CG1p{8Mg{HA680>P63!aN8ipFC
z8s-$nUe;Q+8n!I167DRXY^EY#Ae%Rf&xIjYZE_ByPJIpQ0*Msn8ZL2$8qS4Gj0`1`
zDJ(Tyvl-?xH8V0Y6e@=^q_74vq=1c>&5*(l)Gh_2Ie@e@P!(G(cZp;TH%M&?XAO56
zQ#eB~0}DfmOl1orLoE*@LzQR>SBY#5PctLPObpeM3~UUM3@JdRbv!_8z;rodIfEwm
zWFsb{;8Ja%&z{cS_q?<H>Gn-ec62@2v*2mR1_l4%;P-oao=t0ivU}Up3B6Vdp#?el
zi7EP;Od+Mxa4pZL%zxG~;pxt85RD*q*Zj$;Oa+W`ldmyd*0{x5P?VWha*HK7KPB}R
zdv0oRabkMvEl$^p<kW(a%>2At%*7=|n!J<mG6#wBrWO_D7sbOAF{Z9$C{mm3$>PGu
zGr5mNMoNH5fRT++hM9wri;<6!kBNg(gps3x=}(cy<RdJ*8MP-juzDz|0o_&vCe(qf
zTY~ASC7!wI;h8BV86K&b=@}&^lV7n)Ga622V{4Vt04X+v>p;>wc`2JJGYgLf0H_|F
A?f?J)