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

meutils/schemas/image_types.py

@@ -9,7 +9,8 @@
 # @Description  : todo: 通用比例适配
 
 from meutils.pipe import *
-from meutils.str_utils.regular_expression import parse_url
+from meutils.str_utils import parse_url
+from meutils.math_utils import size2aspect_ratio
 
 from pydantic import constr
 from openai.types import ImagesResponse as _ImagesResponse, Image
@@ -124,11 +125,7 @@ class ImageRequest(BaseModel):  # openai
             self.size = ASPECT_RATIOS.get(self.aspect_ratio, '1024x1024')
 
         elif self.size:  # 适配尺寸
-            if ':' in self.size:
-                self.aspect_ratio = self.size
-
-            else:
-                self.aspect_ratio = ASPECT_RATIOS.get(self.size, '1:1')
+            self.aspect_ratio = size2aspect_ratio(self.size)
 
             self.size = self.size if 'x' in self.size else '512x512'
 
@@ -138,7 +135,7 @@ class ImageRequest(BaseModel):  # openai
             if len(prompts) == 2:
                 return prompts
             else:
-                return prompts + [' ']
+                return prompts + [' ']  # 只有 单url
 
         elif "http" in self.prompt and (images := parse_url(self.prompt)):
             return images[0], self.prompt.replace(images[0], "")
@@ -146,6 +143,11 @@ class ImageRequest(BaseModel):  # openai
         else:
             return None, self.prompt
 
+    def prompt2aspect_ratio(self, aspect_ratios):  # 提示词优先级最高：从支持的比例中选择匹配
+        for aspect_ratio in aspect_ratios:
+            if aspect_ratio in self.prompt:
+                return aspect_ratio
+
     class Config:
         extra = "allow"
 
@@ -162,6 +164,40 @@ class ImageRequest(BaseModel):  # openai
         }
 
 
+class ImageEditRequest(BaseModel):
+    model: Union[str, Literal["dall-e-2", "dall-e-3", "gpt-image-1"]]
+
+    prompt: str
+    image: Any  # 图片
+
+    mask: Optional[Any] = None  # 图片
+    background: Optional[Literal["transparent", "opaque", "auto"]] = None
+
+    n: Optional[int] = 1
+    quality: Optional[Literal["standard", "low", "medium", "high", "auto"]] = None
+    size: Optional[
+        Union[str, Literal["256x256", "512x512", "1024x1024", "1536x1024", "1024x1536", "auto"]]] = "1024x1024"
+    response_format: Optional[Literal["url", "b64_json"]] = None
+
+    aspect_ratio: Optional[str] = None
+
+    user: Optional[str] = None
+
+    def __init__(self, /, **data: Any):
+        super().__init__(**data)
+        if not isinstance(self.image, list):
+            self.image = [self.image]
+
+        if self.aspect_ratio:  # 适配比例
+            self.size = ASPECT_RATIOS.get(self.aspect_ratio, '1024x1024')
+
+        elif self.size:  # 适配尺寸
+
+            self.aspect_ratio = size2aspect_ratio(self.size)
+
+            self.size = self.size if 'x' in self.size else '512x512'
+
+
 class FalImageRequest(ImageRequest):
     prompt: str
     seed: Optional[int] = None
@@ -525,40 +561,6 @@ class ImageProcess(BaseModel):
     #     extra = "allow"
 
 
-class ImageEditRequest(BaseModel):
-    model: Union[str, Literal["dall-e-2", "dall-e-3", "gpt-image-1"]]
-
-    prompt: str
-    image: Any  # 图片
-
-    mask: Optional[Any] = None  # 图片
-    background: Optional[Literal["transparent", "opaque", "auto"]] = None
-
-    n: Optional[int] = 1
-    quality: Optional[Literal["standard", "low", "medium", "high", "auto"]] = None
-    size: Optional[
-        Union[str, Literal["256x256", "512x512", "1024x1024", "1536x1024", "1024x1536", "auto"]]] = "1024x1024"
-    response_format: Optional[Literal["url", "b64_json"]] = None
-
-    aspect_ratio: Optional[str] = None
-
-    user: Optional[str] = None
-
-    def __init__(self, /, **data: Any):
-        super().__init__(**data)
-        if not isinstance(self.image, list):
-            self.image = [self.image]
-
-        if self.aspect_ratio:  # 适配比例
-            self.size = ASPECT_RATIOS.get(self.aspect_ratio, '1024x1024')
-
-        elif self.size:  # 适配尺寸
-            if ':' in self.size:
-                self.aspect_ratio = self.size
-
-            self.size = self.size if 'x' in self.size else '512x512'
-
-
 if __name__ == '__main__':
     # print(ASPECT_RATIOS.items())
 
@@ -599,9 +601,16 @@ if __name__ == '__main__':
 
     data = {
         "model": "flux-kontext-pro",
-        "prompt": "a cat",
+        "prompt": "a cat and a dog",
         "size": "512x1024",
+        # "aspect_ratio": "16:9"
     }
 
-    r = ImageRequest(**data)
+    dd = {
+        "model": "flux-kontext-pro",
+        "prompt": "a cat and a dog",
+        "size": "5121x1024",
+        # "aspect_ratio": "16:9"
+    }
 
+    r = ImageRequest(**data)

meutils/schemas/oneapi/common.py

@@ -92,6 +92,19 @@ MODEL_PRICE = {
     "sora-1:1-480p-5s": 1.2,
     "dall-e-3": 0.03,
 
+    # rag
+    "qwen3-reranker-0.6b": 0.0011,
+    "qwen3-reranker-4b": 0.0011,
+    "qwen3-reranker-8b": 0.0011,
+
+    "qwen3-embedding-0.6b": 0.0011,
+    "qwen3-embedding-4b": 0.0011,
+    "qwen3-embedding-8b": 0.0011,
+
+    # 视频
+    "api-videos-3d": 0.01,
+    "api-videos-3d-1.5": 0.01,
+
     # 智能体
     "ppt": 0.1,
     "ppt-islide": 0.1,
@@ -667,6 +680,10 @@ MODEL_RATIO = {
     "meta-deepresearch": 2,
 
     # 豆包
+    "doubao-seed-1-6-flash-250615": 0.075,
+    "doubao-seed-1-6-250615": 0.4,
+    "doubao-seed-1-6-thinking-250615": 0.4,
+
     "doubao-1-5-ui-tars-250428": 1.75,
     "ui-tars-72b": 1.75,
     "doubao-1-5-pro-32k": 0.4,
@@ -725,6 +742,11 @@ MODEL_RATIO = {
     "hunyuan-standard-256k": 60,
 
     # 百度文心
+    "ernie-4.5-turbo-vl-32k": 0.45,
+    "ernie-4.5-turbo-128k": 0.12,
+    "ernie-x1-turbo-32k": 0.15,
+    "ernie-x1-32k-preview": 0.3,
+
     "ERNIE-Speed-8K": 0.2858,
     "ERNIE-Speed-128K": 0.2858,
 
@@ -912,6 +934,8 @@ MODEL_RATIO = {
     "o3": 5,
     "o3-2025-04-16": 5,
 
+    "o3-pro": 10,
+
     # 硅基
     "llama-3.1-8b-instruct": 0.01,
     "meta-llama/Meta-Llama-3.1-8B-Instruct": 0.01,
@@ -1023,6 +1047,7 @@ COMPLETION_RATIO = {
 
     "o3": 4,
     "o3-2025-04-16": 4,
+    "o3-pro": 4,
 
     "gpt-4o-realtime-preview": 4,
     "gpt-4o-realtime-preview-2024-10-01": 4,
@@ -1095,6 +1120,11 @@ COMPLETION_RATIO = {
     "ERNIE-4.0-Turbo-8K": 3,
     "ERNIE-4.0-8K": 3,
 
+    "ernie-4.5-turbo-vl-32k": 4,
+    "ernie-4.5-turbo-128k": 4,
+    "ernie-x1-turbo-32k": 4,
+    "ernie-x1-32k-preview": 4,
+
     "gemini-all": 5,
     "gemini-1.5-pro-001": 4,
     "gemini-1.5-pro-002": 4,
@@ -1193,6 +1223,11 @@ COMPLETION_RATIO = {
     "deepseek-ai/deepseek-vl2": 4,
 
     # 豆包
+    "doubao-seed-1-6-flash-250615": 10,
+    # doubao-seed-1-6-flash-250615,doubao-seed-1-6-250615,doubao-seed-1-6-thinking-250615
+    "doubao-seed-1-6-250615": 10,
+    "doubao-seed-1-6-thinking-250615": 10,
+
     "doubao-1-5-ui-tars-250428": 3.43,
     "ui-tars-72b": 4,
 

meutils/str_utils/__init__.py

@@ -6,8 +6,10 @@
 # @Author       : yuanjie
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  : 
+# @Description  :
+import re
 
+import httpx
 
 from meutils.pipe import *
 # from meutils.str_utils.translater import translater
@@ -231,13 +233,13 @@ def validate_url(url):
             'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
         }
 
-        response = requests.head(url, timeout=5, allow_redirects=True, headers=headers)
+        # response = requests.head(url, timeout=5, allow_redirects=False, headers=headers)
+        response = requests.head(url, timeout=5, headers=headers)
         if response.status_code >= 400:
             logger.error(f"URL 返回错误状态码: {response.status_code}")
 
             return False
 
-        logger.error("URL 有效")
         return True
     except requests.exceptions.RequestException as e:
         logger.error(f"连接错误: {str(e)}")
@@ -277,4 +279,15 @@ if __name__ == '__main__':
 
     url = 'https://fal.ai/models/fal-ai/flux-pro/kontext/requests/de5f28be-2ca8-4bd4-8c42-c7fc32969801?output=0'
     url = "https://5b0988e595225.cdn.sohucs.com/images/20190814/5ebb727f502545718c4a06f199cd848b.jpeg"
-    print(validate_url([url] * 3))
+    # url = "https://filesystem.site/cdn/20250609/1XPdqIyhHiOJ8SC68W4ZQGBrf7XRZD.png"
+
+    # url = "https://filesystem.site/cdn/20250609/1QUKzDHRQedraO15CXnUc22aBjvqEN.png"
+
+    # url = "https://photog.art/api/oss/R2yh8N"
+
+    url = "https://p3-bot-workflow-sign.byteimg.com/tos-cn-i-mdko3gqilj/1fe07cca46224208bfbed8c0f3c50ed8.png~tplv-mdko3gqilj-image.image?rk3s=81d4c505&x-expires=1780112531&x-signature=e7q1NOMjqCHvMz%2FC3dVAEVisAh4%3D&x-wf-file_name=9748f6214970f744fe7fd7a3699cfa2.png"
+
+    # print(validate_url([url] * 3))
+    print(validate_url(url))
+
+    print(re.findall("http", url*2))

meutils/str_utils/regular_expression.py

@@ -8,6 +8,7 @@
 # @Software     : PyCharm
 # @Description  :
 import json
+import re
 
 from meutils.pipe import *
 from urllib.parse import unquote, unquote_plus
@@ -66,6 +67,9 @@ def get_parse_and_index(text, pattern):
 
 @lru_cache()
 def parse_url(text: str, for_image=False, fn: Optional[Callable] = None):
+    if text.strip().startswith("http") and len(re.findall("http", text)) == 1:  # http开头且是单链接
+        return text.split(maxsplit=1)[:1]
+
     fn = fn or (lambda x: x.removesuffix(")"))
 
     # url_pattern = r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+'
@@ -97,9 +101,7 @@ def parse_url(text: str, for_image=False, fn: Optional[Callable] = None):
 
     valid_urls = []
     for url in urls:
-        url = url.strip(r"\n")
-        if fn:
-            url = fn(url)  # lambda x: x.removesuffix(")")
+        url = fn(url.strip(r"\n"))
 
         valid_urls.append(url)
 
@@ -171,7 +173,16 @@ if __name__ == '__main__':
 
     # print(parse_url(text, True))
     text = """
-    https://p3-bot-workflow-sign.byteimg.com/tos-cn-i-mdko3gqilj/1fe07cca46224208bfbed8c0f3c50ed8.png~tplv-mdko3gqilj-image.image?rk3s=81d4c505&x-expires=1780112531&x-signature=e7q1NOMjqCHvMz%2FC3dVAEVisAh4%3D&x-wf-file_name=9748f6214970f744fe7fd7a3699cfa2.png \nA young woman holding a lipstick tube with a black body and gold decorative rings, featuring a nude or light brown lipstick bullet. The lipstick product faces the camera, positioned slightly below her face. In the background, a close-up of lips coated with the same nude or light brown shade, creating a natural and soft effect.
+https://p26-bot-workflow-sign.byteimg.com/tos-cn-i-mdko3gqilj/f13171faeed2447b8b9c301ba912f25c.jpg~tplv-mdko3gqilj-image.image?rk3s=81d4c505&x-expires=1779880356&x-signature=AJop4%2FM8VjCUfjqiEzUugprc0CI%3D&x-wf-file_name=B0DCGKG71N.MAIN.jpg
+
+还有这种url，两个.jpg的也能兼容么
     """
-    print(parse_url(text, for_image=True))
+    print(parse_url(text))
+
 
+    # print(parse_url(text, for_image=False))
+
+    # text = """https://photog.art/api/oss/R2yh8N Convert this portrait into a straight-on,front-facing ID-style headshot."""
+    # print(parse_url(text))
+    #
+    # valid_urls = parse_url(text, for_image=True)