MeUtils 2025.6.12.17.34.4__py3-none-any.whl → 2025.6.13.18.6.6__py3-none-any.whl

meutils/llm/openai_utils/adapters.py

@@ -6,19 +6,23 @@
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  : 
+# @Description  :
+import json
 
 from meutils.pipe import *
 from meutils.io.files_utils import to_url, to_url_fal
+from meutils.str_utils.json_utils import json_path
 from meutils.schemas.openai_types import CompletionRequest
 from meutils.schemas.image_types import ImageRequest
 from meutils.llm.openai_utils import chat_completion, chat_completion_chunk, create_chat_completion_chunk
 
+
 async def stream_to_nostream(
         request: CompletionRequest,
 ):
     pass
 
+
 async def chat_for_image(
         generate: Callable,
         request: CompletionRequest,
@@ -61,6 +65,44 @@ async def chat_for_image(
     return chunks
 
 
+async def chat_for_video(
+        get_task: Callable,  # response
+        taskid: str,
+):
+    """异步任务"""
+
+    async def gen():
+
+        # 获取任务
+        for i in f"""> VideoTask(id={taskid})\n""":
+            await asyncio.sleep(0.03)
+            yield i
+
+        yield f"[🤫 任务进度]("
+        for i in range(60):
+            await asyncio.sleep(3)
+            response = await get_task(taskid)  # 包含  "status"
+
+            logger.debug(response)
+            if response.get("status", "").lower().startswith(("succ", "fail")):
+
+                yield ")🎉🎉🎉\n\n"
+
+                yield f"""```json\n{json.dumps(response, indent=4, ensure_ascii=False)}\n```"""
+
+                if urls := json_path(response, expr='$..[url,image_url,video_url]'):  # 所有url
+                    for i, url in enumerate(urls, 1):
+                        yield f"\n\n[下载链接{i}]({url})\n\n"
+
+                break
+
+            else:
+                yield "🚀"
+
+    chunks = create_chat_completion_chunk(gen())
+    return chunks
+
+
 if __name__ == '__main__':
     request = CompletionRequest(
         model="deepseek-r1-Distill-Qwen-1.5B",
@@ -69,4 +111,4 @@ if __name__ == '__main__':
         ],
         stream=False,
     )
-    arun(chat_for_image(None, request))
+    arun(chat_for_image(None, request))

meutils/llm/openai_utils/common.py

@@ -178,6 +178,7 @@ async def ppu_flow(
     else:  # 不计费
         yield
 
+
 # 按量计费
 def create_chat_completion(
         completion: Union[str, Iterable[str]],
@@ -255,6 +256,10 @@ def get_payment_times(request: Union[BaseModel, dict], duration: float = 5):
     # 时长
     N += request.get("duration", 0) // duration
 
+    # 命令行参数 --duration 5
+    if "--duration 10" in str(request):
+        N += 1
+
     return N
 
 

meutils/math_utils/common.py

@@ -48,3 +48,4 @@ def size2aspect_ratio(size):
 if __name__ == '__main__':
     print(size2aspect_ratio("1920x1080"))
     print(size2aspect_ratio("1920:1080"))
+    print(size2aspect_ratio("1024x1024"))

meutils/schemas/image_types.py

@@ -99,7 +99,7 @@ class ImageRequest(BaseModel):  # openai
     style: Union[str, Literal["vivid", "natural"]] = None
 
     # 测试默认值 Optional[Literal["256x256", "512x512", "1024x1024", "1792x1024", "1024x1792"]]
-    size: Optional[str] = '1024x1024'
+    size: Optional[str] = '1024x1024'  # null auto
 
     response_format: Optional[Literal["oss_url", "url", "b64_json"]] = "url"
 
@@ -614,3 +614,5 @@ if __name__ == '__main__':
     }
 
     r = ImageRequest(**data)
+
+    print(ImagesResponse())

meutils/schemas/oneapi/_types.py

@@ -38,52 +38,61 @@ class ModelInfo(BaseModel):
 
 
 class ChannelInfo(BaseModel):
+    id: Optional[int] = None  # 不存在就新建
+    type: int = 1  # 枚举值 openai
+
+    name: str = ''
     tag: str = ''
+    group: str = 'default'
+
+    base_url: str = ''
+    key: str
+    models: str = 'MODEL'
 
-    id: Optional[int] = None
-    type: int = 1  # 枚举值 openai
-    key: Optional[str] = None
     access_token: str = ''
     openai_organization: str = ''
     test_model: str = ''
-    status: int = '1'
-    name: str = 'fal-flux'
-    weight: int = '0'
-    created_time: int = '1749175121'
-    test_time: int = '0'
-    response_time: int = '0'
-    base_url: Optional[str] = None
+    status: int = 1
+    weight: int = 0
+    created_time: int = Field(default_factory=lambda: int(time.time()))
+    test_time: int = 0
+    response_time: int = 0
     other: str = ''
-    balance: int = '0'
-    balance_updated_time: int = '0'
+    balance: int = 0
+    balance_updated_time: int = 0
 
-    models: str
-    group: str = 'default'
-
-    used_quota: Optional[int] = None
-    upstream_user_quota: int = '0'
+    used_quota: int = 0
+    upstream_user_quota: int = 0
 
-    model_mapping: Optional[str] = None  # json
+    model_mapping: Union[str, dict] = ""  # json
 
     headers: str = ''  # json
     status_code_mapping: str = ''
-    priority: int = '1'
-    auto_ban: int = '1'
-    empty_response_retry: int = '0'
-    not_use_key: int = '0'
+    priority: int = 0
+    auto_ban: int = 1
+    empty_response_retry: int = 0
+    not_use_key: int = 0
     remark: str = ''
-    mj_relax_limit: int = '99'
-    mj_fast_limit: int = '99'
-    mj_turbo_limit: int = '99'
+    mj_relax_limit: int = 99
+    mj_fast_limit: int = 99
+    mj_turbo_limit: int = 99
     other_info: str = ''
-    channel_ratio: int = '1'
-    error_return_429: int = '0'
+    channel_ratio: int = 1
+    error_return_429: int = 0
     setting: str = ''
 
     """参数覆盖"""
     param_override: str = ''  # json
     is_tools: bool = False
 
+    def __init__(self, /, **data: Any):
+        super().__init__(**data)
+        self.name = self.name or self.base_url or "NAME"
+        self.tag = self.tag or self.base_url or "TAG"
+
+        if isinstance(self.model_mapping, dict):
+            self.model_mapping = json.dumps(self.model_mapping)
+
 
 # https://oss.ffire.cc/images/qw.jpeg?x-oss-process=image/format,jpg/resize,w_512
 if __name__ == '__main__':

meutils/schemas/oneapi/common.py

@@ -73,6 +73,11 @@ MODEL_PRICE = {
     "api-volcengine-high_aes_general_v30l_zt2i": 0.05,
     "api-volcengine-byteedit_v2.0": 0.05,
 
+    "api-doubao-seedance-1-0-pro-250528": 1,
+    "api-doubao-seedance-1-0-pro-250528-480p": 1,
+    "api-doubao-seedance-1-0-pro-250528-720p": 2,
+    "api-doubao-seedance-1-0-pro-250528-1080p": 3,
+
     # videos
     "api-videos-wan-ai/wan2.1-t2v-14b": 1.2,
     "api-videos-wan-ai/wan2.1-t2v-14b-turbo": 1.2,

meutils/schemas/openai_types.py

@@ -627,3 +627,5 @@ if __name__ == '__main__':
     # )
     #
     # print(chat_completion_chunk)
+
+    print(ImageRequest(prompt='xx'))

meutils/str_utils/json_utils.py

@@ -52,7 +52,12 @@ def json_loads(s):
 
 
 def json_path(obj, expr):  # todo: 缓存
-    """$..["keywords","query","search_result"]"""
+    """
+    $..["keywords","query","search_result"]
+
+    python =>     $..[keywords,query,search_result]
+
+    """
     if isinstance(obj, dict):
         pass
     elif isinstance(obj, str):
@@ -76,47 +81,20 @@ if __name__ == '__main__':
         a: int = 1
 
 
-    print(json_path(A(), '$.a'))
-
-    json2class(
-        {
-            "id": 3323,
-            "type": 1,
-            "key": "20c790a8-8f5b-4382-942f-05d6f93ce04d:c3ceee990d5aae3f99084e7da6fa7c98",
-            "access_token": "",
-            "openai_organization": "",
-            "test_model": "",
-            "status": 1,
-            "name": "fal-flux",
-            "weight": 0,
-            "created_time": 1749175121,
-            "test_time": 0,
-            "response_time": 0,
-            "base_url": "https://openai.chatfire.cn/images",
-            "other": "",
-            "balance": 0,
-            "balance_updated_time": 0,
-            "models": "imagen4,recraft-v3,recraftv3,flux-pro-1.1-ultra,flux-kontext-pro,flux-kontext-max",
-            "group": "default",
-            "used_quota": 9927600,
-            "upstream_user_quota": 0,
-            "model_mapping": "{\n \"flux-pro-1.1-ultra\": \"fal-ai/flux-pro/v1.1-ultra\",\n \"ideogram-ai/ideogram-v2-turbo\": \"fal-ai/ideogram/v2/turbo\",\n \"ideogram-ai/ideogram-v2\": \"fal-ai/ideogram/v2\",\n \"recraftv3\": \"fal-ai/recraft-v3\",\n \"recraft-v3\": \"fal-ai/recraft-v3\",\n \"imagen4\": \"fal-ai/imagen4/preview\",\n \"flux-kontext-pro\": \"fal-ai/flux-pro/kontext\",\n \"flux-kontext-max\": \"fal-ai/flux-pro/kontext/max\",\n \"imagen4,recraft-v3,recraftv3,flux-pro-1.1-ultra,flux-kontext-pro,flux-kontext-max\": \"\"\n}",
-            "headers": "",
-            "status_code_mapping": "",
-            "priority": 1,
-            "auto_ban": 1,
-            "empty_response_retry": 0,
-            "not_use_key": 0,
-            "remark": "",
-            "mj_relax_limit": 99,
-            "mj_fast_limit": 99,
-            "mj_turbo_limit": 99,
-            "other_info": "{\"status_reason\":\"model: flux-kontext-max, status code: 500, reason: Failed to generate image: User is locked. Reason: Exhausted balance. Top up your balance at fal.ai/dashboard/billing.\",\"status_time\":1749175757}",
-            "channel_ratio": 1,
-            "error_return_429": 0,
-            "tag": "fal",
-            "setting": "",
-            "param_override": "",
-            "is_tools": True
-        }
-    )
+    data = {
+        "id": "cgt-20250613173405-qnpqg",
+        "model": "doubao-seedance-1-0-pro-250528",
+        "status": "succeeded",
+        "content": {
+            "video_url": "https://ark-content-generation-cn-beijing.tos-cn-beijing.volces.com/doubao-seedance-1-0-pro/02174980724664200000000000000000000ffffac182c177b9d12.mp4?X-Tos-Algorithm=TOS4-HMAC-SHA256&X-Tos-Credential=AKLTYjg3ZjNlOGM0YzQyNGE1MmI2MDFiOTM3Y2IwMTY3OTE%2F20250613%2Fcn-beijing%2Ftos%2Frequest&X-Tos-Date=20250613T093454Z&X-Tos-Expires=86400&X-Tos-Signature=bc080dc9e02282dbe10c82e04c59ac1ed4afb67cbec8aa0506357540f9d47fc4&X-Tos-SignedHeaders=host"
+        },
+        "usage": {
+            "completion_tokens": 245388,
+            "total_tokens": 245388
+        },
+        "created_at": 1749807246,
+        "updated_at": 1749807294
+    }
+
+
+    print(json_path(data, expr='$..[url,image_url,video_url]'))