🔥 Remove support for generating exception models

Author: rafalkrupinski

ChangeLog.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+## [Unreleased]
+
+### Removed
+
+- Removed support for generating exceptions.
+
+
 ## [0.11.0] - 2024-08-14
 
 ### Added
@@ -183,7 +191,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Generate classes for schemas under components/schemas
 - Generate partial client class with methods based on /paths/*/*
 
-[unreleased]: https://github.com/python-lapidary/lapidary-render/compare/v0.11.0...HEAD
+[Unreleased]: https://github.com/python-lapidary/lapidary-render/compare/v0.11.0...HEAD
 [0.10.1]: https://github.com/python-lapidary/lapidary-render/compare/v0.10.1...v0.11.0
 [0.10.1]: https://github.com/python-lapidary/lapidary-render/compare/v0.10.0...v0.10.1
 [0.10.0]: https://github.com/python-lapidary/lapidary-render/compare/v0.9.0...v0.10.0

src/lapidary/render/model/openapi/__init__.py

@@ -1,6 +1,5 @@
 # ignore: F401
 
-from .ext import *
 from .model import *
 
 type SchemaOrRef = Schema | Reference

src/lapidary/render/model/openapi/ext.py

@@ -17,7 +17,6 @@
     PropertyPattern,
     validate_example_xor_examples,
 )
-from .ext import LapidaryModelType
 
 
 class Reference[Target](BaseModel):
@@ -237,7 +236,6 @@ class Schema(ExtendableModel):
         ),
     ]
     lapidary_name: typing.Annotated[str | None, pydantic.Field(alias='x-lapidary-type-name')] = None
-    lapidary_model_type: typing.Annotated[LapidaryModelType | None, pydantic.Field(alias='x-lapidary-modelType')] = None
 
 
 class Tag(ExtendableModel):

src/lapidary/render/model/openapi/model.py

@@ -200,7 +200,6 @@ class SchemaClass:
     allow_extra: bool = False
     docstr: str | None = None
     fields: list[Field] = dc.field(default_factory=list)
-    model_type: ModelType = ModelType.model
 
     def dependencies(self) -> Iterable[TypeHint]:
         yield self.base_type

src/lapidary/render/model/python/model.py

@@ -30,30 +30,19 @@ def _process_schema_object(self, value: openapi.Schema, stack: Stack) -> python.
             return self.schema_types[stack][1]
 
         name = value.lapidary_name or names.maybe_mangle_name(stack.top())
-        base_type = (
-            python.TypeHint.from_type(Exception)
-            if value.lapidary_model_type is openapi.LapidaryModelType.exception
-            else python.TypeHint.from_str('lapidary.runtime:ModelBase')
-        )
-
         stack_props = stack.push('properties')
         fields = [
             self.process_property(prop_schema, stack_props.push(prop_name), prop_name, prop_name in value.required)
             for prop_name, prop_schema in value.properties.items()
         ]
 
-        model_type = (
-            python.ModelType[value.lapidary_model_type.name] if value.lapidary_model_type else python.ModelType.model
-        )
-
         type_hint = resolve_type_hint(str(self.root_package), stack.push('schema', name))
         schema_class = python.SchemaClass(
             class_name=name,
-            base_type=base_type,
+            base_type=python.TypeHint.from_str('lapidary.runtime:ModelBase'),
             allow_extra=value.additional_properties is not False,
             fields=fields,
             docstr=value.description or None,
-            model_type=model_type,
         )
         self.schema_types[stack] = schema_class, type_hint
         return type_hint

src/lapidary/render/model/schema.py

@@ -1,3 +1,19 @@
+{%- from 'includes/type_hint.py.jinja' import type_hint %}
+{%- macro render_field(field) %}
+    {%- if field.annotation.field_props %}
+    {{ field.name }}: typing.Annotated[
+        {{ type_hint(field.annotation.type, path) }},
+        pydantic.Field(
+            {%- for key, value in field.annotation.field_props.items() | sort %}
+            {{ key }}={{ value }},
+            {%- endfor %}
+        )
+    ]
+    {%- else %}
+    {{ field.name }}: {{ type_hint(field.annotation.type, path) }}
+    {%- endif -%}
+    {%- if field.required is false %} = None{% endif %}
+{%- endmacro -%}
 from __future__ import annotations
 
 import lapidary.runtime
@@ -9,5 +25,18 @@ import {{ imp }}
 {%- endfor %}
 {% set path = item.path %}
 {%- for model in item.body %}
-{% include 'includes/schema/schema_class_' + model.model_type.name + '.py.jinja' %}
+
+class {{ model.class_name }}({{ type_hint(model.base_type, path) }}):
+{%- for field in model.fields if field.required %}
+{{- render_field(field) }}
+{% endfor %}
+{%- for field in model.fields if not field.required %}
+{{- render_field(field) }}
+{% endfor %}
+
+{%- if model.allow_extra %}
+    model_config = pydantic.ConfigDict(
+        extra='allow'
+    )
+{% endif -%}
 {%- endfor -%}