MeUtils 2025.1.3.16.13.27__tar.gz → 2025.1.6.14.2.0__tar.gz

{meutils-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0/MeUtils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.1.3.16.13.27
+Version: 2025.1.6.14.2.0
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -108,42 +108,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 Provides-Extra: all
+Requires-Dist: pymongo; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
 Requires-Dist: jmespath; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: openai; extra == "all"
 Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: missingno; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: geopy; extra == "all"
+Requires-Dist: fastapi[all]; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: reportlab; extra == "all"
 Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: simplejson; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: iteration_utilities; 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: redis-py-cluster; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: geopy; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: missingno; extra == "all"
 Requires-Dist: schedule; extra == "all"
-Requires-Dist: seaborn; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: pymysql; 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: jieba; extra == "all"
 Requires-Dist: streamlit; extra == "all"
+Requires-Dist: langchain; extra == "all"
 Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: pymupd; extra == "all"
+Requires-Dist: pandas_summary; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0}/MeUtils.egg-info/SOURCES.txt

@@ -154,6 +154,7 @@ meutils/apis/jimeng/doubao.py
 meutils/apis/jimeng/doubao_utils.py
 meutils/apis/jimeng/files.py
 meutils/apis/jimeng/images.py
+meutils/apis/jimeng/lip_sync.py
 meutils/apis/kling/__init__.py
 meutils/apis/kling/api.py
 meutils/apis/kling/images.py

{meutils-2025.1.3.16.13.27/MeUtils.egg-info → meutils-2025.1.6.14.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.1.3.16.13.27
+Version: 2025.1.6.14.2.0
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -108,42 +108,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 Provides-Extra: all
+Requires-Dist: pymongo; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
 Requires-Dist: jmespath; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: openai; extra == "all"
 Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: missingno; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: geopy; extra == "all"
+Requires-Dist: fastapi[all]; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: reportlab; extra == "all"
 Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: simplejson; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: iteration_utilities; 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: redis-py-cluster; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: geopy; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: missingno; extra == "all"
 Requires-Dist: schedule; extra == "all"
-Requires-Dist: seaborn; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: pymysql; 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: jieba; extra == "all"
 Requires-Dist: streamlit; extra == "all"
+Requires-Dist: langchain; extra == "all"
 Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: pymupd; extra == "all"
+Requires-Dist: pandas_summary; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0}/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-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0}/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-2025.1.6.14.2.0/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-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0}/meutils/apis/vidu/vidu_video.py

@@ -206,20 +206,21 @@ if __name__ == '__main__':
     # arun(get_credits(token))
     #
     d = {
-        "prompt": "一条可爱的狗跑过来",
-        # "url": url  # failed to save uploads
+        "model": 'vidu-1.5',
+        "prompt": "这个女人笑起来",
+        "url": "https://oss.ffire.cc/files/kling_watermark.png"  # failed to save uploads
     }
     token = None
     # print(bjson(ViduRequest(**d).payload))
-    # arun(create_task(ViduRequest(**d)))
+    arun(create_task(ViduRequest(**d)))
     # arun(create_task(ViduRequest(**d), vip=False))
     # # pass
     # token = "sensorsdata2015jssdkcross=dfm-enc-%7B%22Va28a6y8_aV%22%3A%22sSsAAnHAInAGEtIG%22%2C%22gae28_aV%22%3A%22EGEuAnststSEirt-ARSAigSVHIiHVs-EtHsHnIR-sARInAA-EGEuAnststHsIti%22%2C%22OemO2%22%3A%7B%22%24ki8r28_8eiggay_2mbeyr_8cOr%22%3A%22%E7%9B%B4%E6%8E%A5%E6%B5%81%E9%87%8F%22%2C%22%24ki8r28_2rieyz_lrcMmeV%22%3A%22%E6%9C%AA%E5%8F%96%E5%88%B0%E5%80%BC_%E7%9B%B4%E6%8E%A5%E6%89%93%E5%BC%80%22%2C%22%24ki8r28_ergreere%22%3A%22%22%7D%2C%22aVr68a8ar2%22%3A%22rc3liZ7ku67OV5kgPsGCiskkDskl3qmawFlJPq0swqfcpXNJPZKSBF0IQXLzWq7lQFQzQZNcBF1SQF3EQqwIBF3MQhwswX08wFlJPq0swqfcpXKcwhzz3aMax9klWZHAiD7HDsJCWskbDskl3qmawqNcwX0sQF0hQq0HwFfhp4xG%22%2C%22za28mec_kmfa6_aV%22%3A%7B%226ior%22%3A%22%24aVr68a8c_kmfa6_aV%22%2C%22Cikbr%22%3A%22sSsAAnHAInAGEtIG%22%7D%7D;_ga=GA1.1.2058758439.1724312077;_ga_ZJBV7VYP55=GS1.1.1727080335.38.1.1727080510.0.0.0;JWT=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjgzNTAzODAsImlhdCI6MTcyNzA1NDM4MCwiaXNzIjoiaWFtIiwic3ViIjoiMjQyMDA2NTAzNjA5MTgzOSJ9.PkjQqjYB56vYetYwmlagnWn_6bSCwoxCjI7BjfelBOU;Shunt="
     # # token = "_ga=GA1.1.2058758439.1724312077; JWT=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjgzNTAzODAsImlhdCI6MTcyNzA1NDM4MCwiaXNzIjoiaWFtIiwic3ViIjoiMjQyMDA2NTAzNjA5MTgzOSJ9.PkjQqjYB56vYetYwmlagnWn_6bSCwoxCjI7BjfelBOU; Shunt=; sensorsdata2015jssdkcross=dfm-enc-%7B%22Va28a6y8_aV%22%3A%22sSsAAnHAInAGEtIG%22%2C%22gae28_aV%22%3A%22EGEuAnststSEirt-ARSAigSVHIiHVs-EtHsHnIR-sARInAA-EGEuAnststHsIti%22%2C%22OemO2%22%3A%7B%22%24ki8r28_8eiggay_2mbeyr_8cOr%22%3A%22%E7%9B%B4%E6%8E%A5%E6%B5%81%E9%87%8F%22%2C%22%24ki8r28_2rieyz_lrcMmeV%22%3A%22%E6%9C%AA%E5%8F%96%E5%88%B0%E5%80%BC_%E7%9B%B4%E6%8E%A5%E6%89%93%E5%BC%80%22%2C%22%24ki8r28_ergreere%22%3A%22%22%7D%2C%22aVr68a8ar2%22%3A%22rc3liZ7ku67OV5kgPsGCiskkDskl3qmawFlJPq0swqfcpXNJPZKSBF0IQXLzWq7lQFQzQZNcBF1SQF3EQqwIBF3MQhwswX08wFlJPq0swqfcpXKcwhzz3aMax9klWZHAiD7HDsJCWskbDskl3qmawqNcwX0sQF0hQq0HwFfhp4xG%22%2C%22za28mec_kmfa6_aV%22%3A%7B%226ior%22%3A%22%24aVr68a8c_kmfa6_aV%22%2C%22Cikbr%22%3A%22sSsAAnHAInAGEtIG%22%7D%7D; _ga_ZJBV7VYP55=GS1.1.1727080335.38.1.1727080510.0.0.0"
     # token = "JWT=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjgzNDkyNzQsImlhdCI6MTcyNzA1MzI3NCwiaXNzIjoiaWFtIiwic3ViIjoiMjQyMDg5NjA4MTIwNTkwNyJ9.MRXmSr48PifQgRN1-yTTu8d7Sq1An4OS7G5WoYpJ_PU"
 
-    token = "_ga=GA1.1.1191408146.1725443726; Shunt=; JWT=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MzY0NzgzODIsImlhdCI6MTczNTE4MjM4MiwiaXNzIjoiaWFtIiwic3ViIjoiMjU3NTg1MzI5MDUyNzYwNiJ9.AJBuQH0B9aQ2znnczYoqBw9YvHkLh0uZF0QQx5xdxrc; sensorsdata2015jssdkcross=dfm-enc-%7B%22Va28a6y8_aV%22%3A%22sHRHtHIsGAHsRnAn%22%2C%22gae28_aV%22%3A%22EGEuyRHVigIEtAG-AGRuSsHrVAGRuS-EtHsHnIR-sARInAA-EGEuyRHVigSEuIR%22%2C%22OemO2%22%3A%7B%22%24ki8r28_8eiggay_2mbeyr_8cOr%22%3A%22%E8%87%AA%E7%84%B6%E6%90%9C%E7%B4%A2%E6%B5%81%E9%87%8F%22%2C%22%24ki8r28_2rieyz_lrcMmeV%22%3A%22%E6%9C%AA%E5%8F%96%E5%88%B0%E5%80%BC%22%2C%22%24ki8r28_ergreere%22%3A%22z88O2%3A%2F%2Fiyymb682.fmmfkr.ymo%2F%22%7D%2C%22aVr68a8ar2%22%3A%22rc3liZ7ku67OV5kgPsGCiskkDskl3qmawFlJPowIQZ7zWqwJpX0HBF0HQs3AwqdkWX0HQs3ABF1SQF3EQqwIBF3MQhwswX08wFlJPowIQZ7zWqNJPqwI3aMax9klWZHAiD7HDsJCWskbDskl3qmawqKIQFfEwh3HwXKcQhPMQaxG%22%2C%22za28mec_kmfa6_aV%22%3A%7B%226ior%22%3A%22%24aVr68a8c_kmfa6_aV%22%2C%22Cikbr%22%3A%22sHRHtHIsGAHsRnAn%22%7D%7D; _ga_ZJBV7VYP55=GS1.1.1735182278.4.1.1735182405.26.0.0"
-    arun(check_token(token))
+    # token = "_ga=GA1.1.1191408146.1725443726; Shunt=; JWT=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MzY0NzgzODIsImlhdCI6MTczNTE4MjM4MiwiaXNzIjoiaWFtIiwic3ViIjoiMjU3NTg1MzI5MDUyNzYwNiJ9.AJBuQH0B9aQ2znnczYoqBw9YvHkLh0uZF0QQx5xdxrc; sensorsdata2015jssdkcross=dfm-enc-%7B%22Va28a6y8_aV%22%3A%22sHRHtHIsGAHsRnAn%22%2C%22gae28_aV%22%3A%22EGEuyRHVigIEtAG-AGRuSsHrVAGRuS-EtHsHnIR-sARInAA-EGEuyRHVigSEuIR%22%2C%22OemO2%22%3A%7B%22%24ki8r28_8eiggay_2mbeyr_8cOr%22%3A%22%E8%87%AA%E7%84%B6%E6%90%9C%E7%B4%A2%E6%B5%81%E9%87%8F%22%2C%22%24ki8r28_2rieyz_lrcMmeV%22%3A%22%E6%9C%AA%E5%8F%96%E5%88%B0%E5%80%BC%22%2C%22%24ki8r28_ergreere%22%3A%22z88O2%3A%2F%2Fiyymb682.fmmfkr.ymo%2F%22%7D%2C%22aVr68a8ar2%22%3A%22rc3liZ7ku67OV5kgPsGCiskkDskl3qmawFlJPowIQZ7zWqwJpX0HBF0HQs3AwqdkWX0HQs3ABF1SQF3EQqwIBF3MQhwswX08wFlJPowIQZ7zWqNJPqwI3aMax9klWZHAiD7HDsJCWskbDskl3qmawqKIQFfEwh3HwXKcQhPMQaxG%22%2C%22za28mec_kmfa6_aV%22%3A%7B%226ior%22%3A%22%24aVr68a8c_kmfa6_aV%22%2C%22Cikbr%22%3A%22sHRHtHIsGAHsRnAn%22%7D%7D; _ga_ZJBV7VYP55=GS1.1.1735182278.4.1.1735182405.26.0.0"
+    # arun(check_token(token))
     #
     # FEISHU_URL = "https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?sheet=rxldsA"
     # FEISHU_URL="https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?sheet=Hcr2i8"

meutils-2025.1.6.14.2.0/meutils/data/VERSION

@@ -0,0 +1 @@
+2025.01.06.14.02.00

{meutils-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0}/meutils/data/oneapi/NOTICE.md

@@ -32,16 +32,15 @@
 </details>
 
 <details markdown="1">
-  <summary><b>预祝大家新年快乐🎁元旦礼物☺</b></summary>
+  <summary><b>大额充值优惠</b></summary>
 
-- 联系企微客服
-  - 充值100-200   增送5%
-  - 充值200-500   增送10%
-  - 充值500-1000  增送15%
-  - 充值1000-2000 增送20%
+- 充值1000-2000 增送10%
 
 </details>
 
+## 2025-01-04
+- 增加模型配额 gemini-2.0-flash-exp、gemini-2.0-flash-thinking-exp-1219
+
 ## 2024-12-31
 
 - 上线新模型
@@ -49,7 +48,6 @@
       在不显著降低通用任务能力的情况下，在专家任务能力方面表现大幅提升。其在 AIME 2024、MATH500 和 LiveCodeBench 评测中，效果与
       OpenAI-o1-Preview 相当。
     - 兼容SparkAI客户端，文件问答&图片问答：baseurl改为`https://api.chatfire.cn/sparkai/v1`
-      ![](https://sfile.chatglm.cn/chatglm4/e5b99a34-f859-4880-a0ea-a9c6dbc8a60f.png)
 
 ## 2024-12-27
 

{meutils-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0}/meutils/schemas/oneapi/common.py

@@ -153,6 +153,7 @@ MODEL_PRICE = {
 
     "api-kling": 0.1,
     "api-kling-vip": 0.5,
+
     "api-kling-v1.6-std-5s": 1 * 0.8,
     "api-kling-v1.6-std-10s": 2 * 0.8,
     "api-kling-v1.6-pro-5s": 1 * 0.8 * 1.75,
@@ -483,6 +484,7 @@ MODEL_RATIO = {
     "google/gemini-flash-1.5-8b-exp": 0.1,  # openrouter免费
     "gemini-2.0-flash": 0.5,
     "gemini-2.0-flash-exp": 0.5,
+    "gemini-2.0-flash-thinking-exp-1219": 1,
 
     "gemini-1.5-pro-001": 1,
     "gemini-1.5-pro-002": 1,
@@ -647,6 +649,7 @@ COMPLETION_RATIO = {
 
     "gemini-2.0-flash": 5,
     "gemini-2.0-flash-exp": 5,
+    "gemini-2.0-flash-thinking-exp-1219": 5,
 
     "hunyuan-a52b-instruct": 5,
     "qwen2.5-coder-32b-instruct": 3,
@@ -853,7 +856,7 @@ GROUP_RATIO = {
     # 定制分组：不公开
     "35": 1,
 
-    "agent": 2
+    "images": 0.5
 
 }
 USER_USABLE_GROUPS = {
@@ -864,9 +867,6 @@ USER_USABLE_GROUPS = {
     "国产": "0.5￥=1$直连🔥国产大模型api，可申请商用独立分组",
 
     "特价": "0.5￥=1$主打性价比🔥claude系列&gpt/o1系列&国产热门大模型",
-
-    "agent": "2.0￥=1$智能体：联网&文件问答",
-
 }
 
 if _ := {k: f"888￥=1$🈲🈲🈲误用不退" for k, v in GROUP_RATIO.items() if k.endswith(("代理",))}:

{meutils-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0}/meutils/schemas/vidu_types.py

@@ -91,7 +91,7 @@ class VideoRequest(BaseModel):
 
 class ViduRequest(BaseModel):
     """quality 倍率2"""
-    model: Union[str, Literal['vidu-high-performance', 'vidu-high-quality']] = "vidu-high-performance"  # vidu-1.5
+    model: Union[str, Literal['vidu-1.5', 'vidu-high-performance', 'vidu-high-quality']] = "vidu-high-performance"
 
     prompt: Optional[str] = None
     url: Optional[str] = None  # ssupload:?id=
@@ -101,6 +101,10 @@ class ViduRequest(BaseModel):
 
     type: Optional[str] = None  # text2video img2video character2video
 
+    """vidu-1.5"""
+    resolution: Literal['512', '720p', 'vidu-high-quality'] = "512"
+    movement_amplitude: Optional[str] = "auto"  # small medium high
+
     payload: dict = {}
 
     def __init__(self, **data):
@@ -135,22 +139,39 @@ class ViduRequest(BaseModel):
                 }
             )
 
-        self.payload = {
-            "input": input,
-            "type": self.type or type,
-            "settings": {
-                "model": self.model,
-                "model_version": "1.0",
-                # "resolution": "512", 1.5才有的参数 先适配1.0
+        if self.model == "vidu-1.5":
+            self.payload = {
+                "input": input,
+                "type": self.type or type,
+                "settings": {
+                    "model_version": "1.5",
+                    "style": "general",
+                    "duration": self.duration,
+
+                    "resolution": self.resolution,
+                    "aspect_ratio": self.aspect_ratio,
+
+                    "movement_amplitude": self.movement_amplitude,
+
+                }
+            }
+        else:
+
+            self.payload = {
+                "input": input,
+                "type": self.type or type,
+                "settings": {
+                    "model": self.model,
+                    "model_version": "1.0",
 
-                "style": self.style,
+                    "style": self.style,
 
-                # "aspect_ratio": self.aspect_ratio,
+                    "aspect_ratio": self.aspect_ratio,
 
-                "duration": self.duration,
+                    "duration": self.duration,
 
+                }
             }
-        }
 
     class Config:
         json_schema_extra = {

meutils-2025.1.3.16.13.27/meutils/data/VERSION

@@ -1 +0,0 @@
-2025.01.03.16.13.27

{meutils-2025.1.3.16.13.27 → meutils-2025.1.6.14.2.0}/MeUtils.egg-info/requires.txt

@@ -45,42 +45,42 @@ openai
 langchain
 
 [all]
+pymongo
+sse_starlette
 jmespath
-pandas-profiling[notebook]
-filetype
-gunicorn
+openai
 pretty_errors
-redis-py-cluster
-sqlalchemy
-missingno
-langchain
-pymysql
-geopy
+fastapi[all]
+filetype
+reportlab
 pyarrow
+simplejson
+seaborn
+cachetools
+fastapi
+iteration_utilities
 faiss-cpu
-jieba
-openai
-thefuck
+redis-py-cluster
+thriftpy2
+geopy
+sqlalchemy
 asyncmy
+gunicorn
+missingno
 schedule
-seaborn
+thefuck
+pandas-profiling[notebook]
+pymysql
 pymilvus
-thriftpy2
-sse_starlette
-dataframe_image
 jinja2
-fastapi[all]
-pymupd
-cachetools
-iteration_utilities
-fastapi
 polars
-pandas_summary
-pymongo
-simplejson
-reportlab
+jieba
 streamlit
+langchain
 uvicorn
+dataframe_image
+pymupd
+pandas_summary
 
 [ann]
 pymilvus