MeUtils 2025.4.20.23.17.29__py3-none-any.whl → 2025.4.23.16.0.20__py3-none-any.whl

meutils/apis/google/chat.py

@@ -23,8 +23,9 @@ from meutils.schemas.openai_types import chat_completion, chat_completion_chunk,
 from meutils.config_utils.lark_utils import get_next_token_for_polling
 from google import genai
 from google.genai import types
-from google.genai.types import UploadFileConfig, HttpOptions, GenerateContentConfig, HarmCategory, HarmBlockThreshold, \
-    Part
+from google.genai.types import Part, HttpOptions, HarmCategory, HarmBlockThreshold
+from google.genai.types import UploadFileConfig, ThinkingConfig, GenerateContentConfig
+
 from google.genai.types import UserContent, ModelContent, Content
 from google.genai.types import Tool, GoogleSearch
 
@@ -76,7 +77,8 @@ class Completions(object):
             model=request.model,
             config=GenerateContentConfig(
                 tools=tools,
-                system_instruction=request.system_instruction or "请根据用户的语言偏好自动调整回复语言"
+                system_instruction=request.system_instruction or "请根据用户的语言偏好自动调整回复语言",
+                # thinking_config=ThinkingConfig(include_thoughts=True, thinking_budget=24576)
             ),
         )
         # print(response.candidates[0].grounding_metadata.search_entry_point.rendered_content)
@@ -112,10 +114,27 @@ class Completions(object):
             url, user_content = request.last_user_content.split(maxsplit=1)
             file_object = await self.upload(url)
 
-            logger.debug(file_object)
-            if file_object.state.name != "PROCESSING":
-                # _ = self.client.files.get(name=file_object.name)
+            yield f"> {file_object.model_dump_json(indent=4)}\n"
+            yield f"> [正在解析...]("
+
+            s = time.time()
+            for i in range(100):
+                await asyncio.sleep(3)
+                file_object = self.client.files.get(
+                    name=file_object.name,
+                    config={"http_options": {"timeout": 300 * 1000}}
+                )
+
                 logger.debug(file_object)
+                if file_object.state.name == "ACTIVE":
+                    yield f" 100% {int(time.time() - s)}s.)\n\n"
+                    break
+                else:
+                    yield f"{min(i * 5, 99)}% "
+
+            # while file_object.state.name == "ACTIVE":
+            #     logger.debug(file_object)
+            #     await asyncio.sleep(1)
 
             contents += [file_object, user_content]
         else:
@@ -127,7 +146,8 @@ class Completions(object):
             model=request.model,
             config=GenerateContentConfig(
                 response_modalities=['Text'],
-                system_instruction=request.system_instruction
+                system_instruction=request.system_instruction,
+                thinking_config=ThinkingConfig(thinking_budget=request.reasoning_effort and 1024 or 0)
             )
         )
         for i in range(5):
@@ -149,6 +169,9 @@ class Completions(object):
                     await asyncio.sleep(1)
                     continue
                 else:
+                    # {'error': {'code': 400,
+                    #            'message': 'The File cwjpskscrjd79hjezu7dhb is not in an ACTIVE state and usage is not allowed.',
+                    #            'status': 'FAILED_PRECONDITION'}}
                     yield e
                     raise e
 
@@ -317,7 +340,7 @@ class Completions(object):
         file_config = {
             "name": f"{shortuuid.random().lower()}",
             "mime_type": guess_mime_type(files),
-            # "http_options": {"timeout": 1111111}
+            "http_options": {"timeout": 300 * 1000}
         }
 
         return await self.client.aio.files.upload(file=io.BytesIO(await to_bytes(files)), config=file_config)
@@ -331,7 +354,7 @@ class Completions(object):
             api_key=api_key,
             http_options=HttpOptions(
                 base_url=self.base_url,
-                timeout=120 * 1000000,
+                timeout=300 * 1000,
             )
         )
 
@@ -350,7 +373,8 @@ if __name__ == '__main__':
         # {"type": "text", "text": "https://oss.ffire.cc/files/nsfw.jpg 移除右下角的水印"},
         # {"type": "text", "text": "https://oss.ffire.cc/files/kling_watermark.png 总结下"},
         # {"type": "text", "text": "https://oss.ffire.cc/files/nsfw.jpg 总结下"},
-        {"type": "text", "text": "https://lmdbk.com/5.mp4 总结下"},
+        # {"type": "text", "text": "https://lmdbk.com/5.mp4 总结下"},
+        {"type": "text", "text": "https://v3.fal.media/files/penguin/Rx-8V0MVgkVZM6PJ0RiPD_douyin.mp4 总结下"},
 
         # {"type": "text", "text": "总结下"},
         # {"type": "image_url", "image_url": {"url": url}},

meutils/apis/google/gemini_sdk.py

@@ -68,8 +68,7 @@ if __name__ == '__main__':
             max_output_tokens=None,
             # response_modalities=['Text', 'Image'],
 
-            thinking_config=ThinkingConfig(include_thoughts=True),
-
+            thinking_config=ThinkingConfig(include_thoughts=True, thinking_budget=24576),
         ),
 
         # history=[
@@ -124,7 +123,7 @@ if __name__ == '__main__':
     #
     async def main():
         message = [
-            Part.from_text(text="画条狗 带个眼镜"),
+            Part.from_text(text="1+1"),
             # pp
         ]
 
@@ -170,3 +169,26 @@ if __name__ == '__main__':
     arun(main())
 
 # ValueError: Message must be a valid part type: typing.Union[google.genai.types.File, google.genai.types.Part, PIL.Image.Image, str] or typing.Union[google.genai.types.File, google.genai.types.Part, PIL.Image.Image, str, google.genai.types.PartDict], got <class 'list'>
+
+"""
+curl "https://all.chatfire.cc/genai/v1beta/models/gemini-2.5-flash-preview-04-17:generateContent?key=AIzaSyCa8PYURpxFKz7yOtQB_O_wRfrX0gYh9L4" \
+-H 'Content-Type: application/json' \
+-X POST \
+-d '{
+  "contents": [
+    {
+      "parts": [
+        {
+          "text": "9.8 9.11 哪个大"
+        }
+      ]
+    }
+  ],
+  "generationConfig": {
+    "thinkingConfig": {
+        "includeThoughts": true,
+          "thinkingBudget": 1024
+    }
+  }
+}'
+"""

meutils/apis/google/upload.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : upload
+# @Time         : 2025/4/21 16:05
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+
+from meutils.pipe import *
+import asyncio
+import httpx
+import os
+import mimetypes
+import json
+import sys
+from pathlib import Path
+
+mime_type = mimetypes.guess_type("x.html")[0] or "application/octet-stream"
+
+print(mime_type)
+
+num_bytes = len(Path("x.html").read_bytes())
+
+headers = {
+    "X-Goog-Upload-Protocol": "resumable",
+    "X-Goog-Upload-Command": "start",
+    "X-Goog-Upload-Header-Content-Length": str(num_bytes),
+    "X-Goog-Upload-Header-Content-Type": mime_type,
+    "Content-Type": "application/json",
+
+
+
+}
+# payload = {'file': {'display_name': "TEXT"}}
+payload = {}
+base_url = "https://all.chatfire.cc/genai"
+
+client = httpx.Client(base_url=base_url, headers=headers)
+
+response = client.post("/upload/v1beta/files", params={"key": os.getenv("GOOGLE_API_KEY")}, json=payload)
+
+print(dict(response.headers))
+upload_url = response.headers.get("x-goog-upload-url")
+print(upload_url)
+
+headers = {"X-Goog-Upload-Offset": "0",
+    "X-Goog-Upload-Command": "upload, finalize", **headers}
+
+response = httpx.post(url=upload_url, headers=headers, content=Path("x.html").read_bytes())

meutils/apis/jimeng/images.py

@@ -49,7 +49,7 @@ async def create_draft_content(request: ImageRequest, token: str):
 
     height = width = 1328
     if 'x' in request.size:
-        height, width = map(int, request.size.split('x'))
+        width, height = map(int, request.size.split('x'))
 
     main_component_id = str(uuid.uuid4())
     if (urls := parse_url(request.prompt)) or image_uri:  # 图生  # todo: image base64

meutils/apis/proxy/kdlapi.py

@@ -31,22 +31,30 @@ async def get_one_proxy():
 if __name__ == '__main__':
     # arun(get_proxy_list())
 
-    page_url = "http://icanhazip.com/"  # 要访问的目标网页
+    page_url = "https://icanhazip.com/"  # 要访问的目标网页
+    # page_url = "https://httpbin.org/ip"
 
 
     async def fetch(url):
-        proxy = await get_one_proxy()
-        # proxy = "http://154.9.253.9:38443"
-
-        async with httpx.AsyncClient(proxy=proxy, timeout=20) as client:
+        # proxy = await get_one_proxy()
+        proxy = "http://154.9.253.9:38443"
+        # proxy="https://tinyproxy.chatfire.cn"
+        # proxy="https://pp.chatfire.cn"
+        proxy="http://110.42.51.201:38443"
+        proxy="http://110.42.51.223:38443"
+        proxy = "http://110.42.51.223:38443"
+
+        # proxy=None
+        proxy="https://npjdodcrxljt.ap-northeast-1.clawcloudrun.com"
+
+        async with httpx.AsyncClient(proxy=proxy, timeout=30) as client:
             resp = await client.get(url)
-            print(f"status_code: {resp.status_code}, content: {resp.content}")
-
+            logger.debug((f"status_code: {resp.status_code}, content: {resp.text}"))
 
     def run():
         loop = asyncio.get_event_loop()
         # 异步发出5次请求
-        tasks = [fetch(page_url) for _ in range(5)]
+        tasks = [fetch(page_url) for _ in range(3)]
         loop.run_until_complete(asyncio.wait(tasks))
 
 

meutils/apis/search/zhipu_web_search.py

@@ -90,7 +90,10 @@ class Completions(object):
             if isinstance(request, CompletionRequest):
                 if references:
                     urls = [f"[^{i}]: [{ref['title']}]({ref['link']})\n" for i, ref in enumerate(references, 1)]
-                    yield from urls
+
+                    for url in urls:
+                        yield url
+
                     references = []
 
                 delta = chat_completion_chunk.choices[0].delta.model_construct(**delta.model_dump())
@@ -119,5 +122,5 @@ if __name__ == '__main__':
 
         stream=True
     )
-    # arun(Completions().create(request))
+    print(Completions().create(request))
     # arun(Completions().query(request.last_user_content))

meutils/apis/volcengine_apis/images.py

@@ -89,15 +89,16 @@ if __name__ == '__main__':
     3D魔童哪吒 c4d 搬砖 很开心， 很快乐， 精神抖擞， 背景是数不清的敖丙虚化 视觉冲击力强 大师构图 色彩鲜艳丰富 吸引人 背景用黄金色艺术字写着“搬砖挣钱” 冷暖色对比
     """
 
-    prompt = """
-    https://oss.ffire.cc/files/kling_watermark.png
-    让这个女人带上眼镜 衣服换个颜色 
-    """
+    # prompt = """
+    # https://oss.ffire.cc/files/kling_watermark.png
+    # 让这个女人带上眼镜 衣服换个颜色
+    # """
 
     request = ImageRequest(
         model="high_aes_general_v30l_zt2i",
         prompt=prompt,
         response_format="url",
+        size="512x1328",
     )
 
     arun(generate(request, token=token))

meutils/data/VERSION

@@ -1 +1 @@
-2025.04.20.23.17.29
+2025.04.23.16.00.20

meutils/db/redis_db.py

@@ -94,5 +94,7 @@ if __name__ == '__main__':
 
     # arun(main())
 
-    r = redis_client.sadd('set1', 'a', 'b', 'c')
-    r = redis_client.sadd('set1', 'd')
+    # r = redis_client.sadd('set1', 'a', 'b', 'c')
+    # r = redis_client.sadd('set1', 'd')
+    k="meutils.config_utils.lark_utils.commonaget_spreadsheet_values()[(＇feishu_url＇, ＇https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?sheet=Gvm9dt＇), (＇to_dataframe＇, True)]	"
+    redis_client.delete(k)

meutils/io/files_utils.py

@@ -69,7 +69,7 @@ async def to_bytes(
     elif isinstance(file, str):
         if file.startswith('http'):
             logger.debug(f"FileType: HTTP")
-            async with AsyncClient(headers=headers or {}, timeout=120) as cilent:  # todo: 缓存 根据大小
+            async with AsyncClient(headers=headers or {}, timeout=300) as cilent:  # todo: 缓存 根据大小
                 resp = await cilent.get(file)
                 file_bytes = resp.content
 

meutils/llm/completions/assistants/zhipu.py

@@ -0,0 +1,225 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : zhipu_智能体
+# @Time         : 2024/12/30 17:34
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : https://bigmodel.cn/dev/api/intelligent-agent-model/assistantapi
+
+from meutils.pipe import *
+from meutils.llm.openai_utils import to_openai_params
+from meutils.llm.clients import AsyncOpenAI, zhipuai_sdk_client
+from meutils.str_utils.regular_expression import parse_url
+
+from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, CompletionRequest, CompletionUsage
+
+
+class Completions(object):
+
+    def __init__(self,
+                 base_url: Optional[str] = None,
+                 api_key: Optional[str] = None
+                 ):
+        pass
+
+    async def create(self, request: CompletionRequest):
+        # attachments = [{"file_id": "chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf"}]
+
+        chunks = zhipuai_sdk_client.assistant.conversation(
+            assistant_id=request.model,
+
+            model="glm-4-assistant",
+            messages=request.messages,
+            stream=True,
+            attachments=None,
+            metadata=None
+        )
+
+        references = {}
+        for chunk in chunks:
+            # logger.debug(chunk)
+            delta = chunk.choices[0].delta
+
+            if hasattr(delta, "tool_calls") and delta.tool_calls:
+                logger.debug(delta.tool_calls)
+
+                tool_call = delta.tool_calls[0].model_dump()
+                tool_type = tool_call.get("type", "")  # drawing_tool code_interpreter web_browser retrieval
+                outputs = tool_call.get(tool_type, {}).get("outputs") or []
+                # references += outputs
+
+                references.setdefault(tool_type, []).extend(outputs)
+
+                if not outputs:
+                    yield f"\n\n> {delta.model_dump_json(indent=4, exclude_none=True)}\n\n"
+                logger.debug(references)
+
+                continue
+
+            if hasattr(delta, "content"):
+                if references:
+                    for i in self.references2content(references):
+                        yield i
+                    references = {}
+                # logger.debug(delta.content)
+                yield delta.content
+
+            else:
+                logger.debug(delta)
+
+            # if references: # 搜索
+            #     urls = [f"[^{i}]: [{ref['title']}]({ref['link']})\n" for i, ref in enumerate(references, 1)]
+            #
+            #     for url in urls:
+            #         yield url
+            #
+            #     references = []
+            #
+            # delta = chat_completion_chunk.choices[0].delta.model_construct(**delta.model_dump())
+            # chat_completion_chunk.choices[0].delta = delta
+            # yield chat_completion_chunk
+
+    def references2content(self, references):
+        """drawing_tool code_interpreter web_browser retrieval"""
+        if outputs := references.get("web_browser"):
+            for i, ref in enumerate(outputs, 1):
+                # yield f"[^{i}]: [{ref['title']}]({ref['link']})\n"
+                yield f"[{ref['title']}]({ref['link']})\n"
+
+        elif outputs := references.get("drawing_tool"):
+            for i, ref in enumerate(outputs, 1):
+                yield f"![{i}]({ref['image']})\n"
+
+        yield "\n"
+
+    async def _create(self, request: CompletionRequest):
+        if request.last_user_content.startswith(("http",)):
+            file_url, text = request.last_user_content.split(maxsplit=1)
+
+            request.messages = [
+                {
+                    'role': 'user',
+                    'content': [
+                        {
+                            "type": "text",
+                            "text": text
+                        },
+
+                        {
+                            "type": "file",  # 不标准
+                            "file_url": {
+                                "url": file_url
+                            }
+                        }
+                    ]
+                }
+            ]
+
+        logger.debug(request)
+
+        data = to_openai_params(request)
+        return await self.client.chat.completions.create(**data)
+
+
+if __name__ == '__main__':
+    assistant_id = "65940acff94777010aa6b796"
+    # assistant_id = "65d2f07bb2c10188f885bd89"
+    # assistant_id="65a265419d72d299a9230616",
+    # assistant_id="659d051a5f14eb8ce1235b96",
+    # assistant_id="65d2f07bb2c10188f885bd89",
+
+    # assistant_id="659e54b1b8006379b4b2abd6",
+    # conversation_id=None,  # 多轮：从messages获取
+    # conversation_id="67dd1317d7c8fe4c9efe459a",
+    request = CompletionRequest(
+        model=assistant_id,
+        messages=[
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "text",
+                        # "text": "画条狗 输出两张图片",
+                        # "text": "南京天气如何",
+                        # "text": "https://sfile.chatglm.cn/chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf 总结这个文件",
+
+                        "text": "https://sfile.chatglm.cn/chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf 基于这个文件做个ppt"
+
+                        # "text": "周杰伦 【最新动态、相关信息或新闻】",
+                        # "text": "生成PPT"
+                    }]
+            }
+        ],
+
+        # messages=[
+        #     {
+        #         "role": "user",
+        #         "content": [
+        #             {
+        #                 "type": "text",
+        #                 "text": "基于这个内容做个ppt"
+        #             },
+        #             {
+        #                 "type": "file",
+        #                 "file": [
+        #                     {
+        #                         "file_id": "chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf",
+        #                         "file_url": "https://sfile.chatglm.cn/chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf",
+        #                         "file_name": "附件.大模型在合规管理工作中的应用.pdf",
+        #                         "file_size": 2571523,
+        #                         "order": 0,
+        #                         "maxReadPercent": 0,
+        #                         "cover_images": [],
+        #                         "url": "https://sfile.chatglm.cn/chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf"
+        #                     }
+        #                 ]
+        #             }
+        #         ]
+        #     }
+        # ]
+    )
+
+    arun(Completions().create(request))
+    # 输入 输出
+    # input
+    # {
+    #     "assistant_id": "65d2f07bb2c10188f885bd89",
+    #     "conversation_id": "67d932d5e579c3ded42aa80e",
+    #     "meta_data": {
+    #         "if_plus_model": false,
+    #         "is_test": false,
+    #         "input_question_type": "xxxx",
+    #         "channel": "",
+    #         "draft_id": "",
+    #         "quote_log_id": "",
+    #         "platform": "pc"
+    #     },
+    #     "messages": [
+    #         {
+    #             "role": "user",
+    #             "content": [
+    #                 {
+    #                     "type": "text",
+    #                     "text": "基于这个内容做个ppt"
+    #                 },
+    #                 {
+    #                     "type": "file",
+    #                     "file": [
+    #                         {
+    #                             "file_id": "chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf",
+    #                             "file_url": "https://sfile.chatglm.cn/chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf",
+    #                             "file_name": "附件.大模型在合规管理工作中的应用.pdf",
+    #                             "file_size": 2571523,
+    #                             "order": 0,
+    #                             "maxReadPercent": 0,
+    #                             "cover_images": [],
+    #                             "url": "https://sfile.chatglm.cn/chatglm4/3db10f79-a952-4987-83d2-cf0cfd5d5530.pdf"
+    #                         }
+    #                     ]
+    #                 }
+    #             ]
+    #         }
+    #     ]
+    # }