解决类型问题

.github/workflows/docs-build.yml

@@ -52,7 +52,7 @@ jobs:
       - name: "发布"
         run: |
           npx -p "@getmeli/cli" meli upload docs/.vitepress/dist \
-            --url "https://dash.apage.dev" \
+            --url "https://pages.liteyuki.icu" \
             --site "$MELI_SITE" \
             --token "$MELI_TOKEN" \
             --release "$GITHUB_SHA"

README.md

@@ -1,6 +1,6 @@
 <!--suppress LongLine -->
 <div align="center">
-  <a href="https://marsho.liteyuki.org"><img src="https://marsho.liteyuki.org/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
+  <a href="https://marshoai-docs.pages.liteyuki.icu"><img src="https://marshoai-docs.pages.liteyuki.icu/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
   <br>
 </div>
 
@@ -48,7 +48,7 @@ _谁不喜欢回复消息快又可爱的猫娘呢？_
 
 ## 😼 使用
 
-请查看[使用文档](https://marsho.liteyuki.org/start/use.html)
+请查看[使用文档](https://marshoai-docs.pages.liteyuki.icu/start/use.html)
 
 ## ❤ 鸣谢&版权说明
 

README_EN.md

@@ -1,6 +1,6 @@
 <!--suppress LongLine -->
 <div align="center">
-  <a href="https://marsho.liteyuki.org"><img src="https://marsho.liteyuki.org/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
+  <a href="https://marshoai-docs.pages.liteyuki.icu"><img src="https://marshoai-docs.pages.liteyuki.icu/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
   <br>
 </div>
 
@@ -48,7 +48,7 @@ Plugin internally installed the catgirl character of Marsho, is able to have a c
 - 🐾 Play! I like play with friends!
 
 ## 😼 Usage
-Please read [Documentation](https://marsho.liteyuki.org/start/use.html)
+Please read [Documentation](https://marshoai-docs.pages.liteyuki.icu/start/use.html)
 
 ## ❤ Thanks&Copyright
 This project uses the following code from other projects:  

docs/en/start/install.md

@@ -65,7 +65,7 @@ When nonebot linked to OneBot v11 adapter, can recieve double click and response
 MarshoTools is a feature added in `v0.5.0`, support loading external function library to provide Function Call for Marsho. 
 
 ## 🧩 Marsho Plugin
-Marsho Plugin is a feature added in `v1.0.0`, replacing the old MarshoTools feature. [Documentation](https://marsho.liteyuki.org/dev/extension)
+Marsho Plugin is a feature added in `v1.0.0`, replacing the old MarshoTools feature. [Documentation](https://marshoai-docs.pages.liteyuki.icu/dev/extension)
 
 ## 👍 Praise list
 

docs/zh/start/install.md

@@ -68,7 +68,7 @@ GitHub Models API 的限制较多，不建议使用，建议通过修改`MARSHOA
 
 ## 🧩 小棉插件
 
-小棉插件是`v1.0.0`的新增功能，替代旧的小棉工具功能。[使用文档](https://marsho.liteyuki.org/dev/extension)
+小棉插件是`v1.0.0`的新增功能，替代旧的小棉工具功能。[使用文档](https://marshoai-docs.pages.liteyuki.icu/dev/extension)
 
 ## 👍 夸赞名单
 

nonebot_plugin_marshoai/__init__.py

@@ -26,19 +26,17 @@ from nonebot.plugin import require
 
 require("nonebot_plugin_alconna")
 require("nonebot_plugin_localstore")
-require("nonebot_plugin_argot")
 
 import nonebot_plugin_localstore as store  # type: ignore
 from nonebot import get_driver, logger  # type: ignore
 
 from .config import config
+
+# from .hunyuan import *
 from .dev import *
 from .marsho import *
 from .metadata import metadata
 
-# from .hunyuan import *
-
-
 __author__ = "Asankilp"
 __plugin_meta__ = metadata
 

nonebot_plugin_marshoai/constants.py

@@ -37,7 +37,7 @@ OPENAI_NEW_MODELS: list = [
 INTRODUCTION: str = f"""MarshoAI-NoneBot by LiteyukiStudio
 你好喵~我是一只可爱的猫娘AI，名叫小棉~🐾！
 我的主页在这里哦~↓↓↓
-https://marsho.liteyuki.org
+https://marshoai-docs.pages.liteyuki.icu
 
 ※ 使用 「{config.marshoai_default_name}.status」命令获取状态信息。
 ※ 使用「{config.marshoai_default_name}.help」命令获取使用说明。"""

nonebot_plugin_marshoai/dev.py

@@ -1,16 +1,15 @@
 import os
 from pathlib import Path
 
-from nonebot import get_driver, logger, on_command, require
+from nonebot import get_driver, logger, require
 from nonebot.adapters import Bot, Event
 from nonebot.matcher import Matcher
 from nonebot.typing import T_State
-from nonebot_plugin_argot import add_argot, get_message_id
 
 from nonebot_plugin_marshoai.plugin.load import reload_plugin
 
 from .config import config
-from .instances import context
+from .marsho import context
 from .plugin.func_call.models import SessionContext
 
 require("nonebot_plugin_alconna")
@@ -49,21 +48,6 @@ function_call = on_alconna(
     permission=SUPERUSER,
 )
 
-argot_test = on_command("argot", permission=SUPERUSER)
-
-
-@argot_test.handle()
-async def _():
-    await argot_test.send(
-        "aa",
-        argot={
-            "name": "test",
-            "command": "test",
-            "segment": f"{os.getcwd()}",
-            "expired_at": 1000,
-        },
-    )
-
 
 @function_call.assign("list")
 async def list_functions():
@@ -114,34 +98,26 @@ async def call_function(
     recursive=True,
 )
 def on_plugin_file_change(event):
-    if not event.src_path.endswith(".py"):
+    if event.src_path.endswith(".py"):
-        return
-
         logger.info(f"文件变动: {event.src_path}")
         # 层层向上查找到插件目录
         dir_list: list[str] = event.src_path.split("/")  # type: ignore
         dir_list[-1] = dir_list[-1].split(".", 1)[0]
         dir_list.reverse()
-
         for plugin_name in dir_list:
-        if not (plugin := get_plugin(plugin_name)):
+            if plugin := get_plugin(plugin_name):
-            continue
+                if plugin.module_path.endswith("__init__.py"):
-
+                    # 包插件
-        if (
+                    if os.path.dirname(plugin.module_path).replace(
-            plugin.module_path
+                        "\\", "/"
-            and plugin.module_path.endswith("__init__.py")
+                    ) in event.src_path.replace("\\", "/"):
-            and os.path.dirname(plugin.module_path).replace("\\", "/")
-            in event.src_path.replace("\\", "/")
-        ):  # 包插件
                         logger.debug(f"找到变动插件: {plugin.name}，正在重新加载")
                         reload_plugin(plugin)
                         context.reset_all()
                         break
                 else:
                     # 单文件插件
-            if plugin.module_path != event.src_path:
+                    if plugin.module_path == event.src_path:
-                continue
-
                         logger.debug(f"找到变动插件: {plugin.name}，正在重新加载")
                         reload_plugin(plugin)
                         context.reset_all()

nonebot_plugin_marshoai/handler.py

@@ -1,5 +1,4 @@
 import json
-from datetime import timedelta
 from typing import Optional, Tuple, Union
 
 from azure.ai.inference.models import (
@@ -18,14 +17,7 @@ from nonebot.matcher import (
     current_event,
     current_matcher,
 )
-from nonebot_plugin_alconna.uniseg import (
+from nonebot_plugin_alconna.uniseg import UniMessage, UniMsg, get_message_id, get_target
-    Text,
-    UniMessage,
-    UniMsg,
-    get_message_id,
-    get_target,
-)
-from nonebot_plugin_argot import Argot  # type: ignore
 from openai import AsyncOpenAI, AsyncStream
 from openai.types.chat import ChatCompletion, ChatCompletionChunk, ChatCompletionMessage
 
@@ -43,7 +35,7 @@ from .util import (
     make_chat_openai,
     parse_richtext,
 )
-from .utils.processor import process_chat_stream, process_completion_to_details
+from .utils.request import process_chat_stream
 
 
 class MarshoHandler:
@@ -125,7 +117,7 @@ class MarshoHandler:
 
     async def handle_function_call(
         self,
-        completion: Union[ChatCompletion, AsyncStream[ChatCompletionChunk]],
+        completion: Union[ChatCompletion],
         user_message: Union[str, list],
         model_name: str,
         tools_list: list | None = None,
@@ -238,28 +230,12 @@ class MarshoHandler:
                 target_list.append([self.target.id, self.target.private])
 
             # 对话成功发送消息
-            send_message = UniMessage()
             if config.marshoai_enable_richtext_parse:
-                send_message = await parse_richtext(str(choice_msg_content))
+                await (await parse_richtext(str(choice_msg_content))).send(
-            else:
+                    reply_to=True
-                send_message = UniMessage(str(choice_msg_content))
-            send_message.append(
-                Argot(
-                    "detail",
-                    Text(await process_completion_to_details(response)),
-                    command="detail",
-                    expired_at=timedelta(minutes=5),
-                )  # type:ignore
                 )
-            # send_message.append(
+            else:
-            #     Argot(
+                await UniMessage(str(choice_msg_content)).send(reply_to=True)
-            #         "debug",
-            #         Text(str(response)),
-            #         command=f"debug",
-            #         expired_at=timedelta(minutes=5),
-            #     )
-            # )
-            await send_message.send(reply_to=True)
             return UserMessage(content=user_message), choice_msg_after
         elif choice.finish_reason == CompletionsFinishReason.CONTENT_FILTERED:
 

nonebot_plugin_marshoai/marsho.py

@@ -23,7 +23,6 @@ from nonebot_plugin_alconna import (
     message_reaction,
     on_alconna,
 )
-from nonebot_plugin_argot.extension import ArgotExtension  # type: ignore
 
 from .config import config
 from .constants import INTRODUCTION, SUPPORT_IMAGE_MODELS
@@ -33,7 +32,7 @@ from .instances import client, context, model_name, target_list, tools
 from .metadata import metadata
 from .plugin.func_call.caller import get_function_calls
 from .util import *
-from .utils.processor import process_chat_stream
+from .utils.request import process_chat_stream
 
 
 async def at_enable():
@@ -64,7 +63,6 @@ marsho_cmd = on_alconna(
     aliases=tuple(config.marshoai_aliases),
     priority=96,
     block=True,
-    extensions=[ArgotExtension()],
 )
 resetmem_cmd = on_alconna(
     Alconna(
@@ -121,7 +119,7 @@ async def add_assistantmsg(target: MsgTarget, arg: Message = CommandArg()):
 @praises_cmd.handle()
 async def praises():
     # await UniMessage(await tools.call("marshoai-weather.get_weather", {"location":"杭州"})).send()
-    await praises_cmd.finish(await build_praises())
+    await praises_cmd.finish(build_praises())
 
 
 @contexts_cmd.handle()

nonebot_plugin_marshoai/models.py

@@ -1,12 +1,12 @@
 import importlib
-import importlib.util
 import json
 import os
 import sys
+
+# import importlib.util
 import traceback
 
 from nonebot import logger
-from typing_extensions import deprecated
 
 from .config import config
 
@@ -73,7 +73,6 @@ class MarshoContext:
         return self._get_target_dict(is_private).setdefault(target_id, [])
 
 
-@deprecated("小棉工具已弃用，无法正常调用")
 class MarshoTools:
     """
     Marsho 的工具类
@@ -116,12 +115,10 @@ class MarshoTools:
                 spec = importlib.util.spec_from_file_location(
                     package_name, os.path.join(package_path, "__init__.py")
                 )
-                if not spec:
-                    raise ImportError(f"工具包 {package_name} 未找到")
                 package = importlib.util.module_from_spec(spec)
                 self.imported_packages[package_name] = package
                 sys.modules[package_name] = package
-                spec.loader.exec_module(package)  # type:ignore
+                spec.loader.exec_module(package)
 
                 logger.success(f"成功加载工具包 {package_name}")
             except json.JSONDecodeError as e:

nonebot_plugin_marshoai/observer.py

@@ -29,7 +29,7 @@ def debounce(wait):
         def wrapper(*args, **kwargs):
             nonlocal last_call_time
             current_time = time.time()
-            if last_call_time is None or (current_time - last_call_time) > wait:
+            if (current_time - last_call_time) > wait:
                 last_call_time = current_time
                 return func(*args, **kwargs)
 
@@ -52,7 +52,7 @@ class CodeModifiedHandler(FileSystemEventHandler):
     """
 
     @debounce(1)
-    def on_modified(self, event: FileSystemEvent):
+    def on_modified(self, event):
         raise NotImplementedError("on_modified must be implemented")
 
     def on_created(self, event):

nonebot_plugin_marshoai/utils/request.py

@@ -16,7 +16,7 @@ async def process_chat_stream(
         last_chunk = chunk
         # print(chunk)
         if not is_first_token_appeared:
-            logger.info(f"{chunk.id}: 第一个 token 已出现")
+            logger.debug(f"{chunk.id}: 第一个 token 已出现")
             is_first_token_appeared = True
         if not chunk.choices:
             logger.info("Usage:", chunk.usage)
@@ -24,12 +24,12 @@ async def process_chat_stream(
             delta = chunk.choices[0].delta
             if (
                 hasattr(delta, "reasoning_content")
-                and delta.reasoning_content is not None  # type:ignore
+                and delta.reasoning_content is not None
             ):
-                reasoning_contents += delta.reasoning_content  # type:ignore
+                reasoning_contents += delta.reasoning_content
             else:
                 if not is_answering:
-                    logger.info(
+                    logger.debug(
                         f"{chunk.id}: 思维链已输出完毕或无 reasoning_content 字段输出"
                     )
                     is_answering = True
@@ -69,22 +69,3 @@ async def process_chat_stream(
             object="chat.completion",
             usage=None,
         )
-
-
-async def process_completion_to_details(completion: ChatCompletion) -> str:
-    if not isinstance(completion, ChatCompletion):
-        return "暂不支持对流式调用用量的获取，或预期之外的输入"
-
-    usage_text = ""
-    usage = completion.usage
-    if usage is None:
-        usage_text = "无"
-    else:
-        usage_text = str(usage)
-
-    details_text = f"""=========消息详情=========
-    模型: {completion.model}
-    消息 ID: {completion.id}
-    用量信息: {usage_text}"""
-    # print(details_text)
-    return details_text

pdm.lock

@@ -5,7 +5,7 @@
 groups = ["default", "dev", "test"]
 strategy = ["inherit_metadata"]
 lock_version = "4.5.0"
-content_hash = "sha256:6aa043fb1d2d4d384e0d0c698c02a27f22e099828d2973a4baef05c5316f4ee0"
+content_hash = "sha256:9dd3edfe69c332deac360af2685358e82c5dac0870900668534fc6f1d34040f8"
 
 [[metadata.targets]]
 requires_python = "~=3.10"
@@ -1519,27 +1519,9 @@ files = [
     {file = "nonebot_plugin_apscheduler-0.5.0.tar.gz", hash = "sha256:6c0230e99765f275dc83d6639ff33bd6f71203fa10cd1b8a204b0f95530cda86"},
 ]
 
-[[package]]
-name = "nonebot-plugin-argot"
-version = "0.1.7"
-requires_python = ">=3.10"
-summary = "NoneBot 暗语"
-groups = ["default"]
-dependencies = [
-    "aiofiles>=24.1.0",
-    "nonebot-plugin-alconna>=0.51.1",
-    "nonebot-plugin-apscheduler>=0.5.0",
-    "nonebot-plugin-localstore>=0.7.4",
-    "nonebot2>=2.3.2",
-]
-files = [
-    {file = "nonebot_plugin_argot-0.1.7-py3-none-any.whl", hash = "sha256:1af939a60967e27aff6f7ce97150d26cba8f1ef0cf216b44372cc0d8e5937204"},
-    {file = "nonebot_plugin_argot-0.1.7.tar.gz", hash = "sha256:f76c2139c9af1e2de6efdc487b728fbad84737d272bf1f600d085bbe6ed79094"},
-]
-
 [[package]]
 name = "nonebot-plugin-localstore"
-version = "0.7.4"
+version = "0.7.3"
 requires_python = "<4.0,>=3.9"
 summary = "Local Storage Support for NoneBot2"
 groups = ["default"]
@@ -1550,8 +1532,8 @@ dependencies = [
     "typing-extensions<5.0.0,>=4.0.0",
 ]
 files = [
-    {file = "nonebot_plugin_localstore-0.7.4-py3-none-any.whl", hash = "sha256:3b08030878eadcdd8b9ce3d079da0dc2d0e41dc91f0b2d8cf7fa862a27de9090"},
+    {file = "nonebot_plugin_localstore-0.7.3-py3-none-any.whl", hash = "sha256:1bc239b4b5320df0dc08eada7c4f8ba4cb92d4dc3134bf4646ab5e297bd7e575"},
-    {file = "nonebot_plugin_localstore-0.7.4.tar.gz", hash = "sha256:85ddc13814bfcd484ab311306823651390020bf44f4fb4733b343a58e72723ce"},
+    {file = "nonebot_plugin_localstore-0.7.3.tar.gz", hash = "sha256:1aff10e2dacfc5bc9ce239fd34849f8d7172a118135dbc5aeba1c97605d9959d"},
 ]
 
 [[package]]

pyproject.toml

@@ -10,7 +10,7 @@ authors = [
 ]
 dependencies = [
     "nonebot2>=2.4.0",
-    "nonebot-plugin-alconna>=0.57.1",
+    "nonebot-plugin-alconna>=0.57.0",
     "nonebot-plugin-localstore>=0.7.1",
     "zhDatetime>=2.0.0",
     "aiohttp>=3.9",
@@ -28,14 +28,13 @@ dependencies = [
     "azure-ai-inference>=1.0.0b6",
     "watchdog>=6.0.0",
     "nonebot-plugin-apscheduler>=0.5.0",
-    "openai>=1.58.1",
+    "openai>=1.58.1"
-    "nonebot-plugin-argot>=0.1.7"
 
 ]
 license = { text = "MIT, Mulan PSL v2" }
 
 [project.urls]
-Homepage = "https://marsho.liteyuki.org/"
+Homepage = "https://marshoai-docs.pages.liteyuki.icu/"
 
 
 [tool.nonebot]