omlish 0.0.0.dev41__py3-none-any.whl → 0.0.0.dev43__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev41'
-__revision__ = '9666ba3a1c40b95074dfcacd1c0c87ca5e267d6f'
+__version__ = '0.0.0.dev43'
+__revision__ = '00082c22c620ab906955cc479d2d861116e82c45'
 
 
 #

omlish/dataclasses/__init__.py

@@ -92,6 +92,7 @@ from .utils import (  # noqa
     chain_metadata,
     deep_replace,
     field_modifier,
+    fields_dict,
     maybe_post_init,
     opt_repr,
     update_class_metadata,

omlish/dataclasses/impl/__init__.py

@@ -21,4 +21,5 @@ TODO:
  - proto/jsonschema gen
  - enums
  - nodal
+ - embedding? forward kwargs in general? or only for replace?
 """

omlish/dataclasses/utils.py

@@ -36,6 +36,10 @@ def opt_repr(o: ta.Any) -> str | None:
 #
 
 
+def fields_dict(cls_or_instance: ta.Any) -> dict[str, dc.Field]:
+    return {f.name: f for f in dc.fields(cls_or_instance)}
+
+
 class field_modifier:  # noqa
     def __init__(self, fn: ta.Callable[[dc.Field], dc.Field]) -> None:
         super().__init__()

omlish/marshal/__init__.py

@@ -57,6 +57,7 @@ from .helpers import (  # noqa
 from .objects import (  # noqa
     FieldInfo,
     FieldMetadata,
+    FieldOptions,
     ObjectMarshaler,
     ObjectMetadata,
     ObjectUnmarshaler,

omlish/marshal/dataclasses.py

@@ -13,8 +13,11 @@ from .base import Unmarshaler
 from .base import UnmarshalerFactory
 from .naming import Naming
 from .naming import translate_name
+from .objects import DEFAULT_FIELD_OPTIONS
+from .objects import FIELD_OPTIONS_KWARGS
 from .objects import FieldInfo
 from .objects import FieldMetadata
+from .objects import FieldOptions
 from .objects import ObjectMarshaler
 from .objects import ObjectMetadata
 from .objects import ObjectUnmarshaler
@@ -43,6 +46,11 @@ def get_field_infos(
         for k, v in dc.asdict(dc_md.field_defaults).items()
         if v is not None
     }
+    fo_defaults = {
+        k: v
+        for k, v in fi_defaults.pop('options').items()
+        if v != getattr(DEFAULT_FIELD_OPTIONS, k)
+    }
 
     type_hints = ta.get_type_hints(ty)
 
@@ -53,8 +61,10 @@ def get_field_infos(
         else:
             um_name = field.name
 
-        kw = dict(fi_defaults)
-        kw.update(
+        fi_kw = dict(fi_defaults)
+        fo_kw = dict(fo_defaults)
+
+        fi_kw.update(
             name=field.name,
             type=type_hints[field.name],
             metadata=FieldMetadata(),
@@ -63,20 +73,35 @@ def get_field_infos(
             unmarshal_names=[um_name],
         )
 
+        has_set_name = False
         if (fmd := field.metadata.get(FieldMetadata)) is not None:
-            kw.update(
+            fi_kw.update(
                 metadata=fmd,
-                omit_if=fmd.omit_if,
-                default=fmd.default,
             )
 
+            for fo_k in FIELD_OPTIONS_KWARGS:
+                if (fo_v := getattr(fmd.options, fo_k)) != getattr(DEFAULT_FIELD_OPTIONS, fo_k):
+                    fo_kw[fo_k] = fo_v
+
             if fmd.name is not None:
-                kw.update(
+                has_set_name = True
+                fi_kw.update(
                     marshal_name=fmd.name,
                     unmarshal_names=col.unique([fmd.name, *(fmd.alts or ())]),
                 )
 
-        ret.append(FieldInfo(**kw))
+        if fo_kw.get('embed') and not has_set_name:
+            fi_kw.update(
+                marshal_name=fi_kw['marshal_name'] + '_',
+                unmarshal_names=[n + '_' for n in fi_kw['unmarshal_names']],
+            )
+
+        ret.append(
+            FieldInfo(
+                options=FieldOptions(**fo_kw),
+                **fi_kw,
+            ),
+        )
 
     return ret
 
@@ -123,23 +148,51 @@ class DataclassUnmarshalerFactory(UnmarshalerFactory):
     def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
         ty = check.isinstance(rty, type)
         check.state(dc.is_dataclass(ty))
-
         dc_md = get_dataclass_metadata(ty)
 
         d: dict[str, tuple[FieldInfo, Unmarshaler]] = {}
         defaults: dict[str, ta.Any] = {}
+        embeds: dict[str, type] = {}
+        embeds_by_unmarshal_name: dict[str, tuple[str, str]] = {}
+
+        def add_field(fi: FieldInfo, *, prefixes: ta.Iterable[str] = ('',)) -> ta.Iterable[str]:
+            ret: list[str] = []
+
+            if fi.options.embed:
+                e_ty = check.isinstance(fi.type, type)
+                check.state(dc.is_dataclass(e_ty))
+                # e_dc_md = get_dataclass_metadata(e_ty)
+
+                embeds[fi.name] = e_ty
+                for e_fi in get_field_infos(e_ty, ctx.options):
+                    e_ns = add_field(e_fi, prefixes=[p + ep for p in prefixes for ep in fi.unmarshal_names])
+                    embeds_by_unmarshal_name.update({e_f: (fi.name, e_fi.name) for e_f in e_ns})
+                    ret.extend(e_ns)
+
+            else:
+                tup = (fi, _make_field_obj(ctx, fi.type, fi.metadata.unmarshaler, fi.metadata.unmarshaler_factory))
+
+                for pfx in prefixes:
+                    for un in fi.unmarshal_names:
+                        un = pfx + un
+                        if un in d:
+                            raise KeyError(f'Duplicate fields for name {un!r}: {fi.name!r}, {d[un][0].name!r}')
+                        d[un] = tup
+                        ret.append(un)
+
+                if fi.options.default.present:
+                    defaults[fi.name] = fi.options.default.must()
+
+            return ret
+
         for fi in get_field_infos(ty, ctx.options):
-            tup = (fi, _make_field_obj(ctx, fi.type, fi.metadata.unmarshaler, fi.metadata.unmarshaler_factory))
-            for un in fi.unmarshal_names:
-                if un in d:
-                    raise KeyError(f'Duplicate fields for name {un!r}: {fi.name!r}, {d[un][0].name!r}')
-                d[un] = tup
-            if fi.default.present:
-                defaults[fi.name] = fi.default.must()
+            add_field(fi)
 
         return ObjectUnmarshaler(
             ty,
             d,
             unknown_field=dc_md.unknown_field,
             defaults=defaults,
+            embeds=embeds,
+            embeds_by_unmarshal_name=embeds_by_unmarshal_name,
         )

omlish/marshal/helpers.py

@@ -12,10 +12,7 @@ def update_field_metadata(**kwargs: ta.Any) -> dc.field_modifier:
     @dc.field_modifier
     def inner(f: dc.Field) -> dc.Field:
         return dc.update_field_metadata(f, {
-            FieldMetadata: dc.replace(
-                f.metadata.get(FieldMetadata, FieldMetadata()),
-                **kwargs,
-            ),
+            FieldMetadata: f.metadata.get(FieldMetadata, FieldMetadata()).update(**kwargs),
         })
     return inner
 
@@ -26,10 +23,7 @@ def update_fields_metadata(
 ) -> ta.Callable[[type[T]], type[T]]:
     def inner(a: str, f: dc.Field) -> dc.Field:
         return dc.update_field_metadata(f, {
-            FieldMetadata: dc.replace(
-                f.metadata.get(FieldMetadata, FieldMetadata()),
-                **kwargs,
-            ),
+            FieldMetadata: f.metadata.get(FieldMetadata, FieldMetadata()).update(**kwargs),
         })
 
     return dc.update_fields(inner, fields)

omlish/marshal/objects.py

@@ -1,11 +1,9 @@
 """
 TODO:
  - cfg naming
- - adapters for dataclasses / namedtuples / user objects (as confitured)
+ - adapters for dataclasses / namedtuples / user objects (as configured)
  - mro-merge ObjectMetadata
  - key ordering override - like slice, -1 means last
- - dedupe omit_if/default fields on Metadata/Info - FieldOptions prob
-  - impl merge, update helpers:update_fields_metadata
 """
 import collections.abc
 import typing as ta
@@ -27,13 +25,25 @@ from .values import Value
 ##
 
 
+@dc.dataclass(frozen=True, kw_only=True)
+class FieldOptions:
+    omit_if: ta.Callable[[ta.Any], bool] | None = None
+
+    default: lang.Maybe[ta.Any] = dc.xfield(default=lang.empty(), check_type=lang.Maybe)
+
+    embed: bool = False
+
+
+DEFAULT_FIELD_OPTIONS = FieldOptions()
+FIELD_OPTIONS_KWARGS: frozenset[str] = frozenset(dc.fields_dict(FieldOptions).keys())
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class FieldMetadata:
     name: str | None = None
     alts: ta.Iterable[str] | None = None
 
-    omit_if: ta.Callable[[ta.Any], bool] | None = None
-    default: lang.Maybe[ta.Any] = dc.xfield(lang.empty(), check_type=lang.Maybe)
+    options: FieldOptions = DEFAULT_FIELD_OPTIONS
 
     marshaler: Marshaler | None = None
     marshaler_factory: MarshalerFactory | None = None
@@ -41,6 +51,15 @@ class FieldMetadata:
     unmarshaler: Unmarshaler | None = None
     unmarshaler_factory: UnmarshalerFactory | None = None
 
+    def update(self, **kwargs: ta.Any) -> 'FieldMetadata':
+        okw = {k: v for k, v in kwargs.items() if k in FIELD_OPTIONS_KWARGS}
+        mkw = {k: v for k, v in kwargs.items() if k not in FIELD_OPTIONS_KWARGS}
+        return dc.replace(
+            self,
+            **(dict(options=dc.replace(self.options, **okw)) if okw else {}),
+            **mkw,
+        )
+
 
 @dc.dataclass(frozen=True, kw_only=True)
 class ObjectMetadata:
@@ -64,8 +83,7 @@ class FieldInfo:
 
     metadata: FieldMetadata = FieldMetadata()
 
-    omit_if: ta.Callable[[ta.Any], bool] | None = None
-    default: lang.Maybe[ta.Any] = lang.empty()
+    options: FieldOptions = FieldOptions()
 
 
 ##
@@ -80,12 +98,21 @@ class ObjectMarshaler(Marshaler):
     unknown_field: str | None = None
 
     def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
-        ret = {}
+        ret: dict[str, ta.Any] = {}
         for fi, m in self.fields:
             v = getattr(o, fi.name)
-            if fi.omit_if is not None and fi.omit_if(v):
+
+            if fi.options.omit_if is not None and fi.options.omit_if(v):
                 continue
-            ret[fi.marshal_name] = m.marshal(ctx, v)
+
+            mv = m.marshal(ctx, v)
+
+            if fi.options.embed:
+                for ek, ev in check.isinstance(mv, collections.abc.Mapping).items():
+                    ret[fi.marshal_name + check.non_empty_str(ek)] = ev  # type: ignore
+
+            else:
+                ret[fi.marshal_name] = mv
 
         if self.unknown_field is not None:
             if (ukf := getattr(o, self.unknown_field)):
@@ -135,8 +162,12 @@ class ObjectUnmarshaler(Unmarshaler):
     _: dc.KW_ONLY
 
     unknown_field: str | None = None
+
     defaults: ta.Mapping[str, ta.Any] | None = None
 
+    embeds: ta.Mapping[str, type] | None = None
+    embeds_by_unmarshal_name: ta.Mapping[str, tuple[str, str]] | None = None
+
     def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
         ma = check.isinstance(v, collections.abc.Mapping)
 
@@ -144,6 +175,8 @@ class ObjectUnmarshaler(Unmarshaler):
         kw: dict[str, ta.Any] = {}
         ukf: dict[str, ta.Any] | None = None
 
+        ekws: dict[str, dict[str, ta.Any]] = {en: {} for en in self.embeds or ()}
+
         if self.unknown_field is not None:
             kw[self.unknown_field] = ukf = {}
 
@@ -159,10 +192,20 @@ class ObjectUnmarshaler(Unmarshaler):
                     continue
                 raise
 
-            if fi.name in kw:
-                raise KeyError(f'Duplicate keys for field {fi.name!r}: {ks!r}')
+            if self.embeds_by_unmarshal_name and (en := self.embeds_by_unmarshal_name.get(ks)):
+                tkw, tk = ekws[en[0]], en[1]
+            else:
+                tkw, tk = kw, fi.name
+
+            if tk in tkw:
+                raise KeyError(f'Duplicate keys for field {tk!r}: {ks!r}')
+
+            tkw[tk] = u.unmarshal(ctx, mv)
 
-            kw[fi.name] = u.unmarshal(ctx, mv)
+        for em, ecls in self.embeds.items() if self.embeds else ():
+            ekw = ekws[em]
+            ev = ecls(**ekw)
+            kw[em] = ev
 
         if self.defaults:
             for dk, dv in self.defaults.items():
@@ -194,9 +237,9 @@ class SimpleObjectUnmarshalerFactory(UnmarshalerFactory):
         }
 
         defaults = {
-            fi.name: fi.default.must()
+            fi.name: fi.options.default.must()
             for fi in flds
-            if fi.default.present
+            if fi.options.default.present
         }
 
         return ObjectUnmarshaler(

omlish/specs/openapi/__init__.py

@@ -0,0 +1,5 @@
+from . import marshal  # noqa
+
+from .openapi import (  # noqa
+    Openapi,
+)

omlish/specs/openapi/marshal.py

@@ -0,0 +1,63 @@
+import typing as ta
+
+from ... import check
+from ... import dataclasses as dc
+from ... import lang
+from ... import marshal as msh
+from ... import matchfns as mfs
+from ... import reflect as rfl
+from .openapi import Reference
+
+
+#
+
+
+def _reference_union_arg(rty: rfl.Type) -> rfl.Type | None:
+    if isinstance(rty, rfl.Union) and len(rty.args) == 2 and Reference in rty.args:
+        return check.single(a for a in rty.args if a is not Reference)
+    else:
+        return None
+
+
+@dc.dataclass(frozen=True)
+class _ReferenceUnionMarshaler(msh.Marshaler):
+    m: msh.Marshaler
+    r: msh.Marshaler
+
+    def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
+        if isinstance(o, Reference):
+            return self.r.marshal(ctx, o)
+        else:
+            return self.m.marshal(ctx, o)
+
+
+class _ReferenceUnionMarshalerFactory(msh.MarshalerFactoryMatchClass):
+    @mfs.simple(lambda _, ctx, rty: _reference_union_arg(rty) is not None)
+    def _build(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
+        return _ReferenceUnionMarshaler(ctx.make(check.not_none(_reference_union_arg(rty))), ctx.make(Reference))
+
+
+@dc.dataclass(frozen=True)
+class _ReferenceUnionUnmarshaler(msh.Unmarshaler):
+    u: msh.Unmarshaler
+    r: msh.Unmarshaler
+
+    def unmarshal(self, ctx: msh.UnmarshalContext, v: msh.Value) -> ta.Any:
+        if not isinstance(v, ta.Mapping):
+            raise TypeError(v)
+        elif '$ref' in v:
+            return self.r.unmarshal(ctx, v)
+        else:
+            return self.u.unmarshal(ctx, v)  # noqa
+
+
+class _ReferenceUnionUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
+    @mfs.simple(lambda _, ctx, rty: _reference_union_arg(rty) is not None)
+    def _build(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
+        return _ReferenceUnionUnmarshaler(ctx.make(check.not_none(_reference_union_arg(rty))), ctx.make(Reference))
+
+
+@lang.static_init
+def _install_standard_marshalling() -> None:
+    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [_ReferenceUnionMarshalerFactory()]
+    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [_ReferenceUnionUnmarshalerFactory()]

omlish/specs/openapi/openapi.py

@@ -0,0 +1,443 @@
+"""
+https://swagger.io/specification/
+"""
+import typing as ta
+
+from ... import check
+from ... import dataclasses as dc
+from ... import marshal as msh
+from ...formats import json
+
+
+##
+
+
+# https://swagger.io/specification/#security-requirement-object
+SecurityRequirement: ta.TypeAlias = ta.Mapping[str, ta.Sequence[str]]
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class OauthFlow:
+    """https://swagger.io/specification/#oauth-flow-object"""
+
+    authorization_url: str
+    token_url: str
+    scopes: ta.Mapping[str, str]
+    refresh_ur: str | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class OauthFlows:
+    """https://swagger.io/specification/#oauth-flows-object"""
+
+    implicit: OauthFlow | None = None
+    password: OauthFlow | None = None
+    client_credentials: OauthFlow | None = None
+    authorization_code: OauthFlow | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+@msh.update_fields_metadata(['in_'], name='in')
+class SecurityScheme:
+    """https://swagger.io/specification/#security-scheme-object"""
+
+    type: str
+    scheme: str
+    name: str | None = None
+    in_: str | None = None
+    description: str | None = None
+    bearer_format: str | None = None
+    flows: OauthFlows | None = None
+    open_id_connect_url: str | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Xml:
+    """https://swagger.io/specification/#xml-object"""
+
+    name: str | None = None
+    namespace: str | None = None
+    prefix: str | None = None
+    attribute: bool | None = None
+    wrapped: bool | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Discriminator:
+    """https://swagger.io/specification/#discriminator-object"""
+
+    property_name: str
+    mapping: ta.Mapping[str, str] | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL, unknown_field='x')
+class Schema:
+    """https://swagger.io/specification/#schema-object"""
+
+    discriminator: Discriminator | None = None
+    xml: Xml | None = None
+    external_docs: ta.Optional['ExternalDocumentation'] = None
+    example: ta.Any | None = None
+
+    # FIXME: HACK: this is a jsonschema lol - these are just hacked on
+
+    type: str | None = None
+    format: str | None = None
+    one_of: ta.Any = None
+    all_of: ta.Any = None
+    default: ta.Any = None
+    enum: ta.Any = None
+    items: ta.Any = None
+    required: ta.Any = None
+    properties: ta.Any = None
+    description: str | None = None
+    title: str | None = None
+    deprecated: bool | None = None
+    nullable: bool | None = None
+    additional_properties: ta.Any = None
+
+    #
+
+    x: ta.Mapping[str, ta.Any] | None = None
+
+    @dc.init
+    def _check_x(self) -> None:
+        for k in self.x or {}:
+            check.arg(k.startswith('x-'))
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+@msh.update_fields_metadata(['ref'], name='$ref')
+class Reference:
+    """https://swagger.io/specification/#reference-object"""
+
+    ref: str
+    summary: str | None = None
+    description: str | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Tag:
+    """https://swagger.io/specification/#tag-object"""
+
+    name: str
+    description: str | None = None
+    external_docs: ta.Optional['ExternalDocumentation'] = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+@msh.update_fields_metadata(['common'], embed=True, name='')
+class Header:
+    """https://swagger.io/specification/#header-object"""
+
+    # TODO: marshal embedding, shared with Parameter
+    common: 'ParameterCommon'
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Link:
+    """https://swagger.io/specification/#link-object"""
+
+    operation_ref: str | None = None
+    operation_id: str | None = None
+    parameters: ta.Mapping[str, ta.Any] | None = None
+    request_body: ta.Any = None
+    description: str | None = None
+    server: ta.Optional['Server'] = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Example:
+    """https://swagger.io/specification/#example-object"""
+
+    summary: str | None = None
+    description: str | None = None
+    value: ta.Any | None = None
+    external_value: str | None = None
+
+
+# https://swagger.io/specification/#callback-object
+Callback: ta.TypeAlias = ta.Mapping[str, ta.Union['PathItem', Reference]]
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Response:
+    """https://swagger.io/specification/#response-object"""
+
+    description: str
+    headers: ta.Mapping[str, Header | Reference] | None = None
+    content: ta.Mapping[str, 'MediaType'] | None = None
+    links: ta.Mapping[str, Link | Reference] | None = None
+
+
+# https://swagger.io/specification/#responses-object
+Responses: ta.TypeAlias = ta.Mapping[str, Response | Reference]
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Encoding:
+    """https://swagger.io/specification/#encoding-object"""
+
+    content_type: str | None = None
+    headers: ta.Mapping[str, Header | Reference] | None = None
+    style: str | None = None
+    explode: bool | None = None
+    allow_reserved: bool | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class MediaType:
+    """https://swagger.io/specification/#media-type-object"""
+
+    schema: Schema | Reference | None = None
+    example: ta.Any = None
+    examples: ta.Mapping[str, Example | Reference] | None = None
+    encoding: ta.Mapping[str, Encoding] | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class RequestBody:
+    """https://swagger.io/specification/#request-body-object"""
+
+    content: ta.Mapping[str, MediaType]
+    description: str | None = None
+    required: bool | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class ParameterCommon:
+    description: str | None = None
+    required: bool | None = None
+    deprecated: bool | None = None
+    allow_empty_value: bool | None = None
+
+    style: str | None = None
+    explode: bool | None = None
+    allow_reserved: bool | None = None
+    schema: Schema | None = None
+    example: ta.Any = None
+    examples: ta.Mapping[str, Example | Reference] | None = None
+
+    content: ta.Mapping[str, MediaType] | None = None
+
+    # style: ta.Any = None
+    matrix: ta.Any = None
+    label: ta.Any = None
+    form: ta.Any = None
+    simple: ta.Any = None
+    space_delimited: ta.Any = None
+    pipe_delimited: ta.Any = None
+    deep_object: ta.Any = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+@msh.update_fields_metadata(['in_'], name='in')
+@msh.update_fields_metadata(['common'], embed=True, name='')
+class Parameter:
+    """https://swagger.io/specification/#parameter-object"""
+
+    name: str
+    in_: str
+
+    common: ParameterCommon
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class ExternalDocumentation:
+    """https://swagger.io/specification/#external-documentation-object"""
+
+    url: str
+    description: str | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL, unknown_field='x')
+class Operation:
+    """https://swagger.io/specification/#operation-object"""
+
+    tags: ta.Sequence[str] | None = None
+    summary: str | None = None
+    description: str | None = None
+    external_docs: ExternalDocumentation | None = None
+    operation_id: str | None = None
+    parameters: ta.Sequence[Parameter | Reference] | None = None
+    request_body: RequestBody | Reference | None = None
+    responses: Responses | None = None
+    callbacks: ta.Mapping[str, Callback | Reference] | None = None
+    deprecated: bool | None = None
+    security: ta.Sequence[SecurityRequirement] | None = None
+    servers: ta.Sequence['Server'] | None = None
+
+    #
+
+    x: ta.Mapping[str, ta.Any] | None = None
+
+    @dc.init
+    def _check_x(self) -> None:
+        for k in self.x or {}:
+            check.arg(k.startswith('x-'))
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+@msh.update_fields_metadata(['ref'], name='$ref')
+class PathItem:
+    """https://swagger.io/specification/#path-item-object"""
+
+    ref: str | None = None
+    summary: str | None = None
+    description: str | None = None
+    get: Operation | None = None
+    put: Operation | None = None
+    post: Operation | None = None
+    delete: Operation | None = None
+    options: Operation | None = None
+    head: Operation | None = None
+    patch: Operation | None = None
+    trace: Operation | None = None
+    servers: ta.Sequence['Server'] | None = None
+    parameters: ta.Sequence[Parameter | Reference] | None = None
+
+
+# https://swagger.io/specification/#paths-object
+Paths: ta.TypeAlias = ta.Mapping[str, PathItem]
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Components:
+    """https://swagger.io/specification/#components-object"""
+
+    schemas: ta.Mapping[str, Schema] | None = None
+    responses: ta.Mapping[str, Response | Reference] | None = None
+    parameters: ta.Mapping[str, Parameter | Reference] | None = None
+    examples: ta.Mapping[str, Example | Reference] | None = None
+    requestbodies: ta.Mapping[str, RequestBody | Reference] | None = None
+    headers: ta.Mapping[str, Header | Reference] | None = None
+    security_schemes: ta.Mapping[str, SecurityScheme | Reference] | None = None
+    links: ta.Mapping[str, Link | Reference] | None = None
+    callbacks: ta.Mapping[str, Callback | Reference] | None = None
+    path_items: ta.Mapping[str, PathItem | Reference] | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class ServerVariable:
+    """https://swagger.io/specification/#server-variable-object"""
+
+    default: str
+    enum: ta.Sequence[str] | None = None
+    description: str | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Server:
+    """https://swagger.io/specification/#server-object"""
+
+    url: str
+    description: str | None = None
+    variables: ta.Mapping[str, ServerVariable] | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class License:
+    """https://swagger.io/specification/#license-object"""
+
+    name: str
+    identifier: str | None = None
+    url: str | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Contact:
+    """https://swagger.io/specification/#contact-object"""
+
+    name: str | None = None
+    url: str | None = None
+    email: str | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL)
+class Info:
+    """https://swagger.io/specification/#info-object"""
+
+    title: str
+    version: str
+    summary: str | None = None
+    description: str | None = None
+    terms_of_service: str | None = None
+    contact: Contact | None = None
+    license: License | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.LOW_CAMEL, unknown_field='x')
+class Openapi:
+    """https://swagger.io/specification/#openapi-object"""
+
+    openapi: str
+    info: Info
+    json_schema_dialect: str | None = None
+    servers: ta.Sequence[Server] | None = None
+    paths: Paths | None = None
+    webhooks: ta.Mapping[str, PathItem | Reference] | None = None
+    components: Components | None = None
+    security: ta.Sequence[SecurityRequirement] | None = None
+    tags: ta.Sequence[Tag] | None = None
+    external_docs: ExternalDocumentation | None = None
+
+    #
+
+    x: ta.Mapping[str, ta.Any] | None = None
+
+    @dc.init
+    def _check_x(self) -> None:
+        for k in self.x or {}:
+            check.arg(k.startswith('x-'))
+
+
+##
+
+
+def _main():
+    import argparse
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('schema_path')
+
+    args = parser.parse_args()
+
+    import yaml
+
+    with open(args.schema_path) as f:
+        doc = yaml.safe_load(f)
+
+    api = msh.unmarshal(doc, Openapi)
+
+    print(json.dumps_pretty(msh.marshal(api)))
+
+
+if __name__ == '__main__':
+    _main()

{omlish-0.0.0.dev41.dist-info → omlish-0.0.0.dev43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev41
+Version: 0.0.0.dev43
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev41.dist-info → omlish-0.0.0.dev43.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=FPSgLg_3QDVzKlNOuqV3dMqhja2KG_TUfKdGmHE8Eg4,803
-omlish/__about__.py,sha256=7FsOWhuWPr63aM9w6D-8mkjM3PSH0TI7v26pjaJDmCg,2919
+omlish/__about__.py,sha256=r89Z8V9DxpOVxM2o7M6f4JV4JEbBfeEO1OjjT6MpsLE,2919
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=QUUS6sv2ftfcmhDj4qU429mEE_lfWa0UN5yYpPG65B0,6265
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -64,10 +64,10 @@ omlish/configs/__init__.py,sha256=3uh09ezodTwkMI0nRmAMP0eEuJ_0VdF-LYyNmPjHiCE,77
 omlish/configs/classes.py,sha256=GLbB8xKjHjjoUQRCUQm3nEjM8z1qNTx9gPV7ODSt5dg,1317
 omlish/configs/flattening.py,sha256=AOlRpBHm449MxwMp3CiIRGunStOC1DUNs1f3CLou0wc,4731
 omlish/configs/strings.py,sha256=0brx1duL85r1GpfbNvbHcSvH4jWzutwuvMFXda9NeI0,2651
-omlish/dataclasses/__init__.py,sha256=L2kRMvsWgsennXVw7VgZdczCtdLsQzyPcMFit2rBpbA,1337
-omlish/dataclasses/utils.py,sha256=qBKHyW2LSjnJYfPSAExEsVZ5EdmDBfp4napAhfWkZFs,3221
+omlish/dataclasses/__init__.py,sha256=LALx4dXSvBWAKzmZxb3rkNdoR7kOaXeGcVypTnECvcw,1354
+omlish/dataclasses/utils.py,sha256=Ewd6w31uXy1sVUj59sxmXfGuI0CgsAbcfNXx0tsrNco,3347
 omlish/dataclasses/impl/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
-omlish/dataclasses/impl/__init__.py,sha256=rQJRcE9fVsGEvRUOZ18r4DE0xiLbSRjspyJRXgbLS3I,348
+omlish/dataclasses/impl/__init__.py,sha256=0hgOm3_u3yimjEkB-9fRMqX9rAW6kQC5t8XL0lpvffQ,410
 omlish/dataclasses/impl/api.py,sha256=6QtUAbP3DQZw8WEkgpsYfYKTn4CQBV9v0z2B4fTcR80,6405
 omlish/dataclasses/impl/as_.py,sha256=CD-t7hkC1EP2F_jvZKIA_cVoDuwZ-Ln_xC4fJumPYX0,2598
 omlish/dataclasses/impl/copy.py,sha256=Tn8_n6Vohs-w4otbGdubBEvhd3TsSTaM3EfNGdS2LYo,591
@@ -219,24 +219,24 @@ omlish/logs/formatters.py,sha256=q79nMnR2mRIStPyGrydQHpYTXgC5HHptt8lH3W2Wwbs,671
 omlish/logs/handlers.py,sha256=nyuFgmO05By_Xwq7es58ClzS51-F53lJL7gD0x5IqAg,228
 omlish/logs/noisy.py,sha256=Ubc-eTH6ZbGYsLfUUi69JAotwuUwzb-SJBeGo_0dIZI,348
 omlish/logs/utils.py,sha256=MgGovbP0zUrZ3FGD3qYNQWn-l0jy0Y0bStcQvv5BOmQ,391
-omlish/marshal/__init__.py,sha256=B2NLwxUuhvD17FfbipXmYo9yZmpBFcHqGPp-r8_Vuvs,1951
+omlish/marshal/__init__.py,sha256=_vx3txFh09j3SoxSfSS4AwwnDa9jgAWzXYjluIitGWA,1969
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
 omlish/marshal/base.py,sha256=ceNjOFxCwLNuxkmxofk3Sh5rE39JGxnc4giN7NNr9kA,6121
 omlish/marshal/base64.py,sha256=F-3ogJdcFCtWINRgJgWT0rErqgx6f4qahhcg8OrkqhE,1089
-omlish/marshal/dataclasses.py,sha256=TdpTCqAHs9hrTyUG__goSRcm848LZznJcDG4WY5wbgM,4109
+omlish/marshal/dataclasses.py,sha256=B21hFukA9pNhp-PzBWG7rxz_F5BjNzMxU3nFURRrGXo,6037
 omlish/marshal/datetimes.py,sha256=0ffg8cEvx9SMKIXZGD9b7MqpLfmgw0uKKdn6YTfoqok,3714
 omlish/marshal/enums.py,sha256=-0fKutBbyz8ygEaA0_P_8IOJrI9jMGigmnPbutV9Bg4,1464
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
 omlish/marshal/factories.py,sha256=UV2Svjok-lTWsRqKGh-CeuAhvlohw9uJe7ZLyoKMvTM,2968
 omlish/marshal/forbidden.py,sha256=BNshzm4lN5O8sUZ1YvxrSYq3WPklq9NMQCRZ7RC3DLM,865
 omlish/marshal/global_.py,sha256=8XCjPcIjA65StESshzNfQiSyuckVaEiiWROmC3qk0mo,1117
-omlish/marshal/helpers.py,sha256=YA0pNo-Fkc-_qKeoRNXUpP36js8oelU7uENkvoGD4hY,1206
+omlish/marshal/helpers.py,sha256=-SOgYJmrURILHpPK6Wu3cCvhj8RJrqfJxuKhh9UMs7o,1102
 omlish/marshal/iterables.py,sha256=6I_ZdJemLSQtJ4J5NrB9wi-eyxiJZS61HzHXp1yeiX8,2592
 omlish/marshal/mappings.py,sha256=zhLtyot7tzQtBNj7C4RBxjMELxA5r2q2Mth8Br7xkFs,2803
 omlish/marshal/maybes.py,sha256=mgK3QsWHkXgRqo076KxYKH6elRxzJ_QDTodv93mgHR0,2198
 omlish/marshal/naming.py,sha256=lIklR_Od4x1ghltAgOzqcKhHs-leeSv2YmFhCHO7GIs,613
 omlish/marshal/numbers.py,sha256=oY_yMNJEnJhjfLh89gpPXvKqeUyhQcaTcQB6ecyHiG8,1704
-omlish/marshal/objects.py,sha256=E5wvH1o0_edsVJ4HoUuTqPfnb21ou08IdL442OQUOUw,5235
+omlish/marshal/objects.py,sha256=fe4dPEF6BqZRWHSn3D7Z5JyLg-Z7JFPhBe2gjUGBefw,6543
 omlish/marshal/optionals.py,sha256=r0XB5rqfasvgZJNrKYd6Unq2U4nHt3JURi26j0dYHlw,1499
 omlish/marshal/polymorphism.py,sha256=doA8aLUhna6aco5b2Ok3jsem1V4NsF3rM5RTfJt0a7U,5708
 omlish/marshal/primitives.py,sha256=wcvcs5GH_TWVmzAszh3dvyKibJgBxnXke-AlAXiwrrI,1107
@@ -289,6 +289,9 @@ omlish/specs/jsonschema/schemas/draft202012/vocabularies/format.json,sha256=UOu_
 omlish/specs/jsonschema/schemas/draft202012/vocabularies/meta-data.json,sha256=j3bW4U9Bubku-TO3CM3FFEyLUmhlGtEZGEhfsXVPHHY,892
 omlish/specs/jsonschema/schemas/draft202012/vocabularies/unevaluated.json,sha256=Lb-8tzmUtnCwl2SSre4f_7RsIWgnhNL1pMpWH54tDLQ,506
 omlish/specs/jsonschema/schemas/draft202012/vocabularies/validation.json,sha256=cBCjHlQfMtK-ch4t40jfdcmzaHaj7TBId_wKvaHTelg,2834
+omlish/specs/openapi/__init__.py,sha256=zilQhafjvteRDF_TUIRgF293dBC6g-TJChmUb6T9VBQ,77
+omlish/specs/openapi/marshal.py,sha256=ob_qUbT9-de86KhPjFccl_NP0liQcXK7Ao-b5Hn0VQA,2133
+omlish/specs/openapi/openapi.py,sha256=y4h04jeB7ORJSVrcy7apaBdpwLjIyscv1Ub5SderH2c,12682
 omlish/sql/__init__.py,sha256=TpZLsEJKJzvJ0eMzuV8hwOJJbkxBCV1RZPUMLAVB6io,173
 omlish/sql/_abc.py,sha256=HLhnnLZ7l0r_N99I-RCqJe6VHth-9iluU7cR-7-5jfs,1519
 omlish/sql/dbs.py,sha256=lpdFmm2vTwLoBiVYGj9yPsVcTEYYNCxlYZZpjfChzkY,1870
@@ -325,9 +328,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev41.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev41.dist-info/METADATA,sha256=r8Q2E7Ch6npanZY7xAo-quF5Z9R9OWkH6eY2JATdOfs,3817
-omlish-0.0.0.dev41.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev41.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev41.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev41.dist-info/RECORD,,
+omlish-0.0.0.dev43.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev43.dist-info/METADATA,sha256=uuX1PAEvidaoC9uBAqHDBXL1Td-VZiG_xC1MdX_GKKY,3817
+omlish-0.0.0.dev43.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev43.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev43.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev43.dist-info/RECORD,,