MeUtils 2025.3.7.22.46.32__py3-none-any.whl → 2025.3.13.19.7.25__py3-none-any.whl

{MeUtils-2025.3.7.22.46.32.dist-info → MeUtils-2025.3.13.19.7.25.dist-info}/RECORD

@@ -91,7 +91,7 @@ examples/_openaisdk/kimi_qa.py,sha256=dNBIe01vK7p-8cFnbgVXJ5H3xPSW32-cc0rwZx3K_1
 examples/_openaisdk/minimax.py,sha256=zOshBkL1bHgRlj4z6k2FQRScNTr7ysZkfh2-OaAynkU,2116
 examples/_openaisdk/open_router.py,sha256=ky_tdPX9CZkq4rAnjaFrOY_bygZuy6V8jIQfh6bq9U0,1497
 examples/_openaisdk/openai_aiplus.py,sha256=7sT2t4jjZBABFiwKQwUjgdilO8s006NuPAPx7neHER8,1182
-examples/_openaisdk/openai_audio.py,sha256=ZyYslH9RfdJBpNUpjKn_5x0d94_H291Qt31u_6weISc,484
+examples/_openaisdk/openai_audio.py,sha256=Fcp-k4CzU0oB7vDKldRLwUCIRIwwVn_w9CmbEWacbOk,1002
 examples/_openaisdk/openai_baichuan.py,sha256=-xhHovkFmWOTX25CJjIon0my-ocmwfAZJu1C0eS80Xs,1614
 examples/_openaisdk/openai_baidu.py,sha256=qnrxP66lY7Qf2jEbFEHrt0FrR5_Aji1AgwSI_46IabY,1969
 examples/_openaisdk/openai_cache.py,sha256=89GbJ1QlqQbVxlUeuFgEbwDYHOkum7BK0zB-CqmDAZU,726
@@ -107,7 +107,7 @@ examples/_openaisdk/openai_files.py,sha256=zcF4k4sQ2FnINhq6x1wCKw1WCu93g1h69Yul_
 examples/_openaisdk/openai_gitee.py,sha256=UQEJMQMQDhgqYzo_aYetYXnBmVtqRwIweJDDK3NlSMw,1205
 examples/_openaisdk/openai_god.py,sha256=O8fbhyxiIlVR7pTvBTXgQ2QTwfcZ2MkEIyDe_jp797A,1056
 examples/_openaisdk/openai_groq.py,sha256=_5Ue1yEx0Gp6theFioB_D8kepR0UlqMU96PVGH-LkVY,7363
-examples/_openaisdk/openai_images.py,sha256=dPsJniqSfE_pUzgB_3VwKCC1q_T0sG0bvi6ZmJZ2udg,6003
+examples/_openaisdk/openai_images.py,sha256=RAnLVKGAXXrStRSfZQ2k584vfEpACf94s1_g57IV2Xc,6005
 examples/_openaisdk/openai_jina.py,sha256=QeGRXMQmkJyg8Cz4Vfx4pP39a5TcO7pQQfPAPbBA8bs,1628
 examples/_openaisdk/openai_json.py,sha256=M4tq_IkzYbmtgbFilGQHmRdJhH0OltiwGk7cK7uc-sQ,1850
 examples/_openaisdk/openai_kindo.py,sha256=dRQd8BOUDlWo4xp2l1s3BeP7qv19i7CUjx14NRv1fxM,741
@@ -348,7 +348,7 @@ meutils/apis/chatglm/temp.py,sha256=zYe6JGUHVfb77T_TdNsdmpTs2D9OyqDTUEkblDAIoYY,
 meutils/apis/chatglm/x.py,sha256=lI86Cd6SN4noCN5HM9gRugcVmjHDtxDTV4m-7Bj61N0,24312
 meutils/apis/fal/__init__.py,sha256=A7w3ZAS7Tv20N4X4Em6NshDxKSCPAzaPxHJTbM3BbyM,272
 meutils/apis/fal/files.py,sha256=Gppdo96uw8-TCDr8P691jV7dK9Si-E-kJXFJR5BVt-Q,1373
-meutils/apis/fal/images.py,sha256=GGYQMKf9aNXLQ_x0VtSmn6chRti_YWzuDDy2qha7qN4,8546
+meutils/apis/fal/images.py,sha256=YacJb4sdyv2J-R_OPc_P6d6EB2HhndRt862wEHsjRSU,8546
 meutils/apis/fal/images_.py,sha256=C-C1TTQtMJ6RRcd-4FeYPn0R5IpPRPUFmBbrTVs_ypA,1446
 meutils/apis/fal/pd.py,sha256=oPrMK_FJqohl2Kf0U0it8SqgvIlSEYFcSX8sfVkD8bU,311
 meutils/apis/fal/videos.py,sha256=GzMyS-nBMGAXHaCLKxgCdzowB3jpJDXLb6-y1v0zKNo,3387
@@ -361,7 +361,7 @@ meutils/apis/hailuoai/demo.py,sha256=WTnDFL2HgVpAjcn5BljLrbf2y2aATkvvNy75zoEIQkc
 meutils/apis/hailuoai/hasha_new.py,sha256=1sD3fxmxYrEufmPaJZGAkYJoHKO85hfLXemnY-xYIO8,9101
 meutils/apis/hailuoai/music.py,sha256=S_oi-ZDbocTfbRgREdXtGx50xzUc1PCZGuxmr917E7M,265
 meutils/apis/hailuoai/upload.py,sha256=22S6W6hGQhUquVKqh7QCkXb6KHDl3iMKKi6Z0AJdFEI,6501
-meutils/apis/hailuoai/videos.py,sha256=hoVSbEjHfp2PIFxKL2n5Yy56DIhNkCrE3iKay8Yk3_E,20915
+meutils/apis/hailuoai/videos.py,sha256=98JGBHSh1eL3tTzOIKdCRC4_oHQW74By2S8kGn3QPdY,21195
 meutils/apis/hailuoai/yy.py,sha256=du4CmLx5ebAI5FXe8NzQsmwpdA1_Kdxm7hgo5k9Zf-A,9016
 meutils/apis/hf/__init__.py,sha256=ZZoRl8yNYekoMhE__67XXBKNSYJaLgjtaa0netjJKUU,271
 meutils/apis/hf/got_ocr.py,sha256=pZURFpryDh_Ak6PNiARztOzYgkjVrfScJ5-0XzMBrzI,1776
@@ -393,11 +393,11 @@ meutils/apis/jiema/24mail.py,sha256=GUszRtoDe3T9q-X4embwT5YhcjgQ3XnkTJMKX93sCF4,
 meutils/apis/jiema/__init__.py,sha256=YBybggoDRYCNYcwJOypxR7MzfTjIhqO7BkGlTt7NDo4,271
 meutils/apis/jiema/yezi.py,sha256=26vhnA3lC5049Rqx-CHO-wyGKbdZAfvjEOG90W38cr0,3675
 meutils/apis/jimeng/__init__.py,sha256=a8CE_cOl9jqal0hycwaLm4Mnga8jmZlz9nCze_9bBqA,272
-meutils/apis/jimeng/common.py,sha256=dJcex3hh1eyLwSJwlfeHlaTal9_h5ERvOTb2PSrF96I,6763
+meutils/apis/jimeng/common.py,sha256=vlNbB5YAylMrL-Lq_04JNy-XQxwU2m3vC-R4B3pDX4U,6810
 meutils/apis/jimeng/doubao.py,sha256=5OdnBpmZQOCLIb6lnN8YrL7J7E0XF47q0UF-z6asSuI,4295
 meutils/apis/jimeng/doubao_utils.py,sha256=XCHnvwfCOtJmPQuzDOCfKDMP_Pcqh-Y4w2h5f7Y2gzM,5999
 meutils/apis/jimeng/files.py,sha256=E-pPmi6fIP_n6wgfiDbqeWsIfrXVZUe7LpA6Wds1xDI,11047
-meutils/apis/jimeng/images.py,sha256=ntGcXQvgdh9KuhYtcVGvlPY36wRUh7TR3fpU45j1VRc,13034
+meutils/apis/jimeng/images.py,sha256=84Dte9cf-QBduMUgdXC82F91slAZVIlOkNFtaTJ83ac,13211
 meutils/apis/jimeng/videos.py,sha256=x-PDOYNBN-yTmNvMbyDbwm_E2LXZ6A4hcVzEahV_Hvc,10813
 meutils/apis/kling/__init__.py,sha256=pKz40SEjui1dhHBD-icyNTJOYhzLvxLxJCwszuH4vio,271
 meutils/apis/kling/api.py,sha256=8NEWunWX3pVWhZzDnzw6rd07nPfOuY2T-XkgL86ZWYg,2328
@@ -498,11 +498,8 @@ meutils/async_utils/background.py,sha256=dl6UaMIFBZDB1uxSZzGFJdSnpt3Xo0flK7gwsok
 meutils/async_utils/common.py,sha256=bfZkUlQz21WHAh2W7SDxFtrvUYNBnRfVxIUgMmT7o1Q,5212
 meutils/async_utils/test.py,sha256=lkZdgSzzgVg8hYVcaBNEJ3KBvFTEfjbXZVvtknQZsRQ,1155
 meutils/caches/__init__.py,sha256=hIUEqNnmhukkbKK2F39bXe-MGDwzeUoTOf_sYly53xo,291
-meutils/caches/acache.py,sha256=sNpnX89oDjrB14CVusddJWxo2Jp5GB4h2lVSkJvXBv8,2791
-meutils/caches/c.py,sha256=9hm9x_xMRGtqG51SirOS3Pzi2L9zxU_nov4muE5iJ48,699
+meutils/caches/acache.py,sha256=ajuQkQUt4ojGEMUNO0IGpJTZKL3tWK0F4pBZU2uxl6g,3198
 meutils/caches/common.py,sha256=_shMi_U99g5vzfg9SAmUQHVE2IgWyiNATiSBBsDKGHI,1743
-meutils/caches/demo.py,sha256=tY3mJUe4D2gbBVMd8gny40nK2BwqBGsaWDjDJsL7ObE,758
-meutils/caches/redis_.py,sha256=5Oxq_XT5BJ7C9emzsXWDkiY4p8dVG7XFn0WxB14-z5E,600
 meutils/caches/redis_cache.py,sha256=oXGk_CZhjp9P_z1TG_zhmma4iGepK-iIWY_ZYQWSkFg,1395
 meutils/caches/redis_mulit.py,sha256=WQrNmH98S0D9mG5eixqPtrYvOPi62T4w2ZvNETB4eU4,597
 meutils/clis/__init__.py,sha256=2Fhn43X8kFP6FpAnnAMiPcdnjUwQaukiIr2uGB6mGAY,279
@@ -530,7 +527,7 @@ meutils/config_utils/lark_utils/demo.py,sha256=3g0Fs7oLaeW75T60gYWMLgyNg1OnfOjfH
 meutils/config_utils/lark_utils/x.py,sha256=MlMQGhehP9xMEgetxVCX68XFaosfKoW1JA5cZ3JqN2w,1857
 meutils/crawlers/__init__.py,sha256=TBU4xA-IOsHV-0yIkW7YXxn_QT7TT8NncqxO7IykEfs,271
 meutils/data/SimHei.ttf,sha256=-XEnekS5yHP_URkT4XBI2w22ylV-KxudhkeIYFbrILA,10062565
-meutils/data/VERSION,sha256=Y3w-YpvEyc9Uj2fdHdypgmnZIVaD56sRSluqFvoNrGA,19
+meutils/data/VERSION,sha256=gvMaT5MaUqFzPLIuAj4fFtRKp8q9SVrRZa7KdzFCTP0,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -618,10 +615,10 @@ meutils/llm/demo.py,sha256=gyGjTxuNFMOa1X4CXaChkq0lcjbKiRsnSRhkeMvsoQk,3822
 meutils/llm/mappers.py,sha256=ZQLl3OuD06kVMP8bwIpVgAB1UVzMJWUJiZ3vgk-ZjeI,303
 meutils/llm/utils.py,sha256=4u3b8VO3wX3xKny1AdV4579qXux1YA4k5gI-CYPtx0o,4279
 meutils/llm/x.py,sha256=ETvKKDTmDNrik0K2-_a_SEQxyV4X4-fy0JPrAOLNPv4,1732
-meutils/llm/completions/__init__.py,sha256=Z9b0uVj0DuprlPVvLqb-jYf5hk7C1rD-c3fMIQHxVEY,271
+meutils/llm/completions/__init__.py,sha256=q5FEYPpo2f_P44Ghdh9fkrmqZLX2Asso8p-nf-ZTqks,244
 meutils/llm/completions/chat_gemini.py,sha256=tAbWcNmcZUqvpS9ZCLuljTKYE0nNRSIMxo4VqssVAIA,1784
 meutils/llm/completions/chat_plus.py,sha256=g5I8WRX7NC4hIyAUqHExs8a9pwDOUdejanf1F2PUAxc,2207
-meutils/llm/completions/chat_spark.py,sha256=HwVAIzpfTLwxPgO0U6WfhmpKEAKV_nofyG7A1003JMo,5680
+meutils/llm/completions/chat_spark.py,sha256=MBo4IlkEA9NhIyXYG6F0vbJkpQbO-awM1lHTWwM6M7E,9768
 meutils/llm/completions/cp.py,sha256=tGf3umHKXDH0KuTfN7BLr8yAvN6MYWLYR5UVaJkJs0c,4172
 meutils/llm/completions/delilegal.py,sha256=mr53ps7I33SC8Fjy4rma-xoNF-mLgwdZfHgdSOyLtQY,5131
 meutils/llm/completions/dify.py,sha256=dqL_8uxAp2d8M00pkyh2I30tflwi4pUyX-V6pwe3_BA,3048
@@ -768,7 +765,7 @@ meutils/schemas/metaso_types.py,sha256=r_X0Exs_2S3rNS71RneemMpz7EvBIOLBfAMmWMQRn
 meutils/schemas/napkin_types.py,sha256=Kp0MbpRxzMBz4HWW4DrfcgOvHZVEF3N7P5yNeC1XGI4,2664
 meutils/schemas/ocr_types.py,sha256=fZWYQAKii7HaTlSU9DS0wHyiEoOHuLnhvgoiH4Cn498,1381
 meutils/schemas/openai_api_protocol.py,sha256=0GhmhUTEr54N_XCVuZI1MSxJldvwMNJjUAAAdWznw58,12716
-meutils/schemas/openai_types.py,sha256=5E3Bst59AAdZKveHHMcAjwUqKAmwEZw4-oauwYnJFzs,16616
+meutils/schemas/openai_types.py,sha256=TIUF1fYu3oMOeilPN7uQRcLdNsCIHhbfKAh1T2CHN4E,19996
 meutils/schemas/pixverse_types.py,sha256=3mHg2KxvszV1U8K3GdzsODZz4uocLVRjEeJgYhX0Xmw,2347
 meutils/schemas/playwright_types.py,sha256=zhZd53m1Wg4zlGtq2JM4z7Aon-u_eF6rzs-_TFYWvkU,1177
 meutils/schemas/prodia_types.py,sha256=knh_lzAxMfWMoqAPmvyMweay9PmQmsoQ1X6Mj17ohWg,476
@@ -790,7 +787,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=YanT0q9pU7dva2ZBPWjCpwGNUuifnJh0zUJJCQ9070c,3848
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=ryEhnFjHUlnGJnjHPbp2P66R7jhDwmDuLa_JOPo5BDg,31140
+meutils/schemas/oneapi/common.py,sha256=BDuvwo1uJjntTknxCvvwYgRRART2tQLDT6Ll_u0Mzgk,31188
 meutils/schemas/oneapi/icons.py,sha256=T7W5gInBJoHe62wzMimbG_UI-wn3_-rmQ1O4O2z-CQY,1089
 meutils/schemas/oneapi/model_group_info.py,sha256=rGtflYJuFIjk5MsVEvK9JUR4IciX8jfErqeLqf8DIlQ,1586
 meutils/schemas/oneapi/model_info.py,sha256=_uwKEPIIqm7ZYfhmpxtXB2QNsS83SpJY-OaBzvogC9w,772
@@ -919,9 +916,9 @@ meutils/tools/seize.py,sha256=nOKAS63w-Lbi48I0m2MPhdsokUTwxco0laPxYVmW4Mw,1064
 meutils/tools/service_monitor.py,sha256=ibsLtBN2g2DL7ZnLJ8vhiZOiOcqTAyx711djDdBK-3M,1255
 meutils/tools/sys_monitor.py,sha256=6MoyzrItqDUOSjfHcMJmMofQkEPTW36CT_aKui0rg84,429
 meutils/tools/token_monitor.py,sha256=Np-YK-R4P4IPAXyZvMxwvXI4sFmNJQAQK1lSegNaYpA,997
-MeUtils-2025.3.7.22.46.32.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.3.7.22.46.32.dist-info/METADATA,sha256=8WSzySIQFHqgcETMsJwYXblzuyRVqsh3DvnyV3ZlkkA,32833
-MeUtils-2025.3.7.22.46.32.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.3.7.22.46.32.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.3.7.22.46.32.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.3.7.22.46.32.dist-info/RECORD,,
+MeUtils-2025.3.13.19.7.25.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.3.13.19.7.25.dist-info/METADATA,sha256=TWL4tG_hKS1nKv2xQRh_VxmD9RAgk-hpG5C-H2jhygY,32833
+MeUtils-2025.3.13.19.7.25.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.3.13.19.7.25.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.3.13.19.7.25.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.3.13.19.7.25.dist-info/RECORD,,

examples/_openaisdk/openai_audio.py

@@ -12,9 +12,28 @@ from meutils.pipe import *
 
 # base_url = "https://openai-dev.chatfire.cn/audio/v1"
 
+# model = "FunAudioLLM/CosyVoice2-0.5B"
+# voice = "FunAudioLLM/CosyVoice2-0.5B:alex"
 
+text = """
+东北证券公司的精神
+融合 创新 专注 至简
+
+“融合”：融入市场、融通资源、融合发展
+
+“创新”：勇于突破、追求卓越、超越自我
+
+“专注”：专一专业、忠诚敬业、重德守律、做到极致
+
+“至简”：简约简朴、脚踏实地、知行合一
+"""
 r = OpenAI(
     # base_url=base_url
-).audio.speech.create(input="你好呀", model='tts-1', voice="alloy")
+).audio.speech.create(input=text,
+                      model='tts-1',
+                      # model=model,
+                      # voice="1"
+voice="alloy"
+                      )
 
-r.stream_to_file('xx.mp3')
+r.stream_to_file('nesc.mp3')

examples/_openaisdk/openai_images.py

@@ -196,7 +196,7 @@ with timer('image'):
     response = client.images.generate(
         model=model,
         prompt=prompt,
-        response_format="b64_json",
+        # response_format="b64_json",
         # extra_body={
         #     "Style": "True",
         #     "controls": {}, ######### 这个看起来更通用些

meutils/apis/fal/images.py

@@ -143,9 +143,9 @@ if __name__ == '__main__':
         }
 
     # model = "fal-ai/flux-pro/v1.1"  # 0.04
-    # model = "fal-ai/flux-pro/v1.1-ultra"# 0.06
+    model = "fal-ai/flux-pro/v1.1-ultra"# 0.06
     # model = "fal-ai/flux/dev/image-to-image"  # 0.03 图生图
-    model = "fal-ai/recraft-v3"  # 0.04 变清晰
+    # model = "fal-ai/recraft-v3"  # 0.04 变清晰
     # model = "fal-ai/ideogram/v2" # 0.08
     # model = "fal-ai/ideogram/v2/turbo"  # 0.05
     # model = "fal-ai/flux/schnell"

meutils/apis/hailuoai/videos.py

@@ -38,7 +38,7 @@ send_message = partial(
 MODEL_MAPPING = {
     # video-01 video-01 video-01-live2d S2V-01
 
-    "t2v-01": "23000", # 23010
+    "t2v-01": "23000",  # 23010
     "t2v-01-director": "23010",
 
     "i2v-01": "23001",
@@ -318,7 +318,6 @@ async def create_task(request: VideoRequest, token: Optional[str] = None):
 
 # 307134660730421250
 async def get_task(task_id: str, token: str):
-
     task_id = task_id.rsplit('-', 1)[-1]
 
     params = {
@@ -421,6 +420,7 @@ if __name__ == '__main__':  # 304752356930580482
     # arun(get_task(task_id="307177115102699528", token=token))
 
     token = None
+    token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDQ3MDMwNzIsInVzZXIiOnsiaWQiOiIzMDI4MzM4Njc3NzE5NDkwNTgiLCJuYW1lIjoibWUgYmV0dGVyIiwiYXZhdGFyIjoiIiwiZGV2aWNlSUQiOiIzMDI4MzM3NTk1MTI3NjQ0MTciLCJpc0Fub255bW91cyI6ZmFsc2V9fQ.Mjb64ZjkKyV9pj-_bXyLczU6kU729VLaKbYj9NmrK-4"
     # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MzUxMTcwNzcsInVzZXIiOnsiaWQiOiIzMTEyOTUzMTkzMjc1NzYwNjQiLCJuYW1lIjoiVUdIUiBKVkJYIiwiYXZhdGFyIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jS3RuR2NjdGZsWV9fR2tiQ1MzdnhzSXdWSEFUX0ZmMFdyb3RvMnN4bFdWZW1KMm53PXM5Ni1jIiwiZGV2aWNlSUQiOiIzMTMzMTU5NTMxMDA0MTA4ODciLCJpc0Fub255bW91cyI6ZmFsc2V9fQ.KsRcfnAoPAR08ygzq-GIiujkFbZ2CgLeww7EP9qcb9Q"
     request = VideoRequest(
         model="I2V-01-live",
@@ -432,7 +432,7 @@ if __name__ == '__main__':  # 304752356930580482
     )
 
     r = arun(create_task(request, token=token))
-    arun(get_task(task_id=r.task_id, token=r.system_fingerprint))
+    # arun(get_task(task_id=r.task_id, token=r.system_fingerprint))
     #
     #
     # data = {

meutils/apis/jimeng/common.py

@@ -179,6 +179,7 @@ if __name__ == '__main__':
     token = "1c21a9fe6a4230609d7ff13e5cec41ec"
     token = "34438eb03d165737122180caf62a8058"
     token = "ffeee346fbd19eceebb79a7bfbca4bfe"
+    token = "b8bb4cb67dba6c0d1048bdc0596bc461"
     arun(check_token(token))
 
     # print(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0].tolist())

meutils/apis/jimeng/images.py

@@ -191,9 +191,9 @@ async def create_draft_content(request: ImageRequest, token: str):
     return draft_content
 
 
-@retrying(max_retries=3)
-@rcache(ttl=24 * 3600, serializer="pickle")
-async def create_task(request: ImageRequest, token: Optional[str] = None):
+@retrying()
+@rcache(ttl=30 * 24 * 3600, serializer="pickle", key_builder=lambda *args, **kwargs: args[1].prompt)
+async def create_task(request: ImageRequest, token: Optional[str] = None):  # todo: 图片
     token = token or await get_next_token_for_polling(FEISHU_URL, check_token)
 
     url = "/mweb/v1/aigc_draft/generate"
@@ -228,7 +228,6 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):
         logger.debug(bjson(data))
 
     if task_id := (data.get("data") or {}).get("aigc_data", {}).get("history_record_id"):  # bug
-
         return TaskResponse(task_id=task_id, system_fingerprint=token)
     else:
 
@@ -355,29 +354,29 @@ if __name__ == '__main__':
 
     from meutils.apis.jimeng.files import face_recognize
 
-    face_recognize = arun(face_recognize(image_url, token))
-
-    face_recognize_data = face_recognize.get("data", {})
-
+    # face_recognize = arun(face_recognize(image_url, token))
+    #
+    # face_recognize_data = face_recognize.get("data", {})
 
     data = {
         "model": "seededit",
-        # "prompt": "https://oss.ffire.cc/files/kling_watermark.png 让这个女人带上墨镜，衣服换个颜色",
+        "prompt": "https://oss.ffire.cc/files/kling_watermark.png 让这个女人带上墨镜，衣服换个颜色把",
         # "prompt": "草拟吗 艹",
-        "prompt": "让这个女人带上墨镜，衣服换个颜色",
+        # "prompt": "让这个女人带上墨镜，衣服换个颜色",
+        # "prompt": "Add a background for this photo, sort of sizzle it.",
 
         "size": "1024x1024",
 
-        "controls": {
-            "face_recognize_data": face_recognize_data
-        }
+        # "controls": {
+        #     "face_recognize_data": face_recognize_data
+        # }
     }
-    arun(generate(ImageRequest(**data)))
+    # arun(generate(ImageRequest(**data)))
 
     # arun(generate(ImageRequest(prompt="fuck you")))
     # prompt = "A plump Chinese beauty wearing a wedding dress revealing her skirt and underwear is swinging on the swing,Happy smile,cleavage,Exposed thighs,Spread your legs open,Extend your leg,panties,upskirt,Barefoot,sole"
     # request = ImageRequest(prompt=prompt)
-    # task = arun(create_task(request))
+    task = arun(create_task(ImageRequest(**data), token=token))
 
     # arun(get_task(task.task_id, task.system_fingerprint))
 

meutils/caches/acache.py

@@ -12,12 +12,11 @@ import os
 from meutils.pipe import *
 from meutils.db.redis_db import async_pool
 
-from aiocache import cached
-
 from aiocache import cached, Cache, RedisCache, caches
 from aiocache import multi_cached
+from meutils.schemas.image_types import ImageRequest
 
-logger.debug(async_pool.connection_kwargs)
+# logger.debug(async_pool.connection_kwargs)
 
 REDIS_URL = "redis://:chatfirechatfire@110.42.51.143:6379"
 
@@ -54,9 +53,21 @@ async def cached_fc(user_id, **kwargs):
     return False
 
 
-@rcache(ttl=3)
-async def redis_fc(user_id, **kwargs):
+# global x
+#
+# key_builder = lambda *args, **kwargs: "key"
+# key_builder = lambda *args, **kwargs: args[0].prompt
+key_builder = lambda *args, **kwargs: args[1].prompt
+
+def key_builder(*args, **kwargs):
+    # print(args)
+    return args[1].prompt
+
+
+@rcache(ttl=11, key_builder=key_builder)
+async def redis_fcc(user_id, **kwargs):
     logger.debug(user_id)
+    # 1 / 0
     return False
 
 
@@ -107,11 +118,14 @@ async def expensive_operation():
 
 if __name__ == '__main__':
 
+    from aiocache import cached, Cache, RedisCache, caches
+
+
     async def main():
         for i in range(10):
-            logger.debug(i)
+            # logger.debug(i)
 
-            await redis_fc(A())
+            await redis_fcc(ImageRequest(prompt=f'a cat {i}'))
             await asyncio.sleep(1)
 
 

meutils/data/VERSION

@@ -1 +1 @@
-2025.03.07.22.46.32
+2025.03.13.19.07.25

meutils/llm/completions/__init__.py

@@ -8,4 +8,3 @@
 # @Software     : PyCharm
 # @Description  : 
 
-from meutils.pipe import *

meutils/llm/completions/chat_spark.py

@@ -18,6 +18,7 @@ todo: 记录上下文日志
 
 from meutils.pipe import *
 from meutils.io.openai_files import file_extract
+from meutils.str_utils.json_utils import json_path
 
 from meutils.llm.clients import AsyncOpenAI
 from meutils.llm.openai_utils import to_openai_params
@@ -31,37 +32,52 @@ class Completions(object):
         self.api_key = api_key
 
     async def create(self, request: CompletionRequest):
-
-        if image_urls := request.last_urls.get("image_url"):
-            request.model = "doubao-1.5-vision-pro-32k"  # 6月过期
+        if request.last_user_content.startswith("http"):  # 文件问答-单轮
+            file_url, content = request.last_user_content.split(maxsplit=1)
+            file_content = await file_extract(file_url)
 
             request.messages = [
                 {
                     'role': 'user',
-                    "content": [
-                        {"type": "text", "text": request.last_user_content},
-                        {"type": "image_url", "image_url": {"url": image_urls[-1]}}
-                    ]
+                    'content': f"""{json.dumps(file_content, ensure_ascii=False)}\n\n{content}"""
                 }
             ]
-        else:
-            for i, message in enumerate(request.messages[::-1], 1):
-                if message.get("role") == "user":  # 每一轮还要处理
-                    content = message.get("content")
+        elif image_urls := request.last_urls.get("image_url"):  # 长度为1
+            url = image_urls[0]
+
+            if url.endswith(('.jpg', '.jpeg', '.png', '.gif', '.bmp')):  # 图片问答
+
+                request.model = "doubao-1.5-vision-pro-32k"  # 6月过期
+                for i, message in enumerate(request.messages):
+                    if message.get("role") == "user":
+                        user_contents = message.get("content")
+                        if isinstance(user_contents, list):
+                            for i, content in enumerate(user_contents):
+                                content_type = content.get("type")
+
+                                if content_type == "image_url":
+                                    image_url = content.get("image_url", "")
+
+                                    user_contents[i] = {"type": "image_url", "image_url": {"url": image_url}}
+
+            else:  # 文件问答-多轮
+                for i, message in enumerate(request.messages[::-1], 1):
+                    if message.get("role") == "user":
+                        texts = json_path(message, expr='$..text') or [""]
+                        file_urls = json_path(message, expr='$..image_url') or [""]
 
-                    if content.startswith("http"):
-                        file_url, content = content.split(maxsplit=1)
-                        file_content = await file_extract(file_url)
+                        # logger.debug(f"""{texts} \n\n {file_urls}""")
 
-                        request.messages[-i] = {
-                            'role': 'user',
-                            'content': f"""{json.dumps(file_content, ensure_ascii=False)}\n\n
-                            {content}
-                            """
-                        }
-                        break
+                        text, file_url = texts[-1], file_urls[-1]
+                        if file_url in image_urls:
+                            file_content = await file_extract(file_url)
 
-        logger.debug(request)
+                            message["content"] = f"""{json.dumps(file_content, ensure_ascii=False)}\n\n{text}"""
+
+                            request.messages = request.messages[-i:]
+                            break  # 截断：从最新的文件开始
+
+        logger.debug(request.model_dump_json(indent=4))
 
         data = to_openai_params(request)
         return await AsyncOpenAI(api_key=self.api_key).chat.completions.create(**data)
@@ -100,36 +116,125 @@ if __name__ == '__main__':
             #     ]
             # },
 
+            # {
+            #     'role': 'user',
+            #     # "content": '你好',
+            #     "content": [
+            #         {"type": "text", "text": "描述第一张图片"},
+            #
+            #         {"type": "image_url", "image_url": "https://oss.ffire.cc/files/kling_watermark.png"},
+            #         # {"type": "image_url", "image_url": "https://oss.ffire.cc/files/nsfw.jpg"}
+            #
+            #     ],
+            #
+            #     # 'content': {
+            #     #     "type": "file_url",
+            #     #     "file_url": {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf", "detai": "auto"}
+            #     # },
+            #     # 'content': "https://oss.ffire.cc/files/%E6%8B%9B%E6%A0%87%E6%96%87%E4%BB%B6%E5%A4%87%E6%A1%88%E8%A1%A8%EF%BC%88%E7%AC%AC%E4%BA%8C%E6%AC%A1%EF%BC%89.pdf 这个文件讲了什么？",
+            #     # 'content': "https://translate.google.com/?sl=zh-CN&tl=en&text=%E6%8F%90%E4%BE%9B%E6%96%B9&op=tr1anslate 这个文件讲了什么？",
+            #
+            #     # "content": "https://oss.ffire.cc/files/百炼系列手机产品介绍.docx 总结下"
+            #     # "content": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"
+            #
+            #     # "content": "https://admin.ilovechatgpt.top/file/lunIMYAIzhinengzhushouduishenghuodocx_14905733.docx 总结"
+            #
+            # },
+            #
+            # {'role': 'assistant', 'content': "好的"},
+            #
+            # {
+            #     'role': 'user',
+            #     # "content": '描述第一张图片',
+            #     "content": [
+            #         {"type": "text", "text": "描述第一张图片"},
+            #
+            #         {"type": "image_url", "image_url": "https://oss.ffire.cc/files/nsfw.jpg"}
+            #
+            #     ],
+            #
+            # },
             {
                 'role': 'user',
-                # "content": '你好',
-                # "content": [
-                #     {"type": "text", "text": "描述"},
-                #
-                #     {"type": "image_url", "image_url": "https://oss.ffire.cc/files/kling_watermark.png"}
-                # ],
+                'content': [
+                    {
+                        "type": "text",
+                        "text": "总结下"
+                    },
 
-                # 'content': {
-                #     "type": "file_url",
-                #     "file_url": {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf", "detai": "auto"}
-                # },
-                # 'content': "https://oss.ffire.cc/files/%E6%8B%9B%E6%A0%87%E6%96%87%E4%BB%B6%E5%A4%87%E6%A1%88%E8%A1%A8%EF%BC%88%E7%AC%AC%E4%BA%8C%E6%AC%A1%EF%BC%89.pdf 这个文件讲了什么？",
-                # 'content': "https://translate.google.com/?sl=zh-CN&tl=en&text=%E6%8F%90%E4%BE%9B%E6%96%B9&op=tr1anslate 这个文件讲了什么？",
-
-                "content": "https://oss.ffire.cc/files/百炼系列手机产品介绍.docx 总结下"
-                # "content": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"
+                    {
+                        "type": "image_url",
+                        "image_url": "xx"
+                    }
+                ]
+            },
+            {
+                'role': 'user',
+                'content': [
+                    {
+                        "type": "text",
+                        "text": "总结下"
+                    },
 
-                # "content": "https://admin.ilovechatgpt.top/file/lunIMYAIzhinengzhushouduishenghuodocx_14905733.docx 总结"
+                    {
+                        "type": "image_url",
+                        "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+                    }
+                ]
+            },
+            {
+                'role': 'user',
+                'content': [
+                    {
+                        "type": "text",
+                        "text": "总结下"
+                    },
 
+                    {
+                        "type": "image_url",
+                        "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+                    }
+                ]
+            },
+            {
+                'role': 'assistant',
+                'content': "你好"
             },
+            {
+                'role': 'user',
+                'content': [
+                    {
+                        "type": "text",
+                        "text": "总结下"
+                    },
 
-            # {'role': 'assistant', 'content': "好的"},
-            # {
-            #     'role': 'user',
-            #     # 'content': {
-            #     #     "type": "file_url",
-            #     #     "file_url": {"url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf", "detai": "auto"}
-            #     # },
+                    {
+                        "type": "image_url",
+                        "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+                    }
+                ]
+            },
+            {
+                'role': 'assistant',
+                'content': "1"
+            },
+            {
+                'role': 'user',
+                'content': [
+                    {
+                        "type": "text",
+                        "text": "总结1"
+                    }
+                ]
+            },
+            {
+                'role': 'assistant',
+                'content': "2"
+            },
+            {
+                'role': 'user',
+                'content': "总结2"
+            },
             #     'content': [
             #         {
             #             "type": "text",
@@ -145,4 +250,13 @@ if __name__ == '__main__':
 
     )
 
+    # [{'role': 'system',
+    #   'content': 'undefined\n Current date: 2025-03-13'},
+    #  {'role': 'user',
+    #   'content': [{'type': 'text', 'text': '解读'},
+    #               {'type': 'image_url',
+    #                'image_url': 'https://ai.chatfire.cn/files/images/xx-1741850404348-339a12ba3.png'}]},
+    #  {},
+    #  {'role': 'user', 'content': '总结一下'}]
+
     arun(c.create(request))

meutils/schemas/oneapi/common.py

@@ -405,13 +405,13 @@ MODEL_RATIO = {
     # 阿里千问 https://dashscope.console.aliyun.com/billing
     "qwen-long": 0.25,
     "qwen-turbo": 0.05,
-    "qwen-plus": 0.4 * 2,
-    "qwen-max": 1.2 * 2,
+    "qwen-plus": 0.4 * 1,
+    "qwen-max": 1.2 * 1,
     "qwen-max-longcontext": 20,
     "qwen-turbo-2024-11-01": 0.15,
-    "qwen-max-latest": 1.2 * 2,
-    "qwen2.5-max": 1.2 * 2,
-    "qwen-max-2025-01-25": 1.2 * 2,
+    "qwen-max-latest": 1.2 * 1,
+    "qwen2.5-max": 1.2 * 1,
+    "qwen-max-2025-01-25": 1.2 * 1,
 
     "qwen-vl-max-latest": 1.5,
     "qwen-vl-plus-latest": 0.75,
@@ -690,6 +690,7 @@ MODEL_RATIO = {
     "gpt-4o-realtime-preview-2024-10-01": 2.5,
     "gpt-4o-audio-preview": 2.5 / 2,
     "gpt-4o-mini-audio-preview": 0.15 / 2,
+    "gpt-4o-audio-preview-2024-12-17": 2.5 / 2,
 
     "gpt-4o": 1.25,
     "gpt-4o-all": 2.5,  # 逆向