MeUtils 2025.1.17.19.49.29__tar.gz → 2025.1.27.15.5.31__tar.gz

{meutils-2025.1.17.19.49.29 → meutils-2025.1.27.15.5.31/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.27.15.5.31
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -36,6 +36,7 @@ Requires-Dist: shortuuid
 Requires-Dist: toml
 Requires-Dist: pyyaml
 Requires-Dist: jsonpath
+Requires-Dist: jmespath
 Requires-Dist: json_repair
 Requires-Dist: nacos-sdk-python
 Requires-Dist: wget
@@ -66,7 +67,6 @@ Requires-Dist: pandas-profiling[notebook]; extra == "plus"
 Requires-Dist: pandas_summary; extra == "plus"
 Requires-Dist: jieba; extra == "plus"
 Requires-Dist: jinja2; extra == "plus"
-Requires-Dist: jmespath; extra == "plus"
 Requires-Dist: simplejson; extra == "plus"
 Requires-Dist: pretty_errors; extra == "plus"
 Requires-Dist: cachetools; extra == "plus"
@@ -108,42 +108,41 @@ 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: pymysql; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
 Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: pymupd; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
 Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: pymongo; extra == "all"
+Requires-Dist: redis-py-cluster; extra == "all"
+Requires-Dist: schedule; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: langchain; extra == "all"
 Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: seaborn; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: missingno; extra == "all"
 Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: geopy; extra == "all"
 Requires-Dist: streamlit; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: thefuck; extra == "all"
-Requires-Dist: missingno; extra == "all"
+Requires-Dist: reportlab; extra == "all"
+Requires-Dist: cachetools; extra == "all"
 Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: jmespath; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: pymongo; extra == "all"
-Requires-Dist: schedule; extra == "all"
 Requires-Dist: filetype; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: jinja2; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
 Requires-Dist: fastapi; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: polars; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: pymilvus; 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: pymupd; extra == "all"
 Requires-Dist: simplejson; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: faiss-cpu; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2025.1.17.19.49.29 → meutils-2025.1.27.15.5.31}/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
@@ -337,6 +337,8 @@ meutils/io/image.py
 meutils/io/minio_utils.py
 meutils/io/tf_io.py
 meutils/io/x.py
+meutils/jwt_utils/__init__.py
+meutils/jwt_utils/common.py
 meutils/llm/__init__.py
 meutils/llm/check_api.py
 meutils/llm/check_utils.py
@@ -361,6 +363,7 @@ meutils/llm/completions/xx.py
 meutils/llm/completions/yuanbao.py
 meutils/llm/completions/agents/__init__.py
 meutils/llm/completions/agents/file.py
+meutils/llm/completions/agents/search.py
 meutils/llm/completions/rag/__init__.py
 meutils/llm/completions/rag/fire.py
 meutils/llm/completions/rag/qwen.py
@@ -416,6 +419,7 @@ meutils/parsers/fileparser/__init__.py
 meutils/parsers/fileparser/common.py
 meutils/parsers/fileparser/demo.py
 meutils/parsers/fileparser/filetype.py
+meutils/parsers/fileparser/mineru.py
 meutils/parsers/fileparser/pdf.py
 meutils/parsers/fileparser/表格抽取.py
 meutils/parsers/fileparser/filetype/__init__.py
@@ -461,8 +465,6 @@ meutils/request_utils/volc.py
 meutils/request_utils/wechat.py
 meutils/request_utils/公网ip.py
 meutils/request_utils/爬虫.py
-meutils/request_utils/jwt_utils/__init__.py
-meutils/request_utils/jwt_utils/common.py
 meutils/schemas/__init__.py
 meutils/schemas/baidu_api.py
 meutils/schemas/baidu_types.py

{meutils-2025.1.17.19.49.29 → meutils-2025.1.27.15.5.31}/MeUtils.egg-info/requires.txt

@@ -16,6 +16,7 @@ shortuuid
 toml
 pyyaml
 jsonpath
+jmespath
 json_repair
 nacos-sdk-python
 wget
@@ -45,42 +46,41 @@ openai
 langchain
 
 [all]
-jieba
-reportlab
+pymysql
+openai
+iteration_utilities
 fastapi[all]
-asyncmy
-pymupd
+thriftpy2
 sse_starlette
+jieba
+uvicorn
+thefuck
+pymongo
+redis-py-cluster
+schedule
+dataframe_image
+asyncmy
+langchain
 sqlalchemy
-seaborn
+pandas-profiling[notebook]
+missingno
 pretty_errors
-dataframe_image
+geopy
 streamlit
-openai
-thefuck
-missingno
+reportlab
+cachetools
 pandas_summary
-langchain
-pymysql
-polars
-jmespath
-gunicorn
-pymongo
-schedule
 filetype
-pandas-profiling[notebook]
+jinja2
+faiss-cpu
 fastapi
-redis-py-cluster
-geopy
-uvicorn
+polars
+pyarrow
+seaborn
+gunicorn
 pymilvus
-jinja2
-thriftpy2
-cachetools
-iteration_utilities
+pymupd
 simplejson
-pyarrow
-faiss-cpu
 
 [ann]
 pymilvus
@@ -126,7 +126,6 @@ pandas-profiling[notebook]
 pandas_summary
 jieba
 jinja2
-jmespath
 simplejson
 pretty_errors
 cachetools

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.1.17.19.49.29
+Version: 2025.1.27.15.5.31
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -36,6 +36,7 @@ Requires-Dist: shortuuid
 Requires-Dist: toml
 Requires-Dist: pyyaml
 Requires-Dist: jsonpath
+Requires-Dist: jmespath
 Requires-Dist: json_repair
 Requires-Dist: nacos-sdk-python
 Requires-Dist: wget
@@ -66,7 +67,6 @@ Requires-Dist: pandas-profiling[notebook]; extra == "plus"
 Requires-Dist: pandas_summary; extra == "plus"
 Requires-Dist: jieba; extra == "plus"
 Requires-Dist: jinja2; extra == "plus"
-Requires-Dist: jmespath; extra == "plus"
 Requires-Dist: simplejson; extra == "plus"
 Requires-Dist: pretty_errors; extra == "plus"
 Requires-Dist: cachetools; extra == "plus"
@@ -108,42 +108,41 @@ 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: pymysql; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
 Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: pymupd; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
 Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: pymongo; extra == "all"
+Requires-Dist: redis-py-cluster; extra == "all"
+Requires-Dist: schedule; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: langchain; extra == "all"
 Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: seaborn; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: missingno; extra == "all"
 Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: geopy; extra == "all"
 Requires-Dist: streamlit; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: thefuck; extra == "all"
-Requires-Dist: missingno; extra == "all"
+Requires-Dist: reportlab; extra == "all"
+Requires-Dist: cachetools; extra == "all"
 Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: jmespath; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: pymongo; extra == "all"
-Requires-Dist: schedule; extra == "all"
 Requires-Dist: filetype; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: jinja2; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
 Requires-Dist: fastapi; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: polars; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: pymilvus; 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: pymupd; extra == "all"
 Requires-Dist: simplejson; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: faiss-cpu; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2025.1.17.19.49.29 → meutils-2025.1.27.15.5.31}/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.27.15.5.31}/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.27.15.5.31}/meutils/apis/hunyuan/image_tools.py

@@ -73,12 +73,16 @@ async def image_process(request: HunyuanImageProcessRequest, token: Optional[str
 
 if __name__ == '__main__':
     # request = ImageProcessRequest(image="https://oss.ffire.cc/files/kling_watermark.png", task='removewatermark')
-
+    token = "web_uid=ac283ec7-4bf6-40c9-a0ce-5a2e0cd7db06; hy_source=web; hy_user=I09MgMfFcUUyVSIg; hy_token=hevVCi/QuVjQcre5NDRMO7FuiWCZoDMIq3Zp8IwNxrPUofl4zWYazHEdeZ2S5o7q; _qimei_q36=; _qimei_h38=f2d27f50f0f23e085296d28303000006a17a09; _qimei_fingerprint=efbb885a22f7d4e5589008c28bc8e7ba; _qimei_uuid42=18c0310102d1002a082420cd40bb9717523c3c7e12; _gcl_au=1.1.915258067.1733278380; _ga_RPMZTEBERQ=GS1.1.1733722091.3.1.1733722108.0.0.0; _ga=GA1.2.981511920.1725261466; sensorsdata2015jssdkcross=%7B%22distinct_id%22%3A%22100000458739%22%2C%22first_id%22%3A%22191b198c7b2d52-0fcca8d731cb9b8-18525637-2073600-191b198c7b31fd9%22%2C%22props%22%3A%7B%22%24latest_traffic_source_type%22%3A%22%E7%A4%BE%E4%BA%A4%E7%BD%91%E7%AB%99%E6%B5%81%E9%87%8F%22%2C%22%24latest_utm_medium%22%3A%22cpc%22%7D%2C%22identities%22%3A%22eyIkaWRlbnRpdHlfY29va2llX2lkIjoiMTkxYjE5OGM3YjJkNTItMGZjY2E4ZDczMWNiOWI4LTE4NTI1NjM3LTIwNzM2MDAtMTkxYjE5OGM3YjMxZmQ5IiwiJGlkZW50aXR5X2xvZ2luX2lkIjoiMTAwMDAwNDU4NzM5In0%3D%22%2C%22history_login_id%22%3A%7B%22name%22%3A%22%24identity_login_id%22%2C%22value%22%3A%22100000458739%22%7D%2C%22%24device_id%22%3A%22191b198c7b2d52-0fcca8d731cb9b8-18525637-2073600-191b198c7b31fd9%22%7D"
     with timer():
         image = "https://sfile.chatglm.cn/chatglm4/3dcb1cc2-22ad-420b-9d16-dc71dffc02b2.png"
         image = "https://oss.ffire.cc/files/kling_watermark.png"
         image = "https://cdn.meimeiqushuiyin.cn/2024-12-05/ori/tmp_0511a4cb2066ffc309fa6f7a733ac1e93236709bf46c9430.jpg"
         image = "https://cdn.meimeiqushuiyin.cn/2024-12-05/ori/tmp_de5e186878b079a87d22c561f17e6853.jpg"
+        image = "https://yuanbao.tencent.com/api/resource/download?resourceId=740fed65baed5f763db891b5443b7ee5"
+        image = url = "https://oss.ffire.cc/files/shuiyin.jpg"
+        # image = url = "https://oss.ffire.cc/files/shuiyin2.jpg"
+
         request = HunyuanImageProcessRequest(image=image, task='removewatermark')
 
-        arun(image_process(request))
+        arun(image_process(request, token=token))

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

@@ -9,9 +9,12 @@
 # @Description  :
 
 from meutils.pipe import *
+from meutils.decorators.retry import retrying, IgnoredRetryException
+
 from meutils.config_utils.lark_utils import get_next_token_for_polling
-from meutils.schemas.image_types import ImageRequest, ImagesResponse
+from meutils.schemas.image_types import ImageRequest, ImagesResponse, HunyuanImageProcessRequest
 from meutils.schemas.image_types import ImageProcess
+from meutils.schemas.yuanbao_types import YUANBAO_BASE_URL, FEISHU_URL as YUANBAO_FEISHU_URL
 
 from meutils.io.files_utils import to_bytes, to_base64, to_url_fal
 
@@ -28,6 +31,50 @@ send_message = partial(
 )
 
 
+@retrying(min=3, ignored_exception_types=(IgnoredRetryException,))
+async def make_request_for_hunyuan(payload, token: Optional[str] = None, response_format: str = "url"):
+    s = time.time()
+
+    token = token or await get_next_token_for_polling(YUANBAO_FEISHU_URL)
+
+    model = payload.pop("model", "removewatermark")
+
+    logger.debug(payload)
+
+    headers = {
+        'cookie': token
+    }
+    async with httpx.AsyncClient(base_url=YUANBAO_BASE_URL, headers=headers, timeout=100) as client:
+        response = await client.post(f"/api/image/{model}", json=payload)
+        response.raise_for_status()
+        logger.debug(response.text)
+
+        skip_strings = ['DONE', 'TRACEID']
+        data = response.text.replace(r'\u0026', '&').splitlines() | xsse_parser(skip_strings=skip_strings)
+        data = data and data[-1]
+        logger.debug(data)
+
+        # todo: 错误处理
+        if isinstance(data, dict) and any(data["code"] == code for code in {"429"}):
+            Exception(f"重试: {response.text}")
+
+        elif isinstance(data, list) or any(i in response.text for i in {"当前图片没有检测到水印"}):  # 跳过重试并返回原始错误
+            raise IgnoredRetryException(f"忽略重试: \n{response.text}")
+
+        data = [
+            {
+                "url": data["imageUrl"],
+                "imageUrl": data["imageUrl"],
+                "thumbnailUrl": data["thumbnailUrl"],
+            }
+        ]
+        if response_format == "url":
+            return ImagesResponse(data=data, timings={"inference": time.time() - s})
+        else:
+            data[0]["b64_json"] = await to_base64(data[0]['url'])
+            return ImagesResponse(data=data, timings={"inference": time.time() - s})
+
+
 async def make_request_for_gitee(payload, token: Optional[str] = None, response_format: str = "url"):
     s = time.time()
     feishu_url = "https://xchatllm.feishu.cn/sheets/MekfsfVuohfUf1tsWV0cCvTmn3c?sheet=PDnO6X"
@@ -83,6 +130,8 @@ async def make_request_for_baidu(payload, token: Optional[str] = None, response_
                 except Exception as e:
                     logger.error(e)
                     if i > 3: break
+        if not image_base64:
+            raise Exception(f"未检测到: {data}")
 
         if response_format == "url":
             url = await to_url_fal(image_base64, content_type="image/png")
@@ -102,18 +151,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":
@@ -123,15 +172,34 @@ async def edit_image(request: ImageProcess):
         }
         return await make_request_for_gitee(payload, response_format=request.response_format)
 
+    elif request.model.startswith("hunyuan-"):
+        payload = {
+            "imageUrl": request.image if request.image.startswith("http") else await to_url_fal(request.image),
+        }
+        # "remove-watermark" "clarity"
+        if "remove-watermark" in request.model:
+            payload["model"] = "removewatermark"
+        elif "clarity" in request.model:
+            payload["model"] = "clarity"
+
+        return await make_request_for_hunyuan(payload, response_format=request.response_format)
+
 
 if __name__ == '__main__':
     token = "BAIDUID=FF8BB4BF861992E2BF4A585A37366236:FG=1; BAIDUID_BFESS=FF8BB4BF861992E2BF4A585A37366236:FG=1; BIDUPSID=FF8BB4BF861992E2BF4A585A37366236; BDRCVFR[dG2JNJb_ajR]=mk3SLVN4HKm; userFrom=null; ab_sr=1.0.1_NjY5OWZiZDg5YTJmYTQzNWUyNzU1YjBmN2FlMDFiNjMyOTVhMDE3ZWVlYWY5N2Y2MTg4NGI1MzRmMmVjMjQyZjlhZTU2MmM1NDRlMmU4YzgwMzRiMjUyYTc4ZjY1OTcxZTE4OTA4YTlmMWIwZWUzNTdiMzlhZTRiM2IzYTQ0MjgyMzc2MjQwMGRlYzZlZDhjOTg5Yzg4NWVjMTNiZmVmZQ==; BDRCVFR[-pGxjrCMryR]=mk3SLVN4HKm; H_WISE_SIDS=60273_60360_60623_60664_60678_60684_60700"
+    # hunyuan
+    token = "web_uid=ac283ec7-4bf6-40c9-a0ce-5a2e0cd7db06; hy_source=web; hy_user=I09MgMfFcUUyVSIg; hy_token=hevVCi/QuVjQcre5NDRMO7FuiWCZoDMIq3Zp8IwNxrPUofl4zWYazHEdeZ2S5o7q; _qimei_q36=; _qimei_h38=f2d27f50f0f23e085296d28303000006a17a09; _qimei_fingerprint=efbb885a22f7d4e5589008c28bc8e7ba; _qimei_uuid42=18c0310102d1002a082420cd40bb9717523c3c7e12; _gcl_au=1.1.915258067.1733278380; _ga_RPMZTEBERQ=GS1.1.1733722091.3.1.1733722108.0.0.0; _ga=GA1.2.981511920.1725261466; sensorsdata2015jssdkcross=%7B%22distinct_id%22%3A%22100000458739%22%2C%22first_id%22%3A%22191b198c7b2d52-0fcca8d731cb9b8-18525637-2073600-191b198c7b31fd9%22%2C%22props%22%3A%7B%22%24latest_traffic_source_type%22%3A%22%E7%A4%BE%E4%BA%A4%E7%BD%91%E7%AB%99%E6%B5%81%E9%87%8F%22%2C%22%24latest_utm_medium%22%3A%22cpc%22%7D%2C%22identities%22%3A%22eyIkaWRlbnRpdHlfY29va2llX2lkIjoiMTkxYjE5OGM3YjJkNTItMGZjY2E4ZDczMWNiOWI4LTE4NTI1NjM3LTIwNzM2MDAtMTkxYjE5OGM3YjMxZmQ5IiwiJGlkZW50aXR5X2xvZ2luX2lkIjoiMTAwMDAwNDU4NzM5In0%3D%22%2C%22history_login_id%22%3A%7B%22name%22%3A%22%24identity_login_id%22%2C%22value%22%3A%22100000458739%22%7D%2C%22%24device_id%22%3A%22191b198c7b2d52-0fcca8d731cb9b8-18525637-2073600-191b198c7b31fd9%22%7D"
 
     url = "https://oss.ffire.cc/files/kling_watermark.png"
+    url = "https://oss.ffire.cc/files/shuiyin.jpg"
+    url = "https://oss.ffire.cc/files/shuiyin3.jpg"
+
     # url = "https://s22-def.ap4r.com/bs2/upload-ylab-stunt-sgp/se/ai_portal_sgp_queue_mmu_txt2img_aiweb/9c520b80-efc2-4321-8f0e-f1d34d483ddd/1.png"
 
     request = ImageProcess(
-        model="remove-watermark",
+        model="hunyuan-remove-watermark",
+
+        # model="remove-watermark",
         # model="clarity",
         # model="expand",
         # model="rmbg-2.0",

{meutils-2025.1.17.19.49.29 → meutils-2025.1.27.15.5.31}/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))