MeUtils 2025.6.18.16.30.56__py3-none-any.whl → 2025.6.20.18.7.13__py3-none-any.whl

meutils/apis/utils.py

@@ -8,8 +8,8 @@
 # @Software     : PyCharm
 # @Description  : textinparsex
 
-from openai import AsyncClient
 from meutils.pipe import *
+from openai import AsyncClient
 
 
 # upstream_base_url: Optional[str] = Header(None),
@@ -17,16 +17,16 @@ from meutils.pipe import *
 
 async def make_request(
         base_url: str,
-        path: str,
         api_key: Optional[str] = None,
-
-        method: str = "GET",
         headers: Optional[dict] = None,
 
+        path: str = "/",
+
         params: Optional[dict] = None,
         payload: Optional[dict] = None,
         files: Optional[dict] = None,
 
+        method: str = "POST",
 ):
     client = AsyncClient(base_url=base_url, api_key=api_key, default_headers=headers)
 

meutils/apis/videos/veo.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : videos
+# @Time         : 2025/6/18 16:34
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+from meutils.db.redis_db import redis_aclient
+from meutils.apis.utils import make_request
+from fastapi import APIRouter, File, UploadFile, Query, Form, Depends, Request, HTTPException, status, BackgroundTasks
+
+base_url = "https://api.gptgod.online"
+
+
+async def create_task(
+        request: dict,
+        api_key: Optional[str] = None
+):
+    response = await make_request(
+        base_url=base_url,
+        api_key=api_key,
+        path="/v1/video/create",
+        payload=request,
+    )
+
+    if task_id := response.get('id'):
+        await redis_aclient.set(task_id, api_key, ex=7 * 24 * 3600)
+
+    return response
+
+
+async def get_task(task_id: str):
+    token = await redis_aclient.get(task_id)  # 绑定对应的 token
+    token = token and token.decode()
+    if not token:
+        raise HTTPException(status_code=404, detail="TaskID not found")
+
+    response = await make_request(
+        base_url=base_url,
+        api_key=token,
+        path=f"/v1/video/query?id={task_id}",
+        method="GET",
+    )
+    return response
+
+
+if __name__ == '__main__':
+    api_key = "sk-h0Cgw9qeyotIUC9WnWSBEB0aO4RbjgEbhZmtg2Ja0kL5npDZ1"
+    payload = {
+        "prompt": "牛飞上天了",
+        "model": "veo3",
+        "images": [
+            "https://filesystem.site/cdn/20250612/VfgB5ubjInVt8sG6rzMppxnu7gEfde.png",
+            "https://filesystem.site/cdn/20250612/998IGmUiM2koBGZM3UnZeImbPBNIUL.png"
+        ],
+        "enhance_prompt": True
+    }
+
+    # arun(create_task(payload, api_key))
+
+    arun(get_task("veo3:2ba161ec-747f-4d5b-b58b-2a610bfc2c31"))
+
+
+

meutils/apis/volcengine_apis/videos.py

@@ -6,7 +6,8 @@
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  : 
+# @Description  :
+import time
 
 from meutils.pipe import *
 from meutils.io.files_utils import to_url
@@ -27,14 +28,16 @@ FEISHU_URL = "https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?shee
 
 async def get_valid_token(tokens: Optional[list] = None):
     tokens = tokens or await get_series(FEISHU_URL)
+
     for token in tokens:
         if await check(token):
+
             logger.debug(f"有效 {token}")
 
             return token
         else:
             logger.debug(f"无效 {token}")
-    _ = f"{FEISHU_URL}\n\n所有token无效"
+    _ = f"{time.ctime()}\n\n{FEISHU_URL}\n\n所有token无效"
     logger.error(_)
     send_message(_, n=3)
 

meutils/config_utils/lark_utils/common.py

@@ -10,14 +10,14 @@
 
 from meutils.pipe import *
 from meutils.caches import rcache
-
+from meutils.str_utils import parse_slice
 from meutils.decorators.retry import retrying
 from meutils.decorators.contextmanagers import try_catcher
 from meutils.notice.feishu import send_message
 from meutils.db.redis_db import redis_client, redis_aclient
 from typing import Optional, Union
 
-from urllib.parse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs, unquote
 
 FEISHU_BASE_URL = "https://open.feishu.cn/open-apis/"
 
@@ -307,12 +307,22 @@ async def get_dataframe(iloc_tuple: Optional[tuple] = None, feishu_url: Optional
 
 
 async def get_series(feishu_url: str, index: int = 0, duplicated: bool = False):  # 系统配置
+    # 前置处理
+    # https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=Y7HVfo[:2]
+    slice_obj = None
+    if feishu_url.endswith(']') and '[' in feishu_url:  # 是否解码
+        logger.debug(feishu_url)
+        feishu_url, slice_string = feishu_url.rsplit('[', maxsplit=1)
+        slice_obj = parse_slice(f"[{slice_string}")
+
     df = await aget_spreadsheet_values(feishu_url=feishu_url, to_dataframe=True)
     series = df[index]
     values = [i for i in series if i and isinstance(i, str)]  # todo: 非标准字符串处理
     if duplicated:  # 有序去重
         values = values | xUnique
 
+    if slice_obj:
+        values = values[slice_obj]
     return values
 
 
@@ -395,4 +405,10 @@ if __name__ == '__main__':
     #     token = arun(get_next_token(feishu_url))
 
     # FEISHU_URL = "https://xchatllm.feishu.cn/sheets/XfjqszII3hZAEvtTOgecOgv2nye?sheet=c14b34"
-    # print(arun(get_series(FEISHU_URL)))
+    FEISHU_URL="https://xchatllm.feishu.cn/sheets/RIv6sAUtFhlZYItyYa6ctdv1nvb?sheet=0bcf4a[:2]"
+    FEISHU_URL="https://xchatllm.feishu.cn/sheets/RIv6sAUtFhlZYItyYa6ctdv1nvb?sheet=0bcf4a"
+
+    # FEISHU_URL="https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=Y7HVfo%5B%3A2%5D"
+
+    r = arun(get_series(FEISHU_URL))
+

meutils/data/VERSION

@@ -1 +1 @@
-2025.06.18.16.30.56
+2025.06.20.18.07.13

meutils/llm/check_utils.py

@@ -258,4 +258,5 @@ if __name__ == '__main__':
 
     # arun(check_token_for_ppinfra("sk_F0kgPyCMTzmOH_-VCEJucOK8HIrbnLGYm_IWxBToHZQ"))
 
-    arun(check_token_for_volc("07139a08-e360-44e2-ba31-07f379bf99ed"))
+    # arun(check_token_for_volc("07139a08-e360-44e2-ba31-07f379bf99ed"))
+    arun(check_token_for_ppinfra("sk_mCb5sRGTi6GXkSRp5F679Rbs0V_Hfee3p85lccGXCOo"))

meutils/llm/models_mapping.py

@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : models
+# @Time         : 2025/4/14 11:09
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+
+"""
+
+[Model(id='LLM-Research/c4ai-command-r-plus-08-2024', created=1725120000, object='model', owned_by='system'),
+ Model(id='mistralai/Mistral-Small-Instruct-2409', created=1725120000, object='model', owned_by='system'),
+ Model(id='mistralai/Ministral-8B-Instruct-2410', created=1727712000, object='model', owned_by='system'),
+ Model(id='mistralai/Mistral-Large-Instruct-2407', created=1719763200, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-Coder-32B-Instruct', created=1731340800, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-Coder-14B-Instruct', created=1731340800, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-Coder-7B-Instruct', created=1731340800, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-72B-Instruct', created=1737907200, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-32B-Instruct', created=1737907200, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-14B-Instruct', created=1737907200, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-7B-Instruct', created=1737907200, object='model', owned_by='system'),
+ Model(id='Qwen/QwQ-32B-Preview', created=1737907200, object='model', owned_by='system'),
+ Model(id='LLM-Research/Llama-3.3-70B-Instruct', created=1733414400, object='model', owned_by='system'),
+ Model(id='opencompass/CompassJudger-1-32B-Instruct', created=1733414400, object='model', owned_by='system'),
+ Model(id='Qwen/QVQ-72B-Preview', created=1735056000, object='model', owned_by='system'),
+ Model(id='LLM-Research/Meta-Llama-3.1-405B-Instruct', created=1721664000, object='model', owned_by='system'),
+ Model(id='LLM-Research/Meta-Llama-3.1-8B-Instruct', created=1721664000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2-VL-7B-Instruct', created=1726675200, object='model', owned_by='system'),
+ Model(id='LLM-Research/Meta-Llama-3.1-70B-Instruct', created=1721664000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-14B-Instruct-1M', created=1737907200, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-7B-Instruct-1M', created=1737907200, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-VL-3B-Instruct', created=1737907200, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-VL-7B-Instruct', created=1737907200, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-VL-72B-Instruct', created=1737907200, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-R1-Distill-Llama-70B', created=1737302400, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-R1-Distill-Llama-8B', created=1737302400, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-R1-Distill-Qwen-32B', created=1737302400, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-R1-Distill-Qwen-14B', created=1737302400, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-R1-Distill-Qwen-7B', created=1737302400, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B', created=1737302400, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-V3', created=1737302400, object='model', owned_by='system'),
+ Model(id='Qwen/QwQ-32B', created=1732517497, object='model', owned_by='system'),
+ Model(id='XGenerationLab/XiYanSQL-QwenCoder-32B-2412', created=1732517497, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen2.5-VL-32B-Instruct', created=1732517497, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-V3-0324', created=1732517497, object='model', owned_by='system'),
+ Model(id='Wan-AI/Wan2.1-T2V-1.3B', created=0, object='model', owned_by='system'),
+ Model(id='LLM-Research/Llama-4-Scout-17B-16E-Instruct', created=1732517497, object='model', owned_by='system'),
+ Model(id='LLM-Research/Llama-4-Maverick-17B-128E-Instruct', created=1732517497, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen3-0.6B', created=1745856000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen3-1.7B', created=1745856000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen3-4B', created=1745856000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen3-8B', created=1745856000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen3-14B', created=1745856000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen3-30B-A3B', created=1745856000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen3-32B', created=1745856000, object='model', owned_by='system'),
+ Model(id='Qwen/Qwen3-235B-A22B', created=1745856000, object='model', owned_by='system'),
+ Model(id='XGenerationLab/XiYanSQL-QwenCoder-32B-2504', created=1732517497, object='model', owned_by='system'),
+ Model(id='deepseek-ai/DeepSeek-R1-0528', created=1748361600, object='model', owned_by='system')]
+"""
+
+modelscope_model_mapping = {
+    "deepseek-reasoner": "deepseek-ai/DeepSeek-R1-0528",
+    "deepseek-r1": "deepseek-ai/DeepSeek-R1-0528",
+    "deepseek-r1-0528": "deepseek-ai/DeepSeek-R1-0528",
+    "deepseek-r1-250528": "deepseek-ai/DeepSeek-R1-0528",
+
+    "deepseek-chat": "deepseek-ai/DeepSeek-V3",
+    "deepseek-v3": "deepseek-ai/DeepSeek-V3",
+    "deepseek-v3-0324": "deepseek-ai/DeepSeek-V3-0324",
+    "deepseek-v3-250324": "deepseek-ai/DeepSeek-V3-0324",
+
+    "majicflus_v1": "MAILAND/majicflus_v1",
+
+}

meutils/schemas/hailuo_types.py

@@ -18,8 +18,6 @@ FEISHU_URL_ABROAD = "https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2kn
 
 FEISHU_URL_OSS = "https://xchatllm.feishu.cn/sheets/MekfsfVuohfUf1tsWV0cCvTmn3c?sheet=Kcg6QC"
 
-
-
 #     """生成中是1 成功是2 失败是5 内容审核7 排队中11"""
 # "status": 12,
 # "message": "Optimizing prompt in progress...",
@@ -51,7 +49,8 @@ class VideoRequest(BaseModel):
 
     {"desc":"跳动","useOriginPrompt":true,"fileList":[{"id":"304987062153912323","name":"3a71b0bb-3cab-4e69-b1f0-592976d0897b_00001_.png","type":"png"}]}
     """
-    model: Union[str, Literal["video-01", "T2V-01", "I2V-01", "I2V-01-live", "S2V-01"]] = "video-01"
+    model: Union[
+        str, Literal["MiniMax-Hailuo-02", "video-01", "T2V-01", "I2V-01", "I2V-01-live", "S2V-01"]] = "video-01"
 
     """生成视频的描述。(注：需少于2000字)"""
     prompt: Optional[str] = None
@@ -66,6 +65,9 @@ class VideoRequest(BaseModel):
     """本参数仅当model选择为S2V-01时可用。模型将依据此参数中上传的主体来生成视频。目前仅支持单主体参考（数组长度为 1）。"""
     # subject_reference: list = [{"type": "character", "image": ""}]
 
+    duration: Literal[6, 10] = 6
+    resolution: Union[str, Literal["768P", "1080P"]] = "768P"
+
     callback_url: Optional[str] = None
 
     "n"
@@ -161,7 +163,7 @@ class VideoResponse(BaseModel):
             self.file_id = self.videos[0].downloadURL
 
         if self.videos:
-            self.status = status_mapper.get(self.videos[0].status, "Failed")
+            self.status = status_mapper.get(self.videos[0].status or 2, "Failed")
 
 
 #
@@ -240,3 +242,10 @@ class MusicRequet(BaseModel):
 class MusicResponse(BaseModel):
     trace_id: str
     base_resp: BaseResponse
+
+
+if __name__ == '__main__':
+
+    print(VideoResponse(task_id='1', base_resp={"status_code": 0, "status_msg": "success"}).model_dump())
+
+    print(Video(x='xxx'))

meutils/schemas/oneapi/_types.py

@@ -38,7 +38,7 @@ class ModelInfo(BaseModel):
 
 
 class ChannelInfo(BaseModel):
-    id: Optional[int] = None  # 不存在就新建
+    id: Optional[Union[int, str]] = None  # 不存在就新建
     type: int = 1  # 枚举值 openai
 
     name: str = ''
@@ -46,7 +46,7 @@ class ChannelInfo(BaseModel):
     group: str = 'default'
 
     base_url: str = ''
-    key: str
+    key: str  # 与id相对应
     models: str = 'MODEL'
 
     access_token: str = ''
@@ -87,11 +87,14 @@ class ChannelInfo(BaseModel):
 
     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"
+
+        self.id = self.id or None
+
+        self.name = f"""{str(datetime.datetime.now())[:10]} {self.name or self.base_url or "NAME"}"""
+        self.tag = f"""{str(datetime.datetime.now())[:10]} {self.tag or self.base_url or "TAG"}"""
         self.group = self.group or self.base_url or "GROUP"
 
-        self.setting= self.setting or ""
+        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)
@@ -103,6 +106,15 @@ if __name__ == '__main__':
 
     from meutils.apis.oneapi import option, channel
 
-    option()
+    # option()
     #
-    arun(channel.edit_channel(MODEL_PRICE))
+    # arun(channel.edit_channel(MODEL_PRICE))
+
+    c = ChannelInfo(key='key')
+
+    c_ = c.copy()
+    l = []
+    for i in range(3):
+        c_.key = f"######{i}"
+        l.append(c_)
+    print(l)

meutils/schemas/oneapi/common.py

@@ -44,8 +44,6 @@ MODEL_PRICE = {
     "gemini-2.5-flash-video": 0.05,
     "gemini-2.5-pro-video": 0.1,
 
-    "veo3": 4,
-
     # rix
     "kling_image": 0.05,
     "kling_virtual_try_on": 1,
@@ -95,6 +93,18 @@ MODEL_PRICE = {
     "api-videos-wan-ai/wan2.1-i2v-14b-720p": 1.2,
     "api-videos-wan-ai/wan2.1-i2v-14b-720p-turbo": 1.2,
 
+    # veo
+    "veo3": 2,
+    "api-veo3": 2,
+    "api-veo3-pro": 8,
+    "api-veo3-pro-frames": 8,
+
+    # hailuo
+    "api-minimax-hailuo-01-6s": 0.5,
+    "api-minimax-hailuo-02-6s-768p": 1,
+    "api-minimax-hailuo-02-10s-768p": 1,
+    "api-minimax-hailuo-02-6s-1080p": 2,
+
     # chatfire
     "ppu-0001": 0.0001,
     "ppu-001": 0.001,
@@ -146,9 +156,6 @@ MODEL_PRICE = {
 
     "official-api-vidu": 0.5,
 
-    "official-api-hailuo-video": 0.5,
-    "api-hailuo-video": 0.5,
-
     "api-videos-seedream-3.0": 0.5,
 
     "api-kling-video/v2/master/text-to-video": 5,
@@ -1018,7 +1025,7 @@ MODEL_RATIO = {
 
 COMPLETION_RATIO = {
     "minimax-text-01": 8,
-    "minimax-m1-80k":4,
+    "minimax-m1-80k": 4,
 
     # 智能体
     "gpt-4-plus": 5,

meutils/serving/fastapi/dependencies/auth.py

@@ -46,7 +46,8 @@ async def get_bearer_token(
 
     elif token.startswith("http") and "feishu.cn" in token:  # feishu 取所有 keys 主要针对 channel
         feishu_url = token
-        tokens = await get_series(feishu_url)
+
+        tokens = await get_series(feishu_url, duplicated=True)
         token = '\n'.join(tokens)  # 多渠道
 
     elif ',' in token:  # 内存里随机轮询

meutils/str_utils/__init__.py

@@ -246,6 +246,16 @@ def validate_url(url):
 
         return False
 
+def parse_slice(slice_str):
+    content = slice_str.strip()[1:-1]
+    parts = content.split(':', 2)
+    parts += [''] * (3 - len(parts))  # 确保有3部分
+    return slice(
+        int(parts[0]) if parts[0] else None,
+        int(parts[1]) if parts[1] else None,
+        int(parts[2]) if parts[2] else None
+    )
+
 
 if __name__ == '__main__':
     # print(str_replace('abcd', {'a': '8', 'd': '88'}))
@@ -291,3 +301,14 @@ if __name__ == '__main__':
     print(validate_url(url))
 
     print(re.findall("http", url*2))
+
+    # 示例用法
+    slice_str = "[:2]"
+    slice_str = ":2]"
+
+    # slice_str="https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=Y7HVfo[:2]"
+    # https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=Y7HVfo%5B%3A2%5D
+    slice_obj = parse_slice(slice_str)
+    l = list(range(10))
+    print(l[slice_obj])  # [0, 1]
+

meutils/str_utils/regular_expression.py

@@ -8,6 +8,7 @@
 # @Software     : PyCharm
 # @Description  :
 import json
+import mimetypes
 import re
 
 from meutils.pipe import *
@@ -97,6 +98,8 @@ def parse_url(text: str, for_image=False, fn: Optional[Callable] = None):
         # 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)'
 
+        # "https://i.miji.bid/2025/06/10/d018000aed9b872c7b248dccf14c4450.pngA" 纠正
+
     urls = re.findall(url_pattern, text)
 
     valid_urls = []
@@ -176,8 +179,10 @@ if __name__ == '__main__':
 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的也能兼容么
+
+https://i.miji.bid/2025/06/10/d018000aed9b872c7b248dccf14c4450.pngA
     """
-    print(parse_url(text))
+    print(parse_url(text, for_image=True))
 
 
     # print(parse_url(text, for_image=False))
@@ -186,3 +191,5 @@ https://p26-bot-workflow-sign.byteimg.com/tos-cn-i-mdko3gqilj/f13171faeed2447b8b
     # print(parse_url(text))
     #
     # valid_urls = parse_url(text, for_image=True)
+
+    print(mimetypes.guess_type("xx.ico"))