refactor: split changes for api/services/tools/api_tools_manage_servi…

api/.ruff.toml

@@ -1,4 +1,8 @@
-exclude = ["migrations/*"]
+exclude = [
+ "migrations/*",
+ ".git",
+ ".git/**",
+]
 line-length = 120
 
 [format]

api/core/tools/utils/parser.py

@@ -378,7 +378,7 @@ def parse_openai_plugin_json_to_tool_bundle(
  @staticmethod
  def auto_parse_to_tool_bundle(
  content: str, extra_info: dict | None = None, warning: dict | None = None
- ) -> tuple[list[ApiToolBundle], str]:
+ ) -> tuple[list[ApiToolBundle], ApiProviderSchemaType]:
  """
  auto parse to tool bundle
 

api/services/tools/api_tools_manage_service.py

@@ -85,7 +85,9 @@ def parser_api_schema(schema: str) -> Mapping[str, Any]:
  raise ValueError(f"invalid schema: {str(e)}")
 
  @staticmethod
- def convert_schema_to_tool_bundles(schema: str, extra_info: dict | None = None) -> tuple[list[ApiToolBundle], str]:
+ def convert_schema_to_tool_bundles(
+ schema: str, extra_info: dict | None = None
+ ) -> tuple[list[ApiToolBundle], ApiProviderSchemaType]:
  """
  convert schema to tool bundles
 
@@ -103,7 +105,7 @@ def create_api_tool_provider(
  provider_name: str,
  icon: dict,
  credentials: dict,
- schema_type: str,
+ schema_type: ApiProviderSchemaType,
  schema: str,
  privacy_policy: str,
  custom_disclaimer: str,
@@ -112,9 +114,6 @@ def create_api_tool_provider(
  """
  create api tool provider
  """
- if schema_type not in [member.value for member in ApiProviderSchemaType]:
- raise ValueError(f"invalid schema type {schema}")
-
  provider_name = provider_name.strip()
 
  # check if the provider exists
@@ -241,18 +240,15 @@ def update_api_tool_provider(
  original_provider: str,
  icon: dict,
  credentials: dict,
- schema_type: str,
+ _schema_type: ApiProviderSchemaType,
  schema: str,
- privacy_policy: str,
+ privacy_policy: str | None,
  custom_disclaimer: str,
  labels: list[str],
  ):
  """
  update api tool provider
  """
- if schema_type not in [member.value for member in ApiProviderSchemaType]:
- raise ValueError(f"invalid schema type {schema}")
-
  provider_name = provider_name.strip()
 
  # check if the provider exists
@@ -277,7 +273,7 @@ def update_api_tool_provider(
  provider.icon = json.dumps(icon)
  provider.schema = schema
  provider.description = extra_info.get("description", "")
- provider.schema_type_str = ApiProviderSchemaType.OPENAPI
+ provider.schema_type_str = schema_type
  provider.tools_str = json.dumps(jsonable_encoder(tool_bundles))
  provider.privacy_policy = privacy_policy
  provider.custom_disclaimer = custom_disclaimer
@@ -356,7 +352,7 @@ def test_api_tool_preview(
  tool_name: str,
  credentials: dict,
  parameters: dict,
- schema_type: str,
+ schema_type: ApiProviderSchemaType,
  schema: str,
  ):
  """