MeUtils 2025.7.7.17.42.1__py3-none-any.whl → 2025.7.15.17.2.8__py3-none-any.whl

meutils/apis/utils.py

@@ -7,15 +7,75 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
+import httpx
 
 from meutils.pipe import *
 from openai import AsyncClient
 from meutils.caches import rcache
+from openai._legacy_response import HttpxBinaryResponseContent
+
+
+async def make_request_httpx(
+        base_url: str,
+        headers: Optional[dict] = None,
+
+        path: Optional[str] = None,
+
+        params: Optional[dict] = None,
+        payload: Optional[dict] = None,
+        data: Optional[Any] = None,
+        files: Optional[dict] = None,
+        timeout: Optional[int] = None,
+
+        method: Optional[str] = None,
+
+        debug: bool = False,
+        **kwargs
+):
+    if method is None:
+        method = (payload or data or files) and "POST" or "GET"
+
+    path = path or "/"
+    path = f"""/{path.removeprefix("/")}"""
+
+
+    if debug:
+        log = {
+            "base_url": base_url,
+            "path": path,
+            "method": method,
+            "headers": headers,
+            "params": params,
+            "payload": payload,
+            "data": data,
+            "timeout": timeout,
+        }
+        logger.debug(f"MAKE_REQUEST: {method.upper()} => {base_url}{path}")
+        logger.debug(f"MAKE_REQUEST_DETAIL: {bjson(log)}")
+
+    async with httpx.AsyncClient(base_url=base_url, headers=headers, timeout=timeout or 100) as client:
+        # content: RequestContent | None = None,
+        # data: RequestData | None = None,
+        # files: RequestFiles | None = None,
+        # json: typing.Any | None = None,
+        # params: QueryParamTypes | None = None,
+        # headers: HeaderTypes | None = None,
+        response = await client.request(method, path, json=payload, data=data, files=files, params=params)
+        # response.raise_for_status()
+
+        if isinstance(response.content, HttpxBinaryResponseContent):
+            return response.content
+
+        try:
+            return response.json()
+        except Exception as e:
+            logger.error(e)
+            return response
 
 
 async def make_request(
         base_url: str,
-        api_key: Optional[str] = None,
+        api_key: Optional[str] = None,  # false 不走 Authorization bearer
         headers: Optional[dict] = None,
 
         path: Optional[str] = None,
@@ -30,9 +90,13 @@ async def make_request(
 
         debug: bool = False
 ):
+    if isinstance(api_key, dict):
+        # "Authorization": f"key {api_key}",
+        headers = {**headers, **api_key}  # 覆盖
+
     if headers:
         headers = {k: v for k, v in headers.items() if '_' not in k}
-        if not any(i in base_url for i in {"queue.fal.run"}):  # todo  xi-api-key
+        if not any(i in base_url for i in {"queue.fal.run", "elevenlabs"}):  # todo  xi-api-key
             headers = {}
 
     client = AsyncClient(base_url=base_url, api_key=api_key, default_headers=headers, timeout=timeout)
@@ -86,7 +150,19 @@ async def make_request(
                 return response.json()
 
     elif method.upper() == 'POST':
+        # if any("key" in i.lower() for i in headers or {}):  # 跳过Bearer鉴权
+        #     async with httpx.AsyncClient(base_url=base_url, headers=headers, timeout=timeout or 100) as client:
+        #         response = await client.post(path, json=payload, params=params)
+        #         # response.raise_for_status()
+        #
+        #         # print(response.text)
+        #
+        #         return response.json()
+
         response = await client.post(path, body=payload, options=options, files=files, cast_to=object)
+
+        # HttpxBinaryResponseContent
+
         return response
 
 
@@ -120,7 +196,6 @@ async def make_request_with_cache(
     )
 
 
-
 if __name__ == '__main__':
     from meutils.io.files_utils import to_bytes
 
@@ -243,4 +318,67 @@ if __name__ == '__main__':
     #     debug=True
     # ))
 
-    arun(get_baidubce_token())
+    """
+    curl -X POST "https://api.elevenlabs.io/v1/text-to-speech/JBFqnCBsd6RMkjVDRZzb?output_format=mp3_44100_128" \
+     -H "xi-api-key: sk_f155f9d255438f52942edc8e1e7c56fb61a78dedaae0fbc5" \
+     -H "Content-Type: application/json" \
+     -d '{
+  "text": "The first move is what sets everything in motion.",
+  "model_id": "eleven_turbo_v2_5"
+}'
+
+curl -X POST "http://0.0.0.0:80000/elevenlabs/v1/text-to-speech/JBFqnCBsd6RMkjVDRZzb?output_format=mp3_44100_128" \
+     -H "xi-api-key: sk_f155f9d255438f52942edc8e1e7c56fb61a78dedaae0fbc5" \
+     -H "Content-Type: application/json" \
+     -d '{
+  "text": "The first move is what sets everything in motion.",
+  "model_id": "eleven_turbo_v2_5"
+}'
+
+curl -X POST https://api.elevenlabs.io/v1/speech-to-text \
+     -H "xi-api-key: xi-api-key" \
+     -H "Content-Type: multipart/form-data" \
+     -F model_id="foo" \
+     -F file=@<file1>
+     
+"""
+    #
+    UPSTREAM_BASE_URL = "https://api.elevenlabs.io/v1"
+    UPSTREAM_API_KEY = "sk_f155f9d255438f52942edc8e1e7c56fb61a78dedaae0fbc5"
+    headers = {
+        "xi-api-key": UPSTREAM_API_KEY
+    }
+
+    path = "/text-to-speech/JBFqnCBsd6RMkjVDRZzb"
+
+    params = {
+        "output_format": "mp3_44100_128"
+    }
+    payload = {
+        "text": "The first move is what sets everything in motion.",
+        "model_id": "eleven_multilingual_v2"
+    }
+
+    path = "speech-to-text"
+
+    data = {
+        'model_id': "scribe_v1",
+
+    }
+    files = {
+        'file': ('xx.mp3', open("/Users/betterme/PycharmProjects/AI/MeUtils/meutils/ai_audio/x1.wav", 'rb'))
+
+    }
+
+    params=None
+
+    arun(make_request_httpx(
+        base_url=UPSTREAM_BASE_URL,
+        path=path,
+        # payload=payload,
+        data=data,
+        files=files,
+        headers=headers,
+        params=params,
+        # debug=True,
+    ))

meutils/data/VERSION

@@ -1 +1 @@
-2025.07.07.17.42.01
+2025.07.15.17.02.08

meutils/io/files_utils.py

@@ -224,6 +224,35 @@ async def markdown_base64_to_url(text, pattern=r'!\[Image_\d+\]\((.+?)\)'):
     return text
 
 
+async def get_file_duration(filename: str = ".mp4", url: Optional[str] = None, content: Optional[bytes] = None,
+                            headers: Optional[dict] = None):
+    # Path(url.split('?')[0]).name
+    headers = {
+        "Range": "bytes=0-8191"
+    }
+    async with httpx.AsyncClient(timeout=200) as client:
+        for i in range(2):
+            if url:
+                response = await client.get(url=url, headers=headers)
+                response.raise_for_status()
+
+                content = response.content
+            elif content is None:
+                raise ValueError("url or content is required")
+
+            from tinytag import TinyTag
+
+            tag = TinyTag.get(filename=filename, file_obj=io.BytesIO(content), ignore_errors=False)
+
+            logger.debug(tag.duration)
+            if tag.duration:
+                break
+            else:
+                headers = None
+
+        return int(np.ceil(tag.duration or 10))
+
+
 if __name__ == '__main__':
     # import tempfile
     #
@@ -281,7 +310,7 @@ if __name__ == '__main__':
     file = "/Users/betterme/PycharmProjects/AI/ppt.txt"
     # arun(to_url(Path(file).read_bytes(), filename='ppt.txt'))
 
-    arun(markdown_base64_to_url("![image](data:imagexxxxx)", pattern=r'!\[image\]\((.+?)\)'))
+    # arun(markdown_base64_to_url("![image](data:imagexxxxx)", pattern=r'!\[image\]\((.+?)\)'))
 
     # arun(to_bytes("https://oss.ffire.cc/files/kling_watermark.png"))
 
@@ -294,4 +323,11 @@ if __name__ == '__main__':
 
     # r = arun(to_bytes(url))
 
-    # print(mimetypes.guess_type(url)[0])
+    print(mimetypes.guess_type(url)[0])
+
+    url = "https://lmdbk.com/5.mp4"
+    # url = "https://v3.fal.media/files/kangaroo/y5-1YTGpun17eSeggZMzX_video-1733468228.mp4"
+    content = requests.get(url).content
+    with timer():
+        # arun(get_file_duration(content=content))
+        arun(get_file_duration(url=url))

meutils/llm/check_utils.py

@@ -172,7 +172,7 @@ async def check_token_for_gemini(api_key):
 @retrying()
 async def check_token_for_ppinfra(api_key, threshold: float = 1):
     if not isinstance(api_key, str):
-        return await check_tokens(api_key, check_token_for_ppinfra)
+        return await check_tokens(api_key, partial(check_token_for_ppinfra, threshold=threshold))
     try:
         client = AsyncOpenAI(base_url="https://api.ppinfra.com/v3/user", api_key=api_key)
         data = await client.get("", cast_to=object)
@@ -274,6 +274,14 @@ async def check_token_for_zhipu(api_key, threshold: float = 1, resource_package_
         return False
 
 
+# curl 'https://bigmodel.cn/api/biz/product/createPreOrder' \
+#   -H 'accept: application/json, text/plain, */*' \
+#   -H 'accept-language: zh' \
+#   -H 'authorization: eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX3R5cGUiOiJQRVJTT05BTCIsInVzZXJfaWQiOjIyNDAwNDUsInVzZXJfa2V5IjoiNTZmNjkxODUtOTBhMS00NDYyLWFhNWYtYTljNjhmMGY0Njc3IiwiY3VzdG9tZXJfaWQiOiI2MTQ2MTc1MjExNDcxMTYwNSIsInVzZXJuYW1lIjoia2JieHYxMDYifQ.3zLefwa8lzQLyNYz0DVqkgdOgm1_ljPEoihza44Wv1r-pEPS08kQFeZm-v2CY3qhslgHh2I3d1LN_mr-9bhQjw' \
+#   -
+#   -H 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36' \
+#   --data-raw '{"channelCode":"BALANCE","isMobile":false,"num":1,"payPrice":0,"productId":"product-e6e499"}'
+
 @retrying()
 @rcache(ttl=1 * 24 * 3600, skip_cache_func=skip_cache_func)
 async def check_token_for_fal(token, threshold: float = 0):
@@ -295,6 +303,28 @@ async def check_token_for_fal(token, threshold: float = 0):
         return False
 
 
+@retrying()
+@rcache(ttl=1 * 24 * 3600, skip_cache_func=skip_cache_func)
+async def check_token_for_gitee(api_key, threshold: float = 1):
+    if not isinstance(api_key, str):
+        return await check_tokens(api_key, check_token_for_volc)
+
+    try:
+        base_url = "https://ai.gitee.com/v1"
+        client = AsyncOpenAI(base_url=base_url, api_key=api_key)
+        _ = await client.embeddings.create(
+            model="Qwen3-Embedding-0.6B",
+            input="hi"
+        )
+        return True
+    except TimeoutException as e:
+        raise
+
+    except Exception as e:
+        logger.error(f"Error: {e}\n{api_key}")
+        return False
+
+
 if __name__ == '__main__':
     from meutils.config_utils.lark_utils import get_next_token_for_polling, get_series
 
@@ -331,6 +361,8 @@ if __name__ == '__main__':
     # arun(check_token_for_ppinfra("sk_F0kgPyCMTzmOH_-VCEJucOK8HIrbnLGYm_IWxBToHZQ"))
 
     # arun(check_token_for_volc("f1f394db-59e9-4cdd-9d12-b11d50173efc"))
+    # arun(check_token_for_volc("279749bd-ba5e-4962-9c65-eb6604b65594"))
+
     # arun(check_token_for_ppinfra("sk_mCb5sRGTi6GXkSRp5F679Rbs0V_Hfee3p85lccGXCOo"))
 
     # arun(check_token_for_zhipu(api_key="e130b903ab684d4fad0d35e411162e99.PqyXq4QBjfTdhyCh",
@@ -338,4 +370,6 @@ if __name__ == '__main__':
 
     # arun(check_token_for_fal("56d8a95e-2fe6-44a6-8f7d-f7f9c83eec24:537f06b6044770071f5d86fc7fcd6d6f"))
 
-    arun(check_token_for_ppinfra("sk_NdGt2jb_QSEW_1cauXnWK-qShGIJ_irWgtG-DEBVs4A"))
+    arun(check_token_for_ppinfra("sk_IeM4wjPIsgQFpfGqIOdMpHNF28qGLu1wxvh_vy3DiWM", threshold=1))
+
+    # arun(check_token_for_gitee("NWVXUPI38OQVXZGOEL3D23I9YUQWZPV23GVVBW1X"))

meutils/llm/completions/qwenllm.py

@@ -18,6 +18,7 @@ from openai import AsyncOpenAI
 
 from meutils.pipe import *
 from meutils.decorators.retry import retrying
+# from meutils.oss.ali_oss import qwenai_upload
 from meutils.io.files_utils import to_bytes, guess_mime_type
 from meutils.caches import rcache
 
@@ -64,6 +65,8 @@ async def to_file(file, api_key, cookie: Optional[str] = None):
     logger.debug(file_object)
     return file_object
 
+# todo
+# oss
 
 async def create(request: CompletionRequest, token: Optional[str] = None, cookie: Optional[str] = None):
     cookie = cookie or COOKIE
@@ -139,6 +142,12 @@ async def create(request: CompletionRequest, token: Optional[str] = None, cookie
 
                     user_content[i] = {"type": "image", "image": file_object.id}
 
+                elif content.get("type") == 'input_audio':
+                    url = content.get(content.get("type")).get("data")
+                    file_object = await to_file(url, token, cookie)
+
+                    user_content[i] = {"type": "image", "image": file_object.id}
+
         elif user_content.startswith("http"):
             file_url, user_content = user_content.split(maxsplit=1)
 
@@ -244,12 +253,28 @@ if __name__ == '__main__':
     #
     # ]
 
+    # user_content = [
+    #     {
+    #         "role": "user",
+    #         "content": [
+    #             {
+    #                 "type": "input_audio",
+    #                 "input_audio": {
+    #                     "data": "https://help-static-aliyun-doc.aliyuncs.com/file-manage-files/zh-CN/20250211/tixcef/cherry.wav",
+    #                     "format": "wav",
+    #                 },
+    #             },
+    #             {"type": "text", "text": "这段音频在说什么"},
+    #         ],
+    #     },
+    # ]
+
     request = CompletionRequest(
         # model="qwen-turbo-2024-11-01",
         # model="qwen-max-latest",
         # model="qvq-max-2025-03-25",
         # model="qvq-72b-preview-0310",
-        # model="qwen2.5-omni-7b",
+        model="qwen2.5-omni-7b",
         # model="qwen-plus",
 
         # model="qwen-max-latest-search",
@@ -260,10 +285,12 @@ if __name__ == '__main__':
         # model="qwen2.5-vl-72b-instruct",
 
         # model="qwen-plus-latest",
-        model="qwen3-235b-a22b",
+        # model="qwen3-235b-a22b",
         # model="qwen3-30b-a3b",
         # model="qwen3-32b",
 
+        # model="qwen-omni-turbo-0119",
+
         # max_tokens=1,
         max_tokens=None,
 
@@ -273,11 +300,11 @@ if __name__ == '__main__':
                 # 'content': '今天南京天气',
                 # 'content': "9.8 9.11哪个大",
                 # 'content': 'https://oss.ffire.cc/files/AIGC.pdf 总结下',
-                'content': ' 总结下',
+                # 'content': ' 总结下',
 
                 # "chat_type": "search", deep_research
 
-                # 'content': user_content,
+                'content': user_content,
 
                 # "content": [
                 #     {
@@ -343,6 +370,6 @@ if __name__ == '__main__':
 
     # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImV4cCI6MTc0ODQ3OTE0M30.oAIE1K0XA0YYqlxB8Su-u0UJbY_BBZa4_tvZpFJKxGY"
 
-    arun(create(request, token))
+    # arun(create(request, token))
 
-    # arun(to_file("https://oss.ffire.cc/files/kling_watermark.png", token))
+    arun(to_file("https://help-static-aliyun-doc.aliyuncs.com/file-manage-files/zh-CN/20250211/tixcef/cherry.wav", token))

meutils/llm/openai_polling/chat.py

@@ -36,7 +36,7 @@ class Completions(object):
 
         ###########################################################################
         # 开启视觉模型
-        if not any(i in request.model for i in ["vl", 'vision']) and (urls := request.last_urls.get("image_url")):
+        if not any(i in request.model.lower() for i in ["vl", 'vision']) and (urls := request.last_urls.get("image_url")):
             # logger.debug(request)
             if request.model.startswith(("gemini",)):
 

meutils/llm/openai_utils/billing_utils.py

@@ -90,11 +90,11 @@ async def billing_for_tokens(
             "total_tokens": total_tokens
         }
 
-            # usage = {
-        #     "prompt_tokens": input_tokens,
-        #     "completion_tokens": output_tokens,
-        #     "total_tokens": total_tokens
-        # }
+    usage = {
+            "prompt_tokens": input_tokens,
+            "completion_tokens": output_tokens,
+            "total_tokens": total_tokens
+        }
     """
     usage = usage or {}
     n = n and int(np.round(n))
@@ -115,6 +115,7 @@ async def billing_for_tokens(
             extra_body={"extra_fields": usage}
         )
     else:
+        # todo 设计 id chatcmpl-NEdenEpvzGiKR2FfK2GmzK => 表达某些含义
         _ = await client.chat.completions.create(
             model=model,
             messages=[{"role": "user", "content": "ChatfireAPI"}],
@@ -227,7 +228,10 @@ if __name__ == '__main__':
     #     "total_tokens": 101
     # }
     # n = 1
-    # arun(create_usage_for_tokens(usage=usage, n=n))
+    usage = {
+        "prompt_tokens": 1000, "completion_tokens": 100,  # "total_tokens": 2000,
+    }
+    arun(billing_for_tokens(model="tokens", usage=usage))
 
     # arun(create_usage_for_async_task(task_id="task_id", n=1))
 
@@ -278,4 +282,4 @@ if __name__ == '__main__':
         ],
         "enhance_prompt": True
     }
-    print(get_billing_model(data, default_resolution=""))
+    # print(get_billing_model(data, default_resolution=""))

meutils/llm/openai_utils/common.py

@@ -39,7 +39,7 @@ AUDIO_TRANSCRIPTIONS_PARAMS = get_function_params(fn=OpenAI(api_key='').audio.tr
 
 
 def to_openai_params(
-        request: Union[dict, CompletionRequest, ChatCompletionRequest, ImageRequest, TTSRequest, STTRequest],
+        request: Union[dict, CompletionRequest, ChatCompletionRequest, ImageRequest, ImageEditRequest, TTSRequest, STTRequest],
         redirect_model: Optional[str] = None,
 ) -> dict:
     data = copy.deepcopy(request)
@@ -66,7 +66,7 @@ def to_openai_params(
     data['extra_body'] = extra_body  # 拓展字段
     data['model'] = redirect_model or data['model']
 
-    if request.model.startswith(("gemini",)):
+    if data['model'].startswith(("gemini",)):
         data.pop("extra_body", None)
         data.pop("presence_penalty", None)
         data.pop("frequency_penalty", None)
@@ -156,7 +156,7 @@ async def ppu_flow(
     成功，充足，后扣费
     成功，不足，报错
     """
-    post =post.lower()
+    post = post.lower()
     if n is not None and n > 0:  # todo: 跳过某些用户
         try:
             user_money, api_key_money = await asyncio.gather(*[get_user_money(api_key), get_api_key_money(api_key)])

meutils/oss/{ali.py → ali_oss.py}

@@ -8,9 +8,13 @@
 # @Software     : PyCharm
 # @Description  : 
 
+import oss2
+
 from meutils.pipe import *
+from meutils.io.files_utils import guess_mime_type
+from meutils.config_utils.lark_utils import get_next_token_for_polling
 
-import oss2
+FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=PP1PGr"
 
 # params = {
 #     "access_key_id": "STS.NWwe4G59dgRocw4eRdfCXvCrV",
@@ -27,15 +31,20 @@ import oss2
 url = "https://chat.qwen.ai/api/v1/files/getstsToken"
 
 
-def get_sts_token(filename):
+async def get_sts_token(filename, filetype: Optional[str] = None, token: Optional[str] = None):
+    token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True)
+
+    filetype = filetype or guess_mime_type(filename).split('/')[0]
+
+
     payload = {
         "filename": filename,
-        "filetype": "image"  # file video audio
+        "filetype": filetype,  # file video audio
+        "filesize": 1001
     }
 
     headers = {
-        'authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjEwNzY1N2Y1LTgxN2ItNDg5Yi1iNjk4LWFhZjAyM2EwZTE4MyIsImV4cCI6MTc0NjI5NTAwNH0.D1uJN44NHiEt6URce4upbHvs7v73_Vd0V1s3T_JzclI',
-
+        'authorization': f'Bearer {token}',
     }
 
     response = requests.request("POST", url, headers=headers, json=payload)
@@ -43,8 +52,8 @@ def get_sts_token(filename):
     return response.json()
 
 
-def qwenai_upload(file, filetype: str = 'image'):  # todo: 自动猜测类型
-    params = get_sts_token(file_name)
+async def qwenai_upload(file, filetype: Optional[str] = None):  # todo: 自动猜测类型
+    params = await get_sts_token(file_name, filetype)
 
     access_key_id = params['access_key_id']
     access_key_secret = params['access_key_secret']
@@ -61,6 +70,8 @@ def qwenai_upload(file, filetype: str = 'image'):  # todo: 自动猜测类型
     file_path = params.get("file_path")
     file_url = params.get("file_url")
 
+    logger.debug(params)
+
     # 上传文件
     if isinstance(file, bytes):
         bucket.put_object(file_path, file)
@@ -73,6 +84,7 @@ def qwenai_upload(file, filetype: str = 'image'):  # todo: 自动猜测类型
 if __name__ == '__main__':
     # qwenai_upload(params['file_path'], params)
     file_name = "/Users/betterme/PycharmProjects/AI/QR.png"
-    # file_url = qwenai_upload(file_name)
 
-    get_sts_token(file_name)
+    # arun(get_sts_token(file_name))
+    file_url = arun(qwenai_upload(file_name))
+