From 25e4176ed36aee2e71722c1730f5fdbf1f09b3cb Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 27 Aug 2025 11:50:34 +0800
Subject: [PATCH] 'commit'

---
 dsLightRag/Routes/QWenImageRoute.py           |  13 +-
 .../QWenImageRoute.cpython-310.pyc            | Bin 6150 -> 6476 bytes
 dsLightRag/Test/TestQWen3ImageEdit.py         | 137 ++++--------------
 3 files changed, 36 insertions(+), 114 deletions(-)

diff --git a/dsLightRag/Routes/QWenImageRoute.py b/dsLightRag/Routes/QWenImageRoute.py
index 876cdcbd..6169eeeb 100644
--- a/dsLightRag/Routes/QWenImageRoute.py
+++ b/dsLightRag/Routes/QWenImageRoute.py
@@ -7,7 +7,7 @@ import uuid
 from typing import Optional
 
 from fastapi import APIRouter, HTTPException
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, root_validator
 
 from Config.Config import OBS_PREFIX, OBS_BUCKET, OBS_SERVER
 from QWenImage.QWenImageEditKit import QwenImageEditor
@@ -36,10 +36,9 @@ class GenerateImageRequest(BaseModel):
 class EditImageRequest(BaseModel):
     """编辑图片请求模型"""
     prompt: str = Field(..., description="编辑提示词")
-    size: str = Field(default="1328*1328", description="图片尺寸")
     api_key: Optional[str] = Field(default=None, description="自定义API密钥")
-    # 支持URL或Base64两种格式，二选一
-    image_url: Optional[str] = Field(default=None, description="原始图片URL")
+    # 仅保留URL方式，设为必填项
+    image_url: str = Field(..., description="原始图片URL")
     image_base64: Optional[str] = Field(default=None, description="原始图片Base64编码")
 
     @root_validator(pre=True)
@@ -145,16 +144,16 @@ async def edit_image(request: EditImageRequest):
         dict: 包含编辑结果的字典
     """
     try:
+        # 恢复为仅使用image_url的日志记录
         logger.info(f"接收到图片编辑请求: image_url={request.image_url[:50]}..., prompt={request.prompt[:50]}...")
         
         # 如果提供了自定义API密钥，创建新的编辑器实例
         editor = QwenImageEditor(api_key=request.api_key) if request.api_key else image_editor
 
-        # 调用图片编辑API
+        # 使用image_url参数调用编辑接口
         result = editor.edit_image(
             image_url=request.image_url,
-            prompt=request.prompt,
-            negative_prompt=request.negative_prompt
+            prompt=request.prompt
         )
         
         # 处理结果
diff --git a/dsLightRag/Routes/__pycache__/QWenImageRoute.cpython-310.pyc b/dsLightRag/Routes/__pycache__/QWenImageRoute.cpython-310.pyc
index 1b64f4e67511beb91e35c3ef29a2398f72eccc1c..e84167f819d79fd73db24d88d705f4bcd45c4f5d 100644
GIT binary patch
delta 2187
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
HX~Mq%zL_ea

delta 1901
zcmZvdTWl0n7{||<nVp@z&EBu=_Cm{Lp=?`j0s=<R%B6q>5nU*~c!qWBZnvJDs+3*1
zw1E&)g`7vyur+w$K|srcAu7=aqlrG6m`#jN74$*FgC-iPe&4jAKDd+l&G-G!cW&Q&
zbM~7x=Q{MF$KxdMd-vq^7tgj_((7s4rB%JBC}D)z@_NCW@fLg;U%{X8Tbh~=6oQ$c
zW!v+iLO2t)Y%L!tL^DxJ3<q;CXO=S8q?Cynv>G=O(==0OgvUvy-UtGdPZ8#3o(aM{
zhI?GjG=Q%&FZf=|Z#4GDs!hx{O_|?lI4-dO3r;BGG}COL9<uaC(8DZZ=}SOwVNuXy
zEIvUXveh6%OId=|S>7^{q3eTE&9Qx;Wb7?6BVV(1<%~R=`H0@3ZGPB)jSm0i=v=#I
z<4VNuZjfd#e|Go6`PrMdXK#FbP2ypYxL-`keKa8E<OGe0n9^J41-TyX5_WMCg@$Mh
z?t03-;-ZqIuZ!!-iX#$JnF0yX4ArnR`xas-Ov6Nh<}jRw8YiH;EFDr~=`Jf)Ux@Wu
zn)_j_Zwq1CL6Y)|cH8>K**CAuzW2ubiVq#=<~~?V&5<h%WR1R2o)>+#@a_O;`$loS
z_ikPJdFt(--nw}A>g{_sCV3r3dxwqefSG&6=o{h1!idS^pz;I)_s5fn20+Rq681!E
z3jG#DD*{L7D-jaH>e3*3?ah82{Q1Nzq-N%ly+fvfnJ=6HO4o_+Ts`U<?6X$1xzC5K
zfntkepyd)@xmN};!!?Z?FOM1}vs9C_hAC{Gbdw$R;OI!cIKcV_;T3OK*Jo{=YuMQ#
z4thH1Dly^NOm~Vqo=r3@{`916UC_8%wCN{lmv~=q)gDkn&d{-%_|~2fzv}BwmC2CC
z?2~duDoad@6aJ-1s+2jVDJ5A_kxj=qsVHMT%*mv@vtldThFlQoid*G9DOJ?6T6Iqo
zO3Lbxr(!pC(_8gTLw#O`f}fHqn&}72Th=a<DY@b(E7d^RQMOM@N2Q9h(&#EX`2_Qs
zK?w4jAs{qEs9JHC<!V@b;;q{nVWF}MGzk}Vm<%sbh#5U`gOZAelCcOZIKslFUiRRm
z^HFAuMc|5>y140!i8h~~ek!*4lEDZ|!txv9WHC|<`{JqSiMjub7iUfXJ6^Lj-fy%`
zRQ=KDYDjKM=2np`mPT59?O)oy9^c9a#74kau)XK7F}!vc7Hhk~a;CxB`6g`MjCfQe
z14GNVf;ox<Eqs+%C+=Q6H+%KNd$-=<+c4}gM2EN@XjOaB>=fSzl5~ssBe1J^I|!)+
z-+}rQh{a`LL35|*4>p{#iWh5)??miE>_+TCSe4$5)?NhG9N&kSuQ9atBc4X|AQZ#_
zK+4Nk!K0?)=8Bv@gALCj4kN7Do+C%Vd>;J_0zAUgh@%K=OUKYUgjn_v%hBowoPoP^
z79gFLoNY8BE3!iIQs*?g=m`~RzxX_KjdqBa!butz7s4$xBt8hY(@yb2I352H`{Sny
z{WXcIl0=oi)j2*m(;DfduEpH-i2i6JJtpqQf<i?7UH7qL2oR9mRH9BAp*mecwbRl+
z$^)K<hSc(!I$#>F<;<ErU(9B6!&&|U=sbrwj_4M@L?5ZEd3F?skLR-K`Nw>c7rx=g
zV@;><pDGi<YO#tX-Sg^#wI^qC7c|z~hs<0)y??NTPi`F;Dld+j2Cq5bxafx24bB^J
zN^3_?qSc4MbCItA)Rd88$>exCSc#o4gh6oKc=%*<B^V8k)Lwg3$nlnCJ{p3J<E6_^
XS(R1llYN@z@KNm`+`Ue!_;va(9O%EE

diff --git a/dsLightRag/Test/TestQWen3ImageEdit.py b/dsLightRag/Test/TestQWen3ImageEdit.py
index 5fce73ac..edc944f4 100644
--- a/dsLightRag/Test/TestQWen3ImageEdit.py
+++ b/dsLightRag/Test/TestQWen3ImageEdit.py
@@ -16,99 +16,45 @@ logger = logging.getLogger("TestQWenImageEdit")
 base_url = "http://localhost:8200/api/qwenImage"
 
 
-def test_get_config():
-    """测试获取配置接口"""
+def test_edit_image(prompt):
     try:
-        url = f"{base_url}/config"
-        logger.info(f"调用获取配置接口: {url}")
-        response = requests.get(url)
+        """测试编辑图片接口"""
+        # 1. 定义测试图片URL
+        test_image_url = "https://help-static-aliyun-doc.aliyuncs.com/assets/img/zh-CN/7219965571/p1000025.png"
+        # 2. 定义API端点URL（修复核心问题）
+        api_url = f"{base_url}/edit"
         
-        if response.status_code == 200:
-            result = response.json()
-            logger.info(f"获取配置成功: {json.dumps(result, ensure_ascii=False, indent=2)}")
-            return True, result
-        else:
-            logger.error(f"获取配置失败: HTTP状态码={response.status_code}, 响应内容={response.text}")
-            return False, None
-    except Exception as e:
-        logger.exception(f"获取配置时发生异常: {str(e)}")
-        return False, None
-
-
-def get_test_image_base64(image_path=None):
-    """获取测试图片的base64编码"""
-    try:
-        # 默认使用测试目录下的示例图片
-        if not image_path:
-            test_dir = os.path.dirname(os.path.abspath(__file__))
-            image_path = os.path.join(test_dir, "test_image.jpg")
-            
-            # 如果默认图片不存在，创建一个简单的base64字符串
-            if not os.path.exists(image_path):
-                logger.warning(f"测试图片不存在，使用默认base64字符串: {image_path}")
-                return "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="
+        logger.info(f"调用编辑图片接口: {api_url}")
+        logger.info(f"请求参数: prompt={prompt[:50]}...,  image_url={test_image_url[:50]}...")
         
-        # 读取图片文件并转换为base64
-        with open(image_path, "rb") as image_file:
-            return base64.b64encode(image_file.read()).decode('utf-8')
-    except Exception as e:
-        logger.exception(f"获取图片base64编码时发生异常: {str(e)}")
-        return "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="
-
-
-def test_edit_image(prompt, image_base64=None, size='1328*1328', save_local=True):
-    """测试编辑图片接口（仅支持base64流式上传）"""
-    try:
-        url = f"{base_url}/edit"
-        headers = {"Content-Type": "application/json"}
-        
-        # 如果未提供base64，使用默认测试图片
-        if not image_base64:
-            image_base64 = get_test_image_base64()
-            logger.info("使用默认测试图片base64数据")
-        
-        data = {
+        # 构造请求数据
+        payload = {
             "prompt": prompt,
-            "image_base64": image_base64,
-            "size": size,
-            "save_local": save_local
+            "image_url": test_image_url  # 正确传递图片URL参数
         }
-        
-        logger.info(f"调用编辑图片接口: {url}")
-        logger.info(f"请求参数: prompt={prompt[:50]}..., size={size}, save_local={save_local}")
-        
         # 记录开始时间
-        start_time = time.time()
-        
+        success_count=0
         # 发送请求
-        response = requests.post(url, headers=headers, data=json.dumps(data, ensure_ascii=False))
-        
-        # 计算耗时
-        elapsed_time = time.time() - start_time
-        logger.info(f"请求耗时: {elapsed_time:.2f}秒")
-        
-        if response.status_code == 200:
-            result = response.json()
+        # 发送请求到正确的API端点
+        headers = {"Content-Type": "application/json"}
+        response = requests.post(api_url, headers=headers, data=json.dumps(payload, ensure_ascii=False))
+
+        # 解析响应结果
+        result = response.json()
+        if result.get("code") == 200:
+            # 修复计数逻辑 - 从响应数据判断成功状态
+            success_count += 1
             logger.info(f"编辑图片成功: {json.dumps(result, ensure_ascii=False, indent=2)}")
-            
+        else:
+            logger.error(f"编辑图片失败: {json.dumps(result, ensure_ascii=False)}")
+
             # 检查返回的数据
             if result.get("code") == 200 and "data" in result:
                 images = result["data"].get("images", [])
-                logger.info(f"成功编辑{len(images)}张图片")
-                
-                # 如果保存了本地文件，检查文件是否存在
-                if save_local and "local_file_paths" in result["data"]:
-                    for file_path in result["data"]["local_file_paths"]:
-                        full_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), file_path.lstrip('.'))
-                        if os.path.exists(full_path):
-                            logger.info(f"本地文件已保存: {full_path}")
-                        else:
-                            logger.warning(f"本地文件不存在: {full_path}")
-                
+                logger.info(f"成功编辑{success_count}张图片")
+
             return True, result
-        else:
-            logger.error(f"编辑图片失败: HTTP状态码={response.status_code}, 响应内容={response.text}")
-            return False, None
+
     except Exception as e:
         logger.exception(f"编辑图片时发生异常: {str(e)}")
         return False, None
@@ -118,36 +64,13 @@ def main():
     """主函数，运行单元测试"""
     logger.info("===== 开始测试QWenImage编辑接口 ====")
     
-    # 1. 测试获取配置接口
-    logger.info("\n1. 测试获取配置接口")
-    config_success, config_data = test_get_config()
-    
     # 2. 测试编辑图片接口 - 基本测试
     logger.info("\n2. 测试编辑图片接口 - 基本测试")
-    basic_prompt = "将图片转换为水彩画风格，增加明亮度"
-    edit_success, edit_data = test_edit_image(
-        prompt=basic_prompt,
-        size="1328*1328",
-        save_local=True
+    basic_prompt = "把“霓裳汉服社”改成“通义实验室”"
+    test_edit_image(
+        prompt=basic_prompt
     )
-    
-    # 3. 测试编辑图片接口 - 不同参数
-    if config_success:
-        supported_sizes = config_data["data"].get("supported_sizes", ["1328*1328"])
 
-        logger.info(f"\n3. 测试编辑图片接口 - 不同参数(size={supported_sizes[0]})")
-        different_prompt = "添加下雪效果，转为冷色调"
-        test_edit_image(
-            prompt=different_prompt,
-            size=supported_sizes[0],
-            save_local=True
-        )
-    
-    logger.info("\n===== QWenImage编辑接口测试完成 =====")
-    
-    # 输出测试结果摘要
-    success_count = sum([config_success, edit_success])
-    logger.info(f"测试结果: {success_count} 接口测试成功")
 
 
 if __name__ == "__main__":