MeUtils 2025.4.20.23.17.29__py3-none-any.whl → 2025.4.23.16.0.20__py3-none-any.whl

meutils/llm/completions/chat_spark.py

@@ -111,125 +111,126 @@ if __name__ == '__main__':
             #     ]
             # },
 
+            {
+                'role': 'user',
+                # "content": '你好',
+                # "content": [
+                #     {"type": "text", "text": "描述第一张图片"},
+                #
+                #     {"type": "image_url", "image_url": "https://oss.ffire.cc/files/kling_watermark.png"},
+                #     # {"type": "image_url", "image_url": "https://oss.ffire.cc/files/nsfw.jpg"}
+                #
+                # ],
+
+                # 'content': {
+                #     "type": "file_url",
+                #     "file_url": {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf", "detai": "auto"}
+                # },
+                # 'content': "https://oss.ffire.cc/files/%E6%8B%9B%E6%A0%87%E6%96%87%E4%BB%B6%E5%A4%87%E6%A1%88%E8%A1%A8%EF%BC%88%E7%AC%AC%E4%BA%8C%E6%AC%A1%EF%BC%89.pdf 这个文件讲了什么？",
+                # 'content': "https://translate.google.com/?sl=zh-CN&tl=en&text=%E6%8F%90%E4%BE%9B%E6%96%B9&op=tr1anslate 这个文件讲了什么？",
+
+                # "content": "https://oss.ffire.cc/files/百炼系列手机产品介绍.docx 总结下"
+                # "content": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"
+
+                # "content": "https://admin.ilovechatgpt.top/file/lunIMYAIzhinengzhushouduishenghuodocx_14905733.docx 总结",
+            "content": "http://admin.ilovechatgpt.top/file/xinjianMicrosoftWordwendangdoc-9052714901036-bGSJLeKbqQdnIZZn.doc 111111234234",
+
+            },
+            #
+            # {'role': 'assistant', 'content': "好的"},
+            #
             # {
             #     'role': 'user',
-            #     # "content": '你好',
+            #     # "content": '描述第一张图片',
             #     "content": [
             #         {"type": "text", "text": "描述第一张图片"},
             #
-            #         {"type": "image_url", "image_url": "https://oss.ffire.cc/files/kling_watermark.png"},
-            #         # {"type": "image_url", "image_url": "https://oss.ffire.cc/files/nsfw.jpg"}
+            #         {"type": "image_url", "image_url": "https://oss.ffire.cc/files/nsfw.jpg"}
             #
             #     ],
             #
-            #     # 'content': {
-            #     #     "type": "file_url",
-            #     #     "file_url": {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf", "detai": "auto"}
-            #     # },
-            #     # 'content': "https://oss.ffire.cc/files/%E6%8B%9B%E6%A0%87%E6%96%87%E4%BB%B6%E5%A4%87%E6%A1%88%E8%A1%A8%EF%BC%88%E7%AC%AC%E4%BA%8C%E6%AC%A1%EF%BC%89.pdf 这个文件讲了什么？",
-            #     # 'content': "https://translate.google.com/?sl=zh-CN&tl=en&text=%E6%8F%90%E4%BE%9B%E6%96%B9&op=tr1anslate 这个文件讲了什么？",
-            #
-            #     # "content": "https://oss.ffire.cc/files/百炼系列手机产品介绍.docx 总结下"
-            #     # "content": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"
-            #
-            #     # "content": "https://admin.ilovechatgpt.top/file/lunIMYAIzhinengzhushouduishenghuodocx_14905733.docx 总结"
-            #
             # },
+            # {
+            #     'role': 'user',
+            #     'content': [
+            #         {
+            #             "type": "text",
+            #             "text": "总结下"
+            #         },
             #
-            # {'role': 'assistant', 'content': "好的"},
-            #
+            #         {
+            #             "type": "image_url",
+            #             "image_url": "xx"
+            #         }
+            #     ]
+            # },
             # {
             #     'role': 'user',
-            #     # "content": '描述第一张图片',
-            #     "content": [
-            #         {"type": "text", "text": "描述第一张图片"},
+            #     'content': [
+            #         {
+            #             "type": "text",
+            #             "text": "总结下"
+            #         },
             #
-            #         {"type": "image_url", "image_url": "https://oss.ffire.cc/files/nsfw.jpg"}
+            #         {
+            #             "type": "image_url",
+            #             "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+            #         }
+            #     ]
+            # },
+            # {
+            #     'role': 'user',
+            #     'content': [
+            #         {
+            #             "type": "text",
+            #             "text": "总结下"
+            #         },
             #
-            #     ],
+            #         {
+            #             "type": "image_url",
+            #             "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+            #         }
+            #     ]
+            # },
+            # {
+            #     'role': 'assistant',
+            #     'content': "你好"
+            # },
+            # {
+            #     'role': 'user',
+            #     'content': [
+            #         {
+            #             "type": "text",
+            #             "text": "总结下"
+            #         },
             #
+            #         {
+            #             "type": "image_url",
+            #             "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+            #         }
+            #     ]
+            # },
+            # {
+            #     'role': 'assistant',
+            #     'content': "1"
+            # },
+            # {
+            #     'role': 'user',
+            #     'content': [
+            #         {
+            #             "type": "text",
+            #             "text": "总结1"
+            #         }
+            #     ]
+            # },
+            # {
+            #     'role': 'assistant',
+            #     'content': "2"
+            # },
+            # {
+            #     'role': 'user',
+            #     'content': "总结2"
             # },
-            {
-                'role': 'user',
-                'content': [
-                    {
-                        "type": "text",
-                        "text": "总结下"
-                    },
-
-                    {
-                        "type": "image_url",
-                        "image_url": "xx"
-                    }
-                ]
-            },
-            {
-                'role': 'user',
-                'content': [
-                    {
-                        "type": "text",
-                        "text": "总结下"
-                    },
-
-                    {
-                        "type": "image_url",
-                        "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
-                    }
-                ]
-            },
-            {
-                'role': 'user',
-                'content': [
-                    {
-                        "type": "text",
-                        "text": "总结下"
-                    },
-
-                    {
-                        "type": "image_url",
-                        "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
-                    }
-                ]
-            },
-            {
-                'role': 'assistant',
-                'content': "你好"
-            },
-            {
-                'role': 'user',
-                'content': [
-                    {
-                        "type": "text",
-                        "text": "总结下"
-                    },
-
-                    {
-                        "type": "image_url",
-                        "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
-                    }
-                ]
-            },
-            {
-                'role': 'assistant',
-                'content': "1"
-            },
-            {
-                'role': 'user',
-                'content': [
-                    {
-                        "type": "text",
-                        "text": "总结1"
-                    }
-                ]
-            },
-            {
-                'role': 'assistant',
-                'content': "2"
-            },
-            {
-                'role': 'user',
-                'content': "总结2"
-            },
             #     'content': [
             #         {
             #             "type": "text",

meutils/llm/openai_polling/chat.py

@@ -38,6 +38,10 @@ class Completions(object):
         if not any(i in request.model for i in ["vl", 'vision']) and (urls := request.last_urls.get("image_url")):
             # logger.debug(request)
             if request.model.startswith(("gemini",)):
+
+                # request.reasoning_effort
+                # "low", "medium", "high"
+
                 if urls[-1].startswith("http"):
                     base64_list = await to_base64(urls, content_type="image/png")
                 else:
@@ -77,6 +81,11 @@ class Completions(object):
             data.pop("frequency_penalty", None)
             data.pop("extra_body", None)
 
+            if "thinking" in request.model and request.reasoning_effort is None:
+                data['model'] = data['model'].removesuffix("-thinking")
+                data['reasoning_effort'] = None
+                # data['reasoning_effort'] = "low"
+
         return await self.client.chat.completions.create(**data)
 
 
@@ -116,22 +125,44 @@ if __name__ == '__main__':
         max_tokens=None,
     )
     # arun(Completions().create(request))
+    # d = {
+    #     "model": "gemini-2.5-pro-exp-03-25",
+    #     "messages": [
+    #         {
+    #             "content": [
+    #                 {
+    #                     "text": "The following is an open-ended problem from an International Math competition. Please calculate the answer according to the given requirements and the information provided. Please use LaTeX format to represent the variables and formulas used in the solution process and results. Please end your solution with \"So the final answer is \boxed{multiple answers connected with commas}(unit).\" and give the result explicitly, note that the unit of the answer should not be included in \boxed{}.\nConsider the following system of equations in which all logarithms have base 10:\n\n$$\n\begin{aligned}\n(\log x)(\log y)-3 \log 5 y-\log 8 x & =a \\n(\log y)(\log z)-4 \log 5 y-\log 16 z & =b \\n(\log z)(\log x)-4 \log 8 x-3 \log 625 z & =c\n\end{aligned}\n$$\nIf $a=-4, b=4$, and $c=-18$, solve the system of equations.",
+    #                     "type": "text"
+    #                 },
+    #                 {
+    #                     "image_url": {
+    #                         "detail": "low",
+    #                         "url": "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABAAEADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD//2Q=="
+    #                     },
+    #                     "type": "image_url"
+    #                 }
+    #             ],
+    #             "role": "user"
+    #         }
+    #     ],
+    #     "stream": False,
+    #     "top_p": 0.7,
+    #     "temperature": 0.7,
+    #     "n": 1
+    # }
+
     d = {
         "model": "gemini-2.5-pro-exp-03-25",
+        # "model": "gemini-2.5-pro-exp-03-25-thinking",
+
         "messages": [
             {
                 "content": [
                     {
-                        "text": "The following is an open-ended problem from an International Math competition. Please calculate the answer according to the given requirements and the information provided. Please use LaTeX format to represent the variables and formulas used in the solution process and results. Please end your solution with \"So the final answer is \boxed{multiple answers connected with commas}(unit).\" and give the result explicitly, note that the unit of the answer should not be included in \boxed{}.\nConsider the following system of equations in which all logarithms have base 10:\n\n$$\n\begin{aligned}\n(\log x)(\log y)-3 \log 5 y-\log 8 x & =a \\n(\log y)(\log z)-4 \log 5 y-\log 16 z & =b \\n(\log z)(\log x)-4 \log 8 x-3 \log 625 z & =c\n\end{aligned}\n$$\nIf $a=-4, b=4$, and $c=-18$, solve the system of equations.",
+                        "text": "9个8如何加减乘除运直得到1000",
                         "type": "text"
                     },
-                    {
-                        "image_url": {
-                            "detail": "low",
-                            "url": "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABAAEADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD//2Q=="
-                        },
-                        "type": "image_url"
-                    }
+
                 ],
                 "role": "user"
             }
@@ -139,7 +170,8 @@ if __name__ == '__main__':
         "stream": False,
         "top_p": 0.7,
         "temperature": 0.7,
-        "n": 1
+        "n": 1,
+        "reasoning_effort": None
     }
 
     # request = request.construct(**d)

meutils/schemas/oneapi/common.py

@@ -72,6 +72,10 @@ MODEL_PRICE = {
     "ppt": 0.1,
     "ppt-islide": 0.1,
 
+    # grok
+    "grok-3": 0.01,
+    "grok-3-image": 0.02,
+
     # 虚拟换衣fish
     "api-kolors-virtual-try-on": 0.1,
     "official-api-kolors-virtual-try-on": 0.8,
@@ -252,6 +256,7 @@ MODEL_PRICE = {
     "o3-mini": 0.05,
     "o3-mini-high": 0.1,
 
+    "o4-mini": 0.05 * 0.8,
     "o4-mini-high": 0.15 * 0.8,
 
     "gpt-4-all": 0.1,
@@ -849,6 +854,8 @@ MODEL_RATIO = {
     # 临时
     "ep-20240515073409-dlpqp": 5,
     "microsoft/phi-4": 0.035 * 5,
+    "mistral-small-3.1-24b-instruct": 0.1,
+    "mistral-small-24b-instruct-2501": 0.1,
 
     "meta-llama/Llama-3.2-11B-Vision-Instruct": 0.1,
 
@@ -1134,7 +1141,10 @@ COMPLETION_RATIO = {
     "step-1.5v-mini": 5,
     "step-1o-vision-32k": 5,
 
-    "meta-llama/Llama-3.2-11B-Vision-Instruct": 4
+    "meta-llama/Llama-3.2-11B-Vision-Instruct": 4,
+
+    "mistral-small-3.1-24b-instruct": 0.1,
+    "mistral-small-24b-instruct-2501": 3
 
 }
 

meutils/schemas/openai_types.py

@@ -116,6 +116,8 @@ class CompletionRequest(BaseModel):
     frequency_penalty: Optional[float] = None
     user: Optional[str] = None
 
+    reasoning_effort: Optional[Literal["low", "medium", "high"]] = None
+
     # 拓展字段
 
     def __init__(self, **kwargs):