MeUtils 2025.4.18.14.53.20__py3-none-any.whl → 2025.4.19.13.52.36__py3-none-any.whl

meutils/llm/openai_polling/chat.py

@@ -7,6 +7,7 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
+import streamlit
 
 from meutils.pipe import *
 from meutils.io.files_utils import to_base64
@@ -34,12 +35,15 @@ class Completions(object):
     async def create(self, request: CompletionRequest):
 
         ###########################################################################
-
         # 开启视觉模型
         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",)):  # 仅支持base64
-                base64_list = await to_base64(urls, content_type="image/png")  ######## todo: tokens怎么计算的
+            if request.model.startswith(("gemini",)):
+                if urls[-1].startswith("http"):
+                    base64_list = await to_base64(urls, content_type="image/png")
+                else:
+                    base64_list = urls  # 仅支持base64 todo: tokens怎么计算的
+
                 request.messages = [
                     {
                         'role': 'user',
@@ -62,8 +66,8 @@ class Completions(object):
                     }
                 ]
             else:
-                # logger.debug('xxxxxxxx')
                 request.model = "glm-4v-flash"
+                request.max_tokens = None
                 self.client = zhipuai_client
         ###########################################################################
 
@@ -102,7 +106,7 @@ if __name__ == '__main__':
                 },
                 {
                     "image_url": {
-                        "detail": "auto",
+                        # "detail": "auto",
                         "url": "https://osshk.share704.com/file/upload/2025/04/14/1911575959253815296.jpg"
                     },
                     "type": "image_url"
@@ -110,6 +114,38 @@ if __name__ == '__main__':
             ]}
         ],
         stream=False,
-        max_tokens=8000,
+        max_tokens=None,
     )
-    arun(Completions().create(request))
+    # 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
+    }
+
+    # request = request.construct(**d)
+    from meutils.io.files_utils import to_url
+
+    # arun(to_url(request.last_urls.get("image_url")[-1], filename='x.jpeg'))
+
+    arun(Completions().create(request.construct(**d)))

meutils/notice/feishu.py

@@ -31,18 +31,18 @@ def send_message(
         url: str = DEFAULT,
         n: int = 1,
 ):
-    if any(i in str(content).lower() for i in {'重定向', 'pass'}):
-        return
+    logger.debug(f"数据类型：{type(content)}")
+    logger.debug(content)
 
     if any((content, title)):
 
         if isinstance(content, str):  # todo: post_process
             content = content.replace("<", "【").replace(">", "】")
             contents = [content]
-            # contents = [{"a": 1}]*3
 
         elif isinstance(content, (list,)):
             contents = list(map(bjson, content))
+            # logger.debug(bjson(contents))
 
         elif isinstance(content, (dict,)):
             contents = [bjson(content)]
@@ -63,7 +63,7 @@ def send_message(
                             "content": str(content),
                             "tag": "lark_md"
                         }
-                    } for content in contents if ";base64," not in (str(content))  # 忽略base64
+                    } for content in contents  # if ";base64," not in str(content)  # 忽略base64
                 ],
                 "header": {
                     "title": {
@@ -73,11 +73,14 @@ def send_message(
                 }
             }
         }
-        r = None
+
         for i in range(n):
             time.sleep(i ** 2)
-            r = httpx.post(url, json=message)
-        return r and r.text
+            r = httpx.post(url, json=message, timeout=30)
+            r.raise_for_status()
+
+            if r.status_code != 200 or r.json()['code'] != 0:
+                logger.debug(r.text)
 
 
 @decorator
@@ -118,8 +121,9 @@ if __name__ == '__main__':
     # send_message("xxx", title=None)
     send_message(None, title=None)
 
-    send_message_for_images("xxxxxxxx", title=None)
+    # send_message_for_images("xxxxxxxx", title=None)
 
+    send_message_for_try_catch("xxxxxxxx")
     # @catch(task_name='这是一个任务名')
     # def f():
     #     time.sleep(3)

meutils/schemas/oneapi/common.py

@@ -99,6 +99,9 @@ MODEL_PRICE = {
     "api-images-recraftv3": 0.1,
     "api-images-seededit": 0.1,
 
+    "seedream-3.0": 0.05,
+    "chat-seedream-3.0": 0.05,
+
     "seededit": 0.1,
     "chat-seededit": 0.1,
 
@@ -250,7 +253,8 @@ MODEL_PRICE = {
 
     "gpt-4-all": 0.1,
     "gpt-4o-all": 0.1,
-    "gpt-4o-image": 0.06,
+    "gpt-4o-image": 0.05,
+    "sora-image": 0.1,
 
     "gpt-4-gizmo-*": 0.1,
     "advanced-voice": 1,
@@ -616,6 +620,7 @@ MODEL_RATIO = {
     "doubao-1-5-thinking-pro-250415": 2,
     "doubao-1-5-thinking-pro-vision": 2,
     "doubao-1-5-thinking-pro-vision-250415": 2,
+    "doubao-1-5-thinking-pro-m-250415": 2,
 
     # 商汤 https://platform.sensenova.cn/pricing
     # https://platform.sensenova.cn/doc?path=/pricingdoc/pricing.md
@@ -1058,6 +1063,7 @@ COMPLETION_RATIO = {
     "doubao-1-5-thinking-pro-250415": 4,
     "doubao-1-5-thinking-pro-vision": 4,
     "doubao-1-5-thinking-pro-vision-250415": 4,
+    "doubao-1-5-thinking-pro-m-250415": 4,
 
     "deepseek-r1:1.5b": 4,
     "deepseek-r1-distill-qwen-1.5b": 4,
@@ -1317,7 +1323,7 @@ if __name__ == '__main__':
 
     option()
     # #
-    # arun(channel.edit_channel(MODEL_PRICE))
+    arun(channel.edit_channel(MODEL_PRICE))
 
     print(bjson({k: v * 6 for k, v in MODEL_RATIO.items() if k.startswith('claude')}))
     print([k for k in MODEL_RATIO if k.startswith('gpt-4.1')] | xjoin(","))

meutils/serving/fastapi/dependencies/headers.py

@@ -18,7 +18,7 @@ from typing import Dict, Optional
 #     return dict(request.headers)
 
 def get_headers(request: Request):
-    return request.headers
+    return dict(request.headers)
 
 # lambda request: dict(request.headers)
 # @app.get("/headers/")