更新函数调用模型,添加同步函数类型支持;重构函数信息获取逻辑;新增示例测试用例
Some checks failed
Deploy VitePress site to Pages / build (push) Failing after 38s
Pre-commit checks / pre-commit (3.11) (push) Successful in 2m40s
Pre-commit checks / pre-commit (3.10) (push) Successful in 3m19s
Pre-commit checks / pre-commit (3.12) (push) Successful in 3m19s
Pre-commit checks / pre-commit (3.13) (push) Successful in 3m23s
Pytest API Testing / Pytest (3.11) (push) Failing after 2m10s
Pytest API Testing / Pytest (3.10) (push) Failing after 2m51s
Pytest API Testing / Pytest (3.12) (push) Failing after 2m46s
Pytest API Testing / Pytest (3.13) (push) Failing after 2m39s

This commit is contained in:
2024-12-14 19:56:42 +08:00
parent 2229a60a05
commit 52046ba032
5 changed files with 43 additions and 19 deletions

View File

@ -3,7 +3,7 @@ from typing import Any
from pydantic import BaseModel
from .typing import ASYNC_FUNCTION_CALL_FUNC
from .typing import ASYNC_FUNCTION_CALL_FUNC, FUNCTION_CALL_FUNC
class PluginMetadata(BaseModel):
@ -114,7 +114,7 @@ class FunctionCall(BaseModel):
"""函数描述 这个函数用于获取天气信息"""
arguments: dict[str, FunctionCallArgument]
"""函数参数信息"""
function: ASYNC_FUNCTION_CALL_FUNC
function: FUNCTION_CALL_FUNC
"""函数对象"""
class Config:

View File

@ -2,17 +2,17 @@
"""
import inspect
from typing import Any, Callable, Coroutine, TypeAlias
from nonebot import logger
from nonebot_plugin_marshoai.plugin.utils import is_coroutine_callable
from .models import FunctionCall, FunctionCallArgument
from .typing import (
ASYNC_FUNCTION_CALL_FUNC,
FUNCTION_CALL_FUNC,
SYNC_FUNCTION_CALL_FUNC,
)
from .utils import is_coroutine_callable
_loaded_functions: dict[str, FUNCTION_CALL_FUNC] = {}
@ -42,21 +42,21 @@ def function_call(*funcs: FUNCTION_CALL_FUNC) -> None:
Returns:
str: 函数定义信息
"""
for func in funcs:
function_call = get_function_info(func)
# TODO: 注册函数
# for func in funcs:
# function_call = get_function_info(func)
# # TODO: 注册函数
def get_function_info(func: FUNCTION_CALL_FUNC):
"""获取函数信息
# def get_function_info(func: FUNCTION_CALL_FUNC) -> FunctionCall:
# """获取函数信息
Args:
func: 函数对象
# Args:
# func: 函数对象
Returns:
FunctionCall: 函数信息对象模型
"""
name = func.__name__
description = func.__doc__
logger.info(f"注册函数: {name} {description}")
# TODO: 获取函数参数信息
# Returns:
# FunctionCall: 函数信息对象模型
# """
# description = func.__doc__
# # TODO: 获取函数参数信息
# parameters = {}
# pass