more idiomatic REST API

docs/openapi_generator/pyopenapi/operations.py

@@ -8,7 +8,6 @@ import collections.abc
 import enum
 import inspect
 import typing
-import uuid
 from dataclasses import dataclass
 from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Tuple, Union
 
@@ -16,12 +15,7 @@ from llama_stack.apis.version import LLAMA_STACK_API_VERSION
 
 from termcolor import colored
 
-from ..strong_typing.inspection import (
-    get_signature,
-    is_type_enum,
-    is_type_optional,
-    unwrap_optional_type,
-)
+from ..strong_typing.inspection import get_signature
 
 
 def split_prefix(
@@ -113,9 +107,6 @@ class EndpointOperation:
 
     def get_route(self) -> str:
         if self.route is not None:
-            assert (
-                "_" not in self.route
-            ), f"route should not contain underscores: {self.route}"
             return "/".join(["", LLAMA_STACK_API_VERSION, self.route.lstrip("/")])
 
         route_parts = ["", LLAMA_STACK_API_VERSION, self.name]
@@ -265,42 +256,16 @@ def get_endpoint_operations(
                     f"parameter '{param_name}' in function '{func_name}' has no type annotation"
                 )
 
-            if is_type_optional(param_type):
-                inner_type: type = unwrap_optional_type(param_type)
-            else:
-                inner_type = param_type
-
-            if prefix == "get" and (
-                inner_type is bool
-                or inner_type is int
-                or inner_type is float
-                or inner_type is str
-                or inner_type is uuid.UUID
-                or is_type_enum(inner_type)
-            ):
-                if parameter.kind == inspect.Parameter.POSITIONAL_ONLY:
-                    if route_params is not None and param_name not in route_params:
-                        raise ValidationError(
-                            f"positional parameter '{param_name}' absent from user-defined route '{route}' for function '{func_name}'"
-                        )
-
-                    # simple type maps to route path element, e.g. /study/{uuid}/{version}
+            if prefix in ["get", "delete"]:
+                if route_params is not None and param_name in route_params:
                     path_params.append((param_name, param_type))
                 else:
-                    if route_params is not None and param_name in route_params:
-                        raise ValidationError(
-                            f"query parameter '{param_name}' found in user-defined route '{route}' for function '{func_name}'"
-                        )
-
-                    # simple type maps to key=value pair in query string
                     query_params.append((param_name, param_type))
             else:
                 if route_params is not None and param_name in route_params:
-                    raise ValidationError(
-                        f"user-defined route '{route}' for function '{func_name}' has parameter '{param_name}' of composite type: {param_type}"
-                    )
-
-                request_params.append((param_name, param_type))
+                    path_params.append((param_name, param_type))
+                else:
+                    request_params.append((param_name, param_type))
 
         # check if function has explicit return type
         if signature.return_annotation is inspect.Signature.empty:
@@ -335,19 +300,18 @@ def get_endpoint_operations(
 
             response_type = process_type(return_type)
 
-        # set HTTP request method based on type of request and presence of payload
-        if not request_params:
             if prefix in ["delete", "remove"]:
                 http_method = HTTPMethod.DELETE
-            else:
+            elif prefix == "post":
+                http_method = HTTPMethod.POST
+            elif prefix == "get":
                 http_method = HTTPMethod.GET
-        else:
-            if prefix == "set":
+            elif prefix == "set":
                 http_method = HTTPMethod.PUT
             elif prefix == "update":
                 http_method = HTTPMethod.PATCH
             else:
-                http_method = HTTPMethod.POST
+                raise ValidationError(f"unknown prefix {prefix}")
 
         result.append(
             EndpointOperation(