mirror of
https://github.com/langgenius/dify.git
synced 2026-09-08 11:04:27 +08:00
refactor: replace bare dict with dict[str, Any] in OpenAPI tools parser (#35061)
This commit is contained in:
parent
dd50a68bf2
commit
2edd083a71
@ -32,7 +32,7 @@ class OpenAPISpecDict(TypedDict):
|
|||||||
class ApiBasedToolSchemaParser:
|
class ApiBasedToolSchemaParser:
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def parse_openapi_to_tool_bundle(
|
def parse_openapi_to_tool_bundle(
|
||||||
openapi: Mapping[str, Any], extra_info: dict | None = None, warning: dict | None = None
|
openapi: Mapping[str, Any], extra_info: dict[str, Any] | None = None, warning: dict[str, Any] | None = None
|
||||||
) -> list[ApiToolBundle]:
|
) -> list[ApiToolBundle]:
|
||||||
warning = warning if warning is not None else {}
|
warning = warning if warning is not None else {}
|
||||||
extra_info = extra_info if extra_info is not None else {}
|
extra_info = extra_info if extra_info is not None else {}
|
||||||
@ -236,7 +236,7 @@ class ApiBasedToolSchemaParser:
|
|||||||
return value
|
return value
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _get_tool_parameter_type(parameter: dict) -> ToolParameter.ToolParameterType | None:
|
def _get_tool_parameter_type(parameter: dict[str, Any]) -> ToolParameter.ToolParameterType | None:
|
||||||
parameter = parameter or {}
|
parameter = parameter or {}
|
||||||
typ: str | None = None
|
typ: str | None = None
|
||||||
if parameter.get("format") == "binary":
|
if parameter.get("format") == "binary":
|
||||||
@ -265,7 +265,7 @@ class ApiBasedToolSchemaParser:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def parse_openapi_yaml_to_tool_bundle(
|
def parse_openapi_yaml_to_tool_bundle(
|
||||||
yaml: str, extra_info: dict | None = None, warning: dict | None = None
|
yaml: str, extra_info: dict[str, Any] | None = None, warning: dict[str, Any] | None = None
|
||||||
) -> list[ApiToolBundle]:
|
) -> list[ApiToolBundle]:
|
||||||
"""
|
"""
|
||||||
parse openapi yaml to tool bundle
|
parse openapi yaml to tool bundle
|
||||||
@ -278,14 +278,14 @@ class ApiBasedToolSchemaParser:
|
|||||||
warning = warning if warning is not None else {}
|
warning = warning if warning is not None else {}
|
||||||
extra_info = extra_info if extra_info is not None else {}
|
extra_info = extra_info if extra_info is not None else {}
|
||||||
|
|
||||||
openapi: dict = safe_load(yaml)
|
openapi: dict[str, Any] = safe_load(yaml)
|
||||||
if openapi is None:
|
if openapi is None:
|
||||||
raise ToolApiSchemaError("Invalid openapi yaml.")
|
raise ToolApiSchemaError("Invalid openapi yaml.")
|
||||||
return ApiBasedToolSchemaParser.parse_openapi_to_tool_bundle(openapi, extra_info=extra_info, warning=warning)
|
return ApiBasedToolSchemaParser.parse_openapi_to_tool_bundle(openapi, extra_info=extra_info, warning=warning)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def parse_swagger_to_openapi(
|
def parse_swagger_to_openapi(
|
||||||
swagger: dict, extra_info: dict | None = None, warning: dict | None = None
|
swagger: dict[str, Any], extra_info: dict[str, Any] | None = None, warning: dict[str, Any] | None = None
|
||||||
) -> OpenAPISpecDict:
|
) -> OpenAPISpecDict:
|
||||||
warning = warning or {}
|
warning = warning or {}
|
||||||
"""
|
"""
|
||||||
@ -351,7 +351,7 @@ class ApiBasedToolSchemaParser:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def parse_openai_plugin_json_to_tool_bundle(
|
def parse_openai_plugin_json_to_tool_bundle(
|
||||||
json: str, extra_info: dict | None = None, warning: dict | None = None
|
json: str, extra_info: dict[str, Any] | None = None, warning: dict[str, Any] | None = None
|
||||||
) -> list[ApiToolBundle]:
|
) -> list[ApiToolBundle]:
|
||||||
"""
|
"""
|
||||||
parse openapi plugin yaml to tool bundle
|
parse openapi plugin yaml to tool bundle
|
||||||
@ -392,7 +392,7 @@ class ApiBasedToolSchemaParser:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def auto_parse_to_tool_bundle(
|
def auto_parse_to_tool_bundle(
|
||||||
content: str, extra_info: dict | None = None, warning: dict | None = None
|
content: str, extra_info: dict[str, Any] | None = None, warning: dict[str, Any] | None = None
|
||||||
) -> tuple[list[ApiToolBundle], ApiProviderSchemaType]:
|
) -> tuple[list[ApiToolBundle], ApiProviderSchemaType]:
|
||||||
"""
|
"""
|
||||||
auto parse to tool bundle
|
auto parse to tool bundle
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user