MeUtils 2025.1.4.11.4.46__py3-none-any.whl → 2025.1.10.20.14.42__py3-none-any.whl

meutils/schemas/db/oneapi_types.py

@@ -101,7 +101,10 @@ class OneapiToken(SQLModel, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
     user_id: Optional[int] = Field(default=None)
     key: Optional[str] = Field(default=None)
+
     used_quota: Optional[int] = Field(default=None)
+    remain_quota: Optional[int] = Field(default=None)
+    unlimited_quota: Optional[bool] = Field(default=False)
 
     class Config:
         arbitrary_types_allowed = True

meutils/schemas/image_types.py

@@ -10,6 +10,7 @@
 
 from meutils.pipe import *
 
+from pydantic import constr
 from openai.types import ImagesResponse as _ImagesResponse, Image
 
 ASPECT_RATIOS = {
@@ -58,7 +59,7 @@ class ImagesResponse(_ImagesResponse):
 
 
 class ImageRequest(BaseModel):  # openai
-    prompt: str = ""
+    prompt: constr(min_length=1, max_length=1000) = ""
     negative_prompt: Optional[str] = None
 
     model: str = ""
@@ -215,6 +216,31 @@ class KlingImageRequest(ImageRequest):
         self.size = "1:1" if self.size not in {"1:1", "2:3", "3:2", "3:4", "4:3", "9:16", "16:9"} else self.size
 
 
+class KolorsRequest(ImageRequest):
+    model: Literal["kolors-1.0", "kolors-1.5"] = "kolors-1.0"
+    n: Optional[int] = 4
+
+    """
+    1:1(1024*1024)
+    4:3(1152*896)
+    3:4(768*1024)
+    16:9(1024 576)
+    9:16(576 1024)
+    3:2(1024*640)
+    2:3(640*1024)
+    """
+    size: Literal[
+        "1024x1024", "1152x896", "768x1024", "1024x576", "576x1024", "1024x640", "640x1024"
+    ] = "1024x1024"
+
+    # 图生图
+    image: Optional[str] = None
+    image_fidelity: Optional[float] = None
+
+    def __init__(self, /, **data: Any):
+        super().__init__(**data)
+
+
 class CogviewImageRequest(ImageRequest):
     model: str = "cogview-3"
     size: Optional[Literal["1024x1024", "768x1344", "864x1152", "1344x768", "1152x864", "1440x720", "720x1440"]] = None
@@ -440,4 +466,4 @@ if __name__ == '__main__':
 
     # print(ImagesResponse(data=[{'url': 1}]))
 
-    print(Recraft(prompt="一条猫").model_dump_json())
+    print(RecraftImageRequest(prompt="").model_dump_json())

meutils/schemas/kuaishou_types.py

@@ -113,7 +113,7 @@ class KlingaiImageRequest(BaseModel):
             {'name': 'imageCount', 'value': self.n},
             {"name": "fidelity", "value": self.image_fidelity or 0.5},
             {'name': 'biz', 'value': 'klingai'},
-            {"name": "kolors_version", "value": "1.5"}
+            {"name": "kolors_version", "value": "1.0"} ####### 1.5
         ]
         self.payload = {
             'arguments': arguments,

meutils/schemas/oneapi/common.py

@@ -17,6 +17,14 @@ FREE = 0.001
 MJ = 1.5
 
 MODEL_PRICE = {
+    # rix
+    "kling_image": 0.02,
+    "kling_virtual_try_on": 1,
+
+    "kling_video": 1,
+    "kling_extend": 1,
+    "kling_lip_sync": 1,
+
     # chatfire
     "ppu-0001": 0.0001,
     "ppu-001": 0.001,
@@ -153,6 +161,7 @@ MODEL_PRICE = {
 
     "api-kling": 0.1,
     "api-kling-vip": 0.5,
+
     "api-kling-v1.6-std-5s": 1 * 0.8,
     "api-kling-v1.6-std-10s": 2 * 0.8,
     "api-kling-v1.6-pro-5s": 1 * 0.8 * 1.75,
@@ -275,12 +284,9 @@ MODEL_RATIO = {
     "claude-3-5-haiku-20241022": 4,
     "anthropic/claude-3-5-haiku-20241022:beta": 4,
 
-    "grok": 2.5,
-    "grok-beta": 2.5,
-    # "grok2": 1,
-    # "grok-2": 1,
-    "x-ai/grok-beta": 2.5,
-    "grok-vision-beta": 2.5,
+    "grok-2": 1,
+    "grok-2-1212": 1,
+    "grok-2-vision-1212": 1,
 
     # 定制
     "lingxi-all": 1,
@@ -298,7 +304,7 @@ MODEL_RATIO = {
     "glm-4-0520": 2.5,
     "glm-4-airx": 10,
     "glm-4v": 2.5,
-    "glm-4v-plus": 5,
+    "glm-4v-plus": 2,
     "glm-4v-flash": 0.1,
     "glm-4-plus": 25,
 
@@ -366,12 +372,14 @@ MODEL_RATIO = {
     "yi-1.5-34b-chat-16k": 0.63,
 
     "yi-lightning": 0.5,
+    "yi-vision-v2": 3,
+
+    "yi-vision": 3,
     "yi-large": 10,
     "yi-large-turbo": 6,
     "yi-large-rag": 12.5,
     "yi-medium": 1.25,
     "yi-medium-200k": 6,
-    "yi-vision": 3,
 
     # minimax https://platform.minimaxi.com/document/price?id=6433f32294878d408fc8293e
     "abab6.5-chat": 15 / 7.5,
@@ -388,6 +396,7 @@ MODEL_RATIO = {
     "deepseek-v3": 0.5,
     "deepseek/deepseek-chat": 0.5,
     "deepseek-ai/DeepSeek-V3": 0.5,
+    "accounts/fireworks/models/deepseek-v3": 0.5,
 
     'deepseek-r1': 0.5,
     'deepseek-think': 0.5,
@@ -483,6 +492,8 @@ MODEL_RATIO = {
     "google/gemini-flash-1.5-8b-exp": 0.1,  # openrouter免费
     "gemini-2.0-flash": 0.5,
     "gemini-2.0-flash-exp": 0.5,
+    "gemini-2.0-flash-thinking-exp": 1,
+    "gemini-2.0-flash-thinking-exp-1219": 1,
 
     "gemini-1.5-pro-001": 1,
     "gemini-1.5-pro-002": 1,
@@ -588,10 +599,9 @@ COMPLETION_RATIO = {
     "gpt-4-plus": 5,
     "gpt-4o-plus": 5,
 
-    "grok": 3,
-    "grok-beta": 3,
-    "x-ai/grok-beta": 3,
-    "grok-vision-beta": 3,
+    "grok-2": 5,
+    "grok-2-1212": 5,
+    "grok-2-vision-1212": 5,
 
     "claude-3-5-haiku-20241022": 5,
     "anthropic/claude-3-5-haiku-20241022:beta": 5,
@@ -647,6 +657,8 @@ COMPLETION_RATIO = {
 
     "gemini-2.0-flash": 5,
     "gemini-2.0-flash-exp": 5,
+    "gemini-2.0-flash-thinking-exp": 5,
+    "gemini-2.0-flash-thinking-exp-1219": 5,
 
     "hunyuan-a52b-instruct": 5,
     "qwen2.5-coder-32b-instruct": 3,
@@ -672,6 +684,7 @@ COMPLETION_RATIO = {
     "deepseek-search": 1,
     "deepseek/deepseek-chat": 1,
     "deepseek-ai/DeepSeek-V3": 1,
+    "accounts/fireworks/models/deepseek-v3": 1,
 
     "glm-zero": 5,
     "glm-zero-preview": 5,
@@ -853,7 +866,7 @@ GROUP_RATIO = {
     # 定制分组：不公开
     "35": 1,
 
-    "agent": 2
+    "images": 0.5
 
 }
 USER_USABLE_GROUPS = {
@@ -864,9 +877,6 @@ USER_USABLE_GROUPS = {
     "国产": "0.5￥=1$直连🔥国产大模型api，可申请商用独立分组",
 
     "特价": "0.5￥=1$主打性价比🔥claude系列&gpt/o1系列&国产热门大模型",
-
-    "agent": "2.0￥=1$智能体：联网&文件问答",
-
 }
 
 if _ := {k: f"888￥=1$🈲🈲🈲误用不退" for k, v in GROUP_RATIO.items() if k.endswith(("代理",))}:

meutils/schemas/vidu_types.py

@@ -91,7 +91,7 @@ class VideoRequest(BaseModel):
 
 class ViduRequest(BaseModel):
     """quality 倍率2"""
-    model: Union[str, Literal['vidu-high-performance', 'vidu-high-quality']] = "vidu-high-performance"  # vidu-1.5
+    model: Union[str, Literal['vidu-1.5', 'vidu-high-performance', 'vidu-high-quality']] = "vidu-high-performance"
 
     prompt: Optional[str] = None
     url: Optional[str] = None  # ssupload:?id=
@@ -101,6 +101,10 @@ class ViduRequest(BaseModel):
 
     type: Optional[str] = None  # text2video img2video character2video
 
+    """vidu-1.5"""
+    resolution: Literal['512', '720p', 'vidu-high-quality'] = "512"
+    movement_amplitude: Optional[str] = "auto"  # small medium high
+
     payload: dict = {}
 
     def __init__(self, **data):
@@ -135,22 +139,39 @@ class ViduRequest(BaseModel):
                 }
             )
 
-        self.payload = {
-            "input": input,
-            "type": self.type or type,
-            "settings": {
-                "model": self.model,
-                "model_version": "1.0",
-                # "resolution": "512", 1.5才有的参数 先适配1.0
+        if self.model == "vidu-1.5":
+            self.payload = {
+                "input": input,
+                "type": self.type or type,
+                "settings": {
+                    "model_version": "1.5",
+                    "style": "general",
+                    "duration": self.duration,
+
+                    "resolution": self.resolution,
+                    "aspect_ratio": self.aspect_ratio,
+
+                    "movement_amplitude": self.movement_amplitude,
+
+                }
+            }
+        else:
+
+            self.payload = {
+                "input": input,
+                "type": self.type or type,
+                "settings": {
+                    "model": self.model,
+                    "model_version": "1.0",
 
-                "style": self.style,
+                    "style": self.style,
 
-                # "aspect_ratio": self.aspect_ratio,
+                    "aspect_ratio": self.aspect_ratio,
 
-                "duration": self.duration,
+                    "duration": self.duration,
 
+                }
             }
-        }
 
     class Config:
         json_schema_extra = {

meutils/serving/fastapi/exceptions/http_error.py

@@ -15,7 +15,7 @@ from meutils.notice.feishu import send_message as _send_message
 send_message = partial(
     _send_message,
     title=__name__,
-    url="https://open.feishu.cn/open-apis/bot/v2/hook/79fc258f-46a9-419e-b131-1d79b3d0bcff"
+    url="https://open.feishu.cn/open-apis/bot/v2/hook/d1c7b67d-b0f8-4067-a2f5-109f20eeb696"
 )
 
 
@@ -54,7 +54,7 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
 
     # 默认值
     reps = None
-    request_json = {}
+    request_json = {"body": await request.body()}
     if isinstance(exc, (HTTPStatusError, APIStatusError)):
         status_code = exc.response.status_code or 500
 
@@ -65,10 +65,6 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
             content=content,
             status_code=status_code,
         )
-        try:
-            request_json = await request.json()
-        except Exception as e:
-            request_json = {"error": f"json parse error: {e}"}
 
     # send_message
     content_detail = f"{traceback.format_exc()}"

meutils/str_utils/regular_expression.py

@@ -9,6 +9,7 @@
 # @Description  : 
 
 from meutils.pipe import *
+from urllib.parse import unquote, unquote_plus
 
 zh = re.compile('[a-zA-Z\u4e00-\u9fa5]+')  # 中文 + 字母
 nozh = re.compile('[^a-zA-Z\u4e00-\u9fa5]+')  # 中文 + 字母
@@ -58,11 +59,13 @@ def get_parse_and_index(text, pattern):
 
 @lru_cache()
 def parse_url(text: str, for_image=False):
+
     # url_pattern = r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+'
     url_pattern = r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+|#]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+'
 
     # url_pattern = 'https?://(?:[-\w.]|(?:%[\da-fA-F]{2}))+'
     if for_image:
+        text = unquote_plus(text)
         # suffix = [
         #     ".jpg",
         #     ".jpeg",
@@ -78,15 +81,26 @@ def parse_url(text: str, for_image=False):
         #     ".raw",
         #     ".dng"
         # ]
-        url_pattern = r'https?://[\w\-\.]+/\S+\.(?:png|jpg|jpeg|gif)'
-        url_pattern = r"http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[#]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+\.(?:jpg|jpeg|png|gif)"
+        # url_pattern = r'https?://[\w\-\.]+/\S+\.(?:png|jpg|jpeg|gif)'
+        url_pattern = r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[#]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+\.(?:jpg|jpeg|png|gif|svg|webp)'
+
 
-    urls = re.findall(url_pattern, str(text))
+    urls = re.findall(url_pattern, text)
 
     return urls
 
 
 if __name__ == '__main__':
+    # from urllib.parse import urlparse
+    #
+    #
+    # def is_valid_url(url):
+    #     try:
+    #         result = urlparse(url)
+    #         return all([result.scheme, result.netloc])
+    #     except:
+    #         return False
+
     text = """7个正规url
     这是一段包含URL的文本，https://www.google.com 是一个URL，另一个URL是http://www.baidu.com
     解读这个文本https://www.url1.com
@@ -100,13 +114,22 @@ if __name__ == '__main__':
     总结 https://waptianqi.2345.com/wea_history/58238.htm
     解释下这张照片 https://img-home.csdnimg.cn/images/20201124032511.png
         解释下这张https://img-home.csdnimg.cn/images/x.png
-        
+
         img-home.csdnimg.cn/images/20201124032511.png
+
+
+    https://oss.ffire.cc/files/百炼系列手机产品介绍.docx
+    
+        https://oss.ffire.cc/files/%E6%8B%9B%E6%A0%87%E6%96%87%E4%BB%B6%E5%A4%87%E6%A1%88%E8%A1%A8%EF%BC%88%E7%AC%AC%E4%BA%8C%E6%AC%A1%EF%BC%89.pdf 这个文件讲了什么？
+
     """
+    # https://oss.ffire.cc/files/%E6%8B%9B%E6%A0%87%E6%96%87%E4%BB%B6%E5%A4%87%E6%A1%88%E8%A1%A8%EF%BC%88%E7%AC%AC%E4%BA%8C%E6%AC%A1%EF%BC%89.pdf 正则匹配会卡死
     # from urllib3.util import parse_url
-    text = "@firebot /换衣 https://oss.ffire.cc/files/try-on.png"
+    # text = "@firebot /换衣 https://oss.ffire.cc/files/try-on.png"
+    # text = "@firebot /换衣 https://oss.ffire.cc/files/try-on.pn"
 
-    print(parse_url(text))
+    # print(parse_url(text))
+    print(parse_url(text, for_image=True))
 
     # print(parse_url("http://154.3.0.117:39666/docs#/default/get_content_preview_spider_playwright_get"))
 

meutils/llm/completions/agents/files.py

@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : files
-# @Time         : 2025/1/3 15:38
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  : 支持文档、图片、音频、视频问答
-"""单一智能体
-任意模型支持文档、图片、音频、视频问答
-api形式
-- /agents/v1
-- /v1 前缀区分 agents-{model}【底层调用 /agents/v1】
-
-"""
-
-from meutils.pipe import *

meutils/llm/openai_client.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : chat
-# @Time         : 2024/8/19 14:23
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  : 
-
-
-from openai import OpenAI, AsyncOpenAI
-
-chat = OpenAI().chat.completions.create
-achat = AsyncOpenAI().chat.completions.create