MeUtils 2025.3.31.19.40.39__py3-none-any.whl → 2025.4.8.18.11.44__py3-none-any.whl

meutils/schemas/oneapi/common.py

@@ -633,6 +633,7 @@ MODEL_RATIO = {
     "anthropic/claude-3.5-sonnet:beta": 4,  # 1022
 
     "claude-3-7-sonnet-thinking": 1.5,
+    "claude-3-7-sonnet-20250219-thinking": 1.5,
     "claude-3-7-sonnet-latest": 1.5,
     "claude-3-7-sonnet-20250219": 1.5,
 
@@ -719,9 +720,12 @@ MODEL_RATIO = {
     "chatgpt-4o-latest": 2.5,
     "gpt-4o-realtime-preview": 2.5,
     "gpt-4o-realtime-preview-2024-10-01": 2.5,
-    "gpt-4o-audio-preview": 2.5 / 2,
+
     "gpt-4o-mini-audio-preview": 0.15 / 2,
+
+    "gpt-4o-audio-preview": 2.5 / 2,
     "gpt-4o-audio-preview-2024-12-17": 2.5 / 2,
+    "gemini-2.0-flash-audio": 0.15 / 2,
 
     "gpt-4o": 1.25,
     "gpt-4o-all": 2.5,  # 逆向
@@ -735,9 +739,10 @@ MODEL_RATIO = {
     "o1": 7.5,
     "o1-2024-12-17": 7.5,
 
-    "o1-mini": 1.5,
+    "o1-mini": 0.55,
+    "o1-mini-2024-09-12": 0.55,
+
     "o1-preview": 7.5,
-    "o1-mini-2024-09-12": 1.5,
     "o1-preview-2024-09-12": 7.5,
     "o3-mini": 0.55,
 
@@ -752,7 +757,8 @@ MODEL_RATIO = {
     "meta-llama/Llama-3.3-70B-Instruct": 2,
     "llama-3.3-70b-instruct": 2,
 
-    "hunyuan-a52b-instruct": 2.5,  # 10.5
+    "meta-llama/Llama-4-Scout-17B-16E-Instruct": 0.1,
+    "meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8": 0.2,
 
     # groq https://console.groq.com/docs/models
     "llama3-8b-8192": 0.01,
@@ -828,6 +834,12 @@ COMPLETION_RATIO = {
     "gpt-4o-realtime-preview-2024-10-01": 4,
     "gpt-4o-2024-11-20": 4,
 
+    "gpt-4o-mini-audio-preview": 4,
+
+    "gpt-4o-audio-preview": 4,
+    "gpt-4o-audio-preview-2024-12-17": 4,
+    "gemini-2.0-flash-audio": 4,
+
     # claude
     "claude-3-opus-20240229": 5,
     "anthropic/claude-3-opus:beta": 5,  # openrouter
@@ -845,6 +857,9 @@ COMPLETION_RATIO = {
     "llama-3.1-405b-instruct": 6,
     "meta-llama/Meta-Llama-3.1-405B-Instruct": 6,
 
+    "meta-llama/Llama-4-Scout-17B-16E-Instruct": 3,
+    "meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8": 3,
+
     "llama-3.3-70b-instruct": 4,
 
     "command": 4,
@@ -1212,5 +1227,7 @@ if __name__ == '__main__':
     from meutils.apis.oneapi import option, channel
 
     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')}))

meutils/schemas/openai_types.py

@@ -127,30 +127,43 @@ class CompletionRequest(BaseModel):
 
     @cached_property
     def last_user_content(self) -> str:
+        """text"""
         for i, message in enumerate(self.messages[::-1], 1):
             if message.get("role") == "user":
                 contents = message.get("content")
                 if isinstance(contents, list):
                     for content in contents:
-                        return content.get('text', "")
+                        if content.get("type") == "text":
+                            return content.get('text', "")
+
                 else:
                     return str(contents)
+        return ""
 
     @cached_property
     def last_assistant_content(self) -> str:
+        """text"""
         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', "")
+                        if content.get("type") == "text":
+                            return content.get('text', "")
                 else:
                     return str(contents)
+        return ""
 
     @cached_property
     def last_urls(self):  # file_url 多轮对话需要  sum(request.last_urls.values(), [])
         """最新一轮的 user url 列表"""
-        content_types = {"image_url", "file", "file_url", "video_url", "audio_url"}
+        content_types = {
+            "image_url",
+            "file", "file_url",
+            "audio_url", "input_audio",
+
+            "video_url",
+        }
         for i, message in enumerate(self.messages[::-1], 1):
             data = {}
             if message.get("role") == "user":  # 每一轮还要处理
@@ -159,11 +172,12 @@ class CompletionRequest(BaseModel):
                     for content in user_contents:
                         content_type = content.get("type")
                         if content_type in content_types:
+                            # logger.debug(content)
                             if _url := content.get(content_type, {}):  # {"type": "file", "file": fileid}
                                 if isinstance(_url, str):  # 兼容了spark qwenai
                                     url = _url
                                 else:
-                                    url = _url.get("url")
+                                    url = _url.get("url") or _url.get("data")
                                 url and data.setdefault(content_type, []).append(url)
 
             if data: return data
@@ -523,39 +537,52 @@ if __name__ == '__main__':
                 {},
                 {'role': 'user', 'content': '总结'}]
 
-    mesages = [{'role': 'system',
-                'content': 'undefined\n Current date: 2025-03-13'},
-               {'role': 'user',
-                'content': [{'type': 'text', 'text': '一句话总结'},
-                            {'type': 'image_url',
-                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
-               {},
-               {'role': 'user',
-                'content': [{'type': 'text', 'text': '一句话总结'},
-                            {'type': 'image_url',
-                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
-               {},
-               {'role': 'user',
-                'content': [{'type': 'text', 'text': '一句话总结'},
-                            {'type': 'image_url',
-                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
-               {},
-               {'role': 'user',
-                'content': [{'type': 'text', 'text': '一句话总结'},
-                            {'type': 'image_url',
-                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
-               {},
-               {'role': 'user',
-                'content': [{'type': 'text', 'text': '一句话总结'},
-                            {'type': 'image_url',
-                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
-               {},
-               {'role': 'user',
-                'content': [{'type': 'text', 'text': '一句话总结'},
-                            {'type': 'image_url',
-                             'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
-               {},
-               {'role': 'user', 'content': '总结'}]
+    messages = [{'role': 'system',
+                 'content': 'undefined\n Current date: 2025-03-13'},
+                {'role': 'user',
+                 'content': [{'type': 'text', 'text': '一句话总结'},
+                             {'type': 'image_url',
+                              'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+                {},
+                {'role': 'user',
+                 'content': [{'type': 'text', 'text': '一句话总结'},
+                             {'type': 'image_url',
+                              'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+                {},
+                {'role': 'assistant',
+                 'content': [{'type': 'text', 'text': '一句话总结'},
+                             {'type': 'image_url',
+                              'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+                {},
+                {'role': 'user',
+                 'content': [{'type': 'text', 'text': '一句话总结'},
+                             {'type': 'image_url',
+                              'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+                {},
+                {'role': 'user',
+                 'content': [{'type': 'text', 'text': '一句话总结'},
+                             {'type': 'image_url',
+                              'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'}]},
+                {},
+                {'role': 'user',
+                 'content': [
+                     {'type': 'image_url',
+                      'image_url': 'https://ai.chatfire.cn/files/images/uniacess删除-1741853464016-b176842ad.txt'},
+                     {
+                         "type": "input_audio",
+                         "input_audio": {
+                             "data": "base64_audio",
+                             "format": "wav"
+                         }
+                     },
+                     {'type': 'text', 'text': '一句话总结'},
+
+                 ],
+
+                 },
+                {},
+                # {'role': 'user', 'content': '总结'}
+                ]
     #
     # r = ChatCompletionRequest(model="gpt-3.5-turbo", messages=messages)
     # r.messages[-1]['content'] = [{"type": "image_url", "image_url": {"url": r.urls[-1]}}]
@@ -566,7 +593,10 @@ if __name__ == '__main__':
     # print(chat_completion_chunk_stop)
 
     # print(CompletionRequest(messages=messages).last_urls)
-    # print(CompletionRequest(messages=messages).last_user_content)
+    # print(CompletionRequest(messages=messages).last_urls)
 
-    print(chat_completion_chunk)
-    print(chat_completion)
+    # print(mesages)
+    print(CompletionRequest(messages=messages).last_assistant_content)
+
+    # print(chat_completion_chunk)
+    # print(chat_completion)

meutils/str_utils/regular_expression.py

@@ -21,7 +21,6 @@ HTML_PARSER = re.compile(r'```html(.*?)```', re.DOTALL)
 # re.sub(r'=(.+)', r'=123','s=xxxxx')
 
 
-
 @lru_cache()
 def remove_date_suffix(filename):
     """
@@ -61,7 +60,9 @@ def get_parse_and_index(text, pattern):
 
 
 @lru_cache()
-def parse_url(text: str, for_image=False):
+def parse_url(text: str, for_image=False, fn: Optional[Callable] = None):
+    fn = fn or (lambda x: x.removesuffix(")"))
+
     # url_pattern = r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+'
     url_pattern = r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+|#]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+'
 
@@ -92,6 +93,9 @@ def parse_url(text: str, for_image=False):
     valid_urls = []
     for url in urls:
         url = url.strip(r"\n")
+        if fn:
+            url = fn(url)  # lambda x: x.removesuffix(")")
+
         valid_urls.append(url)
 
     return valid_urls
@@ -149,7 +153,6 @@ if __name__ == '__main__':
     d = {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"}
     # print(parse_url(str(d)))
 
-
     text = "https://sc-maas.oss-cn-shanghai.aliyuncs.com/outputs/bb305b60-d258-4542-8b07-5ced549e9896_0.png?OSSAccessKeyId=LTAI5tQnPSzwAnR8NmMzoQq4&Expires=1739948468&Signature=NAswPSXj4AGghDuoNX5rVFIidcs%3D 笑起来"
 
     print(parse_url(text))