omlish 0.0.0.dev333__tar.gz → 0.0.0.dev334__tar.gz

{omlish-0.0.0.dev333/omlish.egg-info → omlish-0.0.0.dev334}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev333
+Version: 0.0.0.dev334
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev333'
-__revision__ = '6bdf8fd7239d2a0d37ef56577759311e43d08ac3'
+__version__ = '0.0.0.dev334'
+__revision__ = '94a2a21ea15445a26922d6bc6501c1f500a1b43a'
 
 
 #

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/omlish/dataclasses/reflection.py

@@ -29,6 +29,8 @@ class ClassReflection:
     def cls(self) -> type:
         return self._cls
 
+    #
+
     @lang.cached_property
     def spec(self) -> ClassSpec:
         if (cs := get_class_spec(self._cls)) is not None:
@@ -60,6 +62,8 @@ class ClassReflection:
 
         return cs
 
+    #
+
     @lang.cached_property
     def fields_inspection(self) -> FieldsInspection:
         return inspect_fields(self._cls)
@@ -80,6 +84,20 @@ class ClassReflection:
     def instance_fields(self) -> ta.Sequence[dc.Field]:
         return [f for f in self.fields.values() if std_field_type(f) is StdFieldType.INSTANCE]
 
+    #
+
+    @lang.cached_property
+    def type_hints(self) -> ta.Mapping[str, ta.Any]:
+        return ta.get_type_hints(self._cls)
+
+    @lang.cached_property
+    def field_annotations(self) -> ta.Mapping[str, ta.Any]:
+        return {
+            f: self.type_hints[f]
+            for f in self.fields
+            if f in self.type_hints
+        }
+
 
 def reflect(cls: type) -> ClassReflection:
     return ClassReflection(cls)

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/omlish/formats/json/__init__.py

@@ -9,6 +9,15 @@ import typing as _ta
 from ... import lang as _lang
 
 
+from .backends import (  # noqa
+    Backend,
+
+    DEFAULT_BACKED,
+
+    StdBackend,
+    STD_BACKEND,
+)
+
 from .consts import (  # noqa
     COMPACT_KWARGS,
     COMPACT_SEPARATORS,

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/omlish/formats/json/backends/__init__.py

@@ -5,3 +5,8 @@ from .base import (  # noqa
 from .default import (  # noqa
     DEFAULT_BACKED,
 )
+
+from .std import (  # noqa
+    StdBackend,
+    STD_BACKEND,
+)

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/omlish/marshal/global_.py

@@ -42,7 +42,17 @@ def global_unmarshaler_factory() -> UnmarshalerFactory:
     return new_standard_unmarshaler_factory()
 
 
+@ta.overload
 def unmarshal(v: Value, ty: type[T], **kwargs: ta.Any) -> T:
+    ...
+
+
+@ta.overload
+def unmarshal(v: Value, ty: ta.Any, **kwargs: ta.Any) -> ta.Any:
+    ...
+
+
+def unmarshal(v, ty, **kwargs):
     uc = UnmarshalContext(GLOBAL_REGISTRY, factory=global_unmarshaler_factory(), **kwargs)
     return uc.make(ty).unmarshal(uc, v)
 

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/omlish/specs/jsonschema/__init__.py

@@ -64,3 +64,11 @@ from .types import (  # noqa
     JsonType,
     TYPE_SETS_BY_JSON_TYPE,
 )
+
+
+##
+
+
+from ...lang.imports import _register_conditional_import  # noqa
+
+_register_conditional_import('...marshal', '.marshal', __package__)

omlish-0.0.0.dev334/omlish/specs/jsonschema/marshal.py

@@ -0,0 +1,29 @@
+import typing as ta
+
+from ... import check
+from ... import lang
+from ... import marshal as msh
+from .keywords.base import Keywords
+from .keywords.parse import KeywordParser
+from .keywords.render import render_keywords
+
+
+##
+
+
+class _KeywordsMarshaler(msh.Marshaler):
+    def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
+        return render_keywords(check.isinstance(o, Keywords))
+
+
+class _KeywordsUnmarshaler(msh.Unmarshaler):
+    def unmarshal(self, ctx: msh.UnmarshalContext, v: msh.Value) -> ta.Any:
+        return KeywordParser(allow_unknown=True).parse_keywords(check.isinstance(v, ta.Mapping))
+
+
+@lang.static_init
+def _install_standard_marshalling() -> None:
+    msh.install_standard_factories(
+        msh.TypeMapMarshalerFactory({Keywords: _KeywordsMarshaler()}),
+        msh.TypeMapUnmarshalerFactory({Keywords: _KeywordsUnmarshaler()}),
+    )

omlish-0.0.0.dev334/omlish/specs/openapi/marshal.py

@@ -0,0 +1,148 @@
+import typing as ta
+
+from ... import check
+from ... import dataclasses as dc
+from ... import lang
+from ... import marshal as msh
+from ... import reflect as rfl
+from ...funcs import match as mfs
+from .. import jsonschema as jsch
+from .openapi import Reference
+from .openapi import Schema
+
+
+##
+
+
+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))
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class _SchemaMarshaler(msh.Marshaler):
+    m_dct: ta.Mapping[str, tuple[str, msh.Marshaler]]
+    kw_m: msh.Marshaler
+
+    def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
+        sch: Schema = check.isinstance(o, Schema)
+        dct = {}
+        for f, (k, fm) in self.m_dct.items():
+            fv = getattr(sch, f)
+            if fv is None:
+                continue
+            dct[k] = fm.marshal(ctx, fv)
+        if sch.keywords is not None:
+            dct.update(keywords=self.kw_m.marshal(ctx, sch.keywords))
+        return dct
+
+
+class _SchemaMarshalerFactory(msh.MarshalerFactoryMatchClass):
+    @mfs.simple(lambda _, ctx, rty: rty is Schema)
+    def _build(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
+        return _SchemaMarshaler(
+            {
+                f: (msh.translate_name(f, msh.Naming.LOW_CAMEL), ctx.make(rfl.type_(a)))
+                for f, a in dc.reflect(Schema).field_annotations.items()
+                if f != 'keywords'
+            },
+            ctx.make(jsch.Keywords),
+        )
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class _SchemaUnmarshaler(msh.Unmarshaler):
+    u_dct: ta.Mapping[str, tuple[str, msh.Unmarshaler]]
+    kw_u: msh.Unmarshaler
+
+    def unmarshal(self, ctx: msh.UnmarshalContext, v: msh.Value) -> ta.Any:
+        dct = dict(check.isinstance(v, ta.Mapping))
+        kw = {}
+        for k, (f, fu) in self.u_dct.items():
+            try:
+                kv = dct.pop(k)
+            except KeyError:
+                continue
+            kw[f] = fu.unmarshal(ctx, kv)
+        if dct:
+            kw.update(keywords=self.kw_u.unmarshal(ctx, dct))
+        return Schema(**kw)
+
+
+class _SchemaUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
+    @mfs.simple(lambda _, ctx, rty: rty is Schema)
+    def _build(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
+        return _SchemaUnmarshaler(
+            {
+                msh.translate_name(f, msh.Naming.LOW_CAMEL): (f, ctx.make(rfl.type_(a)))
+                for f, a in dc.reflect(Schema).field_annotations.items()
+                if f != 'keywords'
+            },
+            ctx.make(jsch.Keywords),
+        )
+
+
+##
+
+
+@lang.static_init
+def _install_standard_marshalling() -> None:
+    msh.install_standard_factories(
+        _ReferenceUnionMarshalerFactory(),
+        _ReferenceUnionUnmarshalerFactory(),
+
+        _SchemaMarshalerFactory(),
+        _SchemaUnmarshalerFactory(),
+    )

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/omlish/specs/openapi/openapi.py

@@ -7,6 +7,7 @@ from ... import check
 from ... import dataclasses as dc
 from ... import marshal as msh
 from ...formats import json
+from .. import jsonschema as jsch
 
 
 ##
@@ -76,7 +77,6 @@ class Discriminator:
 
 
 @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"""
 
@@ -85,31 +85,7 @@ class Schema:
     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-'))
+    keywords: jsch.Keywords | None = None
 
 
 @dc.dataclass(frozen=True)
@@ -230,7 +206,7 @@ class ParameterCommon:
     style: str | None = None
     explode: bool | None = None
     allow_reserved: bool | None = None
-    schema: Schema | None = None
+    schema: Schema | Reference | None = None
     example: ta.Any = None
     examples: ta.Mapping[str, Example | Reference] | None = None
 

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev333
+Version: 0.0.0.dev334
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/omlish.egg-info/SOURCES.txt

@@ -639,6 +639,7 @@ omlish/specs/jsonrpc/errors.py
 omlish/specs/jsonrpc/marshal.py
 omlish/specs/jsonrpc/types.py
 omlish/specs/jsonschema/__init__.py
+omlish/specs/jsonschema/marshal.py
 omlish/specs/jsonschema/types.py
 omlish/specs/jsonschema/keywords/__init__.py
 omlish/specs/jsonschema/keywords/base.py

{omlish-0.0.0.dev333 → omlish-0.0.0.dev334}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev333'
+version = '0.0.0.dev334'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev333/omlish/specs/openapi/marshal.py

@@ -1,65 +0,0 @@
-import typing as ta
-
-from ... import check
-from ... import dataclasses as dc
-from ... import lang
-from ... import marshal as msh
-from ... import reflect as rfl
-from ...funcs import match as mfs
-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.install_standard_factories(
-        _ReferenceUnionMarshalerFactory(),
-        _ReferenceUnionUnmarshalerFactory(),
-    )