MeUtils 2025.3.19.19.13.35__py3-none-any.whl → 2025.3.21.10.18.9__py3-none-any.whl

meutils/llm/completions/chat_gemini.py

@@ -6,12 +6,16 @@
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  : 
+# @Description  :
+import asyncio
 
+import shortuuid
 
 from meutils.pipe import *
 from meutils.llm.openai_utils import to_openai_params
 from meutils.llm.clients import AsyncOpenAI
+from meutils.str_utils.regular_expression import parse_url
+from meutils.io.files_utils import to_url, markdown_base64_to_url
 
 from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, CompletionRequest, CompletionUsage
 
@@ -31,12 +35,18 @@ class Completions(object):
                  base_url: Optional[str] = None,
                  api_key: Optional[str] = None
                  ):
+
+        base_url = "https://api.aiguoguo199.com/v1"
+
         self.client = AsyncOpenAI(
             base_url=base_url,
             api_key=api_key,
         )
 
     async def create(self, request: CompletionRequest):
+        if request.model == "gemini-2.0-flash-exp-image-generation":
+            return await self.images_create(request)
+
         urls = sum(request.last_urls.values(), [])
         for url in urls:
             request.messages[-1]["content"].append({"type": "image_url", "image_url": {"url": url}})
@@ -44,20 +54,74 @@ class Completions(object):
         data = to_openai_params(request)
         return await self.client.chat.completions.create(**data)
 
+    async def images_create(self, request: CompletionRequest):
+
+        if request.last_assistant_content and (urls := parse_url(request.last_assistant_content)):
+            for message in request.messages[::-1]:
+                if message.get("role") == "assistant":
+                    message["content"] = [
+                        {"type": "image_url", "image_url": {"url": url.removesuffix(")")}} for url in urls
+                    ]
+
+        if urls := parse_url(request.last_user_content):  # 修正提问格式， 兼容 url
+            for message in request.messages[::-1]:
+                if message.get("role") == "user":
+                    message["content"] = [
+                        {"type": "image_url", "image_url": {"url": url.removesuffix(")")}} for url in urls
+                    ]
+                    message["content"] += [{"type": "text", "text": request.last_user_content}]
+
+        # 调用模型
+        logger.debug(request.model_dump_json(indent=4))
+
+        data = to_openai_params(request)
+        response = await self.client.chat.completions.create(**data)
+
+        if request.stream:
+            return self.stream_create(response)
+
+        else:
+            content = response.choices[0].message.content
+            response.choices[0].message.content = await markdown_base64_to_url(content)  # base64 转 url
+
+            if hasattr(response, "system_prompt"):
+                del response.system_prompt
+
+            return response
+
+    async def stream_create(self, chunks):
+        async for chunk in chunks:
+            if hasattr(chunk, "system_prompt"):
+                del chunk.system_prompt
+
+            if (content := chunk.choices[0].delta.content) and content.startswith("!["):
+                chunk.choices[0].delta.content = await markdown_base64_to_url(content)
+
+                yield chunk
+            else:
+                yield chunk
+            logger.debug(str(chunk))
+
 
 if __name__ == '__main__':
     url = "https://oss.ffire.cc/files/lipsync.mp3"
     url = "https://lmdbk.com/5.mp4"
     content = [
-        {"type": "text", "text": "总结下"},
+
+        {"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}}
+        # {"type": "video_url", "video_url": {"url": url}}
 
     ]
+
+    #
     request = CompletionRequest(
         # model="qwen-turbo-2024-11-01",
-        model="gemini-all",
+        # model="gemini-all",
+        model="gemini-2.0-flash-exp-image-generation",
         # model="qwen-plus-latest",
 
         messages=[
@@ -68,6 +132,9 @@ if __name__ == '__main__':
             },
 
         ],
-        stream=False,
+        stream=True,
     )
-    arun(Completions().create(request))
+
+    api_key = "sk-Q2XxJBh3KM7bTptL6e96E8596fC74426BaA87528867aA77b"
+
+    arun(Completions(api_key=api_key).create(request))

meutils/llm/completions/chat_plus.py

@@ -76,7 +76,7 @@ class Completions(object):
                     }
                 ]
                 data = to_openai_params(request)
-                return self.client.chat.completions.create(**data)
+                return await self.client.chat.completions.create(**data)
 
             elif guess_mime_type(file_url).startswith(("video", "audio")):  # 音频 视频
                 request.model = "gemini"  # 果果
@@ -98,7 +98,7 @@ class Completions(object):
                     }
                 ]
                 data = to_openai_params(request)
-                return self.client.chat.completions.create(**data)
+                return await self.client.chat.completions.create(**data)
 
             else:
 
@@ -111,18 +111,18 @@ class Completions(object):
                     }
                 ]
                 data = to_openai_params(request)
-                return self.client.chat.completions.create(**data)
+                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 self.client.chat.completions.create(**data)
+            return await self.client.chat.completions.create(**data)
 
         elif file_urls := request.last_urls.get("file_url"):
-            return self.chat_files(request)
+            return await self.chat_files(request)
 
         data = to_openai_params(request)
-        return self.client.chat.completions.create(**data)
+        return await self.client.chat.completions.create(**data)
 
     async def chat_files(self, request: CompletionRequest):  # 多轮
         for i, message in enumerate(request.messages[::-1], 1):
@@ -142,7 +142,7 @@ class Completions(object):
                     break  # 截断：从最新的文件开始
 
         data = to_openai_params(request)
-        return self.client.chat.completions.create(**data)
+        return await self.client.chat.completions.create(**data)
 
     async def create_images(self, request: CompletionRequest):
 
@@ -153,7 +153,13 @@ class Completions(object):
         )
         image_url = response.data[0].url
         tool_desc = """> images.generate\n\n"""
-        return tool_desc + f"![{request.last_user_content}]({image_url})"
+        tool_desc += f"![{request.last_user_content}]({image_url})"
+        if not request.stream:
+            chat_completion.choices[0].message.content = tool_desc
+            return chat_completion
+        return tool_desc
+
+    # chat_completion_chunk
 
     # async def create_videos(self, request: CompletionRequest):
     #
@@ -169,9 +175,9 @@ if __name__ == '__main__':
     c = Completions()
 
     request = CompletionRequest(
-        model="qwen-turbo-2024-11-01",
+        # model="qwen-turbo-2024-11-01",
         # model="claude-3-5-sonnet-20241022",
-        # model="gpt-4o-mini",
+        model="gpt-4o-mini",
 
         messages=[{
             'role': 'user',
@@ -181,10 +187,12 @@ if __name__ == '__main__':
                     "text": "总结下"
                 },
 
-                # {
-                #     "type": "image_url",
-                #     "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
-                # }
+                {
+                    "type": "file_url",
+                    "file_url": {
+                        "url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+                    }
+                }
             ]
         }])
 

meutils/llm/completions/chat_videos.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : chat_videos
+# @Time         : 2025/3/20 10:19
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+
+from meutils.pipe import *
+from meutils.llm.clients import AsyncOpenAI
+from meutils.apis.chatglm import glm_video_api  # VideoRequest, create_task, get_task
+from meutils.str_utils.regular_expression import parse_url
+
+from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, CompletionRequest, CompletionUsage
+
+
+class Completions(object):
+
+    def __init__(self,
+                 base_url: Optional[str] = None,
+                 api_key: Optional[str] = None
+                 ):
+        self.client = AsyncOpenAI(
+            base_url=base_url,
+            api_key=api_key,
+        )
+
+    async def create(self, request: CompletionRequest):
+
+        image_url = None
+        prompt = request.last_user_content
+        if urls := parse_url(prompt):
+            image_url = urls[0]
+            prompt = prompt.replace(image_url, "")
+
+        # 创建任务
+        video_request = glm_video_api.VideoRequest(image_url=image_url, prompt=prompt)
+        response = await glm_video_api.create_task(video_request)
+        taskid = response.id
+        system_fingerprint = response.system_fingerprint
+
+        # 获取任务
+        for i in f"""> VideoTask(id={taskid.split('-')[-1]}, image_url={image_url}, prompt={prompt})\n""":
+            await asyncio.sleep(0.03)
+            yield i
+
+        yield f"[🤫 任务进度]("
+        for i in range(60):
+            await asyncio.sleep(3)
+            response = await glm_video_api.get_task(taskid, system_fingerprint)
+
+            logger.debug(response)
+            if response.task_status == "SUCCESS" or response.video_result:
+                yield ")🎉🎉🎉\n\n"
+                for video in response.video_result or []:
+                    yield f"[^1]: [封面]({video.cover_image_url})\n\n"
+                    yield f"[^2]: [视频]({video.url})\n\n"
+
+                    yield f"[视频]({video.url})[^1][^2]\n\n"
+                    yield f"![视频]({video.url})[^1][^2]\n\n"
+
+                break
+            else:
+                yield "🔥"
+
+
+if __name__ == '__main__':
+    url = "https://oss.ffire.cc/files/lipsync.mp3"
+    url = "https://lmdbk.com/5.mp4"
+    content = [
+        {"type": "text", "text": "总结下"},
+        # {"type": "image_url", "image_url": {"url": url}},
+
+        {"type": "video_url", "video_url": {"url": url}}
+
+    ]
+    request = CompletionRequest(
+        # model="qwen-turbo-2024-11-01",
+        model="gemini-all",
+        # model="qwen-plus-latest",
+
+        messages=[
+            {
+                'role': 'user',
+
+                'content': content
+            },
+
+        ],
+        stream=False,
+    )
+    arun(Completions().create(request))

meutils/llm/completions/deep2x.py

@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : deepx
+# @Time         : 2025/3/20 08:53
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+"""
+deep + claude
+
+"""
+
+from openai import AsyncOpenAI
+
+from meutils.pipe import *
+from meutils.decorators.retry import retrying
+from meutils.io.files_utils import to_bytes
+from meutils.io.openai_files import file_extract, guess_mime_type
+from meutils.str_utils.json_utils import json_path
+from meutils.apis.search import metaso
+# from meutils.apis.chatglm import glm_video_api
+
+from meutils.llm.clients import chatfire_client, zhipuai_client, AsyncOpenAI
+from meutils.llm.openai_utils import to_openai_params
+
+from meutils.schemas.openai_types import ChatCompletionRequest
+from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, CompletionRequest, ImageRequest
+
+
+class Completions(object):
+
+    def __init__(self, api_key: Optional[str] = None):
+        self.api_key = api_key
+        self.client = AsyncOpenAI(api_key=api_key)
+
+    async def create(self, request: CompletionRequest):
+        """
+        :param request:
+        :return:
+        """
+        data = to_openai_params(request)
+        data['model'] = 'deepseek-reasoner'
+        data['max_tokens'] = 1  # 火山 支持max_tokens=1输出思维链
+        if request.stream:
+            reasoning_content = ""
+            completions = await chatfire_client.chat.completions.create(**data)
+            async for chunk in completions:
+                yield chunk
+                delta = chunk.choices[0].delta
+                if hasattr(delta, "reasoning_content"):
+                    reasoning_content += delta.reasoning_content
+
+            request.messages = [
+                {
+                    'role': 'user',
+                    'content': f"""<think>\n\n{reasoning_content}\n\n</think>\n\n{request.last_user_content}"""
+                }
+            ]
+            data = to_openai_params(request)
+            async for chunk in await self.client.chat.completions.create(**data):
+                yield chunk
+        else:
+            reasoning_content = ""
+            completions = await chatfire_client.chat.completions.create(**data)
+            message = completions.choices[0].message
+            if hasattr(message, "reasoning_content"):
+                reasoning_content += message.reasoning_content
+
+            request.messages = [
+                {
+                    'role': 'user',
+                    'content': f"""<think>\n\n{reasoning_content}\n\n</think>\n\n\n{request.last_user_content}"""
+                }
+            ]
+            data = to_openai_params(request)
+            _completions = await self.client.chat.completions.create(**data)
+            completions.choices[0].message.content = _completions.choices[0].message.content
+            yield completions
+
+    async def screate(self, request: CompletionRequest):
+        pass
+
+
+if __name__ == '__main__':
+    c = Completions()
+
+    request = CompletionRequest(
+        # model="qwen-turbo-2024-11-01",
+        # model="claude-3-5-sonnet-20241022",
+        model="deepseek-chat",
+        stream=True,
+
+        messages=[{
+            'role': 'user',
+            'content': "1+1"
+        }])
+
+    arun(c.create(request))

meutils/oss/__init__.py

@@ -8,13 +8,7 @@
 # @Software     : PyCharm
 # @Description  : 
 
-from meutils.pipe import *
 
 
-def upload(file: bytes, purpos="zhipu"):
-    from meutils.oss.minio_oss import Minio
-    from meutils.apis.chatglm.glm_video import upload_task
-
-    file_task = upload_task(file)
 
 

meutils/schemas/oneapi/common.py

@@ -425,7 +425,7 @@ MODEL_RATIO = {
     "qwen2.5-math-72b-instruct": 2,
     "qwen2.5-coder-32b-instruct": 0.5,
 
-    "qwq-32b": 2,
+    "qwq-32b": 1,
     "qwq-max": 2,
     "qwq-max-search": 2,
     "qwen-max-search": 2,
@@ -858,8 +858,8 @@ COMPLETION_RATIO = {
 
     "gemini-2.0-flash-lite-preview-02-05": 4,
 
-    "gemini-2.0-pro": 4,
-    "gemini-2.0-pro-exp-02-05": 4,
+    "gemini-2.0-pro": 5,
+    "gemini-2.0-pro-exp-02-05": 5,
 
     "gemma2-9b-it": 4,
     "gemma2-27b-it": 4,
@@ -871,6 +871,8 @@ COMPLETION_RATIO = {
     "qwen-turbo-2024-11-01": 3,
     "qwen/qwq-32b-preview": 3,
     "Qwen/QwQ-32B-Preview": 3,
+    "qwq-32b": 3,
+
     "qwq-32b-preview": 3,
     "qvq-72b-preview": 3,
 

meutils/schemas/openai_types.py

@@ -121,9 +121,6 @@ class CompletionRequest(BaseModel):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-    class Config:
-        extra = "allow"
-
     @cached_property
     def last_message(self):
         return self.messages and self.messages[-1]
@@ -132,12 +129,23 @@ class CompletionRequest(BaseModel):
     def last_user_content(self) -> str:
         for i, message in enumerate(self.messages[::-1], 1):
             if message.get("role") == "user":
-                user_contents = message.get("content")
-                if isinstance(user_contents, list):
-                    for content in user_contents:
+                contents = message.get("content")
+                if isinstance(contents, list):
+                    for content in contents:
                         return content.get('text', "")
                 else:
-                    return str(user_contents)
+                    return str(contents)
+
+    @cached_property
+    def last_assistant_content(self) -> str:
+        for i, message in enumerate(self.messages[::-1], 1):
+            if message.get("role") == "assistant":
+                contents = message.get("content")
+                if isinstance(contents, list):
+                    for content in contents:
+                        return content.get('text', "")
+                else:
+                    return str(contents)
 
     @cached_property
     def last_urls(self):  # file_url 多轮对话需要  sum(request.last_urls.values(), [])
@@ -180,6 +188,24 @@ class CompletionRequest(BaseModel):
     #
     #     return message
 
+    class Config:
+        extra = "allow"
+
+        json_schema_extra = {
+            "examples": [
+                {
+                    "model": "deepseek-chat",
+                    "messages": [
+                        {
+                            "role": "user",
+                            "content": "hi"
+                        }
+                    ],
+                    "stream": True
+                },
+            ]
+        }
+
 
 class ChatCompletionRequest(BaseModel):
     """

meutils/str_utils/regular_expression.py

@@ -20,6 +20,8 @@ HTML_PARSER = re.compile(r'```html(.*?)```', re.DOTALL)
 
 # re.sub(r'=(.+)', r'=123','s=xxxxx')
 
+
+
 @lru_cache()
 def remove_date_suffix(filename):
     """
@@ -152,6 +154,8 @@ if __name__ == '__main__':
 
     print(parse_url(text))
 
+    print(parse_url("[](https://oss.ffire.cc/cdn/2025-03-20/YbHhMbrXV82XGn4msunAJw)"))
+
     # print('https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\\n\\n'.strip(r"\n"))
 
     # print(parse_url("http://154.3.0.117:39666/docs#/default/get_content_preview_spider_playwright_get"))