MeUtils 2025.6.9.11.23.49__py3-none-any.whl → 2025.6.12.17.34.4__py3-none-any.whl

{MeUtils-2025.6.9.11.23.49.dist-info → MeUtils-2025.6.12.17.34.4.dist-info}/RECORD

@@ -103,6 +103,7 @@ examples/_openaisdk/openai_baidu.py,sha256=qnrxP66lY7Qf2jEbFEHrt0FrR5_Aji1AgwSI_
 examples/_openaisdk/openai_cache.py,sha256=89GbJ1QlqQbVxlUeuFgEbwDYHOkum7BK0zB-CqmDAZU,726
 examples/_openaisdk/openai_chatfire.py,sha256=lnQU_po1eMb-YIrW8rgQMfC5UbcReCMZERiylesmJr0,19092
 examples/_openaisdk/openai_chatfire_all.py,sha256=DaiI1NfDeK655QvXyczkgXK9Awxp7NBe71LHA7trxGE,4831
+examples/_openaisdk/openai_chatfire_usa.py,sha256=kS7QlZYTUAJ0lfgTnh3wK-NIW9lfC8aSO0xgfUF7lBE,649
 examples/_openaisdk/openai_dashscope.py,sha256=m9SjQpaNgYwr4Qd3XusWbJBGp5ZTtpuB40QopejxPKQ,1029
 examples/_openaisdk/openai_deepinfra.py,sha256=innI4BT15dZEqheqDHG4lHDczY1QC7t2Whcavi1pcz0,1195
 examples/_openaisdk/openai_deepseek.py,sha256=0IbHh2F6eVDs-i8gP8x8wj6s9R6CzOGN7QrCp1EuB5k,2086
@@ -370,7 +371,7 @@ meutils/apis/dreamfaceapp/videos.py,sha256=xtz4GYRTdVE-D7xxFpSaH5Kl5ewXDx9Ogvtkf
 meutils/apis/fal/__init__.py,sha256=A7w3ZAS7Tv20N4X4Em6NshDxKSCPAzaPxHJTbM3BbyM,272
 meutils/apis/fal/chat.py,sha256=yReABuCWfXOEt7tZax03XIX5KBlfBo2DlEOp2EpiGOM,2641
 meutils/apis/fal/files.py,sha256=Gppdo96uw8-TCDr8P691jV7dK9Si-E-kJXFJR5BVt-Q,1373
-meutils/apis/fal/images.py,sha256=eFpG1kjn5vxpwk_M-bOI2teUjTz7VLj6akraExFJm3k,12265
+meutils/apis/fal/images.py,sha256=TKMlgIHVsMbI6tLvM24JILkyFU5RWzWVIlAk2CiqYfo,12499
 meutils/apis/fal/images_.py,sha256=C-C1TTQtMJ6RRcd-4FeYPn0R5IpPRPUFmBbrTVs_ypA,1446
 meutils/apis/fal/kling_videos.py,sha256=kL4SRpZafRSCRODtiNqeXauxfamHNdcBTE65BrG1rVA,2554
 meutils/apis/fal/pd.py,sha256=oPrMK_FJqohl2Kf0U0it8SqgvIlSEYFcSX8sfVkD8bU,311
@@ -382,7 +383,7 @@ meutils/apis/gitee/images/__init__.py,sha256=zvS8e0ogQLqajZTAype1e0TDLJenlfbRQ16
 meutils/apis/gitee/images/kolors.py,sha256=IGpDtMiOOPgbE8ZOXFP9-Hh_XNCDkuvNYjKQbXq8Nik,3338
 meutils/apis/google/__init__.py,sha256=3pcpV81045y42FCTSdN99YGLCabwocR-f1_gjTSeFhE,243
 meutils/apis/google/audios.py,sha256=Su1V3TAOn8X94KgOrmpLRPnYETgTyDXqjDf4qQMkzAo,3289
-meutils/apis/google/chat.py,sha256=tpNTiICiLcVSsUMm5f78k_TvwCfR2o7b52R1gNYNOlI,16972
+meutils/apis/google/chat.py,sha256=aYB67-1tlnCE2yxIk2bKPEUih10jchGgEaQ_HmMKcmg,17022
 meutils/apis/google/files.py,sha256=1TMYUe7OVAmDlhlu92dSLUQr037hQzXf-RTfZ9Tfp_c,1017
 meutils/apis/google/gemini_sdk.py,sha256=iHmD_pGPM3qy_IHHA2pwAt01gM3hjRlPmrvsRQmfgEM,8525
 meutils/apis/google/google2openai.py,sha256=JaRw4XfGjy1XAbM4UwLqwLHmldOvM1J1tbMTagi10os,3075
@@ -413,6 +414,7 @@ meutils/apis/images/deepinfra.py,sha256=lMqfU0LIXEzHiAS31dCcoTnPIE6tpoDJhq61H0TV
 meutils/apis/images/demo.py,sha256=Cjk-EKMKbp44czykW_44qR0TzElX8nNCALqXBBw5sJA,4405
 meutils/apis/images/edits.py,sha256=tdtFKVaMti4zOAh9WQ_VWrKyuJyomZ3-Fwh1DK7EJAM,10189
 meutils/apis/images/eidt.py,sha256=s8IBbCjwwoogIUf-d2O7nkawUmly9n19nvLYPaLEeg4,1217
+meutils/apis/images/generations.py,sha256=e5eFUy_y42fp7TnIaY6R1L8eoK-2LH4hILrWqPtOQiA,998
 meutils/apis/images/openai_edits.py,sha256=a03L8vY8NXnl8uT9o0SMszMxE7dv6tTCZQyMyI5dS_g,2160
 meutils/apis/images/recraft.py,sha256=6EqGtoG8RBiStOIazaBvceekP9pF1_ws7fn4BuXFdqk,72705
 meutils/apis/images/flux/__init__.py,sha256=W_PZabQm6EmtJYmzEiEpL_WCXTAW0AiJ-t_n5UTrE8c,271
@@ -435,7 +437,7 @@ meutils/apis/jimeng/common.py,sha256=LFuhgY-KKE661Kf5oY0xAA1LhNu6ErGJ6SflSJPVHkE
 meutils/apis/jimeng/doubao_images.py,sha256=Aeq1hve2PiO3baP50Augsu0u2YFlC7r_X5jgnDqv6y4,2082
 meutils/apis/jimeng/doubao_utils.py,sha256=d9KDNkqKN4oxaJRAeGNMouRvzHEhIRXzN3T_HjtTXdM,6025
 meutils/apis/jimeng/files.py,sha256=AlsAlQGufGm84TldUBLFZpZQGD6INN5xIwHql9ocPj4,11310
-meutils/apis/jimeng/images.py,sha256=AO1Qvm-zpIU5hJegnf_zseIYE1C58wzfyje6Db5TzOk,23001
+meutils/apis/jimeng/images.py,sha256=KUr16G_SyNUJixXHUZUwdSECxtbPGuM21_LSoSWHWPM,23066
 meutils/apis/jimeng/videos.py,sha256=MRDXz96BYEuS4vVCHeXaoNE6nfpq0B6UCf1_dafCE-8,6127
 meutils/apis/jimeng/videos_videos.py,sha256=A6oWLKcrb6YMIumqUMQS3KVP9bhOEKLUOIlAUlbREmE,12259
 meutils/apis/jimeng_global/__init__.py,sha256=ENdwkppOOekt9Qzy_50TyA7lzNEqo0TpZcF7d2rYBhc,245
@@ -541,6 +543,7 @@ meutils/apis/voice_clone/fish_api.py,sha256=pDpE-B8HFiGIOV3NVd1HmFrCC2GQc3wH-81o
 meutils/apis/volcengine_apis/__init__.py,sha256=gtu5ZNCc3up8bzgrCi10uwhsC04HpuCEEPXR_iVCNJE,244
 meutils/apis/volcengine_apis/images.py,sha256=F9LXXptesnASB_Al7rkEshb2S5r3PixZd8w0mif5468,5463
 meutils/apis/volcengine_apis/tasks.py,sha256=da2wYs2bqjYte_P2aFbSdKkLBaghuAj6vVKIlgdMg5A,4495
+meutils/apis/volcengine_apis/videos.py,sha256=T4L4IdOEzMuktDgBESiTPBR1dBUVgWMVvsUdGXbQ5XA,4552
 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
@@ -589,7 +592,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=ajfrXVxwxLXDqLqTkbMBfVztcutU0Ib27pelOabEPe8,19
+meutils/data/VERSION,sha256=trtpAA_484ptK6W_nrD0KMw3dsbSBTaOSpa5pyFCCfQ,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -671,7 +674,7 @@ meutils/jwt_utils/__init__.py,sha256=zs4pIDk4sQ82o7meMwt64_tv2WBMRTaXX9doe0ilvvs
 meutils/jwt_utils/common.py,sha256=u2PPQJ9S-83y8f3Sb5L2OCRP7o-xV56EAmlzMZ8Je0Q,2352
 meutils/llm/__init__.py,sha256=mYv0QpACLd-wz4htIduPuTU3mX06_Y8ZprxDohtZGBM,244
 meutils/llm/check_api.py,sha256=Cu60Rvp7zLmmazuLXxpK4z-FCab4NrO4nH5LzfYjjoM,3591
-meutils/llm/check_utils.py,sha256=PqZXMlM__U3m7HmZf0k3tlDDPLj05IAndbtzBRdhQek,8096
+meutils/llm/check_utils.py,sha256=-6cOZDci4WMwwnp5YloSGSXcaI9SU45X-BXgExI9Ltc,8109
 meutils/llm/clients.py,sha256=qZa9WC85Ah4tdEd-EI_P_038mnJLq_z-smaJdwJp-EM,2956
 meutils/llm/demo.py,sha256=gyGjTxuNFMOa1X4CXaChkq0lcjbKiRsnSRhkeMvsoQk,3822
 meutils/llm/mappers.py,sha256=ZQLl3OuD06kVMP8bwIpVgAB1UVzMJWUJiZ3vgk-ZjeI,303
@@ -713,8 +716,8 @@ meutils/llm/openai_polling/__init__.py,sha256=qmAMITPtrTD-y57RiJXewuOic7iLKBhx8m
 meutils/llm/openai_polling/chat.py,sha256=WSQnKEJlZkJjS8CVq6RWouu7FCGgjw5Z5Aj2n1XkYsY,8049
 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=lGKuxTgvC_W5LvlNKXB5dL5ycqV6yRGVtzK_2mKOm6I,2217
-meutils/llm/openai_utils/common.py,sha256=UMZPB4__Xs1iCyccMFrEwTYn1lJJuNIGL-TfblUBM1g,10451
+meutils/llm/openai_utils/adapters.py,sha256=qZ0mzjHB9o6m6PwytCy1Ukr3GQZ7qqAjzbsAzryXp6k,2307
+meutils/llm/openai_utils/common.py,sha256=67HF4OHNRHfquerdgaHASdLFnHipwVpwUFnAhQQcaX0,10465
 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
@@ -725,9 +728,11 @@ meutils/logging/__init__.py,sha256=dKFrn05P8EAvvzxwiZnzPTT5r54yInwoO5cRyp2jFmQ,2
 meutils/logging/handlers.py,sha256=ngnVVN7wcFQZsSTnc-1nP5ZRCp-jbO1Qt7mjNfum_-8,701
 meutils/logging/log_utils.py,sha256=Sa5-Y4fWNTKQw2fIb1dbPgOypl6S6m7EOrbciSqEt5A,2937
 meutils/logging/logger.py,sha256=-J_tWYfAvPhSTshVWIiN-6zTZnjkFuwDfMtxUtuNkuY,6183
+meutils/math_utils/__init__.py,sha256=vg71MyiPyDCeFDwi42MLSfAFQl43a3uNLIgerY0eDRA,284
+meutils/math_utils/common.py,sha256=8MpWwgYLdvrpouTd9YJzcAwH-KNq58J4mY87dvd7e3Q,1086
 meutils/notice/__init__.py,sha256=BVbcBx4ks-BH_63gEcjMxL67oX1_aWdaM8r3TDo8Ogg,248
 meutils/notice/emails.py,sha256=TvC1xv3MpFC2HU0lTQW5SmNuj7UMlgjpsUImMp9jKOw,2403
-meutils/notice/feishu.py,sha256=i2YkuzFGRtaIeu7CRtkf2hHXzLr1-SJX-qRk-b_mO2E,4482
+meutils/notice/feishu.py,sha256=ydQuZgzmL3j5u0ySkLKShRemM4UYYOKa-vIsnezKWEU,4626
 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
@@ -820,7 +825,7 @@ meutils/schemas/fish_types.py,sha256=yC0ZFr3Ebh8F0OhtMsXYaIfNNvzOM2LT9YtKTaRoHGU
 meutils/schemas/hailuo_types.py,sha256=ubG6qIU506tq51UsURuwlPhtPNa49xHSoBzBtW7jg_0,7431
 meutils/schemas/haimian_types.py,sha256=jGu484UviAeBgy5OIUyRY4uYCxXfv16zDPqiJQr9wNQ,1364
 meutils/schemas/idphoto_types.py,sha256=nuHbpppejRSkJCiQ7YKx0Gnke0ShKZhOvdg0e7tk9-0,1074
-meutils/schemas/image_types.py,sha256=yOoY2cQJNkZCZBPg5Zzi03eS49YuO4XGtzECk-5Do24,15721
+meutils/schemas/image_types.py,sha256=NgHdKpZLLE4RLoEeDZnCwpFuMUVDJqUr0Q9ZNHW3oj0,16224
 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 +861,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=IdXSLPQl73AKtCC5jFI2w5O7WFuQcQJlN_pr8xiMKz0,2648
-meutils/schemas/oneapi/common.py,sha256=CPx0TZZTOHs0zk25VPZw6ELIqb7qG2S2WMAGVP7M7Wo,40544
+meutils/schemas/oneapi/common.py,sha256=0RFlX0yKc1uQ1pRa1vZwzLx2ywWXDYReKpo6waxN3kw,41461
 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
@@ -909,9 +914,9 @@ meutils/settings/__init__.py,sha256=jZc0NXPA9zIMcTAYypSQDxJqvXakyJ0ztK9ZMND2Q7U,
 meutils/settings/base.py,sha256=kb3QVS2eUFWyGgvegtSK4cqJFF76J1JctTSzCVqc1Mo,264
 meutils/settings/demo.py,sha256=Ht3t6LREQsKa5W2owNrOZNAoZfS-zItIFNwGhhPj-4k,484
 meutils/str_utils/Translator.py,sha256=tfvNQIeVCqmX9yW6jobeibDHG6X-XecSSAx9kJIFFyw,1258
-meutils/str_utils/__init__.py,sha256=oZh9gMfiOHvIf7ViDGhpYxxPoXyIbxCJaTWrNvuv-V0,9620
+meutils/str_utils/__init__.py,sha256=7rVAWR0bbxVvuWFwyC0ZedpY1QVSmrrLwLIfPAfjWqM,10238
 meutils/str_utils/json_utils.py,sha256=H65v9vZtXVuYyRCQAfyQ4KZzAecwjvjBH6qTy0hCDE4,4033
-meutils/str_utils/regular_expression.py,sha256=Cm9Hy5GoIcWejs2oElgw_prNCRnb_y8xUCW_Mt7rdIc,6128
+meutils/str_utils/regular_expression.py,sha256=HqEcPNyUHBBo7oJlwOFNpiFiO5NCXB8hD41nI1826fU,6161
 meutils/str_utils/__translater/__init__.py,sha256=mtDbKL_Qdkeq5VPVO1M4ejf9H8PzKM5h7iepqkBG8N0,277
 meutils/str_utils/__translater/tencent.py,sha256=1E_56l6-A49Yuz2ZrMKxt-QJfcf0xDYN2X0dg58Dytk,1408
 meutils/str_utils/__translater/translater.py,sha256=A_9NLVvkjzPd9omIcJGhux21D-gcCxemyrZ7o6uGx_Q,1238
@@ -985,9 +990,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.9.11.23.49.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.6.9.11.23.49.dist-info/METADATA,sha256=tp7eaJmWY34d6covaYTxM1WZ_yrw9-YMXK4jkJVXmX8,32833
-MeUtils-2025.6.9.11.23.49.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.6.9.11.23.49.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.6.9.11.23.49.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.6.9.11.23.49.dist-info/RECORD,,
+MeUtils-2025.6.12.17.34.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.6.12.17.34.4.dist-info/METADATA,sha256=0owD_l02jJ_WKeYpjPm60ER0d3dFUFISBwwTpxcCoxI,32833
+MeUtils-2025.6.12.17.34.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.6.12.17.34.4.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.6.12.17.34.4.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.6.12.17.34.4.dist-info/RECORD,,

examples/_openaisdk/openai_chatfire_usa.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : openai_siliconflow
+# @Time         : 2024/6/26 10:42
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+import os
+
+from meutils.pipe import *
+from openai import OpenAI
+from openai import OpenAI, APIStatusError
+
+
+client = OpenAI(
+    api_key="sk-5pMaS37pVZXH9s2dMwRK984QiwIRh9qQbQGnkv5fAFNaxMK6-16207",
+    base_url="https://usa.chatfire.cn"
+)
+
+
+
+r = client.images.generate(
+    model="cogview-3-plus",
+    prompt="a white siamese cat",
+    size="1024x1024",
+    extra_body={
+        ""
+    },
+    n=1,
+)

meutils/apis/fal/images.py

@@ -48,13 +48,13 @@ async def check(token, threshold: float = 0):
         return False
 
 
-async def generate(request: ImageRequest, token: Optional[str] = None):
+async def generate(request: ImageRequest, api_key: Optional[str] = None):
     """https://fal.ai/models/fal-ai/flux-pro/v1.1-ultra/api#api-call-submit-request
     """
     logger.debug(request)
 
     s = time.time()
-    token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True, check_token=check)
+    token = api_key or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True, check_token=check)
 
     arguments = request.model_dump(exclude_none=True)
     width, height = request.size.split("x")
@@ -153,13 +153,17 @@ async def generate(request: ImageRequest, token: Optional[str] = None):
         }
 
         if request.aspect_ratio:
+            arguments.pop("aspect_ratio", None)
+
             aspect_ratios = {'21:9', '16:9', '4:3', '3:2', '1:1', '2:3', '3:4', '9:16', '9:21'}
-            if request.aspect_ratio in aspect_ratios:
-                arguments["aspect_ratio"] = request.aspect_ratio
 
-        logger.debug(bjson(arguments))
+            if aspect_ratio := request.prompt2aspect_ratio(aspect_ratios): # 提示词优先级最高
+                arguments["aspect_ratio"] = aspect_ratio
 
+            elif request.aspect_ratio in aspect_ratios:
+                arguments["aspect_ratio"] = request.aspect_ratio
 
+        logger.debug(bjson(arguments))
 
     elif request.model.startswith("fal-ai/flux"):  # https://fal.ai/models/fal-ai/flux-pro/v1.1-ultra/api
 
@@ -264,14 +268,14 @@ if __name__ == '__main__':
 
     tokens = arun(get_series(FEISHU_URL))
     # tokens = ["578e143c-702d-46a1-8c02-d451bc3e155b:bb531a95f79c6026e7bc7ab676163c71"]
-    tokens = """
-30e9fe5c-75d0-4bdd-b11d-ff17dbe4bba5:3de8535e2fa4d9347e599a845cf3e7b8
-05c0b4f6-1443-4b28-aeff-771b65ebaebc:28df6b9b71430b05aca6b8bc7e873a4a
-    """.split()
-
-    r = []
-    for t in tokens:
-        if arun(check(t)):
-            r.append(t)
-
-    print('\n'.join(r))
+#     tokens = """
+# 30e9fe5c-75d0-4bdd-b11d-ff17dbe4bba5:3de8535e2fa4d9347e599a845cf3e7b8
+# 05c0b4f6-1443-4b28-aeff-771b65ebaebc:28df6b9b71430b05aca6b8bc7e873a4a
+#     """.split()
+#
+#     r = []
+#     for t in tokens:
+#         if arun(check(t)):
+#             r.append(t)
+#
+#     print('\n'.join(r))

meutils/apis/google/chat.py

@@ -62,9 +62,9 @@ tools = [
 # )
 
 class Completions(object):
-    def __init__(self, api_key: Optional[str] = None):
+    def __init__(self, api_key: Optional[str] = None, base_url: Optional[str] = None):
         self.api_key = api_key
-        self.base_url = "https://g.chatfire.cn"
+        self.base_url = base_url or "https://g.chatfire.cn"
         self.client = None  ####
 
     async def create_for_search(self, request: CompletionRequest):
@@ -278,7 +278,7 @@ class Completions(object):
         # 两轮即可连续编辑图片
 
         messages = []
-        for m in request.messages:
+        for m in request.messages or []:
             contents = m.get("content")
             if m.get("role") == "assistant":
                 assistant_content = str(contents)

meutils/apis/images/generations.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : generations
+# @Time         : 2025/6/11 17:06
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 统一收口
+
+from meutils.pipe import *
+from meutils.llm.clients import AsyncClient
+from meutils.llm.openai_utils import to_openai_params
+
+from meutils.schemas.image_types import ImageRequest
+
+from meutils.apis.fal.images import generate as fal_generate
+
+
+async def generate(
+        request: ImageRequest,
+        api_key: Optional[str] = None,
+        base_url: Optional[str] = None,
+):
+    if base_url:  # 优先级最高
+        client = AsyncClient(api_key=api_key, base_url=base_url)
+        return await client.images.generate(**to_openai_params(request))
+
+    if request.model.startswith("fal-ai"):
+        return await fal_generate(request, api_key)
+
+
+if __name__ == '__main__':
+    arun(generate(ImageRequest(model="flux", prompt="笑起来")))

meutils/apis/jimeng/images.py

@@ -54,6 +54,7 @@ async def create_draft_content(request: ImageRequest, token: str):
     main_component_id = str(uuid.uuid4())
     if (urls := parse_url(request.prompt)) or image_uri:  # 图生  # todo: image base64
         request.model = "high_aes_general_v20_L:general_v2.0_L"  # 2.1不支持图片编辑 某些不支持
+        request.model = "high_aes_general_v30l:general_v3.0_18b"
 
         if image_uri:
             pass
@@ -667,7 +668,7 @@ if __name__ == '__main__':
 
     # request = ImageRequest(prompt=prompt, size="2048*2048")
 
-    task = arun(create_task(request))
+    # task = arun(create_task(request))
     # task = arun(create_task(request, "d2d142fc877e696484cc2fc521127b36"))
     # task = arun(create_task(request, "d2d142fc877e696484cc2fc521127b36"))
 
@@ -683,4 +684,4 @@ if __name__ == '__main__':
 
     # arun(get_task("16132262728706", "d2d142fc877e696484cc2fc521127b36"))
 
-    # arun(generate(request))
+    arun(generate(request))

meutils/apis/volcengine_apis/videos.py

@@ -0,0 +1,129 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : videos
+# @Time         : 2025/6/11 15:13
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+from meutils.decorators.retry import retrying
+from meutils.llm.clients import AsyncClient
+from meutils.schemas.openai_types import CompletionRequest
+
+from meutils.db.redis_db import redis_aclient
+from meutils.llm.check_utils import check_token_for_volc
+from meutils.config_utils.lark_utils import get_next_token_for_polling, get_series
+
+from fastapi import APIRouter, File, UploadFile, Query, Form, Depends, Request, HTTPException, status, BackgroundTasks
+
+# Please activate
+FEISHU_URL = "https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?sheet=8W6kk8"
+
+
+@retrying(max_retries=5)
+async def create_task(request: CompletionRequest, api_key: Optional[str] = None):
+    api_key = api_key or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True, check_token=check)
+
+    payload = {
+        "model": "doubao-seedance-1-0-pro-250528",
+        "content": [
+            {
+                "type": "text",
+                "text": "无人机以极快速度穿越复杂障碍或自然奇观，带来沉浸式飞行体验  --resolution 1080p  --duration 5 --camerafixed false"
+            },
+            {
+                "type": "image_url",
+                "image_url": {
+                    "url": "https://ark-project.tos-cn-beijing.volces.com/doc_image/seepro_i2v.png"
+                }
+            }
+        ]
+    }
+    payload = request.model_dump(exclude_none=True)
+    client = AsyncClient(base_url="https://ark.cn-beijing.volces.com/api/v3", api_key=api_key)
+
+    response = await client.post(
+        path="/contents/generations/tasks",
+        cast_to=object,
+        body=payload
+    )
+
+    if task_id := response.get('id'):
+        await redis_aclient.set(task_id, api_key, ex=7 * 24 * 3600)
+
+    return response  # {'id': 'cgt-20250611152553-r46ql'}
+
+
+async def get_task(task_id: str):
+    token = await redis_aclient.get(task_id)  # 绑定对应的 token
+    token = token and token.decode()
+    if not token:
+        raise HTTPException(status_code=404, detail="TaskID not found")
+
+    client = AsyncClient(base_url="https://ark.cn-beijing.volces.com/api/v3", api_key=api_key)
+
+    response = await client.get(
+        path=f"/contents/generations/tasks/{task_id}",
+        cast_to=object,
+    )
+
+    return response
+
+
+# 执行异步函数
+if __name__ == "__main__":
+    # api_key = "07139a08-e360-44e2-ba31-07f379bf99ed"  # {'id': 'cgt-20250611164343-w2bzq'} todo 过期调用get
+
+    api_key = "68948c3a-94cd-48b2-aebb-1dcd26cee5d8"  # 欠费
+
+    request = CompletionRequest(
+        model="doubao-seedance-1-0-pro-250528",
+        content=[
+            {
+                "type": "text",
+                "text": "无人机以极快速度穿越复杂障碍或自然奇观，带来沉浸式飞行体验  --resolution 1080p  --duration 5 --camerafixed false"
+            },
+
+            {
+                "type": "image_url",
+                "image_url": {
+                    "url": "https://ark-project.tos-cn-beijing.volces.com/doc_image/seepro_i2v.png"
+                }
+            }
+        ]
+    )
+    # r = arun(create_task(request, api_key))
+    r = {'id': 'cgt-20250612172542-6nbt2'}
+
+    arun(get_task(r.get('id')))
+
+    # arun(get_task("cgt-20250611164343-w2bzq"))
+
+    # arun(get_task("cgt-20250611193213-tcqth"))
+
+"""
+openai.NotFoundError: Error code: 404 - {'error': {'code': 'ModelNotOpen', 'message': 'Your account 2107813928 has not activated the model doubao-seedance-1-0-pro. Please activate the model service in the Ark Console. Request id: 021749718307793fc1441381f8ed755824bb9d58a45ee6cb04068', 'param': '', 'type': 'NotFound'}}
+
+
+curl -X POST https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer 29ce2c44-981d-4b7b-b0f5-f8a39586fd06" \
+  -d '{
+    "model": "doubao-seaweed-241128",
+    "content": [
+        {
+            "type": "text",
+            "text": "女孩抱着狐狸，女孩睁开眼，温柔地看向镜头，狐狸友善地抱着，镜头缓缓拉出，女孩的头发被风吹动  --resolution 720p --duration 5"
+        },
+        {
+            "type": "image_url",
+            "image_url": {
+                "url": "https://ark-project.tos-cn-beijing.volces.com/doc_image/i2v_foxrgirl.png"
+            }
+        }
+    ]
+}'
+"""

meutils/data/VERSION

@@ -1 +1 @@
-2025.06.09.11.23.49
+2025.06.12.17.34.04

meutils/llm/check_utils.py

@@ -218,7 +218,7 @@ if __name__ == '__main__':
 
     check_valid_token = partial(check_token_for_siliconflow, threshold=-1)
 
-    arun(check_valid_token("sk-tythaoctwemlhkytdlmjcegtnufvhqgmwlncgmoxixdyqoxx"))
+    # arun(check_valid_token("sk-tythaoctwemlhkytdlmjcegtnufvhqgmwlncgmoxixdyqoxx"))
 
     pass
     # arun(check_valid_token("sk-LlB4W38z9kv5Wy1c3ceeu4PHeIWs6bbWsjr8Om31jYvsucRv", threshold=0.1))
@@ -248,4 +248,4 @@ if __name__ == '__main__':
 
     # arun(check_token_for_ppinfra("sk_F0kgPyCMTzmOH_-VCEJucOK8HIrbnLGYm_IWxBToHZQ"))
 
-    # arun(check_token_for_volc(os.getenv("VOLC_API_KEY")))
+    arun(check_token_for_volc("07139a08-e360-44e2-ba31-07f379bf99ed"))

meutils/llm/openai_utils/adapters.py

@@ -22,7 +22,10 @@ async def stream_to_nostream(
 async def chat_for_image(
         generate: Callable,
         request: CompletionRequest,
+        api_key: Optional[str] = None,
 ):
+    generate = partial(generate, api_key=api_key)
+
     if not request.stream or request.last_user_content.startswith(  # 跳过nextchat
             (
                     "hi",

meutils/llm/openai_utils/common.py

@@ -178,7 +178,7 @@ async def ppu_flow(
     else:  # 不计费
         yield
 
-
+# 按量计费
 def create_chat_completion(
         completion: Union[str, Iterable[str]],
         redirect_model: str = '',

meutils/math_utils/__init__.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : __init__.py
+# @Time         : 2025/6/10 09:11
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.math_utils.common import *

meutils/math_utils/common.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : common
+# @Time         : 2025/6/10 09:11
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+
+import math
+
+
+def calculate_min_resolution(w, h):
+    """
+    计算给定宽高比的最小像素公约数分辨率（宽高互质）
+
+    参数:
+        aspect_ratio (str): 宽高比字符串，例如"16:9"
+
+    返回:
+        tuple: (宽, 高) 的元组，整数类型
+    """
+    # 分割字符串并转换为整数
+    w, h = map(int, (w, h))
+
+    # 计算最大公约数
+    gcd_val = math.gcd(w, h)
+
+    # 化简为互质的整数比
+    width = w // gcd_val
+    height = h // gcd_val
+
+    return width, height
+
+
+def size2aspect_ratio(size):
+    if 'x' in size:
+        w, h = size.split('x')
+        w, h = calculate_min_resolution(w, h)
+        return f"{w}:{h}"  # aspect_ratio
+
+    elif ':' in size:
+        return size
+
+
+if __name__ == '__main__':
+    print(size2aspect_ratio("1920x1080"))
+    print(size2aspect_ratio("1920:1080"))

meutils/notice/feishu.py

@@ -22,6 +22,8 @@ AUDIO = "https://open.feishu.cn/open-apis/bot/v2/hook/80c2a700-adfa-4b9b-8e3f-00
 FILES = "https://open.feishu.cn/open-apis/bot/v2/hook/075fb2fa-a559-4a7e-89ac-3ab9934ff15c"
 KLING = "https://open.feishu.cn/open-apis/bot/v2/hook/e9a850c2-d171-4637-b976-ee93f7654c40"
 
+VOLC = "https://open.feishu.cn/open-apis/bot/v2/hook/d487ce4f-3c2b-44db-a5b4-7ee4c5e03b4f"
+
 
 @background_task
 def send_message(
@@ -119,13 +121,15 @@ send_message_for_http = partial(send_message, url=http_feishu_url)
 try_catch_feishu_url = "https://open.feishu.cn/open-apis/bot/v2/hook/887fe4d3-8bcd-4cfb-bac9-62f776091ca2"
 send_message_for_try_catch = partial(send_message, url=try_catch_feishu_url)
 
+send_message_for_volc = partial(send_message, url=VOLC)
+
 if __name__ == '__main__':
     # send_message("xxx", title=None)
     send_message(None, title=None)
 
     # send_message_for_images("xxxxxxxx", title=None)
 
-    send_message_for_try_catch("xxxxxxxx")
+    send_message_for_volc("xxxxxxxx")
     # @catch(task_name='这是一个任务名')
     # def f():
     #     time.sleep(3)