MeUtils 2025.1.17.19.49.29__py3-none-any.whl → 2025.1.27.15.5.31__py3-none-any.whl

meutils/apis/jimeng/files.py

@@ -14,7 +14,8 @@ 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))
@@ -53,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()
@@ -99,7 +99,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 +164,29 @@ 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 跨账号不知道是否可以使用
+    """
+                    "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
@@ -190,13 +202,16 @@ 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")
@@ -206,12 +221,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
 
@@ -228,24 +249,47 @@ 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),
     }
 
     # 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
+    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)
+    return image_uri
+
+
+async def upload_for_video(video, token):  # 跨账号token
+    """video url base64 bytes
+    """
+    if not video: return
+
+    upload_token = await get_upload_token(token)
+    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"
@@ -253,11 +297,22 @@ 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))
+        arun(upload_for_video(url, token))

meutils/apis/jimeng/images.py

@@ -9,11 +9,15 @@
 # @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
 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 fake_useragent import UserAgent
@@ -21,6 +25,150 @@ 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)
 
@@ -76,6 +224,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 +236,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 +289,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))