MeUtils 2025.1.3.14.11.44__py3-none-any.whl → 2025.1.4.11.4.46__py3-none-any.whl

{MeUtils-2025.1.3.14.11.44.dist-info → MeUtils-2025.1.4.11.4.46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.1.3.14.11.44
+Version: 2025.1.4.11.4.46
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -63,42 +63,42 @@ Requires-Dist: sse-starlette ; extra == 'ai'
 Requires-Dist: openai ; extra == 'ai'
 Requires-Dist: langchain ; extra == 'ai'
 Provides-Extra: all
-Requires-Dist: seaborn ; extra == 'all'
-Requires-Dist: simplejson ; extra == 'all'
-Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: openai ; extra == 'all'
-Requires-Dist: geopy ; extra == 'all'
-Requires-Dist: pandas-summary ; extra == 'all'
+Requires-Dist: thriftpy2 ; extra == 'all'
+Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: dataframe-image ; extra == 'all'
 Requires-Dist: schedule ; extra == 'all'
-Requires-Dist: pretty-errors ; extra == 'all'
-Requires-Dist: missingno ; extra == 'all'
-Requires-Dist: iteration-utilities ; extra == 'all'
-Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: seaborn ; extra == 'all'
 Requires-Dist: thefuck ; extra == 'all'
-Requires-Dist: redis-py-cluster ; extra == 'all'
-Requires-Dist: thriftpy2 ; extra == 'all'
+Requires-Dist: missingno ; extra == 'all'
+Requires-Dist: uvicorn ; extra == 'all'
+Requires-Dist: pandas-summary ; extra == 'all'
 Requires-Dist: polars ; extra == 'all'
+Requires-Dist: cachetools ; extra == 'all'
+Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
 Requires-Dist: gunicorn ; extra == 'all'
-Requires-Dist: jmespath ; extra == 'all'
-Requires-Dist: uvicorn ; extra == 'all'
-Requires-Dist: pymysql ; extra == 'all'
+Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: iteration-utilities ; extra == 'all'
+Requires-Dist: pymupd ; extra == 'all'
+Requires-Dist: sqlalchemy ; extra == 'all'
 Requires-Dist: filetype ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
+Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: jmespath ; extra == 'all'
 Requires-Dist: fastapi[all] ; extra == 'all'
 Requires-Dist: pymilvus ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
+Requires-Dist: langchain ; extra == 'all'
+Requires-Dist: jinja2 ; extra == 'all'
+Requires-Dist: simplejson ; extra == 'all'
+Requires-Dist: redis-py-cluster ; extra == 'all'
+Requires-Dist: geopy ; extra == 'all'
 Requires-Dist: jieba ; extra == 'all'
-Requires-Dist: faiss-cpu ; extra == 'all'
-Requires-Dist: cachetools ; extra == 'all'
+Requires-Dist: openai ; extra == 'all'
 Requires-Dist: fastapi ; extra == 'all'
-Requires-Dist: jinja2 ; extra == 'all'
-Requires-Dist: pymupd ; extra == 'all'
 Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: pymongo ; extra == 'all'
-Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
-Requires-Dist: dataframe-image ; extra == 'all'
 Requires-Dist: asyncmy ; extra == 'all'
-Requires-Dist: sqlalchemy ; extra == 'all'
+Requires-Dist: pymysql ; extra == 'all'
+Requires-Dist: pretty-errors ; extra == 'all'
+Requires-Dist: pyarrow ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2025.1.3.14.11.44.dist-info → MeUtils-2025.1.4.11.4.46.dist-info}/RECORD

@@ -122,7 +122,7 @@ examples/_openaisdk/test.py,sha256=Y_dP8rK-LFIBc_fy00ug-2XkilK0G_TlFDa3iuUK-iM,3
 examples/_openaisdk/x.py,sha256=IdhHsmyd-uZx5UohfWa_g467kZeR1Pkec42z3bW-3Iw,4752
 examples/_openaisdk/xx.py,sha256=DvU98YbhmFJZ3xWqK4NOAafNqOJLu2ehQycCRLEXVUg,645
 examples/_openaisdk/zhipu_files.py,sha256=HLvlM9CDcmNER5w-MBMLQPZVPJjR2UHRXYA3ru2cT2Q,1057
-examples/_openaisdk/zhipu_智能体.py,sha256=-aH25DEznsB7p9zbmkPINfBudR7f-H3KcA6SHsRlIiM,1211
+examples/_openaisdk/zhipu_智能体.py,sha256=ghjzV0NYmbH36VpRNK9YfE8H2uvtKuVOReHeB494gKc,1210
 examples/_openaisdk/兜底测试.py,sha256=7vIOZDj-iB5dJjfJtHe_A-3D7ZUmOSiryI7ciIp0EzE,2878
 examples/_openaisdk/多模态测试.py,sha256=XNHvC9Qbw3tUZ_i8shyEx3a6T3FFDsTyIIkm3rO0R38,2559
 examples/_openaisdk/多模态测试_.py,sha256=7mh9dnpSApqmrriQ9-q4jY8uHfplsrjyGSXb8b-Zt9o,1276
@@ -367,11 +367,12 @@ 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=wIduTWmtJJQWIbxDMVvQ9BlDheiGbeROPNuulfiwiNY,8819
+meutils/apis/jimeng/common.py,sha256=5pH-qJsas8ocnwXWuHnBa0Pbniv6a6Q3uRyt53kjjno,11363
 meutils/apis/jimeng/doubao.py,sha256=vSEaTQHQdyhpHwCoq6CIikDZkUC9ncyTgKxGUC8cMCI,4345
 meutils/apis/jimeng/doubao_utils.py,sha256=XCHnvwfCOtJmPQuzDOCfKDMP_Pcqh-Y4w2h5f7Y2gzM,5999
-meutils/apis/jimeng/files.py,sha256=aFKg5iesJNVbXclaMR0yDpnKzjqW1yZxkyp9qrGTybo,5365
+meutils/apis/jimeng/files.py,sha256=CBJ8W9pFy7D_GpV7buX3J9LMoqBYxl-EvrxkIYSu9s8,7523
 meutils/apis/jimeng/images.py,sha256=Z1w8Jxqvom-rBB9MSfQz4QvfPLTEoamwyb9X9_yUmBk,4641
+meutils/apis/jimeng/lip_sync.py,sha256=rynQPNngltS73GmuWbpMIuuAr0srZP5kUh0FMY6Ynas,267
 meutils/apis/kling/__init__.py,sha256=pKz40SEjui1dhHBD-icyNTJOYhzLvxLxJCwszuH4vio,271
 meutils/apis/kling/api.py,sha256=AuVQ9URmrbTlz7dEv_kIyhA9fMTZPL9rF3Td6KxTIMA,2183
 meutils/apis/kling/images.py,sha256=FcCkvA4x1Po3SuugfQa8klT0Lrj7fq4N8kbzx6luUxI,5095
@@ -381,7 +382,7 @@ meutils/apis/kling/videos.py,sha256=6z3w0gQHPe3BQNid4ZO2DfYSqvry44EMehG9U0qSB3E,
 meutils/apis/kling/鉴权.py,sha256=1kR67Mb0PxEo4ZxLVJZys4Iru9BUnS_Qqo2cbpLZNCU,842
 meutils/apis/kuaishou/__init__.py,sha256=fDzJvVQl_CxHyiL3bCPH9x7gOLYfK6QuW2iQ33eez7c,243
 meutils/apis/kuaishou/klingai.py,sha256=met1N4cWo6rSSNgMTStjYMhkjLPnQyuL8k3L0OiY2rE,21262
-meutils/apis/kuaishou/klingai_video.py,sha256=5-f-H0QR8Mo5LR2d7VRm2_-mAmT_1DxrIrTDfyUKeTY,10061
+meutils/apis/kuaishou/klingai_video.py,sha256=B_zauEMGDtWhUfSLB1dhMK4tjaJ1kzhGBsvfnpyjZMc,10066
 meutils/apis/kuaishou/kolors.py,sha256=mjPOFeM1n5FrXfs50SJYlZSHqYk-mQ1wRFs-R-LRsa0,7203
 meutils/apis/luma/__init__.py,sha256=51W483rgmMqFlRIHlkIIcKYMqggH4eY_bmV_mD3p7QI,271
 meutils/apis/luma/luma.py,sha256=dAWZj2Q4t5eJNJbbtCfmUNDb1wx_OKxxtrZr0szI6tw,6026
@@ -392,7 +393,7 @@ meutils/apis/monica/llm.py,sha256=gYyBPOTvmoNFaa1KmW3OlSsRKeN7C97EyPUa264nJ08,26
 meutils/apis/napkin/__init__.py,sha256=EWwpRJEbN46d6Dk9PHAZvsYmqD_EOK0jjKQL1kYtcKs,271
 meutils/apis/napkin/icons.py,sha256=_L8EaSeQ6ChT5w7q3jnj_AcRhKvNiBg3-qUKo9JQ12o,2217
 meutils/apis/oneapi/__init__.py,sha256=wg_kqNkFqOkP70vnOHvAeKREps57Rqliu5yKC0gsgLk,284
-meutils/apis/oneapi/channel.py,sha256=SdehWOlh0tLVM1CG_AT5_VpiGHXtc__AlknyLSs0jRw,1989
+meutils/apis/oneapi/channel.py,sha256=ZTRXVA30IC3jrIWdY-l8XOX2ouNlVvnD_vmMSDO8b3Q,2000
 meutils/apis/oneapi/common.py,sha256=dZeuimzuZXVP_bEMYfTdZUKVJePrOVB0fWYl2dwQwcI,3556
 meutils/apis/oneapi/log.py,sha256=dOmyldX5DyJO7mMw4EzYorTIsdLKqZ3AZiV0z0tEpWE,1377
 meutils/apis/oneapi/token.py,sha256=32xR3fnsqctZLEj79RKPptQtUvBF8_QtILIbLWM3yx0,1805
@@ -496,7 +497,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=FQfjvQbWRKEXelG-g51ajO4vPgN2rcpyOVWQkAoRk2s,19
+meutils/data/VERSION,sha256=yixHXXad2U23Mi4yr94vRu7SIQ6IWDMIx49zz1ZwIyQ,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -587,6 +588,8 @@ meutils/llm/completions/tune.py,sha256=FypfUgsB34t-E9xI6WydJYEk_-phscrLOX1iUCeKb
 meutils/llm/completions/x.py,sha256=XE8aCyuhkpYq0nho1mq9lAdRU1yOPc8BpvCpNYYMYqM,630
 meutils/llm/completions/xx.py,sha256=pPfVRczvXZFUvAUOAFr0MMHMb5kVPNfKVhOLKugq52M,1646
 meutils/llm/completions/yuanbao.py,sha256=aN3MwR6yORFv5pGA1ODiLqlNKCfAKQslIfpruAD6m08,5468
+meutils/llm/completions/agents/__init__.py,sha256=Wklnf7FTHm43hyVwfT8FXX44nqdOTykPb_HORIqDuuw,270
+meutils/llm/completions/agents/files.py,sha256=J8bkDykn9pd25B02RCoEU1SwVaUx27sDNH-jC4oXzVA,477
 meutils/llm/completions/rag/__init__.py,sha256=VH4g9H0pqMM1Rkjc1xefQb4Uh8f9vlTt6tjdD6G6Wc0,272
 meutils/llm/completions/rag/fire.py,sha256=0a_POkY9mEy1YwZHXOGnqf9EVyjiJwx3fWhmv_bQ54U,5743
 meutils/llm/completions/rag/qwen.py,sha256=1dBNLLbQDRsM-7EGaStcWFU8HRa-rp3RxJ9cpxu6TBg,265
@@ -683,7 +686,7 @@ meutils/schemas/jimeng_types.py,sha256=qsjtyURGsGnAGAhfZ9k4k-mtbRgjbWId75UMV1d6A
 meutils/schemas/jina_types.py,sha256=SLRRBCap2B1uXnHF7Sgnlz1Work8HvdIltjj4oVlGTk,8826
 meutils/schemas/kimi_types.py,sha256=PjCgHwCDNzKasn4X6rUzvOENqKYT3xj07cgp71IdsDA,3607
 meutils/schemas/kling_types.py,sha256=brWaREBtQeZGUuwgOW2p-vIm2WWInYkq8UfrLInT-Ik,6959
-meutils/schemas/kuaishou_types.py,sha256=YrRIP0KRruNHcxzPexsN-LjnQOGvxRlK7h4pNgHbe-Y,10914
+meutils/schemas/kuaishou_types.py,sha256=-tvlS73TgCqLNjG9M3dBobI8sK3CLPadbXTESB2KMC8,10884
 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
@@ -713,7 +716,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=U_foX82tejUT7efCqyMMTLfq-C4LXMXsmwz5pfldwNw,3734
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=RVftefKVkeEXeHqVrkpA27muaaHSMlt24q-doW2lZTA,24002
+meutils/schemas/oneapi/common.py,sha256=3Oe6a4-a7suvonJokPzNdU8i470mFzg_K3pGfdCE9Oc,24038
 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
@@ -841,9 +844,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.1.3.14.11.44.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.1.3.14.11.44.dist-info/METADATA,sha256=VmU_S_uKCR3JOYQq2WyChHxbkNDaH8WY6KQqyUuM2kA,6201
-MeUtils-2025.1.3.14.11.44.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.1.3.14.11.44.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.1.3.14.11.44.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.1.3.14.11.44.dist-info/RECORD,,
+MeUtils-2025.1.4.11.4.46.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.1.4.11.4.46.dist-info/METADATA,sha256=YJIJUQ4-qTTCH1p3ePuwd3TngoVBN2WE-cOhCap8B5w,6200
+MeUtils-2025.1.4.11.4.46.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.1.4.11.4.46.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.1.4.11.4.46.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.1.4.11.4.46.dist-info/RECORD,,

examples/_openaisdk/zhipu_/346/231/272/350/203/275/344/275/223.py

@@ -31,7 +31,6 @@ generate = client.assistant.conversation(
             "content": [{
                 "type": "text",
                 # "text": "北京未来七天气温，做个折线图",
-
                 "text": "画条狗"
 
             }]

meutils/apis/jimeng/common.py

@@ -12,6 +12,8 @@ from openai import AsyncClient
 from meutils.pipe import *
 from meutils.hash_utils import md5
 from meutils.schemas.image_types import ImageRequest
+from meutils.schemas.openai_types import TTSRequest
+
 from meutils.schemas.jimeng_types import BASE_URL, MODELS_MAP
 from meutils.str_utils.regular_expression import parse_url
 from meutils.apis.jimeng.files import upload
@@ -241,6 +243,76 @@ async def create_draft_content(request: ImageRequest, token: str):
     return draft_content
 
 
+def create_photo_lip_sync(request: TTSRequest):
+    # 映射
+    tts_info = {
+        "name": request.voice or "魅力姐姐",
+        "text": request.input,  # "永远相信美好的事情即将发生"
+        "speed": request.seed or 1,
+        "source_type": "text-to-speech",
+        "tone_category_id": 0,
+        "tone_category_key": "all",
+        "tone_id": "7382879492752019995",
+        "toneKey": request.voice or "魅力姐姐",
+    }
+    payload = {
+        "promptSource": "photo_lip_sync",
+        "generateTimes": 1,
+        "lipSyncInfo": tts_info,
+        "isUseAiGenPrompt": False,
+        "batchNumber": 1
+    }
+
+    return {
+        "submit_id": "",
+        "task_extra": json.dumps(payload),
+        "http_common_info": {
+            "aid": 513695
+        },
+        "input": {
+            "seed": 1834980836,
+            "video_gen_inputs": [
+                {
+                    "v2v_opt": {},
+                    "i2v_opt": {
+                        "realman_avatar": {
+                            "enable": true,
+                            "origin_image": {
+                                "width": 480,
+                                "height": 270,
+                                "image_uri": "tos-cn-i-tb4s082cfz/fae8f746367b40f5a708bf0f1e84de11",
+                                "image_url": ""  ########## https://oss.ffire.cc/files/kling_watermark.png
+                            },
+                            "resource_id_loopy": "34464cac-5e3e-46be-88ff-ccbc7da4d742",
+                            "resource_id_std": "2f66b408-37c3-4de5-b8a4-ba15c104612e",
+                            "origin_audio": {
+                                "duration": 3.216,
+                                "vid": "v02bc3g10000ctrpqrfog65purfpn7a0"
+                            },
+                            "tts_info": json.dumps(tts_info)
+                        }
+                    },
+                    "audio_vid": "v02bc3g10000ctrpqrfog65purfpn7a0",
+                    "video_mode": 4
+                }
+            ]
+        },
+        "mode": "workbench",
+        "history_option": {},
+        "commerce_info": {
+            "resource_id": "generate_video",
+            "resource_id_type": "str",
+            "resource_sub_type": "aigc",
+            "benefit_type": "lip_sync_avatar_std"
+        },
+        "scene": "lip_sync_image",
+        "client_trace_data": {},
+        "submit_id_list": [
+            "d4554e2c-707f-4ebe-b4e6-93aa6687d1c1"
+        ]
+    }
+
+
 if __name__ == '__main__':
     token = "693701c43e477b7c405cc7e2fef0ddbd"
     token = "eb4d120829cfd3ee957943f63d6152ed"

meutils/apis/jimeng/files.py

@@ -42,7 +42,7 @@ def u(params):
 
 
 class JJRequest:
-    def __init__(self, e, t, api, method="GET", params=None, data=None):
+    def __init__(self, e, t, api, method="GET", params=None, data=None, serviceName="imagex"):
         self.t = t
         self.e = e
         self.api = api
@@ -50,14 +50,18 @@ class JJRequest:
         self.params = params
         self.data = data
 
+        self.serviceName = serviceName
+
     def getAuthorization(self):
-        return f"AWS4-HMAC-SHA256 Credential={self.e['access_key_id']}/{self.t[0:8]}/cn-north-1/imagex/aws4_request, SignedHeaders=x-amz-date;x-amz-security-token, Signature={self.signature()}"
+        return f"AWS4-HMAC-SHA256 Credential={self.e['access_key_id']}/{self.t[0: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()
 
-    def getSigningKey(self, r="cn-north-1", n="imagex"):
+    def getSigningKey(self, r="cn-north-1"):
+        n = self.serviceName
+
         o = hmac_hash256("AWS4" + self.e['secret_access_key'], str(self.t[0:8]))
         i = hmac_hash256(o, str(r))
         s = hmac_hash256(i, str(n))
@@ -71,8 +75,8 @@ class JJRequest:
         t.append(hash256(self.canonicalString()))
         return "\n".join(t)
 
-    def credentialString(self, region="cn-north-1", serviceName="imagex"):
-        return "/".join([self.t[0:8], region, serviceName, "aws4_request"])
+    def credentialString(self, region="cn-north-1"):
+        return "/".join([self.t[0:8], region, self.serviceName, "aws4_request"])
 
     def canonicalString(self):
         e = []
@@ -169,6 +173,77 @@ def upload(image: bytes, upload_token: dict):  # oss 跨账号不知道是否可
     return oss_uri
 
 
+@cache(ttl=15 * 60)
+def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不知道是否可以使用
+    # e = auth = upload_token['data']['auth'] # 豆包
+    data = upload_token['data']
+    service_id = data.get('service_id', '3jr8j4ixpe')  # 即梦 3jr8j4ixpe 豆包 a9rns2rl98
+
+    if 'auth' in data:
+        data = data['auth']
+
+    session_token = data['session_token']
+
+    t = time.strftime("%Y%m%dT%H%M%SZ", time.gmtime())
+
+    params = {
+        "Action": "ApplyUploadInner",
+        "Version": "2020-11-19",
+        # "ServiceId": service_id,
+        "SpaceName": "artist_op",
+
+        "s": random_str(10),
+
+        "FileType": "video",
+        "FileSize": len(image),
+
+    }
+
+    r = JJRequest(data, t, "https://vod.bytedanceapi.com/", method="GET", params=params, serviceName="vod")
+    headers = {
+        'authorization': r.getAuthorization(),
+        'x-amz-date': t,
+        'x-amz-security-token': session_token,
+    }
+    # logger.debug(headers)
+    response = requests.get(r.api, params=params, headers=headers)
+    response.raise_for_status()
+    logger.debug(response.status_code)
+    response = response.json()
+
+    logger.debug(bjson(response))
+    if "Result" not in response:
+        return
+
+    upload_node = response['Result']['InnerUploadAddress']['UploadNodes'][0]
+    store_info = upload_node['StoreInfos'][0]
+    logger.debug(bjson(store_info))
+
+    vid = upload_node['Vid']
+    upload_host = upload_node['UploadHost']
+
+    oss_uri = store_info['StoreUri']
+    oss_token = store_info['Auth']
+
+    headers = {
+        "authorization": oss_token,
+        "content-length": str(len(image)),
+        "content-Type": "image/jpeg",
+        "content-crc32": fileCRC32(image),
+    }
+
+    # upload_url = f"https://tos-hl-x.snssdk.com/upload/v1/{oss_uri}"
+    upload_url = f"https://{upload_host}/upload/v1/{oss_uri}"
+
+    response = requests.post(upload_url, headers=headers, data=image)
+    response.raise_for_status()
+    response = response.json()
+
+    logger.debug(response)
+
+    return oss_uri
+
+
 if __name__ == "__main__":
     from meutils.apis.jimeng.common import get_upload_token
 
@@ -176,12 +251,13 @@ if __name__ == "__main__":
     token = "de2215a7bb8e442774cf388f03fac84c"
 
     # jimeng
-    token = "693701c43e477b7c405cc7e2fef0ddbd"
+    token = "eb4d120829cfd3ee957943f63d6152ed"
     #
     upload_token = arun(get_upload_token(token))
 
     #
-    # with open("11.jpg", "rb") as f:
-    #     file = image = f.read()
-    #
-    #     upload(image, upload_token)
+    with open("11.jpg", "rb") as f:
+        file = image = f.read()
+
+        # upload(image, upload_token)
+        print(upload_for_vod(image, upload_token))

meutils/apis/jimeng/lip_sync.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : lip_sync
+# @Time         : 2025/1/3 16:17
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *

meutils/apis/kuaishou/klingai_video.py

@@ -141,13 +141,13 @@ if __name__ == '__main__':
     # https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=v8vcZY
 
     # cookie = "_did=web_474598569404BC09;did=web_43cec8fac6fa32077f3b12bf131b77a7310f;kuaishou.ai.portal_ph=0e15bfbb51aa3d52d065602d7e566d622ba4;kuaishou.ai.portal_st=ChVrdWFpc2hvdS5haS5wb3J0YWwuc3QSsAHW9jii6pSdK5oTimSzQslDxQ5mLAW8m2j8dKFP4uptOr8aycVOX72ydltRPJhO6QbD4fGYD2pFXD_c4gqsAZPLZluo4DeIxFAWhEplxrmSA61cb-VBtCEB2bxyM1gC-sooTaSESNkekMI5WBEq1_NL5E2x-wigAGi6jm1Chpq-bJ3oTAXe9yMLV3oY4qilfoV9M77nn3cY-r76Z2Z9G-3JICGNjTmN2OAQSf_q3EXtMRoSITGi7VYyBd022GVFnVcqtiPoIiDjv6HmF2lhkn6FgvYhjgLMGinYaZxZj84kbjL8GfxuiygFMAE;userId=415950813"
-    token = "weblogger_did=web_9665177505014D12; _gcl_au=1.1.961392860.1725442018; did=web_d77db05423a7f37445a28355351bf2736bf0; anonymous-message-release-notice-1=true; userId=5138238; ksi18n.ai.portal_st=ChNrc2kxOG4uYWkucG9ydGFsLnN0EqABA02dJVaF0Q5XvWFZVNWLa-7fNeGjTJZ_BP3zPN4JN1Ct8LRrLlT8ZAtqXZa0X_fOBXuQFiOqfoIuTziI8bNUaIKPNjhfcCT2CUcLv9bIVdYkwlJGlzMai8-2o2MoF9yopDzeYfwphWxBh575DrMjMjnPoNp0MqSq3iDIIA9glYGxEOYRcotovl63JPPI1Vy4mSX46S1Omh1X0suF2oWKCBoSPFqCkp3UokbKTh0UPCIW9AgsIiBZRgCwD_UpSF1elCUq5jwFhe-Wr2hErFmS73Zc4GyXOSgFMAE; ksi18n.ai.portal_ph=c52b0d2188bc0e0d209a401f9cb4c4889227"
+    # token = "weblogger_did=web_9665177505014D12; _gcl_au=1.1.961392860.1725442018; did=web_d77db05423a7f37445a28355351bf2736bf0; anonymous-message-release-notice-1=true; userId=5138238; ksi18n.ai.portal_st=ChNrc2kxOG4uYWkucG9ydGFsLnN0EqABA02dJVaF0Q5XvWFZVNWLa-7fNeGjTJZ_BP3zPN4JN1Ct8LRrLlT8ZAtqXZa0X_fOBXuQFiOqfoIuTziI8bNUaIKPNjhfcCT2CUcLv9bIVdYkwlJGlzMai8-2o2MoF9yopDzeYfwphWxBh575DrMjMjnPoNp0MqSq3iDIIA9glYGxEOYRcotovl63JPPI1Vy4mSX46S1Omh1X0suF2oWKCBoSPFqCkp3UokbKTh0UPCIW9AgsIiBZRgCwD_UpSF1elCUq5jwFhe-Wr2hErFmS73Zc4GyXOSgFMAE; ksi18n.ai.portal_ph=c52b0d2188bc0e0d209a401f9cb4c4889227"
     request = KlingaiVideoRequest(prompt="一只可爱的黑白边境牧羊犬，头伸出车窗，毛发被风吹动，微笑着伸出舌头",
                                   duration=5)  # 27638649
     # e = KlingaiVideoRequest.Config.json_schema_extra.get('examples')[-1]  # 尾帧
     # request = KlingaiVideoRequest(**e)
     #
-    # pprint(arun(create_task(request, cookie)))
+    print(arun(create_task(request, vip=True)))
     # arun(get_task("31298981", cookie))
     # arun(get_task("vip-47426519", token))
 
@@ -191,7 +191,7 @@ if __name__ == '__main__':
     #
     #
     #
-    arun(get_reward(token))  # 签到
+    # arun(get_reward(token))  # 签到
     # arun(get_point(token))  # 签到
 
-    arun(get_task_plus('60909700', token=token))
+    # arun(get_task_plus('60909700', token=token))

meutils/apis/oneapi/channel.py

@@ -15,7 +15,7 @@ from meutils.schemas.oneapi import BASE_URL, GROUP_RATIO
 async def edit_channel(models, token: Optional[str] = None):
     token = token or os.environ.get("CHATFIRE_ONEAPI_TOKEN")
 
-    models = ','.join(filter(lambda model: model.startswith(("api", "official-api", "ppu")), models))
+    models = ','.join(filter(lambda model: model.startswith(("api", "official-api", "ppu", "kling-v")), models))
 
     payload = {
         "id": 289,

meutils/data/VERSION

@@ -1 +1 @@
-2025.01.03.14.11.44
+2025.01.04.11.04.46

meutils/llm/completions/agents/__init__.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : __init__.py
+# @Time         : 2025/1/3 15:38
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *

meutils/llm/completions/agents/files.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : files
+# @Time         : 2025/1/3 15:38
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 支持文档、图片、音频、视频问答
+"""单一智能体
+任意模型支持文档、图片、音频、视频问答
+api形式
+- /agents/v1
+- /v1 前缀区分 agents-{model}【底层调用 /agents/v1】
+
+"""
+
+from meutils.pipe import *

meutils/schemas/kuaishou_types.py

@@ -225,7 +225,6 @@ class KlingaiVideoRequest(BaseModel):
         kling_version = '1.5'
         if self.model == 'kling-v1.6':
             kling_version = "1.6"
-            self.mode = 'pro'
             arguments.append({"name": "camera_control_enabled", "value": "false"})  # 暂不支持
         else:
             arguments.append({"name": "camera_control_enabled", "value": "true"})

meutils/schemas/oneapi/common.py

@@ -153,10 +153,10 @@ MODEL_PRICE = {
 
     "api-kling": 0.1,
     "api-kling-vip": 0.5,
-    "api-kling-v1.6-std-5s": 1,
-    "api-kling-v1.6-std-10s": 2,
-    "api-kling-v1.6-pro-5s": 1.5,
-    "api-kling-v1.6-pro-10s": 3,
+    "api-kling-v1.6-std-5s": 1 * 0.8,
+    "api-kling-v1.6-std-10s": 2 * 0.8,
+    "api-kling-v1.6-pro-5s": 1 * 0.8 * 1.75,
+    "api-kling-v1.6-pro-10s": 2 * 0.8 * 1.75,
 
     "api-vidu": 0.09,
     "api-vidu-vip": 0.3,