From e05ad23fe2ed5e8ef2f5e1ab9e9e1a56d474a4e6 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 20 Aug 2025 07:58:55 +0800
Subject: [PATCH] 'commit'

---
 dsLightRag/KeLing/Kit/KlCommon.py             |  17 ++++++---
 .../Kit/__pycache__/KlCommon.cpython-310.pyc  | Bin 3549 -> 3756 bytes
 dsLightRag/KeLing/KlTxt2Img.py                |  33 +++++++++++-------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/dsLightRag/KeLing/Kit/KlCommon.py b/dsLightRag/KeLing/Kit/KlCommon.py
index 695e40ce..05aa7269 100644
--- a/dsLightRag/KeLing/Kit/KlCommon.py
+++ b/dsLightRag/KeLing/Kit/KlCommon.py
@@ -29,15 +29,24 @@ class KlCommon:
             # 构建JWT令牌
             payload = {
                 'iss': KlCommon.ak,
-                'exp': expired_at,
-                'nbf': not_before
+                'exp': int(expired_at.timestamp()),  # 转换为Unix时间戳
+                'nbf': int(not_before.timestamp())   # 转换为Unix时间戳
+            }
+
+            # 定义JWT头部
+            headers = {
+                'alg': 'HS256',
+                'typ': 'JWT'  # 添加类型声明
             }
 
             # 使用HS256算法签名
-            jwt_token = jwt.encode(payload, KlCommon.sk, algorithm='HS256', headers={'alg': 'HS256'})
+            jwt_token = jwt.encode(payload, KlCommon.sk, algorithm='HS256', headers=headers)
+            # 增强调试信息
+            log.info(f"生成JWT令牌: {jwt_token[:10]}...{jwt_token[-10:]}")  # 只打印部分令牌
+            log.debug(f"JWT过期时间: {expired_at}")
             return jwt_token
         except Exception as e:
-            log.error(f"获取JWT令牌失败: {str(e)}")
+            log.error(f"获取JWT令牌失败: {str(e)}", exc_info=True)
             return None
 
     @staticmethod
diff --git a/dsLightRag/KeLing/Kit/__pycache__/KlCommon.cpython-310.pyc b/dsLightRag/KeLing/Kit/__pycache__/KlCommon.cpython-310.pyc
index 7b10a58d44639d94794cd7951c568011c1bdfa88..00c75f7818b5386095c0a8e160ef1295fcd37bf4 100644
GIT binary patch
delta 946
zcmZuvPe@cj7@wK<_PP7^udTNJL0vV?C0HU9#EK4Og^@uDl9y%Md9Kg>^R{`jtjca4
zBq~S<Uf@ARg*pTs3av|rpmRazA#bI5=+LEG*?dpPL%m^s{J!~p?>F;(Gdry>+Co+^
zs3ZC9gq}^Gh`tJa!ck3zuy#>S`?G}kQRfHlTi~85+R!%9B9;svGODgBH9|d9qjjsK
zrtrEMZ<TOm#z#F>g?g9Nn#%PJKlN2ril}~%G@}(n{W1zrbQrCvn;0XR6`;YYRM!Z^
zRdoW5Ar<l9Tmhq+2M?h6DA#8~G{nPI&mx9I8m5sYg3$!Jg{Vxr>!I?eLsr2Rl&E)V
z<aBssVmv`6m2^HU6h2pSUXs|kdRf@sll9#PkEQzM?bE%7kA~v=Q1`r&OeW2r2L}gb
zNRslmclUQ!*LRoS>@RN*#mh10gRf~}C_bLR!fVWCQf6_=N<<iu*+MJxOwp<^MFtF7
zDM&ge6tl>MkDCR<=IKI7C^Ho<G^3cYs3C|g6Y^G8s9+>K)VN*F3g7T-#wc;qDhiLm
zn8k!*bC%F1bz`<<GG{<(iLn4|;FD%4Zsm-kz{YdLI-Im}wYyhJgdCGYRduXm?HBP9
zto?4#dPxLpIE0(F-YX7iJPs#~0W<@&0JJ(e?Lv1u(2l<lmrMkyRVn7JG)+yJd82>p
zqgGIGz&WdbZ|sCj*P{m*9Dtp4&iiBjqb&xVlz*`8a1XExkBr?Iy<|WihM~wrSUB7M
z&PW@GN}1)|5?Rvu>hHSN4~_!>gCKitD_?dS<Z~O8D%e@}zcbh0DI07q#nW~!CHv3I
z_I2lGU}Yf!R*hg4fMqjNF!;1ZnOn#i5HAB9b--nDSc97l$!Rx8@FJDSfeFzuX_vDp
xgx!opkPS&))XCe;n#C+TB_sEp!29qb7KOOS;lZwsD?r^wf%iX~I<JF$e*nd(?E3%!

delta 728
zcmZvZ&rcIU6vt;~XS;28yHG%&N<q*_8x#%EXuMzoy?D?>4nz}E8)j&?zgB056iCqn
z9z5v9If98EJeYVf_-~kap2UNHfH7W8Onk2#IOtB^XTNXWkJ&f-vH0yw80T_X0?&f~
zz9I9U!mo7H1sC^Lz>=4M-IDo5OQKKuRPaM*k7>7=>ND*$J>iO!a3d<bSA5UuJL_bP
zaH7*Y6-xFvCA)c@d7Bk!?f3aUJs@w`J4(qqxlaVdpK<~D$Ertrq?|Ed*p))9T`x16
zfmf^|-RM}aA!|aa#5{DSSUE5+oZ_WsPurC2Zp1=bmb7f9vb`Z6>nQG8rybX=E0v0s
zbrP-0uKDTAPS_08RCU~vT}$N$q9$Rs-`C6|dcoY|#ljT0jE%tJoKZ$oe<r;Y4e8j?
zYi`*12!t(<x|^}egH)r4F>}*fJ~x39yB(td%H~Ae>$c;XsBT7Wxo~vobsXxOtpDTs
zY0Mn-m_{{&I18{`%WZ9WGl3yotW6Z2s^$?(W-+)?JU$hZhi<Rky|XIu0xCFadFX-J
z4`zqQG3acmw(_y8WIhLT{vyiDh$ZtqD9r!wi}O#mq}r+KTGFZ}x~8|1RWqAAc$UMm
zVSo*AJKE?--H3%6jBycz%ZQWt2MRAir2rvVG6qN!&R|i-vXq?yn+)k7qnuM$A#OeR
lZ}q5KSLeY~4B=pz!WL@Utb}tjw@?l)1$+N<sCgci{sLG?r33%~

diff --git a/dsLightRag/KeLing/KlTxt2Img.py b/dsLightRag/KeLing/KlTxt2Img.py
index 77ae7cee..153be2ce 100644
--- a/dsLightRag/KeLing/KlTxt2Img.py
+++ b/dsLightRag/KeLing/KlTxt2Img.py
@@ -9,6 +9,7 @@ from KeLing.Kit.KlErrorCode import KlErrorCode
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 log = logging.getLogger(__name__)
 
+
 class KlTxt2Img(KlCommon):
     BASE_URL = "https://api.klingai.com"
     GENERATION_PATH = "/v1/images/generations"
@@ -43,7 +44,8 @@ class KlTxt2Img(KlCommon):
         log.info(f"生成图片请求体：{json.dumps(request_body)}")
 
         try:
-            response = requests.post(url, headers=headers, json=request_body)
+            # 添加超时设置，避免请求长时间挂起
+            response = requests.post(url, headers=headers, json=request_body, timeout=30)
 
             # 检查响应状态码
             if response.status_code != 200:
@@ -94,22 +96,24 @@ class KlTxt2Img(KlCommon):
         """
         return KlCommon.query_task_status(task_id, KlTxt2Img.QUERY_PATH, "文生图")
 
+
 if __name__ == "__main__":
     try:
         # 提示词和模型名称
         prompt = "一只可爱的小猫咪在草地上玩耍，阳光明媚"
         model_name = "kling-v1"  # 可选：kling-v1, kling-v1-5, kling-v2
-        save_image_path = f"{KlCommon.base_path}KeLing_Txt_2_Image.png"
+        save_image_path = f"{KlCommon.base_path}\KeLing_Txt_2_Image.png"
 
         # 添加重试逻辑
         generate_retry_count = 0
         max_generate_retries = 5  # 最大重试次数
-        generate_retry_interval = 5000  # 重试间隔（毫秒）
+        initial_retry_interval = 2000  # 初始重试间隔（毫秒）
+        max_retry_interval = 30000  # 最大重试间隔（毫秒）
 
         task_id = None
         account_issue = False
 
-        while not account_issue:
+        while generate_retry_count < max_generate_retries and not account_issue:
             try:
                 task_id = KlTxt2Img.generate_image(prompt, model_name)
                 break
@@ -118,18 +122,22 @@ if __name__ == "__main__":
 
                 # 检查是否是账户问题
                 error_msg = str(e)
-                if "资源包已耗尽" in error_msg or 
-                   "账户欠费" in error_msg or 
-                   "无权限" in error_msg:
+                if "资源包已耗尽" in error_msg or "账户欠费" in error_msg or "无权限" in error_msg:
                     log.error("账户问题，停止重试")
                     account_issue = True
                 else:
                     generate_retry_count += 1
                     if generate_retry_count < max_generate_retries:
-                        log.warn(f"等待{generate_retry_interval}毫秒后重试...")
-                        time.sleep(generate_retry_interval / 1000)  # 转换为秒
+                        # 指数退避策略: 基础延迟 * 2^(重试次数-1)，但不超过最大延迟
+                        current_interval = min(initial_retry_interval * (2 ** (generate_retry_count - 1)), max_retry_interval)
+                        log.warning(f"等待{current_interval}毫秒后重试...")
+                        try:
+                            time.sleep(current_interval / 1000)  # 转换为秒
+                        except KeyboardInterrupt:
+                            log.error("用户中断了程序执行")
+                            exit(1)
                     else:
-                        raise e  # 达到最大重试次数，抛出异常
+                        log.error(f"生成图片失败，已达到最大重试次数: {max_generate_retries}")
 
         if task_id is None:
             if account_issue:
@@ -180,8 +188,7 @@ if __name__ == "__main__":
                 else:
                     raise e  # 达到最大重试次数，抛出异常
 
-        if query_retry_count >= max_query_retries:
-            log.error(f"任务查询超时，已达到最大查询次数: {max_query_retries}")
-
+            if query_retry_count >= max_query_retries:
+                log.error(f"任务查询超时，已达到最大查询次数: {max_query_retries}")
     except Exception as e:
         log.error(f"程序执行异常: {str(e)}", exc_info=True)
\ No newline at end of file