MeUtils 2024.11.29.18.57.29__tar.gz → 2024.11.29.20.22.18__tar.gz

{meutils-2024.11.29.18.57.29 → meutils-2024.11.29.20.22.18/MeUtils.egg-info}/PKG-INFO

@@ -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
@@ -106,42 +106,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 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"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.11.29.18.57.29 → meutils-2024.11.29.20.22.18}/MeUtils.egg-info/SOURCES.txt

@@ -223,6 +223,7 @@ meutils/async_task/通用设计.py
 meutils/async_task/tasks/__init__.py
 meutils/async_task/tasks/_all.py
 meutils/async_task/tasks/kling.py
+meutils/async_task/tasks/replicateai.py
 meutils/async_task/tasks/test.py
 meutils/async_task/tasks/vidu.py
 meutils/async_utils/__init__.py

{meutils-2024.11.29.18.57.29/MeUtils.egg-info → meutils-2024.11.29.20.22.18}/PKG-INFO

@@ -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
@@ -106,42 +106,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 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"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.11.29.18.57.29 → meutils-2024.11.29.20.22.18}/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-2024.11.29.18.57.29 → meutils-2024.11.29.20.22.18}/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-2024.11.29.20.22.18/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-2024.11.29.18.57.29 → meutils-2024.11.29.20.22.18}/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-2024.11.29.18.57.29 → meutils-2024.11.29.20.22.18}/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-2024.11.29.20.22.18/meutils/data/VERSION

@@ -0,0 +1 @@
+2024.11.29.20.22.18

{meutils-2024.11.29.18.57.29 → meutils-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-2024.11.29.18.57.29 → meutils-2024.11.29.20.22.18}/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)

meutils-2024.11.29.18.57.29/meutils/data/VERSION

@@ -1 +0,0 @@
-2024.11.29.18.57.29

{meutils-2024.11.29.18.57.29 → meutils-2024.11.29.20.22.18}/MeUtils.egg-info/requires.txt

@@ -43,42 +43,42 @@ openai
 langchain
 
 [all]
-pretty_errors
-jieba
-jinja2
-redis-py-cluster
 uvicorn
-asyncmy
-seaborn
-sqlalchemy
+polars
 geopy
-pandas-profiling[notebook]
-sse_starlette
-thriftpy2
-missingno
-fastapi[all]
-streamlit
-fastapi
 pymysql
-pyarrow
-pymupd
+pymilvus
 jmespath
-reportlab
+fastapi[all]
+pymupd
+asyncmy
+gunicorn
+jieba
+schedule
+sqlalchemy
+thefuck
 pandas_summary
-simplejson
-openai
-langchain
-cachetools
+missingno
 filetype
-iteration_utilities
 dataframe_image
-pymongo
-polars
-schedule
-pymilvus
-gunicorn
+langchain
+seaborn
+fastapi
 faiss-cpu
-thefuck
+pretty_errors
+iteration_utilities
+pyarrow
+redis-py-cluster
+sse_starlette
+pymongo
+thriftpy2
+simplejson
+pandas-profiling[notebook]
+jinja2
+cachetools
+streamlit
+reportlab
+openai
 
 [ann]
 pymilvus