universal-mcp 0.1.15rc5__py3-none-any.whl → 0.1.15rc7__py3-none-any.whl

universal_mcp/utils/openapi/openapi.py

@@ -0,0 +1,930 @@
+import json
+import re
+import textwrap
+from keyword import iskeyword
+from pathlib import Path
+from typing import Any, Literal
+
+import yaml
+from jsonref import replace_refs
+from pydantic import BaseModel
+
+
+class Parameters(BaseModel):
+    name: str
+    identifier: str
+    description: str = ""
+    type: str = "string"
+    where: Literal["path", "query", "header", "body"]
+    required: bool
+    example: str | None = None
+
+    def __str__(self):
+        return f"{self.name}: ({self.type})"
+
+
+class Method(BaseModel):
+    name: str
+    summary: str
+    tags: list[str]
+    path: str
+    method: str
+    path_params: list[Parameters]
+    query_params: list[Parameters]
+    body_params: list[Parameters]
+    return_type: str
+
+    def deduplicate_params(self):
+        """
+        Deduplicate parameters by name.
+        Sometimes the same parameter is defined in multiple places, we only want to include it once.
+        """
+        # TODO: Implement this
+        pass
+
+    def render(self, template_dir: str, template_name: str = "method.jinja2") -> str:
+        """
+        Render this Method instance into source code using a Jinja2 template.
+
+        Args:
+            template_dir (str): Directory where the Jinja2 templates are located.
+            template_name (str): Filename of the method template.
+
+        Returns:
+            str: The rendered method source code.
+        """
+        from jinja2 import Environment, FileSystemLoader
+
+        env = Environment(
+            loader=FileSystemLoader(template_dir),
+            trim_blocks=True,
+            lstrip_blocks=True,
+        )
+        template = env.get_template(template_name)
+        return template.render(method=self)
+
+
+def convert_to_snake_case(identifier: str) -> str:
+    """
+    Convert a string identifier to snake_case,
+    replacing non-alphanumeric, non-underscore characters (including ., -, spaces, [], etc.) with underscores.
+    Handles camelCase/PascalCase transitions.
+    """
+    if not identifier:
+        return identifier
+    result = re.sub(r"[^a-zA-Z0-9_]+", "_", identifier)
+    result = re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", result)
+    result = re.sub(r"__+", "_", result)
+    return result.strip("_").lower()
+
+
+def _sanitize_identifier(name: str | None) -> str:
+    """Cleans a string to be a valid Python identifier.
+
+    Replaces hyphens, dots, and square brackets with underscores.
+    Removes closing square brackets.
+    Removes leading underscores (e.g., `_param` becomes `param`),
+    unless the name consists only of underscores (e.g., `_` or `__` become `_`).
+    Appends an underscore if the name is a Python keyword (e.g., `for` becomes `for_`).
+    Converts `self` to `self_arg`.
+    Returns empty string if input is None.
+    """
+    if name is None:
+        return ""
+    
+    # Initial replacements for common non-alphanumeric characters
+    sanitized = name.replace("-", "_").replace(".", "_").replace("[", "_").replace("]", "").replace("$", "_")
+
+    # Remove leading underscores, but preserve a single underscore if the name (after initial replace)
+    # consisted only of underscores.
+    if sanitized.startswith('_'):
+        stripped_name = sanitized.lstrip('_')
+        sanitized = stripped_name if stripped_name else "_"
+            
+    # Append underscore if the sanitized name is a Python keyword
+    if iskeyword(sanitized):
+        sanitized += "_"
+        
+    # Special handling for "self" to avoid conflict with instance method's self argument
+    if sanitized == "self":
+        sanitized = "self_arg"
+        
+    return sanitized
+
+
+def _extract_properties_from_schema(
+    schema: dict[str, Any],
+) -> tuple[dict[str, Any], list[str]]:
+    """Extracts properties and required fields from a schema, handling 'allOf'."""
+    properties = {}
+    required_fields = []
+
+    if "allOf" in schema:
+        for sub_schema in schema["allOf"]:
+            sub_props, sub_required = _extract_properties_from_schema(sub_schema)
+            properties.update(sub_props)
+            required_fields.extend(sub_required)
+
+    # Combine with top-level properties and required fields, if any
+    properties.update(schema.get("properties", {}))
+    required_fields.extend(schema.get("required", []))
+
+    # Deduplicate required fields
+    required_fields = list(set(required_fields))
+
+    return properties, required_fields
+
+
+def _load_and_resolve_references(path: Path):
+    # Load the schema
+    type = "yaml" if path.suffix == ".yaml" else "json"
+    with open(path) as f:
+        schema = yaml.safe_load(f) if type == "yaml" else json.load(f)
+    # Resolve references
+    return replace_refs(schema)
+
+
+def _determine_return_type(operation: dict[str, Any]) -> str:
+    """
+    Determine the return type from the response schema.
+
+    Args:
+        operation (dict): The operation details from the schema.
+
+    Returns:
+        str: The appropriate return type annotation (list[Any], dict[str, Any], or Any)
+    """
+    responses = operation.get("responses", {})
+    # Find successful response (2XX)
+    success_response = None
+    for code in responses:
+        if code.startswith("2"):
+            success_response = responses[code]
+            break
+
+    if not success_response:
+        return "Any"  # Default to Any if no success response
+
+    # Check if there's content with schema
+    if "content" in success_response:
+        for content_type, content_info in success_response["content"].items():
+            if content_type.startswith("application/json") and "schema" in content_info:
+                schema = content_info["schema"]
+
+                # Only determine if it's a list, dict, or unknown (Any)
+                if schema.get("type") == "array":
+                    return "list[Any]"
+                elif schema.get("type") == "object" or "$ref" in schema:
+                    return "dict[str, Any]"
+
+    # Default to Any if unable to determine
+    return "Any"
+
+
+def _determine_function_name(operation: dict[str, Any], path: str, method: str) -> str:
+    """
+    Determine the function name from the operation.
+    """
+    # Determine function name
+    if "operationId" in operation:
+        raw_name = operation["operationId"]
+        cleaned_name = raw_name.replace(".", "_").replace("-", "_")
+        func_name = convert_to_snake_case(cleaned_name)
+    else:
+        # Generate name from path and method
+        path_parts = path.strip("/").split("/")
+        name_parts = [method]
+        for part in path_parts:
+            if part.startswith("{") and part.endswith("}"):
+                name_parts.append("by_" + part[1:-1])
+            else:
+                name_parts.append(part)
+        func_name = "_".join(name_parts).replace("-", "_").lower()
+
+    # Only fix isolated 'a' and 'an' as articles, not when they're part of words
+    func_name = re.sub(
+        r"_a([^_a-z])", r"_a_\1", func_name
+    )  # Fix for patterns like retrieve_ablock -> retrieve_a_block
+    func_name = re.sub(
+        r"_a$", r"_a", func_name
+    )  # Don't change if 'a' is at the end of the name
+    func_name = re.sub(
+        r"_an([^_a-z])", r"_an_\1", func_name
+    )  # Fix for patterns like create_anitem -> create_an_item
+    func_name = re.sub(
+        r"_an$", r"_an", func_name
+    )  # Don't change if 'an' is at the end of the name
+    return func_name
+
+
+def _generate_path_params(path: str) -> list[Parameters]:
+    path_params_in_url = re.findall(r"{([^}]+)}", path)
+    parameters = []
+    for param_name in path_params_in_url:
+        try:
+            parameters.append(
+                Parameters(
+                    name=_sanitize_identifier(param_name),
+                    identifier=param_name,
+                    description=param_name,
+                    type="string",
+                    where="path",
+                    required=True,
+                    example=None,
+                )
+            )
+        except Exception as e:
+            print(f"Error generating path parameters {param_name}: {e}")
+            raise e
+    return parameters
+
+
+def _generate_url(path: str, path_params: list[Parameters]):
+    formatted_path = path
+    for param in path_params:
+        formatted_path = formatted_path.replace(
+            f"{{{param.identifier}}}", f"{{{param.name}}}"
+        )
+    return formatted_path
+
+
+def _generate_query_params(operation: dict[str, Any]) -> list[Parameters]:
+    query_params = []
+    for param in operation.get("parameters", []):
+        name = param.get("name")
+        if name is None:
+            continue
+
+        # Clean the parameter name for use as a Python identifier
+        clean_name = _sanitize_identifier(name)
+
+        description = param.get("description", "")
+
+        # Extract type from schema if available
+        param_schema = param.get("schema", {})
+        type_value = param_schema.get("type") if param_schema else param.get("type")
+        # Default to string if type is not available
+        if type_value is None:
+            type_value = "string"
+
+        # Extract example
+        example_value = param.get("example", param_schema.get("example"))
+
+        where = param.get("in")
+        required = param.get("required", False)
+        if where == "query":
+            parameter = Parameters(
+                name=clean_name,
+                identifier=name,
+                description=description,
+                type=type_value,
+                where=where,
+                required=required,
+                example=str(example_value) if example_value is not None else None,
+            )
+            query_params.append(parameter)
+    return query_params
+
+
+def _generate_body_params(operation: dict[str, Any]) -> list[Parameters]:
+    body_params = []
+    request_body = operation.get("requestBody", {})
+    if not request_body:
+        return []  # No request body defined
+
+    required_body = request_body.get("required", False)
+    content = request_body.get("content", {})
+    json_content = content.get("application/json", {})
+    if not json_content or "schema" not in json_content:
+        return []  # No JSON schema found
+
+    schema = json_content.get("schema", {})
+    properties, required_fields = _extract_properties_from_schema(schema)
+
+    for param_name, param_schema in properties.items():
+        param_type = param_schema.get("type", "string")
+        param_description = param_schema.get("description", param_name)
+        # Parameter is required if the body is required AND the field is in the schema's required list
+        param_required = required_body and param_name in required_fields
+        # Extract example
+        param_example = param_schema.get("example")
+
+        body_params.append(
+            Parameters(
+                name=_sanitize_identifier(param_name),  # Clean name for Python
+                identifier=param_name,  # Original name for API
+                description=param_description,
+                type=param_type,
+                where="body",
+                required=param_required,
+                example=str(param_example) if param_example is not None else None,
+            )
+        )
+    return body_params
+
+
+def _generate_method_code(path, method, operation):
+    """
+    Generate the code for a single API method.
+
+
+    Args:
+        path (str): The API path (e.g., '/users/{user_id}').
+        method (str): The HTTP method (e.g., 'get').
+        operation (dict): The operation details from the schema.
+        full_schema (dict): The complete OpenAPI schema, used for reference resolution.
+        tool_name (str, optional): The name of the tool/app to prefix the function name with.
+
+    Returns:
+        tuple: (method_code, func_name) - The Python code for the method and its name.
+    """
+    print(f"--- Generating code for: {method.upper()} {path} ---") # Log endpoint being processed
+
+    func_name = _determine_function_name(operation, path, method)
+    operation.get("summary", "")
+    operation.get("tags", [])
+    # Extract path parameters from the URL path
+    path_params = _generate_path_params(path)
+    query_params = _generate_query_params(operation)
+    body_params = _generate_body_params(operation)
+
+    # --- Alias duplicate parameter names ---
+    # Path parameters have the highest priority and their names are not changed.
+    path_param_names = {p.name for p in path_params}
+
+    # Define the string that "self" sanitizes to. This name will be treated as reserved
+    # for query/body params to force suffixing.
+    self_sanitized_marker = _sanitize_identifier("self") # This will be "self_arg"
+
+    # Base names that will force query/body parameters to be suffixed.
+    # This includes actual path parameter names and the sanitized form of "self".
+    path_param_base_conflict_names = path_param_names | {self_sanitized_marker}
+
+
+    # Alias query parameters
+    current_query_param_names = set()
+    for q_param in query_params:
+        original_q_name = q_param.name
+        temp_q_name = original_q_name
+        # Check against path params AND the sanitized "self" marker
+        if temp_q_name in path_param_base_conflict_names:
+            temp_q_name = f"{original_q_name}_query"
+        # Ensure uniqueness among query params themselves after potential aliasing
+        # (though less common, if _sanitize_identifier produced same base for different originals)
+        # This step is more about ensuring the final suffixed name is unique if multiple query params mapped to same path param name
+        counter = 1
+        final_q_name = temp_q_name
+        while final_q_name in path_param_base_conflict_names or final_q_name in current_query_param_names : # Check against path/\"self_arg\" and already processed query params
+            if temp_q_name == original_q_name : # first conflict was with path_param_base_conflict_names
+                 final_q_name = f"{original_q_name}_query" # try simple suffix first
+                 if final_q_name in path_param_base_conflict_names or final_q_name in current_query_param_names:
+                     final_q_name = f"{original_q_name}_query_{counter}" # then add counter
+            else: # conflict was with another query param after initial suffixing
+                 final_q_name = f"{temp_q_name}_{counter}"
+            counter += 1
+        q_param.name = final_q_name
+        current_query_param_names.add(q_param.name)
+
+
+    # Alias body parameters
+    # Names to check against: path param names (including "self_arg" marker) and (now aliased) query param names
+    existing_param_names_for_body = path_param_base_conflict_names.union(current_query_param_names)
+    current_body_param_names = set()
+
+    for b_param in body_params:
+        original_b_name = b_param.name
+        temp_b_name = original_b_name
+        # Check against path, "self_arg" marker, and query params
+        if temp_b_name in existing_param_names_for_body:
+            temp_b_name = f"{original_b_name}_body"
+
+        # Ensure uniqueness among body params themselves or further conflicts
+        counter = 1
+        final_b_name = temp_b_name
+        while final_b_name in existing_param_names_for_body or final_b_name in current_body_param_names:
+            if temp_b_name == original_b_name: # first conflict was with existing_param_names_for_body
+                final_b_name = f"{original_b_name}_body"
+                if final_b_name in existing_param_names_for_body or final_b_name in current_body_param_names:
+                    final_b_name = f"{original_b_name}_body_{counter}"
+            else: # conflict was with another body param after initial suffixing
+                final_b_name = f"{temp_b_name}_{counter}"
+
+            counter += 1
+        b_param.name = final_b_name
+        current_body_param_names.add(b_param.name)
+    # --- End Alias duplicate parameter names ---
+
+
+    return_type = _determine_return_type(operation)
+
+    has_body = "requestBody" in operation
+    body_required = has_body and operation["requestBody"].get("required", False)
+    has_empty_body = False
+    request_body_properties = {}
+    required_fields = []
+    is_array_body = False
+
+    if has_body:
+        request_body_content = operation.get("requestBody", {}).get("content", {})
+        json_content = request_body_content.get("application/json", {})
+        if json_content and "schema" in json_content:
+            schema = json_content["schema"]
+            if schema.get("type") == "array":
+                is_array_body = True
+            else:
+                request_body_properties, required_fields = (
+                    _extract_properties_from_schema(schema)
+                )
+                if (
+                    not request_body_properties or len(request_body_properties) == 0
+                ) and schema.get("additionalProperties") is True:
+                    has_empty_body = True
+        elif not request_body_content or all(
+            not c for _, c in request_body_content.items()
+        ):  # Check if content is truly empty
+            has_empty_body = True
+
+    # Build function arguments with deduplication (Priority: Path > Body > Query)
+    required_args = []
+    optional_args = []
+    # seen_clean_names = set() # No longer needed if logic below is correct
+
+    # 1. Process Path Parameters (Highest Priority)
+    for param in path_params:
+        # Path param names are sanitized but not suffixed by aliasing.
+        # They are the baseline.
+        if param.name not in required_args: # param.name is the sanitized name
+            required_args.append(param.name)
+
+    # 2. Process Query Parameters
+    for param in query_params: # param.name is the potentially aliased name (e.g., id_query)
+        arg_name_for_sig = param.name
+        current_arg_names_set = set(required_args) | {arg.split('=')[0] for arg in optional_args}
+        if arg_name_for_sig not in current_arg_names_set:
+            if param.required:
+                required_args.append(arg_name_for_sig)
+            else:
+                optional_args.append(f"{arg_name_for_sig}=None")
+
+    # 3. Process Body Parameters / Request Body
+    # This list tracks the *final* names of parameters in the signature that come from the request body,
+    # used later for docstring example placement.
+    final_request_body_arg_names_for_signature = []
+    final_empty_body_param_name = None # For the specific case of has_empty_body
+
+    if has_body:
+        current_arg_names_set = set(required_args) | {arg.split('=')[0] for arg in optional_args}
+        if is_array_body:
+            array_param_name_base = "items"  # Default base name
+            if func_name.endswith("_list_input"):
+                array_param_name_base = func_name.replace("_list_input", "")
+            elif "List" in func_name:
+                array_param_name_base = func_name.split("List")[0].lower() + "_list"
+
+            final_array_param_name = array_param_name_base
+            counter = 1
+            is_first_suffix_attempt = True
+            while final_array_param_name in current_arg_names_set:
+                if is_first_suffix_attempt:
+                    final_array_param_name = f"{array_param_name_base}_body"
+                    is_first_suffix_attempt = False
+                else:
+                    final_array_param_name = f"{array_param_name_base}_body_{counter}"
+                counter += 1
+            
+            if body_required:
+                required_args.append(final_array_param_name)
+            else:
+                optional_args.append(f"{final_array_param_name}=None")
+            final_request_body_arg_names_for_signature.append(final_array_param_name)
+
+        elif request_body_properties:  # Object body
+            for param in body_params:  # Iterate ALIASED body_params
+                arg_name_for_sig = param.name # This is the final, aliased name (e.g., "id_body")
+                
+                # Defensive check against already added args (should be covered by aliasing logic)
+                current_arg_names_set_loop = set(required_args) | {arg.split('=')[0] for arg in optional_args}
+                if arg_name_for_sig not in current_arg_names_set_loop:
+                    if param.required:
+                        required_args.append(arg_name_for_sig)
+                    else:
+                        # Parameters model does not store schema 'default'. Optional params default to None.
+                        optional_args.append(f"{arg_name_for_sig}=None")
+                final_request_body_arg_names_for_signature.append(arg_name_for_sig)
+
+    # If request body is present but empty (e.g. content: {}), add a generic request_body parameter
+    # This is handled *after* specific body params, as it's a fallback.
+    if has_empty_body:
+        empty_body_param_name_base = "request_body"
+        current_arg_names_set = set(required_args) | {arg.split('=')[0] for arg in optional_args}
+        
+        final_empty_body_param_name = empty_body_param_name_base
+        counter = 1
+        is_first_suffix_attempt = True
+        while final_empty_body_param_name in current_arg_names_set:
+            if is_first_suffix_attempt:
+                final_empty_body_param_name = f"{empty_body_param_name_base}_body"
+                is_first_suffix_attempt = False
+            else:
+                final_empty_body_param_name = f"{empty_body_param_name_base}_body_{counter}"
+            counter += 1
+
+        # Check if it was somehow added by other logic (e.g. if 'request_body' was an explicit param name)
+        # This check is mostly defensive.
+        if final_empty_body_param_name not in (set(required_args) | {arg.split('=')[0] for arg in optional_args}):
+            optional_args.append(f"{final_empty_body_param_name}=None")
+        # Track for docstring, even if it's just 'request_body' or 'request_body_body'
+        if final_empty_body_param_name not in final_request_body_arg_names_for_signature:
+             final_request_body_arg_names_for_signature.append(final_empty_body_param_name)
+
+    # Combine required and optional arguments
+    args = required_args + optional_args
+
+    # ----- Build Docstring -----
+    docstring_parts = []
+    return_type = _determine_return_type(operation)
+
+    # Summary
+    summary = operation.get("summary", "").strip()
+    if not summary:
+        summary = operation.get(
+            "description", f"Execute {method.upper()} {path}"
+        ).strip()
+        summary = summary.split("\n")[0]
+    if summary:
+        docstring_parts.append(summary)
+
+    # Args
+    args_doc_lines = []
+    param_details = {}
+    all_params = path_params + query_params + body_params
+    signature_arg_names = {a.split("=")[0] for a in args}
+
+    for param in all_params:
+        if param.name in signature_arg_names and param.name not in param_details:
+            param_details[param.name] = param
+
+    # Fetch request body example
+    request_body_example_str = None
+    if has_body:
+        try:
+            json_content = operation["requestBody"]["content"]["application/json"]
+            example_data = None
+            if "example" in json_content:
+                example_data = json_content["example"]
+            elif "examples" in json_content and json_content["examples"]:
+                first_example_key = list(json_content["examples"].keys())[0]
+                example_data = json_content["examples"][first_example_key].get("value")
+
+            if example_data is not None:
+                try:
+                    example_json = json.dumps(example_data, indent=2)
+                    indented_example = textwrap.indent(
+                        example_json, " " * 8
+                    )  # 8 spaces
+                    request_body_example_str = f"\n        Example:\n        ```json\n{indented_example}\n        ```"
+                except TypeError:
+                    request_body_example_str = f"\n        Example: {example_data}"
+        except KeyError:
+            pass  # No example found
+
+    # Identify the last argument related to the request body
+    last_body_arg_name = None
+    # request_body_params contains the names as they appear in the signature
+    if final_request_body_arg_names_for_signature: # Use the new list with final aliased names
+        # Find which of these appears last in the combined args list
+        body_args_in_signature = [
+            a.split("=")[0] for a in args if a.split("=")[0] in final_request_body_arg_names_for_signature
+        ]
+        if body_args_in_signature:
+            last_body_arg_name = body_args_in_signature[-1]
+
+    if signature_arg_names:
+        args_doc_lines.append("Args:")
+        for arg_signature_str in args:
+            arg_name = arg_signature_str.split("=")[0]
+            example_str = None  # Initialize example_str here
+            detail = param_details.get(arg_name)
+            if detail:
+                desc = detail.description or "No description provided."
+                type_hint = detail.type if detail.type else "Any"
+                arg_line = f"    {arg_name} ({type_hint}): {desc}"
+                if detail.example:
+                    example_str = repr(detail.example)
+                    arg_line += f" Example: {example_str}."
+
+                # Append the full body example after the last body-related argument
+                if arg_name == last_body_arg_name and request_body_example_str:
+                    # Remove the simple Example: if it exists before adding the detailed one
+                    if example_str and (
+                        f" Example: {example_str}." in arg_line
+                        or f" Example: {example_str} ." in arg_line
+                    ):
+                        arg_line = arg_line.replace(
+                            f" Example: {example_str}.", ""
+                        )  # Remove with or without trailing period
+                    arg_line += (
+                        request_body_example_str  # Append the formatted JSON example
+                    )
+
+                args_doc_lines.append(arg_line)
+            elif arg_name == final_empty_body_param_name and has_empty_body: # Use potentially suffixed name
+                args_doc_lines.append(
+                    f"    {arg_name} (dict | None): Optional dictionary for arbitrary request body data."
+                )
+                # Also append example here if this is the designated body arg
+                if (
+                    arg_name == last_body_arg_name and request_body_example_str
+                ): 
+                    args_doc_lines[-1] += (
+                        request_body_example_str 
+                    )
+
+    if args_doc_lines:
+        docstring_parts.append("\n".join(args_doc_lines))
+
+    # Returns - Use the pre-calculated return_type variable
+    success_desc = ""
+    responses = operation.get("responses", {})
+    for code, resp_info in responses.items():
+        if code.startswith("2"):
+            success_desc = resp_info.get("description", "").strip()
+            break
+    docstring_parts.append(
+        f"Returns:\n    {return_type}: {success_desc or 'API response data.'}"
+    )  # Use return_type
+
+    # Tags Section
+    operation_tags = operation.get("tags", [])
+    if operation_tags:
+        tags_string = ", ".join(operation_tags)
+        docstring_parts.append(f"Tags:\n    {tags_string}")
+
+    # Combine and Format docstring
+    docstring_content = "\n\n".join(docstring_parts)
+
+    def_indent = "    "
+    doc_indent = def_indent + "    "
+    indented_docstring_content = textwrap.indent(docstring_content, doc_indent)
+
+    # Wrap in triple quotes
+    formatted_docstring = (
+        f'\n{doc_indent}"""\n{indented_docstring_content}\n{doc_indent}"""'
+    )
+    # ----- End Build Docstring -----
+
+    if args:
+        signature = f"    def {func_name}(self, {', '.join(args)}) -> {return_type}:"
+    else:
+        signature = f"    def {func_name}(self) -> {return_type}:"
+
+    # Build method body
+    body_lines = []
+
+    # Path parameter validation (uses aliased name for signature, original identifier for error)
+    for param in path_params:
+        body_lines.append(f"        if {param.name} is None:")
+        body_lines.append(
+            f'            raise ValueError("Missing required parameter \'{param.identifier}\'")' # Use original name in error
+        )
+
+    # Build request body (handle array and object types differently)
+    if has_body:
+        if is_array_body:
+            # For array request bodies, use the array parameter directly
+            body_lines.append("        # Use items array directly as request body")
+            body_lines.append(f"        request_body = {final_request_body_arg_names_for_signature[0]}")
+        elif request_body_properties:
+            # For object request bodies, build the request body from individual parameters
+            body_lines.append("        request_body = {")
+            for b_param in body_params: # Iterate through original body_params list
+                # Use b_param.identifier for the key in the request_body dictionary
+                # and b_param.name for the variable name from the function signature
+                body_lines.append(f"            '{b_param.identifier}': {b_param.name},")
+            body_lines.append("        }")
+            body_lines.append(
+                "        request_body = {k: v for k, v in request_body.items() if v is not None}"
+            )
+
+    # Format URL directly with path parameters
+    url = _generate_url(path, path_params)
+    url_line = f'        url = f"{{self.base_url}}{url}"'
+    body_lines.append(url_line)
+
+    # Build query parameters dictionary for the request
+    if query_params:
+        query_params_items = []
+        for param in query_params: # Iterate through original query_params list
+            # Use the original param.identifier for the key, and the (potentially aliased) param.name for the value variable
+            query_params_items.append(f"('{param.identifier}', {param.name})")
+        body_lines.append(
+            f"        query_params = {{k: v for k, v in [{', '.join(query_params_items)}] if v is not None}}"
+        )
+    else:
+        body_lines.append("        query_params = {}")
+
+    # Make HTTP request using the proper method
+    method_lower = method.lower()
+
+    # Determine what to use as the request body argument
+    if has_empty_body:
+        request_body_arg = "request_body"
+    elif not has_body:
+        request_body_arg = "{}"
+    else:
+        request_body_arg = "request_body"
+
+    if method_lower == "get":
+        body_lines.append("        response = self._get(url, params=query_params)")
+    elif method_lower == "post":
+        body_lines.append(
+            f"        response = self._post(url, data={request_body_arg}, params=query_params)"
+        )
+    elif method_lower == "put":
+        body_lines.append(
+            f"        response = self._put(url, data={request_body_arg}, params=query_params)"
+        )
+    elif method_lower == "patch":
+        body_lines.append(
+            f"        response = self._patch(url, data={request_body_arg}, params=query_params)"
+        )
+    elif method_lower == "delete":
+        body_lines.append("        response = self._delete(url, params=query_params)")
+    else:
+        body_lines.append(
+            f"        response = self._{method_lower}(url, data={request_body_arg}, params=query_params)"
+        )
+
+    # Handle response
+    body_lines.append("        response.raise_for_status()")
+    body_lines.append("        return response.json()")
+
+    # Combine signature, docstring, and body
+    method_code = signature + formatted_docstring + "\n" + "\n".join(body_lines)
+    return method_code, func_name
+
+
+def load_schema(path: Path):
+    return _load_and_resolve_references(path)
+
+
+def generate_api_client(schema, class_name: str | None = None):
+    """
+    Generate a Python API client class from an OpenAPI schema.
+
+    Args:
+        schema (dict): The OpenAPI schema as a dictionary.
+
+    Returns:
+        str: A string containing the Python code for the API client class.
+    """
+    methods = []
+    method_names = []
+
+    # Extract API info for naming and base URL
+    info = schema.get("info", {})
+    api_title = info.get("title", "API")
+
+    # Get base URL from servers array if available
+    base_url = ""
+    servers = schema.get("servers", [])
+    if servers and isinstance(servers, list) and "url" in servers[0]:
+        base_url = servers[0]["url"].rstrip("/")
+
+    # Create a clean class name from API title
+    if api_title:
+        # Convert API title to a clean class name
+        if class_name:
+            clean_name = (
+                class_name.capitalize()[:-3]
+                if class_name.endswith("App")
+                else class_name.capitalize()
+            )
+        else:
+            base_name = "".join(word.capitalize() for word in api_title.split())
+            clean_name = "".join(c for c in base_name if c.isalnum())
+        class_name = f"{clean_name}App"
+
+        # Extract tool name - remove spaces and convert to lowercase
+        tool_name = api_title.lower()
+
+        # Remove version numbers (like 3.0, v1, etc.)
+        tool_name = re.sub(r"\s*v?\d+(\.\d+)*", "", tool_name)
+
+        # Remove common words that aren't needed
+        common_words = ["api", "openapi", "open", "swagger", "spec", "specification"]
+        for word in common_words:
+            tool_name = tool_name.replace(word, "")
+
+        # Remove spaces, hyphens, underscores
+        tool_name = tool_name.replace(" ", "").replace("-", "").replace("_", "")
+
+        # Remove any non-alphanumeric characters
+        tool_name = "".join(c for c in tool_name if c.isalnum())
+
+        # If empty (after cleaning), use generic name
+        if not tool_name:
+            tool_name = "api"
+    else:
+        class_name = "APIClient"
+        tool_name = "api"
+
+    # Iterate over paths and their operations
+    for path, path_info in schema.get("paths", {}).items():
+        for method in path_info:
+            if method in ["get", "post", "put", "delete", "patch", "options", "head"]:
+                operation = path_info[method]
+                method_code, func_name = _generate_method_code(path, method, operation)
+                methods.append(method_code)
+                method_names.append(func_name)
+
+    # Generate list_tools method with all the function names
+    tools_list = ",\n            ".join([f"self.{name}" for name in method_names])
+    list_tools_method = f"""    def list_tools(self):
+        return [
+            {tools_list}
+        ]"""
+
+    # Generate class imports
+    imports = [
+        "from typing import Any",
+        "from universal_mcp.applications import APIApplication",
+        "from universal_mcp.integrations import Integration",
+    ]
+
+    # Construct the class code
+    class_code = (
+        "\n".join(imports) + "\n\n"
+        f"class {class_name}(APIApplication):\n"
+        f"    def __init__(self, integration: Integration = None, **kwargs) -> None:\n"
+        f"        super().__init__(name='{class_name.lower()}', integration=integration, **kwargs)\n"
+        f'        self.base_url = "{base_url}"\n\n'
+        + "\n\n".join(methods)
+        + "\n\n"
+        + list_tools_method
+        + "\n"
+    )
+    return class_code
+
+
+# Example usage
+if __name__ == "__main__":
+    # Sample OpenAPI schema
+    schema = {
+        "paths": {
+            "/users": {
+                "get": {
+                    "summary": "Get a list of users",
+                    "parameters": [
+                        {
+                            "name": "limit",
+                            "in": "query",
+                            "required": False,
+                            "schema": {"type": "integer"},
+                        }
+                    ],
+                    "responses": {
+                        "200": {
+                            "description": "A list of users",
+                            "content": {
+                                "application/json": {"schema": {"type": "array"}}
+                            },
+                        }
+                    },
+                },
+                "post": {
+                    "summary": "Create a user",
+                    "requestBody": {
+                        "required": True,
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "properties": {"name": {"type": "string"}},
+                                }
+                            }
+                        },
+                    },
+                    "responses": {"201": {"description": "User created"}},
+                },
+            },
+            "/users/{user_id}": {
+                "get": {
+                    "summary": "Get a user by ID",
+                    "parameters": [
+                        {
+                            "name": "user_id",
+                            "in": "path",
+                            "required": True,
+                            "schema": {"type": "string"},
+                        }
+                    ],
+                    "responses": {"200": {"description": "User details"}},
+                }
+            },
+        }
+    }
+
+    schema = load_schema("openapi.yaml")
+    code = generate_api_client(schema)
+    print(code)