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

meutils/config_utils/lark_utils/common.py

@@ -257,7 +257,9 @@ async def get_next_token_for_polling(
         check_token: Optional[Callable] = None,
         max_size: Optional[int] = 10,
         from_redis: Optional[bool] = False,
-        min_points: float = 0
+        min_points: float = 0,
+
+        ttl: Optional[int] = None,
 ):
     if from_redis:
         return await get_next_token(feishu_url, check_token, ttl=7 * 24 * 3600, min_points=min_points)

meutils/data/VERSION

@@ -1 +1 @@
-2025.06.13.18.06.06
+2025.06.18.14.28.04

meutils/llm/check_utils.py

@@ -192,18 +192,28 @@ async def check_token_for_sophnet(api_key, threshold: float = 1):
 
 #
 @retrying()
-async def check_token_for_volc(api_key, threshold: float = 1):
+async def check_token_for_volc(api_key, threshold: float = 1, purpose: Optional[str] = None):
     if not isinstance(api_key, str):
         return await check_tokens(api_key, check_token_for_volc)
 
     try:
-        client = AsyncOpenAI(base_url=os.getenv("VOLC_BASE_URL"), api_key=api_key)
-
-        data = await client.chat.completions.create(
-            model="deepseek-v3-250324",
-            messages=[{"role": "user", "content": "hi"}],
-            max_tokens=1
-        )
+        base_url = os.getenv("VOLC_BASE_URL") or "https://ark.cn-beijing.volces.com/api/v3"
+        client = AsyncOpenAI(base_url, api_key=api_key)
+
+        if purpose:
+            response = client.images.generate(
+                model="doubao-seedream-3-0-t2i-250415",
+                prompt="鱼眼镜头，一只猫咪的头部，画面呈现出猫咪的五官因为拍摄方式扭曲的效果。",
+                size="1024x1024",
+                response_format="url"
+            )
+        else:
+
+            response = await client.chat.completions.create(
+                model="deepseek-v3-250324",
+                messages=[{"role": "user", "content": "hi"}],
+                max_tokens=1
+            )
         return True
     except TimeoutException as e:
         raise

meutils/schemas/image_types.py

@@ -124,6 +124,9 @@ class ImageRequest(BaseModel):  # openai
         if self.aspect_ratio:  # 适配比例
             self.size = ASPECT_RATIOS.get(self.aspect_ratio, '1024x1024')
 
+        elif self.size == 'auto':
+            self.size = self.aspect_ratio = None
+
         elif self.size:  # 适配尺寸
             self.aspect_ratio = size2aspect_ratio(self.size)
 
@@ -191,8 +194,10 @@ class ImageEditRequest(BaseModel):
         if self.aspect_ratio:  # 适配比例
             self.size = ASPECT_RATIOS.get(self.aspect_ratio, '1024x1024')
 
-        elif self.size:  # 适配尺寸
+        elif self.size == 'auto':
+            self.size = self.aspect_ratio = None
 
+        elif self.size:  # 适配尺寸
             self.aspect_ratio = size2aspect_ratio(self.size)
 
             self.size = self.size if 'x' in self.size else '512x512'

meutils/schemas/oneapi/_types.py

@@ -89,7 +89,10 @@ class ChannelInfo(BaseModel):
         super().__init__(**data)
         self.name = self.name or self.base_url or "NAME"
         self.tag = self.tag or self.base_url or "TAG"
+        self.group = self.group or self.base_url or "GROUP"
 
+        self.setting= self.setting or ""
+        self.param_override = self.param_override or ""
         if isinstance(self.model_mapping, dict):
             self.model_mapping = json.dumps(self.model_mapping)
 

meutils/schemas/oneapi/common.py

@@ -73,11 +73,22 @@ MODEL_PRICE = {
     "api-volcengine-high_aes_general_v30l_zt2i": 0.05,
     "api-volcengine-byteedit_v2.0": 0.05,
 
+    "doubao-seedance-1-0-pro-250528": 1,
     "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,
 
+    "api-doubao-seedance-1-0-lite-t2v-250428": 1 / 2,
+    "api-doubao-seedance-1-0-lite-t2v-250428-480p": 1 / 2,
+    "api-doubao-seedance-1-0-lite-t2v-250428-720p": 2 / 2,
+    "api-doubao-seedance-1-0-lite-t2v-250428-1080p": 3 / 2,
+
+    "api-doubao-seedance-1-0-lite-i2v-250428": 1 / 2,
+    "api-doubao-seedance-1-0-lite-i2v-250428-480p": 1 / 2,
+    "api-doubao-seedance-1-0-lite-i2v-250428-720p": 2 / 2,
+    "api-doubao-seedance-1-0-lite-i2v-250428-1080p": 3 / 2,
+
     # videos
     "api-videos-wan-ai/wan2.1-t2v-14b": 1.2,
     "api-videos-wan-ai/wan2.1-t2v-14b-turbo": 1.2,
@@ -614,6 +625,8 @@ MODEL_RATIO = {
 
     # minimax https://platform.minimaxi.com/document/price?id=6433f32294878d408fc8293e
     "minimax-text-01": 0.5,
+    "minimax-m1-80k": 2,
+
     "abab6.5-chat": 15 / 7.5,
     "abab6.5s-chat": 5,
     "abab6.5t-chat": 2.5,
@@ -840,10 +853,12 @@ MODEL_RATIO = {
     "gemini-2.0-flash": 0.075,
     "gemini-2.0-flash-001": 0.075,
     "gemini-2.0-flash-lite-preview-02-05": 0.075,
+    "gemini-2.5-flash-lite-preview-06-17": 0.075,
     "gemini-2.0-flash-exp": 0.075,
     "gemini-2.0-flash-thinking-exp": 0.075,
     "gemini-2.0-flash-thinking-exp-1219": 0.075,
     "gemini-2.0-flash-thinking-exp-01-21": 0.075,
+    "gemini-2.5-flash": 0.075,
 
     "gemini-2.5-flash-preview-04-17": 0.075,
     "gemini-2.5-flash-preview-05-20": 0.075,
@@ -855,6 +870,7 @@ MODEL_RATIO = {
     "gemini-2.5-pro-preview-03-25": 0.625,
     "gemini-2.5-pro-preview-05-06": 0.625,
     "gemini-2.5-pro-preview-06-05": 0.625,
+    "gemini-2.5-pro": 0.625,
 
     "gemini-1.5-pro-001": 1.25,
     "gemini-1.5-pro-002": 1.25,
@@ -936,10 +952,10 @@ MODEL_RATIO = {
     "o4-mini": 0.55,
     "gpt-image-1": 2.5,
 
-    "o3": 5,
-    "o3-2025-04-16": 5,
-
+    "o3": 1,
+    "o3-2025-04-16": 1,
     "o3-pro": 10,
+    "o3-pro-2025-06-10": 10,
 
     # 硅基
     "llama-3.1-8b-instruct": 0.01,
@@ -1002,6 +1018,7 @@ MODEL_RATIO = {
 
 COMPLETION_RATIO = {
     "minimax-text-01": 8,
+    "minimax-m1-80k":4,
 
     # 智能体
     "gpt-4-plus": 5,

meutils/serving/fastapi/dependencies/auth.py

@@ -34,9 +34,9 @@ async def get_bearer_token(
 
     token = auth.credentials
     if token.startswith('redis:'):  # redis里按序轮询
-        if "feishu.cn" in token:
+        if "feishu.cn" in token:  # redis:https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=Y7HVfo
             feishu_url = token.removeprefix("redis:")
-            token = await get_next_token(feishu_url, ttl=24 * 3600)  # todo: 摆脱 feishu
+            token = await get_next_token(feishu_url, ttl=24 * 3600)
 
             # logger.debug(token)
 
@@ -44,10 +44,15 @@ async def get_bearer_token(
             tokens = token.removeprefix("redis:").split(',')  # todo: 初始化redis
             token = np.random.choice(tokens)
 
+    elif token.startswith("http") and "feishu.cn" in token:  # feishu 取所有 keys 主要针对 channel
+        feishu_url = token
+        tokens = await get_series(feishu_url)
+        token = '\n'.join(tokens)  # 多渠道
+
     elif ',' in token:  # 内存里随机轮询
         token = np.random.choice(token.split(','))
 
-    elif token in {"none", "null"}:
+    elif token in {"None", "none", "null"}:
         token = None
 
     return token

examples/_openaisdk/openai_kindo.py

@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : openai_siliconflow
-# @Time         : 2024/6/26 10:42
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  :
-import os
-
-from meutils.pipe import *
-from openai import OpenAI
-from openai import OpenAI, APIStatusError
-
-
-client = OpenAI(
-    # base_url="https://free.chatfire.cn/v1",
-    api_key="9a867a14-26d1-4950-89ae-dd989dec10b5-b137b199a507d6f5",
-    base_url="https://all.chatfire.cc/kindo/v1"
-
-)
-
-try:
-    client.chat.completions.create(
-        messages=[
-            {"role": "user", "content": "你是谁"}
-        ],
-        model="azure/gpt-4o-mini",
-    )
-except Exception as e:
-    print(e)