MeUtils 2025.3.5.20.22.10__py3-none-any.whl → 2025.3.6.18.55.2__py3-none-any.whl

meutils/apis/search/metaso.py

@@ -6,7 +6,7 @@
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  :
+# @Description  : todo 重构
 
 from meutils.pipe import *
 from meutils.schemas.metaso_types import FEISHU_URL, BASE_URL, MetasoRequest, MetasoResponse
@@ -16,7 +16,7 @@ from meutils.apis.proxy.ips import FEISHU_URL_METASO, get_one_proxy, get_proxies
 from meutils.schemas.openai_types import ChatCompletionRequest
 from meutils.notice.feishu import send_message
 
-from meutils.llm.clients import zhipuai_client
+from urllib.parse import quote_plus
 
 token = "wr8+pHu3KYryzz0O2MaBSNUZbVLjLUYC1FR4sKqSW0p19vmcZAoEmHC72zPh/fHtOhYhCcR5GKXrxQs9QjN6dulxfOKfQkLdVkLMahMclPPjNVCPE8bLQut3zBABECLaSqpI0fVWBrdbJptnhASrSw=="
 
@@ -26,10 +26,23 @@ MODELS = {
     "ai-search-pro": "research",
 
     "ai-search:scholar": "detail",
-    "ai-search-pro:scholar": "research"
+    "ai-search-pro:scholar": "research",
+
+    "deepseek-r1-metasearch": "strong-research",
+
+    "meta-research": "strong-research",
+    "meta-deepresearch": "strong-research",
+    "deepseek-r1-metaresearch": "strong-research",
 }
 
 ""
+# pattern = re.compile('\[\[(\d+)\]\]')
+pattern = re.compile(r'\[\[(\d+)\]\]')
+
+
+def replace_ref(match):
+    ref_num = match.group(1)
+    return f'[^{ref_num}]'  # [[1]] -> [^1]
 
 
 async def get_session_id(request: MetasoRequest, headers: Optional[dict] = None, proxy: Optional[str] = None):
@@ -51,8 +64,7 @@ async def get_session_id(request: MetasoRequest, headers: Optional[dict] = None,
         response.raise_for_status()
         data = response.json()
 
-        # logger.debug(bjson(data))
-
+        logger.debug(bjson(data))
         # {
         #     "errCode": 4001,
         #     "errMsg": "搜索次数超出限制"
@@ -83,7 +95,7 @@ async def get_access_token(session_id: Optional[str] = None):
         return tokens and tokens[0]
 
 
-async def create(request: ChatCompletionRequest, response_format: Optional[str] = None):
+async def create(request: ChatCompletionRequest):
     system_fingerprint = request.system_fingerprint
 
     engine_type = ''
@@ -91,7 +103,7 @@ async def create(request: ChatCompletionRequest, response_format: Optional[str]
         _, engine_type = request.model.split(':')
 
     model = None
-    if request.model.startswith("deepseek"):
+    if request.model.startswith(("meta", "deepseek")):
         model = "ds-r1"
         system_fingerprint = "deepseek-r1"
 
@@ -99,26 +111,22 @@ async def create(request: ChatCompletionRequest, response_format: Optional[str]
         model=model,
         mode=MODELS.get(request.model, "detail"),
         question=request.last_content,
-        response_format=response_format
     )
 
     logger.debug(request.model_dump_json(indent=4))
 
     headers = {}
-    if request.mode == "research":  # 登录
+    if "research" in request.mode:  # 登录
         cookie = await get_next_token_for_polling(FEISHU_URL)
         headers["cookie"] = cookie
+        logger.debug(cookie)
 
     proxy = None
     # proxies = await get_proxies()
     session_id = await get_session_id(request, headers=headers, proxy=proxy)
     # session_id = None
     if session_id is None:  # 走代理: 随机轮询
-        # ip = "121.196.183.67"
-        # proxies = {
-        #     "http://": f"http://{ip}:8443",  # 自建 8443
-        #     "https://": f"http://{ip}:8443",
-        # }
+
         proxy = await get_one_proxy(feishu_url=FEISHU_URL_METASO)
         session_id = await get_session_id(request, headers=headers, proxy=proxy)
 
@@ -127,13 +135,11 @@ async def create(request: ChatCompletionRequest, response_format: Optional[str]
     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:
+    async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, params=params, proxy=proxy, timeout=100) as client:
         async with client.stream(method="GET", url="/api/searchV2") as response:
             response.raise_for_status()
-            logger.debug(response.status_code)
 
-            reference_mapping = {}
+            references = []
             async for chunk in response.aiter_lines():
 
                 if (chunk := chunk.strip()) and chunk != "data:[DONE]":
@@ -141,64 +147,28 @@ async def create(request: ChatCompletionRequest, response_format: Optional[str]
 
                     try:
                         response = MetasoResponse(chunk=chunk)
-                        logger.debug(response)
-
-                        if not response.content and response.data.get("infoType") == 'weather':
-                            # yield response.data
-
-                            ################################################################ todo: 外部搜索
-                            chatcompletionchunks = await zhipuai_client.chat.completions.create(
-                                model="glm-4-flash",
-                                messages=[
-                                    {"role": "user", "content": response.data}
-                                ],
-                                stream=True
-                            )
-                            async for chatcompletionchunk in chatcompletionchunks:
-                                yield chatcompletionchunk.choices[0].delta.content
-                            ################################################################
-                            break
+                        references += response.references
 
                         if len(response.content) == 1 and response.content.startswith('秘'):  # 替换 模型水印
                             response.content = f"{system_fingerprint} AI搜索，它是一款能够深入理解您的问题的AI搜索引擎。"
                             yield response.content
                             break
 
-                        if request.response_format:  # 返回原始内容，方便二次加工或者debug
-                            yield response.data
-                            continue
-
-                        if response.type in {"query", "set-reference", "update-reference"}:
-                            logger.debug(bjson(response.data))
-
-                            reference_mapping.update(
-                                {
-                                    str(i): (
-                                            reference.get("link")
-                                            or reference.get("url")
-                                            or reference.get("file_meta", {}).get("url")
-                                    )
-                                    for i, reference in
-                                    enumerate(response.data.get('list', []), len(reference_mapping) + 1)
-                                }
-                            )
-
-                            # logger.debug(bjson(reference_mapping))
-
-                        def replace_ref(match):
-                            ref_num = match.group(1)
-
-                            return f"[[{ref_num}]({reference_mapping.get(str(ref_num))})]"
-
                         _ = pattern.sub(replace_ref, response.content)
-                        # print(_)
                         yield _
 
                     except Exception as e:
                         logger.error(e)
                         logger.debug(response)
+            if references:
+                for i, ref in enumerate(references, 1):
+                    title = ref.get("title")
+                    url = ref.get("link") or ref.get("url") or ref.get("file_meta", {}).get("url", "")
+                    url = quote_plus(url)
 
-            # yield f"""\n---\n```json\n{reference_mapping}\n```"""  # todo: reference信息返回
+                    yield f"\n[^{i}]: [{title}]({url})\n"
+
+                # logger.debug(bjson(references))
 
 
 if __name__ == '__main__':
@@ -211,10 +181,14 @@ if __name__ == '__main__':
 
     # arun(get_session_id(request))
     # arun(get_access_token(request))
+    """
+    metasearch-
+    """
 
     request = ChatCompletionRequest(
         # model="deepseek-search",
-        model="deepseek-r1-search",
+        # model="deepseek-r1-search",
+        model="meta-deepresearch",
         # model="ai-search",
         # model="ai-search:scholar",
         # model="ai-search-pro:scholar",
@@ -222,15 +196,23 @@ if __name__ == '__main__':
         # model="search-pro",
 
         # messages=[{'role': 'user', 'content': '今天南京天气怎么样'}]
-        messages=[{'role': 'user', 'content': 'hi'}]
+        # messages=[{'role': 'user', 'content': '1+1'}]
+        messages=[{'role': 'user', 'content': '周杰伦'}]
 
     )
 
     arun(create(request))
 
     # with timer():
-    #     session_id = "8544840144331366400"
+    #     request = MetasoRequest(
+    #         model='ds-r1',
+    #         mode="research",
+    #         question="南京今天天气",
+    #
+    #     )
+    #     arun(get_session_id(request))
+    # session_id = "8544840144331366400"
     #
-    #     arun(get_access_token(session_id))
+    # arun(get_access_token(session_id))
 
     # wr8+pHu3KYryzz0O2MaBSNUZbVLjLUYC1FR4sKqSW0p19vmcZAoEmHC72zPh/fHtOhYhCcR5GKXrxQs9QjN6dulxfOKfQkLdVkLMahMclPPjNVCPE8bLQut3zBABECLaSqpI0fVWBrdbJptnhASrSw==

meutils/caches/common.py

@@ -17,7 +17,7 @@ cache = memory_cache = cached
 
 
 def rcache(**kwargs):
-    """
+    """serializer="pickle"
     :param endpoint: str with the endpoint to connect to. Default is "127.0.0.1".
     :param port: int with the port to connect to. Default is 6379.
     :param db: int indicating database to use. Default is 0.

meutils/data/VERSION

@@ -1 +1 @@
-2025.03.05.20.22.10
+2025.03.06.18.55.02

meutils/llm/completions/qwenllm.py

@@ -49,6 +49,8 @@ async def to_file(file):
 
 
 async def create(request: CompletionRequest, token: Optional[str] = None):  # ChatCompletionRequest 重构
+    if request.temperature > 2:
+        request.temperature = 1
 
     token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL)
 
@@ -164,9 +166,10 @@ if __name__ == '__main__':
 
     request = CompletionRequest(
         # model="qwen-turbo-2024-11-01",
-        model="qwen-max-latest",
+        # model="qwen-max-latest",
         # model="qwen-max-latest-search",
         # model="qwq-max",
+        model="qwq-32b-preview",
         # model="qwq-max-search",
 
         # model="qwen2.5-vl-72b-instruct",
@@ -177,8 +180,8 @@ if __name__ == '__main__':
             {
                 'role': 'user',
                 # 'content': '今天南京天气',
-                # 'content': "9.8 9.11哪个大",
-                'content': 'https://oss.ffire.cc/files/AIGC.pdf 总结下',
+                'content': "9.8 9.11哪个大",
+                # 'content': 'https://oss.ffire.cc/files/AIGC.pdf 总结下',
 
                 # "chat_type": "search",
 

meutils/llm/completions/yuanbao.py

@@ -112,6 +112,7 @@ class Completions(object):
                 logger.debug(response.status_code)
                 response.raise_for_status()
 
+                references = []
                 reasoning = "<think>\n"  # </think>
                 async for chunk in response.aiter_lines():
                     sse = SSEData(chunk=chunk)
@@ -129,16 +130,20 @@ class Completions(object):
                             yield reasoning
 
                         if sse.search_content:
-                            df = pd.DataFrame(sse.search_content)
-                            df['title'] = "[" + df['title'] + "](" + df['url'] + ")"
-                            df['sourceName'] = "![" + df['sourceName'] + "](" + df['icon_url'] + ")"
-                            df = df[['title', 'web_site_name', 'sourceName', "publish_time"]]
-                            df.index += 1
-                            yield '> Search\n'
-                            yield df.to_markdown()
-                            yield '\n\n'
+                            # references
+                            df = pd.DataFrame(sse.search_content).fillna('')
+                            df['icon'] = "![" + df['sourceName'] + "](" + df['icon_url'] + ")"
+                            df['web_site_name'] = df['icon'] + df['web_site_name'] + ": "
+                            df['title'] = df['web_site_name'] + "[" + df['title'] + "](" + df['url'] + ")"
+
+                            for i, ref in enumerate(df['title'], 1):
+                                references.append(f"[^{i}]: {ref}\n")
 
                         yield sse.content
+                if references:
+                    yield '\n\n'
+                    for ref in references:
+                        yield ref
 
     def generate_id(self, random: bool = True):
         if random:
@@ -188,7 +193,9 @@ if __name__ == '__main__':
     # request = HunyuanImageRequest(prompt='画条狗', size='16:9')
     # deep_seek deep_seek_v3 hunyuan_t1 hunyuan_gpt_175B_0404
     # model = 'deep_seek_v3-search'
-    model = 'deep_seek-search'
+    # model = 'deep_seek-search'
+    model = 'deep_seek'
+    model = 'hunyuan_t1'
 
     arun(Completions().create(
         CompletionRequest(

meutils/notice/feishu.py

@@ -104,10 +104,14 @@ def catch(
     return r
 
 
+send_message_for_images = partial(send_message, url=IMAGES)
+
 if __name__ == '__main__':
     # send_message("xxx", title=None)
     send_message(None, title=None)
 
+    send_message_for_images("xxxxxxxx", title=None)
+
     # @catch(task_name='这是一个任务名')
     # def f():
     #     time.sleep(3)

meutils/schemas/metaso_types.py

@@ -18,7 +18,7 @@ class MetasoRequest(BaseModel):
     model: Optional[Literal["ds-r1",]] = None
 
     """search-mini search search-pro"""
-    mode: Literal["concise", "detail", "research"] = "detail"  # concise detail research
+    mode: Union[str, Literal["concise", "detail", "research", "strong-research"]] = "detail"  # concise detail research
 
     question: str = "Chatfire"
 
@@ -35,9 +35,6 @@ class MetasoRequest(BaseModel):
     newEngine: str = 'true'
     enableImage: str = 'true'
 
-    # 自定义字段
-    response_format: Optional[str] = None  # 原生内容
-
 
 # question: hi
 # mode: detail
@@ -55,6 +52,7 @@ class MetasoResponse(BaseModel):  # sse
     content: str = ""
 
     data: Optional[dict] = None
+    references: list = []
 
     # 原生内容
     chunk: str
@@ -74,6 +72,9 @@ class MetasoResponse(BaseModel):  # sse
             self.data.pop("debugId", None)
             self.content = f"""> 🚀AISearch\n```json\n{self.data}\n```\n\n"""
 
+        if self.type in {"set-reference", "update-reference"}:
+            self.references = self.data.get("list", [])
+
 
 if __name__ == '__main__':
     chunk = """data:{"type":"heartbeat"}"""

meutils/schemas/oneapi/common.py

@@ -16,6 +16,7 @@ BASE_URL = "https://api.chatfire.cn"
 FREE = 0.001
 MJ_RELAX = 1
 STEP = 2
+MINIMAX_VIDEO = 3
 
 MODEL_PRICE = {
     "o1:free": FREE,
@@ -32,12 +33,19 @@ MODEL_PRICE = {
     "kling_extend": 1.2,
     "kling_lip_sync": 1.2,
 
-    "minimax_video-01": 1.2,
+    "minimax_files_retrieve": 0.01,
 
-    "minimax_t2v-01": 1.2,
-    "minimax_i2v-01": 1.2,
-    "minimax_i2v-01-live": 1.2,
-    "minimax_s2v-01": 1.2,
+    "minimax_s2v-01": MINIMAX_VIDEO * 1.5,
+
+    "minimax_i2v-01": MINIMAX_VIDEO,
+    "minimax_i2v-01-live": MINIMAX_VIDEO,
+    "minimax_i2v-01-director": MINIMAX_VIDEO,
+
+    "minimax_t2v-01": MINIMAX_VIDEO,
+    "minimax_t2v-01-director": MINIMAX_VIDEO,
+
+    "minimax_video-01": MINIMAX_VIDEO,
+    "minimax_video-01-live2d": MINIMAX_VIDEO,
 
     # free
     "google/gemini-2.0-flash-thinking-exp:free": 0.00001,
@@ -546,7 +554,7 @@ MODEL_RATIO = {
     "doubao-1.5-pro-32k": 0.8,
     "doubao-1.5-pro-256k": 5,
 
-    "doubao-1.5-vision-pro-32k": 3,
+    "doubao-1.5-vision-pro-32k": 1.5,
     "doubao-vision-lite-32k": 0.75,
     "doubao-vision-pro-32k": 1.5,
 
@@ -679,6 +687,8 @@ MODEL_RATIO = {
     "chatgpt-4o-latest": 2.5,
     "gpt-4o-realtime-preview": 2.5,
     "gpt-4o-realtime-preview-2024-10-01": 2.5,
+    "gpt-4o-audio-preview": 2.5 / 2,
+    "gpt-4o-mini-audio-preview": 0.15 / 2,
 
     "gpt-4o": 1.25,
     "gpt-4o-all": 2.5,  # 逆向