MeUtils 2024.12.26.22.14.1__py3-none-any.whl → 2025.1.3.14.11.44__py3-none-any.whl

meutils/schemas/oneapi/common.py

@@ -153,6 +153,10 @@ MODEL_PRICE = {
 
     "api-kling": 0.1,
     "api-kling-vip": 0.5,
+    "api-kling-v1.6-std-5s": 1,
+    "api-kling-v1.6-std-10s": 2,
+    "api-kling-v1.6-pro-5s": 1.5,
+    "api-kling-v1.6-pro-10s": 3,
 
     "api-vidu": 0.09,
     "api-vidu-vip": 0.3,
@@ -172,10 +176,10 @@ MODEL_PRICE = {
 
     # all
     "o1-plus": 0.2,
-    "o1-pro": 0.5,
+    "o1-pro": 0.6,
 
     "o1-mini-all": 0.2,
-    "o1-preview-all": 0.5,
+    "o1-preview-all": 0.6,
 
     "gpt-4-all": 0.1,
     "gpt-4o-all": 0.1,
@@ -294,23 +298,29 @@ MODEL_RATIO = {
     "glm-4-0520": 2.5,
     "glm-4-airx": 10,
     "glm-4v": 2.5,
-    "glm-4v-plus": 2.5,  # 2.5
+    "glm-4v-plus": 5,
     "glm-4v-flash": 0.1,
     "glm-4-plus": 25,
 
+    "glm-zero": 5,
+    "glm-zero-preview": 5,
+
     # 月之暗面 https://platform.moonshot.cn/docs/price/chat#%E4%BA%A7%E5%93%81%E5%AE%9A%E4%BB%B7
     "moonshot-v1-8k": 6 / 2,  # 特价
     "moonshot-v1-32k": 12 / 2,  # 特价
     "moonshot-v1-128k": 60 / 2,  # 特价
 
     # 阿里千问 https://dashscope.console.aliyun.com/billing
-    "qwen-long": 0.5,
+    "qwen-long": 0.25,
     "qwen-turbo": 0.05,
     "qwen-plus": 2,
-    "qwen-max": 20,
+    "qwen-max": 10,
     "qwen-max-longcontext": 20,
     "qwen-turbo-2024-11-01": 0.15,
 
+    "qwen-vl-max-latest": 1.5,
+    "qwen-vl-plus-latest": 0.75,
+
     "qwen2.5-coder-7b-instruct": 0.05,
     "qwen2.5-7b-instruct": 0.05,
     "qwen2.5-14b-instruct": 0.7 / 2,
@@ -373,18 +383,22 @@ MODEL_RATIO = {
 
     # deepseek
     "deepseek-chat": 0.5,
-    "deepseek-coder": 0.5,
-    'deepseek-coder-v2-instruct': 0.5,
-    'deepseek-v2-chat': 0.5,
-    'deepseek-llm-67b-chat': 0.5,
     "deepseek-ai/deepseek-vl2": 0.5,
 
+    "deepseek-v3": 0.5,
+    "deepseek/deepseek-chat": 0.5,
+    "deepseek-ai/DeepSeek-V3": 0.5,
+
+    'deepseek-r1': 0.5,
+    'deepseek-think': 0.5,
+    "deepseek-search": 0.5,
+
     # 豆包
     "doubao-lite-128k": 0.4,
     "doubao-lite-32k": 0.15,
     "doubao-lite-4k": 0.15,
 
-    "doubao-pro-256k": 0.01,
+    "doubao-pro-256k": 5,
 
     "doubao-pro-128k": 2.5,
     "doubao-pro-32k": 0.4,
@@ -643,14 +657,26 @@ COMPLETION_RATIO = {
     "qwq-32b-preview": 3,
     "qvq-72b-preview": 3,
 
-    "qwen-long": 5,
-    "qwen-max": 5,
-    "glm-4v-flash": 5,
+    "qwen-long": 4,
+    "qwen-max": 3,
+    "qwen-vl-max-latest": 3,
+    "qwen-vl-plus-latest": 3,
 
     "deepseek-ai/deepseek-vl2": 3,
     "doubao-vision-lite-32k": 3,
     "doubao-vision-pro-32k": 3,
 
+    "deepseek-v3": 1,
+    'deepseek-r1': 1,
+    'deepseek-think': 1,
+    "deepseek-search": 1,
+    "deepseek/deepseek-chat": 1,
+    "deepseek-ai/DeepSeek-V3": 1,
+
+    "glm-zero": 5,
+    "glm-zero-preview": 5,
+    "glm-4v-flash": 5,
+
 }
 
 REDIRECT_MODEL = {
@@ -716,7 +742,7 @@ REDIRECT_MODEL = {
     "qwen2.5-coder-7b-instruct": "Qwen/Qwen2.5-Coder-7B-Instruct",
     "qwen2.5-coder-32b-instruct": "Qwen/Qwen2.5-Coder-32B-Instruct",
 
-    "qwen-turbo": "Qwen/Qwen2.5-7B-Instruct",
+    "qwen-turbo": "Qwen/Qwen2.5-7B-Instruct",  # 兜底
     'qwen2-1.5b-instruct': 'Qwen/Qwen2-1.5B-Instruct',
     'qwen2-7b-instruct': 'Qwen/Qwen2-7B-Instruct',
     'qwen2-72b-instruct': 'Qwen/Qwen2-72B-Instruct',

meutils/schemas/openai_types.py

@@ -312,7 +312,6 @@ class STTRequest(BaseModel):  # ASR
 if __name__ == '__main__':
     pass
 
-
     # print(ChatCompletion(choices=[Choice(message=ChatCompletionMessage(content="ChatCompletion"))]))
     # print(ChatCompletionChunk(choices=[ChunkChoice(delta=ChoiceDelta(content="ChatCompletionChunk"))]))
     #
@@ -348,8 +347,20 @@ if __name__ == '__main__':
     # print(req1.model_dump())  # 输出: {'guidance_scale': 5.0}
     # print(req1.model_dump(by_alias=True))  # 输出: {'guidance': 5.0}
 
-    class A(BaseModel):
-        n: int = Field(1, ge=1, le=0)
-
-
-    print(A(n=11))
+    # class A(BaseModel):
+    #     n: int = Field(1, ge=1, le=0)
+    #
+    #
+    # print(A(n=11))
+    messages = [
+        {
+            "role": "user",
+            "content": [{'role': 'user', 'content': [{"type": "image_url", "image_url": "这是个图片链接"}]}]
+        },
+
+        # {'role': 'user', 'content': [{"type": "image_url", "image_url": {"url": "这是个图片链接"}}]},
+    ]
+
+    r = ChatCompletionRequest(model="gpt-3.5-turbo", messages=messages)
+    r.messages[-1]['content'] = [{"type": "image_url", "image_url": {"url": r.urls[-1]}}]
+    print(r)