MeUtils 2024.12.2.11.1.18__py3-none-any.whl → 2024.12.5.12.28.40__py3-none-any.whl

meutils/apis/napkin/icons.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : icons
+# @Time         : 2024/12/3 16:54
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : https://app.napkin.ai/api/v1/auth/sessions
+import json
+
+from meutils.pipe import *
+from meutils.schemas.napkin_types import BASE_URL, ASSETS_BASE_URL, IconsSimilarRequest, Icon, IconsSimilarResponse
+
+
+async def icons_similar(request: IconsSimilarRequest):
+    headers = {
+
+        "cookie": "napkin.identity.visitor=visitor%409e2a59af-19ad-4dc3-96c8-9efbca71c547; napkin.analytics.device_id=d_950e4683-ae41-4941-b9a7-7e8deba8e669_1733214660768; _ga=GA1.1.511154647.1733214661; _fbp=fb.1.1733214661606.54464059277067597; _tt_enable_cookie=1; _ttp=SFxRhdE5PO5Rslohwet46IwiaB3.tt.1; _clck=16odoyg%7C2%7Cfre%7C0%7C1798; intercom-id-zrfc296i=6eb3740a-9c79-4681-87ec-532e4334816f; intercom-device-id-zrfc296i=f282621f-dcec-429b-90c0-fc98bd9dbb71; _ga_NM0S4FZ9JH=GS1.1.1733214661.1.0.1733214667.0.0.0; napkin.app.identity.session=NGJlMjdiZGEtZGEwNi00ZWE5LTkwMjEtN2U4ODAyNjE5NGJm.5092981dc495fe0041ed99fc68dcefa4ba26a0f6; intercom-session-zrfc296i=MGpOUDEvRlE3ZlRyUkhmaUdsVmZjYXNQT2lJYSsxYitaWDhTT0tMWlJFVkVuVjBwTno5emJydVd3VUhvKzlvRC0tLys4ZEp5a0F5M1YzNkFOazJUV2Nudz09--d6be7442da979794afe682b2e044bf51bd19ac88; _clsk=yficge%7C1733214772932%7C9%7C1%7Cr.clarity.ms%2Fcollect; _ga_L149GZ61DV=GS1.1.1733214675.1.1.1733215282.58.0.0",
+        "origin": "https://app.napkin.ai",
+
+        "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+    }
+
+    payload = request.model_dump()
+
+    async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=30) as client:
+        response = await client.post(
+            "/features/text/icons_similar",
+            json=payload,
+        )
+        response.raise_for_status()
+        data = response.json()
+        logger.debug(data)
+        response = IconsSimilarResponse(**data)
+
+        return response.model_dump()
+
+
+if __name__ == '__main__':
+    request = IconsSimilarRequest(caption="一杯咖啡与灵感的邂逅")
+    arun(icons_similar(request))

meutils/apis/sunoai/suno.py

@@ -61,13 +61,21 @@ async def get_access_token(token: str):
     token, last_active_session_id = await get_refresh_token(token)  # last_active_token 没啥用
 
     headers = {
-        "Cookie": f"__client={token}"
+        "Cookie": f"__client={token}",
+    }
+
+    params = {
+        "__clerk_api_version": "2021-02-05",
+        "_clerk_js_version": "5.35.1"
     }
+
     async with httpx.AsyncClient(base_url=CLIENT_BASE_URL, headers=headers, timeout=60) as client:
-        response = await client.post(f"/sessions/{last_active_session_id}/tokens")
-        if response.is_success:
-            return response.json().get('jwt')
+        response = await client.post(f"/sessions/{last_active_session_id}/tokens", params=params)
+        response.raise_for_status()
+        logger.debug(bjson(response.json()))
+        return response.json().get('jwt')
 
+# /tokens?__clerk_api_version=2021-02-05&_clerk_js_version=5.35.1
 
 @retrying(predicate=lambda r: not r)
 async def create_task(request: SunoAIRequest, token: Optional[str] = None):
@@ -314,9 +322,9 @@ async def create_task_for_cover(cover_from_url, lyrics):
 if __name__ == '__main__':
     # token = os.getenv("SUNO_API_KEY")
     # token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6ImNsaWVudF8yaGlHSTlCZFVwOUdZcUlGM3ZmTU1IT25SNFAiLCJyb3RhdGluZ190b2tlbiI6ImltOWMzOGJ4bnV2OThiZXplMW8yOG1zd2Y2c3lrdzd6YnM2ejJubHkifQ.SnC8-G2LVQztTiA2davFS413mQIaBmRFDzIw1JmvHg4UOMXq95z0CgbfK8Gx8Zv-FXdpKVqkamiNTzZP9qsLOSgREqCSSq5bmA6SPIWx-R6dj1PMDFRX-qv5qGyyPe4sadF6wnr45MS9859148gRmr_Go8rAT_7Hu0DKySextl-Xbs6ClDaYYUyyV3HudWQh4F8jwvxkyer05AgN6smQH5eZI-NRKVgZn_i6Mtl8IJz8R1fzD2YNIcvH4QC4qGhrg9n74ljIeORCMsoJzW2SBZa4QWWDx_0VYs-tA_Z43bqwN_2ojMGM63fm2hLOZmwf6S1LQy9_O6UdcUQiEs__OA"
-
+    token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6ImNsaWVudF8ybEIwRFlXTWYya3NxNWlxazl4S2dZbmQ0eVciLCJyb3RhdGluZ190b2tlbiI6Im5vejdpMzlvY2YzMTEzaHp6aDZwY2N5MzltZm5xNmZvdnhtOG9oNngifQ.qUeBLl-NxKzhpoUBpo_EwkHH0qwIsG0nMSD_yvHv5EK7YfybupoPWw8SpSKDhmZu5K_KsgdOF0RQH22jll4U-x0BwfVu1ze-GBxjnNEoSerUB7hu1cfvmg7xMH8rHJQig2TWE2h0hzP6dMajPHQWRTltbb5MMkKHgBFj0CiAFqaGwzSSvAtERwwHBIK3KalbaV1oyd6DJYG4FrVgQLubkp7VXj11LszxD6qXklRhsc9h55kvYASDPHhnZJi9u2QfIbiKVkraXb6ShqDmNtqXbj22p6g2R9fwMEB-m68S7QSZyAWRArWzsSZujzhxmNuMGbuVX1v7op7F3hA2zFphYw"
     # print(arun(get_refresh_token(token)))
-    # print(arun(get_access_token("token")))
+    print(arun(get_access_token(token)))
 
     # arun(generate_lyrics(prompt=''))
 
@@ -339,9 +347,9 @@ if __name__ == '__main__':
     # token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6ImNsaWVudF8yajM1dkNXaTE1b0VQWnlUU0RMMnBsU3RiMVQiLCJyb3RhdGluZ190b2tlbiI6Ijd5MDV0cG1nMWJpbjBmaGIxZW1kYzZoazQzbDRuaG84bmJ4Yzc1dzgifQ.LsEfuPgwXu33f_UD2pRY4HjHIwU_rPG2rvG46BVDKqXcPmhRTWl5LjKgFrSzU51tgxfG-wMopVJhRxgS6YZUMtKVojDFtV_ZImyJ30u6LYA5nSbrkhqUrBdU4P5WmkL9irvh4sGPtvv8ML_pyXzsittsDrNnDCtm_isacOD-Fy3VKOCOjWj4W3qUUdnmBvTeeUbrnepQqurAjYPg6Ug-WkR43xZ5tWtxxTQ4ebtZglgRyCbyF3TM9XMKa67FTwHQsja8cLo2CyGRzb89e3uuF8Na_CY17ZlxJyQ2p_FZmL0egWr0EveZFeVzIUUs704pkhKd-RC9Q47Jqcg8qdiRYA"
     # arun(generate_lyrics('hi', token))
     # arun(generate_lyrics())
-    task_id = "0b017d4e-c559-4cc6-9339-9cd53aa25af4"
-    token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6ImNsaWVudF8ybEIwRFlXTWYya3NxNWlxazl4S2dZbmQ0eVciLCJyb3RhdGluZ190b2tlbiI6Im5vejdpMzlvY2YzMTEzaHp6aDZwY2N5MzltZm5xNmZvdnhtOG9oNngifQ.qUeBLl-NxKzhpoUBpo_EwkHH0qwIsG0nMSD_yvHv5EK7YfybupoPWw8SpSKDhmZu5K_KsgdOF0RQH22jll4U-x0BwfVu1ze-GBxjnNEoSerUB7hu1cfvmg7xMH8rHJQig2TWE2h0hzP6dMajPHQWRTltbb5MMkKHgBFj0CiAFqaGwzSSvAtERwwHBIK3KalbaV1oyd6DJYG4FrVgQLubkp7VXj11LszxD6qXklRhsc9h55kvYASDPHhnZJi9u2QfIbiKVkraXb6ShqDmNtqXbj22p6g2R9fwMEB-m68S7QSZyAWRArWzsSZujzhxmNuMGbuVX1v7op7F3hA2zFphYw"
-    arun(get_task(task_id=task_id, token=token))
+    # task_id = "0b017d4e-c559-4cc6-9339-9cd53aa25af4"
+    # token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6ImNsaWVudF8ybEIwRFlXTWYya3NxNWlxazl4S2dZbmQ0eVciLCJyb3RhdGluZ190b2tlbiI6Im5vejdpMzlvY2YzMTEzaHp6aDZwY2N5MzltZm5xNmZvdnhtOG9oNngifQ.qUeBLl-NxKzhpoUBpo_EwkHH0qwIsG0nMSD_yvHv5EK7YfybupoPWw8SpSKDhmZu5K_KsgdOF0RQH22jll4U-x0BwfVu1ze-GBxjnNEoSerUB7hu1cfvmg7xMH8rHJQig2TWE2h0hzP6dMajPHQWRTltbb5MMkKHgBFj0CiAFqaGwzSSvAtERwwHBIK3KalbaV1oyd6DJYG4FrVgQLubkp7VXj11LszxD6qXklRhsc9h55kvYASDPHhnZJi9u2QfIbiKVkraXb6ShqDmNtqXbj22p6g2R9fwMEB-m68S7QSZyAWRArWzsSZujzhxmNuMGbuVX1v7op7F3hA2zFphYw"
+    # arun(get_task(task_id=task_id, token=token))
 
     # arun(get_credits(token))
     # arun(check_token(token))

meutils/apis/textin.py

@@ -112,6 +112,7 @@ if __name__ == '__main__':
 
     # response = requests.request("POST", url, data=data)
     data = open("/Users/betterme/PycharmProjects/AI/qun.png", 'rb').read()
+    data = open("img.png", 'rb').read()
     # data = arun(to_bytes("https://cdn.meimeiqushuiyin.cn/ori/tmp_e8d6329e1b2c1bc541ca530fcbae14e3ec12f65d8d4ec97d.jpg"))
 
     from meutils.schemas.task_types import Purpose
@@ -121,6 +122,8 @@ if __name__ == '__main__':
 
     # service = "pdf_to_markdown"
 
+    service = 'dewarp'
+
     async def main(n=1):
         for i in tqdm(range(n)):
             try:

meutils/async_task/celery_config.py

@@ -19,6 +19,8 @@ broker_url = os.getenv('REDIS_URL', broker_url)
 # result_backend = f"redis://localhost:6379/1"  # 结果存储
 result_backend = f"{broker_url.replace('/0', '')}/1"  # 结果存储
 
+# logger.debug(result_backend)
+
 # 添加以下配置增加可靠性
 broker_connection_retry = True
 broker_connection_max_retries = 5

meutils/async_task/utils.py

@@ -63,23 +63,26 @@ async def get_task(
         }
     :return:
     """
-    await redis_aclient.select(1)  # 切到 celery
-    if not await redis_aclient.get(f"celery-task-meta-{task_id}"):
-        raise HTTPException(status_code=404, detail="TaskID not found")
-
     filter_kwargs = filter_kwargs or {}
     filter_kwargs["task_id"] = task_id
 
     result = AsyncResult(id=task_id)
-    # logger.debug(bjson(result._get_task_meta()))
-    # logger.debug(bjson(result.get()))
+    logger.debug(bjson(result._get_task_meta()))
+    # logger.debug(bjson(result.get(timeout=30)))
+    logger.debug(result)
+    logger.debug(result.ready())
+    logger.debug(result.state)
 
-    data = result.get().copy()  # 创建任务时：remote task的返回结果 ####### copy避免丢失字段
-    logger.debug(bjson(data))
-    token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
+    # if result.status=="PENDING": # worker可能还未启动，会阻塞
+    # if await redis_aclient.select(1) and not await redis_aclient.exists(f"celery-task-meta-{task_id}"):
+    #     raise HTTPException(status_code=404, detail="TaskID not found")
 
     if result.ready():
         if result.successful():
+            data = result.get(timeout=30).copy()  # 创建任务时：remote task的返回结果 ####### copy避免丢失字段
+            logger.debug(bjson(data))
+            token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
+
             remote_task_id = (
                     data.get("task_id")  # 提前写
                     or data.get("data", {}).get("task_id")
@@ -96,13 +99,21 @@ async def get_task(
                 data=data
             )
 
-            if remote_get_task:  # 获取远程任务, todo: 判断函数类型
+            if remote_get_task:
+                if inspect.iscoroutinefunction(remote_get_task):
+                    remote_task_response = await remote_get_task(remote_task_id, token)
+                else:
+                    remote_task_response = remote_get_task(remote_task_id, token)
 
-                remote_task_response = await remote_get_task(remote_task_id, token)
                 if not isinstance(remote_task_response, dict):
                     remote_task_response = remote_task_response.model_dump()
 
+                # logger.debug(response)
+                # logger.debug(remote_task_response)
+
                 response.__dict__.update(remote_task_response)  # 更新 response
+                # logger.debug(response)
+
 
         else:
             response = TaskResponse(
@@ -144,13 +155,13 @@ async def update_oneapi_from_response(task: OneapiTask, task_response: TaskRespo
     需要获取这几个信息 user_id
 
     """
-    if task.status in {"SUCCESS", "FAILURE"}: return False  # 跳出轮询，不再更新
+    # if task.status in {"SUCCESS", "FAILURE"}: return False  # 跳出轮询，不再更新
 
     task.data = task_response.model_dump(exclude={"system_fingerprint"})
     task.status = task_response.status
     task.progress = time.time() // 10 % 100
 
-    if task.status == "SUCCESS":
+    if task.status == "SUCCESS":  ###### todo: 状态对齐
         task.progress = "100%"
     elif task.status == "FAILURE":
         task.fail_reason = "查看详情"
@@ -164,7 +175,7 @@ if __name__ == '__main__':
 
     from meutils.apis.kling import kolors_virtual_try_on
 
-    task_id = "d91e39a9-eff9-4e98-8412-a5c40371479e"
+    task_id = "31b9bb1b-db59-4a94-9027-2ded2e4f24aa"
     # filter_kwargs = {
     #     "task_id": task_id,  #########理论上只需这个
     #     "user_id": 1,

meutils/config_utils/config_manager.py

@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : config_manager
+# @Time         : 2024/12/4 12:07
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+
+import nacos
+import yaml
+
+from meutils.pipe import *
+
+class ConfigManager:
+    _instance = None
+    _config: Dict[str, Any] = {}
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    def __init__(self):
+        # Nacos客户端配置
+        self.client = nacos.NacosClient(
+            server_addresses="nacos.chatfire.cc",  # Nacos服务器地址
+            namespace="test",  # 命名空间
+            username="chatfire",  # 用户名
+            password="chatfirechatfire"  # 密码
+        )
+
+    def init_config(self, data_id: str, group: str = "DEFAULT_GROUP"):
+        """初始化配置并添加监听器"""
+        # 获取初始配置
+        config = self.client.get_config(data_id, group)
+        logger.debug(config)
+
+        if config:
+            self._config = yaml.safe_load(config)
+
+        # 添加配置变更监听器
+        self.client.add_config_watcher(
+            data_id,
+            group,
+            self._config_changed_callback
+        )
+
+    def _config_changed_callback(self, args):
+        """配置变更回调函数"""
+        print(f"配置发生变更: {args}")
+        try:
+            self._config = yaml.safe_load(args['content'])
+            print(f"最新配置: {self._config}")
+        except Exception as e:
+            print(f"配置更新失败: {e}")
+
+    @property
+    def config(self) -> Dict[str, Any]:
+        """获取当前配置"""
+        return self._config
+
+
+if __name__ == '__main__':
+    # 初始化配置管理器
+
+    data_id = "testdata"
+    group = "DEFAULT_GROUP"
+
+    config_manager = ConfigManager()
+    config_manager.init_config(
+        data_id=data_id,  # 配置ID
+    )
+
+    # yaml.safe_load("- 1")

meutils/config_utils/{nacos.py → nacosx.py}

@@ -10,22 +10,21 @@
 # https://baijiahao.baidu.com/s?id=1774464887530962175&wfr=spider&for=pc
 
 from meutils.pipe import *
-import nacos
+import nacos  # nacos-sdk-python
 
 # Both HTTP/HTTPS protocols are supported, if not set protocol prefix default is HTTP, and HTTPS with no ssl check(verify=False)
 # "192.168.3.4:8848" or "https://192.168.3.4:443" or "http://192.168.3.4:8848,192.168.3.5:8848" or "https://192.168.3.4:443,https://192.168.3.5:443"
-SERVER_ADDRESSES = "server addresses split by comma"
-NAMESPACE = "namespace id"
+server_addresses = "nacos.chatfire.cc"
+NAMESPACE = "test"
 
 # no auth mode
-client = nacos.NacosClient(SERVER_ADDRESSES, namespace=NAMESPACE)
+client = nacos.NacosClient(server_addresses=server_addresses, namespace=NAMESPACE, username='chatfire', password='chatfirechatfire')
 # auth mode
 # client = nacos.NacosClient(SERVER_ADDRESSES, namespace=NAMESPACE, ak="{ak}", sk="{sk}")
 
 # get config
-data_id = "config.nacos"
-group = "group"
+data_id = "testdata"
+group = "DEFAULT_GROUP"
 print(client.get_config(data_id, group))
 
 
-

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.02.11.01.18
+2024.12.05.12.28.40

meutils/db/redis_db.py

@@ -66,7 +66,7 @@ if __name__ == '__main__':
     # _ = redis_client.lrange(feishu, 0, -1)
     # print(len(eval(_)))
 
-    task_id = "celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa"
+    task_id = "celery-task-meta-ca94c602-a2cc-4db5-afe4-763f30df8a18"
 
 
     # arun(redis_aclient.get('celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa'))
@@ -75,7 +75,7 @@ if __name__ == '__main__':
 
     async def main():
         r = await redis_aclient.select(1)
-        print(await redis_aclient.get('celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa'))
+        return await redis_aclient.get(task_id)
 
 
     arun(main())

meutils/llm/completions/tune.py

@@ -114,12 +114,12 @@ async def get_access_token():
 
 @alru_cache(ttl=60)
 @retrying(predicate=lambda r: r is None)
-async def create_conversation_id(token: Optional[str] = None):
-    token = token or await get_access_token()
+async def create_conversation_id(token: str):
     headers = {
         "authorization": token
     }
     conversation_id = str(uuid.uuid4())  # shortuuid.random()
+    # conversation_id = "af306c40-8f85-47a7-a027-185da084c6cc"
     params = {
         "conversation_id": conversation_id,
         "organization_id": "undefined",
@@ -128,34 +128,36 @@ async def create_conversation_id(token: Optional[str] = None):
     }
     async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=30) as client:
         response = await client.post("/api/new", params=params)
-
-        response = await client.get(f"/?id={conversation_id}", headers=headers)
-        html_content = response.text
-        pattern = r'(/_next/static/chunks/7116-[^"]+\.js)'
-        js = re.findall(pattern, html_content)[-1]
-
-        logger.debug(js)
-
-        response = await client.get(js)
-
-        logger.debug(response.status_code)
-        next_action = response.text.split(',A=(0,a.$)("')[1][:40]
-        logger.debug(next_action)  # 2bc738a7215e149dbd4601a440f3b6df45089338 过期时间
-
-        headers = {
-            'next-action': next_action,
-            'Cookie': f"AccessToken={token}",
-
-            'content-type': 'text/plain;charset=UTF-8',
-        }
-        payload = "[]"
-        response = await client.post(f"/?id={conversation_id}", headers=headers, content=payload)
-
         logger.debug(response.status_code)
         logger.debug(response.text)
-
-        if response.is_success:
-            return conversation_id
+        return conversation_id
+
+        # response = await client.get(f"/?id={conversation_id}", headers=headers)
+        # html_content = response.text
+        # pattern = r'(/_next/static/chunks/7116-[^"]+\.js)'
+        # js = re.findall(pattern, html_content)[-1]
+        #
+        # logger.debug(js)
+        #
+        # response = await client.get(js)
+        #
+        # logger.debug(response.status_code)
+        # next_action = response.text.split(',A=(0,a.$)("')[1][:40]
+        # logger.debug(next_action)  # 2bc738a7215e149dbd4601a440f3b6df45089338 过期时间
+        #
+        # headers = {
+        #     'next-action': next_action,
+        #     'Cookie': f"AccessToken={token}",
+        #
+        #     'content-type': 'text/plain;charset=UTF-8',
+        # }
+        # payload = "[]"
+        # response = await client.post(f"/?id={conversation_id}", headers=headers, content=payload)
+        #
+        # logger.debug(response.status_code)
+        # logger.debug(response.text)
+        #
+        # return conversation_id
 
 
 @retrying(max_retries=3)
@@ -168,6 +170,8 @@ async def create(request: ChatCompletionRequest, token: Optional[str] = None, vi
     token = token or await get_access_token()
     conversation_id = await create_conversation_id(token)
 
+    logger.debug(conversation_id)
+
     use_search = False
     if request.messages[0].get('role') != 'system':  # 还原系统信息
         request.messages.insert(0, {'role': 'system', 'content': f'You are {request.model}'})
@@ -181,19 +185,19 @@ async def create(request: ChatCompletionRequest, token: Optional[str] = None, vi
 
     headers = {
         "authorization": token,
-        'Cookie': f"AccessToken={token};",
+        # 'Cookie': f"AccessToken={token};",
         "content-type": "text/plain;charset=UTF-8",
 
     }
     params = {
-        "organization_id": "undefined",
+        # "organization_id": "undefined",
         # "organization_id": "eb0fb996-2317-467b-9847-15f6c40000b7",
         "retry": 2,
     }
     payload = {
         # "query": request.last_content,
         "query": oneturn2multiturn(request.messages),
-        "images": request.urls,  # todo: 兼容base64
+        # "images": request.urls,  # todo: 兼容base64
 
         "conversation_id": conversation_id,
         "model_id": request.model,  # "kaushikaakash04/tune-blob"
@@ -202,6 +206,8 @@ async def create(request: ChatCompletionRequest, token: Optional[str] = None, vi
         "attachment_name": "",
         # "messageId": "4a33e497-efb7-4d8f-ae45-9aa7d2c1c5af1726811555410",
         # "prevMessageId": "4a33e497-efb7-4d8f-ae45-9aa7d2c1c5af1726811555410",
+
+        "check": "286600"
     }
 
     yield "\n"  # 提升首字速度
@@ -254,9 +260,9 @@ if __name__ == '__main__':
     # model = "net-anthropic/claude-3.5-sonnet"
     # model = "all"
 
-    # model = "kaushikaakash04/tune-blob"
+    model = "kaushikaakash04/tune-blob"
     # model = "openai/o1-mini"
-    model = "o1-mini-0609"
+    # model = "o1-mini-0609"
 
     # model = "openai/gpt-4o-mini"
 

meutils/schemas/hailuo_types.py

@@ -21,6 +21,14 @@ FEISHU_URL_OSS = "https://xchatllm.feishu.cn/sheets/MekfsfVuohfUf1tsWV0cCvTmn3c?
 
 class VideoRequest(BaseModel):
     """
+    23000 文生视频
+    "T2V-01": "23000"
+    "I2V-01": "23001"
+    "I2V-01-live"： "23011"
+
+    {"desc":"飞起来","useOriginPrompt":false,"fileList":[{"id":"320650134834716679","name":"s.jpg","type":"jpg"}],"modelID":"23001"} # 老模型
+    {"desc":"飞起来","useOriginPrompt":false,"fileList":[{"id":"320650134834716679","name":"s.jpg","type":"jpg"}],"modelID":"23011"} # 新模型
+
     {"desc":"跳动","useOriginPrompt":true,"fileList":[{"id":"304987062153912323","name":"3a71b0bb-3cab-4e69-b1f0-592976d0897b_00001_.png","type":"png"}]}
     """
     model: str = "video-01"
@@ -35,6 +43,10 @@ class VideoRequest(BaseModel):
     传入图片需要满足以下条件：格式为JPG/JPEG/PNG；长宽比大于2:5、小于5:2；短边像素大于300px；体积不大于20MB。"""
     first_frame_image: Optional[str] = None
 
+    def __init__(self, /, **data: Any):
+        super().__init__(**data)
+
+
 
 class BaseResponse(BaseModel):
     """
@@ -110,6 +122,7 @@ class VideoResponse(BaseModel):
         if self.file_id is None and self.videos:
             self.file_id = self.videos[0].videoURL
 
+
 #
 # "data": {
 #         "videos": [
@@ -138,3 +151,51 @@ class VideoResponse(BaseModel):
 #         "cycleTime": 10,
 #         "hasMore": false
 #     }
+
+"""
+refer_voice
+请输入您的参考音色ID
+refer_instrumental
+请输入您的参考伴奏ID
+lyrics
+##在无垠的星空下\n\n梦开始飞翔\n月光洒在心上\n\n温柔的想象\n在这片宁静中\n\n我们自由歌唱##
+model
+music-01
+audio_setting
+{"sample_rate":44100,"bitrate":256000,"format":"mp3"}
+
+"""
+
+
+class MusicRequet(BaseModel):
+    model: str = "music-01"
+
+    lyrics: str
+
+    refer_voice: Optional[str] = None
+    refer_instrumental: Optional[str] = None
+    audio_setting: dict = {
+        "sample_rate": 44100,
+        "bitrate": 256000,
+        "format": "mp3"
+    }
+
+
+"""
+{
+   "data":{
+      "audio":"hex编码的音频数据",
+      "status":2
+   },
+   "trace_id":"02cb3e6a7f8ada5886fdc11e09452353",
+   "base_resp":{
+      "status_code":0,
+      "status_msg":"success"
+   }
+}
+"""
+
+
+class MusicResponse(BaseModel):
+    trace_id: str
+    base_resp: BaseResponse

meutils/schemas/image_types.py

@@ -117,11 +117,6 @@ class FluxImageRequest(ImageRequest):
     def __init__(self, /, **data: Any):
         super().__init__(**data)
         self.image_size = self.size
-        if "dev" in self.model:
-            self.model = 'flux-schnell'
-
-        if "pro" in self.model:
-            self.model = 'flux-pro'
 
 
 class TogetherImageRequest(ImageRequest):  # together
@@ -238,8 +233,7 @@ class RecraftImageRequest(ImageRequest):
             Literal[
                 'any',
                 'digital_illustration',
-                'illustration_3d',
-                'digital_illustration_seamless',
+                'digital_illustration',
                 'digital_illustration_pixel_art',
                 'digital_illustration_3d',
                 'digital_illustration_psychedelic',
@@ -259,6 +253,7 @@ class RecraftImageRequest(ImageRequest):
                 'digital_illustration_hand_drawn_outline',
                 'digital_illustration_handmade_3d',
                 'digital_illustration_stickers_drawings',
+
                 'realistic_image',
                 'realistic_image_mockup',
                 'realistic_image_b_and_w',
@@ -268,6 +263,7 @@ class RecraftImageRequest(ImageRequest):
                 'realistic_image_natural_light',
                 'realistic_image_studio_portrait',
                 'realistic_image_motion_blur',
+
                 'vector_illustration',
                 'vector_illustration_seamless',
                 'vector_illustration_line_art',