omlish 0.0.0.dev333__py3-none-any.whl → 0.0.0.dev335__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev333'
-__revision__ = '6bdf8fd7239d2a0d37ef56577759311e43d08ac3'
+__version__ = '0.0.0.dev335'
+__revision__ = '445472b51ecc513f0f43aa95228c3b9812ca338b'
 
 
 #

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/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/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/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/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/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/specs/openapi/marshal.py

@@ -6,10 +6,12 @@ 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:
@@ -19,6 +21,9 @@ def _reference_union_arg(rty: rfl.Type) -> rfl.Type | None:
         return None
 
 
+#
+
+
 @dc.dataclass(frozen=True)
 class _ReferenceUnionMarshaler(msh.Marshaler):
     m: msh.Marshaler
@@ -37,6 +42,9 @@ class _ReferenceUnionMarshalerFactory(msh.MarshalerFactoryMatchClass):
         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
@@ -57,9 +65,84 @@ class _ReferenceUnionUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
         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/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.dist-info → omlish-0.0.0.dev335.dist-info}/METADATA

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

{omlish-0.0.0.dev333.dist-info → omlish-0.0.0.dev335.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=0dheu23lnr3-QXTXqGmht7cpWFrK2XfZybnSnnz1y88,3478
+omlish/__about__.py,sha256=H-aNkbPszpa6awU7KHxFKYgjg-Cbj5UcLXu6RGHn5n0,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -140,7 +140,7 @@ omlish/dataclasses/debug.py,sha256=giBiv6aXvX0IagwNCW64qBzNjfOFr3-VmgDy_KYlb-k,2
 omlish/dataclasses/errors.py,sha256=tyv3WR6az66uGGiq9FIuCHvy1Ef-G7zeMY7mMG6hy2Y,2527
 omlish/dataclasses/inspect.py,sha256=BlpPghVCU3w_YDnONEqqE99YHzJM2q3eoqe39YX25Ko,4596
 omlish/dataclasses/internals.py,sha256=vIGCZnStgD3ef4drYRtVOrxhxmAPa0vJpo4pXcDcQvM,3073
-omlish/dataclasses/reflection.py,sha256=FSSTiS7pGTmDrYNkS6fZzaMSe8qtSvDv5Pgz0T55qXg,2404
+omlish/dataclasses/reflection.py,sha256=r0cZWIajIyPeacwR6PGfJGbL8dg7jHXZSvJjey81rPo,2766
 omlish/dataclasses/specs.py,sha256=JFpMILJhxiWYmfTD4TDl03O13o1i0Rwgf14WpI7U9go,6193
 omlish/dataclasses/utils.py,sha256=gv6za6oJYBr1VaeGd7oXqq9lhBs_sxkpC27XYzJggno,1870
 omlish/dataclasses/api/__init__.py,sha256=k5iS9QOwf_f4iOfGffYhnqDOcmEIwEUUTp00u11kIPM,455
@@ -260,7 +260,7 @@ omlish/formats/edn/values.py,sha256=jf0g88KJIMALxcuH51SoaMWg1HqTUqc1ugldmyyXWoc,
 omlish/formats/ini/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/ini/codec.py,sha256=omuFg0kiDksv8rRlWd_v32ebzEcKlgmiPgGID3bRi2M,631
 omlish/formats/ini/sections.py,sha256=7wYyZdVTQbMPFpjQEACKJfAEPzUBrogINsrvFgxJoZ0,1015
-omlish/formats/json/__init__.py,sha256=HXFv4VDTBhx0k5U4JYWZqxziBwzJoPX51QK3xIboT8U,786
+omlish/formats/json/__init__.py,sha256=MAvDQlUgn6DlVZaL03539tYfdtU0cT1Y9Rcy9yBhjYs,889
 omlish/formats/json/codecs.py,sha256=E5KErfqsgGZq763ixXLT3qysbk5MIsypT92xG5aSaIs,796
 omlish/formats/json/consts.py,sha256=A0cTAGGLyjo-gcYIQrL4JIaardI0yPMhQoNmh42BaRg,387
 omlish/formats/json/encoding.py,sha256=iwoYyJePibgvRDZ6e9b2OlXmOBJEczquRNoiffVf3hE,502
@@ -268,7 +268,7 @@ omlish/formats/json/json.py,sha256=Mdqv2vdMi7gp96eV0BIYH5UdWpjWfsh-tSMZeywG-08,3
 omlish/formats/json/literals.py,sha256=MMou9UIoztL9EyX2Zhv3Kzfq8eaKMfGNCFhL16n-fTk,7532
 omlish/formats/json/rendering.py,sha256=0S_ppr5ihkUW7PP0mipZXHr72otqwUCNfanwopcboag,4571
 omlish/formats/json/types.py,sha256=ueO9-uOU2eVWowJf0LH1fHFLjZ6fTIZyq9qybcLQaiQ,147
-omlish/formats/json/backends/__init__.py,sha256=gnaNDCxy_KmmPUPDnjxO5_WjuWxLGbI9FYWx8ZJuQUU,97
+omlish/formats/json/backends/__init__.py,sha256=foi543hIIODpUfvlwVMtkWDGhZSRGaC3BBxdIrinofo,160
 omlish/formats/json/backends/base.py,sha256=WqtyoM82pyM0NyqpPwndrebr1bUVU1QlpmVQNrcAO8c,1114
 omlish/formats/json/backends/default.py,sha256=a-eM-Y1IHdpYvZFjazwq_orRncjtYR7BKxP_2kpEXog,322
 omlish/formats/json/backends/jiter.py,sha256=8qv_XWGpcupPtVm6Z_egHio_iY1Kk8eqkvXTF6fVZr4,1193
@@ -492,7 +492,7 @@ omlish/marshal/__init__.py,sha256=7jIXe9wQv-if1iRUuU6a4MdHScTLFFL8X2JwHaNTAxI,33
 omlish/marshal/base.py,sha256=Q0ZRsz5z0NTI6PeWPc9mdMstJryDDbeIAdpKH9-SDps,11427
 omlish/marshal/errors.py,sha256=g5XJyTHd__8lfwQ4KwgK-E5WR6MoNTMrqKP2U_QRQQQ,307
 omlish/marshal/factories.py,sha256=Q926jSVjaQLEmStnHLhm_c_vqEysN1LnDCwAsFLIzXw,2970
-omlish/marshal/global_.py,sha256=Dv3a6lLU7ikgvcpvfjrG1BZFC4u-zcDvQUT1buphAVU,1380
+omlish/marshal/global_.py,sha256=nTJmC17O8SJNURScIdYqEY72h-dRy6D-SaDSUQCp-cY,1523
 omlish/marshal/naming.py,sha256=7jQ204u_Kpc3-OGr-ctUHSv997DdWYRLh643qLHJhks,852
 omlish/marshal/proxy.py,sha256=puKJpwPpuDlMOIrKMcLTRLJyMiL6n_Xs-p59AuDEymA,543
 omlish/marshal/registries.py,sha256=FvC6qXHCizNB2QmU_N3orxW7iqfGYkiUXYYdTRWS6HA,2353
@@ -628,7 +628,8 @@ omlish/specs/jsonrpc/conns.py,sha256=zvWnBHuSoGnvbGVk72Usp4IFsLscrzPozqR2hmFjnDI
 omlish/specs/jsonrpc/errors.py,sha256=-Zgmlo6bV6J8w5f8h9axQgLquIFBHDgIwcpufEH5NsE,707
 omlish/specs/jsonrpc/marshal.py,sha256=HM736piPGnBZrg8CMLDX-L5fZpegyF6l6JUjzLoSDtk,1852
 omlish/specs/jsonrpc/types.py,sha256=Se9ecG-_k-kY_Qlt9QD2t3y26oY4sXTcskp6XZfVans,3054
-omlish/specs/jsonschema/__init__.py,sha256=rdHG_0kKn64qizk0UI5S2uXV2hzf5vxnt4SXRw9yGuU,1086
+omlish/specs/jsonschema/__init__.py,sha256=-A5mPI3NPcGxqTfux9gvV56O6GbQG9MytAGB98E-1DU,1227
+omlish/specs/jsonschema/marshal.py,sha256=-pmBtNnKC0sxGg3TMVWngTbSSAwG1zQyt0D6aZutd84,873
 omlish/specs/jsonschema/types.py,sha256=_H7ma99hD3_Xu42BFGHOXRI5p79tY8WBX8QE36k7lbw,472
 omlish/specs/jsonschema/keywords/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/specs/jsonschema/keywords/base.py,sha256=QjkMrKw58j99r-Ug2I4Y-SGbyKSTVho5FUP_lWDQ4wA,3010
@@ -653,8 +654,8 @@ omlish/specs/jsonschema/schemas/draft202012/vocabularies/meta-data.json,sha256=j
 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=mIx7Askk3FNxGE1CDLBQUOOrRGYaqW7cPGVW4_nAFF4,187
-omlish/specs/openapi/marshal.py,sha256=XAKKmyuqVKw5y8RE8WlQFfNpmmX8tYIaKipmOWGmFwc,2101
-omlish/specs/openapi/openapi.py,sha256=y4h04jeB7ORJSVrcy7apaBdpwLjIyscv1Ub5SderH2c,12682
+omlish/specs/openapi/marshal.py,sha256=6CB2LCwFfU5rstqkgN_j4Z5rbnba2glzOxcSd01uffI,4451
+omlish/specs/openapi/openapi.py,sha256=6KGY_d8HOyG7ssHIWM40MCXgIMzNLiLKHYNggTSpAYM,12027
 omlish/specs/proto/Protobuf3.g4,sha256=chDrovFsuZaHf5W35WZNts3jOa1ssPwvWiJR4yVIgjw,5552
 omlish/specs/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/specs/proto/nodes.py,sha256=nwA6KyU9pZHLE9cO9dh46qTl6vfYJ8SjuUDlLBuoOms,776
@@ -857,9 +858,9 @@ omlish/typedvalues/holder.py,sha256=vu-umn-h1nvUqmtV5T9ZfQ_OoOYsERu8PhI2N48Ryns,
 omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0,4956
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev333.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev333.dist-info/METADATA,sha256=eG_IP0glYv3_nrLZkSatlDLoDZLzvPIG7okIfT8_P5Y,4416
-omlish-0.0.0.dev333.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev333.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev333.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev333.dist-info/RECORD,,
+omlish-0.0.0.dev335.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev335.dist-info/METADATA,sha256=iYf3Stk7331KK-5TJNBTAylpuR2OF5O3Lte6wAllk_4,4416
+omlish-0.0.0.dev335.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev335.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev335.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev335.dist-info/RECORD,,