MeUtils 2025.5.1.20.22.23__py3-none-any.whl → 2025.5.7.18.34.50__py3-none-any.whl

{MeUtils-2025.5.1.20.22.23.dist-info → MeUtils-2025.5.7.18.34.50.dist-info}/RECORD

@@ -98,7 +98,7 @@ examples/_openaisdk/openai_audio_gpt.py,sha256=7I8Iq1vNnBrxIZ5vfo40oO9zKrrUZbyHL
 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=fQHQ-Z-JpJ7ld2OwIxEF42jOJPQr1eWU6labye44Jiw,19052
+examples/_openaisdk/openai_chatfire.py,sha256=d_AFjubD33sRD0TflzRq-SEDsNjYrwCqgRFpQNekmjA,19043
 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
@@ -285,7 +285,7 @@ meutils/ai_audio/asr/xunfei_asr.py,sha256=XctZCjxu6sQd05biMTOfL9y3TA15kLYIc9mwIZ
 meutils/ai_audio/tts/EdgeTTS.py,sha256=5pO0soW-bYwKmwX87Je_lYGr-XQFeoW4LKMPo_MGfGc,5919
 meutils/ai_audio/tts/__init__.py,sha256=2i3eHZ-f3xG8HsgFcb7V7-b6gb6jKQOZNzr_2WnvCpQ,405
 meutils/ai_audio/tts/minimax.py,sha256=Hy9AWaUSb0cMQnLeNzqe2oBaMJh0c_l-GP92SBwnQ9o,854
-meutils/ai_audio/tts/openai_tts.py,sha256=tdx_s5RFkxyA7IqGwVzd5rmhZjgq0Z1kTKCPXXZxZis,2185
+meutils/ai_audio/tts/openai_tts.py,sha256=J5Q0n9b2pqLo6hXh8l6fCiQe8Zw0uePjw_yyZYdFIxU,2245
 meutils/ai_audio/tts/tts_ui.py,sha256=cj3WGTnBN67gT00vT4ftTwZroJifAJRVJuE4WNzbo_4,4638
 meutils/ai_cv/__init__.py,sha256=0CoI0WlNwB0yFHkYqp5waF767WSZZsfOVxjlmtlCGT0,244
 meutils/ai_cv/doc_prompt.py,sha256=bF9A4x-Jv_mZikJlNEMd3zxjJn68Z3Ymla5x-QtHOS8,2684
@@ -361,8 +361,9 @@ meutils/apis/fal/__init__.py,sha256=A7w3ZAS7Tv20N4X4Em6NshDxKSCPAzaPxHJTbM3BbyM,
 meutils/apis/fal/files.py,sha256=Gppdo96uw8-TCDr8P691jV7dK9Si-E-kJXFJR5BVt-Q,1373
 meutils/apis/fal/images.py,sha256=0diKFpsiO_ZZTL8LnNMN5wV2urfhIEIqIMe_HdrdiLs,8707
 meutils/apis/fal/images_.py,sha256=C-C1TTQtMJ6RRcd-4FeYPn0R5IpPRPUFmBbrTVs_ypA,1446
+meutils/apis/fal/kling_videos.py,sha256=PXRT1rsCSb1QlpmFcGIKYxgRkVmEfMuW7m3iJi1Wk60,2385
 meutils/apis/fal/pd.py,sha256=oPrMK_FJqohl2Kf0U0it8SqgvIlSEYFcSX8sfVkD8bU,311
-meutils/apis/fal/videos.py,sha256=GzMyS-nBMGAXHaCLKxgCdzowB3jpJDXLb6-y1v0zKNo,3387
+meutils/apis/fal/videos.py,sha256=napknQKM2-cU3fKlqXD2BApOVyyIMGxC-2IimR0LBYw,3529
 meutils/apis/gitee/__init__.py,sha256=rmAktsUvEtk7_F28P5C65wuu00nmrbu5bOw6PiCRTS0,271
 meutils/apis/gitee/色情图片识别.py,sha256=liCftD7sL6Fw4Aq6r1PY-qxsxm5XkgVdDvlDR39lrEU,757
 meutils/apis/gitee/images/__init__.py,sha256=zvS8e0ogQLqajZTAype1e0TDLJenlfbRQ16FjSYpxbY,243
@@ -415,12 +416,13 @@ 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=ENdwkppOOekt9Qzy_50TyA7lzNEqo0TpZcF7d2rYBhc,245
-meutils/apis/jimeng/common.py,sha256=4MfdLRpHjWSEOE-DtdqkWmebNoW0_lYc7xG4tznghnc,7092
+meutils/apis/jimeng/common.py,sha256=c2ag4lcxYoC6aR0qZ8t1nwmJ-oB22zHve_UeGuHecg0,7546
 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=O3WAuXIN1psaXePCLRShKnkJ1K8rZoFDOZsoTco3AD8,14191
-meutils/apis/jimeng/videos.py,sha256=x-PDOYNBN-yTmNvMbyDbwm_E2LXZ6A4hcVzEahV_Hvc,10813
+meutils/apis/jimeng/files.py,sha256=AlsAlQGufGm84TldUBLFZpZQGD6INN5xIwHql9ocPj4,11310
+meutils/apis/jimeng/images.py,sha256=KZFxD7kp8QdIqNK71sE8disShnQpUzvOv79FK8mZOZs,13814
+meutils/apis/jimeng/videos.py,sha256=oSntgqp0efv_69Qj_-GR8zD94hIMqUh-Hubk0nyKRGw,5377
+meutils/apis/jimeng/videos_videos.py,sha256=A6oWLKcrb6YMIumqUMQS3KVP9bhOEKLUOIlAUlbREmE,12259
 meutils/apis/jina/__init__.py,sha256=WnZ4LOv-bzC1brd5FZHOHmgq4c0UaFbnksEj2_LzXxQ,292
 meutils/apis/jina/common.py,sha256=dwSJboUcZtvBTKRcvAUcgMD933VfYCUBDdtxbw1ioiE,1099
 meutils/apis/kling/__init__.py,sha256=pKz40SEjui1dhHBD-icyNTJOYhzLvxLxJCwszuH4vio,271
@@ -442,7 +444,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=-1sa8m1tkheHXbdWeH5lWHGhFKQVlAjfd-zEOV3qWbE,7526
+meutils/apis/oneapi/channel.py,sha256=tx4-_U18JU1U4-FIAwaKu9m_oOtPRU-8hPiqYlDZ2CU,11277
 meutils/apis/oneapi/common.py,sha256=AIs8ro-1qui3FG42msBY6dL_zt9QJ0jS63qtp-XTlY4,3617
 meutils/apis/oneapi/demo.py,sha256=i9iBK2OftTvOZdPcCo2nxu8zs0fSKIZbzD8DRKQNla8,1851
 meutils/apis/oneapi/log.py,sha256=gNFFXXcG2Xp5ttO7Q7qR6n6GQUheuU8SOCjJPXZudLY,1447
@@ -513,7 +515,7 @@ meutils/apis/voice_clone/__init__.py,sha256=y7Rpn90LocHhA0ywrDP_fT4QAK7sr4JsIX5w
 meutils/apis/voice_clone/fish.py,sha256=6m8zcS2KEqmalKy2ArnOaNovyxsQp_sw4d_O1kVZR2s,7146
 meutils/apis/voice_clone/fish_api.py,sha256=pDpE-B8HFiGIOV3NVd1HmFrCC2GQc3wH-81oNbTS0mY,307
 meutils/apis/volcengine_apis/__init__.py,sha256=PnngoI3Qk6n_axdOLgENCFYlKsmohgzYVW1HUg7L8gI,271
-meutils/apis/volcengine_apis/images.py,sha256=6_HZBckqlOsyAEYH5d7JnKW7kuyJ6MAArfosCODKFJ8,5261
+meutils/apis/volcengine_apis/images.py,sha256=DtzrDEU_RY3-u-SQKYDFFzh2rudSDc2sNfAmT67Nci8,5332
 meutils/apis/volcengine_apis/tasks.py,sha256=XnmZZ7FM7oPM7V-zvsO0YkCeg1LYCjD29JGJFyatG2I,1806
 meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpMLo,367
 meutils/async_task/celery_config.py,sha256=BX1h3jY34aO6UmUFakdBUwOdsEiOxCGuUtYDUKFtafc,3461
@@ -563,7 +565,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=40dZ-IQ8WNE3ZkqWqYRV46XJECZ6c4Zuxd6sKR87_ok,19
+meutils/data/VERSION,sha256=sQ4C7ud4BsuuVZOqwlpLPp-17QT-WEg7ZWEVYmodcJQ,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -682,7 +684,7 @@ meutils/llm/completions/rag/qwen.py,sha256=1dBNLLbQDRsM-7EGaStcWFU8HRa-rp3RxJ9cp
 meutils/llm/completions/rag/rag.py,sha256=mnC4bZUMuNYuPFXMBqXMofj_ms8uP5MMw1leJ5jXA_k,1209
 meutils/llm/functions/__init__.py,sha256=It6pcNwRBSh3Em45ooi61lc5tFg8eOYv0BvEFuRjSGQ,271
 meutils/llm/openai_polling/__init__.py,sha256=qmAMITPtrTD-y57RiJXewuOic7iLKBhx8mz5uvcxsy8,270
-meutils/llm/openai_polling/chat.py,sha256=xzkT4G_Xxj2tMQSODb2iO8HyCgRJwj9RLagzMalmKXk,8290
+meutils/llm/openai_polling/chat.py,sha256=-zByJeKGajm3OVB7T7Sgi_zmUufBgm8Rh_tR0dQnXSA,8161
 meutils/llm/openai_polling/images.py,sha256=qKMk3vCvamS_48ceC-_y2LPpP5XsD476FHG9MUu8kks,1042
 meutils/llm/openai_utils/__init__.py,sha256=MWyNhP2K49oaHGEZlInZc3XlwqlStFultP8k7HDPAwk,290
 meutils/llm/openai_utils/common.py,sha256=GGctOMlg8xT2A5H-8hMow0VfOZHCDdIPjd12597Nohs,9754
@@ -818,7 +820,7 @@ meutils/schemas/textin_types.py,sha256=IBYbSG7n5rAcS7Z5bXPBnL1a91gx8IBpUlFTGULKj
 meutils/schemas/translator_types.py,sha256=xufNQeyim7RhkzAK_J5_JchZfqaUBDXFwMtrPUu1xzI,627
 meutils/schemas/tripo3d_types.py,sha256=mQF65HwHYmczRgAIuXK5hGxWDWNYDq-Xu9pja7Dwy4o,1452
 meutils/schemas/tryblend_types.py,sha256=glZ0diRJvZmfQotcCWYBA832inihy8TvVWxWZ64CzWA,27793
-meutils/schemas/video_types.py,sha256=shXriVG_HMVkUCwNQl7H6vTmZ2SXkjzDHJJ5uWfXKcQ,2519
+meutils/schemas/video_types.py,sha256=GIec_98NQJNvZMFAlIFNQE4fBA1iCIUguCIG6ot3vqc,3182
 meutils/schemas/vidu_types.py,sha256=7V2uGxK3MyiT-j-Cjoni_DaL2CcJJzz2YPCx_mTplGw,9380
 meutils/schemas/wechat_types.py,sha256=XtIJpMNBzkqBcU68Qno8bnUfHzDOXwFNCIL-6VYQKOA,9260
 meutils/schemas/yuanbao_types.py,sha256=bI_CF9ybaJ1ux8NgP5gEi33k_K_vHmlyD09fxzhYEkQ,12269
@@ -826,7 +828,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=3t2m0H80saEXmYUZfVFrtEaY117GjZTsSa1GKgkJzqQ,3896
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=arghp-dZbLlmXNmeWUuo5TDksQ2_i-AP_OextGpO2Pw,37771
+meutils/schemas/oneapi/common.py,sha256=AtXuVugPN-1T3MjAH_dP6rjZB6gnt2l8EScdAM6ebXY,38070
 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
@@ -955,9 +957,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.5.1.20.22.23.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.5.1.20.22.23.dist-info/METADATA,sha256=MTfsmgbYlI0N9xPI3LFqXRa6uOnr77tOxy_nOiuLd30,32833
-MeUtils-2025.5.1.20.22.23.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.5.1.20.22.23.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.5.1.20.22.23.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.5.1.20.22.23.dist-info/RECORD,,
+MeUtils-2025.5.7.18.34.50.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.5.7.18.34.50.dist-info/METADATA,sha256=wwDNNDEhbrm0WXAGaFQhmtCAVmHzlFeKLuLVZ-DuBzA,32833
+MeUtils-2025.5.7.18.34.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.5.7.18.34.50.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.5.7.18.34.50.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.5.7.18.34.50.dist-info/RECORD,,

examples/_openaisdk/openai_chatfire.py

@@ -267,8 +267,8 @@ if __name__ == '__main__':
 
     # check_models(models, api_key=os.getenv("OPENAI_API_KEY"))
     # check_models(models)
-    models = ['chatfire-translator']
-    check_models(models, api_key=os.getenv("OPENAI_API_KEY_GUOCHAN") + "-2994")
+    models = ['gemini-2.5-pro-preview-03-25']
+    check_models(models, api_key=os.getenv("OPENAI_API_KEY"))
 
 #############神奇 #############reasoning_content 神奇
 

meutils/ai_audio/tts/openai_tts.py

@@ -21,7 +21,9 @@ client = OpenAI(
     # base_url=base_url,
     # api_key=os.getenv('OPENAI_API_KEY'),
 
-    api_key=os.getenv('OPENAI_API_KEY_OPENAI') + "-2738",
+    # api_key=os.getenv('OPENAI_API_KEY_OPENAI') + "-2738",
+    api_key=os.getenv('OPENAI_API_KEY_OPENAI') + "-364",
+
 )
 
 # text = """

meutils/apis/fal/kling_videos.py

@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : videos
+# @Time         : 2025/1/15 15:45
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+from meutils.apis.fal.images import check
+
+from meutils.schemas.task_types import TaskResponse
+from meutils.schemas.video_types import VideoRequest
+
+from meutils.schemas.fal_types import FEISHU_URL
+from meutils.config_utils.lark_utils import get_next_token_for_polling
+
+from fal_client import AsyncClient
+
+
+# 平台/模型/版本
+def model_mapper(model: str):
+    return f"fal-ai/{model.removeprefix('fal-ai/')}"
+
+
+async def create_task(request: VideoRequest, token: Optional[str] = None):
+    """https://fal.ai/models/fal-ai/latentsync/api#queue-submit
+
+    """
+    token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True, check_token=check)
+    logger.debug(request)
+
+    application = f"fal-ai/{request.model.removeprefix('fal-ai/')}"
+
+    client = AsyncClient(key=token)
+    response = await client.submit(
+        application=application,
+        arguments=request.model_dump(exclude_none=True, exclude={"model"})
+    )
+    # AsyncRequestHandle(request_id='0b7ab6b8-c7dc-4f17-a655-4ee56dd0f864')
+
+    return TaskResponse(task_id=f"{request.model}::{response.request_id}", system_fingerprint=token)
+
+
+@alru_cache(ttl=5)
+async def get_task(task_id: str, token: Optional[str] = None):
+    model, request_id = task_id.rsplit('::', 1)
+    application = f"fal-ai/{model.removeprefix('fal-ai/')}"
+
+    client = AsyncClient(key=token)
+    response = await client.status(application, request_id, with_logs=True)
+
+    logger.debug(response.__class__.__name__)  # Queued, InProgress, COMPLETED
+
+    if metrics := response.__dict__.get("metrics"):  # {'inference_time': 17.29231595993042}
+        response = await client.result(application, request_id)
+
+    return response
+
+
+if __name__ == '__main__':
+    model = "latentsync"
+    # model = "sync-lipsync"
+
+
+    model = "fal-ai/kling-video/v2/master/image-to-video"
+    model = "fal-ai/kling-video/v1/standard/text-to-video"
+
+    request = VideoRequest(
+        model=model,
+        prompt="A cute cat",
+    )
+
+
+    r = arun(create_task(request))
+
+
+    # r = arun(get_task(task_id, token))
+
+    arun(get_task(r.task_id, r.system_fingerprint))

meutils/apis/fal/videos.py

@@ -32,7 +32,7 @@ async def create_task(request: FalVideoRequest, token: Optional[str] = None):
     token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL)
     logger.debug(request)
 
-    application = f"fal-ai/{request.model}"
+    application = f"fal-ai/{request.model.removeprefix('fal-ai/')}"
 
     client = AsyncClient(key=token)
     response = await client.submit(
@@ -74,6 +74,9 @@ if __name__ == '__main__':
         video_url=video_url
     )
 
+    model = "fal-ai/kling-video/v2/master/image-to-video"
+    model = "fal-ai/kling-video/v1/standard/text-to-video"
+
     #
     # r = arun(create_task(request))
     # logger.debug(f"{r.task_id, r.system_fingerprint}")

meutils/apis/jimeng/common.py

@@ -20,6 +20,7 @@ from fake_useragent import UserAgent
 
 ua = UserAgent()
 
+
 @lru_cache()
 def get_headers(url, token: str = "693701c43e477b7c405cc7e2fef0ddbd"):
     device_time = f"{int(time.time())}"
@@ -45,13 +46,24 @@ def get_headers(url, token: str = "693701c43e477b7c405cc7e2fef0ddbd"):
 
 
 @cache(ttl=3600 // 2)
-async def get_upload_token(token):  # 3600 跨账号？
+async def get_upload_token(token, biz: Optional[str] = None):  # 3600 跨账号？
+
+    if biz == "video":
+        url = "/mweb/v1/get_upload_token"  # ?aid=513695&da_version=3.2.0&aigc_features=app_lip_sync
+
+        payload = {"scene": 2}
+        client = AsyncClient(base_url=BASE_URL)
+        response = await client.post(url, body=payload, cast_to=object)
+        logger.debug(bjson(response))
+        return response
+
     url = "/artist/v2/tools/get_upload_token"
     headers = get_headers(url, token)
 
     payload = {"scene": 2}
     client = AsyncClient(base_url=BASE_URL, default_headers=headers)
     response = await client.post(url, body=payload, cast_to=object)
+    logger.debug(bjson(response))
     return response
 
 
@@ -182,11 +194,13 @@ if __name__ == '__main__':
     # token = "b8bb4cb67dba6c0d1048bdc0596bc461"
     # token = "34438eb03d165737122180caf62a8058"
     # token = "a521dd578adcfb191fad38dd4baab498"
-    token="7d9969ffd8ad2edda7da8fff11cb9434"
-    token="1513337bdba08a1a77fedad95c03bc6c"
-    token="b1cd6317e4d161bbb3889b9defd769ff"
-    token="a521dd578adcfb191fad38dd4baab498"
-    arun(check_token(token))
+    token = "7d9969ffd8ad2edda7da8fff11cb9434"
+    token = "1513337bdba08a1a77fedad95c03bc6c"
+    token = "b1cd6317e4d161bbb3889b9defd769ff"
+    token = "ed16bb360a4744696f88a7b52b7c10a3"
+    # arun(check_token(token))
+
+    arun(get_upload_token(token, 'video'))
 
     # print(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0].tolist())
     # tokens = arun(get_series(FEISHU_URL))
@@ -202,5 +216,3 @@ if __name__ == '__main__':
     #
     # request = ImageRequest(prompt='https://oss.ffire.cc/files/kling_watermark.png笑起来')
     # arun(create_draft_content(request, token))
-
-

meutils/apis/jimeng/files.py

@@ -102,11 +102,13 @@ class JJRequest:
         return hash256("")
 
 
-@cache(ttl=15 * 60)
+# @cache(ttl=15 * 60)
 async def upload(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
+    # service_id = data.get('service_id', '3jr8j4ixpe')  # 即梦 3jr8j4ixpe 豆包 a9rns2rl98
+
+    service_id = data.get('space_name') or "3jr8j4ixpe"  # 即梦视频 tb4s082cfz
 
     if 'auth' in data:
         data = data['auth']
@@ -115,13 +117,14 @@ async def upload(image: bytes, upload_token: dict):  # oss 跨账号不知道是
 
     t = time.strftime("%Y%m%dT%H%M%SZ", time.gmtime())
 
+    # "ServiceId": "tb4s082cfz",
     params = {
         "Action": "ApplyImageUpload",
         "Version": "2018-08-01",
         "ServiceId": service_id,
         "s": random_str(10),
 
-        "FileExtension": ".png",  #####
+        # "FileExtension": ".png",  #####
         "FileSize": len(image),
     }
 
@@ -193,7 +196,7 @@ async 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
+    service_id = data.get('space_name', 'tb4s082cfz')  # 即梦 3jr8j4ixpe 豆包 a9rns2rl98
 
     if 'auth' in data:
         data = data['auth']
@@ -205,9 +208,10 @@ async def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不
     params = {
         "Action": "ApplyUploadInner",
         "Version": "2020-11-19",
-        # "ServiceId": service_id,
+
+        "ServiceId": service_id,
         # "SpaceName": "artist_op",
-        "SpaceName": "dreamina",
+        # "SpaceName": "dreamina",
 
         "IsInner": "1",
 
@@ -274,11 +278,11 @@ async def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不
     return vid, oss_uri
 
 
-async def upload_for_image(image, token):  # todo: 跨账号token
+async def upload_for_image(image, token, biz: Optional[str] = None):  # todo: 跨账号token
     """image url base64 bytes"""
     if not image: return
 
-    upload_token = await get_upload_token(token)
+    upload_token = await get_upload_token(token, biz)
     image_uri = await upload(await to_bytes(image), upload_token)
     return image_uri
 
@@ -356,5 +360,9 @@ if __name__ == "__main__":
     #     # 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))
+    # arun(face_recognize(image_url, token))
+    # arun(face_recognize(image_url))
+
+    token = "ed16bb360a4744696f88a7b52b7c10a3"
+
+    arun(upload_for_image(image_url, token, "video"))

meutils/apis/jimeng/images.py

@@ -388,25 +388,13 @@ if __name__ == '__main__':
     #
     # face_recognize_data = face_recognize.get("data", {})
 
-    data = {
-        "model": "seededit",
-        "prompt": "https://oss.ffire.cc/files/kling_watermark.png 让这个女人带上墨镜，衣服换个颜色",
-        # "prompt": "草拟吗 艹",
-        # "prompt": "让这个女人带上墨镜，衣服换个颜色",
-        # "prompt": "Add a background for this photo, sort of sizzle it.",
 
-        "size": "1024x1024",
-
-        # "controls": {
-        #     "face_recognize_data": face_recognize_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"
-    prompt = "a dog cat"
-    prompt = "https://oss.ffire.cc/files/kling_watermark.png 让这个女人带上墨镜，衣服换个颜色...  "
+    prompt = "a dog cat in the same room"
+    # prompt = "https://oss.ffire.cc/files/kling_watermark.png 让这个女人带上墨镜，衣服换个颜色...  "
     request = ImageRequest(prompt=prompt, size="1328x1328")
     # request = ImageRequest(prompt=prompt, size="1024x1024")
 
@@ -416,5 +404,9 @@ if __name__ == '__main__':
 
     # arun(get_task(task.task_id, task.system_fingerprint))
 
+
+
+    arun(get_task("16132262728706", "d2d142fc877e696484cc2fc521127b36"))
+
     # arun(generate(request))