MeUtils 2025.2.5.11.6.16__tar.gz → 2025.2.6.19.30.6__tar.gz

{meutils-2025.2.5.11.6.16 → 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.5.11.6.16
+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: iteration_utilities; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: reportlab; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
 Requires-Dist: faiss-cpu; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: seaborn; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
-Requires-Dist: streamlit; extra == "all"
-Requires-Dist: missingno; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: langchain; extra == "all"
 Requires-Dist: jinja2; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: streamlit; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: fastapi[all]; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
 Requires-Dist: geopy; extra == "all"
 Requires-Dist: schedule; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: openai; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: reportlab; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
 Requires-Dist: pymupd; extra == "all"
 Requires-Dist: thefuck; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: simplejson; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: filetype; extra == "all"
+Requires-Dist: seaborn; extra == "all"
 Requires-Dist: pymongo; 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.5.11.6.16 → meutils-2025.2.6.19.30.6}/MeUtils.egg-info/SOURCES.txt

@@ -357,6 +357,7 @@ meutils/llm/completions/modelscope.py
 meutils/llm/completions/oi.py
 meutils/llm/completions/qwenllm.py
 meutils/llm/completions/rag.py
+meutils/llm/completions/reasoner.py
 meutils/llm/completions/tryblend.py
 meutils/llm/completions/tune.py
 meutils/llm/completions/x.py

{meutils-2025.2.5.11.6.16/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.5.11.6.16
+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: iteration_utilities; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: reportlab; extra == "all"
+Requires-Dist: pandas-profiling[notebook]; extra == "all"
 Requires-Dist: faiss-cpu; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
-Requires-Dist: polars; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
-Requires-Dist: pymysql; extra == "all"
-Requires-Dist: seaborn; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
-Requires-Dist: streamlit; extra == "all"
-Requires-Dist: missingno; extra == "all"
+Requires-Dist: jieba; extra == "all"
+Requires-Dist: langchain; extra == "all"
 Requires-Dist: jinja2; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: streamlit; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: fastapi[all]; extra == "all"
+Requires-Dist: pretty_errors; extra == "all"
 Requires-Dist: geopy; extra == "all"
 Requires-Dist: schedule; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: openai; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: reportlab; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: langchain; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
 Requires-Dist: pymupd; extra == "all"
 Requires-Dist: thefuck; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: simplejson; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: filetype; extra == "all"
+Requires-Dist: seaborn; extra == "all"
 Requires-Dist: pymongo; 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.5.11.6.16 → meutils-2025.2.6.19.30.6}/meutils/apis/chatglm/glm_video_api.py

@@ -103,10 +103,12 @@ async def generate(request: ImageRequest, n: int = 30):  # 兼容dalle3
 # VideoResult
 if __name__ == '__main__':
     api_key = "e21bd630f681c4d90b390cd609720483.WSFVgA3Kk1wNCX0mN"
-    api_key = "7d10426c06afa81e8d7401d97781249c.DbqlSsicRtaUdKXI"  # 新号
+    # api_key = "7d10426c06afa81e8d7401d97781249c.DbqlSsicRtaUdKXI"  # 新号
 
     request = VideoRequest(
-        model='cogvideox-flash'
+        # model='cogvideox-flash',
+        model='cogvideox'
+
     )
     # r = arun(create_task(request, api_key=api_key))
     pass

{meutils-2025.2.5.11.6.16 → meutils-2025.2.6.19.30.6}/meutils/apis/hailuoai/videos.py

@@ -19,7 +19,8 @@ from meutils.pipe import *
 from meutils.hash_utils import md5
 from meutils.io.files_utils import to_bytes
 from meutils.schemas.hailuo_types import BASE_URL, FEISHU_URL, FEISHU_URL_OSS
-from meutils.schemas.hailuo_types import BASE_URL_ABROAD, FEISHU_URL_ABROAD
+from meutils.schemas.hailuo_types import BASE_URL_ABROAD as BASE_URL, FEISHU_URL_ABROAD as FEISHU_URL
+
 from meutils.schemas.hailuo_types import VideoRequest, VideoResponse
 from meutils.llm.check_utils import check_tokens
 from meutils.config_utils.lark_utils import get_next_token_for_polling
@@ -48,12 +49,8 @@ MODEL_MAPPING = {
 # minimax_video-01,minimax_video-01-live2d,,minimax_t2v-01,minimax_i2v-01,minimax_i2v-01-live,minimax_s2v-01
 
 
-async def upload(file: bytes, token: Optional[str] = None, vip: Optional[bool] = True):
-    global BASE_URL, FEISHU_URL
-    if vip:
-        BASE_URL, FEISHU_URL = BASE_URL_ABROAD, FEISHU_URL_ABROAD
-
-    data = await get_request_policy(token, vip)
+async def upload(file: bytes, token: str):
+    data = await get_request_policy(token)
 
     access_key_id = data["accessKeyId"]
     access_key_secret = data["accessKeySecret"]
@@ -116,13 +113,8 @@ async def upload(file: bytes, token: Optional[str] = None, vip: Optional[bool] =
 
 @alru_cache(ttl=1 * 24 * 60 * 60)
 @retrying()
-async def get_access_token(token: Optional[str] = None, vip: Optional[bool] = True):
-    global BASE_URL, FEISHU_URL
-    if vip:
-        BASE_URL, FEISHU_URL = BASE_URL_ABROAD, FEISHU_URL_ABROAD
-
-    token = token or await get_next_token_for_polling(FEISHU_URL, from_redis=True)
-    # if vip: return token  # 关闭自动刷新
+async def get_access_token(token: str):
+    logger.debug(f"get_access_token:{token}")
 
     params = {
         'device_platform': 'web',
@@ -154,7 +146,7 @@ async def get_access_token(token: Optional[str] = None, vip: Optional[bool] = Tr
 
 
 @alru_cache(ttl=1 * 60)
-async def get_request_policy(token, vip: Optional[bool] = True):
+async def get_request_policy(token):
     """
     {
         "data": {
@@ -169,11 +161,7 @@ async def get_request_policy(token, vip: Optional[bool] = True):
         }
     }
     """
-    token = await get_access_token(token, vip)
-
-    global BASE_URL, FEISHU_URL
-    if vip:
-        BASE_URL, FEISHU_URL = BASE_URL_ABROAD, FEISHU_URL_ABROAD
+    token = await get_access_token(token)
 
     headers = {
         'token': token,
@@ -196,14 +184,11 @@ async def get_request_policy(token, vip: Optional[bool] = True):
 
 
 @retrying(predicate=lambda r: r.base_resp.status_code in {1000061, 1500009})  # 限流
-async def create_task(request: VideoRequest, token: Optional[str] = None, vip: Optional[bool] = True):
-    global BASE_URL, FEISHU_URL
-    if vip:
-        BASE_URL, FEISHU_URL = BASE_URL_ABROAD, FEISHU_URL_ABROAD
-
-    refresh_token = token or await get_next_token_for_polling(FEISHU_URL, from_redis=True)
+async def create_task(request: VideoRequest, token: Optional[str] = None):
+    refresh_token = token or await get_next_token_for_polling(FEISHU_URL, from_redis=True, check_token=check_token)
     # refresh_token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDA0NzA4NzgsInVzZXIiOnsiaWQiOiIzMjg2MDg4ODkzNTA4MTU3NDQiLCJuYW1lIjoiUm9idXN0IEdlcnRydWRlIiwiYXZhdGFyIjoiaHR0cHM6Ly9jZG4uaGFpbHVvYWkudmlkZW8vbW9zcy9wcm9kLzIwMjQtMTItMjgtMTYvdXNlci91c2VyX2F2YXRhci8xNzM1Mzc1OTI0OTkyMTcxMDY3LWF2YXRhcl8zMjg2MDg4ODkzNTA4MTU3NDQiLCJkZXZpY2VJRCI6IjMwMjgzMzc1OTUxMjc2NDQxNyIsImlzQW5vbnltb3VzIjpmYWxzZX19.dLNBSHjqnKutGl3ralS2g8A-RodHjOdos11vdpbkPwc"
-    token = await get_access_token(refresh_token, vip)
+
+    token = await get_access_token(refresh_token)
 
     payload = {
         "desc": request.prompt,
@@ -228,7 +213,7 @@ async def create_task(request: VideoRequest, token: Optional[str] = None, vip: O
             #                                                            "name": "duikoux.jpg", "type": "jpg"}],
             #  "modelID": "23021", "quantity": "1"}
         else:
-            data = await upload(file, token=refresh_token, vip=vip)
+            data = await upload(file, token=refresh_token)
             file_data = {
                 "id": data['data']['fileID'],
                 "name": "_.png",
@@ -291,7 +276,7 @@ async def create_task(request: VideoRequest, token: Optional[str] = None, vip: O
 
         task_id = (data.get('data') or {}).get('id', '')
         response = VideoResponse(
-            task_id=f"hailuo-{task_id}" if not vip else f"hailuoai-{task_id}",
+            task_id=f"hailuoai-{task_id}",
             base_resp=data.get('statusInfo', {}),
             system_fingerprint=refresh_token
         )
@@ -331,9 +316,6 @@ async def create_task(request: VideoRequest, token: Optional[str] = None, vip: O
 
 # 307134660730421250
 async def get_task(task_id: str, token: str):
-    global BASE_URL, FEISHU_URL
-    if "hailuoai" in task_id:
-        BASE_URL, FEISHU_URL = BASE_URL_ABROAD, FEISHU_URL_ABROAD
 
     task_id = task_id.rsplit('-', 1)[-1]
 
@@ -380,9 +362,8 @@ async def get_task(task_id: str, token: str):
 
 
 # https://hailuoai.video/v1/api/user/equity?device_platform=web&app_id=3001&version_code=22201&uuid=3de88ad0-8a38-48a9-8ed3-0d63f9c71296&lang=en&device_id=302833759512764417&os_name=Mac&browser_name=chrome&device_memory=8&cpu_core_num=10&browser_language=zh-CN&browser_platform=MacIntel&screen_width=1920&screen_height=1080&unix=1731571578000
+@alru_cache(ttl=3600)
 async def check_token(token, threshold: int = 30, **kwargs):
-    BASE_URL, FEISHU_URL = BASE_URL_ABROAD, FEISHU_URL_ABROAD
-
     if not isinstance(token, str):
         return await check_tokens(token, check_token)
 
@@ -426,9 +407,9 @@ if __name__ == '__main__':  # 304752356930580482
     # p = "/Users/betterme/PycharmProjects/AI/MeUtils/meutils/data/cowboy-hat-face.webp"
     # arun(upload(Path(p).read_bytes(), token=token, vip=vip))
     # arun(upload(Path(p).read_bytes(), vip=False))
-    access_token = arun(get_access_token())
+    # access_token = arun(get_access_token())
+    # arun(upload(Path("img.png").read_bytes(), token=access_token))
     # arun(upload(Path("img.png").read_bytes(), token=access_token))
-    arun(upload(Path("img.png").read_bytes(), token=access_token))
 
     # arun(get_task(task_id="307137575113703427", token=token)) # 307173162217783304
     # arun(get_task(task_id="307148849188945924", token=token))
@@ -448,7 +429,7 @@ if __name__ == '__main__':  # 304752356930580482
         first_frame_image="https://oss.ffire.cc/files/kling_watermark.png"  # 307173162217783304
     )
 
-    r = arun(create_task(request, token=token, vip=vip))
+    r = arun(create_task(request, token=token))
     arun(get_task(task_id=r.task_id, token=r.system_fingerprint))
     #
     #

{meutils-2025.2.5.11.6.16 → meutils-2025.2.6.19.30.6}/meutils/apis/images/recraft.py

@@ -147,11 +147,11 @@ if __name__ == '__main__':
         **data
     )
 
-    # with timer():
-    #     arun(generate(request, token=token))
+    with timer():
+        arun(generate(request, token=token))
 
     # tokens = [token]
 
-    tokens = list(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0]) | xfilter_
-
-    r = arun(check_token(tokens))
+    # tokens = list(arun(aget_spreadsheet_values(feishu_url=FEISHU_URL, to_dataframe=True))[0]) | xfilter_
+    #
+    # r = arun(check_token(tokens))

{meutils-2025.2.5.11.6.16 → meutils-2025.2.6.19.30.6}/meutils/apis/jimeng/images.py

@@ -40,7 +40,7 @@ async def create_draft_content(request: ImageRequest, token: str):
 
     if urls := parse_url(request.prompt):
         url = urls[-1]
-        image_uri = upload_for_image(url, token)
+        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不支持图片编辑
@@ -164,8 +164,8 @@ async def create_draft_content(request: ImageRequest, token: str):
         "main_component_id": main_component_id,
         "component_list": [component]
     }
-
-    logger.debug(bjson(draft_content))
+    logger.debug(draft_content)
+    # logger.debug(bjson(draft_content))
 
     return draft_content
 
@@ -181,6 +181,9 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):
         request.model = "high_aes_general_v20_L:general_v2.0_L"
 
     draft_content = await create_draft_content(request, token)
+
+    logger.debug(json.dumps(draft_content))
+
     payload = {
         "extend": {
             "root_model": request.model,
@@ -194,7 +197,6 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):
         }
     }
 
-    logger.debug(bjson(payload))
 
     async with httpx.AsyncClient(base_url=BASE_URL, headers=headers, timeout=60) as client:
         response = await client.post(url, json=payload)
@@ -276,7 +278,10 @@ async def generate(request: ImageRequest):
         response = await get_task(task_response.task_id, task_response.system_fingerprint)
         logger.debug(response)
         if response.status.lower().startswith("fail"):
-            raise Exception(response.message)
+            raise HTTPException(
+                status_code=status.HTTP_451_UNAVAILABLE_FOR_LEGAL_REASONS,
+                detail=response.message
+            )
 
         if data := response.data:
             return {"data": data}
@@ -312,10 +317,18 @@ if __name__ == '__main__':
     # t3 = ("10186352959490", "eb4d120829cfd3ee957943f63d6152ed")
     #
     # arun(get_task(*t3))
+    data = {
+        "model": "seededit",
+        "prompt": "https://oss.ffire.cc/files/kling_watermark.png 让这个女人带上墨镜，衣服换个颜色",
+        "size": "1024x1024"
+    }
+    # 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))

{meutils-2025.2.5.11.6.16 → 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.5.11.6.16 → meutils-2025.2.6.19.30.6}/meutils/apis/search/metaso.py

@@ -16,6 +16,8 @@ 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
+
 token = "wr8+pHu3KYryzz0O2MaBSNUZbVLjLUYC1FR4sKqSW0p19vmcZAoEmHC72zPh/fHtOhYhCcR5GKXrxQs9QjN6dulxfOKfQkLdVkLMahMclPPjNVCPE8bLQut3zBABECLaSqpI0fVWBrdbJptnhASrSw=="
 
 MODELS = {
@@ -27,6 +29,8 @@ MODELS = {
     "ai-search-pro:scholar": "research"
 }
 
+""
+
 
 async def get_session_id(request: MetasoRequest, headers: Optional[dict] = None, proxy: Optional[str] = None):
     if proxy:
@@ -86,7 +90,13 @@ async def create(request: ChatCompletionRequest, response_format: Optional[str]
     if ":" in request.model:
         _, engine_type = request.model.split(':')
 
+    model = None
+    if request.model.startswith("deepseek"):
+        model = "ds-r1"
+        system_fingerprint = "deepseek-r1"
+
     request = MetasoRequest(
+        model=model,
         mode=MODELS.get(request.model, "concise"),
         engineType=engine_type,
         question=request.last_content,
@@ -139,14 +149,32 @@ async def create(request: ChatCompletionRequest, response_format: Optional[str]
 
             reference_mapping = {}
             async for chunk in response.aiter_lines():
+
                 if (chunk := chunk.strip()) and chunk != "data:[DONE]":
                     # logger.debug(chunk)
 
                     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
 
                         if len(response.content) == 1 and response.content.startswith('秘'):  # 替换 模型水印
-                            response.content = f"{system_fingerprint}AI搜索，它是一款能够深入理解您的问题的AI搜索引擎。"
+                            response.content = f"{system_fingerprint} AI搜索，它是一款能够深入理解您的问题的AI搜索引擎。"
                             yield response.content
                             break
 
@@ -199,13 +227,16 @@ if __name__ == '__main__':
     # arun(get_access_token(request))
 
     request = ChatCompletionRequest(
-        # model="",
+        # model="deepseek-search",
+        model="deepseek-r1-search",
         # model="ai-search",
-        model="ai-search:scholar",
+        # model="ai-search:scholar",
         # model="ai-search-pro:scholar",
 
         # model="search-pro",
 
+        messages=[{'role': 'user', 'content': '今天南京天气怎么样'}]
+
     )
 
     arun(create(request))

{meutils-2025.2.5.11.6.16 → 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.5.11.6.16 → meutils-2025.2.6.19.30.6}/meutils/data/oneapi/NOTICE.md

@@ -35,23 +35,9 @@
   <summary><b>大额对公，请联系客服</b></summary>
 </details>
 
-## 2025-01-27（预祝大家新年快乐）
-
-### 充值活动
-
-  - 充值200增送 5%
-
-  - 充值500增送 10%
-  - 充值1000增送 20%
-  - 充值2000增送 25%
-  
-### 新上线模型Deepseek系列
-
-  - deepseek-v3
-  - deepseek-r1
-  - deepseek-r1:7b
-
-
+## 2025-02-06（预祝大家新年快乐）
+- deepseek-ai/deepseek-v3 
+  - 即日起至北京时间 2025-02-09 00:00 同步官网倍率
 
 
 ---

{meutils-2025.2.5.11.6.16 → meutils-2025.2.6.19.30.6}/meutils/llm/clients.py

@@ -14,6 +14,9 @@ from meutils.pipe import *
 OpenAI = lru_cache(Client)
 AsyncOpenAI = lru_cache(AsyncClient)
 
+
+chatfire_client = AsyncOpenAI()
+
 moonshot_client = AsyncOpenAI(
     api_key=os.getenv("MOONSHOT_API_KEY"),
     base_url=os.getenv("MOONSHOT_BASE_URL")

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

@@ -9,7 +9,7 @@
 # @Description  : todo: 格式匹配
 
 from meutils.pipe import *
-from meutils.llm.clients import AsyncOpenAI, zhipuai_client, moonshot_client
+from meutils.llm.clients import AsyncOpenAI, chatfire_client, zhipuai_client, moonshot_client
 from meutils.llm.openai_utils import to_openai_params
 from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, ChatCompletionRequest, CompletionUsage
 
@@ -90,26 +90,47 @@ class Completions(object):
             completion = await client.chat.completions.create(**data)
             return completion
 
-        else:  # glm
-            request.model = "web-search-pro"
+        else:
+            # 搜索
             data = to_openai_params(request)
-            completion = await zhipuai_client.chat.completions.create(**data)
-            logger.debug(completion)
+            data['model'] = "web-search-pro"
+            data['stream'] = False
+            search_completion = await zhipuai_client.chat.completions.create(**data)
+            logger.debug(search_completion)  # todo: 返回详细信息
+
+            # 大模型
+            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)
             return completion
 
 
 if __name__ == '__main__':
     request = ChatCompletionRequest(
         # model="baichuan4-turbo",
-        model="xx",
+        # model="xx",
+        # model="deepseek-r1",
+        model="deepseek-r1:1.5b",
+
         # model="moonshot-v1-8k",
         # model="doubao",
 
         messages=[
-            {"role": "user", "content": "南京天气如何"}
+            {"role": "user", "content": "deepseek-r1 vs o3-mini"}
         ],
 
         stream=False
     )
 
     arun(Completions().create(request))
+
+    # async def test():
+    #     for i in await Completions().create(request):
+    #         print(i)
+    #
+    #
+    # arun(test())

{meutils-2025.2.5.11.6.16 → meutils-2025.2.6.19.30.6}/meutils/llm/completions/qwenllm.py

@@ -9,7 +9,6 @@
 # @Description  :
 
 from openai import AsyncOpenAI
-from fake_useragent import UserAgent
 
 from meutils.pipe import *
 from meutils.llm.openai_utils import to_openai_params
@@ -20,6 +19,9 @@ from meutils.schemas.openai_types import chat_completion, chat_completion_chunk,
 FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=PP1PGr"
 
 base_url = "https://chat.qwenlm.ai/api"
+
+from fake_useragent import UserAgent
+
 ua = UserAgent()
 
 
@@ -41,7 +43,7 @@ async def create(request: ChatCompletionRequest):
 
     else:
         response = await client.chat.completions.create(**data)
-        logger.info(response)
+        # logger.info(response)
         yield response.choices[0].message.content