MeUtils 2025.3.5.20.22.10__py3-none-any.whl → 2025.3.6.18.55.2__py3-none-any.whl

{MeUtils-2025.3.5.20.22.10.dist-info → MeUtils-2025.3.6.18.55.2.dist-info}/RECORD

@@ -72,7 +72,7 @@ examples/Time-Extractor/setup.py,sha256=ENYhj1_uJ7z_F3jrz8FR8w5u2SEXrZpl5GXEELUy
 examples/Time-Extractor/resource/__init__.py,sha256=0HHkZVghckIg5LkGMziooZ8TUqfSQFA6j62BN9KyFp0,91
 examples/_openaisdk/4v.py,sha256=lVnWWRNKX0Uu2rKy7PGYFsSVYJ48ykaRZHHdeyuT-rY,3532
 examples/_openaisdk/__init__.py,sha256=5TNibGR-ETncXVWoevqYJ0m2yo1GOxRx3hSu2qWAQNo,271
-examples/_openaisdk/_openai_chatfire.py,sha256=i7nei_-1eq3W8eUxGK6_BsR_1flw3-wJuc-uHkFCwDo,907
+examples/_openaisdk/_openai_chatfire.py,sha256=hvz7Xw329xDDRHbenJohyhK5GGlXr0lA9dplXiwp4Q0,1240
 examples/_openaisdk/baichuan.py,sha256=xmNFc64T02r9wE0VSOG0B21wJJmlrecKVVCelhs2Dt4,890
 examples/_openaisdk/bpo.py,sha256=7Jw16TiKFEQvYbt4g-h7QimLBw7xY49w1MthT5OwcTM,5267
 examples/_openaisdk/chat_latex.py,sha256=FzVSvmG988GRItUg1Uga-L3dZseZW76LCvngHqRedD8,2939
@@ -95,7 +95,7 @@ examples/_openaisdk/openai_audio.py,sha256=ZyYslH9RfdJBpNUpjKn_5x0d94_H291Qt31u_
 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
-examples/_openaisdk/openai_chatfire.py,sha256=A8C7kZSrjpmr31cbMgfsymL9lOpMpueYqm4msdBISMY,18973
+examples/_openaisdk/openai_chatfire.py,sha256=0C2jcC9GR67GxwSIIcVzm0HnNDh_6_Jpq7Y5nL1uP58,18979
 examples/_openaisdk/openai_chatfire_all.py,sha256=DaiI1NfDeK655QvXyczkgXK9Awxp7NBe71LHA7trxGE,4831
 examples/_openaisdk/openai_dashscope.py,sha256=m9SjQpaNgYwr4Qd3XusWbJBGp5ZTtpuB40QopejxPKQ,1029
 examples/_openaisdk/openai_deepinfra.py,sha256=innI4BT15dZEqheqDHG4lHDczY1QC7t2Whcavi1pcz0,1195
@@ -362,7 +362,7 @@ meutils/apis/hailuoai/hasha_new.py,sha256=1sD3fxmxYrEufmPaJZGAkYJoHKO85hfLXemnY-
 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/yy.py,sha256=gJvr7VDa0YPEUkZuETdmCFWWheylDPoMUg8gbS_SVw8,8937
+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
 meutils/apis/hf/gradio.py,sha256=tz4oiY0PHLT48aQocV0wBeuz53mLo8Pz_bQBg43pHpA,839
@@ -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=Ftx_jhIJnw-a2qIEnAC0z3-q8vAC-YXBmJa9LIY4x9w,6751
+meutils/apis/jimeng/common.py,sha256=dJcex3hh1eyLwSJwlfeHlaTal9_h5ERvOTb2PSrF96I,6763
 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=afwWvN6gSRjBGVMjV3CMpMwnuJ1cAVYBiFc6wamc570,9547
-meutils/apis/jimeng/images.py,sha256=iG0-MuW_Oh4rl4o9Gxdge8pXuB7DFfvL0pDdMMCD7xo,12660
+meutils/apis/jimeng/files.py,sha256=E-pPmi6fIP_n6wgfiDbqeWsIfrXVZUe7LpA6Wds1xDI,11047
+meutils/apis/jimeng/images.py,sha256=ntGcXQvgdh9KuhYtcVGvlPY36wRUh7TR3fpU45j1VRc,13034
 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
@@ -439,7 +439,7 @@ meutils/apis/runwayml/__init__.py,sha256=90oL_3o8YkFPYm4R4PCxd3m9hgnHpOCLr0u-X4B
 meutils/apis/runwayml/gen.py,sha256=JrfegC4pI2r7DprDLGMi5px0K1C1pSgopnz0lcJU5RY,5194
 meutils/apis/search/__init__.py,sha256=1lg0ogEBgtwTi3XvkL5hMfSd14A6YNLO7M9itEJmaYI,244
 meutils/apis/search/baichuan.py,sha256=OUD0TH7KzqSxtuRJgjJPWO8XRQIoUwW5RX7lWMo7BXw,268
-meutils/apis/search/metaso.py,sha256=B1i81F5meBLd6ZWDBZb8l0GT1THKL9Qm7hKwmHYTNMA,9520
+meutils/apis/search/metaso.py,sha256=_pMszZWcnvBr-m5bMgirq8-H5xsbTfcQgnDnCq1_z_4,8001
 meutils/apis/search/metaso_.py,sha256=PqMX3FLYbbAcc9qpqrPZ58LuSF29h0asZO1XMYmXbes,3144
 meutils/apis/search/n.py,sha256=o7jzNoR5v_nAjgdUvWgebL3nvvo3ECpq2KCj9YhUNr4,4337
 meutils/apis/search/searxng.py,sha256=RBPeq-AYj5D42gROrZNg0SxIWwWEW0oqrbQ3wEDH9k8,951
@@ -500,7 +500,7 @@ meutils/async_utils/test.py,sha256=lkZdgSzzgVg8hYVcaBNEJ3KBvFTEfjbXZVvtknQZsRQ,1
 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/common.py,sha256=X5z95dZ06H2HCkVTtRqdV77p_DhZYlON7uk1OROCJ00,1724
+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
@@ -530,7 +530,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=xYD0mkffWoWEQOrrTGQ7id-IaoOB0xRljKEckLMB824,19
+meutils/data/VERSION,sha256=_RmLk3bnyAjiy8-dWRZjbrUCXfgQExjHKJKb_DalAZs,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -628,14 +628,14 @@ meutils/llm/completions/dify.py,sha256=dqL_8uxAp2d8M00pkyh2I30tflwi4pUyX-V6pwe3_
 meutils/llm/completions/kimi.py,sha256=TSkLObebIAb_oivOMq3aKx9qoXcMy611_g2yIKex9eo,1541
 meutils/llm/completions/modelscope.py,sha256=umPlJuHSL2RR0oNdTIAqts8iqEmGp_MR6Vh49g-UZuc,271
 meutils/llm/completions/oi.py,sha256=DmvzxJfdLA_I3MWcULhFtiUdo90j7V2dLvYvmZ-Tm9U,293
-meutils/llm/completions/qwenllm.py,sha256=iUMmMrkxcLkprgaJmwKSpG7qCtlFY-t9uVIDtSZGJfc,7762
+meutils/llm/completions/qwenllm.py,sha256=b4AfLtcfKtt3ULUOB9sYXv2e4GZUvrIaFA38c1nMYt4,7861
 meutils/llm/completions/rag.py,sha256=cpQ1aZX2QI1QDfFpODTxWHPYglK6_3qrlUM_KHLBNhc,1112
 meutils/llm/completions/reasoner.py,sha256=rPIxW1iuvLuGhcOa6PkfcJmrTKtJV-8wRKfA09X09tg,6169
 meutils/llm/completions/tryblend.py,sha256=NfVRktn1QiE2k60PzEI-LmKuxZCc7mtL_KlsrVcZg4k,8957
 meutils/llm/completions/tune.py,sha256=FypfUgsB34t-E9xI6WydJYEk_-phscrLOX1iUCeKb_E,10138
 meutils/llm/completions/x.py,sha256=XE8aCyuhkpYq0nho1mq9lAdRU1yOPc8BpvCpNYYMYqM,630
 meutils/llm/completions/xx.py,sha256=pPfVRczvXZFUvAUOAFr0MMHMb5kVPNfKVhOLKugq52M,1646
-meutils/llm/completions/yuanbao.py,sha256=VIvRAwrqBVdVayWlb2urJX5F9vCaojbtq2-Uce3kMk4,6924
+meutils/llm/completions/yuanbao.py,sha256=xaCMzuYhaFrFPwP8Wu6OmGoFGIiX-QirWK5N0NIx6gE,7171
 meutils/llm/completions/agents/__init__.py,sha256=Wklnf7FTHm43hyVwfT8FXX44nqdOTykPb_HORIqDuuw,270
 meutils/llm/completions/agents/search.py,sha256=GKsk0NRy6jsbSu8E9mdBWObJzroGE-L7Iuo5W2MK_u0,5057
 meutils/llm/completions/rag/__init__.py,sha256=VH4g9H0pqMM1Rkjc1xefQb4Uh8f9vlTt6tjdD6G6Wc0,272
@@ -657,7 +657,7 @@ meutils/logging/log_utils.py,sha256=Sa5-Y4fWNTKQw2fIb1dbPgOypl6S6m7EOrbciSqEt5A,
 meutils/logging/logger.py,sha256=-J_tWYfAvPhSTshVWIiN-6zTZnjkFuwDfMtxUtuNkuY,6183
 meutils/notice/__init__.py,sha256=BVbcBx4ks-BH_63gEcjMxL67oX1_aWdaM8r3TDo8Ogg,248
 meutils/notice/emails.py,sha256=TvC1xv3MpFC2HU0lTQW5SmNuj7UMlgjpsUImMp9jKOw,2403
-meutils/notice/feishu.py,sha256=shO0ouOKufq6dAwNFm17cBb2HoaEfyZXfbWkdkJ41dU,3600
+meutils/notice/feishu.py,sha256=2SbEH5OC9fnqbmmCUyg6UtfWwRa4NNvLcEv0gyMGhys,3714
 meutils/notice/file_post.py,sha256=KQ8iQUM30vF7T6ZZPahdLps4dLXK2s3nzdFYbty6M5E,953
 meutils/notice/load_emailfile - 副本.py,sha256=f-Kq3UKZut_P0bmumV1y4PXuPtatjl-5SLUH5LShBUY,7331
 meutils/notice/wechat.py,sha256=-HU5oSvpZrVnjjU76ky7_j0yg5ivn5mIlJ7JJVtlrnY,4082
@@ -763,7 +763,7 @@ meutils/schemas/kuaishou_types.py,sha256=-_-0Fkab5jyJFb_2Y4ugi92JSIDlvWL_e8mH-wM
 meutils/schemas/luma_types.py,sha256=s9RZnZUpdUg8-13_WOWm3bE_e246olplFFjP8ygiDuw,1900
 meutils/schemas/message_types.py,sha256=AJc9ZT_weaTjfjmwF5CDroV0WJEJKnA3u4bnbHhBamo,6176
 meutils/schemas/message_types_.py,sha256=oL7uOsewaziSryZywfap09M5Wh9w28RJDuadFuAfCSI,6297
-meutils/schemas/metaso_types.py,sha256=WBzyL7N6_Zqy5s2UYregp4YuH0fT_OgtVPCmJqqgU2A,2086
+meutils/schemas/metaso_types.py,sha256=r_X0Exs_2S3rNS71RneemMpz7EvBIOLBfAMmWMQRnk8,2182
 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
@@ -789,7 +789,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=AYZ9u3nc4jNdtM5TwQhhG1w5kRksnAf2P1H8P_FqFQw,30714
+meutils/schemas/oneapi/common.py,sha256=28IdCd8UD_1WXYE0VKRRw7v4jVAfoCbOOeZ6x3d5gQU,31047
 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
@@ -918,9 +918,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.5.20.22.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.3.5.20.22.10.dist-info/METADATA,sha256=JVKAO9nNPwn-nw3Tm4tDYpMD8K3HHbZ_UqBjD3Wju6E,32833
-MeUtils-2025.3.5.20.22.10.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.3.5.20.22.10.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.3.5.20.22.10.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.3.5.20.22.10.dist-info/RECORD,,
+MeUtils-2025.3.6.18.55.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.3.6.18.55.2.dist-info/METADATA,sha256=HlMSGydC3x8SH0R1soAtyOZMqAe51WWN1MnvxwSQvFk,32832
+MeUtils-2025.3.6.18.55.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.3.6.18.55.2.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.3.6.18.55.2.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.3.6.18.55.2.dist-info/RECORD,,

examples/_openaisdk/_openai_chatfire.py

@@ -15,18 +15,32 @@ from openai import OpenAI, APIStatusError
 
 
 client = OpenAI(
-    api_key="你的 https://api.chatfire.cn/token",
-    base_url="https://api.chatfire.cn/v1"
+    # api_key="你的 https://api.chatfire.cn/token",
+    # base_url="https://api.chatfire.cn/v1"
 )
 
+url = "https://oss.ffire.cc/files/lipsync.mp3"
+content = [
+    {"type": "text", "text": "总结下"},
+    {"type": "video_url", "video_url": {"url": url}}
+
+]
+messages = [
+    {"role": "user", "content": [
+    {"type": "text", "text": "总结下"},
+    {"type": "video_url", "video_url": {"url": url}}
+
+]}
+]
+
 
 completion = client.chat.completions.create(
-    model="glm-4-flash",
+    model="gemini-all",
     # model="xxxxxxxxxxxxx",
     messages=[
         {"role": "system", "content": '你是个内容审核助手'},
 
-        {"role": "user", "content": message}
+        {"role": "user", "content": content}
     ],
     # top_p=0.7,
     top_p=None,
@@ -35,8 +49,9 @@ completion = client.chat.completions.create(
     max_tokens=1000
 )
 
+#
+# for chunk in completion:
+#     # print(bjson(chunk))
+#     print(chunk.choices[0].delta.content, end="")
 
-for chunk in completion:
-    # print(bjson(chunk))
-    print(chunk.choices[0].delta.content, end="")
-
+print(messages)

examples/_openaisdk/openai_chatfire.py

@@ -245,7 +245,7 @@ if __name__ == '__main__':
 
         # "ds",
 
-"qwen-plus"
+        "qwen-max"
 
     ]
     # check_models(models, api_key=os.getenv("OPENAI_API_KEY"))
@@ -254,7 +254,6 @@ if __name__ == '__main__':
     # check_models(models, api_key=os.getenv("OPENAI_API_KEY_35"))
     # check_models(models, api_key=os.getenv("OPENAI_API_KEY_GUOCHAN"))
 
-
     # check_models(models, api_key=os.getenv("OPENAI_API_KEY_FREE"))
 
     # check_models(models)
@@ -269,7 +268,6 @@ if __name__ == '__main__':
     # check_models(models)
     check_models(models, api_key=os.getenv("OPENAI_API_KEY_GUOCHAN") + "-583")
 
-
 #############神奇 #############reasoning_content 神奇
 
-#############
+#############

meutils/apis/hailuoai/yy.py

@@ -216,27 +216,29 @@ def get_yy(payload: dict, params: dict, url: str = "/api/multimodal/generate/vid
 
 
 if __name__ == '__main__':
-    TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MzM0MDY1MzUsInVzZXIiOnsiaWQiOiIzMDI4MzM4Njc3NzE5NDkwNTgiLCJuYW1lIjoibWUgYmV0dGVyIiwiYXZhdGFyIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jSWdTU0NoczFENHNUajFTVGs3UHNUbTd5NTNKRFg5OW84QnhwWmNWNjU2MEFKYlJnPXM5Ni1jIiwiZGV2aWNlSUQiOiIifX0.mcozMacSciz0MORdleOMS_uhrixhIlpQmFmUwvn81I4"
-
-    params = {
-        'device_platform': 'web', 'app_id': '3001',
-        'version_code': '22201',
-        'uuid': '3de88ad0-8a38-48a9-8ed3-0d63f9c71296',
-        'device_id': '302833759512764417',
-        'os_name': 'Windows',
-        'browser_name': 'chrome',
-        'device_memory': '8',
-        'cpu_core_num': '20',
-        'browser_language': 'zh-CN',
-        'browser_platform': 'Win32',
-        'screen_width': '2560',
-        'screen_height': '1440',
-        'unix': '1730114652000'
-    }
-
-    payload = {
-        "desc": "smile",
-        "useOriginPrompt": True,
-        "fileList": []
-    }
-    print(get_yy(payload, params))
+    # TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MzM0MDY1MzUsInVzZXIiOnsiaWQiOiIzMDI4MzM4Njc3NzE5NDkwNTgiLCJuYW1lIjoibWUgYmV0dGVyIiwiYXZhdGFyIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EvQUNnOG9jSWdTU0NoczFENHNUajFTVGs3UHNUbTd5NTNKRFg5OW84QnhwWmNWNjU2MEFKYlJnPXM5Ni1jIiwiZGV2aWNlSUQiOiIifX0.mcozMacSciz0MORdleOMS_uhrixhIlpQmFmUwvn81I4"
+    #
+    # params = {
+    #     'device_platform': 'web', 'app_id': '3001',
+    #     'version_code': '22201',
+    #     'uuid': '3de88ad0-8a38-48a9-8ed3-0d63f9c71296',
+    #     'device_id': '302833759512764417',
+    #     'os_name': 'Windows',
+    #     'browser_name': 'chrome',
+    #     'device_memory': '8',
+    #     'cpu_core_num': '20',
+    #     'browser_language': 'zh-CN',
+    #     'browser_platform': 'Win32',
+    #     'screen_width': '2560',
+    #     'screen_height': '1440',
+    #     'unix': '1730114652000'
+    # }
+    #
+    # payload = {
+    #     "desc": "smile",
+    #     "useOriginPrompt": True,
+    #     "fileList": []
+    # }
+    # print(get_yy(payload, params))
+
+    print(quote('x x'))

meutils/apis/jimeng/common.py

@@ -20,7 +20,7 @@ from fake_useragent import UserAgent
 
 ua = UserAgent()
 
-
+@lru_cache()
 def get_headers(url, token: str = "693701c43e477b7c405cc7e2fef0ddbd"):
     device_time = f"{int(time.time())}"
     sign = md5(
@@ -130,7 +130,7 @@ def create_photo_lip_sync(request: TTSRequest):
                     "v2v_opt": {},
                     "i2v_opt": {
                         "realman_avatar": {
-                            "enable": true,
+                            "enable": True,
                             "origin_image": {
                                 "width": 480,
                                 "height": 270,

meutils/apis/jimeng/files.py

@@ -15,7 +15,10 @@ import hashlib
 from meutils.pipe import *
 from meutils.caches.redis_cache import cache
 from meutils.io.files_utils import to_bytes
-from meutils.apis.jimeng.common import get_upload_token
+from meutils.apis.jimeng.common import get_upload_token, get_headers, BASE_URL, FEISHU_URL, check_token
+from meutils.notice.feishu import send_message_for_images
+from meutils.config_utils.lark_utils import get_next_token_for_polling
+
 
 def random_str(n):
     return ''.join(random.sample('zyxwvutsrqponmlkjihgfedcba0123456789', n))
@@ -55,6 +58,7 @@ class JJRequest:
 
     def getAuthorization(self):
         return f"AWS4-HMAC-SHA256 Credential={self.e['access_key_id']}/{self.t[:8]}/cn-north-1/{self.serviceName}/aws4_request, SignedHeaders=x-amz-date;x-amz-security-token, Signature={self.signature()}"
+
     def signature(self):
         r = self.getSigningKey()
         return hmac_hash256(r, self.stringToSign()).hexdigest()
@@ -289,13 +293,48 @@ async def upload_for_video(video, token):  # 跨账号token
     return vid, uri
 
 
-if __name__ == "__main__":
+async def face_recognize(image, token: Optional[str] = None):
+    """
+    图片识别
+    """
+    # token = "1c21a9fe6a4230609d7ff13e5cec41ec"  # 跨账号测试
+
+    token = token or await get_next_token_for_polling(FEISHU_URL, check_token)
+
+    url = "/mweb/v1/face_recognize"
+    headers = get_headers(url, token)
+
+    image_uri = await upload_for_image(image, token)
+    payload = {
+        "image_uri_list": [
+            image_uri
+        ]
+    }
 
+    async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=120) as client:
+        response = await client.post(url, json=payload)
+        response.raise_for_status()
+        data = response.json()
+
+        try:
+            data['data']['image_uri'] = image_uri
+            data['data']['face_recognize_list'][0][0]['type'] = ""
+            data['data']['face_recognize_list'][0][0]['id'] = str(uuid.uuid4())
+            data['data']['face_recognize_list'][0][0]['is_selected'] = True
+        except Exception as e:
+            logger.error(e)
+            send_message_for_images(f"图片识别失败 {bjson(data)}", __name__)
+
+        return data
+
+
+if __name__ == "__main__":
     # 豆包
     token = "de2215a7bb8e442774cf388f03fac84c"
 
     # jimeng
-    token = "eb4d120829cfd3ee957943f63d6152ed"
+    token = "ffeee346fbd19eceebb79a7bfbca4bfe"
+    token = "34438eb03d165737122180caf62a8058"
     #
     # upload_token = arun(get_upload_token(token))
 
@@ -312,7 +351,10 @@ if __name__ == "__main__":
     # with timer():
     #     arun(upload_for_image("https://oss.ffire.cc/files/kling_watermark.png", token))
 
-    with timer():
-        url = "https://oss.ffire.cc/files/lipsync.mp3"
-        # arun(upload_for_video("https://oss.ffire.cc/files/lipsync.mp3", token))
-        arun(upload_for_video(url, token))
+    # with timer():
+    #     url = "https://oss.ffire.cc/files/lipsync.mp3"
+    #     # arun(upload_for_video("https://oss.ffire.cc/files/lipsync.mp3", token))
+    #     arun(upload_for_video(url, token))
+    image_url = "https://oss.ffire.cc/files/kling_watermark.png"
+    arun(face_recognize(image_url, token))
+    arun(face_recognize(image_url))

meutils/apis/jimeng/images.py

@@ -14,9 +14,10 @@ guidance 控制精细度 => sample_strength 0-1 数值越大生成的效果质
 import json
 
 from meutils.pipe import *
-from meutils.db.redis_db import redis_aclient
+from meutils.caches import rcache
 
 from meutils.decorators.retry import retrying
+from meutils.notice.feishu import send_message_for_images
 
 from meutils.schemas.jimeng_types import BASE_URL, MODELS_MAP, FEISHU_URL
 from meutils.schemas.image_types import ImageRequest
@@ -37,6 +38,10 @@ async def create_draft_content(request: ImageRequest, token: str):
     """
     创建草稿内容
     """
+    # 参考人物
+    face_recognize_data = request.controls.get("face_recognize_data", {})
+    image_uri = face_recognize_data.pop("image_uri", None)
+
     request.model = MODELS_MAP.get(request.model, MODELS_MAP["default"])
 
     height = width = 1360
@@ -44,13 +49,17 @@ async def create_draft_content(request: ImageRequest, token: str):
         height, width = map(int, request.size.split('x'))
 
     main_component_id = str(uuid.uuid4())
+    if (urls := parse_url(request.prompt)) or image_uri:  # 图生  # todo: image base64
+        request.model = "high_aes_general_v20_L:general_v2.0_L"  # 2.1不支持图片编辑 某些不支持
 
-    if urls := parse_url(request.prompt):
-        url = urls[-1]
-        image_uri = await upload_for_image(url, token)
+        if image_uri:
+            pass
 
-        request.prompt = request.prompt.replace(url, '')
-        request.model = "high_aes_general_v20_L:general_v2.0_L"  # 2.1不支持图片编辑 某些不支持
+        else:
+            url = urls[-1]
+            image_uri = await upload_for_image(url, token)
+
+            request.prompt = request.prompt.replace(url, '')
 
         component = {
             "type": "image_base_component",
@@ -82,7 +91,7 @@ async def create_draft_content(request: ImageRequest, token: str):
                         {
                             "type": "",
                             "id": str(uuid.uuid4()),
-                            "name": "byte_edit",  # bg_paint
+                            "name": "byte_edit",  # bg_paint face_gan
                             "image_uri_list": [
                                 image_uri
                             ],
@@ -100,6 +109,7 @@ async def create_draft_content(request: ImageRequest, token: str):
                                     "uri": image_uri
                                 }
                             ],
+
                             "strength": 0.5
                         }
                     ],
@@ -123,7 +133,11 @@ async def create_draft_content(request: ImageRequest, token: str):
             }
         }
 
-    else:
+        if face_recognize_data:
+            face_recognize_data['name'] = "face_gan"
+            component["abilities"]["blend"]["ability_list"][0].update(face_recognize_data)
+
+    else:  # 文生
 
         component = {
             "type": "image_base_component",
@@ -178,13 +192,8 @@ async def create_draft_content(request: ImageRequest, token: str):
 
 
 @retrying(max_retries=3)
+@rcache(ttl=24 * 3600, serializer="pickle")
 async def create_task(request: ImageRequest, token: Optional[str] = None):
-    if await redis_aclient.sismember("tasks:jimeng:prompt", request.prompt):  # 敏感内容过滤
-        raise HTTPException(
-            status_code=status.HTTP_451_UNAVAILABLE_FOR_LEGAL_REASONS,
-            detail=f"可能触发内容审核，请联系管理员：\n{request.prompt}"
-        )
-
     token = token or await get_next_token_for_polling(FEISHU_URL, check_token)
 
     url = "/mweb/v1/aigc_draft/generate"
@@ -219,8 +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
-        # 映射提示词：方便管理敏感输入
-        await redis_aclient.set(f"tasks:jimeng:{task_id}", request.prompt, ex=3600)
 
         return TaskResponse(task_id=task_id, system_fingerprint=token)
     else:
@@ -265,10 +272,7 @@ async def get_task(task_id, token):
 
         # 敏感词存储
         if status_code != 50:
-            prompt = await redis_aclient.get(f"tasks:jimeng:{task_id}")
-            if prompt:
-                logger.debug(f"敏感内容: {prompt}")
-                await redis_aclient.sadd('tasks:jimeng:prompt', prompt)
+            send_message_for_images(task_info, __name__)
 
         """
         "status": 30, # 内容审核
@@ -318,7 +322,8 @@ async def generate(request: ImageRequest):
 
 if __name__ == '__main__':
     # token = "eb4d120829cfd3ee957943f63d6152ed"
-    token = "34438eb03d165737122180caf62a8058"
+    token = "ffeee346fbd19eceebb79a7bfbca4bfe"
+    image_url = "https://oss.ffire.cc/files/kling_watermark.png"
 
     # request = ImageRequest(prompt="做一个圣诞节的海报", size="1024x1024")
     # request = ImageRequest(prompt="https://oss.ffire.cc/files/kling_watermark.png 让她带上墨镜", size="1024x1024")
@@ -347,14 +352,29 @@ if __name__ == '__main__':
     # t3 = ("10186352959490", "eb4d120829cfd3ee957943f63d6152ed")
     #
     # arun(get_task(*t3))
+
+    from meutils.apis.jimeng.files import face_recognize
+
+    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": "让这个女人带上墨镜，衣服换个颜色",
+
         "size": "1024x1024",
+
+        "controls": {
+            "face_recognize_data": face_recognize_data
+        }
     }
     arun(generate(ImageRequest(**data)))
 
-    # arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))
+    # 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))