🧑‍💻 Simplify Stack by accepting string vararg.

Author: Raphael Krupinski

src/lapidary/render/model/openapi_conv.py

@@ -98,7 +98,7 @@ def process_parameter(self, value: openapi.Parameter, stack: Stack) -> python.Pa
             media_type, media_type_obj = next(iter(value.content.items()))
             # encoding = media_type_obj.encoding
             typ = self.schema_converter.process_schema(
-                media_type_obj.schema_, stack.push_all('content', media_type), value.required
+                media_type_obj.schema_, stack.push('content', media_type), value.required
             )
         else:
             raise TypeError(f'{stack}: schema or content is required')
@@ -125,7 +125,8 @@ def process_path(
     ) -> None:
         common_params_stack = stack.push('parameters')
         common_params = [
-            self.process_parameter(param, common_params_stack.push(idx)) for idx, param in enumerate(value.parameters)
+            self.process_parameter(param, common_params_stack.push(str(idx)))
+            for idx, param in enumerate(value.parameters)
         ]
 
         for method, operation in value.model_extra.items():
@@ -153,7 +154,7 @@ def process_content(self, value: Mapping[str, openapi.MediaType], stack: Stack)
             mime_parsed = parse_media_range(mime)
             if mime_parsed[:2] != ('application', 'json'):
                 continue
-            types[mime] = self.schema_converter.process_schema(media_type.schema_, stack.push_all(mime, 'schema'))
+            types[mime] = self.schema_converter.process_schema(media_type.schema_, stack.push(mime, 'schema'))
         return types
 
     def process_operation(
@@ -178,7 +179,7 @@ def process_operation(
         model = python.OperationFunction(
             name=value.operationId,
             method=stack.top(),
-            path=cast(str, stack[-2]),
+            path=json_pointer.decode_json_pointer(stack[-2]),
             request_body=request_body,
             params=params,
             responses=responses,
@@ -197,7 +198,7 @@ def _mk_params(
         for param in common_params:
             params[param.name] = param
         for idx, oa_param in enumerate(value):
-            param = self.process_parameter(oa_param, stack.push(idx))
+            param = self.process_parameter(oa_param, stack.push(str(idx)))
             params[param.name] = param
         return list(params.values())
 
@@ -208,7 +209,7 @@ def process_security(
         if value is None:
             return None
 
-        security = [self.process_security_requirement(item, stack.push(idx)) for idx, item in enumerate(value)]
+        security = [self.process_security_requirement(item, stack.push(str(idx))) for idx, item in enumerate(value)]
         return security or None
 
     def process_security_requirement(
@@ -252,7 +253,7 @@ def _(self, value: openapi.OAuth2SecurityScheme, stack: Stack) -> None:
                 flow = value.flows.implicit
 
                 if flow.refreshUrl:
-                    raise NotImplementedError(stack.push_all('flows', 'implicit', 'refreshUrl'))
+                    raise NotImplementedError(stack.push('flows', 'implicit', 'refreshUrl'))
 
                 self.target.security_schemes[flow_name] = python.ImplicitOAuth2Flow(
                     name=auth_name,

src/lapidary/render/model/schema.py

@@ -125,7 +125,7 @@ def _get_one_of_type_hint(
         one_of: Iterable[openapi.Reference[openapi.Schema] | openapi.Schema],
     ) -> python.TypeHint:
         return python.GenericTypeHint.union_of(
-            *tuple(self.process_schema(sub_schema, stack.push(idx)) for idx, sub_schema in enumerate(one_of))
+            *tuple(self.process_schema(sub_schema, stack.push(str(idx))) for idx, sub_schema in enumerate(one_of))
         )
 
     def _get_composite_type_hint(

src/lapidary/render/model/stack.py

@@ -1,8 +1,6 @@
 from functools import lru_cache
 from typing import Self
 
-from ..json_pointer import encode_json_pointer
-
 
 class Stack:
     __slots__ = ('path',)
@@ -16,12 +14,9 @@ def from_str(cls, pointer: str) -> Self:
 
     @lru_cache(1)
     def __repr__(self):
-        return '/'.join(encode_json_pointer(str(elem)) for elem in self.path)
-
-    def push(self, name: str | int) -> Self:
-        return Stack(self.path + (name,))
+        return '/'.join(self.path)
 
-    def push_all(self, *names: str | int) -> Self:
+    def push(self, *names: str) -> Self:
         return Stack(self.path + names)
 
     def top(self) -> str:
@@ -33,5 +28,5 @@ def __hash__(self) -> int:
     def __eq__(self, other):
         return isinstance(other, Stack) and self.path == other.path
 
-    def __getitem__(self, item: int) -> str | int:
+    def __getitem__(self, item: int) -> str:
         return self.path[item]