MeUtils 2025.5.14.16.46.40__py3-none-any.whl → 2025.5.27.14.55.19__py3-none-any.whl

meutils/llm/completions/qwenllm.py

@@ -34,7 +34,6 @@ base_url = "https://chat.qwen.ai/api"
 from fake_useragent import UserAgent
 
 ua = UserAgent()
-cookie="_gcl_au=1.1.1784604298.1740443944; cna=KP9DIEqqyjUCATrw/+LjJV8F; _bl_uid=LXmp28z7dwezpmyejeXL9wh6U1Rb; cnaui=310cbdaf-3754-461c-a3ff-9ec8005329c9; aui=310cbdaf-3754-461c-a3ff-9ec8005329c9; x-ap=ap-southeast-1; sca=43897cb0; xlly_s=1; acw_tc=0a03e56417472095089155840e4e574acbd40c39a21ce666c960987382db60; token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImV4cCI6MTc0OTgwMTUxN30.nbaFZ52NvV-4H4ADG67PAjBIjrfKg6rASaIXpGNzotc; x5sec=7b22733b32223a2237386636303338646236626336396135222c227466652d636c6f75643b32223a223330376232663533623638383863316362363164373062363764313730306434434c75626b634547454f4c52737055424d4b66326e6133362f2f2f2f2f77453d227d; SERVERID=4e5d49f8b8c4de74d3e582effa08efe1|1747210060|1747192080; atpsida=c71f340a491f3cce3e3eac74_1747210060_3; tfstk=gDVmWYm8i0tBFWI-e7GfKQDSk3WRqjGslldtXfnNU0o7MlBjX8ca8kDtQtwYqcmrWZwOlflyz2ikgI71c70r8koZ3KkZaUo-J-eAhA5zz2ZL6Ck4s8OgRPNAlfQjGrGs_MId9R4blfapfz5Lsblr7qftuxJqGbWc57xO96Ubu8oYIx1L64q7w0oZ_xkw43oSJVuabAuya0gs7nuwgaboV2x2QfoqaQuiRfoabf7uz0gi_VrZ_fkW_DVaN7SWLnccpRYQ4qDmYro4kyFPlYJbW0Aw_72oBD5KqCRaZq4Rnoceg6mzHRPxaSSyXbzQeouot1YirJ4rgqq1OIG48zyZn5X9RcwuzJHuFEQjrS43s2DPZ3unK7PxG8jH9Dy775DzlMvIyRzLMRqAVCoYKzrop7KJ9bP0mSkoTgkDUpS5pCgPW7J6CxuSrDeV61GDG-hhDabkdtMqPqIdrav6kxuSrDQlrpTZ34gAv; isg=BMDAlP-3vKe5UE86-2l73onAkUiSSaQTo_fIsTpTDltitWrf7l0Ho-HDzR11BVzr; ssxmod_itna=iqGxRDuQqWqxgDUxeKYI5q=xBDeMDWK07DzxC5750CDmxjKidKDUGWubFP=eODglD2PbK9lY5D/f0GeDZDGKQDqx0ob0KjhitD9ehDw3HW8YRw3gzBTox63aTDo4QY=0DOldLLnzLtbDnne+DibDBKDnx4DjpuFDeeaDCeDQxirDD4DAlYD0cg+GDDd7KOpO4YYYt2+74GWG7YdGDGCc4Gtp/OA747PZtxDBr3DaOA31t4DExGO3q4d74Gacf+RDlIhDm4bbzZcDCKX53RQkSoAGA=rqWyDmjarmCHP4OWxY0cM9ahxNQDHe4Ti0K7DH3+tB4HRrtz5894DGRrArQeOdqA4dnkhkCKfCm7q1xNwQtkxxZGdGhdk0QgGNg75ZGNeGdumoQBxNisZGxKDzegx4D; ssxmod_itna2=iqGxRDuQqWqxgDUxeKYI5q=xBDeMDWK07DzxC5750CDmxjKidKDUGWubFP=eODglD2PbK9lGeDAYZGDqD9i8TP4DFgo4f4yQB2DDlaPrasYl/GSIjQlFhxcYO=09GcBzhgnDC7qCFh8PPOGCYBKQQQG1aacPaCHPoKKxyoeaR7vQKSWFpxuOl2g1n1OPYWKwAO0qz6O49xEaEomH=l54na7UyhApqGkvamKQ083kWacqL3hpRSYmV=QURgeFqTpNTF2WOpcHomFGf2fk0ajtWc3xtdLkYBn1xhakW6DqtRHaqs9jqvAv746sxIwPfuBwU2KI7o6xYv7ezBP27oyPfg=Q0xrllEuaQZ6oOjEtf6rhP/aY4FxvlPq85qjokrYAabgAfPKIR7DVPRRChzO5Vr5qAwMYPnmpy1Auj6t329ovh=Iixqga2==KhK24C6egt9nqLWRyaeDZvx=ExD=OZPv7AWK39UikaIQ7oCgATKIXW3DOpaZ5KgvY4=Utyf6uYINC=oho6xzAipN4TEBzn1OEZPhok6+pXVjhvAOv/AtMgv4njQEPr9=QiDuTgaUM456FQhz69aKBAn=m6e10OgbDZGHIGMOXPfDEU6qoLtOYozdXj5ynI=Y9DRcyojI52PfY/RO/SGFqYUBPhpAbhGQkDy0cQq5UyNSaRt6j5DTBr1HOfpjhemqVhtmYsK80TQbMp3Hw9BerDL2ix+klsArI6=TxCEiEmN0K4YxGhQ+S0KGBDmKrG6BdCYGiDmBkl5tAYbFeDwleHTTWh4BWQwkRKCGmP4AWZemD8i7EAW5WG7DmGSi+Iy3/GwHkj35D4lGf47eejxkxKxuE0DaBG0KkiI1DY4k0DbOKA5dD7lOzpz6PkO4lPfuKieqGb+v8qxmqMiNmw/hQRDBgztPxYrYDD"
 
 thinking_budget_mapping = {
     "low": 1000,
@@ -42,15 +41,19 @@ thinking_budget_mapping = {
     "high": 24000
 }
 
+COOKIE = """
+cna=KP9DIEqqyjUCATrw/+LjJV8F; _bl_uid=LXmp28z7dwezpmyejeXL9wh6U1Rb; cnaui=310cbdaf-3754-461c-a3ff-9ec8005329c9; aui=310cbdaf-3754-461c-a3ff-9ec8005329c9; x-ap=ap-southeast-1; sca=43897cb0; acw_tc=0a03e53417483123807755658e597c5e3685457054f2ca60a0a8d87b657874; _gcl_au=1.1.106229673.1748312382; xlly_s=1; token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImV4cCI6MTc1MDkwNDU2MH0.nV7I1sp6rAE0QnqXYKNm4I0vLZmA-TdOKWEHg_37_tw; SERVERID=1e5b6792fa61468bae321990103ad502|1748312579|1748312380; atpsida=0450727e7c9d8a7299a0b2bd_1748312579_5; ssxmod_itna=iqGxRDuQqWqxgDUxeKYI5q=xBDeMDWK07DzxC5750CDmxjKidKDUGQN0bFP=jhWOGxDkYCA+UQSD0HPKmDA5DnGx7YDtr4FN4SeKhDwIa78YRwwHQiGoh=LTX90w=3qflZqcj1T3xoD==hYDmeDUxD1GDDkS0PDxOPD5xDTDWeDGDD3t4DCCfYYD0RpiboIVxRhTABpDYPYPR4YDY56DAqEz4SpVaxXTDDzw4iaPf4vwDi8D7FRG0RpD7P6fmQDXaYDEAWmFk=Dv6Lh+QwI1/oYOyyDc=DoCO0Km0DTVj2qPGGiU5eiBdnNC4490i+yte+in2MWYHDDW=4=5rzqDxKGe1qC+LimweRk5yxmLhdYY4KGYqOqIheUk5ZB5x2QgohQBxN7spmxFezNiDD; ssxmod_itna2=iqGxRDuQqWqxgDUxeKYI5q=xBDeMDWK07DzxC5750CDmxjKidKDUGQN0bFP=jhWOGxDkYCA+UQmDDpU3qY6obeDLWr7pfFyiDDsa7QaIhEVl4FKFerBUoQiRQlSzS+caiWpDOqz2HrsO6xFOwpKsSOYH0Q0WwhDs0Ye1mah+b99w34Im3AYwt4oztFoQ7xBhThYqatKQWcgkRDBDCOiLViK62z51rnpzpbHH7pFpS=Y4zfHiWfozYCf+9FcGmRMsMEYFGRP+TgG9EbEi3Khm0lQmt2AL=quK6RomKnFmmpjzYzxHQ/QEK0AAa3qGPOl3crGu7DDpQnxjfEEgWD/oEHaE4l6jOpKp6DI6P=vQa39gN6h5i3R5eInP2Gob9pY7DKDr3lYiTZrC3R2Yiz/rsFIG1j5n=2=DD3=obLGPQsWnOZWSinlZ=KjKGpIwRPKn3jpohCU+2PciIEehVxTSnioeIx6xdp91zK29tHtN2Zcgi0clGNaY4jIenYlnw+/Qlapjg6Qho=3E/2v3mIjaYygren01ebwPI4EKgDY+4NyiTXYmU+o/lGSogI=GT/38rPOnA5mjuDg2Ub=+HtTjKnpYoEaTvwj3K0GI7FKARVAv=Wojxe0nHRBwhrQIa1vMpv5pfQ8LGCXGp=lZ3Q8v+6=lSfexroPjNP9MvyNVAXQhnKvyAwT/KEsgh/eOdqx0YiHaP1kwxzsu54i4eGiQDshEOQoiRlPBqiDiSRDQay2k1x4xWDhpBTjqZ0Neer0qlDK0YbDpBYKxSGDD; tfstk=gy8S5jal7pL47z_LOgc4laG38cQQOjuaeW1psBUz9aQRdW9e6MCzzbxBcpJ5eU7-ZoUBQpYrZMdRRipBCgUKqMCvlpJBzkd82-QvQ1KUpv4LH-C1yMxPLTWCRBvsgAuZ7QAl-akZQVyg4ccA76BdpJPAkw5IYeMoXQAl-SDk9fRkZW1NLUsRJpQAD1CRJkB8yjsAs1bLyMU8D-BcHwCdvTQAk61dpkIJpIhfttBdJgpdkj1n_yV1O06kNbzD-uH4ifA5hyUplsHhpQig5_8lNgW9wUwzUXf5VOdRhAjyDMIBFgTqPRfWDC9PNp0graIB2hQJRAg5kCx2es9KCk6vfUYCbUM_jTLlKd_JcxU5JaK95wQIf7f2PILGAUD7kT9DMh7kWx4BBIRwriYIC-BH41bANnGLDTId4azNCak3ASsgRs6ZGjZ3xSw1l2pVr0vc2sf50jGbeHjRis1mGjZ3xgCcN_GjG8Kh.; isg=BOrqXB6_dpCyTPX0tTuBOG9yO1aMW261hQXS_3ShLD3Op4xhWOtyxWGRN9O7V-ZN
+""".strip()
+
 
 @retrying()
-async def to_file(file, api_key):
+async def to_file(file, api_key, cookie: Optional[str] = None):
     qwen_client = AsyncOpenAI(
         base_url="https://all.chatfire.cn/qwen/v1",
         api_key=api_key,
         default_headers={
             'User-Agent': ua.random,
-            'Cookie': cookie
+            'Cookie': cookie or COOKIE
         }
     )
     filename = Path(file).name if isinstance(file, str) else 'untitled'
@@ -62,7 +65,8 @@ async def to_file(file, api_key):
     return file_object
 
 
-async def create(request: CompletionRequest, token: Optional[str] = None):  # ChatCompletionRequest 重构
+async def create(request: CompletionRequest, token: Optional[str] = None, cookie: Optional[str] = None):
+    cookie = cookie or COOKIE
 
     if request.temperature > 1:
         request.temperature = 1
@@ -77,9 +81,6 @@ async def create(request: CompletionRequest, token: Optional[str] = None):  # Ch
         default_headers={
             'User-Agent': ua.random,
             'Cookie': cookie,
-            "bx-v": "2.5.28",
-            "bx-umidtoken": "T2gAeo1Mqj6q05L65Ro3Hjf9KHuOsB63ttVeMP_-13M2-R82AvHnHe-o9nAbz7J8Si4=",
-            "x-request-id": "08cb2785-53d2-4c6d-a24c-069cf0303d1a"
         }
     )
     # qwen结构
@@ -118,13 +119,13 @@ async def create(request: CompletionRequest, token: Optional[str] = None):  # Ch
             for i, content in enumerate(user_content):
                 if content.get("type") == 'file_url':  # image_url file_url video_url
                     url = content.get(content.get("type")).get("url")
-                    file_object = await to_file(url, token)
+                    file_object = await to_file(url, token, cookie)
 
                     user_content[i] = {"type": "file", "file": file_object.id}
 
                 elif content.get("type") == 'image_url':
                     url = content.get(content.get("type")).get("url")
-                    file_object = await to_file(url, token)
+                    file_object = await to_file(url, token, cookie)
 
                     user_content[i] = {"type": "image", "image": file_object.id}
 
@@ -133,7 +134,7 @@ async def create(request: CompletionRequest, token: Optional[str] = None):  # Ch
 
             user_content = [{"type": "text", "text": user_content}]
 
-            file_object = await to_file(file_url, token)
+            file_object = await to_file(file_url, token, cookie)
 
             content_type = file_object.meta.get("content_type", "")
             if content_type.startswith("image"):
@@ -260,11 +261,11 @@ if __name__ == '__main__':
                 'role': 'user',
                 # 'content': '今天南京天气',
                 # 'content': "9.8 9.11哪个大",
-                # 'content': 'https://oss.ffire.cc/files/AIGC.pdf 总结下',
+                'content': 'https://oss.ffire.cc/files/AIGC.pdf 总结下',
 
                 # "chat_type": "search",
 
-                'content': user_content,
+                # 'content': user_content,
 
                 # "content": [
                 #     {
@@ -330,8 +331,6 @@ if __name__ == '__main__':
 
     token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImV4cCI6MTc0ODQ3OTE0M30.oAIE1K0XA0YYqlxB8Su-u0UJbY_BBZa4_tvZpFJKxGY"
 
-    # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjEwNzY1N2Y1LTgxN2ItNDg5Yi1iNjk4LWFhZjAyM2EwZTE4MyIsImV4cCI6MTc0NjI5NTAwNH0.D1uJN44NHiEt6URce4upbHvs7v73_Vd0V1s3T_JzclI"
     arun(create(request, token))
-    # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjEwNzY1N2Y1LTgxN2ItNDg5Yi1iNjk4LWFhZjAyM2EwZTE4MyIsImV4cCI6MTc0NjI5NTAwNH0.D1uJN44NHiEt6URce4upbHvs7v73_Vd0V1s3T_JzclI"
 
     # arun(to_file("https://oss.ffire.cc/files/kling_watermark.png", token))

meutils/llm/completions/xx.py

@@ -10,52 +10,7 @@
 
 from meutils.pipe import *
 
-# ResponseT = TypeVar(
-#     "ResponseT",
-#     bound=Union[
-#         object,
-#         str,
-#         None,
-#         "BaseModel",
-#         List[Any],
-#         Dict[str, Any],
-#         Response,
-#         ModelBuilderProtocol,
-#         "APIResponse[Any]",
-#         "AsyncAPIResponse[Any]",
-#         "HttpxBinaryResponseContent",
-#     ],
-# )
-
-payload = {
-    "messages": [
-        {
-            "role": "user",
-            "content": "hi"
-        }
-    ],
-    "use_search": False,
-    "extend": {
-        "sidebar": True
-    },
-    "kimiplus_id": "kimi",
-    "use_research": False,
-    "use_math": False,
-    "refs": [],
-    "refs_file": []
-}
-
-from openai import OpenAI
-
-client = OpenAI(
-    base_url="https://kimi.moonshot.cn",
-    api_key="eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ1c2VyLWNlbnRlciIsImV4cCI6MTczOTY4NDk3NywiaWF0IjoxNzMxOTA4OTc3LCJqdGkiOiJjc3RkYXNmZDBwODBpaGtkNTY4ZyIsInR5cCI6ImFjY2VzcyIsImFwcF9pZCI6ImtpbWkiLCJzdWIiOiJja2kwOTRiM2Flc2xnbGo2Zm8zMCIsInNwYWNlX2lkIjoiY2tpMDk0YjNhZXNsZ2xqNmZvMmciLCJhYnN0cmFjdF91c2VyX2lkIjoiY2tpMDk0YjNhZXNsZ2xqNmZvMzAifQ.uhEQ3sB6SJLR_Duuu4w-WilRsvllI611flQ_uQoI5ufm_GWtLLJfHZ8rE9-RS2YtkprtYovvEf1U1E6ybcL1Jg"
+# from meutils.apis
+r = storage_to_cookie(
+    "cookies.json"
 )
-# "https://kimi.moonshot.cn/api/chat/ctb5lpaflk1f1dda5mv0/completion/stream"
-resp = client.post(
-    "/api/chat/ctb5lpaflk1f1dda5mv0/completion/stream",
-    cast_to=object,
-    body=payload,
-    stream=True
-)
-

meutils/llm/openai_polling/chat.py

@@ -72,7 +72,7 @@ class Completions(object):
                 self.client = zhipuai_client
 
         elif "deepseek-r" in request.model:
-            request.separate_reasoning = True
+            request.separate_reasoning = True  # pp
         ###########################################################################
 
         data = to_openai_params(request)
@@ -82,7 +82,7 @@ class Completions(object):
             data.pop("frequency_penalty", None)
             data.pop("extra_body", None)
 
-            if not request.reasoning_effort:  # 默认关闭思考
+            if '2.5' in request.model and not request.reasoning_effort:  # 默认关闭思考
                 data['reasoning_effort'] = "none"
 
             if "thinking" in request.model:

meutils/office_automation/pdf.py

@@ -56,10 +56,46 @@ def doc2text(filename):
     pass
 
 
+def extract_images_from_pdf(file, output: Optional[str] = None):
+    import fitz
+
+    # 打开PDF文件
+
+    pdf_document = fitz.open(file)
+
+    # 遍历每一页
+
+    for page_number in range(pdf_document.page_count):
+
+        page = pdf_document.load_page(page_number)
+
+        image_list = page.get_images(full=True)
+
+        # 遍历每个图像
+
+        for image_index, img in enumerate(image_list):
+            xref = img[0]
+
+            base_image = pdf_document.extract_image(xref)
+
+            image_bytes = base_image["image"]
+
+            image_ext = base_image["ext"]
+
+            image_filename = f"{output or ''}/image{page_number + 1}_{image_index + 1}.{image_ext}"
+            Path(image_filename).parent.mkdir(parents=True, exist_ok=True)
+
+            # 将图像写入文件
+
+            with open(image_filename, "wb") as image_file:
+                image_file.write(image_bytes)
+
+
 if __name__ == '__main__':
     with timer():
-       r = extract_text('x.pdf')
+        # r = extract_text('x.pdf')
 
+        r = extract_images_from_pdf('《锋利的jQuery》(高清扫描版-有书签)_副本_加水印.pdf', 'images')
 
     # import tiktoken
-    # print(tiktoken.encoding_for_model('gpt-3.5-turbo'))
+    # print(tiktoken.encoding_for_model('gpt-3.5-turbo'))

meutils/pipe.py

@@ -390,4 +390,7 @@ data: [DONE]"""
 
     # print()
 
-    sse.splitlines() | xsse_parser(skip_strings=['DONE', 'TRACEID']) | xprint
+    # sse.splitlines() | xsse_parser(skip_strings=['DONE', 'TRACEID']) | xprint
+
+
+    a = [[{"a":1}]] | xgroup(2)

meutils/schemas/dreamfaceapp_types.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : dreamfaceapp_types
+# @Time         : 2025/5/23 13:42
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+

meutils/schemas/oneapi/common.py

@@ -66,8 +66,6 @@ MODEL_PRICE = {
     "minimax_video-01": MINIMAX_VIDEO,
     "minimax_video-01-live2d": MINIMAX_VIDEO,
 
-    # free
-
     # chatfire
     "ppu-0001": 0.0001,
     "ppu-001": 0.001,
@@ -93,10 +91,12 @@ MODEL_PRICE = {
     "api-kolors-virtual-try-on": 0.1,
     "official-api-kolors-virtual-try-on": 0.8,
 
-    # 语音克隆
+    # audio 语音克隆
     "official-api-fish-model": 0.1,
     "official-api-fish-tts": 0.01,
 
+    "tts-pro": 0.03,
+
     # 官方api
     "official-api-cogvideox": 0.1,
     "official-api-kling-image": 0.02,
@@ -179,6 +179,7 @@ MODEL_PRICE = {
     "flux-pro": 0.05,
     "flux-pro-max": 0.1,
     "flux.1.1-pro": 0.1,
+    "flux1.1-pro": 0.1,
     "black-forest-labs/flux.1.1-pro": 0.1,
 
     "step-1x-medium": 0.2,
@@ -412,9 +413,6 @@ MODEL_RATIO = {
     'baichuan3-turbo-128k': 12,
     'baichuan2-turbo': 4,
 
-    "claude-3-5-haiku-20241022": 0.5,
-    "anthropic/claude-3-5-haiku-20241022:beta": 0.5,
-
     # grok
     "grok-2": 1,
     "grok-2-1212": 1,
@@ -506,6 +504,7 @@ MODEL_RATIO = {
     "qwen3-32b": 1,
     "qwen3-30b-a3b": 0.75,
     "qwen3-235b-a22b": 2,
+    "qwen-math-plus": 2,
 
     "qwq-32b": 1,
     "qwq-plus": 0.8,
@@ -663,10 +662,13 @@ MODEL_RATIO = {
     "doubao-1-5-pro-thinking": 2,
 
     "doubao-1-5-vision-thinking": 2,
+    "doubao-1-5-thinking-vision-pro-250428": 1.5,
+
     "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,
+    "doubao-1-5-thinking-pro-m-250428": 2,
 
     # 商汤 https://platform.sensenova.cn/pricing
     # https://platform.sensenova.cn/doc?path=/pricingdoc/pricing.md
@@ -708,6 +710,11 @@ MODEL_RATIO = {
     "tts-1-hd-1106": 15,
     "whisper-1": 15,
 
+    # claude
+
+    "claude-3-5-haiku-20241022": 0.5,
+    "anthropic/claude-3-5-haiku-20241022:beta": 0.5,
+
     "claude-3-haiku-20240307": 0.125,
     "claude-3-sonnet-20240229": 1.5,
 
@@ -727,6 +734,11 @@ MODEL_RATIO = {
 
     "claude-3-7-sonnet-20250219": 1.5,
 
+    "claude-sonnet-4-20250514": 1.5,
+    "claude-sonnet-4-20250514-thinking": 1.5,
+    "claude-opus-4-20250514": 7.5,
+    "claude-opus-4-20250514-thinking": 7.5,
+
     "deepclaude": 1.5,
     "deep-claude": 1.5,
 
@@ -770,6 +782,7 @@ MODEL_RATIO = {
     "gemini-2.0-flash-thinking-exp-01-21": 0.075,
 
     "gemini-2.5-flash-preview-04-17": 0.075,
+    "gemini-2.5-flash-preview-05-20": 0.075,
 
     "gemini-2.0-pro": 0.625,
     "gemini-2.0-pro-exp": 0.625,
@@ -789,13 +802,14 @@ MODEL_RATIO = {
     "gemini-pro-vision": 1,
     "gemini-ultra": 1,
 
-    "gemini-2.5-flash-thinking": 0.15,
-    "gemini-2.5-flash-preview-04-17-thinking": 0.15 * 2,
-    "gemini-2.5-pro-thinking": 0.625 * 2,
-    "gemini-2.5-pro-exp-03-25-thinking": 0.625 * 2,
-    "gemini-2.5-pro-preview-03-25-thinking": 0.625 * 2,
+    "gemini-2.5-flash-thinking": 0.075,
+    "gemini-2.5-flash-preview-04-17-thinking": 0.075,
+    "gemini-2.5-flash-preview-05-20-thinking": 0.075,
+    "gemini-2.5-pro-thinking": 0.625,
+    "gemini-2.5-pro-exp-03-25-thinking": 0.625,
+    "gemini-2.5-pro-preview-03-25-thinking": 0.625,
 
-    "gemini-thinking": 0.625 * 2,  # 逆向
+    "gemini-thinking": 0.625,  # 逆向
 
     "gpt-3.5-turbo": 0.75,
     "gpt-3.5-turbo-0125": 0.25,
@@ -830,6 +844,7 @@ MODEL_RATIO = {
     "gpt-4o-all": 2.5,  # 逆向
     "gpt-4o-2024-05-13": 1.25,
     "gpt-4o-mini": 0.075,
+    "gpt-4o-mini-tts": 0.3,
     "gpt-4o-mini-2024-07-18": 0.075,
     "gpt-4o-2024-08-06": 1.25,
     "gpt-4o-2024-11-20": 1.25,
@@ -875,6 +890,8 @@ MODEL_RATIO = {
     "llama-3.1-8b-instant": 0.01,
     "llama-3.1-70b-versatile": 3,
 
+    "llama-vision": 0.1,
+
     # sili
     "gemma2-9b-it": 0.1,
     "gemma2-27b-it": 0.5,
@@ -947,9 +964,6 @@ COMPLETION_RATIO = {
     "grok-3-mini-beta": 5 / 3,
     "grok-3-mini-fast-beta": 4 / 0.6,
 
-    "claude-3-5-haiku-20241022": 5,
-    "anthropic/claude-3-5-haiku-20241022:beta": 5,
-
     "gpt-4-all": 4,
     "gpt-4-gizmo-*": 4,
     "gpt-4o-all": 4,
@@ -967,6 +981,7 @@ COMPLETION_RATIO = {
     "gpt-4o-2024-11-20": 4,
 
     "gpt-4o-mini-audio-preview": 4,
+    "gpt-4o-mini-tts": 20,
 
     "gpt-4o-audio-preview": 4,
     "gpt-4o-audio-preview-2024-12-17": 4,
@@ -981,6 +996,9 @@ COMPLETION_RATIO = {
     "gpt-image-1": 8,
 
     # claude
+    "claude-3-5-haiku-20241022": 5,
+    "anthropic/claude-3-5-haiku-20241022:beta": 5,
+
     "claude-3-opus-20240229": 5,
     "anthropic/claude-3-opus:beta": 5,  # openrouter
 
@@ -992,6 +1010,11 @@ COMPLETION_RATIO = {
     "claude-3-7-sonnet-20250219": 5,
     "claude-3-7-sonnet-latest-thinking": 5,
 
+    "claude-sonnet-4-20250514": 5,
+    "claude-sonnet-4-20250514-thinking": 5,
+    "claude-opus-4-20250514": 5,
+    "claude-opus-4-20250514-thinking": 5,
+
     "llama-3.1-70b-instruct": 2,
     "meta-llama/Meta-Llama-3.1-70B-Instruct": 2,
 
@@ -1003,6 +1026,8 @@ COMPLETION_RATIO = {
 
     "llama-3.3-70b-instruct": 4,
 
+    "llama-vision": 4,
+
     "command": 4,
     "command-light": 4,
     "command-light-nightly": 4,
@@ -1053,11 +1078,13 @@ COMPLETION_RATIO = {
     "gemma2-27b-it": 4,
     "google/gemma-3-27b-it": 4,
     # thinking
-    "gemini-2.5-flash-thinking": 8,
-    "gemini-2.5-flash-preview-04-17-thinking": 8,
-    "gemini-2.5-pro-thinking": 8,
-    "gemini-2.5-pro-exp-03-25-thinking": 8,
-    "gemini-2.5-pro-preview-03-25-thinking": 8,
+    "gemini-2.5-flash-thinking": 23,
+    "gemini-2.5-flash-preview-04-17-thinking": 23,
+    "gemini-2.5-flash-preview-05-20-thinking": 23,
+
+    "gemini-2.5-pro-thinking": 23,
+    "gemini-2.5-pro-exp-03-25-thinking": 23,
+    "gemini-2.5-pro-preview-03-25-thinking": 23,
 
     "hunyuan-a52b-instruct": 5,
     "qwen2.5-coder-32b-instruct": 3,
@@ -1092,6 +1119,7 @@ COMPLETION_RATIO = {
     "qwq-max-search": 4,
     "qwen-max-search": 4,
     "qvq-max-2025-03-25": 4,
+    "qwen-math-plus": 3,
 
     "qwen2.5-7b-instruct": 4,
     "qwen2.5-14b-instruct": 4,
@@ -1149,6 +1177,9 @@ COMPLETION_RATIO = {
     "doubao-1-5-thinking-pro-vision": 4,
     "doubao-1-5-thinking-pro-vision-250415": 4,
     "doubao-1-5-thinking-pro-m-250415": 4,
+    "doubao-1-5-thinking-pro-m-250428": 4,
+
+    "doubao-1-5-thinking-vision-pro-250428": 3,
 
     "deepseek-prover-v2-671b": 4,
     "deepseek-r1:1.5b": 4,
@@ -1365,8 +1396,7 @@ REDIRECT_MODEL = {
     "todo": "gpt-4-vision-preview",
 
     # https://chat.tune.app/api/models
-    "claude-3-haiku-20240307": "anthropic/claude-3-haiku",
-    "claude-3-5-sonnet-20240620": "anthropic/claude-3.5-sonnet",
+
     "gpt-4o": "openai/gpt-4o",
     "gpt-4o-mini": "openai/gpt-4o-mini",
     "mistral-large": "mistral/mistral-large",

meutils/schemas/openai_types.py

@@ -426,16 +426,17 @@ class ImagesResponse(_ImagesResponse):
 
 
 class TTSRequest(BaseModel):
-    input: str
     model: Optional[Union[str, Literal["tts-1", "tts-1-hd"]]] = 'tts'
     voice: Optional[Union[str, Literal["alloy", "echo", "fable", "onyx", "nova", "shimmer"]]] = ""
+
+    input: str
+    instructions: Optional[str] = None
+    # emotion: Optional[Literal["happy", "angry", "surprise", "coldness", "disgust", "fear", "excited", "hate"]] = None
+
     speed: Optional[float] = None
 
     response_format: Literal["mp3", "opus", "aac", "flac", "wav", "pcm", "url"] = "mp3"
 
-    # 新增
-    emotion: Optional[Literal["happy", "angry", "surprise", "coldness", "disgust", "fear", "excited", "hate"]] = None
-
     class Config:
         json_schema_extra = {
             "examples": [

meutils/apis/jimeng/doubao.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : images
-# @Time         : 2024/12/16 17:46
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  :
-
-from openai import  AsyncClient
-from meutils.pipe import *
-from meutils.apis.jimeng.doubao_utils import generate_cookie
-
-from meutils.schemas.image_types import ImageRequest
-
-from meutils.schemas.jimeng_types import BASE_URL, MODELS_MAP, FEISHU_URL
-from meutils.apis.jimeng.common import create_draft_content, get_headers, check_token
-from meutils.config_utils.lark_utils import get_next_token_for_polling
-
-
-async def create_():
-    headers = {
-        'agw-js-conv': 'str',
-        'Cookie': 's_v_web_id=verify_m4t9wrdc_qgbhUw0z_07iP_4GFV_8HA7_6jr0e9lLCqQO; passport_csrf_token=8a8aa82fa109ecb3cb25e7afa10de214; passport_csrf_token_default=8a8aa82fa109ecb3cb25e7afa10de214; oauth_token=e45378cb-5afd-4495-88f5-58440e321b48; n_mh=lG4jjJNpPRqpnflIMXQoPMflNZdP31M8fFqgdR9Id5g; uid_tt=1a11a8af13cf1c878482fa862287107c; uid_tt_ss=1a11a8af13cf1c878482fa862287107c; sid_tt=de2215a7bb8e442774cf388f03fac84c; sessionid=de2215a7bb8e442774cf388f03fac84c; sessionid_ss=de2215a7bb8e442774cf388f03fac84c; is_staff_user=false; store-region=cn-js; store-region-src=uid; odin_tt=774fcc6d25d5259fd2af19858e0518c64943eb788718658b403ad8eb13ebbc6ebcb4c42620e87a48b2efb45fe78dc163b82399750898bb201c89f324b9e25b94; passport_auth_status=042935fbff60617ac0735d3ba4cfb559%2C7c535e1ccd98b367728b6560feb66a2e; passport_auth_status_ss=042935fbff60617ac0735d3ba4cfb559%2C7c535e1ccd98b367728b6560feb66a2e; sid_guard=de2215a7bb8e442774cf388f03fac84c%7C1734489199%7C5184000%7CSun%2C+16-Feb-2025+02%3A33%3A19+GMT; sid_ucp_v1=1.0.0-KGQyN2NlYjIxNTA1NTc3ZjI3NWQ2MjZkY2FhNGM3MGM0NzdkNGVjZDMKHwjAreC708zWBBDv6Ii7BhjCsR4gDDDn782qBjgIQCYaAmxxIiBkZTIyMTVhN2JiOGU0NDI3NzRjZjM4OGYwM2ZhYzg0Yw; ssid_ucp_v1=1.0.0-KGQyN2NlYjIxNTA1NTc3ZjI3NWQ2MjZkY2FhNGM3MGM0NzdkNGVjZDMKHwjAreC708zWBBDv6Ii7BhjCsR4gDDDn782qBjgIQCYaAmxxIiBkZTIyMTVhN2JiOGU0NDI3NzRjZjM4OGYwM2ZhYzg0Yw; ttwid=1%7C4rAQ216JOophOdIJRX4cHa6E8FSBjbjqHCKmFCNrQuc%7C1734510550%7C6217dce55189d102c393a4de7022e9ee2e2fa75f211108551b349a0a04532921; passport_fe_beating_status=true; tt_scid=b.csKGNI6QALEo8gG9vJu3nCfptGnLkTxVXPX.wNPQ0q9PaXuKzXfuFQC0i2U7gVa974; gd_random_1831913=eyJtYXRjaCI6ZmFsc2UsInBlcmNlbnQiOjAuMjIzMzcxMDAwNzk1MzUxNzd9.NuOx3z2e4BUOJrwTMG9F3lxrnhmz9jNR6BrhQYU4BhI; gd_random_1525008=eyJtYXRjaCI6ZmFsc2UsInBlcmNlbnQiOjAuMjIzMzcxMDAwNzk1MzUxNzd9.NuOx3z2e4BUOJrwTMG9F3lxrnhmz9jNR6BrhQYU4BhI; gd_random_1831904=eyJtYXRjaCI6ZmFsc2UsInBlcmNlbnQiOjAuMjIzMzcxMDAwNzk1MzUxNzd9.NuOx3z2e4BUOJrwTMG9F3lxrnhmz9jNR6BrhQYU4BhI; msToken=enism5q1i_XLtL8VKKjkjidcvGhyW0U3EGJBI19P3fyqk8NsW4fXW4g8s4TnlgRaF-aWS0kHrmNnENw5L4mFRyyz6A5yZbpR3nCRYJrvBi3-GrtptyOBhznILSv4OO0',
-        'User-Agent': 'Apifox/1.0.0 (https://apifox.com)',
-        'content-type': 'application/json'
-    }
-    payload = {
-        "messages": [
-            {
-                "content": "{\"text\":\"颜色反转\"}",
-                "content_type": 2009,
-                "attachments": [
-                    {
-                        "type": "image",
-                        "key": "tos-cn-i-a9rns2rl98/b87240eb828f43f8a87952e8246f2143.png",
-                        "extra": {
-                            "refer_types": "style"
-                        },
-                        "identifier": "2c4b5ab0-bd1a-11ef-b0b0-d38662f7353b"
-                    }
-                ]
-            }
-        ],
-        "completion_option": {
-            "is_regen": False,
-            "with_suggest": False,
-            "need_create_conversation": False,
-            "launch_stage": 1,
-            "is_replace": False,
-            "is_delete": False,
-            "message_from": 0,
-            "event_id": "0"
-        },
-        "section_id": "533682637787650",
-        "conversation_id": "533682637787394",
-        "local_message_id": "71ee47b0-bd1c-11ef-b0b0-d38662f7353b"
-    }
-
-    client = AsyncClient(base_url="https://www.doubao.com/samantha", default_headers=headers, api_key='xx')
-    response = await client.post("/chat/completion", body=payload, cast_to=object, stream=True)
-    for i in response:
-        print(i)
-    # return response
-
-if __name__ == '__main__':
-   arun(create())