MeUtils 2025.1.23.10.16.28__py3-none-any.whl → 2025.1.29.10.0.47__py3-none-any.whl

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")
@@ -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/apis/jimeng/common.py

@@ -11,12 +11,9 @@ 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_for_image
 from meutils.caches.redis_cache import cache
 
 from fake_useragent import UserAgent
@@ -97,148 +94,7 @@ async def check_token(token, threshold: int = 1):
         return False
 
 
-async def create_draft_content(request: ImageRequest, token: str):
-    """
-    创建草稿内容
-    """
-    request.model = MODELS_MAP.get(request.model, MODELS_MAP["default"])
 
-    height = width = 1360
-    if 'x' in request.size:
-        height, width = map(int, request.size.split('x'))
-
-    main_component_id = str(uuid.uuid4())
-
-    if urls := parse_url(request.prompt):
-        url = urls[-1]
-        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不支持图片编辑
-
-        component = {
-            "type": "image_base_component",
-            "id": main_component_id,
-            "min_version": "3.0.2",
-            "generate_type": "blend",
-            "aigc_mode": "workbench",
-            "abilities": {
-                "type": "",
-                "id": str(uuid.uuid4()),
-                "blend": {
-                    "type": "",
-                    "id": str(uuid.uuid4()),
-                    "core_param": {
-                        "type": "",
-                        "id": str(uuid.uuid4()),
-                        "model": request.model,
-                        "prompt": f"##{request.prompt}",
-                        "sample_strength": 0.5,
-                        "image_ratio": 1,
-                        "large_image_info": {
-                            "type": "",
-                            "id": str(uuid.uuid4()),
-                            "height": height,
-                            "width": width
-                        },
-                    },
-                    "ability_list": [
-                        {
-                            "type": "",
-                            "id": str(uuid.uuid4()),
-                            "name": "byte_edit",
-                            "image_uri_list": [
-                                image_uri
-                            ],
-                            "image_list": [
-                                {
-                                    "type": "image",
-                                    "id": str(uuid.uuid4()),
-                                    "source_from": "upload",
-                                    "platform_type": 1,
-                                    "name": "",
-                                    "image_uri": image_uri,
-                                    "width": 0,
-                                    "height": 0,
-                                    "format": "",
-                                    "uri": image_uri
-                                }
-                            ],
-                            "strength": 0.5
-                        }
-                    ],
-                    "history_option": {
-                        "type": "",
-                        "id": str(uuid.uuid4()),
-                    },
-                    "prompt_placeholder_info_list": [
-                        {
-                            "type": "",
-                            "id": str(uuid.uuid4()),
-                            "ability_index": 0
-                        }
-                    ],
-                    "postedit_param": {
-                        "type": "",
-                        "id": str(uuid.uuid4()),
-                        "generate_type": 0
-                    }
-                }
-            }
-        }
-
-    else:
-
-        component = {
-            "type": "image_base_component",
-            "id": main_component_id,
-            "min_version": "3.0.2",
-            "generate_type": "generate",
-            "aigc_mode": "workbench",
-            "abilities": {
-                "type": "",
-                "id": str(uuid.uuid4()),
-                "generate": {
-                    "type": "",
-                    "id": str(uuid.uuid4()),
-                    "core_param": {
-                        "type": "",
-                        "id": str(uuid.uuid4()),
-                        "model": request.model,
-                        "prompt": request.prompt,
-                        "negative_prompt": request.negative_prompt or "",
-                        "seed": request.seed or 426999300,
-                        "sample_strength": 0.5,
-                        "image_ratio": 1,
-                        "large_image_info": {
-                            "type": "",
-                            "id": str(uuid.uuid4()),
-                            "height": height,
-                            "width": width
-                        }
-                    },
-                    "history_option": {
-                        "type": "",
-                        "id": str(uuid.uuid4()),
-                    }
-                }
-            }
-        }
-
-    draft_content = {
-        "type": "draft",
-        "id": str(uuid.uuid4()),
-        "min_version": "3.0.2",
-        "min_features": [],
-        "is_from_tsn": True,
-        "version": "3.0.8",
-        "main_component_id": main_component_id,
-        "component_list": [component]
-    }
-
-    logger.debug(bjson(draft_content))
-
-    return draft_content
 
 
 def create_photo_lip_sync(request: TTSRequest):

meutils/apis/jimeng/files.py

@@ -15,7 +15,7 @@ import hashlib
 from meutils.pipe import *
 from meutils.caches.redis_cache import cache
 from meutils.io.files_utils import to_bytes
-
+from meutils.apis.jimeng.common import get_upload_token
 
 def random_str(n):
     return ''.join(random.sample('zyxwvutsrqponmlkjihgfedcba0123456789', n))
@@ -54,8 +54,7 @@ class JJRequest:
         self.serviceName = serviceName
 
     def getAuthorization(self):
-        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()}"
-
+        return f"AWS4-HMAC-SHA256 Credential={self.e['access_key_id']}/{self.t[:8]}/cn-north-1/{self.serviceName}/aws4_request, SignedHeaders=x-amz-date;x-amz-security-token, Signature={self.signature()}"
     def signature(self):
         r = self.getSigningKey()
         return hmac_hash256(r, self.stringToSign()).hexdigest()
@@ -180,6 +179,14 @@ async def upload(image: bytes, upload_token: dict):  # oss 跨账号不知道是
 
 
 async def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不知道是否可以使用
+    """
+                    "UploadHost": "tos-lf-x.snssdk.com",
+                    "UploadHost": "tos-hl-x.snssdk.com",
+
+    :param image:
+    :param upload_token:
+    :return:
+    """
     # e = auth = upload_token['data']['auth'] # 豆包
     data = upload_token['data']
     service_id = data.get('service_id', '3jr8j4ixpe')  # 即梦 3jr8j4ixpe 豆包 a9rns2rl98
@@ -195,13 +202,16 @@ async def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不
         "Action": "ApplyUploadInner",
         "Version": "2020-11-19",
         # "ServiceId": service_id,
-        "SpaceName": "artist_op",
+        # "SpaceName": "artist_op",
+        "SpaceName": "dreamina",
 
-        "s": random_str(10),
+        "IsInner": "1",
 
         "FileType": "video",
         "FileSize": len(image),
 
+        "s": random_str(10),
+
     }
 
     r = JJRequest(data, t, "https://vod.bytedanceapi.com/", method="GET", params=params, serviceName="vod")
@@ -239,7 +249,7 @@ async def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不
     headers = {
         "authorization": oss_token,
         "content-length": str(len(image)),
-        "content-Type": "image/jpeg",
+        "content-Type": "application/octet-stream",
         "content-crc32": fileCRC32(image),
     }
 
@@ -257,11 +267,12 @@ async def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不
         data = response.json()
         logger.debug(bjson(data))
 
-    return oss_uri
+    return vid, oss_uri
 
 
 async def upload_for_image(image, token):  # todo: 跨账号token
     """image url base64 bytes"""
+    if not image: return
 
     upload_token = await get_upload_token(token)
     image_uri = await upload(await to_bytes(image), upload_token)
@@ -269,15 +280,16 @@ async def upload_for_image(image, token):  # todo: 跨账号token
 
 
 async def upload_for_video(video, token):  # 跨账号token
-    """video url base64 bytes"""
+    """video url base64 bytes
+    """
+    if not video: return
 
     upload_token = await get_upload_token(token)
-    uri = await upload_for_vod(await to_bytes(video), upload_token)
-    return uri
+    vid, uri = await upload_for_vod(await to_bytes(video), upload_token)
+    return vid, uri
 
 
 if __name__ == "__main__":
-    from meutils.apis.jimeng.common import get_upload_token
 
     # 豆包
     token = "de2215a7bb8e442774cf388f03fac84c"
@@ -302,4 +314,5 @@ if __name__ == "__main__":
 
     with timer():
         url = "https://oss.ffire.cc/files/lipsync.mp3"
-        arun(upload_for_video("https://oss.ffire.cc/files/lipsync.mp3", token))
+        # arun(upload_for_video("https://oss.ffire.cc/files/lipsync.mp3", token))
+        arun(upload_for_video(url, token))

meutils/apis/jimeng/images.py

@@ -14,14 +14,162 @@ 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
 from meutils.schemas.task_types import TaskResponse
-from meutils.apis.jimeng.common import create_draft_content, get_headers, check_token
+from meutils.apis.jimeng.common import get_headers, check_token
+from meutils.str_utils.regular_expression import parse_url
+from meutils.apis.jimeng.files import upload_for_image
+
 from meutils.config_utils.lark_utils import get_next_token_for_polling
+from fastapi import status, HTTPException
 
 from fake_useragent import UserAgent
 
 ua = UserAgent()
 
 
+async def create_draft_content(request: ImageRequest, token: str):
+    """
+    创建草稿内容
+    """
+    request.model = MODELS_MAP.get(request.model, MODELS_MAP["default"])
+
+    height = width = 1360
+    if 'x' in request.size:
+        height, width = map(int, request.size.split('x'))
+
+    main_component_id = str(uuid.uuid4())
+
+    if urls := parse_url(request.prompt):
+        url = urls[-1]
+        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不支持图片编辑
+
+        component = {
+            "type": "image_base_component",
+            "id": main_component_id,
+            "min_version": "3.0.2",
+            "generate_type": "blend",
+            "aigc_mode": "workbench",
+            "abilities": {
+                "type": "",
+                "id": str(uuid.uuid4()),
+                "blend": {
+                    "type": "",
+                    "id": str(uuid.uuid4()),
+                    "core_param": {
+                        "type": "",
+                        "id": str(uuid.uuid4()),
+                        "model": request.model,
+                        "prompt": f"##{request.prompt}",
+                        "sample_strength": 0.5,
+                        "image_ratio": 1,
+                        "large_image_info": {
+                            "type": "",
+                            "id": str(uuid.uuid4()),
+                            "height": height,
+                            "width": width
+                        },
+                    },
+                    "ability_list": [
+                        {
+                            "type": "",
+                            "id": str(uuid.uuid4()),
+                            "name": "byte_edit",
+                            "image_uri_list": [
+                                image_uri
+                            ],
+                            "image_list": [
+                                {
+                                    "type": "image",
+                                    "id": str(uuid.uuid4()),
+                                    "source_from": "upload",
+                                    "platform_type": 1,
+                                    "name": "",
+                                    "image_uri": image_uri,
+                                    "width": 0,
+                                    "height": 0,
+                                    "format": "",
+                                    "uri": image_uri
+                                }
+                            ],
+                            "strength": 0.5
+                        }
+                    ],
+                    "history_option": {
+                        "type": "",
+                        "id": str(uuid.uuid4()),
+                    },
+                    "prompt_placeholder_info_list": [
+                        {
+                            "type": "",
+                            "id": str(uuid.uuid4()),
+                            "ability_index": 0
+                        }
+                    ],
+                    "postedit_param": {
+                        "type": "",
+                        "id": str(uuid.uuid4()),
+                        "generate_type": 0
+                    }
+                }
+            }
+        }
+
+    else:
+
+        component = {
+            "type": "image_base_component",
+            "id": main_component_id,
+            "min_version": "3.0.2",
+            "generate_type": "generate",
+            "aigc_mode": "workbench",
+            "abilities": {
+                "type": "",
+                "id": str(uuid.uuid4()),
+                "generate": {
+                    "type": "",
+                    "id": str(uuid.uuid4()),
+                    "core_param": {
+                        "type": "",
+                        "id": str(uuid.uuid4()),
+                        "model": request.model,
+                        "prompt": request.prompt,
+                        "negative_prompt": request.negative_prompt or "",
+                        "seed": request.seed or 426999300,
+                        "sample_strength": 0.5,
+                        "image_ratio": 1,
+                        "large_image_info": {
+                            "type": "",
+                            "id": str(uuid.uuid4()),
+                            "height": height,
+                            "width": width
+                        }
+                    },
+                    "history_option": {
+                        "type": "",
+                        "id": str(uuid.uuid4()),
+                    }
+                }
+            }
+        }
+
+    draft_content = {
+        "type": "draft",
+        "id": str(uuid.uuid4()),
+        "min_version": "3.0.2",
+        "min_features": [],
+        "is_from_tsn": True,
+        "version": "3.0.8",
+        "main_component_id": main_component_id,
+        "component_list": [component]
+    }
+
+    logger.debug(bjson(draft_content))
+
+    return draft_content
+
+
 async def create_task(request: ImageRequest, token: Optional[str] = None):
     token = token or await get_next_token_for_polling(FEISHU_URL, check_token)
 
@@ -51,11 +199,25 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):
     async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=60) as client:
         response = await client.post(url, json=payload)
         response.raise_for_status()
+
         data = response.json()
         logger.debug(bjson(data))
-
-    task_id = data.get("data", {}).get("aigc_data", {}).get("history_record_id")
-    return TaskResponse(task_id=task_id, system_fingerprint=token)
+    if task_id := data.get("data", {}).get("aigc_data", {}).get("history_record_id"):
+        return TaskResponse(task_id=task_id, system_fingerprint=token)
+    else:
+
+        # {
+        #     "ret": "1018",
+        #     "errmsg": "account punish limit ai generate",
+        #     "systime": "1737962056",
+        #     "logid": "202501271514162E3DA8ECD70A3EE1400F",
+        #     "data": null
+        # }
+
+        raise HTTPException(
+            status_code=status.HTTP_451_UNAVAILABLE_FOR_LEGAL_REASONS,
+            detail="可能触发内容审核，请联系管理员"
+        )
 
 
 async def get_task(task_id, token):