MeUtils 2025.2.6.13.5.49__tar.gz → 2025.2.6.19.30.6__tar.gz

{meutils-2025.2.6.13.5.49 → meutils-2025.2.6.19.30.6/MeUtils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.2.6.13.5.49
+Version: 2025.2.6.19.30.6
 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: missingno; extra == "all"
+Requires-Dist: reportlab; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: jieba; extra == "all"
 Requires-Dist: langchain; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: seaborn; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: jinja2; extra == "all"
 Requires-Dist: streamlit; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: thefuck; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: filetype; extra == "all"
 Requires-Dist: sse_starlette; extra == "all"
 Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
+Requires-Dist: geopy; extra == "all"
 Requires-Dist: schedule; extra == "all"
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: openai; extra == "all"
 Requires-Dist: pymupd; extra == "all"
-Requires-Dist: faiss-cpu; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: reportlab; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: simplejson; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: jinja2; extra == "all"
+Requires-Dist: seaborn; extra == "all"
 Requires-Dist: pymongo; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
 Requires-Dist: pymysql; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: redis-py-cluster; extra == "all"
+Requires-Dist: pandas_summary; extra == "all"
+Requires-Dist: polars; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: missingno; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2025.2.6.13.5.49/MeUtils.egg-info → meutils-2025.2.6.19.30.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2025.2.6.13.5.49
+Version: 2025.2.6.19.30.6
 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: missingno; extra == "all"
+Requires-Dist: reportlab; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: jieba; extra == "all"
 Requires-Dist: langchain; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: seaborn; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: jinja2; extra == "all"
 Requires-Dist: streamlit; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: thefuck; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
+Requires-Dist: filetype; extra == "all"
 Requires-Dist: sse_starlette; extra == "all"
 Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
+Requires-Dist: geopy; extra == "all"
 Requires-Dist: schedule; extra == "all"
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
+Requires-Dist: openai; extra == "all"
 Requires-Dist: pymupd; extra == "all"
-Requires-Dist: faiss-cpu; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: reportlab; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: simplejson; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: jinja2; extra == "all"
+Requires-Dist: seaborn; extra == "all"
 Requires-Dist: pymongo; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
 Requires-Dist: pymysql; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: redis-py-cluster; extra == "all"
+Requires-Dist: pandas_summary; extra == "all"
+Requires-Dist: polars; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: missingno; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2025.2.6.13.5.49 → meutils-2025.2.6.19.30.6}/meutils/apis/search/__init__.py

@@ -8,4 +8,3 @@
 # @Software     : PyCharm
 # @Description  : 
 
-from meutils.pipe import *

{meutils-2025.2.6.13.5.49 → meutils-2025.2.6.19.30.6}/meutils/apis/siliconflow/images.py

@@ -81,7 +81,7 @@ async def generate(request: ImageRequest, api_key: Optional[str] = None):
     request.model = MODELS.get(request.model, DEFAULT_MODEL)
     logger.debug(request)
 
-    if any(i in request.model.lower() for i in {"pro-max", }):
+    if any(i in request.model.lower() for i in {"pro-max", "pro"}):
         request.num_inference_steps = 20
         api_key = api_key or await get_next_token_for_polling(
             FEISHU_URL,
@@ -136,6 +136,17 @@ if __name__ == '__main__':
             'negative_prompt': '', 'n': 1, 'response_format': 'url', 'size': '1152x2048', 'num_inference_steps': 20,
             'seed': None}
 
+    data = {
+        "model": "flux-dev",
+        "prompt": "(Chinese dragon soaring through the clouds).(majestic, colorful, mythical, powerful, ancient).(DSLR camera).(wide-angle lens).(dawn)(fantasy photography).(Kodak Ektar 100)",
+        "negative_prompt": "",
+        "n": 1,
+        "response_format": "url",
+        "size":"1366x768",
+        "num_inference_steps": 20,
+        "seed": None
+    }
+
     # request = FluxImageRequest(model="flux", prompt="a dog", size="1024x1024", num_inference_steps=1)
     # request = FluxImageRequest(model="flux-pro", prompt="a dog", size="10x10", num_inference_steps=1)
     request = FluxImageRequest(**data)

meutils-2025.2.6.19.30.6/meutils/data/VERSION

@@ -0,0 +1 @@
+2025.02.06.19.30.06

{meutils-2025.2.6.13.5.49 → meutils-2025.2.6.19.30.6}/meutils/llm/completions/agents/search.py

@@ -96,7 +96,7 @@ class Completions(object):
             data['model'] = "web-search-pro"
             data['stream'] = False
             search_completion = await zhipuai_client.chat.completions.create(**data)
-            logger.debug(search_completion)
+            logger.debug(search_completion)  # todo: 返回详细信息
 
             # 大模型
             request.messages.append({
@@ -105,7 +105,6 @@ class Completions(object):
             })
 
             data = to_openai_params(request)
-
             completion = await chatfire_client.chat.completions.create(**data)
             return completion
 
@@ -121,7 +120,7 @@ if __name__ == '__main__':
         # model="doubao",
 
         messages=[
-            {"role": "user", "content": "南京天气如何"}
+            {"role": "user", "content": "deepseek-r1 vs o3-mini"}
         ],
 
         stream=False

meutils-2025.2.6.19.30.6/meutils/llm/completions/reasoner.py

@@ -0,0 +1,161 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : reasoner
+# @Time         : 2025/2/6 08:35
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+"""
+1. 适配任意客户端 think标识输出
+2. 开源标准化
+
+"""
+
+from openai import AsyncOpenAI
+
+from meutils.pipe import *
+from meutils.llm.clients import chatfire_client, AsyncOpenAI
+from meutils.llm.openai_utils import to_openai_params
+
+from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, ChatCompletionRequest, CompletionUsage
+
+reasoner_system = {
+    'role': 'system',
+    'content': '你是个AI助手，请务必在深度思考之后，再回答用户问题'
+}
+# re.DOTALL 标志使得 . 可以匹配换行符
+think_pattern = re.compile(r'<think>(.*?)</think>', re.DOTALL)
+
+
+def extract_think_content(content):
+    # 匹配<think>和</think>之间的内容，包括换行符
+    # re.DOTALL 标志使得 . 可以匹配换行符
+    think_content = think_pattern.search(content)
+
+    if think_content:
+        # 获取think标签中的内容
+        think_text = think_content.group(1)
+        # 移除整个think标签及其内容
+        cleaned_content = think_pattern.sub('', content)
+        # 返回think中的内容和清理后的文本
+        return think_text.strip(), cleaned_content.strip()
+    return "", content
+
+
+reasoning = True
+
+
+class Completions(object):
+
+    def __init__(self, api_key: Optional[str] = None, base_url: Optional[str] = None, reasoning_stream: bool = True):
+
+        self.reasoning_stream = reasoning_stream
+
+        self.client = AsyncOpenAI(
+            base_url=base_url, api_key=api_key,
+        )
+
+    async def create(self, request: ChatCompletionRequest):
+        """适配任意客户端"""
+        s = time.perf_counter()
+        request.messages.insert(0, reasoner_system)
+
+        data = to_openai_params(request)
+
+        if request.stream:
+            completion_chunks = await self.client.chat.completions.create(**data)
+
+            is_reasoning_content = True
+            reasoning_prefix = "> Reasoning\n"
+            reasoning_suffix = "Reasoned for "
+
+            async for chunk in completion_chunks:
+                # chunk.model = "deepseek-reasoner"
+                message = chunk.choices[0].delta
+                message.content = message.content or ""
+
+                if not hasattr(message, 'reasoning_content'):  # 标准化
+                    message.reasoning_content = ""
+                    if is_reasoning_content:
+                        message.reasoning_content = (
+                            message.content.replace("<think>", "")
+                            .replace("</think>", "")
+                            .replace("\n\n", "\n")
+                        )
+                        if message.content == "</think>":  # 思考结束
+                            is_reasoning_content = False
+                        message.content = ""
+
+                    logger.debug(message)
+
+                if self.reasoning_stream:  # 适配任意客户端: 展示推理内容
+
+                    if message.reasoning_content.strip():  # 思考开始
+                        message.content = f"{reasoning_prefix}{message.reasoning_content}"
+                        reasoning_prefix = ""
+
+                    elif message.content:  # 思考结束
+                        if reasoning_suffix:
+                            message.content = f"{reasoning_suffix} {time.perf_counter() - s:.0f} seconds.\n{message.content}"
+                            reasoning_suffix = ""
+
+                    yield chunk
+                else:
+                    yield chunk
+
+        else:  # 非流
+            completions = await self.client.chat.completions.create(**data)
+
+            completions.model = "deepseek-reasoner"
+            message = completions.choices[0].message
+
+            if not hasattr(message, 'reasoning_content'):
+                reasoning_content, content = extract_think_content(message.content)
+
+                completions.choices[0].message.reasoning_content = reasoning_content
+                completions.choices[0].message.content = content
+
+            yield completions
+
+
+if __name__ == '__main__':
+    # [
+    #     "qwen-plus-latest",
+    #     "qvq-72b-preview",
+    #     "qwq-32b-preview",
+    #     "qwen2.5-coder-32b-instruct",
+    #     "qwen-vl-max-latest",
+    #     "qwen-turbo-latest",
+    #     "qwen2.5-72b-instruct",
+    #     "qwen2.5-32b-instruct"
+    # ]
+    request = ChatCompletionRequest(
+        # model="qwen-turbo-2024-11-01",
+        # model="qwen-max-latest",
+        # model="qwen-plus-latest",
+
+        # model="deepseek-r1:1.5b",
+        model="deepseek-r1:32b",
+
+        # model="deepseek-r1",
+
+        messages=[
+            # {
+            #     'role': 'system',
+            #     'content': '深度思考之后在回答问题并给出详细的理由'
+            # },
+            # {
+            #     'role': 'system',
+            #     'content': '你是个AI助手，请务必在深度思考之后，再回答用户问题'
+            # },
+            {
+                'role': 'user',
+                'content': '你好'
+            },
+
+        ],
+        stream=False,
+    )
+    arun(Completions().create(request))

{meutils-2025.2.6.13.5.49 → meutils-2025.2.6.19.30.6}/meutils/schemas/oneapi/common.py

@@ -579,7 +579,10 @@ MODEL_RATIO = {
     "gemini-1.5-flash-exp-0827": 0.1,
     "google/gemini-flash-1.5-exp": 0.1,  # openrouter免费
     "google/gemini-flash-1.5-8b-exp": 0.1,  # openrouter免费
-    "gemini-2.0-flash": 0.5,
+
+    "gemini-2.0-flash": 0.75,
+    "gemini-2.0-flash-001": 0.75,
+
     "gemini-2.0-flash-exp": 0.5,
     "gemini-2.0-flash-thinking-exp": 1,
     "gemini-2.0-flash-thinking-exp-1219": 1,
@@ -751,7 +754,10 @@ COMPLETION_RATIO = {
 
     "gemini-exp-1206": 5,
 
-    "gemini-2.0-flash": 5,
+
+    "gemini-2.0-flash": 4,
+    "gemini-2.0-flash-001": 4,
+
     "gemini-2.0-flash-exp": 5,
     "gemini-2.0-flash-thinking-exp": 5,
     "gemini-2.0-flash-thinking-exp-1219": 5,

meutils-2025.2.6.13.5.49/meutils/data/VERSION

@@ -1 +0,0 @@
-2025.02.06.13.05.49

meutils-2025.2.6.13.5.49/meutils/llm/completions/reasoner.py

@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : reasoner
-# @Time         : 2025/2/6 08:35
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  : 
-
-
-from openai import AsyncOpenAI
-
-from meutils.pipe import *
-from meutils.llm.clients import chatfire_client, AsyncOpenAI
-from meutils.llm.openai_utils import to_openai_params
-
-from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, ChatCompletionRequest, CompletionUsage
-
-
-class Completions(object):
-
-    def __init__(self, api_key: Optional[str] = None, base_url: Optional[str] = None):
-        self.api_key = api_key
-        self.base_url = base_url
-
-        self.client = AsyncOpenAI(
-            base_url=self.base_url, api_key=self.api_key,
-        )
-
-    async def create(self, request: ChatCompletionRequest):
-        data = to_openai_params(request)
-
-        if request.stream:
-            _chunk = ""
-            async for chunk in await self.client.chat.completions.create(**data):
-                delta = chunk.choices[0].delta
-
-                reasoning_content = "> Reasoning\n"  # "> Reasoning\n"  # 前缀 "> 思考中\n"
-                if hasattr(delta, 'reasoning_content'):
-                    if reasoning_content:
-                        reasoning_content += delta.reasoning_content
-                    yield reasoning_content
-                    reasoning_content = ''
-                else:
-                    yield '\n'
-
-                yield delta.content
-
-        else:
-            completions = await self.client.chat.completions.create(**data)
-            yield completions
-
-
-if __name__ == '__main__':
-    # [
-    #     "qwen-plus-latest",
-    #     "qvq-72b-preview",
-    #     "qwq-32b-preview",
-    #     "qwen2.5-coder-32b-instruct",
-    #     "qwen-vl-max-latest",
-    #     "qwen-turbo-latest",
-    #     "qwen2.5-72b-instruct",
-    #     "qwen2.5-32b-instruct"
-    # ]
-    request = ChatCompletionRequest(
-        # model="qwen-turbo-2024-11-01",
-        # model="qwen-max-latest",
-        # model="qwen-plus-latest",
-
-        model="deepseek-r1:1.5b",
-        # model="deepseek-r1",
-
-        messages=[
-            {
-                'role': 'system',
-                'content': '每次回答前务必思考之后m，回答问题'
-            },
-            {
-                'role': 'user',
-                'content': '你好'
-            },
-
-        ],
-        stream=True,
-    )
-    arun(Completions().create(request))

{meutils-2025.2.6.13.5.49 → meutils-2025.2.6.19.30.6}/MeUtils.egg-info/requires.txt

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