MeUtils 2024.11.29.11.15.53__tar.gz → 2024.11.29.18.57.29__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.11.29.11.15.53
+Version: 2024.11.29.18.57.29
 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: filetype; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: sse_starlette; 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: faiss-cpu; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: schedule; extra == "all"
-Requires-Dist: streamlit; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: sqlalchemy; 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: openai; extra == "all"
-Requires-Dist: seaborn; extra == "all"
+Requires-Dist: pymysql; extra == "all"
 Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: missingno; extra == "all"
-Requires-Dist: thefuck; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: pymupd; extra == "all"
+Requires-Dist: jmespath; extra == "all"
 Requires-Dist: reportlab; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; 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: filetype; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
 Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: jinja2; extra == "all"
 Requires-Dist: pymongo; extra == "all"
-Requires-Dist: jmespath; extra == "all"
-Requires-Dist: pymupd; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: geopy; extra == "all"
 Requires-Dist: polars; extra == "all"
+Requires-Dist: schedule; extra == "all"
 Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: langchain; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: thefuck; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

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

@@ -218,6 +218,7 @@ meutils/async_task/__init__.py
 meutils/async_task/celery_config.py
 meutils/async_task/common.py
 meutils/async_task/demo_create_tasks.py
+meutils/async_task/utils.py
 meutils/async_task/通用设计.py
 meutils/async_task/tasks/__init__.py
 meutils/async_task/tasks/_all.py

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.11.29.11.15.53
+Version: 2024.11.29.18.57.29
 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: filetype; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: sse_starlette; 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: faiss-cpu; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: schedule; extra == "all"
-Requires-Dist: streamlit; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: sqlalchemy; 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: openai; extra == "all"
-Requires-Dist: seaborn; extra == "all"
+Requires-Dist: pymysql; extra == "all"
 Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: missingno; extra == "all"
-Requires-Dist: thefuck; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: pymupd; extra == "all"
+Requires-Dist: jmespath; extra == "all"
 Requires-Dist: reportlab; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; 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: filetype; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
 Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: jinja2; extra == "all"
 Requires-Dist: pymongo; extra == "all"
-Requires-Dist: jmespath; extra == "all"
-Requires-Dist: pymupd; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: geopy; extra == "all"
 Requires-Dist: polars; extra == "all"
+Requires-Dist: schedule; extra == "all"
 Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: langchain; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: thefuck; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/async_task/__init__.py

@@ -8,4 +8,6 @@
 # @Software     : PyCharm
 # @Description  : 
 
-from meutils.async_task.common import worker, shared_task
+
+# from meutils.async_task.common import worker, shared_task, AsyncResult, states
+from meutils.async_task.common import *

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/async_task/celery_config.py

@@ -14,7 +14,10 @@ from kombu import Exchange, Queue
 
 # 基础配置
 broker_url = 'redis://localhost:6379/0'  # 消息代理（推荐使用Redis）
-result_backend = 'redis://localhost:6379/1'  # 结果存储
+broker_url = os.getenv('REDIS_URL', broker_url)
+
+# result_backend = f"redis://localhost:6379/1"  # 结果存储
+result_backend = f"{broker_url.replace('/0', '/')}/1"  # 结果存储
 
 # 添加以下配置增加可靠性
 broker_connection_retry = True

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/async_task/common.py

@@ -10,25 +10,12 @@
 
 from meutils.pipe import *
 from meutils.decorators.retry import retrying
+
 from meutils.async_task import celery_config
 
 from celery import Celery, Task, shared_task, states
 
 
-class RetryableTask(Task):  # 实际上 在具体任务支持 执行重试就行
-    """shared_task(base=RetryableTask)"""
-
-    # 使用 tenacity 进行更灵活的重试控制
-    @retrying(
-        max_retries=6,
-        title="Celery 任务重试"
-    )
-    def run_with_retry(self, *args, **kwargs):
-        return self.run(*args, **kwargs)
-
-    def __call__(self, *args, **kwargs):
-        return self.run_with_retry(*args, **kwargs)
-
 
 worker = Celery()
 
@@ -41,9 +28,10 @@ worker.conf.update(
     task_track_started=True,
 )
 
-
 if __name__ == '__main__':
     print(worker.conf.humanize(with_defaults=False))
 
     print(worker.conf.broker_url)
     print(worker.conf.result_backend)
+
+    print(arun(get_task("59ddf636-3f27-4110-948e-5977c8cbe1b3")))

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/async_task/demo_create_tasks.py

@@ -44,17 +44,22 @@ if __name__ == '__main__':
     # test.ado_sync_task.apply_async(kwargs={'a': 1, 'b': 3})
     # print(AsyncResult("42e191a0-6099-419e-b61d-07bf7e2df2fc").result)
     # result.backend
-
+    # AsyncResult("42e191a0-6099-419e-b61d-07bf7e2df2fc").get()
     # AsyncResult(r.id).result
 
 
     # test.do_pydantic_task.apply_async(kwargs={'request': test.Request()})
 
+    test.do_pydantic_task.apply_async(kwargs={"request": {"method": "POST", "url": "测试"}})
+
+    print(type(test.do_pydantic_task))
+
+
     # test.do_pydantic_task.apply_async(kwargs={"request": {"method": "POST", "url": "测试"}})
     # test.do_pydantic_task.apply_async(kwargs={"request": {"method": "xx"}})
     # test.do_pydantic_task.apply_async(args=({"method": "xxxxxxx"},))
 
-
-    test.do_task_retry.apply_async(kwargs={'args': "do_task_retry", "kwargs": ""})
-    test.do_task_retrying.apply_async(kwargs={'args': "do_task_retrying", "kwargs": ""})
-    test.do_task_retry_backoff.apply_async(kwargs={'args': "do_task_retry_backoff", "kwargs": ""})
+    #
+    # test.do_task_retrying.apply_async(kwargs={'name': "###do_task_retrying"})
+    # test.do_task_retry.apply_async(kwargs={'name': "###do_task_retry"})
+    # test.do_task_retry_backoff.apply_async(kwargs={'name': "###do_task_retry_backoff"})

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/async_task/tasks/__init__.py

@@ -7,3 +7,5 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  : 
+
+

meutils-2024.11.29.18.57.29/meutils/async_task/tasks/kling.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : kling
+# @Time         : 2024/11/28 16:18
+# @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.kling import kolors_virtual_try_on
+
+
+@shared_task(pydantic=True, retry_kwargs={'max_retries': 5, 'countdown': 10})
+@async_to_sync_pro
+async def create_task(request: kolors_virtual_try_on.TryOnRequest, **kwargs):
+    response = await kolors_virtual_try_on.create_task(request)
+    return response
+
+
+# celery_task
+
+
+if __name__ == '__main__':
+    pass
+    # create_task.apply_async()
+    # kling.create_task.apply_async(kwargs={"request": request.model_dump()})

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/async_task/tasks/test.py

@@ -55,7 +55,7 @@ def do_task_retry(*args, **kwargs):
     retry_backoff=True,
     retry_kwargs={'max_retries': 10}
 )
-def do_task_retry_backoff(*args, **kwargs):
+def do_task_retry_backoff_noautoretry(*args, **kwargs):
     logger.debug("do_task_retry_backoff")
 
     return 1 / 0

meutils-2024.11.29.18.57.29/meutils/async_task/utils.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : utils
+# @Time         : 2024/11/29 16:22
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 通用异步设计，兼容oneapi监控
+
+from celery.result import AsyncResult
+
+from meutils.pipe import *
+from meutils.schemas.task_types import TaskResponse
+
+from meutils.db.orm import update_or_insert
+from meutils.schemas.db.oneapi_types import OneapiTask
+
+
+async def create_task(async_task, request: Union[BaseModel, dict]):
+    if not isinstance(request, dict):
+        request = request.model_dump()
+
+    result = async_task.apply_async(kwargs={"request": request})
+    task_id = result.id
+    return TaskResponse(task_id=task_id)
+
+
+async def get_task(
+        task_id: str,
+        remote_get_task: Optional[Callable] = None,
+        filter_kwargs: Optional[dict] = None
+):
+    result = AsyncResult(id=task_id)
+
+    if result.ready():
+        if result.successful():
+            data = result.get()  # system_fingerprint
+            token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
+
+            response = TaskResponse(
+                task_id=task_id,
+
+                message="Task completed successfully",
+                status=result.status,
+                data=data
+            )
+
+            if remote_get_task:  # 获取远程任务
+                response: TaskResponse = await remote_get_task(task_id, token)  # todo: 缓存一份
+
+                if not isinstance(data, dict):
+                    data = data.model_dump()
+                response.__dict__.update(data)
+
+        else:
+            response = TaskResponse(
+                task_id=task_id,
+
+                code=1,
+                message=str(result.result),
+                status=result.status,
+            )
+    else:
+        response = TaskResponse(
+            task_id=task_id,
+
+            message="Task is still running",
+            status=result.status,
+        )
+
+    # 更新到数据库：异步任务
+    update_fn = partial(update_oneapi_from_response, task_response=response)
+    asyncio.create_task(update_or_insert(OneapiTask, filter_kwargs, update_fn))  # 测试是否会执行
+
+    return response
+
+
+# todo: 可以设计更通用的
+async def update_oneapi_from_response(task: OneapiTask, task_response: TaskResponse):
+    if task.status in {"SUCCESS", "FAILURE"}: return False  # 跳出轮询，不再更新
+
+    task.data = task_response.model_dump(exclude_none=True, exclude={"system_fingerprint"})
+    task.status = task_response.status
+    task.progress = time.time() // 10 % 100
+
+    if task.status == "SUCCESS":
+        task.progress = "100%"
+    elif task.status == "FAILURE":
+        task.fail_reason = "查看详情"
+
+    task.updated_at = int(time.time())
+    task.finish_time = int(time.time())  # 不是实际时间
+
+
+if __name__ == '__main__':
+    pass

meutils-2024.11.29.18.57.29/meutils/data/VERSION

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

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/db/orm.py

@@ -42,12 +42,12 @@ async def get_db():
         yield session
 
 
-async def update_or_insert(entity, kwargs: Optional[dict] = None, update_fn: Optional[Callable] = None,
+async def update_or_insert(entity, filter_kwargs: Optional[dict] = None, update_fn: Optional[Callable] = None,
                            n: int = 1):
     """
 
     :param entity: TASK 类
-    :param ident: 查询条件 字典 元组 第一个值是id
+    :param filter_kwargs: 查询条件 字典 元组 第一个值是id
     :param update_fn:
 
         def update_fn(data):
@@ -61,14 +61,14 @@ async def update_or_insert(entity, kwargs: Optional[dict] = None, update_fn: Opt
             await asyncio.sleep(n / i, 1)
 
             logger.debug(f"UPDATE_OR_INSERT: {entity.__name__}-{i}")
-            update_flag = await update_or_insert(entity, kwargs, update_fn)
+            update_flag = await update_or_insert(entity, filter_kwargs, update_fn)
             if update_flag is False:
                 logger.debug("提前跳出轮询")
                 break
 
-    kwargs = kwargs or {}
+    filter_kwargs = filter_kwargs or {}
     async with AsyncSession(engine) as session:
-        statement = select(entity).filter_by(**kwargs)
+        statement = select(entity).filter_by(**filter_kwargs)
         result = await session.exec(statement)
         data = result.first()  # result.all()
 
@@ -87,7 +87,7 @@ async def update_or_insert(entity, kwargs: Optional[dict] = None, update_fn: Opt
                 await session.refresh(data)
             return data
         else:
-            data = entity(**kwargs)
+            data = entity(**filter_kwargs)
             logger.debug(f"INSERT: {data}")
 
             session.add(data)
@@ -124,7 +124,7 @@ if __name__ == '__main__':
     #
     # arun(create_db_and_tables())
 
-    from meutils.schemas.db.oneapi_types import Tasks
+    from meutils.schemas.db.oneapi_types import OneapiTask
 
     filter_kwargs = {
         "task_id": "888",

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/schemas/db/oneapi_types.py

@@ -13,38 +13,6 @@ from meutils.pipe import *
 from sqlalchemy import JSON
 from sqlmodel import Field, Session, SQLModel, create_engine, select, insert, update, Column, DateTime, func
 
-# "NOT_START", "SUBMITTED", "QUEUED", "IN_PROGRESS", "FAILURE", "SUCCESS", "UNKNOWN"
-
-STATUSES = {
-    "not_start": "NOT_START",
-
-    "submitted": "SUBMITTED",
-
-    "starting": "QUEUED",
-    "queued": "QUEUED",
-    "STARTED": "QUEUED",
-    "started": "QUEUED",
-    "pending": "QUEUED",
-    "PENDING": "QUEUED",
-
-    "processing": "IN_PROGRESS",
-    "in_progress": "IN_PROGRESS",
-    "received": "IN_PROGRESS",
-    "RECEIVED": "IN_PROGRESS",
-
-    "succeed": "SUCCESS",
-    "success": "SUCCESS",
-    "succeeded": "SUCCESS",
-
-    "failed": "FAILURE",
-    "canceled": "FAILURE",
-    "FAILURE": "FAILURE",
-    "failure": "FAILURE",
-
-    "unknown": "UNKNOWN",
-
-}
-
 
 def get_default_name():
     return "xx"
@@ -63,7 +31,7 @@ class Hero(SQLModel, table=True):
     )
 
 
-class Tasks(SQLModel, table=True):
+class OneapiTask(SQLModel, table=True):
     """https://github.com/Calcium-Ion/new-api/blob/main/model/task.go"""
     id: Optional[int] = Field(default=None, primary_key=True)
 

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/schemas/oneapi/common.py

@@ -294,7 +294,7 @@ MODEL_RATIO = {
     "qwen2.5-math-72b-instruct": 4.13 / 2,
     "qwen2.5-coder-32b-instruct": 0.5,
     "qwen/qwq-32b-preview": 1,
-    "QWEN/QWQ-32B-PREVIEW": 1,
+    "Qwen/QwQ-32B-Preview": 1,
 
     "qwen1.5-7b-chat": 0.05,  # 特价
     "qwen1.5-14b-chat": 0.7,
@@ -606,7 +606,7 @@ COMPLETION_RATIO = {
 
     "qwen-turbo-2024-11-01": 3,
     "qwen/qwq-32b-preview": 2,
-    "QWEN/QWQ-32B-PREVIEW": 2,
+    "Qwen/QwQ-32B-Preview": 2,
 
 }
 

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/schemas/task_types.py

@@ -11,6 +11,60 @@ from enum import Enum
 
 from meutils.pipe import *
 
+# "NOT_START", "SUBMITTED", "QUEUED", "IN_PROGRESS", "FAILURE", "SUCCESS", "UNKNOWN"
+
+STATUSES = {
+    "not_start": "NOT_START",
+
+    "submitted": "SUBMITTED",
+
+    "starting": "QUEUED",
+    "queued": "QUEUED",
+    "STARTED": "QUEUED",
+    "started": "QUEUED",
+    "pending": "QUEUED",
+    "PENDING": "QUEUED",
+
+    "processing": "IN_PROGRESS",
+    "in_progress": "IN_PROGRESS",
+    "received": "IN_PROGRESS",
+    "RECEIVED": "IN_PROGRESS",
+
+    "succeed": "SUCCESS",
+    "success": "SUCCESS",
+    "succeeded": "SUCCESS",
+
+    "failed": "FAILURE",
+    "canceled": "FAILURE",
+    "FAILURE": "FAILURE",
+    "failure": "FAILURE",
+
+    "unknown": "UNKNOWN",
+
+}
+
+
+class TaskResponse(BaseModel):
+    """异步任务 通用响应体"""
+    task_id: Optional[str] = None
+
+    code: Optional[int] = 0
+    message: Optional[str] = None
+    status: Optional[str] = "submitted"
+    data: Optional[Any] = None
+
+    # 系统水印：可以存token
+    # user_id: Optional[str] = None
+    system_fingerprint: Optional[str] = None
+
+    def __init__(self, /, **data: Any):
+        super().__init__(**data)
+        self.status = STATUSES.get(self.status, "UNKNOWN")
+
+    class Config:
+        # 允许额外字段，增加灵活性
+        extra = 'allow'
+
 
 class TaskType(str, Enum):
     # 存储
@@ -115,7 +169,16 @@ if __name__ == '__main__':
 
     # print('kling_vip'.startswith(TaskType.kling))
 
-    print(Purpose.__members__)
-    print(list(Purpose))
+    # print(Purpose.__members__)
+    # print(list(Purpose))
+    #
+    # print(Purpose.oss in Purpose.__members__)
+
+    # , ** {"a": 1, "system_fingerprint": 1}
+    response = TaskResponse(system_fingerprint="121")
+
+    print(response.model_dump())
+
+    response.__dict__.update({"a": 1, "system_fingerprint": 1})
 
-    print(Purpose.oss in Purpose.__members__)
+    print(response.model_dump())

meutils-2024.11.29.18.57.29/meutils/serving/fastapi/dependencies/auth.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : auth
+# @Time         : 2023/12/19 17:12
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from typing import Optional, Union
+
+from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+from fastapi import Depends, HTTPException, status
+
+http_bearer = HTTPBearer()
+
+
+# get_bearer_token = http_bearer
+
+
+# 定义获取token的函数
+async def get_bearer_token(
+        auth: Optional[HTTPAuthorizationCredentials] = Depends(http_bearer)
+) -> Optional[str]:
+    """
+    获取Bearer token
+    :param auth: HTTP认证凭证
+    :return: token字符串
+    """
+    if auth is None:
+        return None
+
+    return auth.credentials
+
+
+if __name__ == '__main__':
+    pass

{meutils-2024.11.29.11.15.53 → meutils-2024.11.29.18.57.29}/meutils/serving/fastapi/utils.py

@@ -78,7 +78,7 @@ def limit(limit_value='3/second', error_message: Optional[str] = None, **kwargs)
 
 
 def check_api_key(auth: HTTPAuthorizationCredentials):
-    api_key = auth and auth.credentials or None
+    api_key = auth
     if api_key is None:
         detail = {
             "error": {