MeUtils 2024.12.26.22.14.1__py3-none-any.whl → 2024.12.31.17.51.53__py3-none-any.whl

{MeUtils-2024.12.26.22.14.1.dist-info → MeUtils-2024.12.31.17.51.53.dist-info}/METADATA

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

{MeUtils-2024.12.26.22.14.1.dist-info → MeUtils-2024.12.31.17.51.53.dist-info}/RECORD

@@ -91,7 +91,7 @@ examples/_openaisdk/open_router.py,sha256=Z4i_FJIc773JnIdYA3Hhuy1Dq5-DIOIrmkWwbp
 examples/_openaisdk/openai_audio.py,sha256=ZyYslH9RfdJBpNUpjKn_5x0d94_H291Qt31u_6weISc,484
 examples/_openaisdk/openai_baichuan.py,sha256=4_Gz8FeRrW5Zwnh-KFmaLOXr6sn3AxU47Qd2j8VDiQU,1527
 examples/_openaisdk/openai_cache.py,sha256=89GbJ1QlqQbVxlUeuFgEbwDYHOkum7BK0zB-CqmDAZU,726
-examples/_openaisdk/openai_chatfire.py,sha256=XYiluw1SF-4-OVREsUuh-DVr-kmPC7aKoFxAdmydBO8,17211
+examples/_openaisdk/openai_chatfire.py,sha256=nuaGDz1ANW2AAYxyfKD8Glr-n1C2-l1GmFw_Ea56xT0,17303
 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
@@ -110,7 +110,7 @@ examples/_openaisdk/openai_siliconflow.py,sha256=A2CMev2Bw5OwEJQNXGXQKrNs0DzlvrV
 examples/_openaisdk/openai_step.py,sha256=rwXrGRs5CHhWpNl9oeIHltErp1Or_B3PVKNAoMGY-0c,1054
 examples/_openaisdk/openai_test.py,sha256=OdtT8qxKbh4S8H2T_zgMShn8VMQ_xSWttfqNSYT2hNw,1905
 examples/_openaisdk/openai_tune.py,sha256=D8n3mnlvVpDB_P11sErlibSyYtoFT5aKPUDQhtIANWE,1237
-examples/_openaisdk/openai_zhipu.py,sha256=NplKPhtA5A8O7o9YkjL8YULzsBDBl341D8Gji7fCnw4,1628
+examples/_openaisdk/openai_zhipu.py,sha256=UCj9aCtjmN0gexfzo65VL0EKi_CpF27v2dpx3wN4ItY,1630
 examples/_openaisdk/ppu.py,sha256=jPBufoYt2ZrqNKjgbHr49YZI5vBM-32eBYbhbYduhnY,602
 examples/_openaisdk/rag.py,sha256=NwNHhfi5FZ2XKCmsScjmM5cxCSfJuqx2jV-69ZXh244,1372
 examples/_openaisdk/rag_.py,sha256=rNTCO83JK6zqQAiY0vlHZRN5DQNT9_nCYtjeh8lTijU,121217
@@ -118,6 +118,7 @@ examples/_openaisdk/test.py,sha256=Y_dP8rK-LFIBc_fy00ug-2XkilK0G_TlFDa3iuUK-iM,3
 examples/_openaisdk/x.py,sha256=IdhHsmyd-uZx5UohfWa_g467kZeR1Pkec42z3bW-3Iw,4752
 examples/_openaisdk/xx.py,sha256=DvU98YbhmFJZ3xWqK4NOAafNqOJLu2ehQycCRLEXVUg,645
 examples/_openaisdk/zhipu_files.py,sha256=HLvlM9CDcmNER5w-MBMLQPZVPJjR2UHRXYA3ru2cT2Q,1057
+examples/_openaisdk/zhipu_智能体.py,sha256=f6uCVVLkIq_YKydwvnlzsEZ9jf10BXwtmmo860_uS7M,1100
 examples/_openaisdk/兜底测试.py,sha256=7vIOZDj-iB5dJjfJtHe_A-3D7ZUmOSiryI7ciIp0EzE,2878
 examples/_openaisdk/多模态测试.py,sha256=XNHvC9Qbw3tUZ_i8shyEx3a6T3FFDsTyIIkm3rO0R38,2559
 examples/_openaisdk/多模态测试_.py,sha256=7mh9dnpSApqmrriQ9-q4jY8uHfplsrjyGSXb8b-Zt9o,1276
@@ -224,7 +225,7 @@ examples/wget/demo.py,sha256=b-wASDBKND8_TtdIorNXV45sMjbWnfsYCBVk6XXee3o,438
 examples/wget/progress_bar/__init__.py,sha256=mlmNLOEplBy1h_Me-UWbgidVNrkie5okV1A8HQ0Ihy8,271
 examples/文档智能/__init__.py,sha256=JKHlkF5vTvwFJnFLIT7raQxsvBoK12b8lvVz-c03Uec,271
 meutils/__init__.py,sha256=X_i77Bvnt4-c4XUwuzGZTvXP2doPtTBqQsHl9DE455E,348
-meutils/_utils.py,sha256=WGToRl9L6zrvDAW4CLcP8XyQf0YUnVOqBVNdOz9xv84,1768
+meutils/_utils.py,sha256=5oL-s4vM0DZSyI9j1Qoo999PcJagMKNZ9ZPaXFo9tp4,1999
 meutils/cache_utils.py,sha256=6vz3G8wZ5iOXH91J-dp7ciU_BuLDzjjQUi4Hl8rrzOY,8425
 meutils/common.py,sha256=4iFOr2iNyijMdtvJa-a32owTJNQjwTZ9cQ2xjX5vVw0,16542
 meutils/date_utils.py,sha256=--rh58qfa2iagLjgA0eh1myyvaZ0hgxHiy-WCsrNsuk,2497
@@ -344,7 +345,7 @@ meutils/apis/hunyuan/image_tools.py,sha256=o_Q8_-kp4F11bmZ-VA4_wmI_S5xdH8Dw6VIDb
 meutils/apis/images/__init__.py,sha256=hs7HUJZvw_3DAtoapPnbZsEb4ng1p0a6fJGFFWwUcUk,272
 meutils/apis/images/deepinfra.py,sha256=N7IDJ9dubojOY--R30uQlzSBbuuy4OXkCkRB1ey0kcQ,3241
 meutils/apis/images/demo.py,sha256=Cjk-EKMKbp44czykW_44qR0TzElX8nNCALqXBBw5sJA,4405
-meutils/apis/images/recraft.py,sha256=fqSXLuyhoy6u1uEwvGl0CISOHab_wVLWVdX3NFziamM,10140
+meutils/apis/images/recraft.py,sha256=XWB2F6bH7fVZ31Mc4JcWxR6Oy8KBmjYt2c9FqegAuBU,4455
 meutils/apis/images/fal/__init__.py,sha256=A7w3ZAS7Tv20N4X4Em6NshDxKSCPAzaPxHJTbM3BbyM,272
 meutils/apis/images/fal/files.py,sha256=Gppdo96uw8-TCDr8P691jV7dK9Si-E-kJXFJR5BVt-Q,1373
 meutils/apis/images/fal/images.py,sha256=VdobSRcMuU32Q1dEdTJCy68oXTjomz-yzLLLVE2F7WM,1774
@@ -366,7 +367,7 @@ meutils/apis/jimeng/common.py,sha256=wIduTWmtJJQWIbxDMVvQ9BlDheiGbeROPNuulfiwiNY
 meutils/apis/jimeng/doubao.py,sha256=vSEaTQHQdyhpHwCoq6CIikDZkUC9ncyTgKxGUC8cMCI,4345
 meutils/apis/jimeng/doubao_utils.py,sha256=XCHnvwfCOtJmPQuzDOCfKDMP_Pcqh-Y4w2h5f7Y2gzM,5999
 meutils/apis/jimeng/files.py,sha256=aFKg5iesJNVbXclaMR0yDpnKzjqW1yZxkyp9qrGTybo,5365
-meutils/apis/jimeng/images.py,sha256=Ey4_9eU7i7VbgY3VSXKTq0REsydIU9MCva6rT7oMszg,4017
+meutils/apis/jimeng/images.py,sha256=Z1w8Jxqvom-rBB9MSfQz4QvfPLTEoamwyb9X9_yUmBk,4641
 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
@@ -491,14 +492,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=zqr6yaz0tAmphjpfJAUxC29MpvkVkCUkq8ScIUfBEv4,19
+meutils/data/VERSION,sha256=HUI0nXKG7VC_0piEI6rPcyOH30DsgRP25TKMBx3ldSk,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=0R7Gnh2yE9p_MRFx-a3Z4-UgRCJ3USCl0b86cOcc82Q,5220
+meutils/data/oneapi/NOTICE.md,sha256=dpIf30sW98468255_n6t-rdHFszMU7nX2kQyNRUmEl0,5345
 meutils/data/oneapi/__init__.py,sha256=cm2Kq2RDXPfdVMWcoBB77bu00zJpTDd21Rgc6bTlhws,398
 meutils/db/__init__.py,sha256=HR99rqxoFTWXUHDhLVl33tzIn8M86gigHLmEzOKH1Ec,7637
 meutils/db/mongo.py,sha256=B-B_t939rxtnNGt0PxhivjIUwinmHPzLUpXsjUIaTkQ,2337
@@ -554,7 +555,7 @@ meutils/hooks/hook_test.py,sha256=dLNm_ngK9MV3c0ofLUBZF0dhGJXHuTg4V9k-ry_9wQU,69
 meutils/hooks/wechat.py,sha256=vFnL4jUzCwX1jTcO1-6QehzSUmsfzmWfyna5USMLIF8,5897
 meutils/hooks/wechat_channel.py,sha256=pB96BzjsMSTdVkDMgXO7HbQO4e2a2cSSnXLXFPoMdQc,12467
 meutils/init/__init__.py,sha256=J_ApVNdTQAHsIfSLrMRZhwJ8rdgiOfeyiXGSymvZSng,242
-meutils/init/evn.py,sha256=z-2SGOL2SzDUdaQMEFpazXNjkyV1CLYGML-rNEZZ5a0,1588
+meutils/init/evn.py,sha256=GPw9Un8YbgYJmjwd-uYWQ8JeVr6pRxwyYbDv3W8fb1s,1588
 meutils/init/oo.py,sha256=jXWaCWWFYVPGgTIas47Z3J7sIq-CD7DyK6fKDBsq8GA,12884
 meutils/io/__init__.py,sha256=uW43ZfdWu7adRvwvcTzUGtn4CseRmbzEJdlZV-oqHEA,2107
 meutils/io/files_utils.py,sha256=KLG4230KhNfdZjhjZJo-jVtbR3RQNpPlp028u8hQUQ4,6979
@@ -562,8 +563,6 @@ meutils/io/image.py,sha256=lY8vhmf7_5hW5UPh1QjDfeZZOyvSGKDGpJo9k8-s5N4,6136
 meutils/io/minio_utils.py,sha256=i1YuxwDJzLse0smMXuPqnD1wirBBb8psmB_kd1oPoVU,1274
 meutils/io/tf_io.py,sha256=vEZZS4pCf4Dt3A-FtIVMfhC3FJUUpQCK2OoEvXrBWos,8605
 meutils/io/x.py,sha256=NyDhVhZ9poPPxaK-W5G8qWAnxjZ5NEz-kv32tK8qNvA,2665
-meutils/jwt_utils/__init__.py,sha256=hU1CYBK90Q9QKVrf1s6VFKZwWjHioHa6bO2AuDn7_eo,272
-meutils/jwt_utils/common.py,sha256=MBIKj4N8nMVAg_qQ9ki3U74Q7ZxFYsZDLi7xgTvWGsA,858
 meutils/llm/__init__.py,sha256=mYv0QpACLd-wz4htIduPuTU3mX06_Y8ZprxDohtZGBM,244
 meutils/llm/check_api.py,sha256=Vlan35FGvjPLP-dZu_Gfgmki-G89YPV96-x1oXji79I,3566
 meutils/llm/check_utils.py,sha256=wA7mHaWEqcN-GBeoqUw2ee_54G-Bht-m1opqZkAEFss,3354
@@ -585,12 +584,12 @@ meutils/llm/completions/x.py,sha256=XE8aCyuhkpYq0nho1mq9lAdRU1yOPc8BpvCpNYYMYqM,
 meutils/llm/completions/xx.py,sha256=pPfVRczvXZFUvAUOAFr0MMHMb5kVPNfKVhOLKugq52M,1646
 meutils/llm/completions/yuanbao.py,sha256=aN3MwR6yORFv5pGA1ODiLqlNKCfAKQslIfpruAD6m08,5468
 meutils/llm/completions/rag/__init__.py,sha256=VH4g9H0pqMM1Rkjc1xefQb4Uh8f9vlTt6tjdD6G6Wc0,272
-meutils/llm/completions/rag/fire.py,sha256=7JzDpSBSeW6RQxfExdNwePkyLCnPWoWwjr6lqTcLfqk,4525
+meutils/llm/completions/rag/fire.py,sha256=0a_POkY9mEy1YwZHXOGnqf9EVyjiJwx3fWhmv_bQ54U,5743
 meutils/llm/completions/rag/qwen.py,sha256=1dBNLLbQDRsM-7EGaStcWFU8HRa-rp3RxJ9cpxu6TBg,265
 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=GnrwigxzjlRmiyEeNZOKL2CKWvpo14YU_ujgVnIR6NE,9208
+meutils/llm/openai_utils/common.py,sha256=rBA2EQB6xGfjbboX1x44vwwPSS7EXuA0BbhAULv7JBI,9206
 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
@@ -649,14 +648,18 @@ meutils/queues/demo.py,sha256=gAjGRlJhM6Q-OlQkNuow5qrHuakngYPCfKOg4EVCaR8,1491
 meutils/queues/smooth_queue.py,sha256=hZubxQYP603-aL-_MAW8llGICBpJ7j-9IQG4y-Jo8eY,3513
 meutils/queues/uniform_queue.py,sha256=fKZw-xc9RBY0VoN6uRwQWEds8o5U0nxBz7SQhAVzq-I,1576
 meutils/request_utils/__init__.py,sha256=wqP3vkDJ2wFMawvx4XyT-5pNf-Jr81PYTQ14FCcG-Pw,4053
+meutils/request_utils/ark.py,sha256=n7U89XlESpVJ-gErJIi1fvslkULLJEjAQQoEORGusr4,1012
 meutils/request_utils/a爬虫.py,sha256=PTsl0RuNB7IByErMpGZj5WwSZeHBRR53YqRNx1J0_EU,1894
 meutils/request_utils/crawler.py,sha256=7jSZGg2hWmKjLF1Sp1onH28-FGPV5EoygNlfG5ScKSk,2311
 meutils/request_utils/download.py,sha256=qFGt79Jp1f8n681x0kHWN3S70E-l46PlM2xqSdUDNm8,1767
 meutils/request_utils/results.py,sha256=i422B66FHc7fzAyyORpQEkO0QO_dk38d1K0i8XYuixk,1334
 meutils/request_utils/tiangong.py,sha256=l5t4pAWxxYvFxvyo-jJ-R6efKWMHjYPiPjrPUGMZLiU,3057
+meutils/request_utils/volc.py,sha256=9kHyZDjLqFpFpSsDoGfeRE1Kd0UYrkg8EtotersSlWc,5885
 meutils/request_utils/wechat.py,sha256=LSI2diHs0IOXQiicUEMOtKnpQFTK7jLk-j-OTSwekGU,417
 meutils/request_utils/公网ip.py,sha256=eK7NdsvHnSXcUIOASl1g8loWlfLl0YzoRU_sYEC0HZQ,646
 meutils/request_utils/爬虫.py,sha256=pgbSAuxrpWFmKL_9xikjsz5L3b-bWhe-Fh-uoP7drxo,1735
+meutils/request_utils/jwt_utils/__init__.py,sha256=hU1CYBK90Q9QKVrf1s6VFKZwWjHioHa6bO2AuDn7_eo,272
+meutils/request_utils/jwt_utils/common.py,sha256=sD9-T_JXnlubXJJkFNg1d5oUKzhQ-sq1bRFubLVeu6A,859
 meutils/schemas/__init__.py,sha256=LOdt8C4mTa6rjd6ijvEW7mHuGTNXOhwxQ0gbhWxfrmA,244
 meutils/schemas/baidu_api.py,sha256=iq1-Iztp6d8k-yhRdvHRVfqKKuSnIkBLumBf52qoHdY,484
 meutils/schemas/baidu_types.py,sha256=mYExWrhdoB6Z1fHsp_ftbGF9qWhWMb0lA5k0mao2wDQ,19661
@@ -671,7 +674,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=kcYdL7f-UsixSltsnfytSHn6W4OtAmIMMGBdVmV20k8,11594
+meutils/schemas/image_types.py,sha256=n6WaN4U1557tsXzarLRlYwSsaffNf8NobNVM-p46sDY,11619
 meutils/schemas/jimeng_types.py,sha256=qsjtyURGsGnAGAhfZ9k4k-mtbRgjbWId75UMV1d6AiE,851
 meutils/schemas/jina_types.py,sha256=SLRRBCap2B1uXnHF7Sgnlz1Work8HvdIltjj4oVlGTk,8826
 meutils/schemas/kimi_types.py,sha256=PjCgHwCDNzKasn4X6rUzvOENqKYT3xj07cgp71IdsDA,3607
@@ -684,7 +687,7 @@ meutils/schemas/metaso_types.py,sha256=YD5Xrquxibi3911ZkjODFXqPp9vqxbQXKLdMe8dCq
 meutils/schemas/napkin_types.py,sha256=Kp0MbpRxzMBz4HWW4DrfcgOvHZVEF3N7P5yNeC1XGI4,2664
 meutils/schemas/ocr_types.py,sha256=fZWYQAKii7HaTlSU9DS0wHyiEoOHuLnhvgoiH4Cn498,1381
 meutils/schemas/openai_api_protocol.py,sha256=0GhmhUTEr54N_XCVuZI1MSxJldvwMNJjUAAAdWznw58,12716
-meutils/schemas/openai_types.py,sha256=45vL6STgObZawq_b1MIw9BW5l6NltmQTL2r9VAOep-0,11867
+meutils/schemas/openai_types.py,sha256=fm4x-hnRIjKdLOu32ECqpa796_Gg9N_kRDFa86BoVJE,12358
 meutils/schemas/pixverse_types.py,sha256=3mHg2KxvszV1U8K3GdzsODZz4uocLVRjEeJgYhX0Xmw,2347
 meutils/schemas/playwright_types.py,sha256=zhZd53m1Wg4zlGtq2JM4z7Aon-u_eF6rzs-_TFYWvkU,1177
 meutils/schemas/prodia_types.py,sha256=knh_lzAxMfWMoqAPmvyMweay9PmQmsoQ1X6Mj17ohWg,476
@@ -706,7 +709,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=U_foX82tejUT7efCqyMMTLfq-C4LXMXsmwz5pfldwNw,3734
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=dvnibDVAtLKHurh2zzHC5E4vJCtkY20FRrVT7KGJUQU,23443
+meutils/schemas/oneapi/common.py,sha256=YCDlNNcqzWYrNpuiUN9yjD_cqFQ4v8lMG_kHz8NZSPg,23512
 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
@@ -834,9 +837,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.26.22.14.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.26.22.14.1.dist-info/METADATA,sha256=_P4-wAoIdxW8us12y6oIFwNqjos1ZKHmW7GWGIFbTLE,6202
-MeUtils-2024.12.26.22.14.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.26.22.14.1.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.26.22.14.1.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.26.22.14.1.dist-info/RECORD,,
+MeUtils-2024.12.31.17.51.53.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.31.17.51.53.dist-info/METADATA,sha256=CLAH86V5oAsouo57VlPjVb3lAaRlavNSEAtI8AzrRyE,6203
+MeUtils-2024.12.31.17.51.53.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.31.17.51.53.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.31.17.51.53.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.31.17.51.53.dist-info/RECORD,,

examples/_openaisdk/openai_chatfire.py

@@ -202,7 +202,10 @@ if __name__ == '__main__':
         "ppu-1"
     ]
     # 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_OPENAI"))
+
+    check_models(models, api_key="sk-iPNbgHSRkQ9VUb6iAcCa7a4539D74255A6462d29619d6519")
+
 
     #
     # for i in range(5):

examples/_openaisdk/openai_zhipu.py

@@ -24,6 +24,8 @@ client = OpenAI(
     # base_url="https://any2chat.chatfire.cn/glm/v1"
 )
 
+
+
 try:
     completion = client.chat.completions.create(
         model="glm-4-flash",

examples/_openaisdk/zhipu_/346/231/272/350/203/275/344/275/223.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : zhipu_智能体
+# @Time         : 2024/12/30 17:34
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+
+from zhipuai import ZhipuAI
+api_key = "YOUR API KEY"
+url = "https://open.bigmodel.cn/api/paas/v4"
+client = ZhipuAI(
+    api_key="e21bd630f681c4d90b390cd609720483.WSFVgA3KkwNCX0mN",
+    base_url="https://open.bigmodel.cn/api/paas/v4/"
+)
+
+print(bjson(client.assistant.query_support()))
+generate = client.assistant.conversation(
+    # assistant_id="65a265419d72d299a9230616",
+    assistant_id="65940acff94777010aa6b796",
+    conversation_id=None,
+    model="glm-4-assistant",
+    messages=[
+        {
+            "role": "user",
+            "content": [{
+                "type": "text",
+                # "text": "北京未来七天气温，做个折线图",
+
+                "text": "画条狗"
+
+            }]
+        }
+    ],
+    stream=True,
+    attachments=None,
+    metadata=None
+)
+
+for resp in generate:
+    print(resp)

meutils/_utils.py

@@ -10,6 +10,7 @@
 
 import json
 import base64
+from pydantic import BaseModel
 
 
 # bytes/string
@@ -39,8 +40,21 @@ def list_intersection(l1, l2):
 
 list4log = lambda ls: "\n\t" + "\n\t".join(ls)
 
+
 # 字典
-dict2json = bjson = lambda dic: json.dumps(dic, indent=4, ensure_ascii=False)
+
+
+def bjson(json_data):
+    if isinstance(json_data, dict):
+        return json.dumps(json_data, indent=4, ensure_ascii=False)
+    elif isinstance(json_data, BaseModel):
+        return json_data.model_dump_json(indent=4)
+
+    else:
+        return json_data
+
+
+dict2json = bjson
 json2dict = lambda s: json.loads(s.replace("'", '"'))
 
 

meutils/apis/images/recraft.py

@@ -122,6 +122,5 @@ if __name__ == '__main__':
 
     tokens = list(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0]) | xfilter_
 
-    # tokens = "__Host-next-auth.csrf-token=78920fc4c6bf5aef5c2063e3a4397b1e41074713e35020cf7049156e02d53355%7C2c8e6897101210b68ba31cec5c6232d8ab76a3e070cda7b82ad051680ab93fe0; _gcl_au=1.1.906962865.1730362257; _ga=GA1.1.435165527.1730362257; _fbp=fb.1.1730362257600.714008794112161913; AMP_MKTG_7268c9db0f=JTdCJTdE; _tt_enable_cookie=1; _pin_unauth=dWlkPU0yWmxPR1JsWkRJdE5qZGlZeTAwTWpNeUxXRmpNVEV0TlRrd1l6RTNZelEwTldZMw; __zlcmid=1OVn8OoYVNvKEWM; __stripe_mid=d21b2291-edb8-4cb1-8fac-05c6a9493ca8d85a3c; _ga_ME15C3DGRL=deleted; _ttp=412qSInHGw3jjdyNR6K4tBIYmNZ.tt.1; x-recraft-referral-code=3h7wfOgFGn; __Secure-next-auth.callback-url=https%3A%2F%2Fwww.recraft.ai%2Fprojects; _clck=uflztg%7C2%7Cfra%7C0%7C1765; __Secure-next-auth.session-token.0=eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2R0NNIn0..OMh8sDyFkAVpghZU.iIKkMX3OhmwVyO8CjwCH-8YFQE-J8zE52SImLqu-imuV9q0jNKxBDr9Zo-n2I-TdREv4ffj0FFagny27pL7vjMyp04X2VD_Lh5rv9OMAObho9TsX8AzyLZOu_xbXR1ip98ZSv432BcDq5ppm5ava-ZVqm0Tp0hvJGSWD1yq4S7XjqiIAGeKZfR5Efm1k85fO6CHp-nNiIFVc6f2sw0Y_DcfdAzB4tMxKmJPoa4VHteErM2n41XUA9TvftKK5xVLHDWi0poRXkfB6Tol2xF83jUi2f2Il1BzQ-7q-MsRD-kkxJkEbv2Zcex_HFsaFWN9ohDB_wttuDxBZYCwdjflE-XyLwurtLO4XwbZTRKOR0Jgl6SdF-tBgsKSUrDUdmPGt9oiZv-MzMpTiOYRhTFjTap34rjUOpqlCoPXtiI-YExDCuKs2Dy57wRHF5GHldb3-vuaxKV5tVIq3Uj0Z2uq1SRn2hFhbvcuywlHcyF9HnGur9M6-JBxDaS0W3hrhtHgegIj_kbe6Zl1KBT5knx_IDcVu3KXhiZaLI4kfn_3EQI5zZN9Ay6412fqjP1atd0BpeS5joJl_7O0ni8-0k1I6bRxhnD3uHD5dlQxBJXXHjyisoXTckUXNUKnRbc0x3pL0ObMP7VJ4-mov1KCc_YB3Msh0yfcIa_CXRTJCWH5Q-jkO0pJCVtWjfRegN8G-UpT9k3IDfu6z59O5qFYHM0SjFeee4yJNdAHJRpbuxxNBSBS8aIOey-UN-I2UDme_iGoQnkF9nvOI1zrVHtIhhazxc5YLOyDnVuyhI9ghm2PfYYIxp8sM-Y9VNPjuAKJvg6_q1tSVyiej-qHjV3um1n44AaChgrJ0JXU0gxQV_--xL2n28Tm4sOWb5VUGYAmI32Mvo5bC-kBatusIlkFvnfiQkZT-9fNPAfDiarG-W6T9VsLKhWn2UVBqSJtJgj56uCaw1QilqaKUSYGyUkStWEn0YXsye9vxKSDjm4LJTJdGlkKW0v4qElfwzzV0d9ErjohWN915IzVY-hTRSo8tgt_QHafO3hsyiTpGqalDuT_-BMBShRLozMvGhlQ9jA0QsDueosaNt9OWyk7ZliVSuyt17lI4ApFnaTf3MBjcrnUmk7aejOAQzuy5atNo-HmxxclEYsMuMblcp9kkAsrtx87RHrPYe7DmOorGqJRiKk27S2Nog5ZlBc8RAkq4u4eub9ezwMhFUAYKsv5tnaS6NiggXVbhNiN33uwk2jI7R9ZmJtCnw-b0Nnk2ln4_9CCSa8Ds9VMkiyS6S0QLaPlkmaBzgCYPM7sxTzyuw9BryOlo3akvYJHWegVvxWfN3ap8DdqgXE87zFPE3K3PmJodcv2lVz9FfwUtI81bwRkVpt4VNY7yqGNu33637cufapQsmZJilp5GfHv1FY1lXfrm0LQ19SUjgBHobZ6SrQPUcauypDNFOOAAt9MeVVScsY_5xcyRlPglsA31piiYnDcsBFwOIf-h5GxxYtqf8pDmvUMmXf1zn-97DLpa0D83rKFFA6BralkFCMq0gbBzH4CIeYW35-q1P9Ghq4FIxVxgreueSa5KP96BtFuzIuGEccN478JnsO-DkJWRzTToYTiNUieDjjuhQXFdOFooAHvTrEyvt0HM-ZchJcto4F6xKM3tuJAk2Ng9HCYiIy7rlYzW-gL0v07gI_hwKQ-8dOungh3ggfjooGSayAbsnLeRpAm3P9sTgKrnPp3fyBzzLDkpPj4wBxADpg4sYDyJk3hTa0ec9Kg4ssReU5K77vKg4-YkDAvKvYeQbX69FjXcHf1_XtBQVh2T-teb9G-0kAy6kLVarSJLjp6Mw_Uj3eYV9gbgmNiyBrCcHmUATA6FJkuxVH5W6YVChgEZgIYS1K-PZj-3uchfa6VoSCab1VnreJ6f5aYeY-4ZI5-vDwGJDpd2XkVIrf8zWPFqUkZRpyJHYRwXAGf8MCBFTRXBqzNgPnVjkh_iP9tbmb4_pbgBaTz3Izubx9lWUmso-y0_SPAn1M6x4V2zNHZR6ZVJKAxuNCQrqfIk0Q6-zFHdAHJFPrJSVjKMIDadIpxqQ5zkMeR0O6T204oVwfrtsMnuiAo3dk4ve5qa-MlaFyc0SpfxQkhzCTA3YVXKWo9G5Jp8OYBRmZwDhg4MTvgBeri-hyMsiS025J9vreey3BSyJun7IQJhzDZ6-PVO35qpVB65CNfNSDCO8rI_kAD8xKf893nHBovBumEU_FGC4xz6Yen-7W5TX4yR_2U2CBYX5Iplw5UXHgjXymPbfHjETIh_dyKnuN9fonl8fgi2xk5DDc-oyDaE1qq4g3oBMmXeFA8XpRvcOyXeDyYs5j-KiH0yMlel0xbFluk_UsuiElluUKx5IhnAf04-TX5SCmwubvssyTjs4bWeTw3rjwpvDV9EpLDgPt_WJnHgbbT7e9zRLqQWYnCGro8tnBVsLej-j73L4KdWJQeM8b-Q95l5TfhPrkmbUI-6qyV5tRawBO3ie-c836Bz7YUY1CnopG4qzUfZasJZ8ltrAr7qtwI1c-IJ6CAwDhT_SjhQwyMVUQb7OhvCryf5trtl29kVwsRCeuw8K9uVWmrAKIk5nf3IczDeKNpR0EEnpPMfblkEAaeCSz1KX2fSiURQ2GDUUAOICnhXEhJ9-NcNTHj4ssjU_8RAltnHxTiecwhsLX1qmxi0mrjf-32el6TgQ95FsNDRITKaZ1807lFiQnj3Um9Bqb8ZPxzBBEqJh0WKoD4xT1dqLc1f4HdebodGJva35Nw1Qc9ssNihz2Tziq56J1Zx8vOtz8ibmSJ6Gm3gzWD09h2CQN9Vxwx8kxmF_LECGwgkUsI77029-bayN_t2Mv_s3jeEOAQl-BBNMGHbPPPkcZi5siduzjpphVOAX8wOiqau0MqECstDqh8nemuSvhlomElxmU9mHiRTnUqlAfbO_P1581AUfyOh_InN3ydLnkgrziI58OEWIbHKXXEhRAcCGQrX4nynwOTymiWuzIR0OqhIyi3cLfz3e51uEVmBVVSZfbZuDySiY4yOzA2cMExG1te_NjjhEsvBZ8m3Fjf-PEwBJhrXDQgXlXFp80ERZQ6xVNzt7dVd0GzsQT1-03JaLR6S9tJYXO4QOf9sgXp-R4nvP7mZDuhP-kXbI0rzAmnuPA-eR4joGugTgbH0RWHnZ6z2a8k2kBD_VdjYdbxSZ1vRXtSIpNohuaun4rzXNbRz9kwNNK_Fz-q84fAJ_J1Yb1XHBMrJYQxwVdhRqvSh_jW5zroDFjTFNKwFruMaGa4KESccnTKy8mUH7Cd6S2OCjzDrcl4mQcXBu90FKOH-pYhobFNefJq6LooejPhdN_XBdfm2kQrcTRBYbMk4vekzZxs-wPrlgZkQYSAxKj4i_XTiqztmroaNRYdfFoq4hoArBBsISxRagLukwyL2yvSKnHiqMo9T7whwYF_tXQFGk1T8dQ_9ospLy9EMBMP7tdqw7UX5S051rqADt9q2Rozx7hRuAMHWeAyfRCFgMx0lR3B2txRxxRVWrBNJAqulmG3hJk9px8LpWmlm9CorOkN7cZT6CJKIJdSClkj0VDFiDUjWsZWJLiN_DSRaqcCpgwdkXJKZ4zpUKjH6xQSKzhvbmom9ZkFkNPWO35Vf7e_rLKLCyltHmsTDlgRylqPMkigL6Rds9S07c7fCwcr4d5xWvlV78iKjmg_c4RdxrmGsqeQZl4EmbnmwZfQj3qllIEn7MJ7N5_jE_BO1huH522Ds6hTRFTn_RmA4FtIbqyuvbK1v5MlCoToKiYgBwPI79PzQSEjM4LMMbeUiJx0E5C2Wd3bpTnbc-mfY8uIpFfxnK2_0Mk7rSbm8rqtomgPyqcmAT2mwQS-; __Secure-next-auth.session-token.1=DfJBMjFpUwPYqCIaGMxrX_WtlNau_0B5y61DkoPxCwi6_MziMSz6KUgDB9o4d6xXg5mn-UBR0gXWjPFrIXzP0kdNvCSF9pSGCyiOLmdtKfi3BscGIK70dpfUfKwY972YF6TTb6tXOdLkf3JFyN0cjLd5pcBfSKFAKRt5shH4iNMu6ZwgwZd0guK8IcIddc9KTGxTZlHc6dJ1Rc-QHfBm_DPgYUvf9yKjGSguPuYFqnHwA2T91Ughu9VT2lAuCKjvEX13KOsHB-Vr1i7Ts3TrQtIoS9pMM_NnhdILOp3Od5NGfkJGqAbsfFLYU193V3cK4cib9QisQmKm4hxvlMflKA1IQNlz_isB1vi2JN04AQg.z8GHyaN7ezsgo22MdsiVvQ; _uetsid=84c52090adf211efb65c0dc3b78a1976; _uetvid=a8a766f0975f11ef9b7921e48a0cd258; _ga_ME15C3DGRL=GS1.1.1732844258.46.1.1732845589.0.0.0; _clsk=c52eh1%7C1732845591268%7C3%7C0%7Ce.clarity.ms%2Fcollect; AMP_7268c9db0f=JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjI2OTE1YzI1My1jMTJjLTQ5ODYtYjM3Ni0xMTI3Y2ZmMTFlMjglMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjJjNDdkY2ZiYi0yOWE5LTQ1Y2EtYWRiZS1hM2ZhYWZiODhkNzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMyODQ0MjU3NzEzJTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRUaW1lJTIyJTNBMTczMjg0NTY0OTcyNSUyQyUyMmxhc3RFdmVudElkJTIyJTNBOTA1JTJDJTIycGFnZUNvdW50ZXIlMjIlM0E0JTdE"
-    #
-    arun(check_token(tokens))
+
+    r = arun(check_token(tokens))

meutils/apis/jimeng/images.py

@@ -72,7 +72,17 @@ async def get_task(task_id, token):
         data = response.json()
         logger.debug(bjson(data))
         # {'ret': '1015', 'errmsg': 'login error', 'systime': '1734524280', 'logid': '20241218201800AC3267447B287E9E6C46', 'data': None}
-        item_list = (data.get("data") or {}).get(task_id, {}).get("item_list")
+        task_info = (data.get("data") or {}).get(task_id, {})
+        item_list = task_info.get("item_list")  # "status": 30,
+
+        status_code = task_info.get("status")
+        logger.debug(f"status: {status_code}")
+
+        """
+        "status": 30, # 内容审核
+        "status": 50,
+        """
+
         image_data = map(lambda x: x.get("image", {}).get("large_images"), item_list)
 
         task_data = sum(image_data, []) | xmap_(lambda x: {"url": x.get("image_url")})
@@ -80,8 +90,9 @@ async def get_task(task_id, token):
         return TaskResponse(
             task_id=task_id,
             data=task_data,
-            message=data.get("errmsg"),
-            status="success" if task_data else None,
+            message=data.get("errmsg") if status_code!=30 else "触发内容审核451",
+            status="success" if item_list else 'processing',
+            code=status_code,
         )
 
 
@@ -117,4 +128,13 @@ if __name__ == '__main__':
 
     # arun(get_task(task.task_id, task.system_fingerprint))
 
-    arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))
+    task_id = "10184295086338"
+    system_fingerprint = "eb4d120829cfd3ee957943f63d6152ed"
+
+    t1 = ("10184295086338", "eb4d120829cfd3ee957943f63d6152ed")
+    t2 = ("10184877310722", "dcf7bbc31faed9740b0bf748cd4d2c74")
+    t3 = ("10186352959490", "eb4d120829cfd3ee957943f63d6152ed")
+
+    arun(get_task(*t3))
+
+    # arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.26.22.14.01
+2024.12.31.17.51.53

meutils/data/oneapi/NOTICE.md

@@ -31,6 +31,11 @@
 
 </details>
 
+## 2024-12-27
+  - deepseek-v3
+  - deepseek-r1：deepseek-v3的思考模型
+  - deepseek-search：deepseek-v3的联网模型
+
 ## 2024-12-24
 - 上线新模型
   - doubao-pro-256k：相比Doubao-pro-128k/240628，长文任务效果显著提升10%以上，要点提取、字数遵循、多轮对话上文记忆等能力大幅提升

meutils/init/evn.py

@@ -35,7 +35,7 @@ os.environ['PROMPT_TEMPLATE'] = """
 # 如果无法从中得到答案，请回答“根据已知信息无法回答该问题”或“没有提供足够的信息”。请使用中文回答，不允许添加编造内容。
 # """
 
-# MODELSCOPE_CACHE
+# modelscope_cache
 # PPNLP
 if __name__ == '__main__':
     from pprint import pprint

meutils/llm/completions/rag/fire.py

@@ -12,6 +12,7 @@ import mimetypes
 from meutils.pipe import *
 from meutils.io.files_utils import to_bytes
 from meutils.llm.openai_utils import to_openai_params
+from meutils.str_utils.regular_expression import parse_url
 
 from openai import OpenAI, AsyncOpenAI
 from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, ChatCompletionRequest, CompletionUsage
@@ -66,6 +67,22 @@ class Completions(object):
 
             request.messages = request.system_messages + [{'role': 'user', 'content': request.last_content}]
 
+        elif isinstance(request.last_content, str) and (urls := parse_url(request.last_content)):
+            logger.debug(urls)
+
+            url = urls[-1]
+            request.last_content = request.last_content.replace(url, '')
+
+            files = await asyncio.gather(*map(self.file_extract, urls))
+
+            for file_content in files:
+                request.system_messages.append({
+                    "role": "system",
+                    "content": file_content,
+                })
+
+            request.messages = request.system_messages + [{'role': 'user', 'content': request.last_content}]
+
         logger.debug(request)
 
         data = to_openai_params(request)
@@ -78,30 +95,43 @@ if __name__ == '__main__':
 
     request = ChatCompletionRequest(
         # model="qwen-turbo-2024-11-01",
-        model="claude-3-5-sonnet-20241022",
+        # model="claude-3-5-sonnet-20241022",
+        model="gpt-4o-mini",
+
         messages=[
             {
                 'role': 'system',
                 'content': '你是一个文件问答助手'
             },
+            # {
+            #     'role': 'user',
+            #     # 'content': {
+            #     #     "type": "file_url",
+            #     #     "file_url": {"url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf", "detai": "auto"}
+            #     # },
+            #     'content': [
+            #         {
+            #             "type": "text",
+            #             "text": "这个文件讲了什么？"
+            #         },
+            #         # 多轮的时候要剔除
+            #         {
+            #             "type": "file_url",
+            #             "file_url": {"url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf", "detai": "auto"}
+            #         }
+            #     ]
+            # },
+
             {
                 'role': 'user',
                 # 'content': {
                 #     "type": "file_url",
                 #     "file_url": {"url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf", "detai": "auto"}
                 # },
-                'content': [
-                    {
-                        "type": "text",
-                        "text": "这个文件讲了什么？"
-                    },
-                    # 多轮的时候要剔除
-                    {
-                        "type": "file_url",
-                        "file_url": {"url": "https://oss.ffire.cc/files/招标文件备案表（第二次）.pdf", "detai": "auto"}
-                    }
-                ]
+                'content': "https://oss.ffire.cc/files/%E6%8B%9B%E6%A0%87%E6%96%87%E4%BB%B6%E5%A4%87%E6%A1%88%E8%A1%A8%EF%BC%88%E7%AC%AC%E4%BA%8C%E6%AC%A1%EF%BC%89.pdf 这个文件讲了什么？",
+
             },
+
             # {'role': 'assistant', 'content': "好的"},
             # {
             #     'role': 'user',

meutils/llm/openai_utils/common.py

@@ -266,7 +266,7 @@ if __name__ == '__main__':
         with timer():
             try:
                 async with ppu_flow(api_key="sk-OYK4YxtTlWauT2TdGR5FTAJpkRmSnDwPly4cve0cAvMcrBkZ", post="api-oss",
-                                    n=10000):
+                                    n=100):
                     logger.debug("消费了哦")
 
             except Exception as e:

meutils/request_utils/ark.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : ark
+# @Time         : 2024/12/31 13:44
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+import json
+import os
+
+from meutils.pipe import *
+import volcenginesdkcore
+from volcenginesdkcore.signv4 import SignerV4
+import volcenginesdkark
+
+# sign(path, method, headers, body, query, ak, sk, region, service)
+
+headers = {}
+payload = {
+    "Prompt": "关于星空的歌",
+    "Genre": "R&B/Soul",
+    "Mood": "Dynamic/Energetic",
+    "Gender": "Male",
+    "ModelVersion": "v4.0"
+}
+params = {"Action": "GenLyrics", "Version": "2024-08-12"}
+SignerV4.sign(
+    path="/",
+    method="POST",
+    query=params,
+    body=json.dumps(payload),
+    headers=headers,
+    ak=os.getenv("ARK_ACCESS_KEY"),
+    sk=os.getenv("ARK_SECRET_ACCESS_KEY"),
+    region="cn-beijing",
+    service="imagination"
+)
+
+print(headers)
+
+s = ''
+for k, v in headers.items():
+    s += f"{k}:{v}\n"
+
+print(s)

meutils/{jwt_utils → request_utils/jwt_utils}/common.py

@@ -33,6 +33,7 @@ payload = {
 # Your secret key
 secret = ""
 
+
 # Create the JWT
 token = jwt.encode(payload, secret, algorithm="HS256", headers=header)
 

meutils/request_utils/volc.py

@@ -0,0 +1,160 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : volc
+# @Time         : 2024/12/31 13:20
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+
+import hashlib
+import hmac
+import os
+from urllib.parse import quote
+
+from meutils.pipe import *
+
+# 以下参数视服务不同而不同，一个服务内通常是一致的
+Service = "iam"
+Version = "2018-01-01"
+Region = "cn-beijing"
+Host = "iam.volcengineapi.com"
+ContentType = "application/x-www-form-urlencoded"
+
+# 请求的凭证，从IAM或者STS服务中获取
+AK = os.getenv("ARK_ACCESS_KEY")
+SK = os.getenv("ARK_SECRET_ACCESS_KEY")
+# 当使用临时凭证时，需要使用到SessionToken传入Header，并计算进SignedHeader中，请自行在header参数中添加X-Security-Token头
+# SessionToken = ""
+
+
+def norm_query(params):
+    query = ""
+    for key in sorted(params.keys()):
+        if type(params[key]) == list:
+            for k in params[key]:
+                query = (
+                        query + quote(key, safe="-_.~") + "=" + quote(k, safe="-_.~") + "&"
+                )
+        else:
+            query = (query + quote(key, safe="-_.~") + "=" + quote(params[key], safe="-_.~") + "&")
+    query = query[:-1]
+    return query.replace("+", "%20")
+
+
+# 第一步：准备辅助函数。
+# sha256 非对称加密
+def hmac_sha256(key: bytes, content: str):
+    return hmac.new(key, content.encode("utf-8"), hashlib.sha256).digest()
+
+
+# sha256 hash算法
+def hash_sha256(content: str):
+    return hashlib.sha256(content.encode("utf-8")).hexdigest()
+
+
+# 第二步：签名请求函数
+def request(method, date, query, header, ak, sk, action, body):
+    # 第三步：创建身份证明。其中的 Service 和 Region 字段是固定的。ak 和 sk 分别代表
+    # AccessKeyID 和 SecretAccessKey。同时需要初始化签名结构体。一些签名计算时需要的属性也在这里处理。
+    # 初始化身份证明结构体
+    credential = {
+        "access_key_id": ak,
+        "secret_access_key": sk,
+        "service": Service,
+        "region": Region,
+    }
+    # 初始化签名结构体
+    request_param = {
+        "body": body,
+        "host": Host,
+        "path": "/",
+        "method": method,
+        "content_type": ContentType,
+        "date": date,
+        "query": {"Action": action, "Version": Version, **query},
+    }
+    if body is None:
+        request_param["body"] = ""
+    # 第四步：接下来开始计算签名。在计算签名前，先准备好用于接收签算结果的 signResult 变量，并设置一些参数。
+    # 初始化签名结果的结构体
+    x_date = request_param["date"].strftime("%Y%m%dT%H%M%SZ")
+    short_x_date = x_date[:8]
+    x_content_sha256 = hash_sha256(request_param["body"])
+    sign_result = {
+        "Host": request_param["host"],
+        "X-Content-Sha256": x_content_sha256,
+        "X-Date": x_date,
+        "Content-Type": request_param["content_type"],
+    }
+    # 第五步：计算 Signature 签名。
+    signed_headers_str = ";".join(
+        ["content-type", "host", "x-content-sha256", "x-date"]
+    )
+    # signed_headers_str = signed_headers_str + ";x-security-token"
+    canonical_request_str = "\n".join(
+        [request_param["method"].upper(),
+         request_param["path"],
+         norm_query(request_param["query"]),
+         "\n".join(
+             [
+                 "content-type:" + request_param["content_type"],
+                 "host:" + request_param["host"],
+                 "x-content-sha256:" + x_content_sha256,
+                 "x-date:" + x_date,
+             ]
+         ),
+         "",
+         signed_headers_str,
+         x_content_sha256,
+         ]
+    )
+
+    # 打印正规化的请求用于调试比对
+    print(canonical_request_str)
+    hashed_canonical_request = hash_sha256(canonical_request_str)
+
+    # 打印hash值用于调试比对
+    print(hashed_canonical_request)
+    credential_scope = "/".join([short_x_date, credential["region"], credential["service"], "request"])
+    string_to_sign = "\n".join(["HMAC-SHA256", x_date, credential_scope, hashed_canonical_request])
+
+    # 打印最终计算的签名字符串用于调试比对
+    print(string_to_sign)
+    k_date = hmac_sha256(credential["secret_access_key"].encode("utf-8"), short_x_date)
+    k_region = hmac_sha256(k_date, credential["region"])
+    k_service = hmac_sha256(k_region, credential["service"])
+    k_signing = hmac_sha256(k_service, "request")
+    signature = hmac_sha256(k_signing, string_to_sign).hex()
+
+    sign_result["Authorization"] = "HMAC-SHA256 Credential={}, SignedHeaders={}, Signature={}".format(
+        credential["access_key_id"] + "/" + credential_scope,
+        signed_headers_str,
+        signature,
+    )
+    header = {**header, **sign_result}
+    # header = {**header, **{"X-Security-Token": SessionToken}}
+    # 第六步：将 Signature 签名写入 HTTP Header 中，并发送 HTTP 请求。
+    r = requests.request(method=method,
+                         url="https://{}{}".format(request_param["host"], request_param["path"]),
+                         headers=header,
+                         params=request_param["query"],
+                         data=request_param["body"],
+                         )
+    return r.json()
+
+
+if __name__ == "__main__":
+    # response_body = request("Get", datetime.datetime.utcnow(), {}, {}, AK, SK, "ListUsers", None)
+    # print(response_body)
+
+    now = datetime.datetime.utcnow()
+
+    # Body的格式需要配合Content-Type，API使用的类型请阅读具体的官方文档，如:json格式需要json.dumps(obj)
+    # response_body = request("GET", now, {"Limit": "2"}, {}, AK, SK, "ListUsers", None)
+    # print(response_body)
+
+    response_body = request("POST", now, {"Limit": "10"}, {}, AK, SK, "ListUsers", "UnUseParam=ASDF")
+    print(response_body)

meutils/schemas/image_types.py

@@ -82,6 +82,8 @@ class ImageRequest(BaseModel):  # openai
             self.size = self.size if 'x' in self.size else '512x512'
 
     class Config:
+        extra = "allow"
+
         # frozen = True
         # populate_by_name = True
 

meutils/schemas/oneapi/common.py

@@ -294,7 +294,7 @@ MODEL_RATIO = {
     "glm-4-0520": 2.5,
     "glm-4-airx": 10,
     "glm-4v": 2.5,
-    "glm-4v-plus": 2.5,  # 2.5
+    "glm-4v-plus": 5,
     "glm-4v-flash": 0.1,
     "glm-4-plus": 25,
 
@@ -373,18 +373,19 @@ MODEL_RATIO = {
 
     # deepseek
     "deepseek-chat": 0.5,
-    "deepseek-coder": 0.5,
-    'deepseek-coder-v2-instruct': 0.5,
-    'deepseek-v2-chat': 0.5,
-    'deepseek-llm-67b-chat': 0.5,
     "deepseek-ai/deepseek-vl2": 0.5,
 
+    "deepseek-v3": 0.5,
+    'deepseek-r1': 0.5,
+    'deepseek-think': 0.5,
+    "deepseek-search": 0.5,
+
     # 豆包
     "doubao-lite-128k": 0.4,
     "doubao-lite-32k": 0.15,
     "doubao-lite-4k": 0.15,
 
-    "doubao-pro-256k": 0.01,
+    "doubao-pro-256k": 5,
 
     "doubao-pro-128k": 2.5,
     "doubao-pro-32k": 0.4,
@@ -651,6 +652,11 @@ COMPLETION_RATIO = {
     "doubao-vision-lite-32k": 3,
     "doubao-vision-pro-32k": 3,
 
+    "deepseek-v3": 1,
+    'deepseek-r1': 1,
+    'deepseek-think': 1,
+    "deepseek-search": 1,
+
 }
 
 REDIRECT_MODEL = {
@@ -716,7 +722,7 @@ REDIRECT_MODEL = {
     "qwen2.5-coder-7b-instruct": "Qwen/Qwen2.5-Coder-7B-Instruct",
     "qwen2.5-coder-32b-instruct": "Qwen/Qwen2.5-Coder-32B-Instruct",
 
-    "qwen-turbo": "Qwen/Qwen2.5-7B-Instruct",
+    "qwen-turbo": "Qwen/Qwen2.5-7B-Instruct",  # 兜底
     'qwen2-1.5b-instruct': 'Qwen/Qwen2-1.5B-Instruct',
     'qwen2-7b-instruct': 'Qwen/Qwen2-7B-Instruct',
     'qwen2-72b-instruct': 'Qwen/Qwen2-72B-Instruct',

meutils/schemas/openai_types.py

@@ -312,7 +312,6 @@ class STTRequest(BaseModel):  # ASR
 if __name__ == '__main__':
     pass
 
-
     # print(ChatCompletion(choices=[Choice(message=ChatCompletionMessage(content="ChatCompletion"))]))
     # print(ChatCompletionChunk(choices=[ChunkChoice(delta=ChoiceDelta(content="ChatCompletionChunk"))]))
     #
@@ -348,8 +347,20 @@ if __name__ == '__main__':
     # print(req1.model_dump())  # 输出: {'guidance_scale': 5.0}
     # print(req1.model_dump(by_alias=True))  # 输出: {'guidance': 5.0}
 
-    class A(BaseModel):
-        n: int = Field(1, ge=1, le=0)
-
-
-    print(A(n=11))
+    # class A(BaseModel):
+    #     n: int = Field(1, ge=1, le=0)
+    #
+    #
+    # print(A(n=11))
+    messages = [
+        {
+            "role": "user",
+            "content": [{'role': 'user', 'content': [{"type": "image_url", "image_url": "这是个图片链接"}]}]
+        },
+
+        # {'role': 'user', 'content': [{"type": "image_url", "image_url": {"url": "这是个图片链接"}}]},
+    ]
+
+    r = ChatCompletionRequest(model="gpt-3.5-turbo", messages=messages)
+    r.messages[-1]['content'] = [{"type": "image_url", "image_url": {"url": r.urls[-1]}}]
+    print(r)