MeUtils 2024.11.28.20.2.36__py3-none-any.whl → 2024.11.29.10.30.18__py3-none-any.whl

{MeUtils-2024.11.28.20.2.36.dist-info → MeUtils-2024.11.29.10.30.18.dist-info}/METADATA

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

{MeUtils-2024.11.28.20.2.36.dist-info → MeUtils-2024.11.29.10.30.18.dist-info}/RECORD

@@ -94,7 +94,7 @@ examples/_openaisdk/openai_chatfire.py,sha256=x_YYgf3tYclickltbpdygTteZDYV55iPmw
 examples/_openaisdk/openai_chatfire_all.py,sha256=DaiI1NfDeK655QvXyczkgXK9Awxp7NBe71LHA7trxGE,4831
 examples/_openaisdk/openai_deepseek.py,sha256=-1WyTX5EfB8bdVhZ-y2yZQ04fVzujp4OPmOQR6i3QxI,660
 examples/_openaisdk/openai_doubao.py,sha256=dp0SLvDBYpIJPNs_vnV2GBIEFa9FglNtYvfGKtJ9Bqk,1053
-examples/_openaisdk/openai_embeddings.py,sha256=bhyDsAWODThMegvFkRmcTjz8f0ReSw9WQsp4yArdUcA,852
+examples/_openaisdk/openai_embeddings.py,sha256=jQLDB8IkmYiwhMi6OznoxXsIs-aYxQOfBZmj78NwKyc,952
 examples/_openaisdk/openai_files.py,sha256=gfUbKGZg5P7c3kSMfwalIThi_SEs8O-JTqx49bYFtyM,1505
 examples/_openaisdk/openai_god.py,sha256=O8fbhyxiIlVR7pTvBTXgQ2QTwfcZ2MkEIyDe_jp797A,1056
 examples/_openaisdk/openai_groq.py,sha256=_5Ue1yEx0Gp6theFioB_D8kepR0UlqMU96PVGH-LkVY,7363
@@ -416,14 +416,14 @@ meutils/apis/voice_clone/__init__.py,sha256=y7Rpn90LocHhA0ywrDP_fT4QAK7sr4JsIX5w
 meutils/apis/voice_clone/fish.py,sha256=6m8zcS2KEqmalKy2ArnOaNovyxsQp_sw4d_O1kVZR2s,7146
 meutils/apis/voice_clone/fish_api.py,sha256=pDpE-B8HFiGIOV3NVd1HmFrCC2GQc3wH-81oNbTS0mY,307
 meutils/async_task/__init__.py,sha256=QpkvoT6u-IBAlVgIevDkvEe_kVfW96UkS7i3NQHG63Y,303
-meutils/async_task/celery_config.py,sha256=J21byCOXtk1YH7P_25BNfB9kGr-T1FaW9DkjZnwDNaU,3323
+meutils/async_task/celery_config.py,sha256=Mv8YjLQlHsWbVHw3wkauMw2H1g46KNnJa4EPehFj6dw,3308
 meutils/async_task/common.py,sha256=LDoHKK8ouiN06NrwRn5vtmIyfGGH76iodtiS8Qjz-rM,1218
-meutils/async_task/demo_create_tasks.py,sha256=rML2KBeRMGx_5FvBB5NtDZuxw0sxrqGKlwJ5pi1MCKc,1315
+meutils/async_task/demo_create_tasks.py,sha256=emeDUNtZAlZ6kNwt3_6ta0ART0Bj6T2DhivZDzOMx-o,1762
 meutils/async_task/通用设计.py,sha256=kGdrJHJu9VoOkyGHREn0KUtBTibAaLIcG0O6hEJNhLA,3232
 meutils/async_task/tasks/__init__.py,sha256=2ilRdLq7JNpFU_xFc54r5JGOuNhx5r-zoyXqxC4WWIg,244
 meutils/async_task/tasks/_all.py,sha256=Vz63k9yvgj-IBGjekm0u2t571TTT0nMRMqcPvPqJAbY,533
-meutils/async_task/tasks/kling.py,sha256=Z2Z0orhh3VFUkvfTr66lO4fw9hLoxoVBv3Vz6gxEU-8,516
-meutils/async_task/tasks/test.py,sha256=sPqTbnCocNFmSOH2qRBUQWWVsFyzrcV0ngZ-1ckBrZY,1202
+meutils/async_task/tasks/kling.py,sha256=2_3Qve2VizWCfIWuJFUCG08_LuRCk4Q1Zzg15hXCmas,517
+meutils/async_task/tasks/test.py,sha256=MhKPi0a94We0fEunzyiK7Ur6rARuIU54auiBxEM90k0,1479
 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
@@ -458,14 +458,14 @@ 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=qsSy9dnRgjtdSs_SqrxScnUjyNuZNk2NKIY-duD8EFU,19
+meutils/data/VERSION,sha256=AjLxeELz0BxdQB9EyuDQ1JiqoMZGwyPEgBosCylpFzs,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
 meutils/data/coordinate.py,sha256=VbFtcdho0XG4j-rZD0DgqcIf2_LR2LlbLtfhLXbxiDY,600
 meutils/data/cowboy-hat-face.webp,sha256=AHi2t-WclDVKWgGEe-oZzI4xKACNlgGWUgd622y0K-E,24814
 meutils/data/oneapi/FOOTER.md,sha256=UHv39ey2ICocxPoCj-UI_PWyyWxZYLS8zG1inqtWNQ4,448
-meutils/data/oneapi/NOTICE.md,sha256=H_9kCxX5UV__27xjx-VogMA4SYXJqUgz_bYkspsJnzE,1523
+meutils/data/oneapi/NOTICE.md,sha256=7yF5djeqq0MBUTtcYZxcYzeSGzPLdeJTceEldxS2eUA,1751
 meutils/data/oneapi/__init__.py,sha256=cm2Kq2RDXPfdVMWcoBB77bu00zJpTDd21Rgc6bTlhws,398
 meutils/db/__init__.py,sha256=HR99rqxoFTWXUHDhLVl33tzIn8M86gigHLmEzOKH1Ec,7637
 meutils/db/mongo.py,sha256=B-B_t939rxtnNGt0PxhivjIUwinmHPzLUpXsjUIaTkQ,2337
@@ -665,7 +665,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=yQEpaoOY-YWl9PP4INqapX9TENUVqfY7rjGFgBGKIT8,3459
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=irVbfVowldzGjDdrEFYc-EuGZ9FRYGCJ1-lOq3SFkZA,22449
+meutils/schemas/oneapi/common.py,sha256=Q6l0LuqvtdJTs3IqpxXRRIwGW89RYrEwKwZEwgnkPYM,22573
 meutils/schemas/oneapi/icons.py,sha256=T7W5gInBJoHe62wzMimbG_UI-wn3_-rmQ1O4O2z-CQY,1089
 meutils/schemas/oneapi/model_group_info.py,sha256=rGtflYJuFIjk5MsVEvK9JUR4IciX8jfErqeLqf8DIlQ,1586
 meutils/schemas/oneapi/model_info.py,sha256=_uwKEPIIqm7ZYfhmpxtXB2QNsS83SpJY-OaBzvogC9w,772
@@ -791,9 +791,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.28.20.2.36.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.11.28.20.2.36.dist-info/METADATA,sha256=dyl9mEIDsBHfiFpTBBwPurKOjbmjCim_qsDEJuwembY,6143
-MeUtils-2024.11.28.20.2.36.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.11.28.20.2.36.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.11.28.20.2.36.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.11.28.20.2.36.dist-info/RECORD,,
+MeUtils-2024.11.29.10.30.18.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.11.29.10.30.18.dist-info/METADATA,sha256=9aMXnPqt2OOZUIBZhRnudTxxW5lijBi4KxnWi1tuv44,6144
+MeUtils-2024.11.29.10.30.18.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.11.29.10.30.18.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.11.29.10.30.18.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.11.29.10.30.18.dist-info/RECORD,,

examples/_openaisdk/openai_embeddings.py

@@ -13,18 +13,20 @@ from meutils.pipe import *
 from openai import OpenAI
 
 client = OpenAI(
-    api_key='sk-Gqbp2zoc71gWBVxvBd23D89f469e4e78A823357e2e625455',
+api_key="sk-iPNbgHSRkQ9VUb6iAcCa7a4539D74255A6462d29619d6519",
+    # api_key='sk-Gqbp2zoc71gWBVxvBd23D89f469e4e78A823357e2e625455',
 
     # api_key=os.getenv("SILICONFLOW_API_KEY"),
     # # api_key="sk-gcxjtocodgggxwnhqqsaqznpkpxndktwlgmgkmzljyajjsfp",
     # base_url="https://api.siliconflow.cn/v1",
 
-    base_url="https://api.bltcy.ai/v1"
+    # base_url="https://api.bltcy.ai/v1"
 )
 
 model = "BAAI/bge-large-zh-v1.5"
 model = "bge-large-zh-v1.5"
 model = "text-embedding-3-small"
+model = "text-embedding-ada-002"
 #
 # model = "BAAI/bge-m3"
 

meutils/async_task/celery_config.py

@@ -18,12 +18,12 @@ result_backend = 'redis://localhost:6379/1'  # 结果存储
 
 # 添加以下配置增加可靠性
 broker_connection_retry = True
-broker_connection_max_retries = 0  # 无限重试
+broker_connection_max_retries = 5
 broker_connection_retry_on_startup = True
 
 # 时区设置
-timezone = 'Asia/Shanghai'
 enable_utc = False
+timezone = 'Asia/Shanghai'
 
 # 任务序列化与反序列化配置
 task_serializer = 'json'
@@ -34,7 +34,7 @@ accept_content = ['json']
 # worker_pool = 'solo'  # 工作进程池类型，可选：'prefork'、'eventlet'、'gevent'
 worker_pool_restarts = True
 worker_concurrency = 8  # worker并发数，一般设置为CPU核心数
-worker_prefetch_multiplier = 4  # 预取任务数
+worker_prefetch_multiplier = 3  # 预取任务数
 worker_max_tasks_per_child = 256  # 每个worker执行多少个任务后自动重启
 
 # 任务队列配置
@@ -47,15 +47,15 @@ task_queues = (
 
 # 任务执行设置
 task_soft_time_limit = 10 * 60  # 任务软超时时间（秒）
-task_time_limit = 6 * task_soft_time_limit  # 任务硬超时时间（秒）
+task_time_limit = 2 * task_soft_time_limit  # 任务硬超时时间（秒）
 
 # 任务重试配置
 task_publish_retry = True  # 发布任务失败时重试
 task_publish_retry_policy = {
-    'max_retries': 3,  # 最大重试次数
+    'max_retries': 5,  # 最大重试次数
     'interval_start': 0,  # 初始重试等待时间
-    'interval_step': 1,  # 重试间隔递增步长
-    'interval_max': 8,  # 最大重试间隔
+    'interval_step': 2,  # 重试间隔递增步长
+    'interval_max': 16,  # 最大重试间隔
 }
 
 # # 任务路由配置

meutils/async_task/demo_create_tasks.py

@@ -40,8 +40,16 @@ from celery.result import AsyncResult
 if __name__ == '__main__':
     # r = test.do_sync_task.apply_async(kwargs={'a': 1, 'b': 2})
     # logger.debug(r.backend)
-    test.ado_sync_task.apply_async(kwargs={'a': 1, 'b': 2})
-
-    # print(AsyncResult(r.id).result)
+    # test.ado_sync_task.apply_async(kwargs={'a': 1, 'b': 2})
+    # test.ado_sync_task.apply_async(kwargs={'a': 1, 'b': 3})
+    # print(AsyncResult("42e191a0-6099-419e-b61d-07bf7e2df2fc").result)
     # result.backend
 
+    # 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": "测试"}})
+    test.do_pydantic_task.apply_async(kwargs={"request": {"method": "xx"}})
+    test.do_pydantic_task.apply_async(args=({"method": "xxxxxxx"},))

meutils/async_task/tasks/kling.py

@@ -25,3 +25,4 @@ async def proxy_task(**kwargs):
     pass
 
     return response
+

meutils/async_task/tasks/test.py

@@ -34,6 +34,20 @@ async def ado_sync_task(**kwargs):
     return kwargs
 
 
+class Request(BaseModel):
+    method: str = "GET"
+    url: str = "https://api.chatfire.cn/"
+
+
+# @worker.task(pydantic=True)
+# def do_pydantic_task(request: Request):
+#     return request
+
+
+@shared_task(pydantic=True)
+def do_pydantic_task(request: Request):
+    return request
+
 @shared_task
 @retrying(3)
 def proxy_task(**kwargs):

meutils/data/VERSION

@@ -1 +1 @@
-2024.11.28.20.02.36
+2024.11.29.10.30.18

meutils/data/oneapi/NOTICE.md

@@ -1,6 +1,12 @@
 <h1 align = "center">🔥公告🚀</h1>
 
 ---
+
+## 2024-11-29
+- 新增推理模型 
+  - Qwen/QwQ-32B-Preview
+    > 强大的数学问题解决能力，在AIME、MATH-500数学评测上，超过了OpenAI o1-preview优秀的编码能力，LiveCodeBench接近OpenAI o1-preview
+
 ## 2024-11-25
 - 新增虚拟换衣接口
   - [可灵官方api格式](https://api.chatfire.cn/docs/api-237182295) 0.8/次

meutils/schemas/oneapi/common.py

@@ -293,6 +293,8 @@ MODEL_RATIO = {
     "qwen2.5-72b-instruct": 4.13 / 2,
     "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,
 
     "qwen1.5-7b-chat": 0.05,  # 特价
     "qwen1.5-14b-chat": 0.7,
@@ -603,6 +605,8 @@ COMPLETION_RATIO = {
     "qwen2.5-coder-32b-instruct": 2,
 
     "qwen-turbo-2024-11-01": 3,
+    "qwen/qwq-32b-preview": 2,
+    "QWEN/QWQ-32B-PREVIEW": 2,
 
 }