MeUtils 2024.12.5.12.28.40__py3-none-any.whl → 2024.12.5.15.58.45__py3-none-any.whl

{MeUtils-2024.12.5.12.28.40.dist-info → MeUtils-2024.12.5.15.58.45.dist-info}/METADATA

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

{MeUtils-2024.12.5.12.28.40.dist-info → MeUtils-2024.12.5.15.58.45.dist-info}/RECORD

@@ -100,6 +100,7 @@ examples/_openaisdk/openai_god.py,sha256=O8fbhyxiIlVR7pTvBTXgQ2QTwfcZ2MkEIyDe_jp
 examples/_openaisdk/openai_groq.py,sha256=_5Ue1yEx0Gp6theFioB_D8kepR0UlqMU96PVGH-LkVY,7363
 examples/_openaisdk/openai_images.py,sha256=vGuKEbHxuK70Ls2PTbWUeET9q88Kncn22YLBp14bMO8,5114
 examples/_openaisdk/openai_json.py,sha256=1VfsTKe4yNX1rTRvzlz9oE3FWji_gf36H5OvUNfG0sw,1843
+examples/_openaisdk/openai_modelscope.py,sha256=bKBtXpEN3_YxXRwlQEBV1YmjzT396zxByqdB6nxaEGI,1291
 examples/_openaisdk/openai_moon.py,sha256=Y7RrB6SUi9taQOlA50nfGTpQa9ON6XmPmrxtL-hSL8M,1753
 examples/_openaisdk/openai_search.py,sha256=HKRTU6y9j_nUfZgrJt2eZ84d7TVT39WN-dcA_BFkVb4,937
 examples/_openaisdk/openai_sensenova.py,sha256=TnJpHcD1tG5w_x5DsgFgBRWrU8XUkww0uCebgNFfZDM,3216
@@ -294,7 +295,7 @@ meutils/apis/kuaidi.py,sha256=4KrtOkbGlsLpyvbY80UMSo03iFqFiBHnE0CiqAWWQ4Y,998
 meutils/apis/llm_qa.py,sha256=XM1VMkOTb4xKzgVk56dPC1e8lg7SbnfobBVgfLXiX9A,1207
 meutils/apis/niutrans.py,sha256=weWjn-tUTEaAUe5RGbzcjQqPkJxGDrPwMB6CnaiZSsg,1682
 meutils/apis/search_music.py,sha256=HBLtdterztrccnLAPZrWBlrYSx4WCRflCqz-V30fOA8,972
-meutils/apis/textin.py,sha256=4Cd_iof2jgxtPxPsjWbBJ1B2rQoVrdJOFdWxP3ZKBQU,4749
+meutils/apis/textin.py,sha256=jJC84Ca17bYF8VZU7IXkd7754EWgPJK-tgl1V59BraU,4811
 meutils/apis/ts.py,sha256=Q13EOS9Q-Y2-KwOG_cFMVmGj9RUmDtxk5A3E27dxbN0,1511
 meutils/apis/web_search.py,sha256=6gS3leIB2iyeLtqhB0IbpL_mKzDgArRTqnR7odTWT3E,1035
 meutils/apis/yezi.py,sha256=26vhnA3lC5049Rqx-CHO-wyGKbdZAfvjEOG90W38cr0,3675
@@ -465,14 +466,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=tkQGHrRdks4Tjpd7jJiOglCKj9lH7xI-psnFNEDyYuw,19
+meutils/data/VERSION,sha256=ejsUN1se0NIgZaYpaanFbbntU-As4bHY0gLJqOyLlBM,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=7yF5djeqq0MBUTtcYZxcYzeSGzPLdeJTceEldxS2eUA,1751
+meutils/data/oneapi/NOTICE.md,sha256=PXUnFv_3MBM-MTrrvQrCFQdPjubM-1bTy_tIE9lREEg,1855
 meutils/data/oneapi/__init__.py,sha256=cm2Kq2RDXPfdVMWcoBB77bu00zJpTDd21Rgc6bTlhws,398
 meutils/db/__init__.py,sha256=HR99rqxoFTWXUHDhLVl33tzIn8M86gigHLmEzOKH1Ec,7637
 meutils/db/mongo.py,sha256=B-B_t939rxtnNGt0PxhivjIUwinmHPzLUpXsjUIaTkQ,2337
@@ -640,7 +641,7 @@ meutils/schemas/fish_types.py,sha256=yC0ZFr3Ebh8F0OhtMsXYaIfNNvzOM2LT9YtKTaRoHGU
 meutils/schemas/hailuo_types.py,sha256=hmkjFPID5HS26Ayk80xS2a38XcubokEHxzg86cC0Ki8,6150
 meutils/schemas/haimian_types.py,sha256=jGu484UviAeBgy5OIUyRY4uYCxXfv16zDPqiJQr9wNQ,1364
 meutils/schemas/idphoto_types.py,sha256=nuHbpppejRSkJCiQ7YKx0Gnke0ShKZhOvdg0e7tk9-0,1074
-meutils/schemas/image_types.py,sha256=u8lPJU3robAxbACv54sMhCdET2VAb8g-zSW8EqtDuh8,11291
+meutils/schemas/image_types.py,sha256=mba128lFaIGhPcUJG5JZeDGxNYFRgkJrMuWPY8iG6LA,11569
 meutils/schemas/jina_types.py,sha256=SLRRBCap2B1uXnHF7Sgnlz1Work8HvdIltjj4oVlGTk,8826
 meutils/schemas/kimi_types.py,sha256=PjCgHwCDNzKasn4X6rUzvOENqKYT3xj07cgp71IdsDA,3607
 meutils/schemas/kling_types.py,sha256=brWaREBtQeZGUuwgOW2p-vIm2WWInYkq8UfrLInT-Ik,6959
@@ -673,7 +674,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=Jtt1hXRS5C3DHf_wrkjklVcdPllsAFrzvLq9JLuTdtc,2858
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=ULNre1gz100UuP2wMLlIjkcCO7tbhXmDcKwo0u-9XGk,22723
+meutils/schemas/oneapi/common.py,sha256=GbOIYs2JIvmO_9GVKE-EY6ddeHbAPpu4uz8k0AHQe2o,22822
 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
@@ -800,9 +801,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.12.5.12.28.40.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.5.12.28.40.dist-info/METADATA,sha256=NpU55wGvIupm2QIBSoPuRPPP7Z_YmdO-HbM2QbScTOE,6143
-MeUtils-2024.12.5.12.28.40.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.5.12.28.40.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.5.12.28.40.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.5.12.28.40.dist-info/RECORD,,
+MeUtils-2024.12.5.15.58.45.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.5.15.58.45.dist-info/METADATA,sha256=pX7J_TAl9dKT6WkF8EL9fmlWdJtamv5VqD7LigZOXrc,6143
+MeUtils-2024.12.5.15.58.45.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.5.15.58.45.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.5.15.58.45.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.5.15.58.45.dist-info/RECORD,,

examples/_openaisdk/openai_modelscope.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : openai_siliconflow
+# @Time         : 2024/6/26 10:42
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+"""
+Qwen/Qwen2.5-Coder-32B-InstructQwen/Qwen2.5-Coder-14B-InstructQwen/Qwen2.5-Coder-7B-InstructQwen/Qwen2.5-72B-InstructQwen/Qwen2.5-32B-InstructQwen/Qwen2.5-14B-InstructQwen/Qwen2.5-7B-Instruct
+
+"""
+import os
+
+from meutils.pipe import *
+from openai import OpenAI
+from openai import OpenAI, APIStatusError
+
+client = OpenAI(
+    # api_key=os.getenv("STEP_API_KEY"),
+    # base_url="https://api.stepfun.com/v1",
+    base_url=os.getenv("MODELSCOPE_BASE_URL"),
+    api_key=os.getenv("MODELSCOPE_API_KEY")
+)
+
+print(client.models.list())
+
+try:
+    completion = client.chat.completions.create(
+        # model="step-1-8k",
+        model="Qwen/QwQ-32B-Preview",
+        messages=[
+            {"role": "user", "content": "讲个故事"}
+        ],
+        # top_p=0.7,
+        top_p=None,
+        temperature=None,
+        stream=True,
+        max_tokens=1000
+    )
+except APIStatusError as e:
+    print(e.status_code)
+
+    print(e.response)
+    print(e.message)
+    print(e.code)
+
+for chunk in completion:
+    print(chunk.choices[0].delta.content)

meutils/apis/textin.py

@@ -89,7 +89,7 @@ async def document_process(data: bytes,
                 # "proxies": proxies,
             }
 
-    if response_format == "url" and service in {"watermark-remove", "dewarp"}:
+    if response_format == "url" and service in {"watermark-remove", "crop_enhance_image"}:
         if "data" not in _:
             send_message(_, title=__name__)
 
@@ -122,12 +122,13 @@ if __name__ == '__main__':
 
     # service = "pdf_to_markdown"
 
-    service = 'dewarp'
+    service = 'bill_recognize_v2'
 
     async def main(n=1):
         for i in tqdm(range(n)):
             try:
                 _ = await document_process(data, service=service)
+                logger.debug(bjson(_))
             except Exception as e:
                 logger.error(f"{i}: {e}")
                 break

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.05.12.28.40
+2024.12.05.15.58.45

meutils/data/oneapi/NOTICE.md

@@ -2,6 +2,10 @@
 
 ---
 
+## 2024-12-05
+- 新增模型gpt-4-plus/gpt-4o-plus按倍率计算
+  > OpenAI-plus会员 逆向工程
+  
 ## 2024-11-29
 - 新增推理模型 
   - Qwen/QwQ-32B-Preview

meutils/schemas/image_types.py

@@ -385,11 +385,24 @@ class HunyuanImageProcessRequest(ImageProcessRequest):
 
 
 TEXTIN_TASKS = {
+    # 文本解析
     "image-to-markdown": "pdf_to_markdown",
     "pdf-to-markdown": "pdf_to_markdown",
+    "textin-pdf-to-markdown": "pdf_to_markdown",
+
+    # 去水印
     'textin-removewatermark': 'watermark-remove',
+
+    'textin-ocr': 'text_recognize_3d1',
     'text-recognize': 'text_recognize_3d1',
-    'dewarp': 'dewarp'
+
+    # 图片提取表格
+    "textin-table": "table",
+
+    "textin-crop-enhance": "crop_enhance_image",
+
+    # 票据识别
+    "textin-bill-recognize": "bill_recognize_v2",
 }
 
 

meutils/schemas/oneapi/common.py

@@ -176,7 +176,6 @@ MODEL_PRICE = {
     "gpt-4-all": 0.1,
     "gpt-4o-all": 0.1,
 
-    "gpt-4-mobile": 0.1,
     "gpt-4-gizmo-*": 0.1,
     "advanced-voice": 1,
 
@@ -236,6 +235,10 @@ MODEL_PRICE = {
 }
 
 MODEL_RATIO = {
+    # 智能体
+    "gpt-4-plus": 2.5,
+    "gpt-4o-plus": 2.5,
+
     # embedding & rerank
     "rerank-multilingual-v2.0": 0.1,
     "rerank-multilingual-v3.0": 0.1,
@@ -550,6 +553,10 @@ MODEL_RATIO = {
 }
 
 COMPLETION_RATIO = {
+    # 智能体
+    "gpt-4-plus": 5,
+    "gpt-4o-plus": 5,
+
     "grok": 3,
     "grok-beta": 3,
     "x-ai/grok-beta": 3,