MeUtils 2025.5.14.16.46.40__py3-none-any.whl → 2025.5.27.14.55.19__py3-none-any.whl

meutils/apis/google/gemini_sdk.py

@@ -35,6 +35,28 @@ client = genai.Client(
     )
 )
 
+GOOGLE_CREDENTIALS_JSON="""{
+  "type": "service_account",
+  "project_id": "mystic-gradient-460414-s3",
+  "private_key_id": "074dc3f29316a8d663c6af1eb3e9b60f9c440230",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtAW0wwjk0GheH\nF1PEps5Q+smR9Fc9lBcK6R5cTpJo0aNC/9xvz6yqFXYpTjTqwUYK8EH62RFP4K9g\neZRTAQdF4qXP7S1cPsyeBEtk2whsjUIThS0dK1FZzOM3CLM+JRUU9AJdkQWuY4pT\ngfcZ+x5KtfbbTZQ3rf91ZPbaJID/cEd1yjiquhSWG6UGYxN09YPEmPOMAUSBmphI\nWhPdMLih3lghxHRbIhXF2y8uTAIVifyT4xFb7C9IT4NphMt/Ee5hpN+GzlveNsPK\n6UdO7XBgpWX+GjxCoxKgvuvpsJxBprv87BVar4jOFS8YaIMBaSKV37ZKDs1/JNaa\nYn0nCepJAgMBAAECggEABCMNOH3idoqbrqsqAYEwHItcq9DtD5/Fi8kehNxLn7ZI\nmkLqQ2GyyifkeREhzo3D1iHf4AbWBUQVCYBqwa/b+8mzR5UvMR4e0DX/1AfxTAA2\nOOeFuEV3hudRdRjQCW/DUOqTTme3/C8s6PmJ/jztIOH4Rs70eP7gBY9+ICIAlCsR\n258PYn3AkLq6u3f0lYVeafV2I52aX861FlQTGNfTg3Npixx0ygWKrppX67bhlzm8\nyedpkCc3S+ZIjfYAG8mO57vYWUi0oPA6TDbzAQBHqq1Su2+WvsCaqpJ3PtPVigSj\n/KSsUmCXGMXDl3/yRBvuzV6SMlpylBx72SJY8Pn0gQKBgQDz9f6+58l7BBG1fFKe\nYJdRViuGjNG6pKfXnPFaZEpwwgJx2C4chkEKBB6ge6hiIrk9CCE365xjVl82l99x\nqukOWf6dsW6nX7U4oMNQ53ZMPpCdHvaFI9E/B9Exl01GGx61Ajx88NMFVXDYbWa+\n+gKZ6DFeMukMwqWAPqRmMbp8gQKBgQC1iwn6mbsxiSteZ9SzfE+rPb9FkxC/W0VO\nQMBwTVD52M5STZbuXj+oRP1DXFEz1HWNWhrX2w92faLgaZQv5rbXXXkI5zD1Ymlo\n82yjxjoe2fs79GzuQjs5pVzr9Gd7qjqDiHQETV67uqkjjjrBDxtnh2pBJrQ7NAX4\nWQ5YvO2pyQKBgQDlWaLAftAf4ldzswlI863OPaB1wfV57koMnfMY86g4EWyS8pWH\nI4AJlo3kedx3RgW3pujz1YEUsqKYhHcAOZkYcOq5/ZD1sTiBoEF+0duZGkiCLhW8\nXUveYc79PCzdd6mKqiuLmiwIm6aXEWLCr++6GVwwHtSRtnw48KtFmAKmAQKBgEHn\n6AeCJ+Mj2Qq8xwsh5gpUsEuhyEKv78ko2LPsXalWfBCE+nYu4Q1Ffmwl55TZXJOk\nUnpqnIJ3udmeep2pNFebJ4WD6NIsl/fx507Nd+wbVom9go48nSOgVMuUPr02X2fA\n8d1d+TZN3Xl6+Pl9coVzM6/TTTrw9/ng2sR8UguBAoGBAJ6SMKAqa+yjZezDUkC3\nUkmywTRX9vfhH5mDv+kj1MHW++hLYhLE7WRNtMhgf9idLEQBbw7jzoS4wmx9jtPu\nP0mUh67fjctbtR6uxbuZl5sY3eMx03hmv5H33aazhMA7mQXjMPS7gXTIxMoE2Wmw\nFpJyddFAuwMDZecDr74xNU9b\n-----END PRIVATE KEY-----\n",
+  "client_email": "xxxxx-350@mystic-gradient-460414-s3.iam.gserviceaccount.com",
+  "client_id": "115968049812880579488",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/xxxxx-350%40mystic-gradient-460414-s3.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}"""
+
+
+client = genai.Client(
+    vertexai=True,
+    credentials=GOOGLE_CREDENTIALS_JSON,
+    http_options=HttpOptions(
+        base_url="https://all.chatfire.cc/genai"
+    )
+)
 if __name__ == '__main__':
     model = "gemini-2.0-flash-exp-image-generation"
     model = "gemini-2.5-flash-preview-04-17"
@@ -192,3 +214,15 @@ curl "https://all.chatfire.cc/genai/v1beta/models/gemini-2.5-flash-preview-04-17
   }
 }'
 """
+
+from litellm import completion
+import os
+
+# auth: run 'gcloud auth application-default'
+os.environ["VERTEXAI_PROJECT"] = "hardy-device-386718"
+os.environ["VERTEXAI_LOCATION"] = "us-central1"
+
+response = completion(
+  model="vertex_ai/gemini-1.5-pro",
+  messages=[{ "content": "Hello, how are you?","role": "user"}]
+)

meutils/apis/hailuoai/images.py

@@ -374,7 +374,9 @@ async def generate(request: ImageRequest):
     for i in range(1, 10):
         await asyncio.sleep(max(10 / i, 1))
         if urls := await get_task(task_response.task_id, task_response.system_fingerprint):
-            return ImagesResponse(data=dict(zip(["url"] * len(urls), urls)))
+            logger.debug(urls)
+
+            return ImagesResponse(data=[{"url": url} for url in urls])
 
 
 if __name__ == '__main__':  # 304752356930580482
@@ -414,15 +416,17 @@ if __name__ == '__main__':  # 304752356930580482
     request = ImageRequest(
         model="hailuo-image-01",
 
-        # prompt="a cat",  # 307145017365086216
-        prompt="https://oss.ffire.cc/files/kling_watermark.png 哭起来",
+        prompt="a cat",  # 307145017365086216
+        # prompt="https://oss.ffire.cc/files/kling_watermark.png 哭起来",
         # first_frame_image="https://oss.ffire.cc/files/kling_watermark.png"  # 307173162217783304
     )
 
-    r = arun(create_task(request, token=token))
+    # r = arun(create_task(request, token=token))
     # arun(get_task(task_id=r.task_id, token=r.system_fingerprint))
 
     # arun(get_access_token(token))
+
+    arun(generate(request))
     #
     #
     # data = {

meutils/apis/images/recraft.py

@@ -41,8 +41,10 @@ async def get_access_token(token: str):
         logger.debug(response.json())
         return response.json()["accessToken"]
 
+
 @retrying()
-async def edit_image(image, task: Literal["vectorize", "super_resolution",] = "super_resolution", response_format: Literal["url", "base64"] = "url"):
+async def edit_image(image, task: Literal["vectorize", "super_resolution",] = "super_resolution",
+                     response_format: Literal["url", "base64"] = "url"):
     token = await get_next_token_for_polling(
         feishu_url=FEISHU_URL,
         check_token=check_token,
@@ -141,14 +143,17 @@ async def generate(request: RecraftImageRequest, token: Optional[str] = None):
 
 # eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDY5MjY2MjQsInVzZXIiOnsiaWQiOiIzNjIzNjMwNDU2OTAxNTkxMDciLCJuYW1lIjoibWtybiBhbmJ2IiwiYXZhdGFyIjoiIiwiZGV2aWNlSUQiOiIzMjg2MDA4MzYzNzEwMzQxMTgiLCJpc0Fub255bW91cyI6ZmFsc2V9fQ.JyCL0Be9YsEBlLVIeSpqDv3bTKAlU9Jsds3y5cJKXa4
 async def check_token(token, threshold: float = 1):
-    if not isinstance(token, str):
+    if isinstance(token, list):
         tokens = token
         r = []
+        logger.debug(tokens)
         for batch in tqdm(tokens | xgroup(32)):
             bools = await asyncio.gather(*map(check_token, batch))
             r += list(itertools.compress(batch, bools))
         return r
+
     try:
+
         access_token = await get_access_token(token)
         headers = {"Authorization": f"Bearer {access_token}"}
 
@@ -200,10 +205,8 @@ if __name__ == '__main__':
     # with timer():
     #     arun(generate(request, token=token))
 
-    with timer():
-        arun(edit_image("https://oss.ffire.cc/files/kling_watermark.png"))
+    # with timer():
+    #     arun(edit_image("https://oss.ffire.cc/files/kling_watermark.png"))
     # tokens = [token]
-    #
-    # tokens = list(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0]) | xfilter_
-    # #
-    # r = arun(check_token(tokens[:5]))
+    tokens = list(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0]) | xfilter_
+    r = arun(check_token(tokens))

meutils/apis/jimeng/audio.py

@@ -17,7 +17,8 @@ from meutils.schemas.jimeng_types import BASE_URL
 
 VOICE_MAPPING = {
     # 带情绪
-    "柔美女友": "7382552865023201819",  # "happy", "angry", "fear", "surprise", "coldness", "disgust", "excited", "hate"
+    "柔美女友": "7382552865023201819",
+    # "happy", "angry", "fear", "surprised", "coldness", "disgust", "excited", "hate"
     "妩媚女生": "7459778019725414962",  # "happy", "angry", "fear", "surprise"
     "京腔小爷": "7382048889659986458",  # "joy", "angry", "surprise", "disgust"
 
@@ -117,25 +118,28 @@ async def create_tts(request: TTSRequest):  # audio.speech.create
         "audio_config": {
             "format": "mp3",
             "sample_rate": 24000,
-            "speech_rate": 0,
+            "speech_rate": request.speed or 0,
             "pitch_rate": 0,
             "enable_timestamp": True,
 
         },
         "id_info": {
-            "id": VOICE_MAPPING.get(request.voice, request.voice) or "7459778019725414962",
+            "id": effect_id,
             "item_platform": 1
         }
     }
-    if request.emotion:
-        if request.voice == "京腔小爷" and request.emotion == "happy":
+    if request.instructions and request.voice in {"柔美女友", "妩媚女生", "京腔小爷", }:
+        if request.voice == "京腔小爷" and request.instructions == "happy":
             request.emotion = "joy"
 
+        if request.voice == "柔美女友" and request.instructions == "surprise":
+            request.emotion = "surprised"
+
         payload["audio_config"].update(
             {
                 # 情绪
                 "emotion_scale": 5,
-                "emotion": request.emotion,
+                "emotion": request.instructions,
             }
         )
 
@@ -162,22 +166,26 @@ async def create_tts(request: TTSRequest):  # audio.speech.create
 
 
 if __name__ == '__main__':
-    text = """
-我们不能迟到早退刷脸打卡 中午休息一个小时 进出都得打卡
+    text = """Chatfire tts-pro支持多种音色：
+柔美女友 妩媚女生 京腔小爷 猴哥 熊二 如来佛祖 咆哮哥 四郎 懒小羊 TVB女声 动漫小新 紫薇 黛玉 顾姐 动漫海绵 云龙哥 容嬷嬷 华妃 河南小哥 湾区大叔 广西老表 山东小哥 长沙妹坨 樱花小哥 上海阿姨 京腔 港普男声 天津小哥 西安掌柜 台湾女生 东北老铁 粤语男声 重庆小伙 魅力姐姐 高冷御姐 魅力女友 耿直女声 活泼女声 随性女声 知性女声 温柔淑女 悲伤女声 开朗学长 阳光青年 广告男声 悠悠君子 强势青年 阳光男生 沉稳男声 悲伤青年 病娇少女 撒娇学妹 冷静少女 元气少女 活泼女孩 阳光少年 活泼少年 小男孩 小女孩 萌娃 沉稳老者 老婆婆 儒雅大叔 温柔阿姨 刚正大叔
+
     """
     request = TTSRequest(
         model="tts-1",
         # input="军杰 快来我的五指山下" * 1,
         input=text,
-        voice="柔美女友",
+        # voice="柔美女友",
+        voice="猴哥",
+
         # voice="妩媚女生",
         # voice="如来佛祖",
         # voice="京腔小爷",
 
-        # response_format="url",
+        response_format="url",
 
         # emotion="happy",
-        emotion="fear"
+        # emotion="fear"
+        emotion="surprise"
 
     )
 

meutils/apis/jimeng/doubao_images.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : images
+# @Time         : 2024/12/16 17:46
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+
+from openai import AsyncClient
+from meutils.pipe import *
+from meutils.apis.jimeng.doubao_utils import generate_cookie, generate_params
+
+from meutils.schemas.image_types import ImageRequest
+
+from meutils.schemas.jimeng_types import BASE_URL, MODELS_MAP, FEISHU_URL
+from meutils.config_utils.lark_utils import get_next_token_for_polling
+
+
+async def create(token: Optional[str] = None):
+    token = token or "712a47e7eec7c03b4cc7229775e06841"
+    cookie = generate_cookie(token)
+    params = generate_params()
+
+    headers = {
+        'Cookie': cookie,
+        'agw-js-conv': 'str',
+        'User-Agent': 'Apifox/1.0.0 (https://apifox.com)',
+        'content-type': 'application/json'
+    }
+    payload = {
+        "messages": [
+            {
+                "content": "{\"text\":\"一只猫\"}",
+                "content_type": 2009,
+                "attachments": [
+
+                ]
+            }
+        ],
+        "completion_option": {
+            "is_regen": False,
+            "with_suggest": False,
+            "need_create_conversation": False,
+            "launch_stage": 1,
+            "is_replace": False,
+            "is_delete": False,
+            "message_from": 0,
+            "event_id": "0"
+        },
+        "section_id": "6287920686327298",
+        "conversation_id": "6287920686327042",
+        "local_message_id": "936eee40-354d-11f0-83df-6b1810ffef8a"
+
+        # "local_message_id": str(uuid.uuid4())
+
+    }
+
+    client = AsyncClient(base_url="https://www.doubao.com/samantha", default_headers=headers, api_key='xx',
+                         )
+    response = await client.post("/chat/completion", body=payload, cast_to=object, stream=True,
+                                 options=dict(params=params))
+    async for i in response:
+        print(i)
+    # return response
+
+
+if __name__ == '__main__':
+    arun(create())

meutils/apis/jimeng/doubao_utils.py

@@ -132,7 +132,7 @@ def generate_cookie(refresh_token: str, ms_token: Optional[str] = None) -> str:
     return "; ".join(cookie_parts)
 
 
-async def get_upload_token():  # 3600过期
+async def get_upload_token(refresh_token):  # 3600过期
     """
 
     {'code': 0,
@@ -148,7 +148,7 @@ async def get_upload_token():  # 3600过期
 
     :return:
     """
-    cookie = generate_cookie('de2215a7bb8e442774cf388f03fac84c')
+    cookie = generate_cookie(refresh_token)
     url = "https://www.doubao.com/alice/upload/auth_token"
 
     headers = {
@@ -170,6 +170,6 @@ async def get_upload_token():  # 3600过期
 if __name__ == '__main__':
     # generate_cookie("")
 
-    # arun(get_upload_token())
-    print(generate_params())
+    arun(get_upload_token("712a47e7eec7c03b4cc7229775e06841"))
+    # print(generate_params())
     # print(get_signing_key('xW9YbDhTlWsXdaN7O2g1lfcyePxf5kJyg/r2mwSZG/iuSmbvVgToO6LVCLmUjVJ3'))

meutils/apis/jimeng/videos.py

@@ -36,6 +36,8 @@ async def get_task(task_id: str, token: str = "916fed81175f5186a2c05375699ea40d"
     $..image_to_avatar 成功： 先检测图片or视频
     :param task_ids:
     :return:
+
+    todo： fail_code
     """
     task_ids = task_id.split()
 

meutils/apis/oneapi/channel.py

@@ -9,6 +9,7 @@
 # @Description  : 
 
 from meutils.pipe import *
+from meutils.hash_utils import murmurhash
 from meutils.schemas.oneapi import BASE_URL, GROUP_RATIO
 
 headers = {
@@ -72,24 +73,27 @@ async def edit_channel(models, token: Optional[str] = None):
 
 
 # todo: 分批
+
 async def create_or_update_channel(api_key, base_url: Optional[str] = "https://api.ffire.cc"):
     if isinstance(api_key, list):
         api_keys = api_key | xgroup(128)  # [[],]
     else:
         api_keys = [[api_key]]
 
-    models = "gemini-1.0-pro-vision-latest,gemini-pro-vision,gemini-1.5-pro-latest,gemini-1.5-pro-001,gemini-1.5-pro-002,gemini-1.5-pro,gemini-1.5-flash-latest,gemini-1.5-flash-001,gemini-1.5-flash-001-tuning,gemini-1.5-flash,gemini-1.5-flash-002,gemini-1.5-flash-8b,gemini-1.5-flash-8b-001,gemini-1.5-flash-8b-latest,gemini-1.5-flash-8b-exp-0827,gemini-1.5-flash-8b-exp-0924,gemini-2.5-pro-exp-03-25,gemini-2.5-pro-preview-03-25,gemini-2.5-flash-preview-04-17,gemini-2.0-flash-exp,gemini-2.0-flash,gemini-2.0-flash-001,gemini-2.0-flash-exp-image-generation,gemini-2.0-flash-lite-001,gemini-2.0-flash-lite,gemini-2.0-flash-lite-preview-02-05,gemini-2.0-flash-lite-preview,gemini-2.0-pro-exp,gemini-2.0-pro-exp-02-05,gemini-2.0-flash-thinking-exp-01-21,gemini-2.0-flash-thinking-exp,gemini-2.0-flash-thinking-exp-1219,learnlm-1.5-pro-experimental,learnlm-2.0-flash-experimental,gemma-3-1b-it,gemma-3-4b-it,gemma-3-12b-it,gemma-3-27b-it,gemini-2.0-flash-live-001"
-    nothinking_models = 'gemini-2.5-pro-exp-03-25-nothinking,gemini-2.5-pro-preview-03-25-nothinking,gemini-2.5-flash-preview-04-17-nothinking,gemini-2.0-flash-thinking-exp-01-21-nothinking,gemini-2.0-flash-thinking-exp-nothinking,gemini-2.0-flash-thinking-exp-1219-nothinking'
+    models = "gemini-2.5-flash-preview-05-20,gemini-1.5-flash-latest,gemini-1.5-flash-001,gemini-1.5-flash-001-tuning,gemini-1.5-flash,gemini-1.5-flash-002,gemini-1.5-flash-8b,gemini-1.5-flash-8b-001,gemini-1.5-flash-8b-latest,gemini-1.5-flash-8b-exp-0827,gemini-1.5-flash-8b-exp-0924,gemini-2.5-flash-preview-04-17,gemini-2.0-flash-exp,gemini-2.0-flash,gemini-2.0-flash-001,gemini-2.0-flash-exp-image-generation,gemini-2.0-flash-lite-001,gemini-2.0-flash-lite,gemini-2.0-flash-lite-preview-02-05,gemini-2.0-flash-lite-preview,gemini-2.0-flash-thinking-exp-01-21,gemini-2.0-flash-thinking-exp,gemini-2.0-flash-thinking-exp-1219,learnlm-2.0-flash-experimental,gemma-3-1b-it,gemma-3-4b-it,gemma-3-12b-it,gemma-3-27b-it,gemini-2.0-flash-live-001"
+    nothinking_models = 'gemini-2.5-flash-preview-05-20-nothinking,gemini-2.5-flash-preview-04-17-nothinking,gemini-2.0-flash-thinking-exp-01-21-nothinking,gemini-2.0-flash-thinking-exp-nothinking,gemini-2.0-flash-thinking-exp-1219-nothinking'
     models = f"{models},{nothinking_models}"
 
     payload = {
         # "id": 7493,
-        "type": 24,# gemini
+        "type": 24,  # gemini
         # "key": "AIzaSyCXWV19FRM4XX0KHmpR9lYUz9i1wxQTYUg",
         "openai_organization": "",
         "test_model": "",
         "status": 1,
         "name": "gemini",
+
+        "priority": murmurhash(api_key, bins=3),
         "weight": 0,
         # "created_time": 1745554162,
         # "test_time": 1745554168,
@@ -102,7 +106,6 @@ async def create_or_update_channel(api_key, base_url: Optional[str] = "https://a
         # "used_quota": 0,
         "model_mapping": """{"gemini-2.5-pro-preview-03-25": "gemini-2.5-pro-exp-03-25"}""",
         # "status_code_mapping": "",
-        # "priority": 0,
         # "auto_ban": 1,
         # "other_info": "",
         # "settings": "",
@@ -154,12 +157,11 @@ if __name__ == '__main__':
     # base_url = "https://api.ffire.cc"
     base_url = "https://usa.chatfire.cn"
     #
-    tokens = arun(get_series(FEISHU_URL))
+    tokens = arun(get_series(FEISHU_URL))  # [:5]
     arun(create_or_update_channel(tokens, base_url))
     # arun(create_or_update_channel(tokens))
     # # arun(delete_channel(range(10000, 20000)))
 
-
 """
 API_KEY=6c255307-7b4d-4be8-984b-5440a3e867eb
 curl --location --request POST 'https://api.ffire.cc/api/channel/' \
@@ -200,4 +202,6 @@ curl --location --request POST 'https://api.ffire.cc/api/channel/' \
         "volcengine"
     ]
 }'
-"""
+"""
+
+

meutils/apis/oneapi/user.py

@@ -113,4 +113,4 @@ if __name__ == '__main__':
 
     # arun(get_api_key_log('sk-gpoH1z3G6nHovD8MY40i6xx5tsC1vbh7B3Aao2jmejYNoKhv'))
     # arun(get_user_money("sk-LlB4W38z9kv5Wy1c3ceeu4PHeIWs6bbWsjr8Om31jYvsucRv"))
-    arun(get_user_from_api_key('sk-ROgrPPp2TUdGUC8aNOBwO8Lv0AHZjECKjoT7rBbHbvAKVTKA'))
+    arun(get_user_from_api_key('sk-4mQ0TUJtKfBF7iLcSmVlMCFgeV1gFxs3aPJRI6uBcojPoEBy'))

meutils/apis/siliconflow/videos.py

@@ -20,19 +20,17 @@ from openai import OpenAI, AsyncOpenAI
 
 check_token = partial(check_token_for_siliconflow, threshold=0.01)
 
-MODELS_MAP = {
-    "hunyuan-video": "tencent/HunyuanVideo",
-    "hunyuanvideo": "tencent/HunyuanVideo",
-    "mochi-1-preview": "genmo/mochi-1-preview",
-    "ltx-video": "Lightricks/LTX-Video",
-}
 """
+
+tencent/HunyuanVideo-HD
+
 Wan-AI/Wan2.1-T2V-14B
 Wan-AI/Wan2.1-T2V-14B-Turbo
 
 Wan-AI/Wan2.1-I2V-14B-720P
 Wan-AI/Wan2.1-I2V-14B-720P-Turbo
 
+
 16:9 👉 1280×720
 9:16 👉 720×1280
 1:1 👉 960×960
@@ -44,17 +42,12 @@ Wan-AI/Wan2.1-I2V-14B-720P-Turbo
 async def create_task(request: VideoRequest, token: Optional[str] = None):
     token = token or await get_next_token_for_polling(FEISHU_URL_FREE, check_token=check_token, from_redis=True)
 
+    if 'Wan-AI' in request.model:
+        request.model = "Wan-AI/Wan2.1-T2V-14B-720P-Turbo"
+
     if request.image:
         request.image = await to_base64(request.image)
-
-    if request.model == "Wan-AI/Wan2.1-T2V-14B":
-        request.model = "Wan-AI/Wan2.1-T2V-14B-Turbo"
-
-    elif request.model == "Wan-AI/Wan2.1-I2V-14B-720P":
-        request.model = "Wan-AI/Wan2.1-I2V-14B-720P-Turbo"
-
-    else:
-        request.model = "Wan-AI/Wan2.1-I2V-14B-720P-Turbo" if request.image else "Wan-AI/Wan2.1-T2V-14B-Turbo"
+        request.model = request.model.replace("-T2V-", "-I2V-")
 
     payload = request.model_dump(exclude_none=True)
 

meutils/common.py

@@ -570,7 +570,8 @@ def storage_to_cookie(storage: Union[str, Path, dict]):
     elif isinstance(storage, str):
         storage = json.loads(storage)
 
-    storage = storage['cookies']
+    if isinstance(storage, dict):
+        storage = storage['cookies']
 
     import jsonpath
     cookies = [f"{n}={v}" for n, v in

meutils/config_utils/lark_utils/common.py

@@ -80,7 +80,7 @@ def get_spreadsheet_values(
 
 
 @alru_cache(ttl=600)
-@rcache(ttl=600, serializer='pickle')  # 缓存
+@rcache(ttl=300, serializer='pickle')  # 缓存
 async def aget_spreadsheet_values(
         spreadsheet_token: Optional[str] = None,
         sheet_id: Optional[str] = None,
@@ -101,10 +101,10 @@ async def aget_spreadsheet_values(
         if response.is_success:
             data = response.json()
             if to_dataframe:
-                # values = data.get('data').get('valueRange').get('values')
-                # [value | xmap(lambda x: x['text']) | xjoin('') for value in values]
+                values = data.get('data').get('valueRange').get('values')
+
+                return pd.DataFrame(values)
 
-                return pd.DataFrame(data.get('data').get('valueRange').get('values'))
             return data
         else:
             send_message(

meutils/data/VERSION

@@ -1 +1 @@
-2025.05.14.16.46.40
+2025.05.27.14.55.19

meutils/io/files_utils.py

@@ -26,7 +26,7 @@ from httpx import AsyncClient
 def guess_mime_type(file):
     mime_type = None
     if isinstance(file, str):
-        mime_type, _ = mimetypes.guess_type(file)
+        mime_type, _ = mimetypes.guess_type(file.strip())
     return mime_type or "application/octet-stream"
 
 
@@ -280,5 +280,7 @@ if __name__ == '__main__':
 
     # arun(to_bytes("https://oss.ffire.cc/files/kling_watermark.png"))
 
-    file = "https://v3.fal.media/files/penguin/Rx-8V0MVgkVZM6PJ0RiPD_douyin.mp4"
-    arun(to_bytes(file))
+    # file = "https://v3.fal.media/files/penguin/Rx-8V0MVgkVZM6PJ0RiPD_douyin.mp4"
+    # arun(to_bytes(file))
+
+    print(guess_mime_type("http://admin.ilovechatgpt.top/file/ceshiwendangdocx_31118702.docx "))

meutils/io/openai_files.py

@@ -50,7 +50,7 @@ async def delete_files(client, threshold: int = 666):
 
 
 @rcache(ttl=7 * 24 * 3600)
-async def file_extract(file):
+async def file_extract(file, enable_reader: bool = True):
     """
 
     :param file: url bytes path
@@ -63,8 +63,9 @@ async def file_extract(file):
     filename = Path(file).name if isinstance(file, str) else 'untitled'
     mime_type = guess_mime_type(file)
 
-    if str(file).startswith("http") and mime_type in {"application/octet-stream", "text/html"}:
+    if enable_reader and str(file).startswith("http") and mime_type in {"application/octet-stream", "text/html"}:
         logger.debug(f"jina reader")
+
         markdown_content = await url_reader(file)
         return {
             'filename': filename,

meutils/llm/completions/chat_spark.py

@@ -33,7 +33,7 @@ class Completions(object):
             file_url, *texts = request.last_user_content.split(maxsplit=1) + ["总结下"]
             text = texts[0]
 
-            file_content = await file_extract(file_url)
+            file_content = await file_extract(file_url, enable_reader=False)
 
             request.messages = [
                 {
@@ -73,7 +73,7 @@ class Completions(object):
 
                         text, file_url = texts[-1], file_urls[-1]
                         if file_url in image_urls:
-                            file_content = await file_extract(file_url)
+                            file_content = await file_extract(file_url, enable_reader=False)
 
                             message["content"] = f"""{json.dumps(file_content, ensure_ascii=False)}\n\n{text}"""
 
@@ -104,7 +104,7 @@ if __name__ == '__main__':
     request = CompletionRequest(
         # model="qwen-turbo-2024-11-01",
         # model="claude-3-5-sonnet-20241022",
-        model="deepsek-chat",
+        model="deepseek-chat",
 
         messages=[
             # {
@@ -133,15 +133,15 @@ if __name__ == '__main__':
             {
                 'role': 'user',
                 # "content": '你好',
-                "content": [
-                    {"type": "text", "text": "https://oss.ffire.cc/files/kling_watermark.png 描述第一张图片"},
-
-                    # {"type": "text", "text": "描述第一张图片"},
-                    #
-                    # {"type": "image_url", "image_url": "https://oss.ffire.cc/files/kling_watermark.png"},
-                    #     # {"type": "image_url", "image_url": "https://oss.ffire.cc/files/nsfw.jpg"}
-                    #
-                ],
+                # "content": [
+                #     {"type": "text", "text": "https://oss.ffire.cc/files/kling_watermark.png 描述第一张图片"},
+                #
+                #     # {"type": "text", "text": "描述第一张图片"},
+                #     #
+                #     # {"type": "image_url", "image_url": "https://oss.ffire.cc/files/kling_watermark.png"},
+                #     #     # {"type": "image_url", "image_url": "https://oss.ffire.cc/files/nsfw.jpg"}
+                #     #
+                # ],
 
                 # 'content': {
                 #     "type": "file_url",
@@ -153,7 +153,7 @@ if __name__ == '__main__':
                 # "content": "https://oss.ffire.cc/files/百炼系列手机产品介绍.docx 总结下"
                 # "content": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"
 
-                # "content": "https://admin.ilovechatgpt.top/file/lunIMYAIzhinengzhushouduishenghuodocx_14905733.docx 总结",
+                "content": "http://admin.ilovechatgpt.top/file/4docx_86529298.docx 我无法确定你是否准确识别word里面的论文？",
                 # "content": "http://admin.ilovechatgpt.top/file/xinjianMicrosoftWordwendangdoc-9052714901036-bGSJLeKbqQdnIZZn.doc 111111234234",
 
             },
@@ -276,4 +276,22 @@ if __name__ == '__main__':
     #  {},
     #  {'role': 'user', 'content': '总结一下'}]
 
+    request = {
+        "model": "gemini-all",
+        "messages": [
+            {
+                "role": "system",
+                "content": "\\n Current date: 2025-05-21"
+            },
+            {
+                "role": "user",
+                "content": "http://admin.ilovechatgpt.top/file/ceshiwendangdocx_31118702.docx 你好"
+            }
+        ],
+        "stream": True,
+        "top_p": 0.7,
+        "temperature": 0.8,
+        "n": 1
+    }
+    request = CompletionRequest(**request)
     arun(c.create(request))