MeUtils 2024.12.6.13.38.47__py3-none-any.whl → 2024.12.9.11.53.50__py3-none-any.whl

{MeUtils-2024.12.6.13.38.47.dist-info → MeUtils-2024.12.9.11.53.50.dist-info}/METADATA

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

{MeUtils-2024.12.6.13.38.47.dist-info → MeUtils-2024.12.9.11.53.50.dist-info}/RECORD

@@ -104,7 +104,7 @@ examples/_openaisdk/openai_modelscope.py,sha256=bKBtXpEN3_YxXRwlQEBV1YmjzT396zxB
 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
-examples/_openaisdk/openai_siliconflow.py,sha256=SuOwW7XmoBpKtLRbi7MFovjfeI2sFWhgOYh11O0vBR4,1349
+examples/_openaisdk/openai_siliconflow.py,sha256=UI8MyhXAt2hd4JMjbvVGwc8dA9ARSwf77TePGe08kP0,1402
 examples/_openaisdk/openai_step.py,sha256=rwXrGRs5CHhWpNl9oeIHltErp1Or_B3PVKNAoMGY-0c,1054
 examples/_openaisdk/openai_tune.py,sha256=rDmX_EMsAhD0gKJPQ8P0-icZQAjV6OMkMLX67uwJtvU,674
 examples/_openaisdk/openai_zhipu.py,sha256=K13ogb2IZO0-_ItLqHIAFWaN6FH2vd72PdieIXMZNx8,1626
@@ -334,7 +334,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=XEZnKcandNW9eR-bBYg7bVicuaFJToeFSnHF-u4PbkE,10142
+meutils/apis/images/recraft.py,sha256=fqSXLuyhoy6u1uEwvGl0CISOHab_wVLWVdX3NFziamM,10140
 meutils/apis/images/fal/__init__.py,sha256=A7w3ZAS7Tv20N4X4Em6NshDxKSCPAzaPxHJTbM3BbyM,272
 meutils/apis/images/fal/files.py,sha256=hxcetu8Mcdp-UICh-CF7LuTLFShvGMwgKHxpHyFGj28,1318
 meutils/apis/images/fal/images.py,sha256=z7JhKMDT4tbPgkNEM2V27OVQLVfOYU1dhUnw-pHBcg8,1677
@@ -387,8 +387,10 @@ meutils/apis/replicateai/raw.py,sha256=v_Hztoa8uplkkUSDrnxlhc4qizW3-4tyra685Qnwx
 meutils/apis/runwayml/__init__.py,sha256=90oL_3o8YkFPYm4R4PCxd3m9hgnHpOCLr0u-X4BDg-w,244
 meutils/apis/runwayml/gen.py,sha256=JrfegC4pI2r7DprDLGMi5px0K1C1pSgopnz0lcJU5RY,5194
 meutils/apis/search/__init__.py,sha256=TWEHzb_O2hKDpjfThEWOz1EI1bJeiN20IAvC8wYONQ4,271
+meutils/apis/search/baichuan.py,sha256=OUD0TH7KzqSxtuRJgjJPWO8XRQIoUwW5RX7lWMo7BXw,268
 meutils/apis/search/metaso.py,sha256=147sJM75knMjw_P9AwYg57JdiuRWBCVx2p3Msu-Uchc,8578
 meutils/apis/search/metaso_.py,sha256=PqMX3FLYbbAcc9qpqrPZ58LuSF29h0asZO1XMYmXbes,3144
+meutils/apis/search/n.py,sha256=o7jzNoR5v_nAjgdUvWgebL3nvvo3ECpq2KCj9YhUNr4,4337
 meutils/apis/search/searxng.py,sha256=RBPeq-AYj5D42gROrZNg0SxIWwWEW0oqrbQ3wEDH9k8,951
 meutils/apis/siliconflow/__init__.py,sha256=DQ-A6wAWGna49pmyGhcIWgc2zx6TN9DfQmSUdAW7qjk,241
 meutils/apis/siliconflow/audio.py,sha256=pk1OROATtAURPQ6VkswmR5gJFOFYJJPnjp-boDAf8X0,2017
@@ -426,7 +428,7 @@ meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpML
 meutils/async_task/celery_config.py,sha256=BX1h3jY34aO6UmUFakdBUwOdsEiOxCGuUtYDUKFtafc,3461
 meutils/async_task/common.py,sha256=ZJ4e0CsEJf1ppPmGSwPCwhZBAkUL5xsi_t1ny-bJuko,845
 meutils/async_task/demo_create_tasks.py,sha256=E4FfVl_2RRdlHlPSp4jzo0GAonpFwD0juIvRTfIT3zs,2811
-meutils/async_task/utils.py,sha256=3y-dl0hwGFJAqm4ZsGRIudqjMAL97bJHRkG27ZlrWuM,6126
+meutils/async_task/utils.py,sha256=RO1cY3YwWpXj7VeABl2HOoBRyb2PGFOdWcZ0j7UwmVE,6125
 meutils/async_task/通用设计.py,sha256=kGdrJHJu9VoOkyGHREn0KUtBTibAaLIcG0O6hEJNhLA,3232
 meutils/async_task/tasks/__init__.py,sha256=flHRXJMdts_9az9T9V1c5l3Y-gaDD88COWrARr4WAKU,246
 meutils/async_task/tasks/_all.py,sha256=Vz63k9yvgj-IBGjekm0u2t571TTT0nMRMqcPvPqJAbY,533
@@ -441,7 +443,7 @@ meutils/async_utils/background.py,sha256=dl6UaMIFBZDB1uxSZzGFJdSnpt3Xo0flK7gwsok
 meutils/async_utils/common.py,sha256=WIQ7CVaZiaUeFA3IInM_4uaehJQiTdr_g3Q_8_yQrgc,4899
 meutils/async_utils/test.py,sha256=lkZdgSzzgVg8hYVcaBNEJ3KBvFTEfjbXZVvtknQZsRQ,1155
 meutils/cache/__init__.py,sha256=7ke7BKRUkp1raYrsgOIojHHdeHYNstw9APIdBNDNRzc,2129
-meutils/cache/redis_cache.py,sha256=AOlhe30j_sVmR-DQ4Jkwzzq4hF5XOknp45GIUN4MNg4,503
+meutils/cache/redis_cache.py,sha256=lF2tqeQ-m6fWZ_p_ICbAmnO44OehfoDIu7rKH2UZstE,763
 meutils/clis/__init__.py,sha256=2Fhn43X8kFP6FpAnnAMiPcdnjUwQaukiIr2uGB6mGAY,279
 meutils/clis/browser.py,sha256=eMQ-7LlFJN_Sqs0DMnCVulfdUv9aGhHm5drCViQm4CY,4511
 meutils/clis/check_api.py,sha256=WKsLupPlM0PI6SzfVOwoqoYNEmOj_Jb-bsRDYA_SXsE,2367
@@ -470,14 +472,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=3fylVji8UDp4adBlOcAOoFjZydzWzzd2wHDG6LINIF4,19
+meutils/data/VERSION,sha256=yF6ZygeC6StCmH4KOs4s5WqFtdDMRx-4TESwK0ISzKg,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=PXUnFv_3MBM-MTrrvQrCFQdPjubM-1bTy_tIE9lREEg,1855
+meutils/data/oneapi/NOTICE.md,sha256=DfgR2fI1oH9KpgTPsjhyytY3wi0aOcGzl7MZS6lEpJE,3140
 meutils/data/oneapi/__init__.py,sha256=cm2Kq2RDXPfdVMWcoBB77bu00zJpTDd21Rgc6bTlhws,398
 meutils/db/__init__.py,sha256=HR99rqxoFTWXUHDhLVl33tzIn8M86gigHLmEzOKH1Ec,7637
 meutils/db/mongo.py,sha256=B-B_t939rxtnNGt0PxhivjIUwinmHPzLUpXsjUIaTkQ,2337
@@ -543,7 +545,7 @@ 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=BkhDyhycCbUFHWFlGttSmIKV-cezgyTExlmyV0Ld8pY,3341
+meutils/llm/check_api.py,sha256=Vlan35FGvjPLP-dZu_Gfgmki-G89YPV96-x1oXji79I,3566
 meutils/llm/check_utils.py,sha256=0jRWX_gI_7d9rQMM7ToVEKiTC4tK18DHlD_CIwOSHkU,3374
 meutils/llm/demo.py,sha256=gyGjTxuNFMOa1X4CXaChkq0lcjbKiRsnSRhkeMvsoQk,3822
 meutils/llm/openai_client.py,sha256=S0ijrWxVt_ABDghhNL0Rg2EUUov8envSMStzxcpg4P4,364
@@ -564,7 +566,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=zTOYir4sd9zSTVB4ZE7yB7jTW3zKygwTv3Z0w9xuojc,9130
+meutils/llm/openai_utils/common.py,sha256=GnrwigxzjlRmiyEeNZOKL2CKWvpo14YU_ujgVnIR6NE,9208
 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
@@ -678,7 +680,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=GbOIYs2JIvmO_9GVKE-EY6ddeHbAPpu4uz8k0AHQe2o,22822
+meutils/schemas/oneapi/common.py,sha256=stbrhU23PqCVZfiElML_anx-z-1_9m3Uf3XE6LkFRRE,22987
 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
@@ -805,9 +807,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.6.13.38.47.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.6.13.38.47.dist-info/METADATA,sha256=PXOpJaS8KfYgVyBal0P8gqEJDx7e6joYRN7l65YdemM,6143
-MeUtils-2024.12.6.13.38.47.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.6.13.38.47.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.6.13.38.47.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.6.13.38.47.dist-info/RECORD,,
+MeUtils-2024.12.9.11.53.50.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.9.11.53.50.dist-info/METADATA,sha256=aq4lQk1cpIBQZYMz3u8AX0OzO_PgVq51PHJpmUvWrQo,6143
+MeUtils-2024.12.9.11.53.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.9.11.53.50.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.9.11.53.50.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.9.11.53.50.dist-info/RECORD,,

examples/_openaisdk/openai_siliconflow.py

@@ -12,8 +12,8 @@ from meutils.pipe import *
 from openai import OpenAI
 
 client = OpenAI(
-    # api_key=os.getenv("SILICONFLOW_API_KEY"),
-    api_key="sk-zhvfnyebjcrylrwwzecxcbolwdsitqfwjqzxeysqhprdsjbm",
+    api_key=os.getenv("SILICONFLOW_API_KEY"),
+    # api_key="sk-zhvfnyebjcrylrwwzecxcbolwdsitqfwjqzxeysqhprdsjbm",
     base_url="https://api.siliconflow.cn/v1",
 )
 
@@ -31,6 +31,8 @@ model = "01-ai/Yi-1.5-6B-Chat"
 # model = "meta-llama/Meta-Llama-3.1-70B-Instruct"
 # model = 'meta-llama/Meta-Llama-3.1-405B-Instruct'
 
+model = "meta-llama/Llama-3.3-70B-Instruct".lower()
+
 # api black-forest-labs/FLUX.1-schnell
 messages = [
     {'role': 'user', 'content': '你是谁'}

meutils/apis/images/recraft.py

@@ -118,10 +118,10 @@ if __name__ == '__main__':
     request = RecraftImageRequest(
         prompt='一条猫'
     )
-    arun(generate(request, token=token))
+    # arun(generate(request, token=token))
 
-    # tokens = list(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0]) | xfilter_
+    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))
+    arun(check_token(tokens))

meutils/apis/search/baichuan.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : baichuan
+# @Time         : 2024/12/6 17:51
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *

meutils/apis/search/n.py

@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : n
+# @Time         : 2024/12/6 17:51
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+import json
+
+from meutils.pipe import *
+import httpx
+
+BASE_URL = 'https://n.cn/api/common'
+url = "/conversation/v2"
+
+# Headers
+headers = {
+    'access-token': '12113771263956298908596801732877',
+    'auth-token': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtaWQiOiIxMjExMzc3MTI2Mzk1NjI5ODkwODU5NjgwMTczMjg3NyIsInFpZCI6IiIsImRldGFpbCI6ImxvZ2luIiwiZXhwIjoxNzM0NzczODM0fQ.TE1UEoSSzWWPeEY8s3goiHuwNvLi6uCEu3r5WA7oop4',
+    'chat-token': 'f3d6075b0fe2a4d0497c6a6cd0697c35D1vZ0xSNLxfIUnJqpvpDlb=/-ttIYxjLMb3EMrWwBZU1doBGbL3ZAVmzayK88v4PMHDv3pgnqKCjtMOX7wIXGmMLQdlGz/NxAfFOqMN98gNS+JMtNQ3cqfcQELgNPOnBwFJMk0=',
+    'device-platform': 'Web',
+
+    'request-id': '9d805c53-1fae-4db3-80f8-990b222747d2',
+
+    'chat-date': 'Fri, 06 Dec 2024 09:59:53 GMT',  # 页面过期
+
+    'sid': '12113771263956298908596801732877',
+    'timestamp': '2024-12-06T17:59:53+08:00',
+    'zm-token': 'a3c840bbc53ab84b1b91cd70a8a80b3e',
+    'zm-ua': 'a455ebc67d0b5007e2a055414dd14d78',
+    'zm-ver': '1.2',
+    'Cookie': '__guid=12113771.405349637294117200.1732877020501.2803; webp=1; sdt=afb18c30-6534-4cb2-8c18-ade7636c7a47; _ga=GA1.1.2029555368.1732877022; Q=u%3D360H1374548850%26n%3DLhna_643%26le%3D%26m%3DZGt1WGWOWGWOWGWOWGWOWGWOZwZm%26qid%3D1374548850%26im%3D1_t01b9f6bfa3ea676416%26src%3Dpcw_namiso%26t%3D1; __NS_Q=u%3D360H1374548850%26n%3DLhna_643%26le%3D%26m%3DZGt1WGWOWGWOWGWOWGWOWGWOZwZm%26qid%3D1374548850%26im%3D1_t01b9f6bfa3ea676416%26src%3Dpcw_namiso%26t%3D1; T=s%3D65ecc6b3a47cc8e6df468f2246926051%26t%3D1732877071%26lm%3D0-1%26lf%3D2%26sk%3D93ed9bbe8cc2756ce12afad645453560%26mt%3D1732877071%26rc%3D%26v%3D2.0%26a%3D1; __NS_T=s%3D65ecc6b3a47cc8e6df468f2246926051%26t%3D1732877071%26lm%3D0-1%26lf%3D2%26sk%3D93ed9bbe8cc2756ce12afad645453560%26mt%3D1732877071%26rc%3D%26v%3D2.0%26a%3D1; __DC_sid=12113771.2545635413030612000.1733477831073.6633; Auth-Token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtaWQiOiIxMjExMzc3MTI2Mzk1NjI5ODkwODU5NjgwMTczMjg3NyIsInFpZCI6IiIsImRldGFpbCI6ImxvZ2luIiwiZXhwIjoxNzM0NzczODM0fQ.TE1UEoSSzWWPeEY8s3goiHuwNvLi6uCEu3r5WA7oop4; __quc_silent__=1; test_cookie_enable=null; _ga_F1YB4HZHRB=GS1.1.1733477842.2.1.1733478071.14.0.1241444979; _ga_BCGTJC5JR6=GS1.1.1733477842.2.1.1733478071.0.0.0; __DC_monitor_count=12; _ga_MY08QYRPTL=GS1.1.1733477835.1.1.1733478388.31.0.1234880602; __DC_gid=12113771.779991695.1732877017079.1733479193697.18',
+    'User-Agent': 'Apifox/1.0.0 (https://apifox.com)',
+    'content-type': 'application/x-www-form-urlencoded;charset=UTF-8'
+}
+
+# Request data
+data = {
+    "conversation_id": "b18ae6a0b87a4b0f86f87ec2a36938c3",
+    "message_id": "1864973026710818816",
+
+    "re_answer_msg_id": "",
+    "prompt": "周杰伦",
+    "is_so": True,
+    "is_copilot_enabled": False,
+    "answer_mode": 4,
+    "source_type": "prophet_web",
+    "retry": False,
+    "re_answer": 0,
+    "search_type": "360",
+    "model_type": "",
+    "intention": "",
+    "last_id": 0,
+    "search_method": "1",
+    "search_args": {},
+    "msg_type": "",
+    "kwargs": {
+        "fr": "none",
+        "zhuiwen": {
+            "query": "周杰伦",
+            "answer": "周杰伦",  # todo 追问拓展
+        }
+    }
+}
+
+
+# Make the request
+
+async def create():
+    async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=30) as client:
+        payload = {
+            "title": "周杰伦",
+            "answer_mode": 4,
+            "kwargs": {"fr": "none"}
+        }
+        response = await client.post("/conversation/v2", data=payload)
+        logger.debug(response.json())
+
+        _data = response.json()['data']
+
+        data.update()
+        logger.debug(data)
+        data['conversation_id'] = _data['conversation_id']
+        data['message_id'] = _data['msg_id']
+
+        async with client.stream(method="POST", url="/chat/v2", json=data) as response:
+            response.raise_for_status()
+            logger.debug(response.status_code)
+
+            # logger.debug(response.status_code)
+            async for chunk in response.aiter_lines():
+                # for chunk in "response.aiter_lines()":
+                yield chunk
+
+
+if __name__ == "__main__":
+    arun(create())

meutils/async_task/utils.py

@@ -112,7 +112,6 @@ async def get_task(
                 # logger.debug(bjson(remote_task_response))
 
                 _response = {**response.model_dump(), **remote_task_response}
-
                 response = response.construct(**_response)
 
                 # logger.debug(response.model_dump_json(indent=4))

meutils/cache/redis_cache.py

@@ -19,3 +19,15 @@ cache = hermes.Hermes(
     host='localhost',
     db=1,
 )
+
+if __name__ == '__main__':
+    pass
+
+
+    # ttl: Optional[int] = None,
+    # tags: Sequence[str] = (),
+    # key: Optional[Callable] = None,
+    @cache(ttl=100, key=lambda fn, a, b: (a, b))
+    def func(x, y):
+        logger.debug('xxxxxxx')
+        return x

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.06.13.38.47
+2024.12.09.11.53.50

meutils/data/oneapi/NOTICE.md

@@ -1,6 +1,17 @@
 <h1 align = "center">🔥公告🚀</h1>
 
 ---
+## 2024-12-09
+- 新增模型
+  - meta-llama/Llama-3.3-70B-Instruct: Llama 3.3 是 Llama 系列最先进的多语言开源大型语言模型，以极低成本体验媲美 405B 模型的性能。基于 Transformer 结构，并通过监督微调（SFT）和人类反馈强化学习（RLHF）提升有用性和安全性。其指令调优版本专为多语言对话优化，在多项行业基准上表现优于众多开源和封闭聊天模型。知识截止日期为 2023 年 12 月。
+  - jimeng-v2.1：豆包画图，支持即梦超强图像生成能力，兼容chat/dalle-image调用方式。
+  - 海螺最新的I2V-01-live图生视频模型：特别针对二次元图生视频效果，进行了优化，动作流畅又生动，让2D二次元角色像复活一样。
+
+## 2024-12-06
+- 新增模型
+  - o1-plus: （官网 plus 版本 `逆向工程`，有思考过程显示）o1 是OpenAI针对复杂任务的新推理模型，该任务需要广泛的常识。该模型具有 200k 上下文，目前全球最强模型，支持图片识别
+  - o1-pro: （官网 200刀 plus 版本 `逆向工程`，有思考过程显示）o1-pro 是OpenAI针对复杂任务的新推理模型，该任务需要广泛的常识。该模型具有 200k 上下文，目前全球最强模型，支持图片识别
+
 
 ## 2024-12-05
 - 新增模型gpt-4-plus/gpt-4o-plus按倍率计算

meutils/llm/check_api.py

@@ -87,21 +87,23 @@ if __name__ == '__main__':
     # api_keys = get_spreadsheet_values(feishu_url="https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=lVghgx", to_dataframe=True)[0].tolist()
     # print(arun(check_deepseek_api_key(api_keys)))
 
-    api_keys = os.getenv("DEEPSEEK_API_KEY")
-
-    # arun(check_api_key_or_token(api_keys))
-
-    # print(arun(check_deepseek_api_key(api_keys)))
-    # print(arun(check('sk-f42b2fdc036247e79cd471ab63b1142d', "https://api.deepseek.com/user/balance")))
-
-    api_keys = os.getenv("SILICONFLOW_API_KEY").split()
-    for api_key in api_keys:
-        arun(check(api_key, "https://api.siliconflow.cn/v1/user/info"))
-
-    # api_keys = get_spreadsheet_values(feishu_url="https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=EOZuBW", to_dataframe=True)[0].tolist()
-
+    # api_keys = os.getenv("DEEPSEEK_API_KEY")
+    #
+    # # arun(check_api_key_or_token(api_keys))
     #
+    # # print(arun(check_deepseek_api_key(api_keys)))
+    # # print(arun(check('sk-f42b2fdc036247e79cd471ab63b1142d', "https://api.deepseek.com/user/balance")))
     #
+    # api_keys = os.getenv("SILICONFLOW_API_KEY").split()
     # for api_key in api_keys:
-    #     if api_key:
-    #         arun(check(api_key, "https://any2chat.chatfire.cn/glm/token/check"))
+    #     arun(check(api_key, "https://api.siliconflow.cn/v1/user/info"))
+
+    # api_keys = get_spreadsheet_values(feishu_url="https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=EOZuBW", to_dataframe=True)[0].tolist()
+
+    # kimi
+    api_keys = get_spreadsheet_values(feishu_url="https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=Y7HVfo", to_dataframe=True)[0].tolist()
+    l = []
+    for api_key in api_keys:
+        if api_key:
+            if arun(check(api_key, "https://all.chatfire.cn/kimi/token/check")):
+                l.append(api_key)

meutils/llm/openai_utils/common.py

@@ -114,6 +114,7 @@ async def appu(
         base_url: Optional[str] = None,
 ):
     if model not in MODEL_PRICE:
+        send_message(f"模型未找到{model}，ppu-1默认", title=__name__)
         model = "ppu-1"
 
     client = AsyncOpenAI(api_key=api_key, base_url=base_url)

meutils/schemas/oneapi/common.py

@@ -54,6 +54,7 @@ MODEL_PRICE = {
     "api-images-flux-schnell": 0.01,
     "api-images-flux1.0-schnell": 0.01,
     "api-images-flux1.0-dev": 0.05,
+    "api-images-flux-pro-max": 0.1,
     "api-images-flux1.0-pro": 0.1,
     "api-images-flux1.1-pro": 0.1,
     "api-images-recraftv3": 0.03,
@@ -65,6 +66,7 @@ MODEL_PRICE = {
     "recraftv3-halloween": 0.03,
     "chat-recraftv3": 0.03,
     "chat-recraftv3-halloween": 0.03,
+    "jimeng-v2.1": 0.04,
 
     "api-asr": 0.01,
     "api-stt": 0.01,
@@ -165,14 +167,12 @@ MODEL_PRICE = {
     "api-reranker": 0.01,
 
     # all
-    # "o1-mini": 0.2,
-    # "o1-preview": 0.4,
-    # "o1-mini": 0.1,
-    # "o1-preview": 0.2,
-    # "o1-mini-2024-09-12": 0.1,
-    # "o1-preview-2024-09-12": 0.2,
+    "o1-plus": 0.2,
+    "o1-pro": 0.5,
+
     "o1-mini-all": 0.2,
     "o1-preview-all": 0.4,
+
     "gpt-4-all": 0.1,
     "gpt-4o-all": 0.1,
 
@@ -292,6 +292,7 @@ MODEL_RATIO = {
     "glm-4-airx": 10,
     "glm-4v": 2.5,
     "glm-4v-plus": 1,  # 2.5
+    "glm-4v-flash": 0.1,
 
     # 月之暗面 https://platform.moonshot.cn/docs/price/chat#%E4%BA%A7%E5%93%81%E5%AE%9A%E4%BB%B7
     "moonshot-v1-8k": 6 / 2,  # 特价
@@ -299,7 +300,7 @@ MODEL_RATIO = {
     "moonshot-v1-128k": 60 / 2,  # 特价
 
     # 阿里千问 https://dashscope.console.aliyun.com/billing
-    "qwen-long": 0.25,
+    "qwen-long": 0.5,
     "qwen-turbo": 1,
     "qwen-plus": 2,
     "qwen-max": 20,
@@ -315,6 +316,7 @@ MODEL_RATIO = {
     "qwen2.5-coder-32b-instruct": 0.5,
     "qwen/qwq-32b-preview": 1,
     "Qwen/QwQ-32B-Preview": 1,
+    "qwq-32b-preview": 1,
 
     "qwen1.5-7b-chat": 0.05,  # 特价
     "qwen1.5-14b-chat": 0.7,
@@ -510,8 +512,9 @@ MODEL_RATIO = {
     "meta-llama/Meta-Llama-3.1-70B-Instruct": 2,
     "llama-3.1-405b-instruct": 5,
     "meta-llama/Meta-Llama-3.1-405B-Instruct": 5,
-    "llama-3.1-nemotron-70b-instruct": 2,
-    "nvidia/Llama-3.1-Nemotron-70B-Instruct": 2,
+
+    "meta-llama/Llama-3.3-70B-Instruct": 2,
+    "llama-3.3-70b-instruct": 2,
 
     "hunyuan-a52b-instruct": 2.5,  # 10.5
 
@@ -589,6 +592,8 @@ COMPLETION_RATIO = {
     "llama-3.1-405b-instruct": 6,
     "meta-llama/Meta-Llama-3.1-405B-Instruct": 6,
 
+    "llama-3.3-70b-instruct": 4,
+
     "command": 4,
     "command-light": 4,
     "command-light-nightly": 4,
@@ -618,6 +623,10 @@ COMPLETION_RATIO = {
     "qwen-turbo-2024-11-01": 3,
     "qwen/qwq-32b-preview": 2,
     "Qwen/QwQ-32B-Preview": 2,
+    "qwq-32b-preview":2,
+    "qwen-long": 5,
+    "qwen-max": 5,
+    "glm-4v-flash": 5,
 
 }
 
@@ -721,6 +730,8 @@ REDIRECT_MODEL = {
 
     "llama-3.1-nemotron-70b-instruct": "nvidia/Llama-3.1-Nemotron-70B-Instruct",
 
+    "meta-llama/Llama-3.3-70B-Instruct": "llama-3.3-70b-instruct",
+
     # https://xinghuo.xfyun.cn/sparkapi
     # spark-lite,spark-pro,spark-max,spark-ultra
     # 'spark-lite': "general",  # 实名免费