MeUtils 2025.2.6.20.41.23__py3-none-any.whl → 2025.2.13.20.50.5__py3-none-any.whl

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/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/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/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/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/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/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/data/VERSION

@@ -1 +1 @@
-2025.02.06.20.41.23
+2025.02.13.20.50.05

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/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/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/llm/completions/agents/search.py

@@ -90,19 +90,29 @@ 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)
             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 +124,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/llm/completions/reasoner.py

@@ -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):
@@ -68,15 +65,18 @@ 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.content = message.content or ""  ########## 损失了？message chunk #########应该是很多值未带进chunk 中转站自定义渠道bug 参数放请求头吧
 
-                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,7 +84,7 @@ class Completions(object):
                             .replace("</think>", "")
                             .replace("\n\n", "\n")
                         )
-                        if message.content == "</think>":  # 思考结束
+                        if "</think>" in message.content:  # 思考结束
                             is_reasoning_content = False
                         message.content = ""
 
@@ -92,18 +92,22 @@ class Completions(object):
 
                 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 = ""
 
                     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)
                 else:
                     yield chunk
+                    # logger.debug(chunk)
+
 
         else:  # 非流
             completions = await self.client.chat.completions.create(**data)
@@ -114,6 +118,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,9 +145,10 @@ if __name__ == '__main__':
         # model="qwen-plus-latest",
 
         # model="deepseek-r1:1.5b",
+        model="DeepSeek-R1-Distill-Qwen-1.5B",
         # model="deepseek-r1:32b",
         #
-        model="deepseek-r1",
+        # model="deepseek-r1",
         # model
 
         messages=[

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/llm/openai_utils/common.py

@@ -207,7 +207,7 @@ async def create_chat_completion_chunk(
         # logger.debug(type(completion_chunks))
 
     chat_completion_chunk.id = chat_id or f"chatcmpl-{shortuuid.random()}"
-    chat_completion_chunk_stop.id = chat_completion_chunk.id  ######## todo
+    chat_completion_chunk_stop.id = chat_completion_chunk.id
     async for completion_chunk in achain(completion_chunks):
 
         # logger.debug(completion_chunk)
@@ -218,7 +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 = chat_completion_chunk.id
+                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()

meutils/oss/minio_oss.py

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

meutils/schemas/image_types.py

@@ -79,7 +79,7 @@ class ImageRequest(BaseModel):  # openai
 
     response_format: Optional[Literal["url", "b64_json"]] = "url"
 
-    seed: Optional[int] = None
+    seed: Optional[int] = 21
 
     # oneapi
     negative_prompt: Optional[str] = None

meutils/schemas/metaso_types.py

@@ -23,21 +23,32 @@ class MetasoRequest(BaseModel):
     question: str = "Chatfire"
 
     """全网 文库 学术 图片 播客"""
-    engineType: str = ""  # scholar
-
     scholarSearchDomain: str = "all"
 
+    url: str = "https://metaso.cn/"
+    lang: str = "zh"
+
     searchTopicId: Optional[str] = None
     searchTopicName: Optional[str] = None
 
-    enableMix: bool = True
-    newEngine: bool = True
-    enableImage: bool = True
+    enableMix: str = 'true'
+    newEngine: str = 'true'
+    enableImage: str = 'true'
 
     # 自定义字段
     response_format: Optional[str] = None  # 原生内容
 
 
+# question: hi
+# mode: detail
+# scholarSearchDomain: all
+# model: ds-r1
+# url: https://metaso.cn/
+# lang: zh
+# enableMix: true
+# newEngine: true
+# enableImage: true
+# metaso-pc: pc
 class MetasoResponse(BaseModel):  # sse
 
     type: Optional[str] = None  # query set-reference heartbeat append-text