MeUtils 2025.6.24.16.15.48__py3-none-any.whl → 2025.6.25.20.25.36__py3-none-any.whl

{MeUtils-2025.6.24.16.15.48.dist-info → MeUtils-2025.6.25.20.25.36.dist-info}/RECORD

@@ -125,7 +125,7 @@ examples/_openaisdk/openai_kimi.py,sha256=Y0ohLt2GVBrUzR286mDTJL7kPdLWVKjw36XSBE
 examples/_openaisdk/openai_lingyi.py,sha256=wmwdKaHqKB9lwoHS47hsG-zYrUy2Y3c_0Zu7ANy5IXI,3046
 examples/_openaisdk/openai_local.py,sha256=w-MedYgmRiO5eoMfbTQsB5J8ILFPfla0m6vP7qbQAxY,1889
 examples/_openaisdk/openai_luchentech.py,sha256=Jy0JxpL1u3pXcmslViPvrbwSysVBV-Dz8wSKqv6QtxY,1960
-examples/_openaisdk/openai_modelscope.py,sha256=PCuhZi3G1_-7Dyad9a0BZQU-NKe-8EecveQ3EVJA-GE,3424
+examples/_openaisdk/openai_modelscope.py,sha256=ujzfwn90TLMtYsL5y37WmShZZM_G0-aX7hr4843pH8M,3424
 examples/_openaisdk/openai_moderations.py,sha256=WoIyXDEn4dfVPwqFc54HSz0-7wLPu7pd4ZisZcyLOWM,1369
 examples/_openaisdk/openai_moon.py,sha256=7-gILGwZArZ1VHVb-jtIXEqWJMv65SaMmBSKJ90fx_w,1889
 examples/_openaisdk/openai_oi.py,sha256=8KJ62QgpAZdGWAoYN6AC9M9TrD8JQf7ZO_NAgXZywTo,1414
@@ -259,7 +259,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=bnT4-8C_o4ctat-iWAMzaGX21ppjkr0WI-YSOaqf5HA,2107
+meutils/_utils.py,sha256=bwFkgDC5J1AOC0XCUJboxJJulkdm4hs14HhwUN_rwR4,2225
 meutils/cache_utils.py,sha256=6vz3G8wZ5iOXH91J-dp7ciU_BuLDzjjQUi4Hl8rrzOY,8425
 meutils/common.py,sha256=B5LhebAm4SXPqYfL_K8ho7pC_9wz2n8X_jN2xVaS2Ds,16889
 meutils/date_utils.py,sha256=--rh58qfa2iagLjgA0eh1myyvaZ0hgxHiy-WCsrNsuk,2497
@@ -343,7 +343,7 @@ meutils/apis/niutrans.py,sha256=tWUyGH5SReLBQyVuB7kZvoFB35dsN6gXN-anbiHc_B4,2298
 meutils/apis/search_music.py,sha256=HBLtdterztrccnLAPZrWBlrYSx4WCRflCqz-V30fOA8,972
 meutils/apis/textin.py,sha256=3L23RqYiR7bl6rymQ2YugDO-K1ItPX2sd0wyCrLST90,4897
 meutils/apis/ts.py,sha256=Q13EOS9Q-Y2-KwOG_cFMVmGj9RUmDtxk5A3E27dxbN0,1511
-meutils/apis/utils.py,sha256=SHJAWdEV6_YNrZSCU-IgvnhDtBRJElgQ3oxcyd0mYYw,2041
+meutils/apis/utils.py,sha256=4ksGw3wkyeZrR80qmxHby4SAjf4YG_T5JMbRK3Zwq58,2085
 meutils/apis/web_search.py,sha256=6gS3leIB2iyeLtqhB0IbpL_mKzDgArRTqnR7odTWT3E,1035
 meutils/apis/yezi.py,sha256=26vhnA3lC5049Rqx-CHO-wyGKbdZAfvjEOG90W38cr0,3675
 meutils/apis/aitools/__init__.py,sha256=USdDfW2JZyUVY8ko54Dwpl801O766bvO_3F1lM4b8Gc,271
@@ -359,7 +359,7 @@ meutils/apis/baidu/test.py,sha256=nb9ivelHIw84-d1V-MNGRpGoTpLFsNXPk-TTKpjwOfQ,20
 meutils/apis/chatglm/__init__.py,sha256=uFuc9qY-ZjGqbsfcdGZkcEkhjATojWpzk2WXTTujc70,271
 meutils/apis/chatglm/chat.py,sha256=VARWXh3A2PnoScBgvfgAJC2C8OfVy9vWs3Q-qKg6F8Q,4253
 meutils/apis/chatglm/glm_video.py,sha256=9LA9pyeIcDDHXGhJbZSJfjxrLeNC3SIuCKJwDIXRKR8,14015
-meutils/apis/chatglm/glm_video_api.py,sha256=Wa1uBHIOwPWoAz90RMDeo-nMOvQzdQast1ZMBDTKq4Y,3964
+meutils/apis/chatglm/glm_video_api.py,sha256=IEm7QIWZ_uvh7nVcxNwhtOvURU0fQQzDcSgQNVwyKFo,3965
 meutils/apis/chatglm/images.py,sha256=k2EtOpksgAfJb2MD6kLOKKem713kamTIinRmgr8_3n0,1974
 meutils/apis/chatglm/temp.py,sha256=zYe6JGUHVfb77T_TdNsdmpTs2D9OyqDTUEkblDAIoYY,17811
 meutils/apis/chatglm/x.py,sha256=lI86Cd6SN4noCN5HM9gRugcVmjHDtxDTV4m-7Bj61N0,24312
@@ -471,15 +471,15 @@ meutils/apis/monica/llm.py,sha256=gYyBPOTvmoNFaa1KmW3OlSsRKeN7C97EyPUa264nJ08,26
 meutils/apis/napkin/__init__.py,sha256=EWwpRJEbN46d6Dk9PHAZvsYmqD_EOK0jjKQL1kYtcKs,271
 meutils/apis/napkin/icons.py,sha256=_L8EaSeQ6ChT5w7q3jnj_AcRhKvNiBg3-qUKo9JQ12o,2217
 meutils/apis/oneapi/__init__.py,sha256=wg_kqNkFqOkP70vnOHvAeKREps57Rqliu5yKC0gsgLk,284
-meutils/apis/oneapi/channel.py,sha256=ri682XvJUznZT2AeH7GTZOUI7wM2rt3mHNMXVr1s8Fs,13867
+meutils/apis/oneapi/channel.py,sha256=TU7cNC-Z-0KvP0FlRdDAl96aIG4RRWUx9zW9K7rMHmo,13918
 meutils/apis/oneapi/common.py,sha256=AIs8ro-1qui3FG42msBY6dL_zt9QJ0jS63qtp-XTlY4,3617
 meutils/apis/oneapi/demo.py,sha256=i9iBK2OftTvOZdPcCo2nxu8zs0fSKIZbzD8DRKQNla8,1851
 meutils/apis/oneapi/log.py,sha256=gNFFXXcG2Xp5ttO7Q7qR6n6GQUheuU8SOCjJPXZudLY,1447
 meutils/apis/oneapi/system.py,sha256=WmsGEEAig1rbOPkNxu3yxY67fnoRAiHWYnFWQmvAqtU,911
-meutils/apis/oneapi/token.py,sha256=LaKwkHXNvF46wXEVtbSNwfi0ujuQo7oRyln39MOPKX0,1638
+meutils/apis/oneapi/token.py,sha256=sTsKWZQ4V5uSvqNsUvWTjsJWgIHXrsnVPDhNuOqCqmQ,1637
 meutils/apis/oneapi/token_.py,sha256=3NPU1jbjiRbcXIkw8bANcnby3rXq4U2LjU_8W3PaE_4,2560
-meutils/apis/oneapi/user.py,sha256=hLebQrEuvBpyDnDkPXQsEPVGkhQrqqY1qzbhXitW8Zg,4034
-meutils/apis/oneapi/utils.py,sha256=kuXwRQee3lSgJH7ffGP3Is4BhaUVylKJviG8FVN0F-I,1660
+meutils/apis/oneapi/user.py,sha256=wKg5jrzc4YnbKV2ywFJEc1i5lyYPQ8FZtcakm2irm2g,3961
+meutils/apis/oneapi/utils.py,sha256=92Ikgf0ndz6vUx8UobJYH5eLmUGBNJ32PO49K02FrOk,1777
 meutils/apis/pixverse/__init__.py,sha256=WiboEUfJ_3Hs2WI3OymEspx8_ZSTgMglxTJd97Qk7qo,271
 meutils/apis/pixverse/pixverse.py,sha256=dvnyYVUXCEY_cLnmX9lvq9TesvplCMCuJmmP7ShchQk,5534
 meutils/apis/ppio/__init__.py,sha256=ZCz9kagqxmWkpvDqDS8pkjGYVPpuBonPLfkTF9GuBgI,271
@@ -598,7 +598,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=CU1jsNwEEVPILiPzLdlLhK_pZ7dSlzifRAIRUAEBDJQ,19
+meutils/data/VERSION,sha256=WqRg9XXVPEwoTZK7SSVGABEhZJz7lFaDM5_eQntTpDk,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -612,7 +612,7 @@ meutils/db/__init__.py,sha256=HR99rqxoFTWXUHDhLVl33tzIn8M86gigHLmEzOKH1Ec,7637
 meutils/db/mongo.py,sha256=B-B_t939rxtnNGt0PxhivjIUwinmHPzLUpXsjUIaTkQ,2337
 meutils/db/neo4j.py,sha256=eYd3jP3COWlOFBaF20UXphW67-HwlZ1t0Q34Cp-j6o0,2168
 meutils/db/orm.py,sha256=NEOO6p6D98EARszGXKuc9iTFQburllQS_vlgjp15lls,5094
-meutils/db/redis_db.py,sha256=nQHVTOxE0Apoaj9mjjAYzTTd2QpU6Ry41kPxdJiPb2w,2990
+meutils/db/redis_db.py,sha256=Q0EPQDRrYHZr0npXlcqBpN7wlKgQye3h1PpghScbo4c,3029
 meutils/decorators/__ai.py,sha256=QAz005-Wa-sp0YUUoelaR1pMbt6hPSBML5j0My6TbEI,1681
 meutils/decorators/__init__.py,sha256=hgpHo40pfFWYXEnrW74o8W7SIfCD0GHr3gnujBw1hIQ,3284
 meutils/decorators/cache.py,sha256=-sqhCuiSYZK1UtsRw7bBog19G65O9N27DVTAp_nlBk4,2972
@@ -724,9 +724,9 @@ meutils/llm/openai_polling/chat.py,sha256=PT7Xb621RIa7SSwdlOCq5OMgk7nSyN7cBaBW4q
 meutils/llm/openai_polling/images.py,sha256=qKMk3vCvamS_48ceC-_y2LPpP5XsD476FHG9MUu8kks,1042
 meutils/llm/openai_utils/__init__.py,sha256=MWyNhP2K49oaHGEZlInZc3XlwqlStFultP8k7HDPAwk,290
 meutils/llm/openai_utils/adapters.py,sha256=-6e-gpSYVPUouP9o8leAdOOCNuk-dtndUhzMOyvQpUM,3425
+meutils/llm/openai_utils/bling_utils.py,sha256=AbobMExB4TfgtV6PyXmEwH8SxMpOlP8Gr3HRTs37M4E,5103
 meutils/llm/openai_utils/common.py,sha256=H24wag3LD2RqKV_sXD4OBa4VtmWh8JNUo5h5xvHVmAk,10557
 meutils/llm/openai_utils/tool_outputs.py,sha256=6mNkm4btgy0uzF98gdmcah1bYmoflXdLz2Sqm0KC_LQ,1224
-meutils/llm/openai_utils/usage_utils.py,sha256=GfwZ8PqXrIVXDyKSvyQ7-GewFW-VOdaUqjpGbY_N8l8,2787
 meutils/llm/output_parsers/__init__.py,sha256=EGKvgUD47ReyV5Z9RXDCrdDLgfKMHdoayzsXVmBuQxw,3474
 meutils/llm/prompts/__init__.py,sha256=VlEEViFoUSRS0EF1rHJXHh9Ik9FpvAiR1luKjHOsUc4,8580
 meutils/llm/prompts/demo.py,sha256=vQ6MeR-3ds2js3TzDbZid-YKbo_pH0ehn58B7kjJaMg,3665
@@ -833,7 +833,7 @@ meutils/schemas/fish_types.py,sha256=yC0ZFr3Ebh8F0OhtMsXYaIfNNvzOM2LT9YtKTaRoHGU
 meutils/schemas/hailuo_types.py,sha256=3nx2jgDmi2dpwEfJ6xRiZQ-9nhOOXQgTz1yyLz5d-ik,7722
 meutils/schemas/haimian_types.py,sha256=jGu484UviAeBgy5OIUyRY4uYCxXfv16zDPqiJQr9wNQ,1364
 meutils/schemas/idphoto_types.py,sha256=nuHbpppejRSkJCiQ7YKx0Gnke0ShKZhOvdg0e7tk9-0,1074
-meutils/schemas/image_types.py,sha256=0qQdx6GRrFTLrd59bpqYAaU7EJcJZKan6vKbBLetLy8,16541
+meutils/schemas/image_types.py,sha256=xDKXSffaLawfkY60LRFQlpJ2f_s-AClspgMw3ENt6Bc,16404
 meutils/schemas/jimeng_types.py,sha256=z0mAICgNE0Yaq09_puzgMfHOP-QKWiZqqMlFbLVHtmY,1995
 meutils/schemas/jina_types.py,sha256=SLRRBCap2B1uXnHF7Sgnlz1Work8HvdIltjj4oVlGTk,8826
 meutils/schemas/kimi_types.py,sha256=PjCgHwCDNzKasn4X6rUzvOENqKYT3xj07cgp71IdsDA,3607
@@ -856,7 +856,7 @@ meutils/schemas/runwayml_types.py,sha256=q6g00kg1PYCDjpw-notgbcUGwRAlIa8kAmU52Zu
 meutils/schemas/siliconflow_types.py,sha256=KClkwA2huq8YKuUCYIJZ4RF94ALhy3BsOMF1FcqRO1A,9266
 meutils/schemas/step_types.py,sha256=nGTPXZ7RwOF2RTsPBQguLLcIaBxHs4bsZkYa_LalcJ0,648
 meutils/schemas/suno_types.py,sha256=CxEXHGnLGZ7xvmoIYpz7IYPL73aLjtpHezJRIjWryKs,14965
-meutils/schemas/task_types.py,sha256=Zjbn6AiopkPA3px2ZiMouU9QrL43p9O8bJB5OTI-O_4,4638
+meutils/schemas/task_types.py,sha256=8fCGpBNa1UOAsxYDG3a8P1MMv9tvWiyOn3kt7D34cZw,6371
 meutils/schemas/textin_types.py,sha256=-h9sRDYFUPtcANT5R-KeK-PalIENDMEckpttXgkt-fA,2306
 meutils/schemas/translator_types.py,sha256=xufNQeyim7RhkzAK_J5_JchZfqaUBDXFwMtrPUu1xzI,627
 meutils/schemas/tripo3d_types.py,sha256=mQF65HwHYmczRgAIuXK5hGxWDWNYDq-Xu9pja7Dwy4o,1452
@@ -894,7 +894,7 @@ meutils/serving/fastapi/utils.py,sha256=H5lQSU7-IfJ2w9FWbaJ34LCbQSaNTFSU7z1pG5wZ
 meutils/serving/fastapi/__demo/__init__.py,sha256=TxXjqy2ZxAkadPxqN92Xq3ixCUYkQ-4X6UxsReRpHhc,271
 meutils/serving/fastapi/__demo/异步任务.py,sha256=60_ruA4ljlTLIP5zxcejmm9WJ0SDuqpsO49SZK9vA_s,1444
 meutils/serving/fastapi/dependencies/__init__.py,sha256=TQcxvWqZdA2jZZX84NtAij-bhS7ihcMLx1-xsbSpV4g,384
-meutils/serving/fastapi/dependencies/auth.py,sha256=o6U-PB5laYhPGHWm_-AUVER2hV-K783K5DVfbfFWPm4,2538
+meutils/serving/fastapi/dependencies/auth.py,sha256=1IvBOazIjjvfoGxBrxMOGEYquh5ylsUBM--dK9cJMYs,2644
 meutils/serving/fastapi/dependencies/headers.py,sha256=fBJxhNaRNVMJFoSBFcHJyiayR-MJR9gol21ndH3IW40,815
 meutils/serving/fastapi/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/serving/fastapi/exceptions/http_error.py,sha256=-cBBWNJH3qp1GMSaa9AlojJ18lBLFEk0KHoGUnmV3u4,2601
@@ -998,9 +998,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.6.24.16.15.48.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.6.24.16.15.48.dist-info/METADATA,sha256=C0178dwGy_62iysEaY0NfTDB2TUJJiIXR81hn-MhUAY,32834
-MeUtils-2025.6.24.16.15.48.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.6.24.16.15.48.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.6.24.16.15.48.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.6.24.16.15.48.dist-info/RECORD,,
+MeUtils-2025.6.25.20.25.36.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.6.25.20.25.36.dist-info/METADATA,sha256=FCQl9iVoFMJT2zVI20QdQ2o-r5gnXIgdbgnpaAQIydY,32834
+MeUtils-2025.6.25.20.25.36.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.6.25.20.25.36.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.6.25.20.25.36.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.6.25.20.25.36.dist-info/RECORD,,

examples/_openaisdk/openai_modelscope.py

@@ -23,7 +23,7 @@ client = OpenAI(
     # base_url="https://api.stepfun.com/v1",
     base_url=os.getenv("MODELSCOPE_BASE_URL"),
     # api_key=os.getenv("MODELSCOPE_API_KEY"),
-    api_key="3f82dcb0-f061-41e9-83aa-626f35fa8194"
+    api_key="81ccebd2-1933-4996-8c65-8e170d4f4264"
 )
 
 # print(client.models.list().model_dump_json(indent=4))

meutils/_utils.py

@@ -102,4 +102,7 @@ def dict_merge(dicts):
 
 
 if __name__ == '__main__':
-    print(bjson('xx'))
+    # print(bjson('xx'))
+    l2 = "async-result/{id}"
+    l1 = "/async-result/if123456"#.removeprefix("/")
+    print(list_difference(l1, l2))

meutils/apis/chatglm/glm_video_api.py

@@ -117,3 +117,4 @@ if __name__ == '__main__':
     request = ImageRequest(prompt="https://oss.ffire.cc/files/kling_watermark.png 让这个女人笑起来")
 
     arun(generate(request, n=30))
+

meutils/apis/oneapi/channel.py

@@ -116,7 +116,7 @@ async def create_or_update_channel(
             ids = range(start, end)
 
         request_list = []
-        for i, k in zip(ids, request.key.split()):  # api_key不为空
+        for i, k in zip(ids, request.key.split()):  # api_key不为空, 如果id很多是否考虑复制 api_key不为空
             _request = request.copy()
             _request.id = i
             _request.key = k

meutils/apis/oneapi/token.py

@@ -43,4 +43,3 @@ async def get_api_key_money(api_key):
 
 if __name__ == '__main__':
     arun(get_api_key_money(os.getenv("OPENAI_API_KEY_GUOCHAN")))
-

meutils/apis/oneapi/user.py

@@ -35,27 +35,23 @@ headers = {
 #         if response.is_success:
 #             data = response.json()
 #             return data
-@alru_cache(ttl=3 * 60 * 60)  # todo cache
+@rcache(ttl=7 * 24 * 3600)
 async def get_api_key_log(api_key: str) -> Optional[list]:  # 日志查询会超时：为了获取 user_id, todo缓存 永久缓存 sk => user
     try:
-        if onelog := await redis_aclient.get(f"user:{api_key}"):
-            return json.loads(onelog)
-        else:
-
-            async with httpx.AsyncClient(base_url=BASE_URL) as client:
-                response = await client.get("/api/log/token", params={"key": api_key})
-                response.raise_for_status()
-                data = response.json()
-                if onelog := data['data'][:1]:
-                    await redis_aclient.set(f"user:{api_key}", json.dumps(onelog))
-                    return onelog
+        async with httpx.AsyncClient(base_url=BASE_URL) as client:
+            response = await client.get("/api/log/token", params={"key": api_key})
+            response.raise_for_status()
+            data = response.json()
+            if onelog := data['data'][:1]:
+                await redis_aclient.set(f"user:{api_key}", json.dumps(onelog))
+                return onelog
     except Exception as e:
         logger.error(e)
         send_message(f"获取api-key日志失败：{api_key}", title=__name__)
         return
 
 
-@alru_cache(ttl=60)
+@rcache(ttl=1 * 24 * 3600)
 async def get_user(user_id):
     async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=30) as client:
         response = await client.get(f"/api/user/{user_id}")
@@ -67,9 +63,13 @@ async def get_user(user_id):
 
 
 async def get_user_money(api_key):
-    onelog = await get_api_key_log(api_key)
-    if onelog:
-        user_id = onelog[0]['user_id']
+    if onelog := await get_api_key_log(api_key):
+        onelog = onelog[0]
+        if quota := onelog.get('quota'):
+            return quota / 500000
+
+        user_id = onelog['user_id']
+
         data = await get_user(user_id)
         logger.debug(data)
         if data:
@@ -106,11 +106,12 @@ async def get_user_from_api_key(api_key):
 
 if __name__ == '__main__':
     # api-key => get_one_log => get_user => put_user
-    # arun(get_user(814))
-    payload = arun(get_user(1))
+    # arun(get_user(11047))
+    # payload = arun(get_user(1))
     # print(payload)
-    arun(put_user(payload['data'], -1))
+    # arun(put_user(payload['data'], -1))
+    # arun(get_api_key_log("sk-2KedjhqS6uubaONCS1Dxyq28Tc1P4AtQk3WFfBpzy4enyalH"))
 
-    # arun(get_api_key_log('sk-gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv'))
-    # arun(get_user_money("sk-LlB4W38z9kv5Wy1c3ceeu4PHeIWs6bbWsjr8Om31jYvsucRv"))
-    # arun(get_user_from_api_key('sk-blrcheysazcdqkyghaumetjhzscjedyppghmlujmzhuuyfeu'))
+    # arun(get_api_key_log('sk-'))
+    arun(get_user_money("sk-2KedjhqS6uubaONCS1Dxyq28Tc1P4AtQk3WFfBpzy4enyalH"))
+    # arun(get_user_from_api_key('sk-'))

meutils/apis/oneapi/utils.py

@@ -48,15 +48,18 @@ if __name__ == '__main__':
     #     arun(get_user_quota(os.getenv("OPENAI_API_KEY")))
     # arun(get_user_quota(user_id=1))
 
-    async def task():
-        filter_kwargs = dict(
-            username=f"{shortuuid.random(length=6)}@chatfire.com",
-        )
-        return await update_or_insert(OneapiUser, filter_kwargs)
-
-
-    async def main():
-        await asyncio.gather(*[task() for _ in range(5000)])
-
-
-    arun(main())
+    # async def task():
+    #     filter_kwargs = dict(
+    #         username=f"{shortuuid.random(length=6)}@chatfire.com",
+    #     )
+    #     return await update_or_insert(OneapiUser, filter_kwargs)
+    #
+    #
+    # async def main():
+    #     await asyncio.gather(*[task() for _ in range(5000)])
+    #
+    #
+    # arun(main())
+
+
+    arun(get_user_quota("sk-2KedjhqS6uubaONCS1Dxyq28Tc1P4AtQk3WFfBpzy4enyalH"))

meutils/apis/utils.py

@@ -34,6 +34,7 @@ async def make_request(
         options["params"] = params
 
     path = path or "/"
+    path = f"""/{path.removeprefix("/")}"""
 
     if method.upper() == 'GET':
         response = await client.get(path, options=options, cast_to=object)

meutils/data/VERSION

@@ -1 +1 @@
-2025.06.24.16.15.48
+2025.06.25.20.25.36

meutils/db/redis_db.py

@@ -96,5 +96,6 @@ if __name__ == '__main__':
 
     # r = redis_client.sadd('set1', 'a', 'b', 'c')
     # r = redis_client.sadd('set1', 'd')
-    k="meutils.config_utils.lark_utils.commonaget_spreadsheet_values()[(＇feishu_url＇, ＇https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?sheet=Gvm9dt＇), (＇to_dataframe＇, True)]	"
-    redis_client.delete(k)
+    # k="meutils.config_utils.lark_utils.commonaget_spreadsheet_values()[(＇feishu_url＇, ＇https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?sheet=Gvm9dt＇), (＇to_dataframe＇, True)]	"
+    # redis_client.delete(k)
+    print(redis_client.get('test'))

meutils/llm/openai_utils/bling_utils.py

@@ -0,0 +1,217 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : usage_utils
+# @Time         : 2025/6/24 08:53
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+"""
+1. 同步任务（流 非流）
+    - 按次
+    - 按量
+2. 异步任务
+    - 按次
+    - 按量
+"""
+
+from meutils.pipe import *
+from meutils.llm.clients import AsyncOpenAI
+from meutils.apis.utils import make_request
+
+base_url = "https://api.chatfire.cn/flux/v1"
+
+
+# base_url="http://110.42.51.201:38888/flux/v1"
+# base_url = "http://0.0.0.0:8000/v1/async/flux/v1"
+# base_url = "https://openai-dev.chatfire.cn/usage/async/flux/v1"
+
+async def bling_for_async_task(
+        model: str = "usage-async",
+        task_id: str = "123456",
+        n: float = 1,
+        api_key: Optional[str] = None
+):
+    """todo: 错误如何传进去 post可行 还是 必须get入口"""
+    if n := int(np.round(n)):
+        tasks = [
+            make_request(
+                base_url=base_url,
+                api_key=api_key,
+                path=f"/{model}",
+                payload={
+                    "id": task_id,
+                    # 'polling_url': f'{base_url}/get_result?id={task_id}',
+                }
+            )
+            for i in range(n)
+        ]
+
+        _ = await asyncio.gather(*tasks)
+        return _
+
+
+async def get_async_task(id: str = "123456"):
+    # 计费
+    _ = await make_request(
+        base_url=base_url,
+        path=f"/get_result?id={id}",
+
+        method="GET"
+    )
+
+    return _
+
+
+async def bling_for_tokens(
+        model: str = "usage-chat",
+
+        usage: Optional[dict] = None,
+
+        api_key: Optional[str] = None,
+
+        n: Optional[float] = None,  # 按次走以前逻辑也行
+):
+    """
+
+    image_usage = {
+            "input_tokens": input_tokens,
+            "input_tokens_details": {
+                "text_tokens": input_tokens,
+                "image_tokens": 0,
+            },
+            "output_tokens": output_tokens,
+            "total_tokens": total_tokens
+        }
+
+            # usage = {
+        #     "prompt_tokens": input_tokens,
+        #     "completion_tokens": output_tokens,
+        #     "total_tokens": total_tokens
+        # }
+    """
+    usage = usage or {}
+    n = n and int(np.round(n))
+
+    client = AsyncOpenAI(api_key=api_key)
+    if n:
+        _ = await client.images.generate(
+            model=model,
+            prompt="ChatfireAPI",
+            n=n
+        )
+
+    elif "input_tokens" in usage:
+        _ = await client.images.generate(
+            model=model,
+            prompt="ChatfireAPI",
+            n=n,
+            extra_body={"extra_fields": usage}
+        )
+    else:
+        _ = await client.chat.completions.create(
+            model=model,
+            messages=[{"role": "user", "content": "ChatfireAPI"}],
+            extra_body={"extra_body": usage}
+        )
+    return _
+
+
+def get_billing_n(request: Union[BaseModel, dict], duration: float = 6):
+    """继续拓展其兼容性
+
+    :param request:
+    :param duration:
+    :return:
+    """
+    if isinstance(request, BaseModel):
+        request = request.model_dump()
+
+    # 数量
+    N = request.get("n") or request.get("num_images") or 1
+
+    # 时长
+    N += np.ceil(request.get("duration", 0) / duration)
+
+    # 分辨率
+    if "1080p" in str(request).lower():
+        N += 1
+
+    # 命令行参数 --duration 5
+    s = {"--duration 10", "--dur 10"}
+    if any(i in str(request) for i in s):
+        N += 1
+
+    return N
+
+
+@asynccontextmanager
+async def billing_flow_for_async_task(
+        model: str = "usage-async",
+        task_id: str = "123456",
+        n: float = 1,
+        api_key: Optional[str] = None
+):
+    if n:  # 计费
+        await bling_for_async_task(model, task_id=task_id, n=n, api_key=api_key)
+        yield
+
+    else:  # 不计费
+        a = yield
+        logger.debug(a)
+
+
+@asynccontextmanager
+async def billing_flow_for_tokens(
+        model: str = "usage-chat",
+
+        usage: Optional[dict] = None,  # None就是按次
+
+        api_key: Optional[str] = None,
+):
+    await bling_for_tokens(model, usage=usage, api_key=api_key)
+
+    yield
+
+
+if __name__ == '__main__':
+    # arun(create_usage_for_tokens())
+    # usage = {
+    #     "input_tokens": 1,
+    #     "input_tokens_details": {
+    #         "text_tokens": 1,
+    #         "image_tokens": 0,
+    #     },
+    #     "output_tokens": 100,
+    #     "total_tokens": 101
+    # }
+    # n = 1
+    # arun(create_usage_for_tokens(usage=usage, n=n))
+
+    # arun(create_usage_for_async_task(task_id="task_id", n=1))
+
+    model = "usage-async"
+    model = "fal-ai/model1"
+    task_id = f"{model}-{int(time.time())}"
+
+    # arun(create_usage_for_async_task(model, task_id=task_id, n=3))
+
+    #
+    # arun(get_async_task(task_id))
+    #
+    # arun(get_async_task(f"{task_id}-Ready", status="Ready"))
+
+    # arun(get_async_task('chatfire-123456-Ready-1'))
+
+# {
+#   "id": "chatfire-1750769977.856766",
+#   "result": {},
+#   "status": "Error",
+#   "details": {
+#     "xx": [
+#       "xxxx"
+#     ]
+#   },
+#   "progress": 99
+# }

meutils/schemas/image_types.py

@@ -58,10 +58,6 @@ ASPECT_RATIOS = {
 }
 
 
-# prompt: str,
-#         model: Union[str, ImageModel, None] | NotGiven = NOT_GIVEN,
-#         n: Optional[int] | NotGiven = NOT_GIVEN,
-
 class ImagesResponse(_ImagesResponse):
     created: int = Field(default_factory=lambda: int(time.time()))
 

meutils/schemas/task_types.py

@@ -155,7 +155,39 @@ class FileTask(BaseModel):
     url: Optional[str] = None
 
 
-# pass
+class FluxTaskResponse(BaseModel):
+    id: Union[str, int] = Field(default_factory=lambda: shortuuid.random())
+
+    """Task not found, Pending, Request Moderated, Content Moderated, Ready, Error"""
+    status: Optional[Literal["Pending", "Ready", "Error", "Content Moderated"]] = None  # Ready, Error, success, failed
+
+    result: Optional[dict] = None
+
+    details: Optional[dict] = None  # Error才显示, 当做 metadata
+    progress: Optional[int] = None
+
+    def __init__(self, /, **data: Any):
+        super().__init__(**data)
+
+        self.details = self.details or self.result
+
+        if self.status is None and self.result:
+            if status := (
+                    self.result.get("status")
+                    or self.result.get("task_status")
+                    or self.result.get("state")
+                    or self.result.get("task_state")
+            ):
+                logger.debug(status)
+                if status.lower().startswith(("succ", "ok", "compl")):
+                    self.status = "Ready"
+
+                if status.lower().startswith(("fail", "error", "cancel")):
+                    self.status = "Error"
+
+                if any(i in status.lower() for i in ("moder",)):
+                    self.status = "Content Moderated"
+
 
 if __name__ == '__main__':
     # print(TaskType("kling").name)
@@ -192,4 +224,15 @@ if __name__ == '__main__':
 
     response.user_id = 1
 
-    print(response)
+    data = {
+        "model": "cogvideox-flash",
+        "request_id": "20250625182913f3eb016d10844e3a",
+        "task_status": "SUCCESS",
+        "video_result": [
+            {
+                "cover_image_url": "https://aigc-files.bigmodel.cn/api/cogvideo/3ce064a4-51af-11f0-8152-8e82dfcce76c_cover_0.jpeg",
+                "url": "https://aigc-files.bigmodel.cn/api/cogvideo/3ce064a4-51af-11f0-8152-8e82dfcce76c_0.mp4"
+            }
+        ]
+    }
+    print(FluxTaskResponse(result=data))

meutils/serving/fastapi/dependencies/auth.py

@@ -20,19 +20,9 @@ http_bearer = HTTPBearer()
 
 
 # 定义获取token的函数
+async def parse_token(token: str) -> Optional[str]:
+    if token is None: return None
 
-async def get_bearer_token(
-        auth: Optional[HTTPAuthorizationCredentials] = Depends(http_bearer)
-) -> Optional[str]:
-    """
-    获取Bearer token
-    :param auth: HTTP认证凭证
-    :return: token字符串
-    """
-    if auth is None:
-        return None
-
-    token = auth.credentials
     if token.startswith('redis:'):  # redis里按序轮询
         if "feishu.cn" in token:  # redis:https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=Y7HVfo
             feishu_url = token.removeprefix("redis:")
@@ -59,6 +49,20 @@ async def get_bearer_token(
     return token
 
 
+async def get_bearer_token(
+        auth: Optional[HTTPAuthorizationCredentials] = Depends(http_bearer)
+) -> Optional[str]:
+    """
+    获取Bearer token
+    :param auth: HTTP认证凭证
+    :return: token字符串
+    """
+    if auth is None:
+        return None
+
+    return await parse_token(auth.credentials)
+
+
 # async def get_next_token(redis_key):
 #     """轮询"""
 #     if api_key := await redis_aclient.lpop(redis_key):