From a7ae68a4851832f29ef4a2fab679e7f627c26e29 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Wed, 27 Aug 2025 09:07:28 +0800 Subject: [PATCH] 'commit' --- dsLightRag/QWenImage/QwenImageKit.py | 23 ++++++++---------- .../__pycache__/QwenImageKit.cpython-310.pyc | Bin 4361 -> 4042 bytes dsLightRag/Routes/QWenImageRoute.py | 1 - .../QWenImageRoute.cpython-310.pyc | Bin 4000 -> 3989 bytes dsLightRag/Test/TestQWen3Image.py | 16 ++++-------- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dsLightRag/QWenImage/QwenImageKit.py b/dsLightRag/QWenImage/QwenImageKit.py index 540916b1..b61babc4 100644 --- a/dsLightRag/QWenImage/QwenImageKit.py +++ b/dsLightRag/QWenImage/QwenImageKit.py @@ -17,21 +17,12 @@ class QwenImageGenerator: self.api_key = api_key or ALY_LLM_API_KEY self.model = "qwen-image" - def generate_image(self, prompt, n=1, size='1328*1328'): + def generate_image(self, prompt, size='1328*1328'): # 移除n参数 """生成图片 Args: prompt: 图片描述提示词 - n: 生成图片数量 size: 图片尺寸 - - Returns: - dict: 包含生成结果的字典，格式如下： - { - 'success': bool, # 操作是否成功 - 'images': list, # 图片URL列表 - 'error_msg': str # 错误信息，如果成功则为None - } """ try: # 调用文心一言图片生成API @@ -39,7 +30,6 @@ class QwenImageGenerator: api_key=self.api_key, model=self.model, prompt=prompt, - n=n, size=size ) @@ -47,6 +37,13 @@ class QwenImageGenerator: if rsp.status_code == HTTPStatus.OK: # 提取图片URL image_urls = [result.url for result in rsp.output.results] + # 修改错误消息，移除n参数引用 + if not image_urls: + return { + 'success': False, + 'images': [], + 'error_msg': 'API返回空结果，图片生成失败' + } return { 'success': True, 'images': image_urls, @@ -97,7 +94,7 @@ class QwenImageGenerator: 'error_msg': f'保存图片失败: {str(e)}' } - def generate_and_save_images(self, prompt, n=1, size='1328*1328', save_dir='./'): + def generate_and_save_images(self, prompt, size='1328*1328', save_dir='./'): """生成图片并保存到本地 Args: @@ -110,7 +107,7 @@ class QwenImageGenerator: dict: 包含生成和保存结果的字典 """ # 生成图片 - generate_result = self.generate_image(prompt, n, size) + generate_result = self.generate_image(prompt, size) if not generate_result['success']: return generate_result diff --git a/dsLightRag/QWenImage/__pycache__/QwenImageKit.cpython-310.pyc b/dsLightRag/QWenImage/__pycache__/QwenImageKit.cpython-310.pyc index f97ac0f22c146fd4a3944c563da5f5251a195631..32656b6af6159a43956a912de3e5d5f17f4c804e 100644 GIT binary patch delta 978 zcmZ8fOK1~87@mK2c6PJLCTT0FQN-F-OKN>9Q4vKgf}kR_AQmOW&Kev0NM{pYY%D%N z1qESxtB(qbco9lHsp!F*H@zr(^HA$aK@h+C=c4Ma& zYLUHQ>@gCa*;XZG2uPXYHUbE!fNQL71V))v%`!huSf|ZEw ze8V_EdWf(BhTZ49n8r^K;h>J8j-z%a$W2~1H7?M&?g+?8HGcXKkU9r)rXeCtR1*Qe z09a0c6LNBp2)oYDa%>dolW>yc+**w&gB?=m*g~3P>Ydr7zM5s|P)GRoy}N21c)soX zcYk<3J~MG^_QB)XC+hvJ8=szDotbzxd*#yX`0e+Xug~0_`tayp&Im2P*5B{>e#i%g ziY3nvW1f^FvM}VAdiSXpJg>g<(KbuQkyWO(Xh6|tNWT&~5u{L)gT9=v#;wlQEtsPg zqYM~O{P>TA-AEb5g`WMB^69tMM`*}kT^Kt$Fz6L3#p*Fczljxj3r6J(n2>*TV)oTO+QS#k$}j5Z3*fQZ1vsF@`=21ZE|<^~<5rq9RMz?eROY}P_w_bxdf zWsb?e;V|wOPk5rBkBFCp+1`CQL$+(gdK4iqRw~}G$l3qhtXz%RzEsH@_GGc@6{P3a z2CH&|2CmYnh*;&_)lLyzUo$4usN0(XnL;}Ua;a7{^5jxA|&J$kpdMJgH+N48ealbDiMl=A_#D=#6PeS5{KAnFH}O}0z%@Aou(3Dtoi2oz4v|d z-t4>c=#`;ZJr=VFuGH8!=U)0YHUlFuPPsM@lNyh6#zSc7Ji$$Fp=IzSkMJm3jKes| zrPjZMCN%E>D*R>UpE~;7VFgpVlH6HgJk=F1;C5~y%oSWx0gqHDZp{OadK!nThOc{i zMR$z~J5R-Mw+e!uP$hhVTn69Zx@T~Mvt{j7GER6%WiJsP_Ri`R6Acp`))M)g`HWj- z;;{#*I&mX!O#tyjK;}{^#v^Xj3ta}xroAjiP7`kUp?5+k-90bDMUsoo1|Z}5Yw{QC zxXeeMY;OM`J6|ks-Tcege^yuW$F%KT@&y~m>xvd-+( zlPCG7Ak=tJS zY5U6iubg_hy>R_*>#IG)F3%RCE{Zcw8L5sd6z|@ri+9)7wtjAPF0ElR*ao)OyS%-y zxV7>9SiNRHR6C?}aQVBgoFPp7s6u_>fHg#Yrr`!qlZ*O!$V~e5n6BEzM#(*gtgpi*Hl$>SWzrml$K<6%zdU0;0xwEojyDYq zJy@zIhPykpb7**Eh4f~%rTGR zJ+?y8*3zT}KrZxmXBinDL$8r0ID~qV66g(fSIlGUr>s0QRU0C$Act^L3?k-qvFi>Z zPU%gX7geM9G#FJ6E)FWjvj_nzH5zt}=gj|mTyYdrCKF}5W{Z+*7lrN2R$Wn0?7Rxe zex{oybs;Q1K)}4n$TR+C!Jf%GKx-k=+8ssQfK@1oG>#*gU{~`AK{j z((=3bK`6*ycgCuQP5zs{(x Qg{cK$+6MzLK=nWV1-#ogjsO4v diff --git a/dsLightRag/Routes/QWenImageRoute.py b/dsLightRag/Routes/QWenImageRoute.py index 1ea0a4c9..c8d9a4b5 100644 --- a/dsLightRag/Routes/QWenImageRoute.py +++ b/dsLightRag/Routes/QWenImageRoute.py @@ -51,7 +51,6 @@ async def generate_image(request: GenerateImageRequest): # 仅生成图片，不保存本地 result = generator.generate_image( prompt=request.prompt, - n=request.n, size=request.size ) diff --git a/dsLightRag/Routes/__pycache__/QWenImageRoute.cpython-310.pyc b/dsLightRag/Routes/__pycache__/QWenImageRoute.cpython-310.pyc index 2a458c62bf7a4e13019c806ffbe861e44fdac005..4f2e2d9402f73db65528ec5aeea4cf84a523de76 100644 GIT binary patch delta 145 zcmZ1=KUJPLpO=@50SH*5)@3}{$Q#VU!NSDA(8ySIcX9@cH$O`XdoNQhQw>uJha^MM z$;ro9<}yy7oWknL?$5$dB2l@2@&;C2M*qq8Sp69pH|wz(Ffub032aVdFJTrd0vgNI xz{I7+D8|gf%)-dR$o7weZSyCtHH?hqo9FY)U}WsvY{8ev$R5na$Rfzc2mopSBH{o5 delta 156 zcmbO#zd)WhpO=@50SI`)*Jb?L$Q#VU!NJ79(8ySIe{u$kw=i=JLl#R4doOb>Qw>uJ zha^MM>B)y!<}%KloWSbJ9>~H_B2js8@)}lM#=yz9Sp6B9H*2vOFmf;#2>{J365AZh zUcxL<0%S8aFmY)yiZQb=voL}n+g}d$&Cj{kFfvwbp29POk+EyDE?*)edk7aJiy$8( E0Mx!DTmS$7 diff --git a/dsLightRag/Test/TestQWen3Image.py b/dsLightRag/Test/TestQWen3Image.py index da6ecaf6..afcbd0d5 100644 --- a/dsLightRag/Test/TestQWen3Image.py +++ b/dsLightRag/Test/TestQWen3Image.py @@ -34,12 +34,11 @@ def test_get_config(): return False, None -def test_generate_image(prompt, n=1, size='1328*1328', save_local=True): +def test_generate_image(prompt, size='1328*1328', save_local=True): """测试生成图片接口 Args: prompt: 图片描述提示词 - n: 生成图片数量 size: 图片尺寸 save_local: 是否保存到本地 @@ -51,13 +50,12 @@ def test_generate_image(prompt, n=1, size='1328*1328', save_local=True): headers = {"Content-Type": "application/json"} data = { "prompt": prompt, - "n": n, "size": size, "save_local": save_local } logger.info(f"调用生成图片接口: {url}") - logger.info(f"请求参数: prompt={prompt[:50]}..., n={n}, size={size}, save_local={save_local}") + logger.info(f"请求参数: prompt={prompt[:50]}..., size={size}, save_local={save_local}") # 记录开始时间 start_time = time.time() @@ -109,7 +107,6 @@ def main(): basic_prompt = "一只可爱的小猫在草地上玩耍，阳光明媚，高清细节" generate_success, generate_data = test_generate_image( prompt=basic_prompt, - n=1, size="1328*1328", save_local=True ) @@ -117,13 +114,11 @@ def main(): # 3. 测试生成图片接口 - 不同参数 if config_success: supported_sizes = config_data["data"].get("supported_sizes", ["1328*1328"]) - max_images = min(2, config_data["data"].get("max_images_per_request", 1)) # 为了测试效率，最多请求2张 - - logger.info(f"\n3. 测试生成图片接口 - 不同参数(size={supported_sizes[0]}, n={max_images})") + + logger.info(f"\n3. 测试生成图片接口 - 不同参数(size={supported_sizes[0]})") different_prompt = "美丽的山水风景画，中国水墨画风格" test_generate_image( prompt=different_prompt, - n=max_images, size=supported_sizes[0], save_local=True ) @@ -132,8 +127,7 @@ def main(): # 输出测试结果摘要 success_count = sum([config_success, generate_success]) - total_count = 2 # 基本测试的接口数量 - logger.info(f"测试结果: {success_count}/{total_count} 接口测试成功") + logger.info(f"测试结果: {success_count} 接口测试成功") if __name__ == "__main__":