MeUtils 2025.3.23.13.35.22__py3-none-any.whl → 2025.3.26.18.50.26__py3-none-any.whl

meutils/io/x.py

@@ -11,65 +11,19 @@
 from meutils.pipe import *
 # from minio import Minio
 from meutils.oss.minio_oss import Minio
+import os
+from openai import OpenAI
 
-# MinIO client setup
-# minio_client = Minio(
-#     "minio-server-url:9000",
-#     access_key="your-access-key",
-#     secret_key="your-secret-key",
-#     secure=True  # set to False if not using HTTPS
-# )
-minio_client = Minio()
-
-
-async def download_and_upload(video_url, bucket_name, object_name):
-    buffer_size = 5 * 1024 * 1024  # 5MB buffer to meet MinIO's minimum part size
-
-    async with httpx.AsyncClient() as client:
-        try:
-            async with client.stream("GET", video_url) as response:
-                response.raise_for_status()
-
-                total_size = int(response.headers.get('content-length', 0))
-                buffer = io.BytesIO()
-                uploaded = 0
-
-                async for chunk in response.aiter_bytes(chunk_size=buffer_size):
-                    buffer.write(chunk)
-                    buffer_size = buffer.tell()
-                    buffer.seek(0)
-
-                    if buffer_size >= 5 * 1024 * 1024 or response.is_closed:
-                        try:
-                            minio_client.put_object(
-                                bucket_name,
-                                object_name,
-                                buffer,
-                                length=buffer_size,
-                                part_size=5 * 1024 * 1024,
-                                content_type='video/mp4'
-                            )
-                            uploaded += buffer_size
-                            print(f"Uploaded {uploaded}/{total_size} bytes")
-
-                        except Exception as upload_error:
-                            print(f"Unexpected upload error: {upload_error}")
-                            raise
-
-                        buffer = io.BytesIO()  # Reset buffer after upload
-
-                print("Upload completed")
-        except httpx.HTTPStatusError as http_error:
-            print(f"HTTP error occurred: {http_error}")
-        except Exception as e:
-            print(f"An unexpected error occurred: {e}")
+client = OpenAI(
+    api_key=os.getenv("DASHSCOPE_API_KEY"),
+    base_url="https://dashscope.aliyuncs.com/compatible-mode/v1",
+)
 
+file = client.files.create(
+    file=open("/Users/betterme/PycharmProjects/AI/docker-compose.yml", "rb"),
+    purpose='file-extract'
+)
+client.files.content(file.id)
 
 if __name__ == '__main__':
-    # Usage
-    url = "https://s22-def.ap4r.com/bs2/upload-ylab-stunt-sgp/se/ai_portal_sgp_queue_m2v_txt2video_camera/b7eded0c-452c-4282-ad0a-02d96bd97f3e/0.mp4"
-    bucket_name = "videos"
-    object_name = "video11.mp4"
-
-    with timer():
-        arun(download_and_upload(url, bucket_name, object_name))
+    print(file)

meutils/llm/completions/chat_gemini.py

@@ -69,7 +69,7 @@ class Completions(object):
                     message["content"] += [{"type": "text", "text": request.last_user_content}]
 
         # 调用模型
-        logger.debug(request.model_dump_json(indent=4))
+        # logger.debug(request.model_dump_json(indent=4))
 
         data = to_openai_params(request)
         response = await self.client.chat.completions.create(**data)
@@ -97,7 +97,7 @@ class Completions(object):
                 yield chunk
             else:
                 yield chunk
-            logger.debug(str(chunk))
+            # logger.debug(str(chunk))
 
 
 if __name__ == '__main__':

meutils/llm/completions/chat_plus.py

@@ -46,6 +46,8 @@ class Completions(object):
         :param request:
         :return:
         """
+        request.model = request.model.removesuffix("-all").removesuffix("-plus")  ### 避免死循环
+
         if request.last_user_content.startswith(("画",)):  # 画画
             return await self.create_images(request)  # str
 
@@ -58,7 +60,9 @@ class Completions(object):
             return metaso.create(request)
 
         elif request.last_user_content.startswith(("http",)):
-            file_url, text = request.last_user_content.split(maxsplit=1)  # application/octet-stream
+
+            file_url, *texts = request.last_user_content.split(maxsplit=1) + ["总结下"]  # application/octet-stream
+            text = texts[0]
 
             if guess_mime_type(file_url).startswith("image"):  # 识图
                 request.model = "glm-4v-flash"
@@ -81,7 +85,7 @@ class Completions(object):
                     }
                 ]
                 data = to_openai_params(request)
-                return await self.client.chat.completions.create(**data)
+                return await zhipuai_client.chat.completions.create(**data)
 
             elif guess_mime_type(file_url).startswith(("video", "audio")):  # 音频 视频
                 request.model = "gemini"  # 果果
@@ -106,26 +110,31 @@ class Completions(object):
                 return await self.client.chat.completions.create(**data)
 
             else:
-
+                # logger.debug(f"file_url: {file_url}")
                 file_content = await file_extract(file_url)  # 文件问答-单轮
 
+                logger.debug(file_content)
+
                 request.messages = [
                     {
                         'role': 'user',
                         'content': f"""{json.dumps(file_content, ensure_ascii=False)}\n\n{text}"""
                     }
                 ]
+                # logger.debug(request)
                 data = to_openai_params(request)
                 return await self.client.chat.completions.create(**data)
 
         if image_urls := request.last_urls.get("image_url"):  # 识图
             request.model = "glm-4v-flash"
             data = to_openai_params(request)
-            return await self.client.chat.completions.create(**data)
+            return await zhipuai_client.chat.completions.create(**data)
 
         elif file_urls := request.last_urls.get("file_url"):
             return await self.chat_files(request)
 
+        # todo 标准格式的audio_url video_url
+
         data = to_openai_params(request)
         return await self.client.chat.completions.create(**data)
 
@@ -189,15 +198,19 @@ if __name__ == '__main__':
             'content': [
                 {
                     "type": "text",
-                    "text": "总结下"
+                    # "text": "总结下"
+                    "text": "https://app.yinxiang.com/fx/8b8bba1e-b254-40ff-81e1-fa3427429efe 总结下",
+
+                    # "text": "https://app.yinxiang.com/fx/8b8bba1e-b254-40ff-81e1-fa3427429efe"
+
                 },
 
-                {
-                    "type": "file_url",
-                    "file_url": {
-                        "url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
-                    }
-                }
+                # {
+                #     "type": "file_url",
+                #     "file_url": {
+                #         "url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+                #     }
+                # }
             ]
         }])
 

meutils/llm/completions/chat_spark.py

@@ -26,13 +26,15 @@ class Completions(object):
 
     async def create(self, request: CompletionRequest):
         if request.last_user_content.startswith("http"):  # 文件问答-单轮
-            file_url, content = request.last_user_content.split(maxsplit=1)
+            file_url, *texts = request.last_user_content.split(maxsplit=1) + ["总结下"]
+            text = texts[0]
+
             file_content = await file_extract(file_url)
 
             request.messages = [
                 {
                     'role': 'user',
-                    'content': f"""{json.dumps(file_content, ensure_ascii=False)}\n\n{content}"""
+                    'content': f"""{json.dumps(file_content, ensure_ascii=False)}\n\n{text}"""
                 }
             ]
         elif image_urls := request.last_urls.get("image_url"):  # 长度为1

meutils/llm/completions/yuanbao.py

@@ -7,9 +7,7 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
-import asyncio
 
-import pandas as pd
 from aiostream import stream
 
 from meutils.pipe import *
@@ -52,6 +50,9 @@ class Completions(object):
 
         prompt = request and oneturn2multiturn(request.messages) or image_request.prompt
 
+        if isinstance(prompt, list):
+            prompt = prompt[-1].get("text", "")  # [{'type': 'text', 'text': 'hi'}]
+
         payload = {
             "model": "gpt_175B_0404",
             "chatModelId": request.model,
@@ -101,13 +102,14 @@ class Completions(object):
                 }
             )
 
+        # logger.debug(bjson(payload))
         headers = {
             'cookie': token
         }
         async with httpx.AsyncClient(base_url=YUANBAO_BASE_URL, headers=headers, timeout=300) as client:
             # chatid = (await client.post(API_GENERATE_ID)).text
             chatid = uuid.uuid4()
-
+            # https://yuanbao.tencent.com/api/chat/90802631-22dc-4d5d-9d3f-f27f57d5fec8'
             async with client.stream(method="POST", url=f"{API_CHAT}/{chatid}", json=payload) as response:
                 logger.debug(response.status_code)
                 response.raise_for_status()
@@ -138,8 +140,10 @@ class Completions(object):
 
                             for i, ref in enumerate(df['title'], 1):
                                 references.append(f"[^{i}]: {ref}\n")
+                        if sse.content:
+                            yield sse.content
 
-                        yield sse.content
+                            # logger.debug(sse.content)
                 if references:
                     yield '\n\n'
                     for ref in references:
@@ -195,13 +199,15 @@ if __name__ == '__main__':
     # model = 'deep_seek_v3-search'
     # model = 'deep_seek-search'
     model = 'deep_seek'
-    model = 'hunyuan_t1'
+    # model = 'hunyuan_t1'
     model = 'hunyuan_t1-search'
+    # model = 'deep_seek-search'
 
     arun(Completions().create(
         CompletionRequest(
             model=model,
-            messages=[{'role': 'user', 'content': '南京天气如何'}]
+            messages=[{'role': 'user', 'content': '南京天气如何'}],
+            stream=True
         ),
         # image_request=request,
         # token=token

meutils/notice/feishu.py

@@ -106,6 +106,9 @@ def catch(
 
 send_message_for_images = partial(send_message, url=IMAGES)
 
+httpexception_feishu_url = "https://open.feishu.cn/open-apis/bot/v2/hook/d1c7b67d-b0f8-4067-a2f5-109f20eeb696"
+send_message_for_httpexception = partial(send_message, url=httpexception_feishu_url)
+
 if __name__ == '__main__':
     # send_message("xxx", title=None)
     send_message(None, title=None)

meutils/request_utils/crawler.py

@@ -56,10 +56,11 @@ if __name__ == '__main__':
     # print(Crawler(url).xpath('//*[@id="houselist"]/li/a//text()'))
 
     url  = "https://chat.tune.app/?id=7f268d94-d2d4-4bd4-a732-f196aa20dceb"
+    url = "https://app.yinxiang.com/fx/8b8bba1e-b254-40ff-81e1-fa3427429efe"
 
-    # print(Crawler(url).xpath('//script//text()'))
+    print(Crawler(url).xpath('//script//text()'))
 
-    html_content = httpx.get(url).text
+    # html_content = httpx.get(url).text
 
 
     # # 正则表达式匹配以 "/_next/static/chunks/7116-" 开头的 JS 文件

meutils/schemas/image_types.py

@@ -343,11 +343,6 @@ class RecraftImageRequest(ImageRequest):
         if self.image_type in {"natural", }:
             self.image_type = "any"
 
-        if "halloween" in self.model:
-            self.user_controls = self.user_controls or {
-                "special_event": "halloween"
-            }
-
 
 class ImageProcessRequest(BaseModel):
     task: Optional[str] = None
@@ -508,3 +503,4 @@ if __name__ == '__main__':
     # print(ImagesResponse(data=[{'url': 1}]))
 
     print(RecraftImageRequest(prompt="").model_dump_json())
+    print(RecraftImageRequest(prompt=""))

meutils/schemas/oneapi/common.py

@@ -20,13 +20,15 @@ MINIMAX_VIDEO = 3
 
 MODEL_PRICE = {
     "o1:free": FREE,
+    # "claude-3-7-sonnet-code:free": "claude-3-7-sonnet-code"
+    "claude-3-7-sonnet-code:free": 0.0001,
 
     "black-forest-labs/FLUX.1-dev": 0.0001,
     "black-forest-labs/FLUX.1-pro": 0.0001,
 
     "images": FREE,
     # rix
-    "kling_image": 0.025,
+    "kling_image": 0.05,
     "kling_virtual_try_on": 1,
     "kling_effects": 1,
 
@@ -66,6 +68,10 @@ MODEL_PRICE = {
     "sora-1:1-480p-5s": 1.2,
     "dall-e-3": 0.03,
 
+    # 智能体
+    "ppt": 0.1,
+    "ppt-islide": 0.1,
+
     # 虚拟换衣fish
     "api-kolors-virtual-try-on": 0.1,
     "official-api-kolors-virtual-try-on": 0.8,
@@ -377,6 +383,7 @@ MODEL_RATIO = {
     "grok-3": 2,
     "grok-3-deepsearch": 2,
     "grok-3-reasoner": 2,
+    "grok-3-deepersearch": 2,
 
     # 定制
     "lingxi-all": 1,
@@ -498,9 +505,11 @@ MODEL_RATIO = {
 
     # deepseek
     "deepseek-v3": 1,
+    "deepseek-v3-0324": 1,
     "deepseek-v3-8k": 0.5,
     "deepseek-v3-128k": 5,
     "deepseek-chat": 1,
+
     "deepseek-chat-8k": 0.5,
     "deepseek-chat-64k": 5,
     "deepseek-chat-164k": 5,
@@ -517,8 +526,10 @@ MODEL_RATIO = {
     'deepseek-r1-search': 2,
     'deepseek-reasoner-search': 2,
 
-    'deepseek-r1-think': 1.5,
-    'deepseek-reasoner-think': 1.5,
+    'deepseek-r1-think': 2,
+    'deepseek-reasoner-think': 2,
+
+    "deepseek-r1-plus": 2,
 
     # deepseek-r1:1.5b,deepseek-r1-distill-qwen-1.5b,deepseek-r1:7b,deepseek-r1-distill-qwen-7b,deepseek-r1:8b,deepseek-r1-distill-llama-8b,deepseek-r1:14b,deepseek-r1-distill-qwen-14b,deepseek-r1:32b,deepseek-r1-distill-qwen-32b,deepseek-r1:70b,deepseek-r1-distill-llama-70b
     "deepseek-r1:1.5b": 0.1,
@@ -594,8 +605,9 @@ MODEL_RATIO = {
     "text-babbage-001": 0.25,
     "text-davinci-edit-001": 10,
 
+    "omni-moderation-latest": 0.1,
     "text-moderation-latest": 0.1,
-    "text-moderation-stable": 0.1,
+
     "tts-1": 7.5,
     "tts-1-1106": 7.5,
     "tts-1-hd": 15,
@@ -618,6 +630,12 @@ MODEL_RATIO = {
     "claude-3-7-sonnet-latest": 1.5,
     "claude-3-7-sonnet-20250219": 1.5,
 
+    "deepclaude": 1.5,
+    "deep-claude": 1.5,
+
+    "deep-gemini": 1.5,
+    "deep-grok": 1.5,
+
     "command": 0.5 * 2,
     "command-light": 0.5 * 2,
     "command-light-nightly": 0.5 * 2,
@@ -655,6 +673,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.0-flash-thinking-exp": 1,
     "gemini-2.0-flash-thinking-exp-1219": 1,
@@ -783,6 +802,7 @@ COMPLETION_RATIO = {
     "grok-3": 5,
     "grok-3-deepsearch": 5,
     "grok-3-reasoner": 5,
+    "grok-3-deepersearch": 5,
 
     "claude-3-5-haiku-20241022": 5,
     "anthropic/claude-3-5-haiku-20241022:beta": 5,
@@ -863,6 +883,7 @@ COMPLETION_RATIO = {
 
     "gemini-2.0-pro": 5,
     "gemini-2.0-pro-exp-02-05": 5,
+    "gemini-2.5-pro-exp-03-25": 5,
 
     "gemma2-9b-it": 4,
     "gemma2-27b-it": 4,
@@ -944,7 +965,9 @@ COMPLETION_RATIO = {
     "meta-deepresearch": 4,
 
     "deepseek-v3": 4,
+    "deepseek-v3-0324": 4,
     "deepseek-chat": 4,
+
     'deepseek-r1': 4,
     'deepseek-reasoner': 4,
     "deepseek-reasoner-164k": 8,
@@ -964,6 +987,12 @@ COMPLETION_RATIO = {
     'deepseek-r1-search': 5,
     'deepseek-reasoner-search': 5,
 
+    "deepseek-r1-plus": 4,
+    "deepclaude": 4,
+    "deep-claude": 4,
+    "deep-gemini": 4,
+    "deep-grok": 4,
+
     "glm-zero": 5,
     "glm-zero-preview": 5,
     "glm-4v-flash": 5,

meutils/schemas/siliconflow_types.py

@@ -11,6 +11,9 @@
 
 from meutils.pipe import *
 
+FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=3aA5dH"
+FEISHU_URL_FREE = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=xlvlrH"
+
 BASE_URL = "https://api.siliconflow.cn/v1"
 
 EXAMPLES = [
@@ -72,9 +75,28 @@ class RerankRequest(BaseModel):
 
 class VideoRequest(BaseModel):
     model: str
+
     prompt: str
-    image: Optional[str] = None
+    negative_prompt: Optional[str] = None
+
+    image: Optional[str] = None  # 图生视频
+
     seed: Optional[int] = None
 
+    # response_format: Optional[str] = None # "mp4" fal
+
     class Config:
-        frozen = True
+        extra = "allow"
+
+        # frozen = True
+        # populate_by_name = True
+
+        json_schema_extra = {
+            "examples": [
+                {
+                    "model": "Wan-AI/Wan2.1-I2V-14B-720P-Turbo",
+                    "prompt": "画条狗",
+                    "image": "https://oss.ffire.cc/files/kling_watermark.png"
+                },
+            ]
+        }

meutils/serving/fastapi/exceptions/http_error.py

@@ -10,13 +10,7 @@ from starlette.responses import JSONResponse
 
 from fastapi.exceptions import RequestValidationError, HTTPException
 
-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/d1c7b67d-b0f8-4067-a2f5-109f20eeb696"
-)
+from meutils.notice.feishu import send_message_for_httpexception as send_message
 
 
 async def http_error_handler(_: Request, exc: HTTPException) -> JSONResponse:
@@ -42,7 +36,6 @@ async def general_exception_handler(request: Request, exc: Exception):
 
 
 async def chatfire_api_exception_handler(request: Request, exc: Exception):
-
     content = {
         "error":
             {
@@ -68,10 +61,37 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
 
     # send_message
     content_detail = f"{traceback.format_exc()}"
+    #
+    # from meutils.pipe import logger
+    # logger.debug(content_detail)
+
     if any(code in content_detail for code in {'451', }):
         content_detail = ""
 
-    send_message([content, content_detail])
+    send_message([content, content_detail], title=__name__)
+
+    # from meutils.pipe import logger
+    #
+    # try:
+    #
+    #     logger.debug(request.headers)
+    #     logger.debug(request.url)
+    #     logger.debug(request.method)
+    #     logger.debug(request.query_params._dict)
+    #
+    #     logger.debug(request.client)
+    #     logger.debug(request.cookies)
+    #
+    #     payload  = await request.body()
+    #
+    #     # send_message(payload, title=__name__)
+    #
+    #     logger.debug(payload)
+    #     logger.debug(payload)
+    #
+    #
+    # except Exception as e:
+    #     logger.debug(e)
 
     return reps or JSONResponse(
         content=content,