MeUtils 2025.4.18.14.53.20__py3-none-any.whl → 2025.4.19.13.52.36__py3-none-any.whl

{MeUtils-2025.4.18.14.53.20.dist-info → MeUtils-2025.4.19.13.52.36.dist-info}/RECORD

@@ -249,7 +249,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=5oL-s4vM0DZSyI9j1Qoo999PcJagMKNZ9ZPaXFo9tp4,1999
+meutils/_utils.py,sha256=bnT4-8C_o4ctat-iWAMzaGX21ppjkr0WI-YSOaqf5HA,2107
 meutils/cache_utils.py,sha256=6vz3G8wZ5iOXH91J-dp7ciU_BuLDzjjQUi4Hl8rrzOY,8425
 meutils/common.py,sha256=3Baz2iIIgrMCdxkSZCtLOlvihcLMGMLIeS2Du6vAhhg,16851
 meutils/date_utils.py,sha256=--rh58qfa2iagLjgA0eh1myyvaZ0hgxHiy-WCsrNsuk,2497
@@ -344,7 +344,7 @@ meutils/apis/audio/__init__.py,sha256=y7Rpn90LocHhA0ywrDP_fT4QAK7sr4JsIX5wLJgkNH
 meutils/apis/audio/deepinfra.py,sha256=O-IpAnHfx25QCjhB5xaIYVBy5AbyPzmVz-Pr40gpnsM,1773
 meutils/apis/audio/fish.py,sha256=jPvTveRcDtvGDgRT6EA9WJitAQxftneHxvEJ63yY_cM,8392
 meutils/apis/baidu/__init__.py,sha256=XPkz3DHrDdxCneaZct3y7MaX0Aw9IIseOYOn1YuVBII,243
-meutils/apis/baidu/bdaitpzs.py,sha256=iV34wkJzN-XUxWVI9IThT__5htC9KFCHxk9kqUmNvKo,12852
+meutils/apis/baidu/bdaitpzs.py,sha256=d8UStmi0ABEr8Zy1uoTux-ryAs2aw3XNwAJSRhi40BQ,12685
 meutils/apis/baidu/test.py,sha256=nb9ivelHIw84-d1V-MNGRpGoTpLFsNXPk-TTKpjwOfQ,2058
 meutils/apis/chatglm/__init__.py,sha256=uFuc9qY-ZjGqbsfcdGZkcEkhjATojWpzk2WXTTujc70,271
 meutils/apis/chatglm/glm_video.py,sha256=9LA9pyeIcDDHXGhJbZSJfjxrLeNC3SIuCKJwDIXRKR8,14015
@@ -395,7 +395,7 @@ meutils/apis/images/deepinfra.py,sha256=lMqfU0LIXEzHiAS31dCcoTnPIE6tpoDJhq61H0TV
 meutils/apis/images/demo.py,sha256=Cjk-EKMKbp44czykW_44qR0TzElX8nNCALqXBBw5sJA,4405
 meutils/apis/images/edits.py,sha256=4DDBkr-n_5F6N1bLkSS2puznyPv1cROFhohZc7wVSpY,10155
 meutils/apis/images/eidt.py,sha256=s8IBbCjwwoogIUf-d2O7nkawUmly9n19nvLYPaLEeg4,1217
-meutils/apis/images/recraft.py,sha256=S-ldPRM_Ad92rqq2EKIUerb78uuWag_cIomjOTcWeuE,72270
+meutils/apis/images/recraft.py,sha256=E-hr6lCzqA6z732DPwbtZFTlu-g04aQ7rHk8OUPyg54,72356
 meutils/apis/images/flux/__init__.py,sha256=W_PZabQm6EmtJYmzEiEpL_WCXTAW0AiJ-t_n5UTrE8c,271
 meutils/apis/images/flux/fluxpro.py,sha256=NFl9t9C3R3jsNJpez4o9tOz3r-fjRXj-vKMxCSTRDTU,4022
 meutils/apis/images/flux/mystic.py,sha256=cUkqaMAbd3dSBCvFEoNBBoEoWCGzvBJWPEkEq1Q8xzw,3616
@@ -438,7 +438,7 @@ 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=AxUsQj6muOLrj9IuMt2QJtTmTpR0MvJz1v-r3Ex75hE,2012
+meutils/apis/oneapi/channel.py,sha256=o-nNTrTUObWhhkYp23pFqSNKXNRYpQhlm9FPkmiJplU,2039
 meutils/apis/oneapi/common.py,sha256=AIs8ro-1qui3FG42msBY6dL_zt9QJ0jS63qtp-XTlY4,3617
 meutils/apis/oneapi/log.py,sha256=dOmyldX5DyJO7mMw4EzYorTIsdLKqZ3AZiV0z0tEpWE,1377
 meutils/apis/oneapi/token.py,sha256=LaKwkHXNvF46wXEVtbSNwfi0ujuQo7oRyln39MOPKX0,1638
@@ -450,7 +450,7 @@ meutils/apis/pixverse/pixverse.py,sha256=dvnyYVUXCEY_cLnmX9lvq9TesvplCMCuJmmP7Sh
 meutils/apis/proxy/__init__.py,sha256=by7_6GT3xeDjAWLLqbw8uvGaZ3RdprEW-zJ2DFLOdwA,271
 meutils/apis/proxy/demo.py,sha256=-huvtmltbKXa6cS77k61ts-Kjd5ccSAgXzNrotIvIKA,1642
 meutils/apis/proxy/ips.py,sha256=3McLniROteSBqAtcMH8xKbUBfhVc4ZyGuRwMvgEryKg,5023
-meutils/apis/proxy/kdlapi.py,sha256=e1UGwmjJG8d28Cjb3LQXdPT1VlLneOqOwlfoO0o0tgU,1545
+meutils/apis/proxy/kdlapi.py,sha256=1JDknUVBQDQgGeNIdxNcVjyH1j_0EurJ1B-U8V3RBPs,1557
 meutils/apis/remini/__init__.py,sha256=8TbAnbI_bDfH8g0Y9EHXHBum7C0rZt9MzgAAz_MbAeI,271
 meutils/apis/remini/remini.py,sha256=bJjvtqrCNlAu7No4gYGjoWAM0ch6dCsofYSy2jPZrXg,4239
 meutils/apis/replicateai/__init__.py,sha256=PK7e7-xhn5aj5WOyGHLzpsHQvpeM5uTOiMylvj40ZmU,272
@@ -507,7 +507,7 @@ meutils/apis/voice_clone/__init__.py,sha256=y7Rpn90LocHhA0ywrDP_fT4QAK7sr4JsIX5w
 meutils/apis/voice_clone/fish.py,sha256=6m8zcS2KEqmalKy2ArnOaNovyxsQp_sw4d_O1kVZR2s,7146
 meutils/apis/voice_clone/fish_api.py,sha256=pDpE-B8HFiGIOV3NVd1HmFrCC2GQc3wH-81oNbTS0mY,307
 meutils/apis/volcengine_apis/__init__.py,sha256=PnngoI3Qk6n_axdOLgENCFYlKsmohgzYVW1HUg7L8gI,271
-meutils/apis/volcengine_apis/images.py,sha256=lsrNZ19gqEUDARo8SsXhtcCc1TzazVOuOsjx1LrewzQ,5015
+meutils/apis/volcengine_apis/images.py,sha256=lFuwFjHKYnoYnC-9PKWgox3LOZGCZMivWUJ8I5rTfPM,5117
 meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpMLo,367
 meutils/async_task/celery_config.py,sha256=BX1h3jY34aO6UmUFakdBUwOdsEiOxCGuUtYDUKFtafc,3461
 meutils/async_task/common.py,sha256=ZJ4e0CsEJf1ppPmGSwPCwhZBAkUL5xsi_t1ny-bJuko,845
@@ -527,8 +527,8 @@ meutils/async_utils/background.py,sha256=dl6UaMIFBZDB1uxSZzGFJdSnpt3Xo0flK7gwsok
 meutils/async_utils/common.py,sha256=bfZkUlQz21WHAh2W7SDxFtrvUYNBnRfVxIUgMmT7o1Q,5212
 meutils/async_utils/test.py,sha256=lkZdgSzzgVg8hYVcaBNEJ3KBvFTEfjbXZVvtknQZsRQ,1155
 meutils/caches/__init__.py,sha256=hIUEqNnmhukkbKK2F39bXe-MGDwzeUoTOf_sYly53xo,291
-meutils/caches/acache.py,sha256=vyGwc6PLJmGt8tOe_gxP9tfL2QcMjVdpq_O2Dy7lPeo,3196
-meutils/caches/common.py,sha256=8C6KiHYAeRVguQxOh2ocNCxq9BxuemLOHSEL_xTAtOM,1774
+meutils/caches/acache.py,sha256=iykItx1iSEmTTg8zmM02LZm09M-HuEDN413sKr15QLY,2900
+meutils/caches/common.py,sha256=GvAPsXjZchhlBL8KczGAII6xAtUy_BqB7NmNLPWNHcc,1962
 meutils/caches/redis_cache.py,sha256=oXGk_CZhjp9P_z1TG_zhmma4iGepK-iIWY_ZYQWSkFg,1395
 meutils/caches/redis_mulit.py,sha256=WQrNmH98S0D9mG5eixqPtrYvOPi62T4w2ZvNETB4eU4,597
 meutils/clis/__init__.py,sha256=2Fhn43X8kFP6FpAnnAMiPcdnjUwQaukiIr2uGB6mGAY,279
@@ -556,7 +556,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=98nUDoCFC_wwNFcFXT_ZNKfOhdd9boUOke0YJnD96PU,19
+meutils/data/VERSION,sha256=l_srvdhRZQK6C91QKKv188SIHfXIQN46T8Mq-TWrgos,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -576,7 +576,7 @@ meutils/decorators/__init__.py,sha256=hgpHo40pfFWYXEnrW74o8W7SIfCD0GHr3gnujBw1hI
 meutils/decorators/cache.py,sha256=-sqhCuiSYZK1UtsRw7bBog19G65O9N27DVTAp_nlBk4,2972
 meutils/decorators/catch.py,sha256=JMYXNQ-9P0qic-Jtjtm8o9gCisTvDeUvVkSbPZxcdUM,1555
 meutils/decorators/common.py,sha256=Y-6FIQf4GqllYOGmyzorrLFEbx3MguLsjFmWcnbIaKg,14334
-meutils/decorators/contextmanagers.py,sha256=DPffNQJeGwNwrO14zddioSunsxYde9CLEEBe3mQB24c,5150
+meutils/decorators/contextmanagers.py,sha256=DXInOzFrRF2k00lvtTT1wTOnng4c6Ul6fCUU0scVtdg,5000
 meutils/decorators/decorator.py,sha256=njwKhWhnvAXgHd_8h50V5jj5XZoK7_HM12rFDlmXc8c,15570
 meutils/decorators/decorator_demo.py,sha256=JLCulTW04uYHzLg6jRxVseaAdU-YeyL8Z2p-e_y-rsg,754
 meutils/decorators/demo.py,sha256=VmHYNkQQG_CT8js3uxXCaO7HmBbvVy0bQeE7QgPDdTw,1980
@@ -603,7 +603,7 @@ 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/_openai_files.py,sha256=UIiu6Zg7iSFIn1xIcpLznFlnfCxAJFGuvuPtxvTNHfI,1005
-meutils/io/files_utils.py,sha256=T-cbr2wi0mHk7WqoJ1w2SZgMZlsZzRXNsdijIjD1mG4,8508
+meutils/io/files_utils.py,sha256=PoWfh2L6bC5QrS5fBPoVOEhwjuIJrswBEbhAB0wClfA,8660
 meutils/io/image.py,sha256=BJmYzx7o66X7C32gOfVmfr5tBRXOi0IYQY7BpGLsGrg,6926
 meutils/io/minio_utils.py,sha256=i1YuxwDJzLse0smMXuPqnD1wirBBb8psmB_kd1oPoVU,1274
 meutils/io/openai_files.py,sha256=wi4qp-olva8aF6AfBiUBfb_QlHzHolJJbH4UbHpRrB0,6032
@@ -674,7 +674,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_polling/__init__.py,sha256=qmAMITPtrTD-y57RiJXewuOic7iLKBhx8mz5uvcxsy8,270
-meutils/llm/openai_polling/chat.py,sha256=QPG8wZAUs3zK-l3B6z5arqlhG3xD-e0lDeOkpYd54Sk,3840
+meutils/llm/openai_polling/chat.py,sha256=l8qRBFlVd-asLWAphMfNAArswDPmgH0ny3FqoVF5xOo,6592
 meutils/llm/openai_polling/images.py,sha256=qKMk3vCvamS_48ceC-_y2LPpP5XsD476FHG9MUu8kks,1042
 meutils/llm/openai_utils/__init__.py,sha256=MWyNhP2K49oaHGEZlInZc3XlwqlStFultP8k7HDPAwk,290
 meutils/llm/openai_utils/common.py,sha256=GGctOMlg8xT2A5H-8hMow0VfOZHCDdIPjd12597Nohs,9754
@@ -690,7 +690,7 @@ meutils/logging/log_utils.py,sha256=Sa5-Y4fWNTKQw2fIb1dbPgOypl6S6m7EOrbciSqEt5A,
 meutils/logging/logger.py,sha256=-J_tWYfAvPhSTshVWIiN-6zTZnjkFuwDfMtxUtuNkuY,6183
 meutils/notice/__init__.py,sha256=BVbcBx4ks-BH_63gEcjMxL67oX1_aWdaM8r3TDo8Ogg,248
 meutils/notice/emails.py,sha256=TvC1xv3MpFC2HU0lTQW5SmNuj7UMlgjpsUImMp9jKOw,2403
-meutils/notice/feishu.py,sha256=iCoEGL75NUAVQk7Bb3NyyYfKM3ToQGb5nLOm4zQ6XR8,4271
+meutils/notice/feishu.py,sha256=Sp3gaxDiUFHc_XvFRZFbN-g1zu3hxybq4U0gr599TrY,4417
 meutils/notice/file_post.py,sha256=KQ8iQUM30vF7T6ZZPahdLps4dLXK2s3nzdFYbty6M5E,953
 meutils/notice/load_emailfile - 副本.py,sha256=f-Kq3UKZut_P0bmumV1y4PXuPtatjl-5SLUH5LShBUY,7331
 meutils/notice/wechat.py,sha256=-HU5oSvpZrVnjjU76ky7_j0yg5ivn5mIlJ7JJVtlrnY,4082
@@ -818,7 +818,7 @@ meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVI
 meutils/schemas/db/oneapi_types.py,sha256=3t2m0H80saEXmYUZfVFrtEaY117GjZTsSa1GKgkJzqQ,3896
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=ybmtQ2xDVDxneE1BbKRN2eX-7jskTW5DBzIMv7aRIRM,35331
+meutils/schemas/oneapi/common.py,sha256=UMc9oftLv-DK-YO7r8DOa30y-rRkgPD6rC03L_Z5Eyo,35496
 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
@@ -844,7 +844,7 @@ meutils/serving/fastapi/__demo/__init__.py,sha256=TxXjqy2ZxAkadPxqN92Xq3ixCUYkQ-
 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=3dgfBLbu6VdzB1-7vaEtfXy6oOawIcGiaQZU2fBNXZM,2166
-meutils/serving/fastapi/dependencies/headers.py,sha256=QHsWn8w_9f4_WoYTAOJzzb38FVQdRgbNATLdChWaVGg,916
+meutils/serving/fastapi/dependencies/headers.py,sha256=ddifDCJyELqfPwuUX12x-lH0KNylu2iidc7Mupcvl6k,922
 meutils/serving/fastapi/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/serving/fastapi/exceptions/http_error.py,sha256=-cBBWNJH3qp1GMSaa9AlojJ18lBLFEk0KHoGUnmV3u4,2601
 meutils/serving/fastapi/exceptions/validation_error.py,sha256=Q71wYfzGsVjLA-SQ3R5a8iT0kDG01mwriVUXHhvsTv0,1234
@@ -947,9 +947,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.4.18.14.53.20.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.4.18.14.53.20.dist-info/METADATA,sha256=TzJyXD1YXuW7qOZEGDRq5SHugPRKigLQ9mVHfelpBIE,32834
-MeUtils-2025.4.18.14.53.20.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.4.18.14.53.20.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.4.18.14.53.20.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.4.18.14.53.20.dist-info/RECORD,,
+MeUtils-2025.4.19.13.52.36.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.4.19.13.52.36.dist-info/METADATA,sha256=ljsvi_qp_xMGVNMji003BG00arcfVl8djOoauFm_1PI,32834
+MeUtils-2025.4.19.13.52.36.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.4.19.13.52.36.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.4.19.13.52.36.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.4.19.13.52.36.dist-info/RECORD,,

meutils/_utils.py

@@ -45,14 +45,15 @@ list4log = lambda ls: "\n\t" + "\n\t".join(ls)
 
 
 def bjson(json_data):
-    if isinstance(json_data, dict):
+    if isinstance(json_data, (str,)):
+        json_data = {"metadata": json_data}
+
+    if isinstance(json_data, (dict, list)):
         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("'", '"'))
@@ -98,3 +99,7 @@ def dict_merge(dicts):
         for k, v in d.items():
             dic.setdefault(k, []).append(v)
     return dic
+
+
+if __name__ == '__main__':
+    print(bjson('xx'))

meutils/apis/baidu/bdaitpzs.py

@@ -64,6 +64,8 @@ async def create_task(
         "proxy": await get_one_proxy()
     }
 
+    logger.debug(request_kwargs)
+
     async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=100, **request_kwargs) as client:
 
         response = await client.post('/aigc/pccreate', data=payload)
@@ -205,7 +207,7 @@ if __name__ == '__main__':
     # # token='BAIDUID=F2185337B2F3F85DAB5D2E661BC00C8D:FG=1; BDUSS=hNQkdpbjBOT05EVjRCSFp3TUF-TXFKWHktcFppUGNyd0xZZGp3Mkp6TmVnbFptSVFBQUFBJCQAAAAAAAAAAAEAAACsbZVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF71LmZe9S5mOX; BDUSS_BFESS=hNQkdpbjBOT05EVjRCSFp3TUF-TXFKWHktcFppUGNyd0xZZGp3Mkp6TmVnbFptSVFBQUFBJCQAAAAAAAAAAAEAAACsbZVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF71LmZe9S5mOX; MAWEBCUID=web_axHhqlIWargVQsXuskqOnMzVXDWQHqQXOpFPkPVSvXFIwTNYaC; PSTM=1716434076; BIDUPSID=5FEB509ECAE0F7843030FD4ECC0800F8; newlogin=1; MCITY=-315%3A; H_WISE_SIDS_BFESS=60360_60674; indexPageSugList=%5B%22%E8%AF%81%E4%BB%B6%E7%85%A7%20%E7%94%B7%22%2C%22%E6%85%88%E7%A6%A7%E5%92%8C%E6%9D%8E%E8%8E%B2%E8%8B%B1%22%2C%22%E7%AE%80%E9%A1%BF%E7%81%AF%E5%85%B7%20%E9%81%A5%E6%8E%A7%E5%99%A8%22%2C%22%E5%88%B0%E5%BD%93%E9%81%93%E5%A3%AB%E9%82%A3%E4%BA%9B%E5%B9%B4%20%E8%B1%86%E7%93%A3%22%2C%22%E9%81%93%E5%A3%AB%20%E5%8D%A1%E9%80%9A%22%2C%22%E9%81%93%E5%A3%AB%22%2C%22%E6%88%91%E5%BD%93%E9%81%93%E5%A3%AB%E9%82%A3%E4%BA%9B%E5%B9%B4%22%2C%22%E8%AF%BB%E6%9E%B6%22%2C%22%E6%9D%B0%E8%AF%BA%E6%AF%94%E5%88%A9%20%E5%AF%B9%E6%AF%94%E7%85%A7%20%E5%8D%95%E8%86%9D%E8%B7%AA%E5%9C%B0%22%5D; BAIDUID_BFESS=F2185337B2F3F85DAB5D2E661BC00C8D:FG=1; BDRCVFR[C0p6oIjvx-c]=I67x6TjHwwYf0; delPer=0; PSINO=5; BDRCVFR[C0sZzZJZb70]=mk3SLVN4HKm; BA_HECTOR=alal0125ah0h0h0l8k8l0l01blu4191jd049m1u; ZFY=C8vEYu7ZbY0zTEITG3A0aWCevri4:BT:B0H1NpNZdQWKM:C; BDORZ=B490B5EBF6F3CD402E515D22BCDA1598; H_PS_PSSID=60360_60674_60683_60694_60572; BCLID=11757829139010941756; BCLID_BFESS=11757829139010941756; BDSFRCVID=pZCOJexroG3bGRntFj9auQWaJgKKv3JTDYLE8yu9T4VNR5DVYtg8EG0Pt_ZYMak-XolpogKKL2OTHm_F_2uxOjjg8UtVJeC6EG0Ptf8g0M5; BDSFRCVID_BFESS=pZCOJexroG3bGRntFj9auQWaJgKKv3JTDYLE8yu9T4VNR5DVYtg8EG0Pt_ZYMak-XolpogKKL2OTHm_F_2uxOjjg8UtVJeC6EG0Ptf8g0M5; H_BDCLCKID_SF=tJkH_KthJIP3e4515Pr_q4tJbq58etJXfaO4Vp7F54nKDp0R0JbI0J0h5p6vaP3m066MaM-ELDOxsMT4QfJJhxuH-qoKel5tQH5MXprN3KJmf-Op2hO0ytDNbHOE2-biW2tH2Mbdax7P_IoG2Mn8M4bb3qOpBtQmJeTxoUJ25DnJhhCGe6KbD6bQDH8Oq-jeHDrKBRbaHJOoDDv8QxRcy4LbKxnxJhoe0H6JXt3LBJnfEpjlbURxqqjy3-OkbfQ9babTQ-tbBp3k8MQXbn7FQfbQ0hOe5RvnMe5a2JK2MJ7JOpvsDxnxy-umQRPH-Rv92DQMVU52QqcqEIQHQT3m5-5bbN3ut6IHJbufoID2fIvDqTrP-trf5DCShUFs5J3dB2Q-XPoO3KOGqpoh5b6b2xKJb-bCb4biQPjNoMbgy4op8P3y0bb2DUA1y4vpX4bOBeTxoUJ2-bjWS-cV-xTqjbIebPRiWTj9QgbLMhQ7tt5W8ncFbT7l5hKpbt-q0x-jLTnhVn0MBCK0MD8xDT8Bj6Pq5fcj2nQXK4_tVTrJabC3qMcJXU6q2bDeQNba0hjXbgcBVRjaLx3HOR3oynD5yl0vWtv4qnctfGPJ-qr4Jlb4otbTeMonDh83Bn6kW4oWHGbyWPJO5hvv8KoO3M7VBUKmDloOW-TB5bbPLUQF5l8-sq0x0bOte-bQXH_E5bj2qRAHoK-h3j; H_BDCLCKID_SF_BFESS=tJkH_KthJIP3e4515Pr_q4tJbq58etJXfaO4Vp7F54nKDp0R0JbI0J0h5p6vaP3m066MaM-ELDOxsMT4QfJJhxuH-qoKel5tQH5MXprN3KJmf-Op2hO0ytDNbHOE2-biW2tH2Mbdax7P_IoG2Mn8M4bb3qOpBtQmJeTxoUJ25DnJhhCGe6KbD6bQDH8Oq-jeHDrKBRbaHJOoDDv8QxRcy4LbKxnxJhoe0H6JXt3LBJnfEpjlbURxqqjy3-OkbfQ9babTQ-tbBp3k8MQXbn7FQfbQ0hOe5RvnMe5a2JK2MJ7JOpvsDxnxy-umQRPH-Rv92DQMVU52QqcqEIQHQT3m5-5bbN3ut6IHJbufoID2fIvDqTrP-trf5DCShUFs5J3dB2Q-XPoO3KOGqpoh5b6b2xKJb-bCb4biQPjNoMbgy4op8P3y0bb2DUA1y4vpX4bOBeTxoUJ2-bjWS-cV-xTqjbIebPRiWTj9QgbLMhQ7tt5W8ncFbT7l5hKpbt-q0x-jLTnhVn0MBCK0MD8xDT8Bj6Pq5fcj2nQXK4_tVTrJabC3qMcJXU6q2bDeQNba0hjXbgcBVRjaLx3HOR3oynD5yl0vWtv4qnctfGPJ-qr4Jlb4otbTeMonDh83Bn6kW4oWHGbyWPJO5hvv8KoO3M7VBUKmDloOW-TB5bbPLUQF5l8-sq0x0bOte-bQXH_E5bj2qRAHoK-h3j; BDRCVFR[dG2JNJb_ajR]=mk3SLVN4HKm; userFrom=null; BDRCVFR[-pGxjrCMryR]=mk3SLVN4HKm; ab_sr=1.0.1_NTY4Y2RjNTU5MWYzM2IyZjY4M2EzMWNjYWM1MWRhYjdlZDhmZTdkZGQ1NGE0MGFkZDU0NWQzNTU1OWJiZDllZmU4YjcyZDIyNTJiNzYxOWQ4OGM1MjQ2ODQzYTM2OGQ3YjdkMzQxZWI4Y2U5ZjQ3ZWZkYTQ2M2I3Yzc2MDkxMjBhZjczODNjMDNmNTAxMzhiZDg2ZmU0MTIwZTUxYWMxNQ==; H_WISE_SIDS=60360_60674_60683_60694_60572'
     # request = BDAITPZSRequest(original_url=url, thumb_url=url)
 
-    url = "https://edit-upload-pic.cdn.bcebos.com/fff888d57a9b2ae0ffd802c8f77d80a0.jpeg?authorization=bce-auth-v1%2FALTAKh1mxHnNIyeO93hiasKJqq%2F2024-10-17T09%3A48%3A15Z%2F3600%2Fhost%2F4e7a06db2ea622123db01a2c81114f0377876ac2acb019f1f1594ec67a07af8d"
+    url = "https://oss.ffire.cc/files/shuiyin.jpg"
 
     request = BDAITPZSRequest(
         type="1",

meutils/apis/images/recraft.py

@@ -43,7 +43,8 @@ async def get_access_token(token: str):
 
 
 async def edit_image(image, task: Literal["vectorize", "super_resolution",] = "super_resolution"):
-    token = await get_next_token_for_polling(feishu_url=FEISHU_URL, check_token=check_token, from_redis=True)
+    token = await get_next_token_for_polling(feishu_url=FEISHU_URL, check_token=check_token, from_redis=True,
+                                             min_points=1)
     token = await get_access_token(token)
     headers = {"Authorization": f"Bearer {token}"}
 
@@ -142,13 +143,14 @@ async def check_token(token, threshold: float = 1):
             response = await client.get("/users/me")
             response.raise_for_status()
             data = response.json()
-            logger.debug(data)
-            logger.debug(data["credits"])
+            # logger.debug(data)
+            _ = data["credits"] >= threshold
+            _ or logger.debug(data["credits"])
+            return _
 
-            return data["credits"] >= threshold
     except Exception as e:
         logger.error(e)
-        logger.debug(token)
+        # logger.debug(token)
         return False
 
 

meutils/apis/oneapi/channel.py

@@ -42,7 +42,7 @@ async def edit_channel(models, token: Optional[str] = None):
         "auto_ban": 0,
         "other_info": "",
 
-        "group": "default,china",  # ','.join(GROUP_RATIO),
+        "group": "default,openai,china,chatfire,enterprise",  # ','.join(GROUP_RATIO),
         "groups": ['default']
     }
     headers = {

meutils/apis/proxy/kdlapi.py

@@ -5,11 +5,11 @@ from meutils.pipe import *
 from meutils.caches import rcache
 from meutils.decorators.retry import retrying
 
-username = "d1999983904"
+username = "d1999983904"  # 包月
 password = "1h29rymg"
 
 
-@rcache(ttl=60 - 30)
+@rcache(ttl=60 - 20)
 @retrying()
 async def get_proxy_list():
     secret_id = os.getenv("KDLAPI_SECRET_ID") or "owklc8tk3ypo00ohu80o"
@@ -35,8 +35,8 @@ if __name__ == '__main__':
 
 
     async def fetch(url):
-        # proxy = await get_one_proxy()
-        proxy="http://154.9.253.9:38443"
+        proxy = await get_one_proxy()
+        # proxy = "http://154.9.253.9:38443"
 
         async with httpx.AsyncClient(proxy=proxy, timeout=20) as client:
             resp = await client.get(url)

meutils/apis/volcengine_apis/images.py

@@ -12,6 +12,7 @@ https://www.volcengine.com/docs/85128/1526761
 Seedream 通用3.0文生图模型是基于字节跳动视觉大模型打造的新一代文生图模型，本次升级模型综合能力（图文，结构，美感）均显著提升。V3.0参数量更大，对语义有更好的理解，实体结构也更加自然真实，支持 2048 以下分辨率直出，各类场景下的效果均大幅提升。
 https://www.volcengine.com/docs/6791/1384311
 """
+import os
 
 from meutils.pipe import *
 from meutils.io.files_utils import to_url
@@ -83,6 +84,7 @@ async def generate(request: ImageRequest, token: Optional[str] = None):
 
 
 if __name__ == '__main__':
+    token = f"""{os.getenv("VOLC_ACCESSKEY")}|{os.getenv("VOLC_SECRETKEY")}"""
     prompt = """
     3D魔童哪吒 c4d 搬砖 很开心， 很快乐， 精神抖擞， 背景是数不清的敖丙虚化 视觉冲击力强 大师构图 色彩鲜艳丰富 吸引人 背景用黄金色艺术字写着“搬砖挣钱” 冷暖色对比
     """
@@ -98,7 +100,7 @@ if __name__ == '__main__':
         response_format="url",
     )
 
-    arun(generate(request))
+    arun(generate(request, token=token))
 
     # with timer():
     #     visual_service = VisualService()

meutils/caches/acache.py

@@ -10,7 +10,7 @@
 import os
 
 from meutils.pipe import *
-from meutils.db.redis_db import async_pool
+from meutils.caches import cache, rcache
 
 from aiocache import cached, Cache, RedisCache, caches
 from aiocache import multi_cached
@@ -21,31 +21,6 @@ from meutils.schemas.image_types import ImageRequest
 REDIS_URL = "redis://:chatfirechatfire@110.42.51.143:6379"
 
 
-def rcache(**kwargs):  # todo
-    """
-    :param endpoint: str with the endpoint to connect to. Default is "127.0.0.1".
-    :param port: int with the port to connect to. Default is 6379.
-    :param db: int indicating database to use. Default is 0.
-    :param password: str indicating password to use. Default is None.
-    """
-
-    connection_kwargs = {}
-    if REDIS_URL := os.getenv("REDIS_URL"):
-        user_password, base_url = REDIS_URL.split("@")
-        endpoint, port = base_url.split(':')
-        password = user_password.split(":")[-1]
-
-        connection_kwargs['endpoint'] = endpoint
-        connection_kwargs['port'] = port
-        connection_kwargs['password'] = password
-
-    return cached(
-        cache=RedisCache,
-        **connection_kwargs,
-        **kwargs
-    )
-
-
 @cached(ttl=60)
 @cached(ttl=60)
 async def cached_fc(user_id, **kwargs):
@@ -59,6 +34,7 @@ async def cached_fc(user_id, **kwargs):
 # key_builder = lambda *args, **kwargs: args[0].prompt
 key_builder = lambda *args, **kwargs: args[1].prompt
 
+
 def key_builder(*args, **kwargs):
     print(args)
     return args[1].prompt
@@ -71,6 +47,28 @@ async def redis_fcc(user_id, **kwargs):
     return False
 
 
+skip_cache_func = lambda x: False
+
+
+# def key_builder(*args, **kwargs):
+#     len(str(args[1]))
+
+def skip_cache_func(*args, **kwargs):
+    logger.debug(f"skip_cache_func: {args} {kwargs}")  # todo:缓存下载文件
+    return False
+    logger.debug(x)
+
+
+@rcache(ttl=30, skip_cache_func=skip_cache_func)
+async def skip_cache_fccc(*args, **kwargs):
+    logger.debug(f"第一次调用：{args} {kwargs}")
+
+    return  # 没缓存
+    # return False # 缓存
+    # return True # 缓存
+    # return 'xxxxxxx' # 缓存
+
+
 # @multi_cached(ttl=60) # 多key缓存
 # async def complex_function(user_id, **kwargs):
 #     logger.debug(user_id)
@@ -120,13 +118,13 @@ if __name__ == '__main__':
 
     from aiocache import cached, Cache, RedisCache, caches
 
+    fn = skip_cache_fccc
 
-    async def main():
-        for i in range(10):
-            # logger.debug(i)
 
-            await redis_fcc(ImageRequest(prompt=f'a cat {i}'))
-            await asyncio.sleep(1)
+    async def main(fn):
+        for i in range(3):
+            _ = await fn(i)
+            # logger.debug(f"第{i}次: {_}")
 
 
-    arun(main())
+    arun(main(fn))

meutils/caches/common.py

@@ -15,6 +15,8 @@ from aiocache import cached, Cache, RedisCache, caches
 
 cache = memory_cache = cached
 
+RedisCache.delete_all = lambda *args, **kwargs: caches.get(RedisCache).clear(*args, **kwargs)
+
 
 def rcache(**kwargs):
     """serializer="pickle"
@@ -54,23 +56,29 @@ if __name__ == '__main__':
 
     @cache(ttl=10)
     async def fn(a):
-        logger.debug(a)
+        logger.debug("第一次")
+        return a
+
+
+    @cached(ttl=60)
+    async def fn2(a):
+        logger.debug("第一次")
         return a
 
 
     # @cache(ttl=3)
     @rcache(ttl=10)
     async def mfn(a):
-        logger.debug(a)
+        logger.debug("第一次")
         return a
 
 
-    async def main():
+    async def main(fn):
         for i in range(10):
-            # await fn(11111)
-            await mfn(11111)
+            await fn(i)
 
-            await asyncio.sleep(1)
 
+    # arun(main(fn))
+    # arun(main(fn2))
 
-    arun(main())
+    arun(main(mfn))

meutils/data/VERSION

@@ -1 +1 @@
-2025.04.18.14.53.20
+2025.04.19.13.52.36

meutils/decorators/contextmanagers.py

@@ -105,20 +105,18 @@ async def atry_catch(
         is_trace: bool = False,
         **kwargs,
 ):
-    callback = callback or send_message_for_try_catch
-
-    task_name = task or "Unnamed TryCatch Task"
-
-    data = {
-        "task_name": task_name,
-    }
-
     try:
         yield
     except Exception as e:
-        error_msg = f"""{traceback.format_exc()}""" if is_trace else f"{e}"
-        data["error"] = error_msg
+        task = task or "Unnamed TryCatch Task"
+
+        callback = callback or send_message_for_try_catch
+
+        data = {
+            "task": task,
+            "error": f"""{traceback.format_exc()}""" if is_trace else f"{e}"
 
+        }
         for k, v in kwargs.items():
             if isinstance(v, BaseModel):
                 v = v.model_dump(exclude_none=True)
@@ -137,35 +135,27 @@ def try_catch(
         is_trace: bool = False,
         **kwargs,
 ):
-    callback = callback or send_message_for_try_catch
-
-    task_name = task or "Unnamed TryCatch Task"
-
-    data = {
-        "task_name": task_name,
-    }
-    for k, v in kwargs.items():
-        if isinstance(v, BaseModel):
-            v = v.model_dump(exclude_none=True)
-        elif isinstance(v, typing.Mapping):
-            v = dict(v)
-
-        data[k] = v
-
-    # logger.debug(data)
-
     try:
         yield
     except Exception as e:
-        if is_trace:
-            error_msg = f"""{traceback.format_exc()}"""
-        else:
-            error_msg = f"{e}"
+        task = task or "Unnamed TryCatch Task"
 
-        data["error"] = error_msg
+        callback = callback or send_message_for_try_catch
+
+        data = {
+            "task": task,
+            "error": f"""{traceback.format_exc()}""" if is_trace else f"{e}"
+
+        }
+        for k, v in kwargs.items():
+            if isinstance(v, BaseModel):
+                v = v.model_dump(exclude_none=True)
+            data[k] = v
+
+        # logger.debug(data)
 
         callback(data)
-        raise e
+        raise
 
 
 if __name__ == '__main__':
@@ -190,7 +180,7 @@ if __name__ == '__main__':
     #     except TimeoutError:
     #         print("Task did not complete in time.")
     async def main():
-        async with atry_catch("test"):
+        async with atry_catch("test", a=1):
             1 / 0
 
 

meutils/io/files_utils.py

@@ -49,7 +49,6 @@ def base64_to_bytes(base64_image_string):
     return base64.b64decode(base64_image_string.split(",", 1)[-1])
 
 
-@retrying()
 async def to_bytes(
         file: Union[UploadFile, str, bytes],
         headers: Optional[dict] = None
@@ -67,28 +66,32 @@ async def to_bytes(
         logger.debug(f"FileType: BYTES")
         return file
 
-    file_bytes = None
-    if isinstance(file, UploadFile):
-        file_bytes = await file.read()
+    elif isinstance(file, str):
+        if file.startswith('http'):
+            logger.debug(f"FileType: HTTP")
+            async with AsyncClient(headers=headers or {}, timeout=120) as cilent:  # todo: 缓存 根据大小
+                resp = await cilent.get(file)
+                file_bytes = resp.content
 
-    elif isinstance(file, str) and file.startswith('http'):  # url
-        logger.debug(f"FileType: HTTP")
+        elif file.startswith('data:') and ";base64," in file:
+            logger.debug(f"FileType: BASE64")
 
-        async with AsyncClient(headers=headers or {}, timeout=120) as cilent:
-            resp = await cilent.get(file)
-            file_bytes = resp.content
+            file_bytes = base64_to_bytes(file)
 
-    elif isinstance(file, str) and len(file) > 1024:  # base64
-        logger.debug(f"FileType: BASE64")
+        elif Path(file).is_file():  # file
+            logger.debug(f"FileType: PATH")
 
-        file_bytes = base64_to_bytes(file)
+            file_bytes = Path(file).read_bytes()
 
-    elif isinstance(file, str) and len(file) < 1024 and Path(file).is_file():  # file
-        logger.debug(f"FileType: PATH")
+        else:
+            logger.debug(f"FileType: MAY BASE64")
+            file_bytes = base64_to_bytes(file)
 
-        file_bytes = Path(file).read_bytes()
+        return file_bytes
 
-    return file_bytes
+    elif isinstance(file, UploadFile):
+        file_bytes = await file.read()
+        return file_bytes
 
 
 @asynccontextmanager
@@ -168,6 +171,7 @@ async def to_base64(file: Union[UploadFile, str, bytes, list], content_type: Opt
 
     if not file: return
 
+    # logger.debug(file)
     _ = base64.b64encode(await to_bytes(file)).decode('utf-8')
 
     if content_type:  # "image/png"