MeUtils 2024.12.23.16.36.51__tar.gz → 2024.12.26.22.14.1__tar.gz

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1/MeUtils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.23.16.36.51
+Version: 2024.12.26.22.14.1
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -108,42 +108,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 Provides-Extra: all
-Requires-Dist: missingno; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: pymupd; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: pandas_summary; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: reportlab; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
 Requires-Dist: faiss-cpu; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: missingno; extra == "all"
+Requires-Dist: schedule; extra == "all"
+Requires-Dist: simplejson; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
 Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: streamlit; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
+Requires-Dist: langchain; extra == "all"
+Requires-Dist: pymongo; extra == "all"
+Requires-Dist: seaborn; extra == "all"
 Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: schedule; extra == "all"
-Requires-Dist: thefuck; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
 Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: polars; extra == "all"
 Requires-Dist: jmespath; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
 Requires-Dist: geopy; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: seaborn; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: pymongo; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
 Requires-Dist: jinja2; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: pymupd; extra == "all"
+Requires-Dist: pymysql; extra == "all"
+Requires-Dist: streamlit; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/MeUtils.egg-info/SOURCES.txt

@@ -180,6 +180,7 @@ meutils/apis/oneapi/log.py
 meutils/apis/oneapi/token.py
 meutils/apis/oneapi/token_.py
 meutils/apis/oneapi/user.py
+meutils/apis/oneapi/utils.py
 meutils/apis/pixverse/__init__.py
 meutils/apis/pixverse/pixverse.py
 meutils/apis/proxy/__init__.py
@@ -302,6 +303,7 @@ meutils/decorators/decorator_demo.py
 meutils/decorators/demo.py
 meutils/decorators/fastapi_decorator.py
 meutils/decorators/feishu.py
+meutils/decorators/polling.py
 meutils/decorators/retry.py
 meutils/decorators/scheduler.py
 meutils/decorators/schedulers.py
@@ -361,6 +363,7 @@ meutils/llm/completions/cp.py
 meutils/llm/completions/delilegal.py
 meutils/llm/completions/dify.py
 meutils/llm/completions/kimi.py
+meutils/llm/completions/modelscope.py
 meutils/llm/completions/oi.py
 meutils/llm/completions/rag.py
 meutils/llm/completions/tryblend.py

{meutils-2024.12.23.16.36.51/MeUtils.egg-info → meutils-2024.12.26.22.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.23.16.36.51
+Version: 2024.12.26.22.14.1
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -108,42 +108,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 Provides-Extra: all
-Requires-Dist: missingno; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: pymupd; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: pandas_summary; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: reportlab; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
 Requires-Dist: faiss-cpu; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: missingno; extra == "all"
+Requires-Dist: schedule; extra == "all"
+Requires-Dist: simplejson; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
 Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: streamlit; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
+Requires-Dist: langchain; extra == "all"
+Requires-Dist: pymongo; extra == "all"
+Requires-Dist: seaborn; extra == "all"
 Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: schedule; extra == "all"
-Requires-Dist: thefuck; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
 Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: polars; extra == "all"
 Requires-Dist: jmespath; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
 Requires-Dist: geopy; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: seaborn; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: pymongo; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
 Requires-Dist: jinja2; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: pymupd; extra == "all"
+Requires-Dist: pymysql; extra == "all"
+Requires-Dist: streamlit; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/apis/chatglm/glm_video_api.py

@@ -14,6 +14,8 @@ from meutils.notice.feishu import send_message as _send_message
 from meutils.config_utils.lark_utils import get_next_token_for_polling
 
 from meutils.schemas.video_types import VideoRequest
+from meutils.schemas.image_types import ImageRequest, ImagesResponse
+from meutils.str_utils.regular_expression import parse_url
 
 send_message = partial(
     _send_message,
@@ -60,6 +62,28 @@ async def get_task(task_id, api_key):
     )
     return response
 
+
+async def generate(request: ImageRequest, n: int = 30):  # 兼容dalle3
+    request.model = "cogvideox-flash"
+    # request.duration = 10 # 模型后缀
+
+    url = None
+    if urls := parse_url(request.prompt):
+        url = urls[-1]
+        request.prompt = request.prompt.replace(url, "")
+
+    request = VideoRequest(image_url=url, **request.model_dump(exclude_none=True))
+    task_response = await create_task(request)
+
+    for i in range(n):
+        await asyncio.sleep(max(1., n / (i + 1)))
+        response = await get_task(task_response.id, task_response.system_fingerprint)
+
+        logger.debug(response)
+        if response.task_status == "SUCCESS" or response.video_result:
+            return ImagesResponse(data=response.model_dump()["video_result"])
+
+
 # {
 #     "model": "cogvideox",
 #     "request_id": "8868902201637896192",
@@ -78,7 +102,15 @@ async def get_task(task_id, api_key):
 
 # VideoResult
 if __name__ == '__main__':
-
     api_key = "e21bd630f681c4d90b390cd609720483.WSFVgA3Kk1wNCX0mN"
-    r = arun(create_task(VideoRequest(), api_key=api_key))
+    api_key = "7d10426c06afa81e8d7401d97781249c.DbqlSsicRtaUdKXI"  # 新号
+
+    request = VideoRequest(
+        model='cogvideox-flash'
+    )
+    # r = arun(create_task(request, api_key=api_key))
     pass
+
+    request = ImageRequest(prompt="https://oss.ffire.cc/files/kling_watermark.png 让这个女人笑起来")
+
+    arun(generate(request, n=30))

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/apis/hailuoai/videos.py

@@ -335,7 +335,7 @@ async def get_task(task_id: str, token: str):
         response = VideoResponse(
             task_id=task_id,
             base_resp=data.get('statusInfo', {}),
-            videos=data.get('data', {}).get("videos")
+            videos=(data.get('data') or {}).get("videos")
         )
         return response
 

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/apis/jimeng/common.py

@@ -89,8 +89,8 @@ async def get_credit(token):
 async def check_token(token, threshold: int = 1):
     try:
         response = await get_credit(token)
+        logger.debug(bjson(response))
         credits = sum(response['data']['credit'].values())
-        # logger.debug(credits)
         return credits >= threshold
     except Exception as e:
         return False
@@ -244,8 +244,11 @@ async def create_draft_content(request: ImageRequest, token: str):
 if __name__ == '__main__':
     token = "693701c43e477b7c405cc7e2fef0ddbd"
     token = "eb4d120829cfd3ee957943f63d6152ed"
-    arun(get_credit(token))
-    # arun(check_token(token))
+    token = "dcf7bbc31faed9740b0bf748cd4d2c74"
+    token = "38d7d300b5e0a803431ef88d8d2acfef"
+    token = "916fed81175f5186a2c05375699ea40d"
+    # arun(get_credit(token))
+    arun(check_token(token))
 
     # arun(get_upload_token(token))
     #

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/apis/jimeng/images.py

@@ -70,6 +70,7 @@ async def get_task(task_id, token):
         response = await client.post(url, json=payload)
         response.raise_for_status()
         data = response.json()
+        logger.debug(bjson(data))
         # {'ret': '1015', 'errmsg': 'login error', 'systime': '1734524280', 'logid': '20241218201800AC3267447B287E9E6C46', 'data': None}
         item_list = (data.get("data") or {}).get(task_id, {}).get("item_list")
         image_data = map(lambda x: x.get("image", {}).get("large_images"), item_list)
@@ -84,13 +85,23 @@ async def get_task(task_id, token):
         )
 
 
+async def generate(request: ImageRequest):
+    task_response = await create_task(request)
+    for i in range(1, 10):
+        await asyncio.sleep(max(10 / i, 1))
+        response = await get_task(task_response.task_id, task_response.system_fingerprint)
+        logger.debug(response)
+        if data := response.data:
+            return {"data": data}
+
+
 if __name__ == '__main__':
-    token = "693701c43e477b7c405cc7e2fef0ddbd"
+    token = "eb4d120829cfd3ee957943f63d6152ed"
 
-    request = ImageRequest(prompt="一个漂亮的姑娘", size="1024x1024")
+    # request = ImageRequest(prompt="做一个圣诞节的海报", size="1024x1024")
     # request = ImageRequest(prompt="https://oss.ffire.cc/files/kling_watermark.png 让她带上墨镜", size="1024x1024")
 
-    arun(create_task(request))
+    # task = arun(create_task(request))
 
     # task_id = "10040025470722"
 
@@ -103,3 +114,7 @@ if __name__ == '__main__':
     # task_id = "10082971040514"
     #
     # arun(get_task(task_id, token))
+
+    # arun(get_task(task.task_id, task.system_fingerprint))
+
+    arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/apis/kling/kolors_virtual_try_on.py

@@ -10,10 +10,13 @@
 import jwt
 
 from meutils.pipe import *
-from meutils.schemas.task_types import TaskResponse  ############# 根据这个重构
+from meutils.schemas.task_types import TaskResponse
+from meutils.schemas.image_types import ImageRequest, ImagesResponse
+
 from meutils.schemas.kling_types import API_BASE_URL, TryOnRequest, TaskResponse
 from meutils.config_utils.lark_utils import get_next_token_for_polling
 from meutils.decorators.retry import retrying
+from meutils.str_utils.regular_expression import parse_url
 
 FEISHU_URL = "https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?sheet=cjTepf"
 
@@ -39,7 +42,7 @@ def encode_jwt_token(token):
 ######################################################################
 @alru_cache(ttl=3600)
 @retrying(title=__name__)
-async def create_task(request: TryOnRequest, token: Optional[str] = None):  ###### 所有的 TaskResponse标准化
+async def create_task(request: TryOnRequest, token: Optional[str] = None):
     token = token or await get_next_token_for_polling(FEISHU_URL)
     token = encode_jwt_token(token)
 
@@ -68,8 +71,23 @@ async def get_task(task_id, token):
         return TaskResponse(**data)
 
 
+async def generate(request: ImageRequest):
+    human_image, cloth_image = parse_url(request.prompt)  # 两张图片
+
+    request = TryOnRequest(human_image=human_image, cloth_image=cloth_image)
+    task_response = await create_task(request)
+
+    for i in range(1, 10):
+        await asyncio.sleep(max(10 / i, 1))
+
+        response = await get_task(task_response.data.task_id, task_response.system_fingerprint)
+        if task_result := response.data.task_result:
+            images = task_result.get('images', [])
+            return ImagesResponse(data=images)
+
+
 if __name__ == '__main__':
-    request = TryOnRequest()
+    # request = TryOnRequest()
     # arun(create_task(request))
     # {
     #     "code": 0,
@@ -83,5 +101,11 @@ if __name__ == '__main__':
     #     }
     # }
 
-    token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJkMmU1NmZkY2ZiODY0MmZmYWEyMjZlZWIxNzY4MzMyMiIsImV4cCI6MTczMzE4OTI4OSwibmJmIjoxNzMzMTAyODg0fQ.YjB792REbuFaUoyUXvd5bpI76_0PBWawDHDjPHOBA5Q'
-    arun(get_task("CjiL9mdJhswAAAAAAG2C6g", token))
+    # token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJkMmU1NmZkY2ZiODY0MmZmYWEyMjZlZWIxNzY4MzMyMiIsImV4cCI6MTczMzE4OTI4OSwibmJmIjoxNzMzMTAyODg0fQ.YjB792REbuFaUoyUXvd5bpI76_0PBWawDHDjPHOBA5Q'
+    # arun(get_task("CjiL9mdJhswAAAAAAG2C6g", token))
+
+    human_image: str = "https://oss.ffire.cc/files/try-on.png"
+    cloth_image: str = "https://oss.ffire.cc/files/x.png"
+
+    request = ImageRequest(prompt=f"{human_image}\n{cloth_image}")
+    arun(generate(request))

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/apis/oneapi/user.py

@@ -91,10 +91,10 @@ async def put_user(payload, add_money: float = 0):
 
 if __name__ == '__main__':
     # api-key => get_one_log => get_user => put_user
-    # arun(get_user(814))
+    arun(get_user(814))
     # payload = arun(get_user(924))
     # print(payload)
     # arun(put_user(payload, -1))
 
-    arun(get_api_key_log('sk-gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv'))
-    # arun(get_user_money("sk-1UNhOrvuJ4PeBBpsB202577c14114f7fA234F32d3e8dF767"))
+    # arun(get_api_key_log('sk-gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv'))
+    # arun(get_user_money("sk-gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv"))

meutils-2024.12.26.22.14.1/meutils/apis/oneapi/utils.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : utils
+# @Time         : 2024/12/25 18:13
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+
+from meutils.caches.redis_cache import cache
+from meutils.db.orm import select_first
+from meutils.schemas.db.oneapi_types import OneapiTask, OneapiUser, OneapiToken
+
+
+# engine
+
+
+@cache()
+async def token2user(api_key: str):
+    logger.debug(api_key)
+    filter_kwargs = {
+        "key": api_key[3:],
+    }
+
+    return await select_first(OneapiToken, filter_kwargs)
+
+
+if __name__ == '__main__':
+    arun(token2user('sk-q3uMFm0TFWi5lBQVhGwAWKup28j4omr9vThL4V5ynvdWdeZ8'))

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/async_utils/common.py

@@ -10,7 +10,7 @@
 
 import inspect
 import asyncio
-from typing import Union, Any, Coroutine, AsyncIterator, Iterator, Iterable, AsyncIterable
+from typing import Union, Any, Coroutine, AsyncIterator, Iterator, Iterable, AsyncIterable, Optional, Callable
 
 import numpy as np
 import pandas as pd
@@ -146,6 +146,16 @@ async def arequest(url, method='get', payload=None, **client_params):
         return resp
 
 
+async def poll(fn, n: int = 30, sleep_fn: Optional[Callable] = None):
+    if sleep_fn is None:
+        sleep_fn = lambda i: max(n / (i + 1), 1)  # 预估大概 2~3 *n
+
+    for i in range(n):
+        await asyncio.sleep(sleep_fn(i))
+        if _ := await fn():  # 跳出
+            return _
+
+
 if __name__ == '__main__':
     from meutils.pipe import *
 

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/common.py

@@ -31,6 +31,8 @@ import warnings
 warnings.filterwarnings("ignore")
 
 import functools
+from functools import wraps
+
 import argparse
 import traceback
 import threading

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/config_utils/lark_utils/common.py

@@ -382,5 +382,5 @@ if __name__ == '__main__':
     # with timer():
     #     token = arun(get_next_token(feishu_url))
 
-    FEISHU_URL = "https://xchatllm.feishu.cn/sheets/XfjqszII3hZAEvtTOgecOgv2nye?sheet=c14b34"
-    print(arun(get_series(FEISHU_URL)))
+    # FEISHU_URL = "https://xchatllm.feishu.cn/sheets/XfjqszII3hZAEvtTOgecOgv2nye?sheet=c14b34"
+    # print(arun(get_series(FEISHU_URL)))

meutils-2024.12.26.22.14.1/meutils/data/VERSION

@@ -0,0 +1 @@
+2024.12.26.22.14.01

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/data/oneapi/NOTICE.md

@@ -31,6 +31,16 @@
 
 </details>
 
+## 2024-12-24
+- 上线新模型
+  - doubao-pro-256k：相比Doubao-pro-128k/240628，长文任务效果显著提升10%以上，要点提取、字数遵循、多轮对话上文记忆等能力大幅提升
+  - [qvq-72b-preview](https://mp.weixin.qq.com/s/WzL7tbFUZOgE2IFMeHT-sQ)：Qwen开源视觉推理模型QVQ，更睿智地看世界！
+
+- 增加gemini-2.0配额，支持多模型，默认分组可用
+    - "gemini-2.0-flash"
+    - "gemini-2.0-flash-exp"
+
+
 ## 2024-12-20
 - 修复SunoV4无水印版本
   - [异步任务接口文档](https://api.chatfire.cn/docs/api-246593467)

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/db/orm.py

@@ -97,6 +97,16 @@ async def update_or_insert(entity, filter_kwargs: Optional[dict] = None, update_
             return data
 
 
+async def select_first(entity, filter_kwargs: Optional[dict] = None):
+    async with AsyncSession(engine) as session:
+        statement = select(entity).filter_by(**filter_kwargs)
+
+        if result := await session.exec(statement):
+            _ = result.first()
+            logger.debug(_)
+            return _
+
+
 if __name__ == '__main__':
     pass
 
@@ -124,21 +134,46 @@ if __name__ == '__main__':
     #
     # arun(create_db_and_tables())
 
-    from meutils.schemas.db.oneapi_types import OneapiTask
+    from meutils.schemas.db.oneapi_types import OneapiTask, OneapiUser, OneapiToken
+
+    # filter_kwargs = {
+    #     "task_id": "888",
+    # }
+    #
+    #
+    # async def main():
+    #     async with AsyncSession(engine) as session:
+    #         statement = select(OneapiTask).filter_by(**filter_kwargs)
+    #         result = await session.exec(statement)
+    #         logger.debug(result)
+    #         if result:
+    #             logger.debug(result.first())
+    #         # await session.commit()
+    #
+    #
+    # arun(update_or_insert(OneapiTask, filter_kwargs))
 
     filter_kwargs = {
-        "task_id": "888",
+        "id": "1",
     }
 
 
     async def main():
         async with AsyncSession(engine) as session:
-            statement = select(Tasks).filter_by(**filter_kwargs)
+            # filter_kwargs = {
+            #     "id": "1",
+            # }
+            # statement = select(OneapiUser).filter_by(**filter_kwargs)
+
+            filter_kwargs = {
+                "key": "gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv",
+            }
+            statement = select(OneapiToken).filter_by(**filter_kwargs)
+
             result = await session.exec(statement)
-            logger.debug(result)
             if result:
                 logger.debug(result.first())
             # await session.commit()
 
 
-    arun(update_or_insert(Tasks, filter_kwargs))
+    arun(main())

{meutils-2024.12.23.16.36.51 → meutils-2024.12.26.22.14.1}/meutils/db/redis_db.py

@@ -28,9 +28,6 @@ if REDIS_URL := os.getenv("REDIS_URL"):
     # redis_client = Redis.from_url(REDIS_URL, **kwargs)
     # redis_aclient = AsyncRedis.from_url(REDIS_URL, **kwargs)
 
-
-
-
 else:
     redis_client = Redis(**kwargs)  # decode_responses=True
     redis_aclient = AsyncRedis(**kwargs)
@@ -76,9 +73,15 @@ if __name__ == '__main__':
     #
     # arun(redis_aclient.select(1))
 
+    # async def main():
+    #     r = await redis_aclient.select(1)
+    #     return await redis_aclient.get(task_id)
+    #
+    #
+    # arun(main())
+
     async def main():
-        r = await redis_aclient.select(1)
-        return await redis_aclient.get(task_id)
+        return await redis_aclient.lpop("redis_key")
 
 
     arun(main())

meutils-2024.12.26.22.14.1/meutils/decorators/polling.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : polling
+# @Time         : 2024/12/26 14:08
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+import time
+
+from meutils.pipe import *
+
+
+def poll(n: int = 30, sleep_fn: Optional[Callable] = None):
+    if sleep_fn is None:
+        sleep_fn = lambda i: max(n / (i + 1), 1)  # 预估大概 2~3 *n
+
+    def decorator(fn):
+        is_coroutine = inspect.iscoroutinefunction(fn)
+
+        @wraps(fn)
+        async def wrapper(*args, **kwargs):
+            for i in range(n):
+                await asyncio.sleep(sleep_fn(i))
+                # 根据函数类型选择调用方式
+                result = await fn(*args, **kwargs) if is_coroutine else fn(*args, **kwargs)
+                if result:  # 跳出
+                    return result
+            return None
+
+        return wrapper
+
+    return decorator
+
+
+if __name__ == '__main__':
+    @poll(n=5)
+    async def check_something():
+        # 你的检查逻辑
+
+        logger.debug(time.ctime())
+        return {"status": "ok"}
+
+
+    arun(check_something())

meutils-2024.12.26.22.14.1/meutils/llm/completions/modelscope.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : modelscope
+# @Time         : 2024/12/25 11:01
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *