MeUtils 2024.11.29.18.57.29__py3-none-any.whl → 2024.11.29.20.22.18__py3-none-any.whl

{MeUtils-2024.11.29.18.57.29.dist-info → MeUtils-2024.11.29.20.22.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.11.29.18.57.29
+Version: 2024.11.29.20.22.18
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -61,42 +61,42 @@ Requires-Dist: sse-starlette ; extra == 'ai'
 Requires-Dist: openai ; extra == 'ai'
 Requires-Dist: langchain ; extra == 'ai'
 Provides-Extra: all
-Requires-Dist: pretty-errors ; extra == 'all'
-Requires-Dist: jieba ; extra == 'all'
-Requires-Dist: jinja2 ; extra == 'all'
-Requires-Dist: redis-py-cluster ; extra == 'all'
 Requires-Dist: uvicorn ; extra == 'all'
-Requires-Dist: asyncmy ; extra == 'all'
-Requires-Dist: seaborn ; extra == 'all'
-Requires-Dist: sqlalchemy ; extra == 'all'
+Requires-Dist: polars ; extra == 'all'
 Requires-Dist: geopy ; extra == 'all'
-Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
-Requires-Dist: thriftpy2 ; extra == 'all'
-Requires-Dist: missingno ; extra == 'all'
-Requires-Dist: fastapi[all] ; extra == 'all'
-Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: fastapi ; extra == 'all'
 Requires-Dist: pymysql ; extra == 'all'
-Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: pymupd ; extra == 'all'
+Requires-Dist: pymilvus ; extra == 'all'
 Requires-Dist: jmespath ; extra == 'all'
-Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: fastapi[all] ; extra == 'all'
+Requires-Dist: pymupd ; extra == 'all'
+Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: gunicorn ; extra == 'all'
+Requires-Dist: jieba ; extra == 'all'
+Requires-Dist: schedule ; extra == 'all'
+Requires-Dist: sqlalchemy ; extra == 'all'
+Requires-Dist: thefuck ; extra == 'all'
 Requires-Dist: pandas-summary ; extra == 'all'
-Requires-Dist: simplejson ; extra == 'all'
-Requires-Dist: openai ; extra == 'all'
-Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: cachetools ; extra == 'all'
+Requires-Dist: missingno ; extra == 'all'
 Requires-Dist: filetype ; extra == 'all'
-Requires-Dist: iteration-utilities ; extra == 'all'
 Requires-Dist: dataframe-image ; extra == 'all'
-Requires-Dist: pymongo ; extra == 'all'
-Requires-Dist: polars ; extra == 'all'
-Requires-Dist: schedule ; extra == 'all'
-Requires-Dist: pymilvus ; extra == 'all'
-Requires-Dist: gunicorn ; extra == 'all'
+Requires-Dist: langchain ; extra == 'all'
+Requires-Dist: seaborn ; extra == 'all'
+Requires-Dist: fastapi ; extra == 'all'
 Requires-Dist: faiss-cpu ; extra == 'all'
-Requires-Dist: thefuck ; extra == 'all'
+Requires-Dist: pretty-errors ; extra == 'all'
+Requires-Dist: iteration-utilities ; extra == 'all'
+Requires-Dist: pyarrow ; extra == 'all'
+Requires-Dist: redis-py-cluster ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
+Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: thriftpy2 ; extra == 'all'
+Requires-Dist: simplejson ; extra == 'all'
+Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
+Requires-Dist: jinja2 ; extra == 'all'
+Requires-Dist: cachetools ; extra == 'all'
+Requires-Dist: streamlit ; extra == 'all'
+Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: openai ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2024.11.29.18.57.29.dist-info → MeUtils-2024.11.29.20.22.18.dist-info}/RECORD

@@ -350,7 +350,7 @@ meutils/apis/jiema/yezi.py,sha256=26vhnA3lC5049Rqx-CHO-wyGKbdZAfvjEOG90W38cr0,36
 meutils/apis/kling/__init__.py,sha256=pKz40SEjui1dhHBD-icyNTJOYhzLvxLxJCwszuH4vio,271
 meutils/apis/kling/api.py,sha256=AuVQ9URmrbTlz7dEv_kIyhA9fMTZPL9rF3Td6KxTIMA,2183
 meutils/apis/kling/images.py,sha256=FcCkvA4x1Po3SuugfQa8klT0Lrj7fq4N8kbzx6luUxI,5095
-meutils/apis/kling/kolors_virtual_try_on.py,sha256=pxXdnchm7lEVHqwL8piomuXh3UxprxvRWPv1PQH-w0s,2820
+meutils/apis/kling/kolors_virtual_try_on.py,sha256=xn9zwUjdqRZAuCQ7vxFrTK01b6ScyhF4aMxEkm8-CG4,2818
 meutils/apis/kling/videos.py,sha256=6z3w0gQHPe3BQNid4ZO2DfYSqvry44EMehG9U0qSB3E,2115
 meutils/apis/kling/鉴权.py,sha256=1kR67Mb0PxEo4ZxLVJZys4Iru9BUnS_Qqo2cbpLZNCU,842
 meutils/apis/kuaishou/__init__.py,sha256=fDzJvVQl_CxHyiL3bCPH9x7gOLYfK6QuW2iQ33eez7c,243
@@ -419,12 +419,13 @@ meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpML
 meutils/async_task/celery_config.py,sha256=-p8-uGQq0HFFifZWZY6duCxEDcPJpWA4A_Rnz-WNysU,3430
 meutils/async_task/common.py,sha256=ZJ4e0CsEJf1ppPmGSwPCwhZBAkUL5xsi_t1ny-bJuko,845
 meutils/async_task/demo_create_tasks.py,sha256=DBUxi8lp4iJZrubn6XztRHB4DuZDEXpohSxCH6NMKuc,2219
-meutils/async_task/utils.py,sha256=IgGcKkD6yut_CagnRanRPY180kM6FpYO0dFyJKJ50zQ,2933
+meutils/async_task/utils.py,sha256=IAcGmXUn-L7oJ-i66p-KJCtpNFMQY7lBXGe2ausNljg,3957
 meutils/async_task/通用设计.py,sha256=kGdrJHJu9VoOkyGHREn0KUtBTibAaLIcG0O6hEJNhLA,3232
 meutils/async_task/tasks/__init__.py,sha256=flHRXJMdts_9az9T9V1c5l3Y-gaDD88COWrARr4WAKU,246
 meutils/async_task/tasks/_all.py,sha256=Vz63k9yvgj-IBGjekm0u2t571TTT0nMRMqcPvPqJAbY,533
-meutils/async_task/tasks/kling.py,sha256=DwOUHyNDBpM1olCpow_cVct8iPpg2PEqY180wpTt07o,904
-meutils/async_task/tasks/test.py,sha256=f-QY-k81ixe4x-rRO7yqStZ1w8MdVoq-ooq9bDzXOeI,2148
+meutils/async_task/tasks/kling.py,sha256=4n898Xxv_TgohxqCbsfKt0Jkm6VL3nWY_QkHLckXEx8,925
+meutils/async_task/tasks/replicateai.py,sha256=wbxx6kB7GQZPnKRE6J6r1mEv3wO8X7XaGaNMC5rBVoE,716
+meutils/async_task/tasks/test.py,sha256=IhLJo-s9_gakTkvY7mjjkWtP3IIbb5KLHJpBkrXxIwU,2316
 meutils/async_task/tasks/vidu.py,sha256=obBG4_bf1oPIlLxeca1s1dGOnlyam2xYRy-8TrH3ZTk,620
 meutils/async_utils/__init__.py,sha256=IiJLRm258jkM4xAjUKOD7tVwHIemj7_1CuzXCu3TuQU,284
 meutils/async_utils/asyncer_.py,sha256=S1Sp5WZx_uKM7kJyRVYU8QhmbjOh61JmfN2IN_PJNX4,736
@@ -459,7 +460,7 @@ meutils/config_utils/lark_utils/demo.py,sha256=3g0Fs7oLaeW75T60gYWMLgyNg1OnfOjfH
 meutils/config_utils/lark_utils/x.py,sha256=MlMQGhehP9xMEgetxVCX68XFaosfKoW1JA5cZ3JqN2w,1857
 meutils/crawlers/__init__.py,sha256=TBU4xA-IOsHV-0yIkW7YXxn_QT7TT8NncqxO7IykEfs,271
 meutils/data/SimHei.ttf,sha256=-XEnekS5yHP_URkT4XBI2w22ylV-KxudhkeIYFbrILA,10062565
-meutils/data/VERSION,sha256=tglRMWp3DJ1tnpyFnt4RLYg3xWFHjRXDusrUVd1L2v8,19
+meutils/data/VERSION,sha256=QxN5iiFyDvc3DX0GAXBpPLPcxAFe-sh5BJ19JCt2IyY,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -654,7 +655,7 @@ meutils/schemas/runwayml_types.py,sha256=q6g00kg1PYCDjpw-notgbcUGwRAlIa8kAmU52Zu
 meutils/schemas/siliconflow_types.py,sha256=amOygjMqbSss4021sCNX1p5d-k1wa2tNLr0gnke1Vrc,8429
 meutils/schemas/step_types.py,sha256=nGTPXZ7RwOF2RTsPBQguLLcIaBxHs4bsZkYa_LalcJ0,648
 meutils/schemas/suno_types.py,sha256=KTdcwaJNDUFiY8izVJSZdGZgEMb0OhdiRR_dJVN-Cz0,14967
-meutils/schemas/task_types.py,sha256=G2qzqdNfYKzeJwps_QNiqV4_Qo0MSdxwqqITD8dtajo,4317
+meutils/schemas/task_types.py,sha256=bPcW6r-X0P28SkYwF8E6OoieFoMMVLQBb6s-ca5Dp0k,4380
 meutils/schemas/translator_types.py,sha256=xufNQeyim7RhkzAK_J5_JchZfqaUBDXFwMtrPUu1xzI,627
 meutils/schemas/tripo3d_types.py,sha256=mQF65HwHYmczRgAIuXK5hGxWDWNYDq-Xu9pja7Dwy4o,1452
 meutils/schemas/tryblend_types.py,sha256=glZ0diRJvZmfQotcCWYBA832inihy8TvVWxWZ64CzWA,27793
@@ -663,7 +664,7 @@ meutils/schemas/vidu_types.py,sha256=Wa947mT5pL9yR4utM-A9oQvNvgaJorr9YRccryHnHH4
 meutils/schemas/wechat_types.py,sha256=XtIJpMNBzkqBcU68Qno8bnUfHzDOXwFNCIL-6VYQKOA,9260
 meutils/schemas/yuanbao_types.py,sha256=ZmB-7_eAuTU3QDonNgy0vcVP4YQNwA5yJ8G4mvfOmUE,11966
 meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVIU,272
-meutils/schemas/db/oneapi_types.py,sha256=1QEcIkT5dp1SnjEj2cwiZXPjjh6StGf0_gpGFDbGrNI,2806
+meutils/schemas/db/oneapi_types.py,sha256=hQiWXiF9jcXELosrYkLaai5ZjmbhUSrKfm07OlJgegM,2860
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
 meutils/schemas/oneapi/common.py,sha256=DPo8jsY0ytKFTILKi3-Apz6VK6cM_lBJ1xKqDNRjT88,22573
@@ -792,9 +793,9 @@ meutils/tools/seize.py,sha256=nOKAS63w-Lbi48I0m2MPhdsokUTwxco0laPxYVmW4Mw,1064
 meutils/tools/service_monitor.py,sha256=ibsLtBN2g2DL7ZnLJ8vhiZOiOcqTAyx711djDdBK-3M,1255
 meutils/tools/sys_monitor.py,sha256=6MoyzrItqDUOSjfHcMJmMofQkEPTW36CT_aKui0rg84,429
 meutils/tools/token_monitor.py,sha256=Np-YK-R4P4IPAXyZvMxwvXI4sFmNJQAQK1lSegNaYpA,997
-MeUtils-2024.11.29.18.57.29.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.11.29.18.57.29.dist-info/METADATA,sha256=9PkKcBcZEBTa57HVqN6gG5moC63JcROXWjwlJ5dxH8Y,6144
-MeUtils-2024.11.29.18.57.29.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.11.29.18.57.29.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.11.29.18.57.29.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.11.29.18.57.29.dist-info/RECORD,,
+MeUtils-2024.11.29.20.22.18.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.11.29.20.22.18.dist-info/METADATA,sha256=eDyzrFy0xWDb5eD5n3c0qywQVFilUn4PMYuOxtMLbcE,6144
+MeUtils-2024.11.29.20.22.18.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.11.29.20.22.18.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.11.29.20.22.18.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.11.29.20.22.18.dist-info/RECORD,,

meutils/apis/kling/kolors_virtual_try_on.py

@@ -66,7 +66,7 @@ async def get_task(task_id, token):
 
 if __name__ == '__main__':
     request = TryOnRequest()
-    # arun(create_task(request))
+    arun(create_task(request))
     # {
     #     "code": 0,
     #     "message": "SUCCEED",

meutils/async_task/tasks/kling.py

@@ -29,4 +29,4 @@ async def create_task(request: kolors_virtual_try_on.TryOnRequest, **kwargs):
 if __name__ == '__main__':
     pass
     # create_task.apply_async()
-    # kling.create_task.apply_async(kwargs={"request": request.model_dump()})
+    create_task.apply_async(kwargs={"request": kolors_virtual_try_on.TryOnRequest().model_dump()})

meutils/async_task/tasks/replicateai.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : replicateai
+# @Time         : 2024/11/29 19:08
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+
+from meutils.pipe import *
+from meutils.async_utils import async_to_sync_pro
+from meutils.decorators.retry import retrying
+from meutils.async_task import worker, shared_task
+
+from meutils.apis.replicateai import raw as replicate
+
+
+@shared_task(pydantic=True, retry_kwargs={'max_retries': 5, 'countdown': 10})
+@async_to_sync_pro
+async def create_task(request: replicate.ReplicateRequest, **kwargs):
+    response = await replicate.create_task(request)
+    return response

meutils/async_task/tasks/test.py

@@ -14,6 +14,14 @@ from meutils.async_utils import async_to_sync_pro
 from meutils.async_task import worker, shared_task
 
 
+class Request(BaseModel):
+    method: str = "GET"
+    url: str = "https://api.chatfire.cn/"
+
+    class Config:
+        frozen = True
+
+
 @shared_task
 def do_sync_task(sleep=10, **kwargs):
     logger.debug("同步任务")
@@ -25,18 +33,20 @@ def do_sync_task(sleep=10, **kwargs):
 # AttributeError: 'AsyncToSync' object has no attribute '__name__'. Did you mean: '__ne__'?
 
 
-# @shared_task(name='meutils.async_task.tasks.test.proxy_task')
-@shared_task
-@async_to_sync_pro
-async def ado_sync_task(**kwargs):
-    logger.debug("同步任务+协程")
+@alru_cache()
+async def create_task(request: Request, **kwargs):
+    logger.debug(request)
     await asyncio.sleep(10)
-    return kwargs
+    return request
 
 
-class Request(BaseModel):
-    method: str = "GET"
-    url: str = "https://api.chatfire.cn/"
+@shared_task
+@async_to_sync_pro
+async def ado_pydantic_task(request: Request):
+    logger.debug("同步任务+协程+结构体+缓存")
+    logger.debug(request)
+
+    return await create_task(request)
 
 
 @shared_task(pydantic=True)
@@ -50,6 +60,7 @@ def do_task_retry(*args, **kwargs):
 
     return 1 / 0
 
+
 @shared_task(
     default_retry_delay=3,
     retry_backoff=True,
@@ -59,6 +70,8 @@ def do_task_retry_backoff_noautoretry(*args, **kwargs):
     logger.debug("do_task_retry_backoff")
 
     return 1 / 0
+
+
 @shared_task(
     autoretry_for=(Exception,),
     default_retry_delay=3,

meutils/async_task/utils.py

@@ -23,7 +23,20 @@ async def create_task(async_task, request: Union[BaseModel, dict]):
 
     result = async_task.apply_async(kwargs={"request": request})
     task_id = result.id
-    return TaskResponse(task_id=task_id)
+    return TaskResponse(task_id=task_id, request_id=task_id)
+
+
+# {
+#   "code": 0,
+#   "message": "SUCCEED",
+#   "request_id": "CjMkWmdJhuIAAAAAAAS0mA",
+#   "data": {
+#     "task_id": "CjMkWmdJhuIAAAAAAAS0mA",
+#     "task_status": "submitted",
+#     "created_at": 1732881630997,
+#     "updated_at": 1732881630997
+#   }
+# }
 
 
 async def get_task(
@@ -31,13 +44,29 @@ async def get_task(
         remote_get_task: Optional[Callable] = None,
         filter_kwargs: Optional[dict] = None
 ):
+    """
+
+    :param task_id:
+    :param remote_get_task:
+    :param filter_kwargs: #######参数可以舍弃
+         filter_kwargs = {
+            "task_id": task_id, #########理论上只需这个
+            "user_id": user_id,
+            "platform": "replicate",
+            "action": "replicate",  # 模型
+        }
+    :return:
+    """
     result = AsyncResult(id=task_id)
 
     if result.ready():
         if result.successful():
-            data = result.get()  # system_fingerprint
+            data = result.get()  # TaskResponse
             token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
 
+            # data.get('platform')
+            # data.get('action')
+
             response = TaskResponse(
                 task_id=task_id,
 
@@ -47,7 +76,8 @@ async def get_task(
             )
 
             if remote_get_task:  # 获取远程任务
-                response: TaskResponse = await remote_get_task(task_id, token)  # todo: 缓存一份
+                response: TaskResponse = await remote_get_task(task_id,
+                                                               token)  # todo: 缓存一份，todo： user_id、platform/action
 
                 if not isinstance(data, dict):
                     data = data.model_dump()
@@ -78,6 +108,18 @@ async def get_task(
 
 # todo: 可以设计更通用的
 async def update_oneapi_from_response(task: OneapiTask, task_response: TaskResponse):
+    """
+
+    filter_kwargs = {
+            "task_id": task_id,
+            "user_id": user_id,
+            "platform": "replicate",
+            "action": "replicate",  # 模型
+        }
+
+    需要获取这几个信息 user_id
+
+    """
     if task.status in {"SUCCESS", "FAILURE"}: return False  # 跳出轮询，不再更新
 
     task.data = task_response.model_dump(exclude_none=True, exclude={"system_fingerprint"})

meutils/data/VERSION

@@ -1 +1 @@
-2024.11.29.18.57.29
+2024.11.29.20.22.18

meutils/schemas/db/oneapi_types.py

@@ -33,6 +33,9 @@ class Hero(SQLModel, table=True):
 
 class OneapiTask(SQLModel, table=True):
     """https://github.com/Calcium-Ion/new-api/blob/main/model/task.go"""
+
+    __tablename__ = "tasks"  # 自定义表名
+
     id: Optional[int] = Field(default=None, primary_key=True)
 
     task_id: Optional[str] = Field(default=None, max_length=50)
@@ -78,4 +81,4 @@ if __name__ == '__main__':
     print(Hero())
     # print(Tasks())
 
-    print(Tasks.__name__)
+    print(OneapiTask.__name__)

meutils/schemas/task_types.py

@@ -177,8 +177,12 @@ if __name__ == '__main__':
     # , ** {"a": 1, "system_fingerprint": 1}
     response = TaskResponse(system_fingerprint="121")
 
-    print(response.model_dump())
+    # print(response.model_dump())
+    #
+    # response.__dict__.update({"a": 1, "system_fingerprint": 1})
+    #
+    # print(response.model_dump())
 
-    response.__dict__.update({"a": 1, "system_fingerprint": 1})
+    response.user_id = 1
 
-    print(response.model_dump())
+    print(response)