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

meutils/apis/hailuoai/videos.py

@@ -335,7 +335,7 @@ async def get_task(task_id: str, token: str):
         response = VideoResponse(
             task_id=task_id,
             base_resp=data.get('statusInfo', {}),
-            videos=data.get('data', {}).get("videos")
+            videos=(data.get('data') or {}).get("videos")
         )
         return response
 

meutils/apis/images/recraft.py

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

meutils/apis/jimeng/common.py

@@ -89,8 +89,8 @@ async def get_credit(token):
 async def check_token(token, threshold: int = 1):
     try:
         response = await get_credit(token)
+        logger.debug(bjson(response))
         credits = sum(response['data']['credit'].values())
-        # logger.debug(credits)
         return credits >= threshold
     except Exception as e:
         return False
@@ -244,8 +244,11 @@ async def create_draft_content(request: ImageRequest, token: str):
 if __name__ == '__main__':
     token = "693701c43e477b7c405cc7e2fef0ddbd"
     token = "eb4d120829cfd3ee957943f63d6152ed"
-    arun(get_credit(token))
-    # arun(check_token(token))
+    token = "dcf7bbc31faed9740b0bf748cd4d2c74"
+    token = "38d7d300b5e0a803431ef88d8d2acfef"
+    token = "916fed81175f5186a2c05375699ea40d"
+    # arun(get_credit(token))
+    arun(check_token(token))
 
     # arun(get_upload_token(token))
     #

meutils/apis/jimeng/images.py

@@ -70,8 +70,19 @@ async def get_task(task_id, token):
         response = await client.post(url, json=payload)
         response.raise_for_status()
         data = response.json()
+        logger.debug(bjson(data))
         # {'ret': '1015', 'errmsg': 'login error', 'systime': '1734524280', 'logid': '20241218201800AC3267447B287E9E6C46', 'data': None}
-        item_list = (data.get("data") or {}).get(task_id, {}).get("item_list")
+        task_info = (data.get("data") or {}).get(task_id, {})
+        item_list = task_info.get("item_list")  # "status": 30,
+
+        status_code = task_info.get("status")
+        logger.debug(f"status: {status_code}")
+
+        """
+        "status": 30, # 内容审核
+        "status": 50,
+        """
+
         image_data = map(lambda x: x.get("image", {}).get("large_images"), item_list)
 
         task_data = sum(image_data, []) | xmap_(lambda x: {"url": x.get("image_url")})
@@ -79,18 +90,29 @@ async def get_task(task_id, token):
         return TaskResponse(
             task_id=task_id,
             data=task_data,
-            message=data.get("errmsg"),
-            status="success" if task_data else None,
+            message=data.get("errmsg") if status_code!=30 else "触发内容审核451",
+            status="success" if item_list else 'processing',
+            code=status_code,
         )
 
 
+async def generate(request: ImageRequest):
+    task_response = await create_task(request)
+    for i in range(1, 10):
+        await asyncio.sleep(max(10 / i, 1))
+        response = await get_task(task_response.task_id, task_response.system_fingerprint)
+        logger.debug(response)
+        if data := response.data:
+            return {"data": data}
+
+
 if __name__ == '__main__':
-    token = "693701c43e477b7c405cc7e2fef0ddbd"
+    token = "eb4d120829cfd3ee957943f63d6152ed"
 
-    request = ImageRequest(prompt="一个漂亮的姑娘", size="1024x1024")
+    # request = ImageRequest(prompt="做一个圣诞节的海报", size="1024x1024")
     # request = ImageRequest(prompt="https://oss.ffire.cc/files/kling_watermark.png 让她带上墨镜", size="1024x1024")
 
-    arun(create_task(request))
+    # task = arun(create_task(request))
 
     # task_id = "10040025470722"
 
@@ -103,3 +125,16 @@ if __name__ == '__main__':
     # task_id = "10082971040514"
     #
     # arun(get_task(task_id, token))
+
+    # arun(get_task(task.task_id, task.system_fingerprint))
+
+    task_id = "10184295086338"
+    system_fingerprint = "eb4d120829cfd3ee957943f63d6152ed"
+
+    t1 = ("10184295086338", "eb4d120829cfd3ee957943f63d6152ed")
+    t2 = ("10184877310722", "dcf7bbc31faed9740b0bf748cd4d2c74")
+    t3 = ("10186352959490", "eb4d120829cfd3ee957943f63d6152ed")
+
+    arun(get_task(*t3))
+
+    # arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))

meutils/apis/kling/kolors_virtual_try_on.py

@@ -10,10 +10,13 @@
 import jwt
 
 from meutils.pipe import *
-from meutils.schemas.task_types import TaskResponse  ############# 根据这个重构
+from meutils.schemas.task_types import TaskResponse
+from meutils.schemas.image_types import ImageRequest, ImagesResponse
+
 from meutils.schemas.kling_types import API_BASE_URL, TryOnRequest, TaskResponse
 from meutils.config_utils.lark_utils import get_next_token_for_polling
 from meutils.decorators.retry import retrying
+from meutils.str_utils.regular_expression import parse_url
 
 FEISHU_URL = "https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?sheet=cjTepf"
 
@@ -39,7 +42,7 @@ def encode_jwt_token(token):
 ######################################################################
 @alru_cache(ttl=3600)
 @retrying(title=__name__)
-async def create_task(request: TryOnRequest, token: Optional[str] = None):  ###### 所有的 TaskResponse标准化
+async def create_task(request: TryOnRequest, token: Optional[str] = None):
     token = token or await get_next_token_for_polling(FEISHU_URL)
     token = encode_jwt_token(token)
 
@@ -68,8 +71,23 @@ async def get_task(task_id, token):
         return TaskResponse(**data)
 
 
+async def generate(request: ImageRequest):
+    human_image, cloth_image = parse_url(request.prompt)  # 两张图片
+
+    request = TryOnRequest(human_image=human_image, cloth_image=cloth_image)
+    task_response = await create_task(request)
+
+    for i in range(1, 10):
+        await asyncio.sleep(max(10 / i, 1))
+
+        response = await get_task(task_response.data.task_id, task_response.system_fingerprint)
+        if task_result := response.data.task_result:
+            images = task_result.get('images', [])
+            return ImagesResponse(data=images)
+
+
 if __name__ == '__main__':
-    request = TryOnRequest()
+    # request = TryOnRequest()
     # arun(create_task(request))
     # {
     #     "code": 0,
@@ -83,5 +101,11 @@ if __name__ == '__main__':
     #     }
     # }
 
-    token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJkMmU1NmZkY2ZiODY0MmZmYWEyMjZlZWIxNzY4MzMyMiIsImV4cCI6MTczMzE4OTI4OSwibmJmIjoxNzMzMTAyODg0fQ.YjB792REbuFaUoyUXvd5bpI76_0PBWawDHDjPHOBA5Q'
-    arun(get_task("CjiL9mdJhswAAAAAAG2C6g", token))
+    # token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJkMmU1NmZkY2ZiODY0MmZmYWEyMjZlZWIxNzY4MzMyMiIsImV4cCI6MTczMzE4OTI4OSwibmJmIjoxNzMzMTAyODg0fQ.YjB792REbuFaUoyUXvd5bpI76_0PBWawDHDjPHOBA5Q'
+    # arun(get_task("CjiL9mdJhswAAAAAAG2C6g", token))
+
+    human_image: str = "https://oss.ffire.cc/files/try-on.png"
+    cloth_image: str = "https://oss.ffire.cc/files/x.png"
+
+    request = ImageRequest(prompt=f"{human_image}\n{cloth_image}")
+    arun(generate(request))

meutils/apis/oneapi/user.py

@@ -91,10 +91,10 @@ async def put_user(payload, add_money: float = 0):
 
 if __name__ == '__main__':
     # api-key => get_one_log => get_user => put_user
-    # arun(get_user(814))
+    arun(get_user(814))
     # payload = arun(get_user(924))
     # print(payload)
     # arun(put_user(payload, -1))
 
-    arun(get_api_key_log('sk-gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv'))
-    # arun(get_user_money("sk-1UNhOrvuJ4PeBBpsB202577c14114f7fA234F32d3e8dF767"))
+    # arun(get_api_key_log('sk-gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv'))
+    # arun(get_user_money("sk-gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv"))

meutils/apis/oneapi/utils.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : utils
+# @Time         : 2024/12/25 18:13
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+
+from meutils.caches.redis_cache import cache
+from meutils.db.orm import select_first
+from meutils.schemas.db.oneapi_types import OneapiTask, OneapiUser, OneapiToken
+
+
+# engine
+
+
+@cache()
+async def token2user(api_key: str):
+    logger.debug(api_key)
+    filter_kwargs = {
+        "key": api_key[3:],
+    }
+
+    return await select_first(OneapiToken, filter_kwargs)
+
+
+if __name__ == '__main__':
+    arun(token2user('sk-q3uMFm0TFWi5lBQVhGwAWKup28j4omr9vThL4V5ynvdWdeZ8'))

meutils/async_utils/common.py

@@ -10,7 +10,7 @@
 
 import inspect
 import asyncio
-from typing import Union, Any, Coroutine, AsyncIterator, Iterator, Iterable, AsyncIterable
+from typing import Union, Any, Coroutine, AsyncIterator, Iterator, Iterable, AsyncIterable, Optional, Callable
 
 import numpy as np
 import pandas as pd
@@ -146,6 +146,16 @@ async def arequest(url, method='get', payload=None, **client_params):
         return resp
 
 
+async def poll(fn, n: int = 30, sleep_fn: Optional[Callable] = None):
+    if sleep_fn is None:
+        sleep_fn = lambda i: max(n / (i + 1), 1)  # 预估大概 2~3 *n
+
+    for i in range(n):
+        await asyncio.sleep(sleep_fn(i))
+        if _ := await fn():  # 跳出
+            return _
+
+
 if __name__ == '__main__':
     from meutils.pipe import *
 

meutils/common.py

@@ -31,6 +31,8 @@ import warnings
 warnings.filterwarnings("ignore")
 
 import functools
+from functools import wraps
+
 import argparse
 import traceback
 import threading

meutils/config_utils/lark_utils/common.py

@@ -382,5 +382,5 @@ if __name__ == '__main__':
     # with timer():
     #     token = arun(get_next_token(feishu_url))
 
-    FEISHU_URL = "https://xchatllm.feishu.cn/sheets/XfjqszII3hZAEvtTOgecOgv2nye?sheet=c14b34"
-    print(arun(get_series(FEISHU_URL)))
+    # FEISHU_URL = "https://xchatllm.feishu.cn/sheets/XfjqszII3hZAEvtTOgecOgv2nye?sheet=c14b34"
+    # print(arun(get_series(FEISHU_URL)))

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.23.16.36.51
+2024.12.31.17.51.53

meutils/data/oneapi/NOTICE.md

@@ -31,6 +31,21 @@
 
 </details>
 
+## 2024-12-27
+  - deepseek-v3
+  - deepseek-r1：deepseek-v3的思考模型
+  - deepseek-search：deepseek-v3的联网模型
+
+## 2024-12-24
+- 上线新模型
+  - doubao-pro-256k：相比Doubao-pro-128k/240628，长文任务效果显著提升10%以上，要点提取、字数遵循、多轮对话上文记忆等能力大幅提升
+  - [qvq-72b-preview](https://mp.weixin.qq.com/s/WzL7tbFUZOgE2IFMeHT-sQ)：Qwen开源视觉推理模型QVQ，更睿智地看世界！
+
+- 增加gemini-2.0配额，支持多模型，默认分组可用
+    - "gemini-2.0-flash"
+    - "gemini-2.0-flash-exp"
+
+
 ## 2024-12-20
 - 修复SunoV4无水印版本
   - [异步任务接口文档](https://api.chatfire.cn/docs/api-246593467)

meutils/db/orm.py

@@ -97,6 +97,16 @@ async def update_or_insert(entity, filter_kwargs: Optional[dict] = None, update_
             return data
 
 
+async def select_first(entity, filter_kwargs: Optional[dict] = None):
+    async with AsyncSession(engine) as session:
+        statement = select(entity).filter_by(**filter_kwargs)
+
+        if result := await session.exec(statement):
+            _ = result.first()
+            logger.debug(_)
+            return _
+
+
 if __name__ == '__main__':
     pass
 
@@ -124,21 +134,46 @@ if __name__ == '__main__':
     #
     # arun(create_db_and_tables())
 
-    from meutils.schemas.db.oneapi_types import OneapiTask
+    from meutils.schemas.db.oneapi_types import OneapiTask, OneapiUser, OneapiToken
+
+    # filter_kwargs = {
+    #     "task_id": "888",
+    # }
+    #
+    #
+    # async def main():
+    #     async with AsyncSession(engine) as session:
+    #         statement = select(OneapiTask).filter_by(**filter_kwargs)
+    #         result = await session.exec(statement)
+    #         logger.debug(result)
+    #         if result:
+    #             logger.debug(result.first())
+    #         # await session.commit()
+    #
+    #
+    # arun(update_or_insert(OneapiTask, filter_kwargs))
 
     filter_kwargs = {
-        "task_id": "888",
+        "id": "1",
     }
 
 
     async def main():
         async with AsyncSession(engine) as session:
-            statement = select(Tasks).filter_by(**filter_kwargs)
+            # filter_kwargs = {
+            #     "id": "1",
+            # }
+            # statement = select(OneapiUser).filter_by(**filter_kwargs)
+
+            filter_kwargs = {
+                "key": "gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv",
+            }
+            statement = select(OneapiToken).filter_by(**filter_kwargs)
+
             result = await session.exec(statement)
-            logger.debug(result)
             if result:
                 logger.debug(result.first())
             # await session.commit()
 
 
-    arun(update_or_insert(Tasks, filter_kwargs))
+    arun(main())

meutils/db/redis_db.py

@@ -28,9 +28,6 @@ if REDIS_URL := os.getenv("REDIS_URL"):
     # redis_client = Redis.from_url(REDIS_URL, **kwargs)
     # redis_aclient = AsyncRedis.from_url(REDIS_URL, **kwargs)
 
-
-
-
 else:
     redis_client = Redis(**kwargs)  # decode_responses=True
     redis_aclient = AsyncRedis(**kwargs)
@@ -76,9 +73,15 @@ if __name__ == '__main__':
     #
     # arun(redis_aclient.select(1))
 
+    # async def main():
+    #     r = await redis_aclient.select(1)
+    #     return await redis_aclient.get(task_id)
+    #
+    #
+    # arun(main())
+
     async def main():
-        r = await redis_aclient.select(1)
-        return await redis_aclient.get(task_id)
+        return await redis_aclient.lpop("redis_key")
 
 
     arun(main())

meutils/decorators/polling.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : polling
+# @Time         : 2024/12/26 14:08
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+import time
+
+from meutils.pipe import *
+
+
+def poll(n: int = 30, sleep_fn: Optional[Callable] = None):
+    if sleep_fn is None:
+        sleep_fn = lambda i: max(n / (i + 1), 1)  # 预估大概 2~3 *n
+
+    def decorator(fn):
+        is_coroutine = inspect.iscoroutinefunction(fn)
+
+        @wraps(fn)
+        async def wrapper(*args, **kwargs):
+            for i in range(n):
+                await asyncio.sleep(sleep_fn(i))
+                # 根据函数类型选择调用方式
+                result = await fn(*args, **kwargs) if is_coroutine else fn(*args, **kwargs)
+                if result:  # 跳出
+                    return result
+            return None
+
+        return wrapper
+
+    return decorator
+
+
+if __name__ == '__main__':
+    @poll(n=5)
+    async def check_something():
+        # 你的检查逻辑
+
+        logger.debug(time.ctime())
+        return {"status": "ok"}
+
+
+    arun(check_something())

meutils/init/evn.py

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

meutils/llm/completions/modelscope.py

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

meutils/llm/completions/rag/fire.py

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

meutils/llm/openai_utils/common.py

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

meutils/request_utils/ark.py

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

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

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