MeUtils 2025.4.9.10.39.6__py3-none-any.whl → 2025.4.11.17.37.3__py3-none-any.whl

meutils/schemas/oneapi/common.py

@@ -386,6 +386,11 @@ MODEL_RATIO = {
     "grok-3-reasoner": 2,
     "grok-3-deepersearch": 2,
 
+    "grok-3-beta": 1.5,
+    "grok-3-fast-beta": 2.5,
+    "grok-3-mini-beta": 0.15,
+    "grok-3-mini-fast-beta": 0.3,
+
     # 定制
     "lingxi-all": 1,
 
@@ -681,6 +686,7 @@ MODEL_RATIO = {
     "gemini-2.0-pro": 1.25,
     "gemini-2.0-pro-exp-02-05": 1.25,
     "gemini-2.5-pro-exp-03-25": 1.5,
+    "gemini-2.5-pro-preview-03-25": 0.625,
 
     "gemini-2.0-flash-thinking-exp": 1,
     "gemini-2.0-flash-thinking-exp-1219": 1,
@@ -816,6 +822,11 @@ COMPLETION_RATIO = {
     "grok-3-reasoner": 5,
     "grok-3-deepersearch": 5,
 
+    "grok-3-beta": 5,
+    "grok-3-fast-beta": 5,
+    "grok-3-mini-beta": 5 / 3,
+    "grok-3-mini-fast-beta": 4 / 0.6,
+
     "claude-3-5-haiku-20241022": 5,
     "anthropic/claude-3-5-haiku-20241022:beta": 5,
 
@@ -905,6 +916,7 @@ COMPLETION_RATIO = {
     "gemini-2.0-pro": 5,
     "gemini-2.0-pro-exp-02-05": 5,
     "gemini-2.5-pro-exp-03-25": 5,
+    "gemini-2.5-pro-preview-03-25": 8,
 
     "gemma2-9b-it": 4,
     "gemma2-27b-it": 4,

meutils/schemas/openai_types.py

@@ -121,6 +121,14 @@ class CompletionRequest(BaseModel):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
+    @cached_property
+    def system_instruction(self):
+        # [{'role': 'system', 'content':  [{"type": "text", "text": ""}]]
+
+        if message := self.messages and self.messages[0]:
+            if message.get("role") == "system":
+                return str(message.get("content", "")) or None
+
     @cached_property
     def last_message(self):
         return self.messages and self.messages[-1]
@@ -159,7 +167,9 @@ class CompletionRequest(BaseModel):
         """最新一轮的 user url 列表"""
         content_types = {
             "image_url",
+
             "file", "file_url",
+
             "audio_url", "input_audio",
 
             "video_url",

meutils/serving/fastapi/dependencies/__init__.py

@@ -6,5 +6,8 @@
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  : 
+# @Description  :
 
+
+from meutils.serving.fastapi.dependencies.auth import get_bearer_token
+from meutils.serving.fastapi.dependencies.headers import get_headers

meutils/serving/fastapi/dependencies/auth.py

@@ -33,15 +33,18 @@ async def get_bearer_token(
         return None
 
     token = auth.credentials
-    if token.startswith('redis:'):  # 初始化吧，太长？
+    if token.startswith('redis:'):  # redis里按序轮询
         if "feishu.cn" in token:
             feishu_url = token.removeprefix("redis:")
-            token = await get_next_token(feishu_url)  # 初始化redis
+            token = await get_next_token(feishu_url)  # todo: 摆脱 feishu
 
-        elif ',' in token:  # todo: 初始化redis
-            pass
+            # logger.debug(token)
 
-    elif ',' in token:  # 分隔符
+        else:  # redis:token1,token2
+            tokens = token.removeprefix("redis:").split(',')  # todo: 初始化redis
+            token = np.random.choice(tokens)
+
+    elif ',' in token:  # 内存里随机轮询
         token = np.random.choice(token.split(','))
 
     return token
@@ -71,4 +74,5 @@ async def get_bearer_token_for_oneapi(
 if __name__ == '__main__':
     from meutils.pipe import *
 
-    arun(get_bearer_token(HTTPAuthorizationCredentials(scheme="Bearer", credentials="123")))
+    arun(get_bearer_token(HTTPAuthorizationCredentials(scheme="Bearer",
+                                                       credentials="redis:https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=rWMtht")))

meutils/serving/fastapi/exceptions/http_error.py

@@ -10,7 +10,7 @@ from starlette.responses import JSONResponse
 
 from fastapi.exceptions import RequestValidationError, HTTPException
 
-from meutils.notice.feishu import send_message_for_httpexception as send_message
+from meutils.notice.feishu import send_message_for_http as send_message
 
 
 async def http_error_handler(_: Request, exc: HTTPException) -> JSONResponse:
@@ -60,7 +60,7 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
         )
 
     # send_message
-    content_detail = f"{traceback.format_exc()}"
+    content_detail = f"{traceback.format_exc()}"  # 是不是最后几行就可以了
     #
     # from meutils.pipe import logger
     # logger.debug(content_detail)

meutils/str_utils/__init__.py

@@ -11,12 +11,32 @@
 
 from meutils.pipe import *
 # from meutils.str_utils.translater import translater
+from meutils.str_utils.regular_expression import parse_url
+
 from meutils.request_utils.crawler import Crawler
 from urllib.parse import urlencode, parse_qs, parse_qsl, quote_plus, unquote_plus, urljoin
 
 query_params2json = lambda q: dict(parse_qsl(q))
 
 
+def parse_prompt(prompt, only_first_url: bool = True):
+    if not only_first_url and (urls := parse_url(prompt)):
+        prompt = reduce(lambda prompt, url: prompt.replace(url, " "), urls)
+        return urls, prompt
+
+    if prompt.startswith('http') and (prompts := prompt.split(maxsplit=1)):  # 单 url
+        if len(prompts) == 2:
+            return prompts
+        else:
+            return prompts + [' ']
+
+    elif "http" in prompt and (urls := parse_url(prompt)):
+        return urls[0], prompt.replace(urls[0], "")
+
+    else:
+        return None, prompt
+
+
 def json2query_params(js: dict = None, url='') -> str:
     js = js or {}
     js = {k: v for k, v in js.items() if v}
@@ -200,8 +220,16 @@ if __name__ == '__main__':
 
     # print(query_params2json("act=get&uid=134597&vkey=07A1D82FDDE1E96DB5CEF4EF12C8125F&num=1&time=30&plat=1&re=1&type=0&so=1&ow=1&spl=1&addr=&db=1"))
 
-    print(half2all('⽉月'))
-    print(all2half('⽉月'))
+    # print(half2all('⽉月'))
+    # print(all2half('⽉月'))
+
+    print(parse_prompt(" hi", only_first_url=False))
+
+    print(parse_prompt("https://www.hao123.com/ hi"))
+    print(parse_prompt("https://www.hao123.com/ hi" * 2))
+    print(parse_prompt("hi https://www.hao123.com/ "))
+
+    print(parse_prompt("https://www.hao123.com/ hi" * 2, only_first_url=False))
 
 # import chardet
 #

meutils/apis/google_apis/common.py

@@ -1,243 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : common
-# @Time         : 2025/4/2 13:03
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  : https://ai.google.dev/gemini-api/docs/openai?hl=zh-cn
-
-# https://googleapis.github.io/python-genai/genai.html#module-genai.models
-
-
-from meutils.pipe import *
-from meutils.llm.clients import AsyncOpenAI
-from meutils.io.files_utils import to_url, to_bytes, guess_mime_type
-from meutils.str_utils.regular_expression import parse_url
-
-from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, CompletionRequest, CompletionUsage
-
-from meutils.config_utils.lark_utils import get_next_token_for_polling
-from google import genai
-from google.genai import types
-from google.genai.types import HttpOptions, GenerateContentConfig, Content, HarmCategory, HarmBlockThreshold, Part
-from google.genai.types import UserContent, ModelContent
-
-FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=MJw6hI"
-
-"""
-Gemini 1.5 Pro 和 1.5 Flash 最多支持 3,600 个文档页面。文档页面必须采用以下文本数据 MIME 类型之一：
-
-PDF - application/pdf
-JavaScript - application/x-javascript、text/javascript
-Python - application/x-python、text/x-python
-TXT - text/plain
-HTML - text/html
-CSS - text/css
-Markdown - text/md
-CSV - text/csv
-XML - text/xml
-RTF - text/rtf
-
-- 小文件
-- 大文件: 需要等待处理
-"""
-
-
-class GeminiClient(object):
-    def __init__(self, api_key: Optional[str] = None):
-        self.api_key = api_key  # or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True)
-        self.base_url = "https://all.chatfire.cc/genai"
-
-    async def create(self, request: CompletionRequest):
-        client = await self.get_client()
-
-        if any(i in request.model for i in ("image",)):
-            messages = await self.to_image_messages(request)
-
-            if len(messages) > 1:
-                history = messages[:-1]
-                message = messages[-1].parts
-            else:
-                history = []
-                message = messages[-1].parts
-
-            chat = client.aio.chats.create(  # todo: system_instruction
-                model=request.model,
-                config=GenerateContentConfig(
-                    response_modalities=['Text', 'Image'],
-                ),
-                history=history
-            )
-
-            logger.debug(message)
-
-            # message = [
-            #     Part.from_text(text="画条狗")
-            # ]
-
-            for i in range(5):
-                try:
-                    chunks = await chat.send_message_stream(message)
-                    async for chunk in chunks:
-
-                        if chunk.candidates:
-                            parts = chunk.candidates[0].content.parts or []
-                            for part in parts:
-                                # logger.debug(part)
-                                if part.text:
-                                    yield part.text
-
-                                if part.inline_data:
-                                    image_url = await to_url(
-                                        part.inline_data.data,
-                                        mime_type=part.inline_data.mime_type
-                                    )
-                                    yield f"![image_url]({image_url})"
-                    break
-
-                except Exception as e:
-                    logger.debug(f"重试{i}: {e}")
-                    if "The model is overloaded." in str(e):
-                        await asyncio.sleep(1)
-                        continue
-                    else:
-                        yield e
-                        raise e
-
-    async def to_image_messages(self, request: CompletionRequest):
-        # 两轮即可连续编辑图片
-
-        messages = []
-        for m in request.messages:
-            contents = m.get("content")
-            if m.get("role") == "assistant":
-                assistant_content = str(contents)
-                if urls := parse_url(assistant_content):  # assistant
-                    datas = await asyncio.gather(*map(to_bytes, urls))
-
-                    parts = [
-                        Part.from_bytes(
-                            data=data,
-                            mime_type="image/png"
-                        )
-                        for data in datas
-                    ]
-                    parts += [
-                        Part.from_text(
-                            text=request.last_assistant_content
-                        ),
-                    ]
-                    messages.append(ModelContent(parts=parts))
-
-            elif m.get("role") == "user":
-                if isinstance(contents, list):
-                    parts = []
-                    for content in contents:
-                        if content.get("type") == "image_url":
-                            image_url = content.get("image_url", {}).get("url")
-                            data = await to_bytes(image_url)
-
-                            parts += [
-                                Part.from_bytes(data=data, mime_type="image/png")
-                            ]
-
-                        elif content.get("type") == "text":
-                            text = content.get("text")
-                            if text.startswith('http'):
-                                image_url, text = text.split(maxsplit=1)
-                                data = await to_bytes(image_url)
-
-                                parts += [
-                                    Part.from_bytes(data=data, mime_type="image/png"),
-                                    Part.from_text(text=text)
-                                ]
-                            else:
-                                parts += [
-                                    Part.from_text(text=text)
-                                ]
-
-                    messages.append(UserContent(parts=parts))
-
-                else:  # str
-                    if str(contents).startswith('http'):  # 修正提问格式， 兼容 url
-                        image_url, text = str(contents).split(maxsplit=1)
-                        data = await to_bytes(image_url)
-                        parts = [
-                            Part.from_bytes(data=data, mime_type="image/png"),
-                            Part.from_text(text=text)
-                        ]
-                    else:
-                        parts = [
-                            Part.from_text(text=str(contents)),
-                        ]
-                    messages.append(UserContent(parts=parts))
-
-        return messages
-
-    async def upload(self, files: Union[str, List[str]]):  # => openai files
-        client = await self.get_client()
-
-        if isinstance(files, list):
-            return await asyncio.gather(*map(self.upload, files))
-
-        file_config = {"name": f"{shortuuid.random().lower()}", "mime_type": guess_mime_type(files)}
-        return await client.aio.files.upload(file=io.BytesIO(await to_bytes(files)), config=file_config)
-
-    @alru_cache()
-    async def get_client(self):
-        api_key = self.api_key or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True)
-
-        logger.info(f"GeminiClient: {api_key}")
-
-        return genai.Client(
-            api_key=api_key,
-            http_options=HttpOptions(
-                base_url=self.base_url
-            )
-        )
-
-
-if __name__ == '__main__':
-    file = "https://oss.ffire.cc/files/kling_watermark.png"
-
-    api_key = os.getenv("GOOGLE_API_KEY")
-
-    # arun(GeminiClient(api_key=api_key).upload(file))
-    # arun(GeminiClient(api_key=api_key).upload([file] * 2))
-    # arun(GeminiClient(api_key=api_key).create())
-
-    content = [
-
-        {"type": "text", "text": "https://oss.ffire.cc/files/nsfw.jpg 移除右下角的水印"},
-
-        # {"type": "text", "text": "总结下"},
-        # {"type": "image_url", "image_url": {"url": url}},
-
-        # {"type": "video_url", "video_url": {"url": url}}
-
-    ]
-
-    # content = "https://oss.ffire.cc/files/nsfw.jpg 移除右下角的水印"
-
-    #
-    request = CompletionRequest(
-        # model="qwen-turbo-2024-11-01",
-        # model="gemini-all",
-        model="gemini-2.0-flash-exp-image-generation",
-        # model="qwen-plus-latest",
-
-        messages=[
-            {
-                'role': 'user',
-
-                'content': content
-            },
-
-        ],
-        stream=True,
-    )
-
-    # arun(GeminiClient(api_key=api_key).to_image_messages(request))
-    arun(GeminiClient(api_key=api_key).create(request))

meutils/apis/google_apis/files.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : files
-# @Time         : 2025/4/2 10:40
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  : 
-
-from meutils.pipe import *
-
-
-file = "/Users/betterme/PycharmProjects/AI/QR.png"
-#
-# file_object = client.files.upload(file=file)
-# prompt = "一句话总结"
-
-file_object = client.aio.files.upload(file=file)