MeUtils 2025.2.25.19.14.31__py3-none-any.whl → 2025.3.1.11.32.36__py3-none-any.whl

meutils/llm/completions/qwenllm.py

@@ -17,8 +17,10 @@ AttributeError: 'str' object has no attribute 'choices'
 from openai import AsyncOpenAI
 
 from meutils.pipe import *
-from meutils.llm.clients import qwen_client
+from meutils.io.files_utils import to_bytes
+from meutils.decorators.retry import retrying
 
+from meutils.llm.clients import qwen_client
 from meutils.llm.openai_utils import to_openai_params
 
 from meutils.config_utils.lark_utils import get_next_token_for_polling
@@ -33,6 +35,14 @@ from fake_useragent import UserAgent
 ua = UserAgent()
 
 
+@retrying()
+async def to_file(file, mime_type: str = "application/octet-stream"):
+    file_bytes = await to_bytes(file)
+    file = ("filename", file_bytes, mime_type)
+    file_object = await qwen_client.files.create(file=file, purpose="file-extract")
+    return file_object
+
+
 async def create(request: ChatCompletionRequest, token: Optional[str] = None):  # ChatCompletionRequest 重构
     token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL)
 
@@ -44,18 +54,28 @@ async def create(request: ChatCompletionRequest, token: Optional[str] = None):
 
     # qwen结构
     if any(i in request.model.lower() for i in ("search",)):
-        request.model = "qwen-plus-latest"
+        request.model = "qwen-max-latest"
         request.messages[-1]['chat_type'] = "search"
 
     if any(i in request.model.lower() for i in ("qwq", "think")):
-        request.model = "qwen-plus-latest"
+        request.model = "qwen-max-latest"
         request.messages[-1]['feature_config'] = {"thinking_enabled": True}
 
     # 多模态: todo
-    # file_object = await qwen_client.files.create(file=(file.filename, file.file), purpose="file-extract")
+    if any(i in request.model.lower() for i in ("-vl", "qvq")):
+        # await to_file
+        last_message = request.messages[-1]
+        if isinstance(last_message.get("content"), list):
+            for content in last_message.get("content"):
+                if content.get("type") == 'file':
+                    pass
 
-    data = to_openai_params(request)
+        pass
 
+    elif request.model.lower().endswith("-1m"):
+        pass
+
+    data = to_openai_params(request)
     if request.stream:
         _chunk = ""
         async for chunk in await client.chat.completions.create(**data):
@@ -86,7 +106,9 @@ if __name__ == '__main__':
     request = ChatCompletionRequest(
         # model="qwen-turbo-2024-11-01",
         # model="qwen-max-latest",
-        model="qwen-max-latest-search",
+        # model="qwen-max-latest-search",
+        # model="qwq-max",
+        model="qwen2.5-vl-72b-instruct",
 
         # model="qwen-plus-latest",
 
@@ -94,6 +116,7 @@ if __name__ == '__main__':
             {
                 'role': 'user',
                 # 'content': '今天南京天气',
+                # 'content': "9.8 9.11哪个大",
                 # 'content': '总结下',
 
                 # "chat_type": "search",
@@ -113,10 +136,30 @@ if __name__ == '__main__':
                     }
                 ]
 
+                # "content": [
+                #     {
+                #         "type": "text",
+                #         "text": "总结下",
+                #         # "chat_type": "t2t"
+                #
+                #     },
+                # {
+                #     "type": "image",
+                #     "image": "703dabac-b0d9-4357-8a85-75b9456df1dd"
+                # },
+                # {
+                #     "type": "image",
+                #     "image": "https://oss.ffire.cc/files/kling_watermark.png"
+                #
+                # }
+                # ]
+
             },
 
         ],
         stream=True,
 
     )
-    arun(create(request))
+    # arun(create(request))
+
+    arun(to_file("/Users/betterme/PycharmProjects/AI/MeUtils/meutils/llm/completions/yuanbao.py"))

meutils/llm/completions/yuanbao.py

@@ -43,7 +43,6 @@ class Completions(object):
             self,
             request: Optional[ChatCompletionRequest] = None,
             image_request: Optional[HunyuanImageRequest] = None,
-            enable_search: bool = False,
             token: Optional[str] = None
     ):
         token = token or await get_next_token_for_polling(FEISHU_URL, check_token=check_token)
@@ -54,7 +53,7 @@ class Completions(object):
 
         payload = {
             "model": "gpt_175B_0404",
-            "chatModelId": "deep_seek",
+            "chatModelId": request.model,
             "version": "v2",
             "supportHint": 2,  # 1
 
@@ -78,6 +77,11 @@ class Completions(object):
             },
 
         }
+        if "search" in request.model:
+            # deep_seek deep_seek_v3 hunyuan_t1 hunyuan_gpt_175B_0404
+            payload['chatModelId'] = request.model.replace('-search', '')
+            payload['supportFunctions'] = ["supportInternetSearch"]
+
         if image_request:
             payload["displayImageIntentionLabels"] = [
                 {"type": "resolution", "disPlayValue": "超清", "startIndex": 0, "endIndex": 1}
@@ -96,11 +100,6 @@ class Completions(object):
                 }
             )
 
-        if enable_search:
-            payload['supportFunctions'] = [
-                "supportInternetSearch"
-            ]
-
         headers = {
             'cookie': token
         }
@@ -119,7 +118,6 @@ class Completions(object):
                         yield sse.image
 
                     if request:
-
                         yield sse.content
 
     def generate_id(self, random: bool = True):
@@ -148,26 +146,26 @@ async def check_token(token):
 
 
 if __name__ == '__main__':
-# chatid = generate_id()
-# print(chatid)
-# print(delete_conv(chatid))
-# payload = {
-#     # "model": "gpt_175B_0404",
-#     # "prompt": "1+1",
-#     "prompt": "错了",
-#
-#     # "plugin": "Adaptive",
-#     # "displayPrompt": "1+1",
-#     # "displayPromptType": 1,
-#     # "options": {},
-#     # "multimedia": [],
-#     # "agentId": "naQivTmsDa",
-#     # "version": "v2"
-# }
-# chat(payload)
-
-# async2sync_generator(Completions(api_key).achat('画条狗')) | xprint
-# request = HunyuanImageRequest(prompt='画条狗', size='16:9')
+    # chatid = generate_id()
+    # print(chatid)
+    # print(delete_conv(chatid))
+    # payload = {
+    #     # "model": "gpt_175B_0404",
+    #     # "prompt": "1+1",
+    #     "prompt": "错了",
+    #
+    #     # "plugin": "Adaptive",
+    #     # "displayPrompt": "1+1",
+    #     # "displayPromptType": 1,
+    #     # "options": {},
+    #     # "multimedia": [],
+    #     # "agentId": "naQivTmsDa",
+    #     # "version": "v2"
+    # }
+    # chat(payload)
+
+    # async2sync_generator(Completions(api_key).achat('画条狗')) | xprint
+    # request = HunyuanImageRequest(prompt='画条狗', size='16:9')
 
     arun(Completions().create(
         ChatCompletionRequest(messages=[{'role': 'user', 'content': '南京天气如何'}]),

meutils/schemas/oneapi/common.py

@@ -81,19 +81,6 @@ MODEL_PRICE = {
     "api-images-cogview-3": 0.01,
     "api-images-stable-diffusion": 0.01,
 
-    "api-images-flux1.0-turbo": 0.02,
-    "api-images-flux-schnell": 0.01,
-    "api-images-flux1.0-schnell": 0.01,
-    "api-images-flux1.0-dev": 0.05,
-    "api-images-flux.1-dev": 0.05,
-
-    "api-images-flux-pro-max": 0.1,
-    "api-images-flux1.0-pro": 0.1,
-    "api-images-flux.1-pro": 0.1,
-    "api-images-flux1.1-pro": 0.1,
-    "api-images-flux.1.1-pro": 0.1,
-    "api-images-recraftv3": 0.03,
-
     "api-images-seededit": 0.1,
     "seededit": 0.1,
     "chat-seededit": 0.1,
@@ -102,9 +89,14 @@ MODEL_PRICE = {
 
     # 图片 音频 视频
     "recraftv3": 0.1,  # 官方的
+    "recraft-v3": 0.1,  # d3
     "recraft-api": 0.1,
     "chat-recraftv3": 0.1,
 
+    "flux-pro-1.1-ultra": 0.2,
+    "ideogram-ai/ideogram-v2": 0.2,
+    "ideogram-ai/ideogram-v2-turbo": 0.1,
+
     "api-asr": 0.01,
     "api-stt": 0.01,
     "api-tts": 0.01,
@@ -112,8 +104,6 @@ MODEL_PRICE = {
     "kolors": 0.02,
     "kling": 0.02,
 
-    "ideogram": 0.3,
-
     "api-hunyuan-video": 0.1,
 
     "deepseek-ai/Janus-Pro-7B": 0.01,
@@ -219,11 +209,14 @@ MODEL_PRICE = {
     "api-translator": 0.0001,
     "api-voice-clone": 0.01,
 
+    # suno
     "suno_music": 0.3,
     "suno_lyrics": 0.01,
     "suno_uploads": 0.01,
     "suno_upload": 0.01,
     "suno_concat": 0.01,
+    "chirp-v3-5": 0.5,
+    "chat-suno": 0.5,
 
     # all
     "o1-plus": 0.2,
@@ -638,11 +631,11 @@ MODEL_RATIO = {
     "gemini-2.0-flash": 0.0625,
     "gemini-2.0-flash-001": 0.0625,
     "gemini-2.0-flash-lite-preview-02-05": 0.0625,
+    "gemini-2.0-flash-exp": 0.0625,
 
     "gemini-2.0-pro": 1.25,
     "gemini-2.0-pro-exp-02-05": 1.25,
 
-    "gemini-2.0-flash-exp": 0.5,
     "gemini-2.0-flash-thinking-exp": 1,
     "gemini-2.0-flash-thinking-exp-1219": 1,
     "gemini-2.0-flash-thinking-exp-01-21": 1,
@@ -689,6 +682,7 @@ MODEL_RATIO = {
     "gpt-4o-mini-2024-07-18": 0.075,
     "gpt-4o-2024-08-06": 1.25,
     "gpt-4o-2024-11-20": 1.25,
+    "gpt-4.5-preview-2025-02-27": 37.5,
 
     "o1": 7.5,
     "o1-2024-12-17": 7.5,
@@ -716,14 +710,12 @@ MODEL_RATIO = {
     "llama3-8b-8192": 0.01,
     "llama3-70b-8192": 0.01,
     "mixtral-8x7b-32768": 0.01,
-    "gemma-7b-it": 0.01,
     "llama-3.1-8b-instant": 0.01,
     "llama-3.1-70b-versatile": 3,
 
     # sili
-    "gemma2-9b-it": 0.01,
-    "gemma2-27b-it": 0.63,
-    "google/gemma-2-27b-it": 0.09,
+    "gemma2-9b-it": 0.1,
+    "gemma2-27b-it": 0.5,
 
     "internlm2_5-7b-chat": 0.01,
     'internlm2_5-20b-chat': 0.5,
@@ -774,6 +766,7 @@ COMPLETION_RATIO = {
     "gpt-4-all": 4,
     "gpt-4-gizmo-*": 4,
     "gpt-4o-all": 4,
+    "gpt-4.5-preview-2025-02-27":2,
 
     "o1-mini": 4,
     "o1-preview": 4,
@@ -844,6 +837,9 @@ COMPLETION_RATIO = {
     "gemini-2.0-pro": 4,
     "gemini-2.0-pro-exp-02-05": 4,
 
+    "gemma2-9b-it": 4,
+    "gemma2-27b-it": 4,
+
     "hunyuan-a52b-instruct": 5,
     "qwen2.5-coder-32b-instruct": 3,
 

meutils/schemas/yuanbao_types.py

@@ -253,9 +253,12 @@ class SSEData(BaseModel):
         # df['title'] = "[" + df['title'] + "](" + df['url'] + ")"
         # df['image'] = "![](" + df['image'] + ")"
 
-        elif '{"type":"think"' in chunk: # 思考中...
+        elif '{"type":"think"' in chunk:  # 思考中...
             content = self.reasoning_content = json.loads(chunk).get("content", "")
 
+        elif '{"type":"searchGuid"' in chunk:  # 思考中...
+            content = self.reasoning_content = json.loads(chunk).get("docs", "")
+
         else:
             content = ""
             # chunk.strip() or logger.debug(chunk)  # debug