MeUtils 2025.2.6.19.56.59__tar.gz → 2025.2.11.18.25.28__tar.gz

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

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

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/MeUtils.egg-info/SOURCES.txt

@@ -263,8 +263,11 @@ meutils/async_utils/common.py
 meutils/async_utils/test.py
 meutils/caches/__init__.py
 meutils/caches/acache.py
+meutils/caches/c.py
 meutils/caches/demo.py
+meutils/caches/redis_.py
 meutils/caches/redis_cache.py
+meutils/caches/redis_mulit.py
 meutils/clis/__init__.py
 meutils/clis/browser.py
 meutils/clis/check_api.py

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

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

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/meutils/apis/images/edits.py

@@ -104,6 +104,7 @@ async def make_request_for_gitee(payload, token: Optional[str] = None, response_
 
 
 async def make_request_for_baidu(payload, token: Optional[str] = None, response_format: str = "url"):
+    """todo redis"""
     s = time.time()
     token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True)
     headers = {
@@ -131,7 +132,7 @@ async def make_request_for_baidu(payload, token: Optional[str] = None, response_
                     logger.error(e)
                     if i > 3: break
         if not image_base64:
-            raise Exception(f"未检测到: {data}")
+            raise Exception(f"NO WATERMARK FOUND: {data}")  #############
 
         if response_format == "url":
             url = await to_url_fal(image_base64, content_type="image/png")
@@ -191,15 +192,15 @@ if __name__ == '__main__':
     token = "web_uid=ac283ec7-4bf6-40c9-a0ce-5a2e0cd7db06; hy_source=web; hy_user=I09MgMfFcUUyVSIg; hy_token=hevVCi/QuVjQcre5NDRMO7FuiWCZoDMIq3Zp8IwNxrPUofl4zWYazHEdeZ2S5o7q; _qimei_q36=; _qimei_h38=f2d27f50f0f23e085296d28303000006a17a09; _qimei_fingerprint=efbb885a22f7d4e5589008c28bc8e7ba; _qimei_uuid42=18c0310102d1002a082420cd40bb9717523c3c7e12; _gcl_au=1.1.915258067.1733278380; _ga_RPMZTEBERQ=GS1.1.1733722091.3.1.1733722108.0.0.0; _ga=GA1.2.981511920.1725261466; sensorsdata2015jssdkcross=%7B%22distinct_id%22%3A%22100000458739%22%2C%22first_id%22%3A%22191b198c7b2d52-0fcca8d731cb9b8-18525637-2073600-191b198c7b31fd9%22%2C%22props%22%3A%7B%22%24latest_traffic_source_type%22%3A%22%E7%A4%BE%E4%BA%A4%E7%BD%91%E7%AB%99%E6%B5%81%E9%87%8F%22%2C%22%24latest_utm_medium%22%3A%22cpc%22%7D%2C%22identities%22%3A%22eyIkaWRlbnRpdHlfY29va2llX2lkIjoiMTkxYjE5OGM3YjJkNTItMGZjY2E4ZDczMWNiOWI4LTE4NTI1NjM3LTIwNzM2MDAtMTkxYjE5OGM3YjMxZmQ5IiwiJGlkZW50aXR5X2xvZ2luX2lkIjoiMTAwMDAwNDU4NzM5In0%3D%22%2C%22history_login_id%22%3A%7B%22name%22%3A%22%24identity_login_id%22%2C%22value%22%3A%22100000458739%22%7D%2C%22%24device_id%22%3A%22191b198c7b2d52-0fcca8d731cb9b8-18525637-2073600-191b198c7b31fd9%22%7D"
 
     url = "https://oss.ffire.cc/files/kling_watermark.png"
-    url = "https://oss.ffire.cc/files/shuiyin.jpg"
-    url = "https://oss.ffire.cc/files/shuiyin3.jpg"
+    # url = "https://oss.ffire.cc/files/shuiyin.jpg"
+    # url = "https://oss.ffire.cc/files/shuiyin3.jpg"
 
     # url = "https://s22-def.ap4r.com/bs2/upload-ylab-stunt-sgp/se/ai_portal_sgp_queue_mmu_txt2img_aiweb/9c520b80-efc2-4321-8f0e-f1d34d483ddd/1.png"
 
     request = ImageProcess(
-        model="hunyuan-remove-watermark",
+        # model="hunyuan-remove-watermark",
 
-        # model="remove-watermark",
+        model="remove-watermark",
         # model="clarity",
         # model="expand",
         # model="rmbg-2.0",

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

@@ -288,7 +288,8 @@ async def generate(request: ImageRequest):
 
 
 if __name__ == '__main__':
-    token = "eb4d120829cfd3ee957943f63d6152ed"
+    # token = "eb4d120829cfd3ee957943f63d6152ed"
+    token = "34438eb03d165737122180caf62a8058"
 
     # request = ImageRequest(prompt="做一个圣诞节的海报", size="1024x1024")
     # request = ImageRequest(prompt="https://oss.ffire.cc/files/kling_watermark.png 让她带上墨镜", size="1024x1024")
@@ -324,11 +325,11 @@ if __name__ == '__main__':
     }
     # arun(generate(ImageRequest(**data)))
 
-    # arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))
-    prompt = "A plump Chinese beauty wearing a wedding dress revealing her skirt and underwear is swinging on the swing,Happy smile,cleavage,Exposed thighs,Spread your legs open,Extend your leg,panties,upskirt,Barefoot,sole"
-    request = ImageRequest(prompt=prompt)
+    arun(generate(ImageRequest(prompt="做一个圣诞节的海报")))
+    # prompt = "A plump Chinese beauty wearing a wedding dress revealing her skirt and underwear is swinging on the swing,Happy smile,cleavage,Exposed thighs,Spread your legs open,Extend your leg,panties,upskirt,Barefoot,sole"
+    # request = ImageRequest(prompt=prompt)
     # task = arun(create_task(request))
 
     # arun(get_task(task.task_id, task.system_fingerprint))
 
-    arun(generate(request))
+    # arun(generate(request))

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/meutils/apis/search/metaso.py

@@ -97,8 +97,7 @@ async def create(request: ChatCompletionRequest, response_format: Optional[str]
 
     request = MetasoRequest(
         model=model,
-        mode=MODELS.get(request.model, "concise"),
-        engineType=engine_type,
+        mode=MODELS.get(request.model, "detail"),
         question=request.last_content,
         response_format=response_format
     )
@@ -124,22 +123,9 @@ async def create(request: ChatCompletionRequest, response_format: Optional[str]
         session_id = await get_session_id(request, headers=headers, proxy=proxy)
 
     token = await get_access_token(session_id)
-    params = {
-        'token': token,
-
-        'question': request.question,
-        'mode': request.mode,
-        'engineType': request.engineType,
-
-        "sessionId": session_id,
-        'lang': 'zh',
-        # 'url': f'https://metaso.cn/search/{sessionId}?q={q}',
-        'enableMix': 'true',
-        'scholarSearchDomain': 'all',
-        'expectedCurrentSessionSearchCount': '1',
-        'newEngine': 'true',
-        'enableImage': 'true',
-    }
+
+    params = request.model_dump(exclude_none=True)
+    params['token'] = token
 
     pattern = re.compile('\[\[(\d+)\]\]')
     async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, params=params, proxy=proxy) as client:
@@ -235,7 +221,8 @@ if __name__ == '__main__':
 
         # model="search-pro",
 
-        messages=[{'role': 'user', 'content': '今天南京天气怎么样'}]
+        # messages=[{'role': 'user', 'content': '今天南京天气怎么样'}]
+        messages=[{'role': 'user', 'content': 'hi'}]
 
     )
 

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/meutils/caches/acache.py

@@ -16,24 +16,24 @@ from aiocache import cached
 from aiocache import cached, Cache, RedisCache, caches
 from aiocache import multi_cached
 
+
+
+@cached(ttl=60)
+@cached(ttl=60)
+async def cached_fc(user_id, **kwargs):
+    logger.debug(user_id)
+    return False
+#
 rcache = RedisCache(
     endpoint="127.0.0.1", port=6379, namespace="me"  # 缓存键前缀
 )
-
-
-# @cached(ttl=60)
-# async def cached_fc(user_id, **kwargs):
-#     logger.debug(user_id)
-#     return False
-
-
 @cached(ttl=60, cache=rcache)
 async def redis_fc(user_id, **kwargs):
     logger.debug(user_id)
     return False
 
 
-# @multi_cached(ttl=60, caches=[Cache.MEMORY, Cache.MEMORY])
+# @multi_cached(ttl=60) # 多key缓存
 # async def complex_function(user_id, **kwargs):
 #     logger.debug(user_id)
 #     return False
@@ -63,4 +63,4 @@ class A(BaseModel):
 
 
 if __name__ == '__main__':
-    arun(redis_fc(A()))
+    arun(cached_fc(A()))

meutils-2025.2.11.18.25.28/meutils/caches/c.py

@@ -0,0 +1,29 @@
+import asyncio
+
+from collections import namedtuple
+import redis.asyncio as redis
+
+from aiocache import cached
+from aiocache import RedisCache
+from aiocache.serializers import PickleSerializer
+
+Result = namedtuple('Result', "content, status")
+
+cache = RedisCache(namespace="main", client=redis.Redis(), serializer=PickleSerializer())
+
+
+@cached(cache, ttl=10, key_builder=lambda *args, **kw: "key")
+async def cached_call():
+    return Result("content", 200)
+
+
+async def test_cached():
+    async with cache:
+        await cached_call()
+        exists = await cache.exists("key")
+        assert exists is True
+        await cache.delete("key")
+
+
+if __name__ == "__main__":
+    asyncio.run(test_cached())

meutils-2025.2.11.18.25.28/meutils/caches/redis_.py

@@ -0,0 +1,26 @@
+import asyncio
+
+from aiocache import Cache
+
+
+cache = Cache(Cache.REDIS, endpoint="127.0.0.1", port=6379, namespace="main")
+
+
+async def redis():
+    await cache.set("key", "value")
+    await cache.set("expire_me", "value", ttl=10)
+
+    assert await cache.get("key") == "value"
+    assert await cache.get("expire_me") == "value"
+    assert await cache.raw("ttl", "main:expire_me") > 0
+
+
+async def test_redis():
+    await redis()
+    await cache.delete("key")
+    await cache.delete("expire_me")
+    await cache.close()
+
+
+if __name__ == "__main__":
+    asyncio.run(test_redis())

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/meutils/caches/redis_cache.py

@@ -29,13 +29,11 @@ acache_inmemory = hermes.Hermes(
 )
 
 
-from aiocache import cached, Cache, RedisCache
 
 
 if __name__ == '__main__':
     from meutils.pipe import *
 
-    @cached(ttl=100)
     @cache(tags=('test',))
     async def foo(a, b):
         time.sleep(3)

meutils-2025.2.11.18.25.28/meutils/caches/redis_mulit.py

@@ -0,0 +1,30 @@
+import asyncio
+
+from aiocache import multi_cached, Cache
+
+DICT = {
+    'a': "Z",
+    'b': "Y",
+    'c': "X",
+    'd': "W"
+}
+
+
+# @multi_cached("ids", cache=Cache.REDIS, namespace="main")
+# async def multi_cached_ids(ids=None):
+#     return {id_: DICT[id_] for id_ in ids}
+
+
+@multi_cached("keys", cache=Cache.REDIS, namespace="main")
+async def multi_cached_keys(keys=None):
+    return keys
+
+# cache = Cache(Cache.REDIS, endpoint="127.0.0.1", port=6379, namespace="main")
+
+
+
+
+
+if __name__ == "__main__":
+    # test_multi_cached()
+    asyncio.run(multi_cached_keys('xxx'))

meutils-2025.2.11.18.25.28/meutils/data/VERSION

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

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/meutils/data/oneapi/NOTICE.md

@@ -35,7 +35,17 @@
   <summary><b>大额对公，请联系客服</b></summary>
 </details>
 
-## 2025-02-06（预祝大家新年快乐）
+## 2025-02-10
+### 上线新模型
+- qwen2.5-max： 比deepseek-v3效果更好，更智能（权威排行榜更靠前）
+
+## 2025-02-06
+### 上线新模型
+- deepseek-r1-think： 兼容任意客户端，再也不用担心看不到`深度思考`了
+- deepseek-search： 搜索+深度思考
+- deepseek-r1-search： 搜索+深度思考
+- deepseek-r1-metasearch： 秘塔搜索+深度思考
+
 - deepseek-ai/deepseek-v3 
   - 即日起至北京时间 2025-02-09 00:00 同步官网倍率
 

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/meutils/llm/clients.py

@@ -26,6 +26,11 @@ zhipuai_client = AsyncOpenAI(
     base_url=os.getenv("ZHIPUAI_BASE_URL")
 )
 
+# zhipuai_client = OpenAI(
+#     api_key=os.getenv("ZHIPUAI_API_KEY"),
+#     base_url=os.getenv("ZHIPUAI_BASE_URL")
+# )
+
 if __name__ == '__main__':
     from meutils.pipe import *
 
@@ -34,11 +39,18 @@ if __name__ == '__main__':
     # arun(zhipuai_client.chat.completions.create(messages=[{"role": "user", "content": "hi"}], model='glm-4-flash'))
 
     # web-search-pro
-
-    r = arun(zhipuai_client.chat.completions.create(
-        messages=[{"role": "user", "content": "中国队奥运会拿了多少奖牌"}],
-        model='web-search-pro')
-    )
-
-    r.model_dump_json()
+    # s = zhipuai_client.chat.completions.create(
+    #     messages=[{"role": "user", "content": "《哪吒之魔童闹海》现在的票房是多少"}],
+    #     model='web-search-pro',
+    #     stream=True
+    # )
+    #
+    # r = arun(zhipuai_client.chat.completions.create(
+    #     messages=[{"role": "user", "content": "《哪吒之魔童闹海》现在的票房是多少"}],
+    #     model='web-search-pro',
+    #     stream=True
+    # )
+    # )
+
+    # r.model_dump_json()
 

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

@@ -96,13 +96,16 @@ class Completions(object):
             data['model'] = "web-search-pro"
             data['stream'] = False
             search_completion = await zhipuai_client.chat.completions.create(**data)
-            logger.debug(search_completion)  # todo: 返回详细信息
+            logger.debug(search_completion.model_dump_json(indent=4))  # todo: 返回详细信息
+            # todo: chat搜索接口 搜索内容重排序 搜索聚合
 
             # 大模型
-            request.messages.append({
-                "role": "user",
-                "content": search_completion.model_dump_json(indent=4),
-            })
+            request.messages.append(
+                {
+                    "role": "user",
+                    "content": search_completion.model_dump_json(indent=4),
+                }
+            )
 
             data = to_openai_params(request)
             completion = await chatfire_client.chat.completions.create(**data)
@@ -114,13 +117,14 @@ if __name__ == '__main__':
         # model="baichuan4-turbo",
         # model="xx",
         # model="deepseek-r1",
-        model="deepseek-r1:1.5b",
+        # model="deepseek-r1:1.5b",
+        model="deepseek-r1:32b",
 
         # model="moonshot-v1-8k",
         # model="doubao",
 
         messages=[
-            {"role": "user", "content": "deepseek-r1 vs o3-mini"}
+            {"role": "user", "content": "《哪吒之魔童闹海》现在的票房是多少"}
         ],
 
         stream=False

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

@@ -10,7 +10,7 @@
 """
 1. 适配任意客户端 think标识输出
 2. 开源标准化
-
+todo: 对齐官网格式
 """
 
 from openai import AsyncOpenAI
@@ -44,9 +44,6 @@ def extract_think_content(content):
     return "", content
 
 
-reasoning = True
-
-
 class Completions(object):
 
     def __init__(self, api_key: Optional[str] = None, base_url: Optional[str] = None, reasoning_stream: bool = True):
@@ -74,9 +71,10 @@ class Completions(object):
             async for chunk in completion_chunks:
                 # chunk.model = "deepseek-reasoner"
                 message = chunk.choices[0].delta
-                message.content = message.content or ""
+                message.content = message.content or ""  ########## 损失了？message chunk #########应该是很多值未带进chunk
 
-                if not hasattr(message, 'reasoning_content'):  # 标准化
+                # logger.debug(message)
+                if not hasattr(message, 'reasoning_content'):  # 标准化  finish_reason
                     message.reasoning_content = ""
                     if is_reasoning_content:
                         message.reasoning_content = (
@@ -84,15 +82,15 @@ class Completions(object):
                             .replace("</think>", "")
                             .replace("\n\n", "\n")
                         )
-                        if message.content == "</think>":  # 思考结束
+                        if "</think>" in message.content:  # 思考结束
                             is_reasoning_content = False
                         message.content = ""
 
-                    logger.debug(message)
+                    # logger.debug(message)
 
                 if self.reasoning_stream:  # 适配任意客户端: 展示推理内容
 
-                    if message.reasoning_content.strip():  # 思考开始
+                    if message.reasoning_content and message.reasoning_content.strip():  # 思考开始
                         message.content = f"{reasoning_prefix}{message.reasoning_content}"
                         reasoning_prefix = ""
 
@@ -102,8 +100,11 @@ class Completions(object):
                             reasoning_suffix = ""
 
                     yield chunk
+                    logger.debug(chunk)
                 else:
                     yield chunk
+                    logger.debug(chunk)
+
 
         else:  # 非流
             completions = await self.client.chat.completions.create(**data)
@@ -114,6 +115,10 @@ class Completions(object):
             if not hasattr(message, 'reasoning_content'):
                 reasoning_content, content = extract_think_content(message.content)
 
+                if content.strip().startswith("<think>"):  # max tokens
+                    reasoning_content = content.replace("<think>", "")
+                    content = ""
+
                 completions.choices[0].message.reasoning_content = reasoning_content
                 completions.choices[0].message.content = content
 
@@ -137,25 +142,30 @@ if __name__ == '__main__':
         # model="qwen-plus-latest",
 
         # model="deepseek-r1:1.5b",
-        model="deepseek-r1:32b",
-
+        model="DeepSeek-R1-Distill-Qwen-1.5B",
+        # model="deepseek-r1:32b",
+        #
         # model="deepseek-r1",
+        # model
 
         messages=[
             # {
             #     'role': 'system',
             #     'content': '深度思考之后在回答问题并给出详细的理由'
             # },
-            # {
-            #     'role': 'system',
-            #     'content': '你是个AI助手，请务必在深度思考之后，再回答用户问题'
-            # },
+            {
+                'role': 'system',
+                'content': '你是个AI助手，请务必在深度思考之后，再回答用户问题'
+            },
             {
                 'role': 'user',
                 'content': '你好'
             },
 
         ],
-        stream=False,
+        stream=True,
     )
-    arun(Completions().create(request))
+    arun(Completions(
+        base_url="https://ai.gitee.com/v1",
+        api_key="AHKZ65ARNFH8QGMUUVCPECDTZVOLRPUXIKPGAC1Y",
+    ).create(request))

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/meutils/llm/openai_utils/common.py

@@ -218,6 +218,7 @@ async def create_chat_completion_chunk(
             yield chat_completion_chunk.model_dump_json()
         else:  # todo: AttributeError: 'tuple' object has no attribute 'model'
             try:
+                chat_completion_chunk_stop.id = completion_chunk.id  ##############
                 completion_chunk.model = redirect_model or completion_chunk.model
                 chat_completion_chunk_stop.usage = completion_chunk.usage  ############## 需要判断 usage？
                 yield completion_chunk.model_dump_json()
@@ -283,4 +284,4 @@ if __name__ == '__main__':
 
     # to_openai_params(ChatCompletionRequest())
 
-    print(token_encoder.encode('hi'))
+    print(token_encoder.encode('hi'))

{meutils-2025.2.6.19.56.59 → meutils-2025.2.11.18.25.28}/meutils/oss/minio_oss.py

@@ -182,3 +182,5 @@ if __name__ == '__main__':
         filename='cff.png'
     )
     arun(_)
+
+