MeUtils 2024.11.29.21.20.15__py3-none-any.whl → 2024.12.2.8.52.40__py3-none-any.whl

{MeUtils-2024.11.29.21.20.15.dist-info → MeUtils-2024.12.2.8.52.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.11.29.21.20.15
+Version: 2024.12.2.8.52.40
 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: pandas-summary ; extra == 'all'
-Requires-Dist: fastapi[all] ; extra == 'all'
-Requires-Dist: polars ; extra == 'all'
-Requires-Dist: schedule ; extra == 'all'
-Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: pretty-errors ; extra == 'all'
-Requires-Dist: pymilvus ; extra == 'all'
-Requires-Dist: redis-py-cluster ; extra == 'all'
-Requires-Dist: pymongo ; extra == 'all'
-Requires-Dist: jinja2 ; extra == 'all'
-Requires-Dist: missingno ; extra == 'all'
-Requires-Dist: seaborn ; extra == 'all'
+Requires-Dist: geopy ; extra == 'all'
+Requires-Dist: thriftpy2 ; extra == 'all'
+Requires-Dist: filetype ; extra == 'all'
 Requires-Dist: iteration-utilities ; extra == 'all'
-Requires-Dist: reportlab ; extra == 'all'
-Requires-Dist: fastapi ; extra == 'all'
-Requires-Dist: uvicorn ; extra == 'all'
+Requires-Dist: jinja2 ; extra == 'all'
+Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: gunicorn ; extra == 'all'
 Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: jieba ; extra == 'all'
+Requires-Dist: pymupd ; extra == 'all'
+Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
 Requires-Dist: pymysql ; extra == 'all'
-Requires-Dist: simplejson ; extra == 'all'
-Requires-Dist: geopy ; extra == 'all'
-Requires-Dist: thefuck ; extra == 'all'
+Requires-Dist: dataframe-image ; extra == 'all'
+Requires-Dist: redis-py-cluster ; extra == 'all'
+Requires-Dist: sqlalchemy ; extra == 'all'
 Requires-Dist: openai ; extra == 'all'
+Requires-Dist: langchain ; extra == 'all'
 Requires-Dist: cachetools ; extra == 'all'
-Requires-Dist: gunicorn ; extra == 'all'
-Requires-Dist: thriftpy2 ; extra == 'all'
-Requires-Dist: jieba ; extra == 'all'
-Requires-Dist: filetype ; extra == 'all'
-Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: sqlalchemy ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
-Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
-Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: reportlab ; extra == 'all'
 Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: pymupd ; extra == 'all'
-Requires-Dist: dataframe-image ; extra == 'all'
+Requires-Dist: pymilvus ; extra == 'all'
+Requires-Dist: pandas-summary ; extra == 'all'
+Requires-Dist: seaborn ; extra == 'all'
+Requires-Dist: fastapi[all] ; extra == 'all'
+Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
+Requires-Dist: streamlit ; extra == 'all'
+Requires-Dist: uvicorn ; extra == 'all'
+Requires-Dist: pretty-errors ; extra == 'all'
+Requires-Dist: thefuck ; extra == 'all'
+Requires-Dist: polars ; extra == 'all'
+Requires-Dist: simplejson ; extra == 'all'
+Requires-Dist: fastapi ; extra == 'all'
+Requires-Dist: missingno ; extra == 'all'
 Requires-Dist: jmespath ; extra == 'all'
+Requires-Dist: schedule ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2024.11.29.21.20.15.dist-info → MeUtils-2024.12.2.8.52.40.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=xn9zwUjdqRZAuCQ7vxFrTK01b6ScyhF4aMxEkm8-CG4,2818
+meutils/apis/kling/kolors_virtual_try_on.py,sha256=khIoa6zPGA7tALocrIDBZmVa5ik1rprp-iy4VcWgzSM,3094
 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
@@ -418,8 +418,8 @@ meutils/apis/voice_clone/fish_api.py,sha256=pDpE-B8HFiGIOV3NVd1HmFrCC2GQc3wH-81o
 meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpMLo,367
 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=p2CntKKd9tSrlfyx63uGu57SHQlu2x6XBi1u7y6LTYo,2577
-meutils/async_task/utils.py,sha256=pUatJfzU9Ir-QnMljeeOLAb52bil1siHy_k6rXjU53M,4506
+meutils/async_task/demo_create_tasks.py,sha256=Eu4XjNxRROmMJ0oKfbEhrfLTaOUgedbAhmFyQx5nOQc,2699
+meutils/async_task/utils.py,sha256=jqJArlsv8C559fuN9Qz1q777dRuw44DtctKzKFQwJbA,5190
 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
@@ -460,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=XKBonRtYezOE5KKAm-3wYxpPlf9vfguPCRly42EHiQc,19
+meutils/data/VERSION,sha256=9M1foIAwkqkrZoMedtaqp9mmEE8XG8DGG09VdEn8Iqs,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -655,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=bPcW6r-X0P28SkYwF8E6OoieFoMMVLQBb6s-ca5Dp0k,4380
+meutils/schemas/task_types.py,sha256=pMVRtvPUxb5bMQ9SKn2gzMRUAvTUMTmsPFryrsARgss,4561
 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
@@ -793,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.21.20.15.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.11.29.21.20.15.dist-info/METADATA,sha256=cgTfiiDYrdOixNxGiZ0Hy4Cn-IiTqRU1q8_q8u2hNK8,6144
-MeUtils-2024.11.29.21.20.15.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.11.29.21.20.15.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.11.29.21.20.15.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.11.29.21.20.15.dist-info/RECORD,,
+MeUtils-2024.12.2.8.52.40.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.2.8.52.40.dist-info/METADATA,sha256=PEy8UrM2rrZyTUNtwP_lHGRqRbSNYHzqhKWS7bp-LUI,6142
+MeUtils-2024.12.2.8.52.40.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.2.8.52.40.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.2.8.52.40.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.2.8.52.40.dist-info/RECORD,,

meutils/apis/kling/kolors_virtual_try_on.py

@@ -10,6 +10,7 @@
 import jwt
 
 from meutils.pipe import *
+from meutils.schemas.task_types import TaskResponse  ############# 根据这个重构
 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
@@ -33,9 +34,12 @@ def encode_jwt_token(token):
     return token
 
 
+###################################################################### 重构
+
+######################################################################
 @alru_cache(ttl=3600)
 @retrying(title=__name__)
-async def create_task(request: TryOnRequest, token: Optional[str] = None):
+async def create_task(request: TryOnRequest, token: Optional[str] = None):  ###### 所有的 TaskResponse标准化
     token = token or await get_next_token_for_polling(FEISHU_URL)
     token = encode_jwt_token(token)
 

meutils/async_task/demo_create_tasks.py

@@ -11,7 +11,7 @@
 from meutils.pipe import *
 
 from meutils.async_task import worker
-from meutils.async_task.tasks import test
+from meutils.async_task.tasks import test, kling
 from celery.result import AsyncResult
 
 
@@ -70,3 +70,8 @@ if __name__ == '__main__':
 
     # test.ado_pydantic_task.apply_async(kwargs={"request": test.Request().model_dump()})
     # test.ado_pydantic_task_2.apply_async(kwargs={"request": test.Request().model_dump()})
+
+
+    kling.create_task.apply_async(kwargs={"request": kling.kolors_virtual_try_on.TryOnRequest().model_dump()})
+
+

meutils/async_task/utils.py

@@ -48,7 +48,8 @@ async def create_task(async_task, request: Union[BaseModel, dict]):
 async def get_task(
         task_id: str,
         remote_get_task: Optional[Callable] = None,
-        filter_kwargs: Optional[dict] = None
+        filter_kwargs: Optional[dict] = None,
+        background_tasks: Optional[BackgroundTasks] = None,
 ):
     """
 
@@ -63,12 +64,18 @@ async def get_task(
         }
     :return:
     """
+    filter_kwargs = filter_kwargs or {}
+    filter_kwargs["task_id"] = task_id
+
     result = AsyncResult(id=task_id)
+    # logger.debug(bjson(result._get_task_meta()))
+    # logger.debug(bjson(result.get()))
+
+    data = result.get()  # 创建任务时：remote task的返回结果
+    logger.debug(bjson(data))
 
     if result.ready():
         if result.successful():
-            data = result.get()  # 创建任务时：remote task的返回结果
-
             remote_task_id = (
                     data.get("task_id")  # 远程任务 写在最外层
                     or data.get("id")
@@ -113,9 +120,10 @@ async def get_task(
 
     # 更新到数据库：异步任务
     update_fn = partial(update_oneapi_from_response, task_response=response)
-    asyncio.create_task(update_or_insert(OneapiTask, filter_kwargs, update_fn))  # 测试是否会执行
-
-    background_tasks.add_task(update_or_insert, OneapiTask, filter_kwargs, update_fn)
+    if background_tasks:
+        background_tasks.add_task(update_or_insert, OneapiTask, filter_kwargs, update_fn)
+    else:
+        await update_or_insert(OneapiTask, filter_kwargs, update_fn)
 
     return response
 
@@ -136,7 +144,7 @@ async def update_oneapi_from_response(task: OneapiTask, task_response: TaskRespo
     """
     if task.status in {"SUCCESS", "FAILURE"}: return False  # 跳出轮询，不再更新
 
-    task.data = task_response.model_dump(exclude_none=True, exclude={"system_fingerprint"})
+    task.data = task_response.model_dump(exclude={"system_fingerprint"})
     task.status = task_response.status
     task.progress = time.time() // 10 % 100
 
@@ -150,4 +158,16 @@ async def update_oneapi_from_response(task: OneapiTask, task_response: TaskRespo
 
 
 if __name__ == '__main__':
-    pass
+    from meutils.async_task import worker, shared_task  #######重要 需要识别到worker
+
+    from meutils.apis.kling import kolors_virtual_try_on
+
+    task_id = "807e1525-11ff-40ca-8572-1cfc33d69673"
+    filter_kwargs = {
+        "task_id": task_id,  #########理论上只需这个
+        "user_id": 1,
+        "platform": "kling",
+        "action": "kling",  # 模型
+    }
+
+    arun(get_task(task_id, kolors_virtual_try_on.get_task, filter_kwargs))

meutils/data/VERSION

@@ -1 +1 @@
-2024.11.29.21.20.15
+2024.12.02.08.52.40

meutils/schemas/task_types.py

@@ -54,12 +54,16 @@ class TaskResponse(BaseModel):
     data: Optional[Any] = None
 
     # 系统水印：可以存token
-    # user_id: Optional[str] = None
     system_fingerprint: Optional[str] = None
 
+    model: Optional[str] = None
+
+    # created_at: int = Field(default_factory=lambda: int(time.time()))
+    created_at: Union[str, int] = Field(default_factory=lambda: datetime.datetime.today().isoformat())
+
     def __init__(self, /, **data: Any):
         super().__init__(**data)
-        self.status = STATUSES.get(self.status, "UNKNOWN")
+        self.status = STATUSES.get(self.status.lower(), "UNKNOWN")
 
     class Config:
         # 允许额外字段，增加灵活性
@@ -126,11 +130,11 @@ class Task(BaseModel):
     data: Optional[Any] = None
     metadata: Optional[Any] = None
     # metadata: Optional[Dict[str, str]] = None
-    description: Optional[str] = None
 
     system_fingerprint: Optional[str] = None  # api-key token cookie 加密
 
     created_at: int = Field(default_factory=lambda: int(time.time()))
+    description: Optional[str] = None
 
 
 class FileTask(BaseModel):