➖ Remove dependency on lapidary and email_validator.

Author: rafalkrupinski

poetry.lock

@@ -25,7 +25,6 @@ classifiers = [
 python = "^3.12"
 asyncclick = "^8.1.7.2"
 jsonpatch = "^1.32"
-lapidary = "^0.9.0"
 pybase62 = "^1.0.0"
 pydantic = "^2.5.2"
 python-mimeparse = "^1.6.0"

pyproject.toml

@@ -31,7 +31,7 @@ class Reference[Target](BaseModel):
 class Contact(ExtendableModel):
     name: str | None = None
     url: str | None = None
-    email: pydantic.EmailStr | None = None
+    email: str | None = None
 
 
 class License(ExtendableModel):

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

@@ -5,8 +5,6 @@
 
 from mimeparse import parse_media_range
 
-from lapidary.runtime import SecurityRequirements
-
 from .. import json_pointer, names
 from . import openapi, python
 from .refs import resolve_ref
@@ -214,7 +212,7 @@ def _mk_params(
 
     def process_security(
         self, value: Iterable[openapi.SecurityRequirement] | None, stack: Stack
-    ) -> Iterable[SecurityRequirements] | None:
+    ) -> python.SecurityRequirements | None:
         logger.debug('Process security %s', stack)
         if value is None:
             return None

src/lapidary/render/model/openapi_conv.py

@@ -19,6 +19,7 @@
     'AuthModule',
     'ClientModule',
     'PasswordOAuth2Flow',
+    'SecurityRequirements',
     'SchemaModule',
     'ModulePath',
     'BuiltinTypeHint',
@@ -53,6 +54,7 @@
     PasswordOAuth2Flow,
     ResponseMap,
     SchemaClass,
+    SecurityRequirements,
 )
 from .module import AuthModule, ClientModule, SchemaModule
 from .module_path import ModulePath

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

@@ -4,14 +4,14 @@
 from typing import Any, TypeAlias
 
 from ..openapi import ParameterLocation as ParamLocation
-from ..openapi import SecurityRequirement
 from ..openapi import Style as ParamStyle
 from .type_hint import NONE, TypeHint, type_hint_or_union
 
 MimeType: TypeAlias = str
 ResponseCode: TypeAlias = str
 MimeMap: TypeAlias = Mapping[MimeType, TypeHint]
 ResponseMap: TypeAlias = Mapping[ResponseCode, MimeMap]
+SecurityRequirements: TypeAlias = Iterable[Mapping[str, Iterable[str]]]
 
 
 @dc.dataclass
@@ -117,7 +117,7 @@ class OperationFunction:
     request_body: MimeMap
     params: Iterable['Parameter']
     responses: ResponseMap
-    security: Iterable[SecurityRequirement] | None
+    security: SecurityRequirements | None
 
     @property
     def dependencies(self) -> Iterable[TypeHint]:
@@ -198,7 +198,7 @@ class ClientInit:
     base_url: str | None = None
     headers: Iterable[tuple[str, str]] = dc.field(default_factory=list)
     response_map: ResponseMap = dc.field(default_factory=dict)
-    security: Iterable[SecurityRequirement] | None = None
+    security: SecurityRequirements | None = None
 
     @property
     def dependencies(self) -> Iterable[TypeHint]:

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

@@ -16,7 +16,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.9"
-lapidary = "{{ get_version('lapidary') }}"
+lapidary = "^0.9.0"
 
 [tool.poetry.group.dev.dependencies]
 lapidary-render = "{{ get_version('lapidary_render') }}"

src/lapidary/render/templates/init/pyproject.toml.jinja

@@ -7,7 +7,6 @@
 
 from lapidary.render import json_pointer
 from lapidary.render.model import OpenApi30Converter, openapi, python, stack
-from lapidary.runtime.http_consts import MIME_JSON
 
 logging.basicConfig()
 logging.getLogger('lapidary').setLevel(logging.DEBUG)
@@ -34,7 +33,7 @@ def test_schema_str(document: openapi.OpenApiModel) -> None:
         operations['get'].responses, stack.Stack(('#', 'paths', '/user/login', 'get', 'responses'))
     )
 
-    assert responses['200'][MIME_JSON] == python.BuiltinTypeHint.from_str('str')
+    assert responses['200']['application/json'] == python.BuiltinTypeHint.from_str('str')
     assert converter.schema_converter.schema_modules == []
 
 
@@ -46,7 +45,7 @@ def test_schema_array(document: openapi.OpenApiModel) -> None:
         operations['post'].request_body, stack.Stack(('#', 'paths', '/user/createWithList', 'post', 'requestBody'))
     )
 
-    assert request[MIME_JSON] == python.GenericTypeHint(
+    assert request['application/json'] == python.GenericTypeHint(
         module='builtins', name='list', args=(python.TypeHint.from_str('petstore.components.schemas.User.schema:User'),)
     )
     assert converter.schema_converter.schema_modules[0].body[0].class_name == 'User'