MeUtils 2025.2.11.18.25.28__tar.gz → 2025.2.13.20.50.5__tar.gz

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5/MeUtils.egg-info}/PKG-INFO

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

{meutils-2025.2.11.18.25.28/MeUtils.egg-info → meutils-2025.2.13.20.50.5}/PKG-INFO

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

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/apis/jimeng/images.py

@@ -43,7 +43,7 @@ async def create_draft_content(request: ImageRequest, token: str):
         image_uri = await upload_for_image(url, token)
 
         request.prompt = request.prompt.replace(url, '')
-        request.model = "high_aes_general_v20_L:general_v2.0_L"  # 2.1不支持图片编辑
+        request.model = "high_aes_general_v20_L:general_v2.0_L"  # 2.1不支持图片编辑 某些不支持
 
         component = {
             "type": "image_base_component",
@@ -75,7 +75,7 @@ async def create_draft_content(request: ImageRequest, token: str):
                         {
                             "type": "",
                             "id": str(uuid.uuid4()),
-                            "name": "byte_edit",
+                            "name": "byte_edit",  # bg_paint
                             "image_uri_list": [
                                 image_uri
                             ],
@@ -197,7 +197,6 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):
         }
     }
 
-
     async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=60) as client:
         response = await client.post(url, json=payload)
         response.raise_for_status()

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/apis/vidu/vidu_video.py

@@ -32,12 +32,7 @@ send_message = partial(
 
 
 async def upload(file, token: Optional[str] = None, vip: bool = False):  # todo: 统一到 file object
-    token = token or await get_next_token_for_polling(
-        FEISHU_URL_VIP if vip else FEISHU_URL,
-        check_token=check_token,
-        from_redis=True,
-        min_points=4  # 最小消耗
-    )
+    token = token or await get_next_token_for_polling(FEISHU_URL_VIP)
 
     token = token.strip(";Shunt=").strip("; Shunt=")
     logger.debug(token)
@@ -80,6 +75,9 @@ async def create_task(request: ViduRequest, token: Optional[str] = None, vip: bo
     token = token.strip(";Shunt=").strip("; Shunt=")
 
     task_type = TaskType.vidu_vip if vip else TaskType.vidu
+    if vip:
+        request.payload['settings']['schedule_mode'] = "nopeak"
+        request.payload['settings']['resolution'] = "720p"
 
     headers = {
         "Cookie": token
@@ -214,7 +212,7 @@ if __name__ == '__main__':
     }
     token = None
     # print(bjson(ViduRequest(**d).payload))
-    arun(create_task(ViduRequest(**d)))
+    arun(create_task(ViduRequest(**d), vip=True))
     # 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="

meutils-2025.2.13.20.50.5/meutils/data/VERSION

@@ -0,0 +1 @@
+2025.02.13.20.50.05

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/hash_utils.py

@@ -88,3 +88,7 @@ if __name__ == '__main__':
     r = {'expid': 'expid'}
 
     print(ABTest(**r, ranger=(0, 99)).is_hit('id'))
+
+
+    import uuid
+    print(uuid.uuid3('1', '1'))

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/llm/completions/agents/search.py

@@ -90,6 +90,13 @@ class Completions(object):
             completion = await client.chat.completions.create(**data)
             return completion
 
+        elif request.model.startswith("search"):  # 智谱
+            data = to_openai_params(request)
+
+            search_completion = await zhipuai_client.chat.completions.create(**data)
+            search_completion.model_dump_json(indent=4)
+
+
         else:
             # 搜索
             data = to_openai_params(request)

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/llm/completions/reasoner.py

@@ -65,13 +65,15 @@ class Completions(object):
             completion_chunks = await self.client.chat.completions.create(**data)
 
             is_reasoning_content = True
-            reasoning_prefix = "> Reasoning\n"
-            reasoning_suffix = "Reasoned for "
+            # reasoning_prefix = "> Reasoning\n"
+            # reasoning_suffix = "Reasoned for "
+            reasoning_prefix = "```reasoning\n"
+            reasoning_suffix = "\n```\n"
 
             async for chunk in completion_chunks:
                 # chunk.model = "deepseek-reasoner"
                 message = chunk.choices[0].delta
-                message.content = message.content or ""  ########## 损失了？message chunk #########应该是很多值未带进chunk
+                message.content = message.content or ""  ########## 损失了？message chunk #########应该是很多值未带进chunk 中转站自定义渠道bug 参数放请求头吧
 
                 # logger.debug(message)
                 if not hasattr(message, 'reasoning_content'):  # 标准化  finish_reason
@@ -96,14 +98,15 @@ class Completions(object):
 
                     elif message.content:  # 思考结束
                         if reasoning_suffix:
-                            message.content = f"{reasoning_suffix} {time.perf_counter() - s:.0f} seconds.\n{message.content}"
+                            message.content = f"{message.content.rstrip()}{reasoning_suffix}"
+                            # message.content = f"{reasoning_suffix} {time.perf_counter() - s:.0f} seconds.\n{message.content}"
                             reasoning_suffix = ""
 
                     yield chunk
-                    logger.debug(chunk)
+                    # logger.debug(chunk)
                 else:
                     yield chunk
-                    logger.debug(chunk)
+                    # logger.debug(chunk)
 
 
         else:  # 非流

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/llm/completions/yuanbao.py

@@ -43,6 +43,7 @@ class Completions(object):
             self,
             request: Optional[ChatCompletionRequest] = None,
             image_request: Optional[HunyuanImageRequest] = None,
+            enable_search: bool = False,
             token: Optional[str] = None
     ):
         token = token or await get_next_token_for_polling(FEISHU_URL, check_token=check_token)
@@ -53,8 +54,9 @@ class Completions(object):
 
         payload = {
             "model": "gpt_175B_0404",
+            "chatModelId": "deep_seek",
             "version": "v2",
-            "supportHint": 2,
+            "supportHint": 2,  # 1
 
             "prompt": prompt,
             # "displayPrompt": "画条可爱的狗狗",
@@ -94,6 +96,11 @@ class Completions(object):
                 }
             )
 
+        if enable_search:
+            payload['supportFunctions'] = [
+                "supportInternetSearch"
+            ]
+
         headers = {
             'cookie': token
         }
@@ -112,6 +119,7 @@ class Completions(object):
                         yield sse.image
 
                     if request:
+
                         yield sse.content
 
     def generate_id(self, random: bool = True):
@@ -140,33 +148,34 @@ async def check_token(token):
 
 
 if __name__ == '__main__':
-    # chatid = generate_id()
-    # print(chatid)
-    # print(delete_conv(chatid))
-    # payload = {
-    #     # "model": "gpt_175B_0404",
-    #     # "prompt": "1+1",
-    #     "prompt": "错了",
-    #
-    #     # "plugin": "Adaptive",
-    #     # "displayPrompt": "1+1",
-    #     # "displayPromptType": 1,
-    #     # "options": {},
-    #     # "multimedia": [],
-    #     # "agentId": "naQivTmsDa",
-    #     # "version": "v2"
-    # }
-    # chat(payload)
-
-    # async2sync_generator(Completions(api_key).achat('画条狗')) | xprint
-    request = HunyuanImageRequest(prompt='画条狗', size='16:9')
-
-    # arun(Completions().create(
-    #     ChatCompletionRequest(messages=[{'role': 'user', 'content': '南京天气如何'}]),
-    #     # image_request=request,
-    #     # token=token
-    # ))
-    arun(Completions.generate(request))
+# chatid = generate_id()
+# print(chatid)
+# print(delete_conv(chatid))
+# payload = {
+#     # "model": "gpt_175B_0404",
+#     # "prompt": "1+1",
+#     "prompt": "错了",
+#
+#     # "plugin": "Adaptive",
+#     # "displayPrompt": "1+1",
+#     # "displayPromptType": 1,
+#     # "options": {},
+#     # "multimedia": [],
+#     # "agentId": "naQivTmsDa",
+#     # "version": "v2"
+# }
+# chat(payload)
+
+# async2sync_generator(Completions(api_key).achat('画条狗')) | xprint
+# request = HunyuanImageRequest(prompt='画条狗', size='16:9')
+
+    arun(Completions().create(
+        ChatCompletionRequest(messages=[{'role': 'user', 'content': '南京天气如何'}]),
+        # image_request=request,
+        # token=token
+        enable_search=True
+    ))
+    # arun(Completions.generate(request))
 
     # df = arun(aget_spreadsheet_values(feishu_url=FEISHU__URL, to_dataframe=True))
     #

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/schemas/oneapi/common.py

@@ -18,6 +18,8 @@ MJ_RELAX = 1
 STEP = 2
 
 MODEL_PRICE = {
+    "o1:free": FREE,
+
     "black-forest-labs/FLUX.1-dev": 0.0001,
     "black-forest-labs/FLUX.1-pro": 0.0001,
 
@@ -484,9 +486,9 @@ MODEL_RATIO = {
     "abab5.5s-chat": 2.5,
 
     # deepseek
-    "deepseek-v3": 2,
+    "deepseek-v3": 1,
     "deepseek-v3-128k": 5,
-    "deepseek-chat": 2,
+    "deepseek-chat": 1,
     "deepseek-chat-64k": 5,
     "deepseek-chat-164k": 5,
     "deepseek-chat:function": 4,
@@ -620,7 +622,7 @@ MODEL_RATIO = {
 
     "gemini-2.0-flash": 0.075,
     "gemini-2.0-flash-001": 0.075,
-    "gemini-2.0-flash-lite-preview-02-05": 0.625,
+    "gemini-2.0-flash-lite-preview-02-05": 0.075,
 
     "gemini-2.0-pro": 1.25,
     "gemini-2.0-pro-exp-02-05": 1.25,
@@ -674,6 +676,8 @@ MODEL_RATIO = {
     "gpt-4o-2024-11-20": 1.25,
 
     "o1": 7.5,
+    "o1-2024-12-17": 7.5,
+
     "o1-mini": 1.5,
     "o1-preview": 7.5,
     "o1-mini-2024-09-12": 1.5,

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/schemas/vidu_types.py

@@ -10,7 +10,8 @@
 
 from meutils.pipe import *
 
-BASE_URL = "https://api.vidu.studio/vidu/v1"
+# BASE_URL = "https://api.vidu.studio/vidu/v1"
+BASE_URL = "https://service.vidu.com/vidu/v1"
 UPLOAD_BASE_URL = "https://api.vidu.studio/tools/v1"  # /files/uploads
 
 EXAMPLES = [

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/meutils/schemas/yuanbao_types.py

@@ -220,12 +220,17 @@ class SSEData(BaseModel):
     # data: [DONE]
 
     content: str = ""
+    reasoning_content: str = ""
+
     image: Optional[str] = None
 
     chunk: str = ""
 
     def __init__(self, **data):
         super().__init__(**data)
+
+        logger.debug(self.chunk)
+
         chunk = self.chunk.lstrip("data:")
 
         if '"type":"progress"' in chunk:
@@ -248,6 +253,9 @@ class SSEData(BaseModel):
         # df['title'] = "[" + df['title'] + "](" + df['url'] + ")"
         # df['image'] = "![](" + df['image'] + ")"
 
+        elif '{"type":"think"' in chunk: # 思考中...
+            content = self.reasoning_content = json.loads(chunk).get("content", "")
+
         else:
             content = ""
             # chunk.strip() or logger.debug(chunk)  # debug

meutils-2025.2.11.18.25.28/meutils/data/VERSION

@@ -1 +0,0 @@
-2025.02.11.18.25.28

{meutils-2025.2.11.18.25.28 → meutils-2025.2.13.20.50.5}/MeUtils.egg-info/requires.txt

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