MeUtils 2025.1.3.16.13.27__py3-none-any.whl → 2025.1.4.11.4.46__py3-none-any.whl

{MeUtils-2025.1.3.16.13.27.dist-info → MeUtils-2025.1.4.11.4.46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.1.3.16.13.27
+Version: 2025.1.4.11.4.46
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -63,42 +63,42 @@ Requires-Dist: sse-starlette ; extra == 'ai'
 Requires-Dist: openai ; extra == 'ai'
 Requires-Dist: langchain ; extra == 'ai'
 Provides-Extra: all
-Requires-Dist: jmespath ; extra == 'all'
+Requires-Dist: thriftpy2 ; extra == 'all'
+Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: dataframe-image ; extra == 'all'
+Requires-Dist: schedule ; extra == 'all'
+Requires-Dist: seaborn ; extra == 'all'
+Requires-Dist: thefuck ; extra == 'all'
+Requires-Dist: missingno ; extra == 'all'
+Requires-Dist: uvicorn ; extra == 'all'
+Requires-Dist: pandas-summary ; extra == 'all'
+Requires-Dist: polars ; extra == 'all'
+Requires-Dist: cachetools ; extra == 'all'
 Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
-Requires-Dist: filetype ; extra == 'all'
 Requires-Dist: gunicorn ; extra == 'all'
-Requires-Dist: pretty-errors ; extra == 'all'
-Requires-Dist: redis-py-cluster ; extra == 'all'
+Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: iteration-utilities ; extra == 'all'
+Requires-Dist: pymupd ; extra == 'all'
 Requires-Dist: sqlalchemy ; extra == 'all'
-Requires-Dist: missingno ; extra == 'all'
+Requires-Dist: filetype ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
+Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: jmespath ; extra == 'all'
+Requires-Dist: fastapi[all] ; extra == 'all'
+Requires-Dist: pymilvus ; extra == 'all'
 Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: pymysql ; extra == 'all'
+Requires-Dist: jinja2 ; extra == 'all'
+Requires-Dist: simplejson ; extra == 'all'
+Requires-Dist: redis-py-cluster ; extra == 'all'
 Requires-Dist: geopy ; extra == 'all'
-Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: faiss-cpu ; extra == 'all'
 Requires-Dist: jieba ; extra == 'all'
 Requires-Dist: openai ; extra == 'all'
-Requires-Dist: thefuck ; extra == 'all'
-Requires-Dist: asyncmy ; extra == 'all'
-Requires-Dist: schedule ; extra == 'all'
-Requires-Dist: seaborn ; extra == 'all'
-Requires-Dist: pymilvus ; extra == 'all'
-Requires-Dist: thriftpy2 ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
-Requires-Dist: dataframe-image ; extra == 'all'
-Requires-Dist: jinja2 ; extra == 'all'
-Requires-Dist: fastapi[all] ; extra == 'all'
-Requires-Dist: pymupd ; extra == 'all'
-Requires-Dist: cachetools ; extra == 'all'
-Requires-Dist: iteration-utilities ; extra == 'all'
 Requires-Dist: fastapi ; extra == 'all'
-Requires-Dist: polars ; extra == 'all'
-Requires-Dist: pandas-summary ; extra == 'all'
-Requires-Dist: pymongo ; extra == 'all'
-Requires-Dist: simplejson ; extra == 'all'
-Requires-Dist: reportlab ; extra == 'all'
 Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: uvicorn ; extra == 'all'
+Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: pymysql ; extra == 'all'
+Requires-Dist: pretty-errors ; extra == 'all'
+Requires-Dist: pyarrow ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2025.1.3.16.13.27.dist-info → MeUtils-2025.1.4.11.4.46.dist-info}/RECORD

@@ -367,11 +367,12 @@ meutils/apis/jiema/24mail.py,sha256=GUszRtoDe3T9q-X4embwT5YhcjgQ3XnkTJMKX93sCF4,
 meutils/apis/jiema/__init__.py,sha256=YBybggoDRYCNYcwJOypxR7MzfTjIhqO7BkGlTt7NDo4,271
 meutils/apis/jiema/yezi.py,sha256=26vhnA3lC5049Rqx-CHO-wyGKbdZAfvjEOG90W38cr0,3675
 meutils/apis/jimeng/__init__.py,sha256=a8CE_cOl9jqal0hycwaLm4Mnga8jmZlz9nCze_9bBqA,272
-meutils/apis/jimeng/common.py,sha256=wIduTWmtJJQWIbxDMVvQ9BlDheiGbeROPNuulfiwiNY,8819
+meutils/apis/jimeng/common.py,sha256=5pH-qJsas8ocnwXWuHnBa0Pbniv6a6Q3uRyt53kjjno,11363
 meutils/apis/jimeng/doubao.py,sha256=vSEaTQHQdyhpHwCoq6CIikDZkUC9ncyTgKxGUC8cMCI,4345
 meutils/apis/jimeng/doubao_utils.py,sha256=XCHnvwfCOtJmPQuzDOCfKDMP_Pcqh-Y4w2h5f7Y2gzM,5999
-meutils/apis/jimeng/files.py,sha256=aFKg5iesJNVbXclaMR0yDpnKzjqW1yZxkyp9qrGTybo,5365
+meutils/apis/jimeng/files.py,sha256=CBJ8W9pFy7D_GpV7buX3J9LMoqBYxl-EvrxkIYSu9s8,7523
 meutils/apis/jimeng/images.py,sha256=Z1w8Jxqvom-rBB9MSfQz4QvfPLTEoamwyb9X9_yUmBk,4641
+meutils/apis/jimeng/lip_sync.py,sha256=rynQPNngltS73GmuWbpMIuuAr0srZP5kUh0FMY6Ynas,267
 meutils/apis/kling/__init__.py,sha256=pKz40SEjui1dhHBD-icyNTJOYhzLvxLxJCwszuH4vio,271
 meutils/apis/kling/api.py,sha256=AuVQ9URmrbTlz7dEv_kIyhA9fMTZPL9rF3Td6KxTIMA,2183
 meutils/apis/kling/images.py,sha256=FcCkvA4x1Po3SuugfQa8klT0Lrj7fq4N8kbzx6luUxI,5095
@@ -496,7 +497,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=Z6hm0dQGKZhARlzt9gXSisXp3qnswB3cIZfQHxjx8k4,19
+meutils/data/VERSION,sha256=yixHXXad2U23Mi4yr94vRu7SIQ6IWDMIx49zz1ZwIyQ,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -843,9 +844,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.1.3.16.13.27.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2025.1.3.16.13.27.dist-info/METADATA,sha256=uhe4zsF0-u8MggPXHiNUPNXM5EsQJg0BFxUMHd1ChR8,6201
-MeUtils-2025.1.3.16.13.27.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2025.1.3.16.13.27.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2025.1.3.16.13.27.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2025.1.3.16.13.27.dist-info/RECORD,,
+MeUtils-2025.1.4.11.4.46.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2025.1.4.11.4.46.dist-info/METADATA,sha256=YJIJUQ4-qTTCH1p3ePuwd3TngoVBN2WE-cOhCap8B5w,6200
+MeUtils-2025.1.4.11.4.46.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2025.1.4.11.4.46.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2025.1.4.11.4.46.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2025.1.4.11.4.46.dist-info/RECORD,,

meutils/apis/jimeng/common.py

@@ -12,6 +12,8 @@ from openai import AsyncClient
 from meutils.pipe import *
 from meutils.hash_utils import md5
 from meutils.schemas.image_types import ImageRequest
+from meutils.schemas.openai_types import TTSRequest
+
 from meutils.schemas.jimeng_types import BASE_URL, MODELS_MAP
 from meutils.str_utils.regular_expression import parse_url
 from meutils.apis.jimeng.files import upload
@@ -241,6 +243,76 @@ async def create_draft_content(request: ImageRequest, token: str):
     return draft_content
 
 
+def create_photo_lip_sync(request: TTSRequest):
+    # 映射
+    tts_info = {
+        "name": request.voice or "魅力姐姐",
+        "text": request.input,  # "永远相信美好的事情即将发生"
+        "speed": request.seed or 1,
+        "source_type": "text-to-speech",
+        "tone_category_id": 0,
+        "tone_category_key": "all",
+        "tone_id": "7382879492752019995",
+        "toneKey": request.voice or "魅力姐姐",
+    }
+    payload = {
+        "promptSource": "photo_lip_sync",
+        "generateTimes": 1,
+        "lipSyncInfo": tts_info,
+        "isUseAiGenPrompt": False,
+        "batchNumber": 1
+    }
+
+    return {
+        "submit_id": "",
+        "task_extra": json.dumps(payload),
+        "http_common_info": {
+            "aid": 513695
+        },
+        "input": {
+            "seed": 1834980836,
+            "video_gen_inputs": [
+                {
+                    "v2v_opt": {},
+                    "i2v_opt": {
+                        "realman_avatar": {
+                            "enable": true,
+                            "origin_image": {
+                                "width": 480,
+                                "height": 270,
+                                "image_uri": "tos-cn-i-tb4s082cfz/fae8f746367b40f5a708bf0f1e84de11",
+                                "image_url": ""  ########## https://oss.ffire.cc/files/kling_watermark.png
+                            },
+                            "resource_id_loopy": "34464cac-5e3e-46be-88ff-ccbc7da4d742",
+                            "resource_id_std": "2f66b408-37c3-4de5-b8a4-ba15c104612e",
+                            "origin_audio": {
+                                "duration": 3.216,
+                                "vid": "v02bc3g10000ctrpqrfog65purfpn7a0"
+                            },
+                            "tts_info": json.dumps(tts_info)
+                        }
+                    },
+                    "audio_vid": "v02bc3g10000ctrpqrfog65purfpn7a0",
+                    "video_mode": 4
+                }
+            ]
+        },
+        "mode": "workbench",
+        "history_option": {},
+        "commerce_info": {
+            "resource_id": "generate_video",
+            "resource_id_type": "str",
+            "resource_sub_type": "aigc",
+            "benefit_type": "lip_sync_avatar_std"
+        },
+        "scene": "lip_sync_image",
+        "client_trace_data": {},
+        "submit_id_list": [
+            "d4554e2c-707f-4ebe-b4e6-93aa6687d1c1"
+        ]
+    }
+
+
 if __name__ == '__main__':
     token = "693701c43e477b7c405cc7e2fef0ddbd"
     token = "eb4d120829cfd3ee957943f63d6152ed"

meutils/apis/jimeng/files.py

@@ -42,7 +42,7 @@ def u(params):
 
 
 class JJRequest:
-    def __init__(self, e, t, api, method="GET", params=None, data=None):
+    def __init__(self, e, t, api, method="GET", params=None, data=None, serviceName="imagex"):
         self.t = t
         self.e = e
         self.api = api
@@ -50,14 +50,18 @@ class JJRequest:
         self.params = params
         self.data = data
 
+        self.serviceName = serviceName
+
     def getAuthorization(self):
-        return f"AWS4-HMAC-SHA256 Credential={self.e['access_key_id']}/{self.t[0:8]}/cn-north-1/imagex/aws4_request, SignedHeaders=x-amz-date;x-amz-security-token, Signature={self.signature()}"
+        return f"AWS4-HMAC-SHA256 Credential={self.e['access_key_id']}/{self.t[0:8]}/cn-north-1/{self.serviceName}/aws4_request, SignedHeaders=x-amz-date;x-amz-security-token, Signature={self.signature()}"
 
     def signature(self):
         r = self.getSigningKey()
         return hmac_hash256(r, self.stringToSign()).hexdigest()
 
-    def getSigningKey(self, r="cn-north-1", n="imagex"):
+    def getSigningKey(self, r="cn-north-1"):
+        n = self.serviceName
+
         o = hmac_hash256("AWS4" + self.e['secret_access_key'], str(self.t[0:8]))
         i = hmac_hash256(o, str(r))
         s = hmac_hash256(i, str(n))
@@ -71,8 +75,8 @@ class JJRequest:
         t.append(hash256(self.canonicalString()))
         return "\n".join(t)
 
-    def credentialString(self, region="cn-north-1", serviceName="imagex"):
-        return "/".join([self.t[0:8], region, serviceName, "aws4_request"])
+    def credentialString(self, region="cn-north-1"):
+        return "/".join([self.t[0:8], region, self.serviceName, "aws4_request"])
 
     def canonicalString(self):
         e = []
@@ -169,6 +173,77 @@ def upload(image: bytes, upload_token: dict):  # oss 跨账号不知道是否可
     return oss_uri
 
 
+@cache(ttl=15 * 60)
+def upload_for_vod(image: bytes, upload_token: dict):  # oss 跨账号不知道是否可以使用
+    # e = auth = upload_token['data']['auth'] # 豆包
+    data = upload_token['data']
+    service_id = data.get('service_id', '3jr8j4ixpe')  # 即梦 3jr8j4ixpe 豆包 a9rns2rl98
+
+    if 'auth' in data:
+        data = data['auth']
+
+    session_token = data['session_token']
+
+    t = time.strftime("%Y%m%dT%H%M%SZ", time.gmtime())
+
+    params = {
+        "Action": "ApplyUploadInner",
+        "Version": "2020-11-19",
+        # "ServiceId": service_id,
+        "SpaceName": "artist_op",
+
+        "s": random_str(10),
+
+        "FileType": "video",
+        "FileSize": len(image),
+
+    }
+
+    r = JJRequest(data, t, "https://vod.bytedanceapi.com/", method="GET", params=params, serviceName="vod")
+    headers = {
+        'authorization': r.getAuthorization(),
+        'x-amz-date': t,
+        'x-amz-security-token': session_token,
+    }
+    # logger.debug(headers)
+    response = requests.get(r.api, params=params, headers=headers)
+    response.raise_for_status()
+    logger.debug(response.status_code)
+    response = response.json()
+
+    logger.debug(bjson(response))
+    if "Result" not in response:
+        return
+
+    upload_node = response['Result']['InnerUploadAddress']['UploadNodes'][0]
+    store_info = upload_node['StoreInfos'][0]
+    logger.debug(bjson(store_info))
+
+    vid = upload_node['Vid']
+    upload_host = upload_node['UploadHost']
+
+    oss_uri = store_info['StoreUri']
+    oss_token = store_info['Auth']
+
+    headers = {
+        "authorization": oss_token,
+        "content-length": str(len(image)),
+        "content-Type": "image/jpeg",
+        "content-crc32": fileCRC32(image),
+    }
+
+    # upload_url = f"https://tos-hl-x.snssdk.com/upload/v1/{oss_uri}"
+    upload_url = f"https://{upload_host}/upload/v1/{oss_uri}"
+
+    response = requests.post(upload_url, headers=headers, data=image)
+    response.raise_for_status()
+    response = response.json()
+
+    logger.debug(response)
+
+    return oss_uri
+
+
 if __name__ == "__main__":
     from meutils.apis.jimeng.common import get_upload_token
 
@@ -176,12 +251,13 @@ if __name__ == "__main__":
     token = "de2215a7bb8e442774cf388f03fac84c"
 
     # jimeng
-    token = "693701c43e477b7c405cc7e2fef0ddbd"
+    token = "eb4d120829cfd3ee957943f63d6152ed"
     #
     upload_token = arun(get_upload_token(token))
 
     #
-    # with open("11.jpg", "rb") as f:
-    #     file = image = f.read()
-    #
-    #     upload(image, upload_token)
+    with open("11.jpg", "rb") as f:
+        file = image = f.read()
+
+        # upload(image, upload_token)
+        print(upload_for_vod(image, upload_token))

meutils/apis/jimeng/lip_sync.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : lip_sync
+# @Time         : 2025/1/3 16:17
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *

meutils/data/VERSION

@@ -1 +1 @@
-2025.01.03.16.13.27
+2025.01.04.11.04.46