MeUtils 2025.3.14.8.43.3__py3-none-any.whl → 2025.3.19.19.13.35__py3-none-any.whl

meutils/llm/check_api.py

@@ -96,7 +96,7 @@ if __name__ == '__main__':
     #
     # api_keys = os.getenv("SILICONFLOW_API_KEY").split()
     # for api_key in api_keys:
-    #     arun(check(api_key, "https://api.siliconflow.com/v1/user/info"))
+    #     arun(check(api_key, "https://api.siliconflow.cn/v1/user/info"))
 
     # api_keys = get_spreadsheet_values(feishu_url="https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=EOZuBW", to_dataframe=True)[0].tolist()
 

meutils/llm/check_utils.py

@@ -10,6 +10,8 @@
 
 from meutils.pipe import *
 from meutils.decorators.retry import retrying
+from meutils.caches import rcache
+from httpx import TimeoutException
 
 from openai import OpenAI, AsyncOpenAI
 
@@ -23,6 +25,7 @@ async def check_tokens(tokens, check_token: Callable):
 
 
 @retrying()
+@rcache(ttl=1 * 3600)
 async def check_token_for_siliconflow(api_key, threshold: float = 0):
     if not isinstance(api_key, str):
         return await check_tokens(api_key, check_token_for_siliconflow)
@@ -33,7 +36,7 @@ async def check_token_for_siliconflow(api_key, threshold: float = 0):
     }
     try:
         async with httpx.AsyncClient(headers=headers, timeout=60) as client:
-            response: httpx.Response = await client.get("https://api.siliconflow.com/v1/user/info")
+            response: httpx.Response = await client.get("https://api.siliconflow.cn/v1/user/info")
             response.raise_for_status()
 
             logger.debug(response.text)
@@ -43,6 +46,12 @@ async def check_token_for_siliconflow(api_key, threshold: float = 0):
                 logger.debug(api_key)
                 total_balance = response.json()['data']['totalBalance']
                 return float(total_balance) >= threshold
+    except TimeoutException as e:
+        # logger.error(traceback.format_exc().strip())
+
+        logger.error("Timeout")
+
+        return True
 
     except Exception as e:
         logger.error(f"Error: {e}\n{api_key}")
@@ -50,7 +59,7 @@ async def check_token_for_siliconflow(api_key, threshold: float = 0):
 
 
 @retrying()
-async def check_token_for_openai(api_key, base_url="https://api.stepfun.com/v1"):
+async def check_token_for_openai(api_key, base_url="https://api.stepfun.cn/v1"):
     try:
         client = AsyncOpenAI(
             base_url=base_url,
@@ -93,7 +102,7 @@ async def check_token_for_jina(api_key, threshold=1000):
 
 
 @retrying()
-async def check_token_for_moonshot(api_key, threshold: float=0):
+async def check_token_for_moonshot(api_key, threshold: float = 0):
     if not isinstance(api_key, str):
         return await check_tokens(api_key, check_token_for_jina)
 
@@ -137,4 +146,4 @@ if __name__ == '__main__':
 
     # arun(check_token_for_jina(["jina_c8da77fed9704d558c8def39837960edplTLkNYrsPTJHBF1HcYg_RkRVh0X"]*10))
 
-    arun(check_token_for_moonshot("sk-fWqLGmUtoGgoK9gx5IefO1mWrRF9QHaV7uVRrTcFv1lrJVvJ"))
+    arun(check_token_for_siliconflow("sk-zdsfykbjrdzobopoienanvlpqdsttbbmgpayctqokkrwqazg"))

meutils/llm/clients.py

@@ -8,11 +8,13 @@
 # @Software     : PyCharm
 # @Description  : 
 from openai import Client, AsyncClient, AsyncStream, APIStatusError
+from zhipuai import ZhipuAI
 
 from meutils.pipe import *
 
 OpenAI = lru_cache(Client)
 AsyncOpenAI = lru_cache(AsyncClient)
+ZhipuAI = lru_cache(ZhipuAI)
 
 chatfire_client = AsyncOpenAI()
 
@@ -26,6 +28,11 @@ zhipuai_client = AsyncOpenAI(
     base_url=os.getenv("ZHIPUAI_BASE_URL")
 )
 
+zhipuai_sdk_client = ZhipuAI(
+    api_key=os.getenv("ZHIPUAI_API_KEY"),
+    base_url=os.getenv("ZHIPUAI_BASE_URL")
+)
+
 qwen_client = AsyncOpenAI(
     base_url="https://all.chatfire.cn/qwen/v1",
     api_key="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImV4cCI6MTc0MzAzNTk4OH0.GVAoSFtK94a9CgxqHCEnxzAnRi7gafIvYyH9mIJUh4s"
@@ -58,3 +65,19 @@ if __name__ == '__main__':
     # )
 
     # r.model_dump_json()
+
+    # f = zhipuai_client.chat.completions.create(
+    #     messages=[{"role": "user", "content": "《哪吒之魔童闹海》现在的票房是多少"}],
+    #     model='glm-4-flash',
+    # )
+    #
+    # arun(f)
+
+    response = zhipuai_client.images.generate(
+        model="cogview-3-flash",  # 填写需要调用的模型编码
+        prompt="一只可爱的小猫咪",
+        n=2,
+        # size="1024x1024"
+    )
+
+    arun(response)

meutils/llm/completions/{oi.py → assistants/__init__.py}

@@ -1,16 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # @Project      : AI.  @by PyCharm
-# @File         : oi
-# @Time         : 2024/12/12 13:19
+# @File         : __init__.py
+# @Time         : 2025/3/19 09:05
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  : 
 
 from meutils.pipe import *
-
-
-from openai import OpenAI
-
-

meutils/llm/completions/assistants/ppt.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : ppt
+# @Time         : 2025/3/19 09:05
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *

meutils/llm/completions/chat_gemini.py

@@ -47,6 +47,7 @@ class Completions(object):
 
 if __name__ == '__main__':
     url = "https://oss.ffire.cc/files/lipsync.mp3"
+    url = "https://lmdbk.com/5.mp4"
     content = [
         {"type": "text", "text": "总结下"},
         # {"type": "image_url", "image_url": {"url": url}},

meutils/llm/completions/chat_plus.py

@@ -14,65 +14,178 @@ from openai import AsyncOpenAI
 from meutils.pipe import *
 from meutils.decorators.retry import retrying
 from meutils.io.files_utils import to_bytes
-from meutils.io.openai_files import file_extract
+from meutils.io.openai_files import file_extract, guess_mime_type
+from meutils.str_utils.json_utils import json_path
+from meutils.apis.search import metaso
+# from meutils.apis.chatglm import glm_video_api
 
-from meutils.llm.clients import qwen_client, chatfire_client
+from meutils.llm.clients import chatfire_client, zhipuai_client, AsyncOpenAI
 from meutils.llm.openai_utils import to_openai_params
 
-from meutils.config_utils.lark_utils import get_next_token_for_polling
-from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, CompletionRequest, CompletionUsage
-
-FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=PP1PGr"
-
-base_url = "https://chat.qwenlm.ai/api"
+from meutils.schemas.openai_types import ChatCompletionRequest
+from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, CompletionRequest, ImageRequest
 
 from fake_useragent import UserAgent
 
 ua = UserAgent()
 
-"""
-# vision_model="doubao-1.5-vision-pro-32k"
-# glm-4v-flash 
-
-1. 文件解析
-
-"""
-
 
 class Completions(object):
 
-    def __init__(self,
-                 vision_model: str = "doubao-1.5-vision-pro-32k",
-                 base_url: Optional[str] = None,
-                 api_key: Optional[str] = None,
-                 ):
-        self.vision_model = vision_model
-        self.client = AsyncOpenAI(
-            base_url=base_url,
-            api_key=api_key,
-        )
+    def __init__(self, api_key: Optional[str] = None):
+        self.api_key = api_key
+        self.client = AsyncOpenAI(api_key=api_key)
 
     async def create(self, request: CompletionRequest):
-        """适配任意客户端"""
-
-        last_message = request.last_message
-        file_urls = request.last_urls.get("file_url", [])
-        file_contents = await file_extract(file_urls)
-
-
-        # if 'r1' in request.model:  # vl
-        #     data = to_openai_params(request)
-        #     data['stream'] = False
-        #     data['model'] = self.vision_model
-        #
-        #     data['messages'] = [
-        #         {"type": "text", "text": "图片描述："}
-        #     ]
-        #
-        #     # await chatfire_client.create(**data)
-        #
-        #     return await chatfire_client.create(**data)
-        #
-        # request.last_message
-
-# "image_url": "http://ai.chatfire.cn/files/images/image-1725418399272-d7b71012f.png"
+        """
+        :param request:
+        :return:
+        """
+        if request.last_user_content.startswith(("画",)):  # 画画
+            return await self.create_images(request)  # str
+
+        # ppt 视频生成
+        # elif request.last_user_content.startswith(("联网", "搜索", "在线搜索", "在线查询")):  # 画画
+        #     return metaso.create(request)
+        # elif request.last_user_content.startswith(("视频",)):  # 视频生成
+
+        elif request.last_user_content.startswith(("联网", "搜索", "在线搜索", "在线查询")):  # 画画
+            return metaso.create(request)
+
+        elif request.last_user_content.startswith(("http",)):
+            file_url, text = request.last_user_content.split(maxsplit=1)  # application/octet-stream
+
+            if guess_mime_type(file_url).startswith("image"):  # 识图
+                request.model = "glm-4v-flash"
+                request.messages = [
+                    {
+                        'role': 'user',
+                        'content': [
+                            {
+                                "type": "text",
+                                "text": text
+                            },
+
+                            {
+                                "type": "image_url",
+                                "image_url": {
+                                    "url": file_url
+                                }
+                            }
+                        ]
+                    }
+                ]
+                data = to_openai_params(request)
+                return self.client.chat.completions.create(**data)
+
+            elif guess_mime_type(file_url).startswith(("video", "audio")):  # 音频 视频
+                request.model = "gemini"  # 果果
+                request.messages = [
+                    {
+                        'role': 'user',
+                        'content': [
+                            {
+                                "type": "text",
+                                "text": text
+                            },
+                            {
+                                "type": "image_url",
+                                "image_url": {
+                                    "url": file_url
+                                }
+                            }
+                        ]
+                    }
+                ]
+                data = to_openai_params(request)
+                return self.client.chat.completions.create(**data)
+
+            else:
+
+                file_content = await file_extract(file_url)  # 文件问答-单轮
+
+                request.messages = [
+                    {
+                        'role': 'user',
+                        'content': f"""{json.dumps(file_content, ensure_ascii=False)}\n\n{text}"""
+                    }
+                ]
+                data = to_openai_params(request)
+                return self.client.chat.completions.create(**data)
+
+        if image_urls := request.last_urls.get("image_url"):  # 识图
+            request.model = "glm-4v-flash"
+            data = to_openai_params(request)
+            return self.client.chat.completions.create(**data)
+
+        elif file_urls := request.last_urls.get("file_url"):
+            return self.chat_files(request)
+
+        data = to_openai_params(request)
+        return self.client.chat.completions.create(**data)
+
+    async def chat_files(self, request: CompletionRequest):  # 多轮
+        for i, message in enumerate(request.messages[::-1], 1):
+            if message.get("role") == "user":
+                texts = json_path(message, expr='$..text') or [""]
+                file_urls = json_path(message, expr='$..file_url.url') or [""]
+
+                logger.debug(f"""{texts} \n\n {file_urls}""")
+
+                text, file_url = texts[-1], file_urls[-1]
+                if file_url in request.last_urls.get("file_url", []):
+                    file_content = await file_extract(file_url)
+
+                    message["content"] = f"""{json.dumps(file_content, ensure_ascii=False)}\n\n{text}"""
+
+                    request.messages = request.messages[-i:]
+                    break  # 截断：从最新的文件开始
+
+        data = to_openai_params(request)
+        return self.client.chat.completions.create(**data)
+
+    async def create_images(self, request: CompletionRequest):
+
+        response = await zhipuai_client.images.generate(
+            model="cogview-3-flash",
+            prompt=request.last_user_content,
+            n=1
+        )
+        image_url = response.data[0].url
+        tool_desc = """> images.generate\n\n"""
+        return tool_desc + f"![{request.last_user_content}]({image_url})"
+
+    # async def create_videos(self, request: CompletionRequest):
+    #
+    #     request = ImageRequest(prompt=request.last_user_content)
+    #
+    #     response = await glm_video_api.generate(request)
+    #     image_url = response.data[0].url
+    #     tool_desc = """> images.generate\n\n"""
+    #     return tool_desc + f"![{request.last_user_content}]({image_url})"
+
+
+if __name__ == '__main__':
+    c = Completions()
+
+    request = CompletionRequest(
+        model="qwen-turbo-2024-11-01",
+        # model="claude-3-5-sonnet-20241022",
+        # model="gpt-4o-mini",
+
+        messages=[{
+            'role': 'user',
+            'content': [
+                {
+                    "type": "text",
+                    "text": "总结下"
+                },
+
+                # {
+                #     "type": "image_url",
+                #     "image_url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf"
+                # }
+            ]
+        }])
+
+    arun(c.create(request))

meutils/llm/completions/chat_spark.py

@@ -6,18 +6,11 @@
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  : 支持文档、图片、音频、视频问答
-"""单一智能体
-任意模型支持文档、图片、音频、视频问答
-api形式
-- /agents/v1
-- /v1 前缀区分 agents-{model}【底层调用 /agents/v1】
+# @Description  :
 
-todo: 记录上下文日志
-"""
 
 from meutils.pipe import *
-from meutils.io.openai_files import file_extract
+from meutils.io.openai_files import file_extract, guess_mime_type
 from meutils.str_utils.json_utils import json_path
 
 from meutils.llm.clients import AsyncOpenAI
@@ -45,7 +38,7 @@ class Completions(object):
         elif image_urls := request.last_urls.get("image_url"):  # 长度为1
             url = image_urls[0]
 
-            if url.endswith(('.jpg', '.jpeg', '.png', '.gif', '.bmp')):  # 图片问答
+            if guess_mime_type(url).startswith("image"):  # 图片问答
 
                 request.model = "doubao-1.5-vision-pro-32k"  # 6月过期
                 for i, message in enumerate(request.messages):

meutils/llm/completions/qwenllm.py

@@ -127,12 +127,15 @@ async def create(request: CompletionRequest, token: Optional[str] = None):  # Ch
 
     else:
         response = await client.chat.completions.create(**data)
-        for i in range(3):
-            if not isinstance(response, str):  # 报错
-                yield response.choices[0].message.content
-                break
-            else:
-                logger.warning(f"重试 {i}\n{response}")
+        if not isinstance(response, str):
+            yield response.choices[0].message.content  # isinstance(response, str)
+
+        # for i in range(3):
+        #     if not isinstance(response, str):  # 报错
+        #         yield response.choices[0].message.content
+        #         break
+        #     else:
+        #         logger.warning(f"重试 {i}\n{response}")
 
 
 if __name__ == '__main__':
@@ -186,6 +189,8 @@ if __name__ == '__main__':
 
         # model="qwen-plus-latest",
 
+        max_tokens=8000,
+
         messages=[
             {
                 'role': 'user',

meutils/request_utils/crawler.py

@@ -62,14 +62,14 @@ if __name__ == '__main__':
     html_content = httpx.get(url).text
 
 
-    # 正则表达式匹配以 "/_next/static/chunks/7116-" 开头的 JS 文件
-    pattern = r'(/_next/static/chunks/7116-[^"]+\.js)'
-
-    # 使用 re.findall() 找到所有匹配项
-    matches = re.findall(pattern, html_content)
-
-    "/_next/static/chunks/7116-aed224a0caaab94c.js"
-
-    # 打印结果
-    for match in matches:
-        print(match)
+    # # 正则表达式匹配以 "/_next/static/chunks/7116-" 开头的 JS 文件
+    # pattern = r'(/_next/static/chunks/7116-[^"]+\.js)'
+    #
+    # # 使用 re.findall() 找到所有匹配项
+    # matches = re.findall(pattern, html_content)
+    #
+    # "/_next/static/chunks/7116-aed224a0caaab94c.js"
+    #
+    # # 打印结果
+    # for match in matches:
+    #     print(match)

meutils/schemas/oneapi/common.py

@@ -28,6 +28,7 @@ MODEL_PRICE = {
     # rix
     "kling_image": 0.025,
     "kling_virtual_try_on": 1,
+    "kling_effects": 1,
 
     "kling_video": 1.2,
     "kling_extend": 1.2,
@@ -218,7 +219,7 @@ MODEL_PRICE = {
     "api-voice-clone": 0.01,
 
     # suno
-    "suno_music": 0.3,
+    "suno_music": 0.36,
     "suno_lyrics": 0.01,
     "suno_uploads": 0.01,
     "suno_upload": 0.01,
@@ -646,6 +647,8 @@ MODEL_RATIO = {
     "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-flash-exp-image": 2.5,
+    "gemini-2.0-flash-exp-image-generation": 2.5,
 
     "gemini-2.0-pro": 1.25,
     "gemini-2.0-pro-exp-02-05": 1.25,
@@ -733,6 +736,7 @@ MODEL_RATIO = {
     # sili
     "gemma2-9b-it": 0.1,
     "gemma2-27b-it": 0.5,
+    "google/gemma-3-27b-it": 0.5,
 
     "internlm2_5-7b-chat": 0.01,
     'internlm2_5-20b-chat': 0.5,
@@ -845,6 +849,9 @@ COMPLETION_RATIO = {
     "gemini-2.0-flash-001": 4,
 
     "gemini-2.0-flash-exp": 5,
+    "gemini-2.0-flash-exp-image": 5,
+    "gemini-2.0-flash-exp-image-generation": 5,
+
     "gemini-2.0-flash-thinking-exp": 5,
     "gemini-2.0-flash-thinking-exp-1219": 5,
     "gemini-2.0-flash-thinking-exp-01-21": 5,
@@ -856,6 +863,7 @@ COMPLETION_RATIO = {
 
     "gemma2-9b-it": 4,
     "gemma2-27b-it": 4,
+    "google/gemma-3-27b-it": 4,
 
     "hunyuan-a52b-instruct": 5,
     "qwen2.5-coder-32b-instruct": 3,

meutils/schemas/openai_types.py

@@ -55,7 +55,7 @@ class Choice(_Choice):
 
 
 class ChatCompletion(_ChatCompletion):
-    id: str = Field(default_factory=shortuuid.random)
+    id: str = Field(default_factory=lambda: f"chatcmpl-{shortuuid.random()}")
     created: int = Field(default_factory=lambda: int(time.time()))
     model: str = ""
     object: str = "chat.completion"
@@ -67,7 +67,7 @@ class ChunkChoice(_ChunkChoice):
 
 
 class ChatCompletionChunk(_ChatCompletionChunk):
-    id: str = Field(default_factory=shortuuid.random)
+    id: str = Field(default_factory=lambda: f"chatcmpl-{shortuuid.random()}")
     created: int = Field(default_factory=lambda: int(time.time()))
     model: str = ""
     object: str = "chat.completion.chunk"
@@ -161,6 +161,25 @@ class CompletionRequest(BaseModel):
             if data: return data
         return {}
 
+    # def create_message(self, text: str, content_type: Optional[str] = None):
+    #     """
+    #     消息生成器
+    #     :param text:
+    #     :param content_type:
+    #     :return:
+    #     """
+    #     message = {
+    #         'role': 'user',
+    #         'content': [
+    #             {
+    #                 "type": "text",
+    #                 "text": text
+    #             },
+    #         ]
+    #     }
+    #
+    #     return message
+
 
 class ChatCompletionRequest(BaseModel):
     """
@@ -520,5 +539,8 @@ if __name__ == '__main__':
     # print(chat_completion)
     # 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(CompletionRequest(messages=messages).last_user_content)
+
+    print(chat_completion_chunk)
+    print(chat_completion)

meutils/schemas/siliconflow_types.py

@@ -11,7 +11,7 @@
 
 from meutils.pipe import *
 
-BASE_URL = "https://api.siliconflow.com/v1"
+BASE_URL = "https://api.siliconflow.cn/v1"
 
 EXAMPLES = [
     {

meutils/apis/search/zhipu.py

@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : zhipu
-# @Time         : 2025/2/19 20:42
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  : 
-
-from meutils.pipe import *
-from meutils.str_utils.json_utils import json_path
-from meutils.llm.clients import AsyncOpenAI, chatfire_client, zhipuai_client, moonshot_client
-from meutils.llm.openai_utils import to_openai_params
-from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, ChatCompletionRequest, CompletionUsage
-
-
-class Completions(object):
-
-    def __init__(self, api_key: Optional[str] = None):
-        self.api_key = api_key
-
-    async def create(self, request: ChatCompletionRequest, search_result2md: bool = False):
-        request.stream = False
-        request.model = "web-search-pro"
-        request.messages = [{
-            "role": "user",
-            "content": request.last_content,
-        }]
-        data = to_openai_params(request)
-
-        search_completion = await zhipuai_client.chat.completions.create(**data)
-        logger.debug(search_completion.model_dump_json(indent=4))
-
-        if results := json_path(search_completion, '$..[keywords,query,search_result]'):
-            data = dict(zip(["keywords", "query", "search_result"], results))
-            if search_result2md:
-                global df
-
-                df = pd.DataFrame(data["search_result"])
-
-                df['title'] = [f"[{k}]({v})" for k, v in zip(df['title'], df['link'])]
-                df['media'] = [f"![{k}]({v})" for k, v in zip(df['media'], df['icon'])]
-
-                df = df[['title', 'media']]
-                df.index += 1
-                # {df_.to_markdown(index=False).replace('|:-', '|-').replace('-:|', '-|')}
-                data["search_result"] = df.to_markdown()
-            return data
-
-    async def query(self, q: str):
-        pass
-
-        # {
-        #     "role": "user",
-        #     "content": search_completion.model_dump_json(indent=4),
-        # }
-
-
-if __name__ == '__main__':
-    model = "web-search-pro"
-    # model = "tencent-search"
-
-    request = ChatCompletionRequest(
-        # model="baichuan4-turbo",
-        # model="xx",
-        # model="deepseek-r1",
-        # model="deepseek-r1:1.5b",
-        model=model,
-
-        # model="moonshot-v1-8k",
-        # model="doubao",
-
-        messages=[
-            {"role": "user", "content": "《哪吒之魔童闹海》现在的票房是多少"}
-        ],
-
-        stream=True
-    )
-    arun(Completions().create(request, search_result2md=True))