MeUtils 2025.2.18.19.56.22__py3-none-any.whl → 2025.2.20.17.30.7__py3-none-any.whl

meutils/apis/jimeng/images.py

@@ -7,9 +7,14 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
+"""
+guidance 控制精细度 => sample_strength 0-1 数值越大生成的效果质量越好，耗时会更久
+
+"""
 
 from meutils.pipe import *
 from meutils.caches.redis_cache import cache
+from meutils.decorators.retry import retrying
 
 from meutils.schemas.jimeng_types import BASE_URL, MODELS_MAP, FEISHU_URL
 from meutils.schemas.image_types import ImageRequest
@@ -137,7 +142,7 @@ async def create_draft_content(request: ImageRequest, token: str):
                         "prompt": request.prompt,
                         "negative_prompt": request.negative_prompt or "",
                         "seed": request.seed or 426999300,
-                        "sample_strength": 0.5,
+                        "sample_strength": request.guidance or 0.5,  # 精细度
                         "image_ratio": 1,
                         "large_image_info": {
                             "type": "",
@@ -170,6 +175,7 @@ async def create_draft_content(request: ImageRequest, token: str):
     return draft_content
 
 
+@retrying(max_retries=3)
 async def create_task(request: ImageRequest, token: Optional[str] = None):
     token = token or await get_next_token_for_polling(FEISHU_URL, check_token)
 
@@ -221,6 +227,7 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):
         )
 
 
+@retrying()
 async def get_task(task_id, token):
     url = "/mweb/v1/get_history_by_ids"
     headers = get_headers(url, token)
@@ -270,11 +277,14 @@ async def get_task(task_id, token):
 # @cache: todo: cache 积分异常消耗
 # @cache(ttl=3600)
 async def generate(request: ImageRequest):
+    # logger.debug(request)
+
     task_response = await create_task(request)
 
-    for i in range(1, 10):
-        await asyncio.sleep(max(10 / i, 1))
+    for i in range(1, 15):
+        await asyncio.sleep(max(15 / i, 5))
         response = await get_task(task_response.task_id, task_response.system_fingerprint)
+        logger.debug(f"{task_response.task_id, task_response.system_fingerprint}")
         logger.debug(response)
         if response.status.lower().startswith("fail"):
             raise HTTPException(
@@ -320,11 +330,11 @@ if __name__ == '__main__':
     data = {
         "model": "seededit",
         "prompt": "https://oss.ffire.cc/files/kling_watermark.png 让这个女人带上墨镜，衣服换个颜色",
-        "size": "1024x1024"
+        "size": "1024x1024",
     }
-    # arun(generate(ImageRequest(**data)))
+    arun(generate(ImageRequest(**data)))
 
-    arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))
+    # arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))
     # prompt = "A plump Chinese beauty wearing a wedding dress revealing her skirt and underwear is swinging on the swing,Happy smile,cleavage,Exposed thighs,Spread your legs open,Extend your leg,panties,upskirt,Barefoot,sole"
     # request = ImageRequest(prompt=prompt)
     # task = arun(create_task(request))

meutils/apis/search/zhipu.py

@@ -0,0 +1,80 @@
+#!/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))

meutils/apis/vidu/vidu_video.py

@@ -208,7 +208,8 @@ if __name__ == '__main__':
     d = {
         "model": 'vidu-2.0',
         "prompt": "这个女人笑起来",
-        "url": "https://oss.ffire.cc/files/kling_watermark.png"  # failed to save uploads
+        "url": "https://oss.ffire.cc/files/kling_watermark.png",  # failed to save uploads
+        "tail_image_url": "https://oss.ffire.cc/files/kling_watermark.png",
     }
     token = None
     # print(bjson(ViduRequest(**d).payload))

meutils/caches/acache.py

@@ -27,7 +27,7 @@ async def cached_fc(user_id, **kwargs):
 rcache = RedisCache(
     endpoint="127.0.0.1", port=6379, namespace="me"  # 缓存键前缀
 )
-@cached(ttl=60, cache=rcache)
+@cached(cache=rcache)
 async def redis_fc(user_id, **kwargs):
     logger.debug(user_id)
     return False

meutils/data/VERSION

@@ -1 +1 @@
-2025.02.18.19.56.22
+2025.02.20.17.30.07

meutils/decorators/contextmanagers.py

@@ -11,6 +11,7 @@
 from meutils.pipe import *
 
 from contextlib import contextmanager, asynccontextmanager
+from concurrent.futures import ThreadPoolExecutor, as_completed, TimeoutError
 
 
 @contextmanager
@@ -56,10 +57,52 @@ async def atry_catcher(task="Task", fallback: Callable = None, is_trace: bool =
             yield await fallback()
 
 
+@contextmanager
+def timeout_task_executor(timeout: float=3, max_workers: int = None):
+    """
+    一个上下文管理器，用于执行任务并设置超时时间。
+    :param timeout: 超时时间（秒）。
+    :param max_workers: 线程池的最大工作线程数，默认为 None（由系统决定）。
+    """
+    executor = ThreadPoolExecutor(max_workers=max_workers)
+
+    def execute_task(task: Callable[[], Any]) -> Any:
+        """
+        在上下文中执行任务，并设置超时时间。
+        :param task: 要执行的任务函数。
+        :return: 任务的结果。如果超时，抛出 TimeoutError。
+        """
+        future = executor.submit(task)
+        try:
+            return future.result(timeout=timeout)
+        except TimeoutError:
+            logger.error(f"Task was terminated due to timeout after {timeout} seconds.")
+            return None
+
+    try:
+        yield execute_task  # 返回一个可调用对象，用于执行任务
+    finally:
+        executor.shutdown(wait=False)  # 不等待未完成的任务，直接关闭
+
+
 if __name__ == '__main__':
-    async def f():
-        return 1/0
+    # async def f():
+    #     return 1/0
+    #
+    #
+    # with try_catcher("test"):
+    #     arun(f())
+
+    def example_task():
+        print("Starting task...")
+        time.sleep(4)  # 模拟耗时任务
+        print("Task completed!")
+        return "Done"
 
 
-    with try_catcher("test"):
-        arun(f())
+    with timeout_task_executor(timeout=3) as execute:
+        try:
+            result = execute(example_task)
+            print(f"Task result: {result}")
+        except TimeoutError:
+            print("Task did not complete in time.")

meutils/llm/check_utils.py

@@ -97,7 +97,7 @@ if __name__ == '__main__':
     check_valid_token = partial(check_token_for_siliconflow, threshold=-1)
 
     pass
-    arun(check_valid_token("sk-sjfqlwkuqkkrrgfguxckuagmuhzmvxuxocgvxjgygxwsqawr", threshold=0.1))
+    arun(check_valid_token("sk-geevdizajhngehlkrjlgwcugcunrircpezhqijrscmtiafxj", threshold=0.1))
 
     FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=KVClcs"
 

meutils/llm/prompts/search_prompts.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : search_prompt
+# @Time         : 2025/2/19 10:37
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 提示词模板
+
+from meutils.pipe import *
+
+current_date = datetime.datetime.now().strftime("%Y-%m-%d")
+
+system_prompt = f"""你是一个具备网络访问能力的智能助手，在适当情况下，优先使用网络信息（参考信息）来回答，
+以确保用户得到最新、准确的帮助。当前日期是 {current_date}。"""
+
+# deepseek_prompt

meutils/schemas/image_types.py

@@ -83,7 +83,7 @@ class ImageRequest(BaseModel):  # openai
 
     # oneapi
     negative_prompt: Optional[str] = None
-    guidance: Optional[int] = None
+    guidance: Optional[float] = None
     steps: Optional[int] = None
 
     controls: Optional[dict] = {}  # 额外参数
@@ -479,6 +479,9 @@ class ImageProcess(BaseModel):
 
     response_format: Literal["url", "b64_json"] = "url"
 
+    # class Config:
+    #     extra = "allow"
+
 
 if __name__ == '__main__':
     # print(ASPECT_RATIOS.items())

meutils/schemas/oneapi/common.py

@@ -412,7 +412,7 @@ MODEL_RATIO = {
     "qwen2.5-coder-7b-instruct": 0.05,
     "qwen2.5-7b-instruct": 0.05,
     "qwen2.5-14b-instruct": 0.25,
-    "qwen2.5-32b-instruct": 0.5,
+    "qwen2.5-32b-instruct": 1,
     "qwen2.5-72b-instruct": 2,
     "qwen2.5-math-72b-instruct": 2,
     "qwen2.5-coder-32b-instruct": 0.5,
@@ -568,7 +568,7 @@ MODEL_RATIO = {
     "ERNIE-3.5-128K": 4,
 
     "ERNIE-4.0-Turbo-8K": 15,
-    "ERNIE-4.0-8K": 20,
+    "ERNIE-4.0-8K": 10,
 
     "text-ada-001": 0.2,
     "text-babbage-001": 0.25,
@@ -622,9 +622,9 @@ MODEL_RATIO = {
     "google/gemini-flash-1.5-exp": 0.1,  # openrouter免费
     "google/gemini-flash-1.5-8b-exp": 0.1,  # openrouter免费
 
-    "gemini-2.0-flash": 0.075,
-    "gemini-2.0-flash-001": 0.075,
-    "gemini-2.0-flash-lite-preview-02-05": 0.075,
+    "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-pro": 1.25,
     "gemini-2.0-pro-exp-02-05": 1.25,
@@ -735,6 +735,8 @@ MODEL_RATIO = {
     "ep-20240515073409-dlpqp": 5,
     "microsoft/phi-4": 0.035 * 5,
 
+    "meta-llama/Llama-3.2-11B-Vision-Instruct": 0.1,
+
 }
 
 COMPLETION_RATIO = {
@@ -915,6 +917,8 @@ COMPLETION_RATIO = {
     "step-1.5v-mini": 5,
     "step-1o-vision-32k": 5,
 
+    "meta-llama/Llama-3.2-11B-Vision-Instruct": 4
+
 }
 
 REDIRECT_MODEL = {

meutils/schemas/vidu_types.py

@@ -92,10 +92,13 @@ class VideoRequest(BaseModel):
 
 class ViduRequest(BaseModel):
     """quality 倍率2"""
-    model: Union[str, Literal['vidu-1.5', 'vidu-high-performance', 'vidu-high-quality']] = "vidu-high-performance"
+    model: Union[str, Literal['vidu-2.0', 'vidu-1.5', 'vidu-high-performance', 'vidu-high-quality']] = "vidu-high-performance"
 
     prompt: Optional[str] = None
+
     url: Optional[str] = None  # ssupload:?id=
+    tail_image_url: Optional[str] = None
+
     style: str = "general"  # anime
     aspect_ratio: str = "16:9"
     duration: int = 4
@@ -103,7 +106,7 @@ class ViduRequest(BaseModel):
     type: Optional[str] = None  # text2video img2video character2video headtailimg2video
 
     """vidu-1.5"""
-    resolution: Literal['512', '720p', 'vidu-high-quality'] = "512"
+    resolution: Union[str, Literal['512', '720p', '1080p']] = "512"
     movement_amplitude: Optional[str] = "auto"  # small medium high
 
     sample_count: int = 1
@@ -143,6 +146,17 @@ class ViduRequest(BaseModel):
                 }
             )
 
+        if self.tail_image_url:
+            type = "headtailimg2video"
+            input['prompts'].append(
+                {
+                    "type": "image",
+                    "content": self.tail_image_url,
+                    "src_imgs": [self.tail_image_url, ]
+                }
+            )
+
+
         if self.model in ("vidu-1.5", "vidu-2.0"):
             self.payload = {
                 "input": input,

meutils/str_utils/json_utils.py

@@ -52,6 +52,7 @@ def json_loads(s):
 
 
 def json_path(obj, expr):  # todo: 缓存
+    """$..["keywords","query","search_result"]"""
     if isinstance(obj, dict):
         pass
     elif isinstance(obj, str):

meutils/str_utils/regular_expression.py

@@ -145,9 +145,14 @@ if __name__ == '__main__':
     print(parse_url(text, for_image=False))
 
     d = {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"}
-    print(parse_url(str(d)))
+    # print(parse_url(str(d)))
 
-    print('https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\\n\\n'.strip(r"\n"))
+
+    text = "https://sc-maas.oss-cn-shanghai.aliyuncs.com/outputs/bb305b60-d258-4542-8b07-5ced549e9896_0.png?OSSAccessKeyId=LTAI5tQnPSzwAnR8NmMzoQq4&Expires=1739948468&Signature=NAswPSXj4AGghDuoNX5rVFIidcs%3D 笑起来"
+
+    print(parse_url(text))
+
+    # print('https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\\n\\n'.strip(r"\n"))
 
     # print(parse_url("http://154.3.0.117:39666/docs#/default/get_content_preview_spider_playwright_get"))