MeUtils 2025.1.17.19.49.29__tar.gz → 2025.1.23.10.16.28__tar.gz

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28/MeUtils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.1.17.19.49.29
+Version: 2025.1.23.10.16.28
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -108,42 +108,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 Provides-Extra: all
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: reportlab; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: langchain; extra == "all"
 Requires-Dist: pymupd; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: seaborn; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: streamlit; extra == "all"
+Requires-Dist: geopy; extra == "all"
 Requires-Dist: openai; extra == "all"
-Requires-Dist: thefuck; extra == "all"
-Requires-Dist: missingno; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: langchain; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: fastapi[all]; extra == "all"
 Requires-Dist: pymysql; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: schedule; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
 Requires-Dist: polars; extra == "all"
+Requires-Dist: simplejson; extra == "all"
 Requires-Dist: jmespath; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: pymongo; extra == "all"
-Requires-Dist: schedule; extra == "all"
+Requires-Dist: streamlit; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
 Requires-Dist: filetype; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: fastapi; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: missingno; extra == "all"
 Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: reportlab; extra == "all"
 Requires-Dist: jinja2; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
-Requires-Dist: simplejson; extra == "all"
 Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: pymongo; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/MeUtils.egg-info/SOURCES.txt

@@ -164,7 +164,7 @@ meutils/apis/jimeng/doubao.py
 meutils/apis/jimeng/doubao_utils.py
 meutils/apis/jimeng/files.py
 meutils/apis/jimeng/images.py
-meutils/apis/jimeng/lip_sync.py
+meutils/apis/jimeng/videos.py
 meutils/apis/kling/__init__.py
 meutils/apis/kling/api.py
 meutils/apis/kling/images.py

{meutils-2025.1.17.19.49.29/MeUtils.egg-info → meutils-2025.1.23.10.16.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.1.17.19.49.29
+Version: 2025.1.23.10.16.28
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -108,42 +108,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 Provides-Extra: all
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: reportlab; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: langchain; extra == "all"
 Requires-Dist: pymupd; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: seaborn; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: streamlit; extra == "all"
+Requires-Dist: geopy; extra == "all"
 Requires-Dist: openai; extra == "all"
-Requires-Dist: thefuck; extra == "all"
-Requires-Dist: missingno; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: langchain; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: fastapi[all]; extra == "all"
 Requires-Dist: pymysql; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: schedule; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
 Requires-Dist: polars; extra == "all"
+Requires-Dist: simplejson; extra == "all"
 Requires-Dist: jmespath; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: pymongo; extra == "all"
-Requires-Dist: schedule; extra == "all"
+Requires-Dist: streamlit; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
 Requires-Dist: filetype; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: fastapi; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: missingno; extra == "all"
 Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: reportlab; extra == "all"
 Requires-Dist: jinja2; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
-Requires-Dist: simplejson; extra == "all"
 Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: pymongo; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/meutils/apis/fal/videos.py

@@ -50,13 +50,16 @@ async def get_task(task_id: str, token: Optional[str] = None):
     application = f"fal-ai/{model}"
 
     client = AsyncClient(key=token)
-    # status = await fal_client.status_async("fal-ai/latentsync", request_id, with_logs=True)
+    response = await client.status(application, request_id, with_logs=False)
+    logger.debug(response)
 
-    response = await client.result(application, request_id)
-    # AsyncRequestHandle(request_id='0b7ab6b8-c7dc-4f17-a655-4ee56dd0f864')
+    # response = await client.result(application, request_id)
+    # client.AsyncRequestHandle(request_id='0b7ab6b8-c7dc-4f17-a655-4ee56dd0f864')
     return response
 
 
+
+
 if __name__ == '__main__':
     model = "latentsync"
     model = "sync-lipsync"
@@ -70,8 +73,11 @@ if __name__ == '__main__':
 
     r = arun(create_task(request))
 
-    token = "3f712efa-a692-4e7f-9409-e6c505bab4e2:151a0b6093312cc8f66fc52b7c4c92a8"
-    model = "0b7ab6b8-c7dc-4f17-a655-4ee56dd0f864"
 
-    # task_id = r.task_id
-    # arun(get_task(task_id, token))
+    task_id = r.task_id
+    arun(get_task(task_id, r.system_fingerprint))
+
+    # task_id="latentsync::d4133f01-0f5b-4213-abe4-d14abdb57e3f"
+    # token = "3f712efa-a692-4e7f-9409-e6c505bab4e2:151a0b6093312cc8f66fc52b7c4c92a8"
+
+    # r = arun(get_task(task_id, token))

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/meutils/apis/hailuoai/videos.py

@@ -35,14 +35,19 @@ send_message = partial(
 )
 
 MODEL_MAPPING = {
-    # video-01
-    "T2V-01": "23000",
-    "I2V-01": "23001",
-    "I2V-01-live": "23011",
-    "S2V-01": "23021"
+    # video-01 video-01 video-01-live2d S2V-01
+
+    "t2v-01": "23000",
+    "i2v-01": "23001",
+    "i2v-01-live": "23011",
+    "video-01-live2d": "23011",
+    "s2v-01": "23021",
 }
 
 
+# minimax_video-01,minimax_video-01-live2d,,minimax_t2v-01,minimax_i2v-01,minimax_i2v-01-live,minimax_s2v-01
+
+
 async def upload(file: bytes, token: Optional[str] = None, vip: Optional[bool] = True):
     global BASE_URL, FEISHU_URL
     if vip:
@@ -217,6 +222,11 @@ async def create_task(request: VideoRequest, token: Optional[str] = None, vip: O
                 # "type": "png",
                 "url": request.first_frame_image,
             }
+
+            # {"desc": "跳起来", "useOriginPrompt": false, "fileList": [{"id": "338311163211288581",
+            #                                                            "url": "https://cdn.hailuoai.video/moss/prod/2025-01-22-11/user/multi_chat_file/de5a4cec-eb26-4380-94e4-13b268bf5c0d.jpg",
+            #                                                            "name": "duikoux.jpg", "type": "jpg"}],
+            #  "modelID": "23021", "quantity": "1"}
         else:
             data = await upload(file, token=refresh_token, vip=vip)
             file_data = {
@@ -227,7 +237,7 @@ async def create_task(request: VideoRequest, token: Optional[str] = None, vip: O
             }
 
         payload["fileList"].append(file_data)
-        payload["modelID"] = MODEL_MAPPING.get(request.model, "23001")
+        payload["modelID"] = MODEL_MAPPING.get(request.model.lower(), "23001")
 
     logger.debug(bjson(payload))
 

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/meutils/apis/images/edits.py

@@ -102,18 +102,18 @@ async def edit_image(request: ImageProcess):
     }
 
     if request.model == "remove-watermark":
-        if mask:
+        if mask:  ####### todo: mask 抠图
             payload['type'] = "2"
-        return await make_request_for_baidu(payload)
+        return await make_request_for_baidu(payload, response_format=request.response_format)
 
     elif request.model == "clarity":
         payload['type'] = "3"
-        return await make_request_for_baidu(payload)
+        return await make_request_for_baidu(payload, response_format=request.response_format)
 
     elif request.model == "expand":
         payload['type'] = "4"
         payload['ext_ratio'] = request.aspect_ratio
-        return await make_request_for_baidu(payload)
+        return await make_request_for_baidu(payload, response_format=request.response_format)
     ################################################################################################
 
     elif request.model == "rmbg-2.0":

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/meutils/apis/images/recraft.py

@@ -143,10 +143,10 @@ if __name__ == '__main__':
         **data
     )
 
-    with timer():
-        arun(generate(request, token=token))
+    # with timer():
+    #     arun(generate(request, token=token))
     # tokens = [token]
 
-    # tokens = list(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0]) | xfilter_
-    #
-    # r = arun(check_token(tokens))
+    tokens = list(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0]) | xfilter_
+
+    r = arun(check_token(tokens))

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/meutils/apis/jimeng/common.py

@@ -16,8 +16,7 @@ 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
-from meutils.io.files_utils import to_bytes
+from meutils.apis.jimeng.files import upload_for_image
 from meutils.caches.redis_cache import cache
 
 from fake_useragent import UserAgent
@@ -25,7 +24,7 @@ from fake_useragent import UserAgent
 ua = UserAgent()
 
 
-def get_headers(url, token="693701c43e477b7c405cc7e2fef0ddbd"):
+def get_headers(url, token: str = "693701c43e477b7c405cc7e2fef0ddbd"):
     device_time = f"{int(time.time())}"
     sign = md5(
         # f"9e2c|receive|7|5.8.0|{device_time}||11ac"
@@ -112,8 +111,7 @@ async def create_draft_content(request: ImageRequest, token: str):
 
     if urls := parse_url(request.prompt):
         url = urls[-1]
-        upload_token = await get_upload_token(token)
-        image_uri = upload(await to_bytes(url), upload_token)
+        image_uri = upload_for_image(url, token)
 
         request.prompt = request.prompt.replace(url, '')
         request.model = "high_aes_general_v20_L:general_v2.0_L"  # 2.1不支持图片编辑
@@ -319,6 +317,7 @@ if __name__ == '__main__':
     token = "dcf7bbc31faed9740b0bf748cd4d2c74"
     token = "38d7d300b5e0a803431ef88d8d2acfef"
     token = "916fed81175f5186a2c05375699ea40d"
+    token = "7c5e148d9fa858e3180c42f843c20454"
     # arun(get_credit(token))
     arun(check_token(token))
 

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/meutils/apis/jimeng/doubao.py

@@ -13,13 +13,13 @@ from meutils.pipe import *
 from meutils.apis.jimeng.doubao_utils import generate_cookie
 
 from meutils.schemas.image_types import ImageRequest
-from meutils.schemas.task_types import TaskResponse
+
 from meutils.schemas.jimeng_types import BASE_URL, MODELS_MAP, FEISHU_URL
 from meutils.apis.jimeng.common import create_draft_content, get_headers, check_token
 from meutils.config_utils.lark_utils import get_next_token_for_polling
 
 
-async def create():
+async def create_():
     headers = {
         'agw-js-conv': 'str',
         'Cookie': 's_v_web_id=verify_m4t9wrdc_qgbhUw0z_07iP_4GFV_8HA7_6jr0e9lLCqQO; passport_csrf_token=8a8aa82fa109ecb3cb25e7afa10de214; passport_csrf_token_default=8a8aa82fa109ecb3cb25e7afa10de214; oauth_token=e45378cb-5afd-4495-88f5-58440e321b48; n_mh=lG4jjJNpPRqpnflIMXQoPMflNZdP31M8fFqgdR9Id5g; uid_tt=1a11a8af13cf1c878482fa862287107c; uid_tt_ss=1a11a8af13cf1c878482fa862287107c; sid_tt=de2215a7bb8e442774cf388f03fac84c; sessionid=de2215a7bb8e442774cf388f03fac84c; sessionid_ss=de2215a7bb8e442774cf388f03fac84c; is_staff_user=false; store-region=cn-js; store-region-src=uid; odin_tt=774fcc6d25d5259fd2af19858e0518c64943eb788718658b403ad8eb13ebbc6ebcb4c42620e87a48b2efb45fe78dc163b82399750898bb201c89f324b9e25b94; passport_auth_status=042935fbff60617ac0735d3ba4cfb559%2C7c535e1ccd98b367728b6560feb66a2e; passport_auth_status_ss=042935fbff60617ac0735d3ba4cfb559%2C7c535e1ccd98b367728b6560feb66a2e; sid_guard=de2215a7bb8e442774cf388f03fac84c%7C1734489199%7C5184000%7CSun%2C+16-Feb-2025+02%3A33%3A19+GMT; sid_ucp_v1=1.0.0-KGQyN2NlYjIxNTA1NTc3ZjI3NWQ2MjZkY2FhNGM3MGM0NzdkNGVjZDMKHwjAreC708zWBBDv6Ii7BhjCsR4gDDDn782qBjgIQCYaAmxxIiBkZTIyMTVhN2JiOGU0NDI3NzRjZjM4OGYwM2ZhYzg0Yw; ssid_ucp_v1=1.0.0-KGQyN2NlYjIxNTA1NTc3ZjI3NWQ2MjZkY2FhNGM3MGM0NzdkNGVjZDMKHwjAreC708zWBBDv6Ii7BhjCsR4gDDDn782qBjgIQCYaAmxxIiBkZTIyMTVhN2JiOGU0NDI3NzRjZjM4OGYwM2ZhYzg0Yw; ttwid=1%7C4rAQ216JOophOdIJRX4cHa6E8FSBjbjqHCKmFCNrQuc%7C1734510550%7C6217dce55189d102c393a4de7022e9ee2e2fa75f211108551b349a0a04532921; passport_fe_beating_status=true; tt_scid=b.csKGNI6QALEo8gG9vJu3nCfptGnLkTxVXPX.wNPQ0q9PaXuKzXfuFQC0i2U7gVa974; gd_random_1831913=eyJtYXRjaCI6ZmFsc2UsInBlcmNlbnQiOjAuMjIzMzcxMDAwNzk1MzUxNzd9.NuOx3z2e4BUOJrwTMG9F3lxrnhmz9jNR6BrhQYU4BhI; gd_random_1525008=eyJtYXRjaCI6ZmFsc2UsInBlcmNlbnQiOjAuMjIzMzcxMDAwNzk1MzUxNzd9.NuOx3z2e4BUOJrwTMG9F3lxrnhmz9jNR6BrhQYU4BhI; gd_random_1831904=eyJtYXRjaCI6ZmFsc2UsInBlcmNlbnQiOjAuMjIzMzcxMDAwNzk1MzUxNzd9.NuOx3z2e4BUOJrwTMG9F3lxrnhmz9jNR6BrhQYU4BhI; msToken=enism5q1i_XLtL8VKKjkjidcvGhyW0U3EGJBI19P3fyqk8NsW4fXW4g8s4TnlgRaF-aWS0kHrmNnENw5L4mFRyyz6A5yZbpR3nCRYJrvBi3-GrtptyOBhznILSv4OO0',

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/meutils/apis/jimeng/files.py

@@ -14,6 +14,7 @@ import hashlib
 
 from meutils.pipe import *
 from meutils.caches.redis_cache import cache
+from meutils.io.files_utils import to_bytes
 
 
 def random_str(n):
@@ -99,7 +100,7 @@ class JJRequest:
 
 
 @cache(ttl=15 * 60)
-def upload(image: bytes, upload_token: dict):  # oss 跨账号不知道是否可以使用
+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
@@ -164,17 +165,21 @@ def upload(image: bytes, upload_token: dict):  # oss 跨账号不知道是否可
     # upload_url = f"https://tos-hl-x.snssdk.com/upload/v1/{oss_uri}"
     upload_url = f"https://{response['Result']['UploadAddress']['UploadHosts'][0]}/upload/v1/{oss_uri}"
 
-    response = requests.post(upload_url, headers=headers, data=image)
-    response.raise_for_status()
-    response = response.json()
+    # response = requests.post(upload_url, headers=headers, data=image)
+    # response.raise_for_status()
+    # response = response.json()
+    # logger.debug(response)
 
-    logger.debug(response)
+    async with httpx.AsyncClient(headers=headers, timeout=60) as client:
+        response = await client.post(upload_url, content=image)
+        response.raise_for_status()
+        data = response.json()
+        logger.debug(bjson(data))
 
     return oss_uri
 
 
-@cache(ttl=15 * 60)
-def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不知道是否可以使用
+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
@@ -206,12 +211,18 @@ def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不知道
         '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()
+    # 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))
+
+    async with httpx.AsyncClient(headers=headers, params=params, timeout=120) as client:
+        response = await client.get(r.api)
+        response.raise_for_status()
+        response = response.json()
+        logger.debug(bjson(response))
 
-    logger.debug(bjson(response))
     if "Result" not in response:
         return
 
@@ -235,15 +246,36 @@ def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不知道
     # 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()
+    # response = requests.post(upload_url, headers=headers, data=image)
+    # response.raise_for_status()
+    # response = response.json()
+    # logger.debug(response)
 
-    logger.debug(response)
+    async with httpx.AsyncClient(headers=headers, timeout=120) as client:
+        response = await client.post(upload_url, content=image)
+        response.raise_for_status()
+        data = response.json()
+        logger.debug(bjson(data))
 
     return oss_uri
 
 
+async def upload_for_image(image, token):  # todo: 跨账号token
+    """image url base64 bytes"""
+
+    upload_token = await get_upload_token(token)
+    image_uri = await upload(await to_bytes(image), upload_token)
+    return image_uri
+
+
+async def upload_for_video(video, token):  # 跨账号token
+    """video url base64 bytes"""
+
+    upload_token = await get_upload_token(token)
+    uri = await upload_for_vod(await to_bytes(video), upload_token)
+    return uri
+
+
 if __name__ == "__main__":
     from meutils.apis.jimeng.common import get_upload_token
 
@@ -253,11 +285,21 @@ if __name__ == "__main__":
     # jimeng
     token = "eb4d120829cfd3ee957943f63d6152ed"
     #
-    upload_token = arun(get_upload_token(token))
+    # upload_token = arun(get_upload_token(token))
 
     #
-    with open("11.jpg", "rb") as f:
-        file = image = f.read()
+    # with open("test.jpg", "rb") as f:
+    #     file = image = f.read()
+    #
+    #     print(upload(image, upload_token))
+    # print(upload_for_vod(image, upload_token))
+    #
+    # with timer():
+    #     arun(upload_for_video("https://fal.media/files/koala/8teUPbRRMtAUTORDvqy0l.mp4", token))
+
+    # with timer():
+    #     arun(upload_for_image("https://oss.ffire.cc/files/kling_watermark.png", token))
 
-        # upload(image, upload_token)
-        print(upload_for_vod(image, upload_token))
+    with timer():
+        url = "https://oss.ffire.cc/files/lipsync.mp3"
+        arun(upload_for_video("https://oss.ffire.cc/files/lipsync.mp3", token))

{meutils-2025.1.17.19.49.29 → meutils-2025.1.23.10.16.28}/meutils/apis/jimeng/images.py

@@ -9,6 +9,7 @@
 # @Description  :
 
 from meutils.pipe import *
+from meutils.caches.redis_cache import cache
 
 from meutils.schemas.jimeng_types import BASE_URL, MODELS_MAP, FEISHU_URL
 from meutils.schemas.image_types import ImageRequest
@@ -76,6 +77,7 @@ async def get_task(task_id, token):
         item_list = task_info.get("item_list")  # "status": 30,
 
         status_code = task_info.get("status")
+        fail_msg = f"""{task_info.get("fail_msg")}"""
         logger.debug(f"status: {status_code}")
 
         """
@@ -87,21 +89,33 @@ async def get_task(task_id, token):
 
         task_data = sum(image_data, []) | xmap_(lambda x: {"url": x.get("image_url")})
 
-        return TaskResponse(
+        response = TaskResponse(
             task_id=task_id,
             data=task_data,
-            message=data.get("errmsg") if status_code!=30 else "触发内容审核451",
+            message=data.get("errmsg"),
             status="success" if item_list else 'processing',
             code=status_code,
         )
 
+        if status_code == 30:
+            response.status = "fail"
+            response.message = fail_msg
 
+        return response
+
+
+# @cache: todo: cache 积分异常消耗
+# @cache(ttl=3600)
 async def generate(request: ImageRequest):
     task_response = await create_task(request)
+
     for i in range(1, 10):
         await asyncio.sleep(max(10 / i, 1))
         response = await get_task(task_response.task_id, task_response.system_fingerprint)
         logger.debug(response)
+        if response.status.lower().startswith("fail"):
+            raise Exception(response.message)
+
         if data := response.data:
             return {"data": data}
 
@@ -128,13 +142,18 @@ if __name__ == '__main__':
 
     # arun(get_task(task.task_id, task.system_fingerprint))
 
-    task_id = "10184295086338"
-    system_fingerprint = "eb4d120829cfd3ee957943f63d6152ed"
-
-    t1 = ("10184295086338", "eb4d120829cfd3ee957943f63d6152ed")
-    t2 = ("10184877310722", "dcf7bbc31faed9740b0bf748cd4d2c74")
-    t3 = ("10186352959490", "eb4d120829cfd3ee957943f63d6152ed")
+    # task_id = "10184295086338"
+    # system_fingerprint = "eb4d120829cfd3ee957943f63d6152ed"
+    #
+    # t1 = ("10184295086338", "eb4d120829cfd3ee957943f63d6152ed")
+    # t2 = ("10184877310722", "dcf7bbc31faed9740b0bf748cd4d2c74")
+    # t3 = ("10186352959490", "eb4d120829cfd3ee957943f63d6152ed")
+    #
+    # arun(get_task(*t3))
 
-    arun(get_task(*t3))
+    arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))
+    # 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))
 
-    # arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))
+    # arun(get_task(task.task_id, task.system_fingerprint))