MeUtils 2025.5.9.17.18.7__py3-none-any.whl → 2025.5.12.15.21.44__py3-none-any.whl

meutils/apis/google/chat.py

@@ -109,8 +109,7 @@ class Completions(object):
             # https://ai.google.dev/gemini-api/docs/document-processing?hl=zh-cn&lang=python
             file_objects = await self.upload(urls)
             for file_object in file_objects:
-                for i in self.check_file(file_object):
-                    yield i
+                self.check_file(file_object)
 
             contents += file_objects
             contents.append(request.last_user_content)
@@ -122,28 +121,26 @@ class Completions(object):
             file_object = await self.upload(url)
             yield f"```json\n{file_object.model_dump_json(indent=4)}\n```\n\n"
 
-            for i in self.check_file(file_object):
-                yield i
-            # s = time.time()
-            # for i in range(100):
-            #     file_object = self.client.files.get(
-            #         name=file_object.name,
-            #         config={"http_options": {"timeout": 300 * 1000}}
-            #     )
-            #
-            #     logger.debug(file_object)
-            #     if file_object.state.name in {"ACTIVE", "FAILED_PRECONDITION"}:
-            #         yield f"100%) ✅️✅️✅️{time.time() - s:.2f}s.\n\n"
-            #         break
-            #     else:
-            #         yield f"{min(i * 5, 99)}%"
-            #
-            #     await asyncio.sleep(3)
+            s = time.time()
+            for i in range(100):
+                file_object = self.client.files.get(
+                    name=file_object.name,
+                    config={"http_options": {"timeout": 300 * 1000}}
+                )
+
+                logger.debug(file_object)
+                if file_object.state.name in {"ACTIVE", }:
+                    yield f"100%) ✅️✅️✅️{time.time() - s:.2f}s.\n\n"
+                    break
+                else:
+                    yield f"{min(i * 5, 99)}%"
+
+                await asyncio.sleep(3)
 
             # {'error': {'code': 400,
             #            'message': 'The File cwjpskscrjd79hjezu7dhb is not in an ACTIVE state and usage is not allowed.',
             #            'status': 'FAILED_PRECONDITION'}}
-
+            #
             # while file_object.state.name == "ACTIVE":
             #     logger.debug(file_object)
             #     await asyncio.sleep(1)
@@ -373,9 +370,7 @@ class Completions(object):
         )
 
     def check_file(self, file_object):
-        s = time.time()
 
-        yield f"> [🤔Thinking]("
         for i in range(100):
             file_object = self.client.files.get(
                 name=file_object.name,
@@ -384,10 +379,7 @@ class Completions(object):
 
             logger.debug(file_object)
             if file_object.state.name in {"ACTIVE", }:  # FAILED_PRECONDITION
-                yield f"100%) ✅️✅️✅️{time.time() - s:.2f}s.\n\n"
                 break
-            else:
-                yield f"{min(i * 5, 99)}%"
 
             time.sleep(3)
 

meutils/apis/hailuoai/images.py

@@ -211,10 +211,10 @@ async def get_request_policy(token):
 
 @retrying(predicate=lambda r: r.base_resp.status_code in {1000061, 1500009})  # 限流
 async def create_task(request: ImageRequest, token: Optional[str] = None):
-
     refresh_token = token or await get_next_token_for_polling(FEISHU_URL, from_redis=True, check_token=check_token)
     BASE_URL = get_base_url(refresh_token)
 
+    token = refresh_token
     # token = await get_access_token(refresh_token) ##########
 
     payload = {
@@ -290,35 +290,8 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):
                                 detail=response.base_resp)
 
         return response
-    # {
-    #     "statusInfo": {
-    #         "code": 1000061,
-    #         "httpCode": 0,
-    #         "message": "上一个视频任务未完成，请稍后再试",
-    #         "serviceTime": 1729512914,
-    #         "requestID": "82bc8c60-4dc3-4ad0-b5b6-b1836e0c88ab",
-    #         "debugInfo": "",
-    #         "serverAlert": 0
-    #     }
-    # }
-
-    # {
-    #     "data": {
-    #         "id": "304746220940677121"
-    #     },
-    #     "statusInfo": {
-    #         "code": 0,
-    #         "httpCode": 0,
-    #         "message": "成功",
-    #         "serviceTime": 1729513305,
-    #         "requestID": "caaf2364-d2ed-45df-b79a-827810a5d58c",
-    #         "debugInfo": "",
-    #         "serverAlert": 0
-    #     }
-    # }
 
 
-# 307134660730421250
 async def get_task(task_id: str, token: str):
     BASE_URL = get_base_url(token)
 
@@ -437,7 +410,7 @@ if __name__ == '__main__':  # 304752356930580482
 
     token = None
     # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDQ3MDMwNzIsInVzZXIiOnsiaWQiOiIzMDI4MzM4Njc3NzE5NDkwNTgiLCJuYW1lIjoibWUgYmV0dGVyIiwiYXZhdGFyIjoiIiwiZGV2aWNlSUQiOiIzMDI4MzM3NTk1MTI3NjQ0MTciLCJpc0Fub255bW91cyI6ZmFsc2V9fQ.Mjb64ZjkKyV9pj-_bXyLczU6kU729VLaKbYj9NmrK-4"
-    token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDg3Mzg4MTQsInVzZXIiOnsiaWQiOiIyMjkwODQ3NTA2MDEzODgwMzciLCJuYW1lIjoi5bCP6J665bi9ODAzNyIsImF2YXRhciI6Imh0dHBzOi8vY2RuLmhhaWx1b2FpLmNvbS9wcm9kL3VzZXJfYXZhdGFyLzE3MDYyNjc3MTEyODI3NzA4NzItMTczMTk0NTcwNjY4OTY1ODk2b3ZlcnNpemUucG5nIiwiZGV2aWNlSUQiOiIyNDM3MTMyNTI1NDU5ODY1NjIiLCJpc0Fub255bW91cyI6ZmFsc2V9fQ.o0SoZMSTWkXNHxJjt3Ggby5MJWSfd-rnK_I95T_WMP8"
+    # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDg3Mzg4MTQsInVzZXIiOnsiaWQiOiIyMjkwODQ3NTA2MDEzODgwMzciLCJuYW1lIjoi5bCP6J665bi9ODAzNyIsImF2YXRhciI6Imh0dHBzOi8vY2RuLmhhaWx1b2FpLmNvbS9wcm9kL3VzZXJfYXZhdGFyLzE3MDYyNjc3MTEyODI3NzA4NzItMTczMTk0NTcwNjY4OTY1ODk2b3ZlcnNpemUucG5nIiwiZGV2aWNlSUQiOiIyNDM3MTMyNTI1NDU5ODY1NjIiLCJpc0Fub255bW91cyI6ZmFsc2V9fQ.o0SoZMSTWkXNHxJjt3Ggby5MJWSfd-rnK_I95T_WMP8"
     request = ImageRequest(
         model="hailuo-image-01",
 

meutils/apis/hailuoai/videos.py

@@ -208,8 +208,6 @@ async def get_request_policy(token):
 
 @retrying(predicate=lambda r: r.base_resp.status_code in {1000061, 1500009})  # 限流
 async def create_task(request: VideoRequest, token: Optional[str] = None):
-
-
     refresh_token = token or await get_next_token_for_polling(FEISHU_URL, from_redis=True, check_token=check_token)
     # refresh_token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDA0NzA4NzgsInVzZXIiOnsiaWQiOiIzMjg2MDg4ODkzNTA4MTU3NDQiLCJuYW1lIjoiUm9idXN0IEdlcnRydWRlIiwiYXZhdGFyIjoiaHR0cHM6Ly9jZG4uaGFpbHVvYWkudmlkZW8vbW9zcy9wcm9kLzIwMjQtMTItMjgtMTYvdXNlci91c2VyX2F2YXRhci8xNzM1Mzc1OTI0OTkyMTcxMDY3LWF2YXRhcl8zMjg2MDg4ODkzNTA4MTU3NDQiLCJkZXZpY2VJRCI6IjMwMjgzMzc1OTUxMjc2NDQxNyIsImlzQW5vbnltb3VzIjpmYWxzZX19.dLNBSHjqnKutGl3ralS2g8A-RodHjOdos11vdpbkPwc"
 
@@ -272,7 +270,8 @@ async def create_task(request: VideoRequest, token: Optional[str] = None):
     params = {
         'device_platform': 'web',
         'app_id': '3001',
-        'version_code': '22201',
+        'version_code': '22202',
+        'biz_id': 0,
         'uuid': '8c059369-00bf-4777-a426-d9c9b7984ee6',
         'device_id': '243713252545986562',
         'os_name': 'Mac',
@@ -450,7 +449,7 @@ if __name__ == '__main__':  # 304752356930580482
     token = None
     # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDQ3MDMwNzIsInVzZXIiOnsiaWQiOiIzMDI4MzM4Njc3NzE5NDkwNTgiLCJuYW1lIjoibWUgYmV0dGVyIiwiYXZhdGFyIjoiIiwiZGV2aWNlSUQiOiIzMDI4MzM3NTk1MTI3NjQ0MTciLCJpc0Fub255bW91cyI6ZmFsc2V9fQ.Mjb64ZjkKyV9pj-_bXyLczU6kU729VLaKbYj9NmrK-4"
     # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDg3Mzg4MTQsInVzZXIiOnsiaWQiOiIyMjkwODQ3NTA2MDEzODgwMzciLCJuYW1lIjoi5bCP6J665bi9ODAzNyIsImF2YXRhciI6Imh0dHBzOi8vY2RuLmhhaWx1b2FpLmNvbS9wcm9kL3VzZXJfYXZhdGFyLzE3MDYyNjc3MTEyODI3NzA4NzItMTczMTk0NTcwNjY4OTY1ODk2b3ZlcnNpemUucG5nIiwiZGV2aWNlSUQiOiIyNDM3MTMyNTI1NDU5ODY1NjIiLCJpc0Fub255bW91cyI6ZmFsc2V9fQ.o0SoZMSTWkXNHxJjt3Ggby5MJWSfd-rnK_I95T_WMP8"
-    # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTAxMjg4NTIsInVzZXIiOnsiaWQiOiIzNzQwMTM3NzUyNzg4ODY5MTciLCJuYW1lIjoiTmFodWVsIE1vbGluYSIsImF2YXRhciI6IiIsImRldmljZUlEIjoiMzEzMzc0MTIyMjEyMjc4MjczIiwiaXNBbm9ueW1vdXMiOmZhbHNlfX0.uxTtDTcPT07piVA-x3N2ms2VrRN3JwcU99g_HJLwqLE"
+    token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTAxMjg4NTIsInVzZXIiOnsiaWQiOiIzNzQwMTM3NzUyNzg4ODY5MTciLCJuYW1lIjoiTmFodWVsIE1vbGluYSIsImF2YXRhciI6IiIsImRldmljZUlEIjoiMzEzMzc0MTIyMjEyMjc4MjczIiwiaXNBbm9ueW1vdXMiOmZhbHNlfX0.uxTtDTcPT07piVA-x3N2ms2VrRN3JwcU99g_HJLwqLE"
     request = VideoRequest(
         model="t2v-01",
         # model="S2V-01-live",

meutils/apis/jimeng/images.py

@@ -9,6 +9,7 @@
 # @Description  :
 """
 guidance 控制精细度 => sample_strength 0-1 数值越大生成的效果质量越好，耗时会更久
+ paths: ["/mweb/v1/generate", "/mweb/v1/super_resolution", "/mweb/v1/painting", "/commerce/v1/subscription/make_unauto_order", "/commerce/v1/benefits/credit_receive", "/commerce/v1/purchase/make_order", "/mweb/v1/get_explore", "/mweb/v1/feed_short_video", "/mweb/v1/feed", "/mweb/v1/get_homepage", "/mweb/v1/get_weekly_challenge_work_list", "/mweb/v1/mget_item_info", "/mweb/v1/get_item_info", "/mweb/v1/get_history_by_ids", "/mweb/search/v1/search"],
 
 """
 import json
@@ -206,7 +207,7 @@ def key_builder(*args, **kwargs):
 
 
 @retrying()
-@rcache(ttl=30 * 24 * 3600, serializer="pickle", key_builder=lambda *args, **kwargs: f"{args[1].seed} {args[1].prompt}")
+@rcache(ttl=1 * 1 * 3600, serializer="pickle", key_builder=lambda *args, **kwargs: f"{args[1].seed} {args[1].prompt}")
 async def create_task(request: ImageRequest, token: Optional[str] = None):  # todo: 图片
     token = token or await get_next_token_for_polling(FEISHU_URL, check_token)
 
@@ -281,7 +282,6 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):  # to
 @retrying(max_retries=3, min=3)
 async def get_task(task_id, token):
     url = "/mweb/v1/get_history_by_ids"
-
     headers = get_headers(url, token)
 
     payload = {
@@ -294,14 +294,25 @@ async def get_task(task_id, token):
         response = await client.post(url, json=payload)
         response.raise_for_status()
 
+        logger.debug(response.text)
+
+        task_info = {}
         if response.text:
             data = response.json()
+            logger.debug(bjson(data))
+            task_info = (data.get("data") or {}).get(task_id, {})
         else:
-            data = {}
+            logger.debug("走 /mweb/v1/get_history")
+
+            data = await get_task_plus(task_id, token)
+
+            records_list = (data.get("data") or {}).get("records_list", [])
+
+            for record in records_list:
+                if record.get("history_record_id") == task_id:
+                    task_info = record
 
-        logger.debug(bjson(data))
         # {'ret': '1015', 'errmsg': 'login error', 'systime': '1734524280', 'logid': '20241218201800AC3267447B287E9E6C46', 'data': None}
-        task_info = (data.get("data") or {}).get(task_id, {})
         item_list = task_info.get("item_list", [])  # "status": 30,
 
         status_code = task_info.get("status")
@@ -337,6 +348,254 @@ async def get_task(task_id, token):
         return response
 
 
+@retrying(max_retries=3, min=3)
+async def get_task_plus(task_id, token):
+    url = "/mweb/v1/get_history"
+    headers = get_headers(url, token)
+
+    params = {
+        "aid": 513695,
+        "da_version": "3.2.2",
+        "aigc_features": "app_lip_sync",
+    }
+
+    payload = {
+        "count": 20,
+        "history_type_list": [
+            1,
+            4,
+            5,
+            6,
+            7,
+            8
+        ],
+        "direction": 1,
+        "mode": "workbench",
+        "image_info": {
+            "width": 2048,
+            "height": 2048,
+            "format": "webp",
+            "image_scene_list": [
+                {
+                    "scene": "smart_crop",
+                    "width": 240,
+                    "height": 240,
+                    "uniq_key": "smart_crop-w:240-h:240",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 320,
+                    "height": 320,
+                    "uniq_key": "smart_crop-w:320-h:320",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 480,
+                    "height": 480,
+                    "uniq_key": "smart_crop-w:480-h:480",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 480,
+                    "height": 320,
+                    "uniq_key": "smart_crop-w:480-h:320",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 240,
+                    "height": 160,
+                    "uniq_key": "smart_crop-w:240-h:160",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 160,
+                    "height": 213,
+                    "uniq_key": "smart_crop-w:160-h:213",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 320,
+                    "height": 427,
+                    "uniq_key": "smart_crop-w:320-h:427",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 1080,
+                    "height": 1080,
+                    "uniq_key": "1080",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 900,
+                    "height": 900,
+                    "uniq_key": "900",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 720,
+                    "height": 720,
+                    "uniq_key": "720",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 480,
+                    "height": 480,
+                    "uniq_key": "480",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 360,
+                    "height": 360,
+                    "uniq_key": "360",
+                    "format": "webp"
+                },
+                {
+                    "scene": "normal",
+                    "width": 2400,
+                    "height": 2400,
+                    "uniq_key": "2400",
+                    "format": "webp"
+                }
+            ]
+        },
+        "origin_image_info": {
+            "width": 96,
+            "format": "webp",
+            "image_scene_list": [
+                {
+                    "scene": "smart_crop",
+                    "width": 240,
+                    "height": 240,
+                    "uniq_key": "smart_crop-w:240-h:240",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 320,
+                    "height": 320,
+                    "uniq_key": "smart_crop-w:320-h:320",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 480,
+                    "height": 480,
+                    "uniq_key": "smart_crop-w:480-h:480",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 480,
+                    "height": 320,
+                    "uniq_key": "smart_crop-w:480-h:320",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 240,
+                    "height": 160,
+                    "uniq_key": "smart_crop-w:240-h:160",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 160,
+                    "height": 213,
+                    "uniq_key": "smart_crop-w:160-h:213",
+                    "format": "webp"
+                },
+                {
+                    "scene": "smart_crop",
+                    "width": 320,
+                    "height": 427,
+                    "uniq_key": "smart_crop-w:320-h:427",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 1080,
+                    "height": 1080,
+                    "uniq_key": "1080",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 900,
+                    "height": 900,
+                    "uniq_key": "900",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 720,
+                    "height": 720,
+                    "uniq_key": "720",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 480,
+                    "height": 480,
+                    "uniq_key": "480",
+                    "format": "webp"
+                },
+                {
+                    "scene": "loss",
+                    "width": 360,
+                    "height": 360,
+                    "uniq_key": "360",
+                    "format": "webp"
+                },
+                {
+                    "scene": "normal",
+                    "width": 2400,
+                    "height": 2400,
+                    "uniq_key": "2400",
+                    "format": "webp"
+                }
+            ]
+        },
+        "history_option": {
+            "story_id": "",
+            "multi_size_image_config": [
+                {
+                    "height": 100,
+                    "width": 100,
+                    "format": "webp"
+                },
+                {
+                    "height": 360,
+                    "width": 360,
+                    "format": "webp"
+                },
+                {
+                    "height": 720,
+                    "width": 720,
+                    "format": "webp"
+                }
+            ]
+        },
+        "is_pack_origin": True
+    }
+
+    async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=60) as client:
+        response = await client.post(url, json=payload, params=params)
+        response.raise_for_status()
+
+        return response.json()
+
+
 # @cache: todo: cache 积分异常消耗
 # @cache(ttl=3600)
 async def generate(request: ImageRequest):
@@ -402,7 +661,7 @@ if __name__ == '__main__':
 
     # 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 in the same room !!!  !!"
+    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")
@@ -410,10 +669,13 @@ if __name__ == '__main__':
     # request = ImageRequest(prompt=prompt, size="2048*2048")
 
     # task = arun(create_task(request, "7d9969ffd8ad2edda7da8fff11cb9434"))
-    task = arun(create_task(request, "b1cd6317e4d161bbb3889b9defd769ff"))
-
+    # task = arun(create_task(request, "d2d142fc877e696484cc2fc521127b36"))
+    #
     # arun(get_task(task.task_id, task.system_fingerprint))
 
+    arun(get_task('16279716197378', 'd2d142fc877e696484cc2fc521127b36'))
+    arun(get_task_plus('16279716197378', 'd2d142fc877e696484cc2fc521127b36'))
+
     # TaskResponse(task_id='16127190069506', code=0, message=None, status='SUBMITTED', data=None,
     #              system_fingerprint='8089661372fe8db9795cc507c3049625', model=None,
     #              created_at='2025-05-06T19:49:50.933089')

meutils/data/VERSION

@@ -1 +1 @@
-2025.05.09.17.18.07
+2025.05.12.15.21.44

meutils/llm/completions/todo.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : todo
+# @Time         : 2025/5/12 13:32
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+
+"""
+400 {"code":20015,"message":"length of prompt_tokens (213479) must be less than max_seq_len (65536).","data":null}
+"""