MeUtils 2025.2.6.19.49.50__py3-none-any.whl → 2025.2.6.20.41.23__py3-none-any.whl

{MeUtils-2025.2.6.19.49.50.dist-info → MeUtils-2025.2.6.20.41.23.dist-info}/METADATA

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

{MeUtils-2025.2.6.19.49.50.dist-info → MeUtils-2025.2.6.20.41.23.dist-info}/RECORD

@@ -94,7 +94,7 @@ examples/_openaisdk/openai_audio.py,sha256=ZyYslH9RfdJBpNUpjKn_5x0d94_H291Qt31u_
 examples/_openaisdk/openai_baichuan.py,sha256=-xhHovkFmWOTX25CJjIon0my-ocmwfAZJu1C0eS80Xs,1614
 examples/_openaisdk/openai_baidu.py,sha256=qnrxP66lY7Qf2jEbFEHrt0FrR5_Aji1AgwSI_46IabY,1969
 examples/_openaisdk/openai_cache.py,sha256=89GbJ1QlqQbVxlUeuFgEbwDYHOkum7BK0zB-CqmDAZU,726
-examples/_openaisdk/openai_chatfire.py,sha256=kklrM7T8P5P5_mfCBPrXRq9FlBMKPMovGrI1mHZcKSQ,18446
+examples/_openaisdk/openai_chatfire.py,sha256=LlJnt5_Z6NgOjbpneO3wNfRfFuIGRTUPCZ_BbexuHc0,18528
 examples/_openaisdk/openai_chatfire_all.py,sha256=DaiI1NfDeK655QvXyczkgXK9Awxp7NBe71LHA7trxGE,4831
 examples/_openaisdk/openai_dashscope.py,sha256=m9SjQpaNgYwr4Qd3XusWbJBGp5ZTtpuB40QopejxPKQ,1029
 examples/_openaisdk/openai_deepinfra.py,sha256=innI4BT15dZEqheqDHG4lHDczY1QC7t2Whcavi1pcz0,1195
@@ -518,7 +518,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=-8qC-P_IFO7StKHx8b2yeSbeNFXCZIlwRJVZ0qhFrf8,19
+meutils/data/VERSION,sha256=gMmj5o_6WTKGJH8XgEaOUaTkPis38nxBlANaFkOYhkI,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -585,7 +585,7 @@ meutils/llm/completions/modelscope.py,sha256=umPlJuHSL2RR0oNdTIAqts8iqEmGp_MR6Vh
 meutils/llm/completions/oi.py,sha256=DmvzxJfdLA_I3MWcULhFtiUdo90j7V2dLvYvmZ-Tm9U,293
 meutils/llm/completions/qwenllm.py,sha256=d3E51-iKSCuL2HrVO4aUmGN_fa5Jwz5K1ENbK7MtXEE,2043
 meutils/llm/completions/rag.py,sha256=cpQ1aZX2QI1QDfFpODTxWHPYglK6_3qrlUM_KHLBNhc,1112
-meutils/llm/completions/reasoner.py,sha256=3spXH61ZByy-L3mvVhG4fLJScYgv6CTjayhKrDfPLTA,5318
+meutils/llm/completions/reasoner.py,sha256=IUwIM-B74iH_WUgGv1_y3qabtSi2EBWGO3YOsTmT3jo,5469
 meutils/llm/completions/tryblend.py,sha256=NfVRktn1QiE2k60PzEI-LmKuxZCc7mtL_KlsrVcZg4k,8957
 meutils/llm/completions/tune.py,sha256=FypfUgsB34t-E9xI6WydJYEk_-phscrLOX1iUCeKb_E,10138
 meutils/llm/completions/x.py,sha256=XE8aCyuhkpYq0nho1mq9lAdRU1yOPc8BpvCpNYYMYqM,630
@@ -600,7 +600,7 @@ meutils/llm/completions/rag/qwen.py,sha256=1dBNLLbQDRsM-7EGaStcWFU8HRa-rp3RxJ9cp
 meutils/llm/completions/rag/rag.py,sha256=mnC4bZUMuNYuPFXMBqXMofj_ms8uP5MMw1leJ5jXA_k,1209
 meutils/llm/functions/__init__.py,sha256=It6pcNwRBSh3Em45ooi61lc5tFg8eOYv0BvEFuRjSGQ,271
 meutils/llm/openai_utils/__init__.py,sha256=MWyNhP2K49oaHGEZlInZc3XlwqlStFultP8k7HDPAwk,290
-meutils/llm/openai_utils/common.py,sha256=KkvQ-FdSlyuBS61_qbmbVbvU-Sdfz-sbZQ-3lTG-fMg,9436
+meutils/llm/openai_utils/common.py,sha256=XQNFzu6GkKozjRinsaTh755zoRpjsWYL5BK4q3gj8jw,9525
 meutils/llm/openai_utils/tool_outputs.py,sha256=6mNkm4btgy0uzF98gdmcah1bYmoflXdLz2Sqm0KC_LQ,1224
 meutils/llm/output_parsers/__init__.py,sha256=EGKvgUD47ReyV5Z9RXDCrdDLgfKMHdoayzsXVmBuQxw,3474
 meutils/llm/prompts/__init__.py,sha256=VlEEViFoUSRS0EF1rHJXHh9Ik9FpvAiR1luKjHOsUc4,8580
@@ -744,7 +744,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=YanT0q9pU7dva2ZBPWjCpwGNUuifnJh0zUJJCQ9070c,3848
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=OdxupI70-Vukr37xG_ERUuInaH5KPe5BySDGpjyUhI0,27706
+meutils/schemas/oneapi/common.py,sha256=mePimgYAll7TAI9d044BQ1jX-xOsdO9_iPMInUHwpCg,27747
 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
@@ -872,9 +872,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-2025.2.6.19.49.50.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.2.6.19.49.50.dist-info/METADATA,sha256=c0h4TkD37PClHt4_EBNBRYiLD9SrPhZWlSbyOw3OUws,6142
-MeUtils-2025.2.6.19.49.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.2.6.19.49.50.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.2.6.19.49.50.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.2.6.19.49.50.dist-info/RECORD,,
+MeUtils-2025.2.6.20.41.23.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.2.6.20.41.23.dist-info/METADATA,sha256=2hhfEzGEv6L9m2YB36RLjEWfZpVf0ezXPxbGsf4GQwQ,6142
+MeUtils-2025.2.6.20.41.23.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.2.6.20.41.23.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.2.6.20.41.23.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.2.6.20.41.23.dist-info/RECORD,,

examples/_openaisdk/openai_chatfire.py

@@ -227,14 +227,14 @@ if __name__ == '__main__':
         # "deepseek-r1:1.5b"
         # "deepseek-v3-128k",
         # "qwen2.5-32b-instruct"
-        "deepseek-r1:1.5b"
+        # "deepseek-r1:1.5b"
         # "deepseek-r1:1.5b"
 
-        # "deepseek-r1",
+        "deepseek-r1",
         # "deepseek-v3"
 
     ]
-    check_models(models, api_key=os.getenv("OPENAI_API_KEY"))
+    # check_models(models, api_key=os.getenv("OPENAI_API_KEY"))
     # check_models(models, api_key=os.getenv("OPENAI_API_KEY_OPENAI"))
     # check_models(models, api_key=os.getenv("OPENAI_API_KEY"))
     # check_models(models, api_key=os.getenv("OPENAI_API_KEY_35"))
@@ -249,4 +249,6 @@ if __name__ == '__main__':
     # for i in range(5):
     #     check_models(models, api_key=os.getenv("OPENAI_API_KEY_GUOCHAN") + "-302")
 
-    # check_models(models, api_key=os.getenv("OPENAI_API_KEY_GUOCHAN") + "-725")
+    # check_models(models, api_key=os.getenv("OPENAI_API_KEY_GUOCHAN") + "-725")
+
+    check_models(models, api_key=os.getenv("OPENAI_API_KEY_GUOCHAN") + "-722")

meutils/data/VERSION

@@ -1 +1 @@
-2025.02.06.19.49.50
+2025.02.06.20.41.23

meutils/llm/completions/reasoner.py

@@ -10,7 +10,7 @@
 """
 1. 适配任意客户端 think标识输出
 2. 开源标准化
-
+todo: 对齐官网格式
 """
 
 from openai import AsyncOpenAI
@@ -88,7 +88,7 @@ class Completions(object):
                             is_reasoning_content = False
                         message.content = ""
 
-                    logger.debug(message)
+                    # logger.debug(message)
 
                 if self.reasoning_stream:  # 适配任意客户端: 展示推理内容
 
@@ -137,25 +137,29 @@ if __name__ == '__main__':
         # model="qwen-plus-latest",
 
         # model="deepseek-r1:1.5b",
-        model="deepseek-r1:32b",
-
-        # model="deepseek-r1",
+        # model="deepseek-r1:32b",
+        #
+        model="deepseek-r1",
+        # model
 
         messages=[
             # {
             #     'role': 'system',
             #     'content': '深度思考之后在回答问题并给出详细的理由'
             # },
-            # {
-            #     'role': 'system',
-            #     'content': '你是个AI助手，请务必在深度思考之后，再回答用户问题'
-            # },
+            {
+                'role': 'system',
+                'content': '你是个AI助手，请务必在深度思考之后，再回答用户问题'
+            },
             {
                 'role': 'user',
                 'content': '你好'
             },
 
         ],
-        stream=False,
+        stream=True,
     )
-    arun(Completions().create(request))
+    arun(Completions(
+        base_url="https://ai.gitee.com/v1",
+        api_key="AHKZ65ARNFH8QGMUUVCPECDTZVOLRPUXIKPGAC1Y",
+    ).create(request))

meutils/llm/openai_utils/common.py

@@ -207,7 +207,7 @@ async def create_chat_completion_chunk(
         # logger.debug(type(completion_chunks))
 
     chat_completion_chunk.id = chat_id or f"chatcmpl-{shortuuid.random()}"
-    chat_completion_chunk_stop.id = chat_completion_chunk.id
+    chat_completion_chunk_stop.id = chat_completion_chunk.id  ######## todo
     async for completion_chunk in achain(completion_chunks):
 
         # logger.debug(completion_chunk)
@@ -218,6 +218,7 @@ async def create_chat_completion_chunk(
             yield chat_completion_chunk.model_dump_json()
         else:  # todo: AttributeError: 'tuple' object has no attribute 'model'
             try:
+                chat_completion_chunk_stop.id = chat_completion_chunk.id
                 completion_chunk.model = redirect_model or completion_chunk.model
                 chat_completion_chunk_stop.usage = completion_chunk.usage  ############## 需要判断 usage？
                 yield completion_chunk.model_dump_json()
@@ -283,4 +284,4 @@ if __name__ == '__main__':
 
     # to_openai_params(ChatCompletionRequest())
 
-    print(token_encoder.encode('hi'))
+    print(token_encoder.encode('hi'))

meutils/schemas/oneapi/common.py

@@ -382,7 +382,8 @@ MODEL_RATIO = {
     "qwen-max": 10,
     "qwen-max-longcontext": 20,
     "qwen-turbo-2024-11-01": 0.15,
-    "qwen-max-latest":0.01,
+    "qwen-max-latest": 1.2,
+    "qwen2.5-max": 1.2,
 
     "qwen-vl-max-latest": 1.5,
     "qwen-vl-plus-latest": 0.75,
@@ -754,7 +755,6 @@ COMPLETION_RATIO = {
 
     "gemini-exp-1206": 5,
 
-
     "gemini-2.0-flash": 4,
     "gemini-2.0-flash-001": 4,
 
@@ -778,13 +778,14 @@ COMPLETION_RATIO = {
     "qwen-vl-plus-latest": 3,
     "qwen2-vl-7b-instruct": 5,
     "qwen2-vl-72b-instruct": 5,
-    "qwen-max-latest": 5,
+    "qwen-max-latest": 4,
+    "qwen2.5-max": 4,
 
     "qwen2.5-7b-instruct": 4,
-    "qwen2.5-14b-instruct":  4,
-    "qwen2.5-32b-instruct":  4,
-    "qwen2.5-72b-instruct":  4,
-    "qwen2.5-math-72b-instruct":  4,
+    "qwen2.5-14b-instruct": 4,
+    "qwen2.5-32b-instruct": 4,
+    "qwen2.5-72b-instruct": 4,
+    "qwen2.5-math-72b-instruct": 4,
 
     "deepseek-vl2": 4,
     "deepseek-ai/deepseek-vl2": 4,