omlish 0.0.0.dev171__py3-none-any.whl → 0.0.0.dev173__py3-none-any.whl

omlish/.manifests.json

@@ -121,6 +121,20 @@
       }
     }
   },
+  {
+    "module": ".formats.repr",
+    "attr": "_REPR_LAZY_CODEC",
+    "file": "omlish/formats/repr.py",
+    "line": 24,
+    "value": {
+      "$.codecs.base.LazyLoadedCodec": {
+        "mod_name": "omlish.formats.repr",
+        "attr_name": "REPR_CODEC",
+        "name": "repr",
+        "aliases": null
+      }
+    }
+  },
   {
     "module": ".formats.toml",
     "attr": "_TOML_LAZY_CODEC",

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev171'
-__revision__ = '6786ad234e8dbeece3f1696fe7170f730b9ab11e'
+__version__ = '0.0.0.dev173'
+__revision__ = 'af782a809468cfc82da86cb06197a69f7e749145'
 
 
 #

omlish/formats/repr.py

@@ -0,0 +1,25 @@
+import ast
+import typing as ta
+
+from .codecs import make_object_lazy_loaded_codec
+from .codecs import make_str_object_codec
+
+
+##
+
+
+def dumps(obj: ta.Any) -> str:
+    return repr(obj)
+
+
+def loads(s: str) -> ta.Any:
+    return ast.literal_eval(s)
+
+
+##
+
+
+REPR_CODEC = make_str_object_codec('repr', dumps, loads)
+
+# @omlish-manifest
+_REPR_LAZY_CODEC = make_object_lazy_loaded_codec(__name__, 'REPR_CODEC', REPR_CODEC)

omlish/lite/dataclasses.py

@@ -1,5 +1,6 @@
 # ruff: noqa: UP006 UP007
 import dataclasses as dc
+import typing as ta
 
 
 def dataclass_cache_hash(
@@ -30,3 +31,12 @@ def dataclass_cache_hash(
         return cls
 
     return inner
+
+
+def dataclass_maybe_post_init(sup: ta.Any) -> bool:
+    try:
+        fn = sup.__post_init__
+    except AttributeError:
+        return False
+    fn()
+    return True

omlish/reflect/__init__.py

@@ -28,9 +28,11 @@ from .types import (  # noqa
     DEFAULT_REFLECTOR,
     Generic,
     NewType,
+    ReflectTypeError,
     Reflector,
     TYPES,
     Type,
+    TypeInfo,
     Union,
     get_newtype_supertype,
     get_orig_bases,

omlish/reflect/subst.py

@@ -8,6 +8,7 @@ from .ops import get_concrete_type
 from .ops import to_annotation
 from .types import Any
 from .types import Generic
+from .types import Literal
 from .types import NewType
 from .types import Type
 from .types import Union
@@ -35,7 +36,7 @@ def replace_type_vars(
         update_aliases: bool = False,
 ) -> Type:
     def rec(cur):
-        if isinstance(cur, (type, NewType, Any)):
+        if isinstance(cur, (type, NewType, Any, Literal)):
             return cur
 
         if isinstance(cur, Generic):

omlish/reflect/types.py

@@ -7,6 +7,7 @@ TODO:
  - cache this shit, esp generic_mro shit
   - cache __hash__ in Generic/Union
 """
+import abc
 import dataclasses as dc
 import types
 import typing as ta
@@ -17,11 +18,12 @@ _NoneType = types.NoneType  # type: ignore
 _NONE_TYPE_FROZENSET: frozenset['Type'] = frozenset([_NoneType])
 
 
-_GenericAlias = ta._GenericAlias  # type: ignore  # noqa
+_AnnotatedAlias = ta._AnnotatedAlias  # type: ignore  # noqa
 _CallableGenericAlias = ta._CallableGenericAlias  # type: ignore  # noqa
+_GenericAlias = ta._GenericAlias  # type: ignore  # noqa
+_LiteralGenericAlias = ta._LiteralGenericAlias  # type: ignore  # noqa
 _SpecialGenericAlias = ta._SpecialGenericAlias  # type: ignore  # noqa
 _UnionGenericAlias = ta._UnionGenericAlias   # type: ignore  # noqa
-_AnnotatedAlias = ta._AnnotatedAlias  # type: ignore  # noqa
 
 
 ##
@@ -116,19 +118,29 @@ def get_newtype_supertype(obj: ta.Any) -> ta.Any:
 ##
 
 
-Type: ta.TypeAlias = ta.Union[
+class TypeInfo(abc.ABC):  # noqa
+    pass
+
+
+Type: ta.TypeAlias = ta.Union[  # noqa
     type,
     ta.TypeVar,
-    'Union',
-    'Generic',
-    'NewType',
-    'Annotated',
-    'Any',
+    TypeInfo,
 ]
 
 
+TYPES: tuple[type, ...] = (
+    type,
+    ta.TypeVar,
+    TypeInfo,
+)
+
+
+##
+
+
 @dc.dataclass(frozen=True)
-class Union:
+class Union(TypeInfo):
     args: frozenset[Type]
 
     @property
@@ -144,8 +156,11 @@ class Union:
         return Union(rem)
 
 
+#
+
+
 @dc.dataclass(frozen=True)
-class Generic:
+class Generic(TypeInfo):
     cls: type
     args: tuple[Type, ...]                                                # map[int, V] = (int, V) | map[T, T] = (T, T)
 
@@ -167,39 +182,51 @@ class Generic:
         )
 
 
+#
+
+
 @dc.dataclass(frozen=True)
-class NewType:
+class NewType(TypeInfo):
     obj: ta.Any
     ty: Type
 
 
+#
+
+
 @dc.dataclass(frozen=True)
-class Annotated:
+class Annotated(TypeInfo):
     ty: Type
     md: ta.Sequence[ta.Any]
 
     obj: ta.Any = dc.field(compare=False, repr=False)
 
 
-class Any:
+#
+
+
+@dc.dataclass(frozen=True)
+class Literal(TypeInfo):
+    args: tuple[ta.Any, ...]
+
+    obj: ta.Any = dc.field(compare=False, repr=False)
+
+
+#
+
+
+class Any(TypeInfo):
     pass
 
 
 ANY = Any()
 
 
-TYPES: tuple[type, ...] = (
-    type,
-    ta.TypeVar,
-    Union,
-    Generic,
-    NewType,
-    Annotated,
-    Any,
-)
+##
 
 
-##
+class ReflectTypeError(TypeError):
+    pass
 
 
 class Reflector:
@@ -212,57 +239,80 @@ class Reflector:
 
         self._override = override
 
+    #
+
     def is_type(self, obj: ta.Any) -> bool:
-        if isinstance(obj, (Union, Generic, ta.TypeVar, NewType, Any)):  # noqa
+        try:
+            self._type(obj, check_only=True)
+        except ReflectTypeError:
+            return False
+        else:
             return True
 
-        oty = type(obj)
-
-        return (
-                oty is _UnionGenericAlias or oty is types.UnionType or  # noqa
-
-                isinstance(obj, ta.NewType) or  # noqa
-
-                (
-                    is_simple_generic_alias_type(oty) or
-                    oty is _CallableGenericAlias
-                ) or
+    def type(self, obj: ta.Any) -> Type:
+        if (ty := self._type(obj, check_only=False)) is None:
+            raise RuntimeError(obj)
+        return ty
 
-                isinstance(obj, type) or
+    #
 
-                isinstance(obj, _SpecialGenericAlias)
-        )
+    def _type(self, obj: ta.Any, *, check_only: bool) -> Type | None:
+        ##
+        # Overrides beat everything
 
-    def type(self, obj: ta.Any) -> Type:
         if self._override is not None:
             if (ovr := self._override(obj)) is not None:
                 return ovr
 
+        ##
+        # Any
+
         if obj is ta.Any:
             return ANY
 
-        if isinstance(obj, (Union, Generic, ta.TypeVar, NewType, Any)):  # noqa
+        ##
+        # Already a Type?
+
+        if isinstance(obj, (ta.TypeVar, TypeInfo)):  # noqa
             return obj
 
         oty = type(obj)
 
+        ##
+        # Union
+
         if oty is _UnionGenericAlias or oty is types.UnionType:
+            if check_only:
+                return None
+
             return Union(frozenset(self.type(a) for a in ta.get_args(obj)))
 
+        ##
+        # NewType
+
         if isinstance(obj, ta.NewType):  # noqa
+            if check_only:
+                return None
+
             return NewType(obj, get_newtype_supertype(obj))
 
+        ##
+        # Simple Generic
+
         if (
                 is_simple_generic_alias_type(oty) or
                 oty is _CallableGenericAlias
         ):
+            if check_only:
+                return None
+
             origin = ta.get_origin(obj)
             args = ta.get_args(obj)
 
             if oty is _CallableGenericAlias:
                 p, r = args
                 if p is Ellipsis or isinstance(p, ta.ParamSpec):
-                    raise TypeError(f'Callable argument not yet supported for {obj=}')
+                    raise ReflectTypeError(f'Callable argument not yet supported for {obj=}')
                 args = (*p, r)
                 params = _KNOWN_SPECIAL_TYPE_VARS[:len(args)]
 
@@ -276,7 +326,7 @@ class Reflector:
                 params = get_params(origin)
 
             if len(args) != len(params):
-                raise TypeError(f'Mismatched {args=} and {params=} for {obj=}')
+                raise ReflectTypeError(f'Mismatched {args=} and {params=} for {obj=}')
 
             return Generic(
                 origin,
@@ -285,7 +335,13 @@ class Reflector:
                 obj,
             )
 
+        ##
+        # Full Generic
+
         if isinstance(obj, type):
+            if check_only:
+                return None
+
             if issubclass(obj, ta.Generic):  # type: ignore
                 params = get_params(obj)
                 if params:
@@ -295,12 +351,20 @@ class Reflector:
                         params,
                         obj,
                     )
+
             return obj
 
+        ##
+        # Special Generic
+
         if isinstance(obj, _SpecialGenericAlias):
             if (ks := _KNOWN_SPECIALS_BY_ALIAS.get(obj)) is not None:
+                if check_only:
+                    return None
+
                 if (np := ks.nparams) < 0:
-                    raise TypeError(obj)
+                    raise ReflectTypeError(obj)
+
                 params = _KNOWN_SPECIAL_TYPE_VARS[:np]
                 return Generic(
                     ks.origin,
@@ -309,11 +373,29 @@ class Reflector:
                     obj,
                 )
 
+        ##
+        # Annotated
+
         if isinstance(obj, _AnnotatedAlias):
+            if check_only:
+                return None
+
             o = ta.get_args(obj)[0]
             return Annotated(self.type(o), md=obj.__metadata__, obj=obj)
 
-        raise TypeError(obj)
+        ##
+        # Literal
+
+        if isinstance(obj, _LiteralGenericAlias):
+            if check_only:
+                return None
+
+            return Literal(ta.get_args(obj), obj=obj)
+
+        ##
+        # Failure
+
+        raise ReflectTypeError(obj)
 
 
 DEFAULT_REFLECTOR = Reflector()

{omlish-0.0.0.dev171.dist-info → omlish-0.0.0.dev173.dist-info}/METADATA

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

{omlish-0.0.0.dev171.dist-info → omlish-0.0.0.dev173.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omlish/.manifests.json,sha256=0BnQGD2dcXEma0Jop2ZesvDNzSj3CAJBNq8aTGuBz9A,7276
-omlish/__about__.py,sha256=Rj036_D8dtLJRoGHG3dkHa3mPBqKH30N9NF-eVEPdbk,3409
+omlish/.manifests.json,sha256=lRkBDFxlAbf6lN5upo3WSf-owW8YG1T21dfpbQL-XHM,7598
+omlish/__about__.py,sha256=lwpg2kAkCyobGpYChlHlrlHiyjWU48sngnP5x3kz8J8,3409
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -217,6 +217,7 @@ omlish/formats/dotenv.py,sha256=qoDG4Ayu7B-8LjBBhcmNiLZW0_9LgCi3Ri2aPo9DEQ8,1931
 omlish/formats/json5.py,sha256=odpZIShlUpv19aACWe58SoMPcv0AHKIa6zSMjlKgaMI,515
 omlish/formats/pickle.py,sha256=jdp4E9WH9qVPBE3sSqbqDtUo18RbTSIiSpSzJ-IEVZw,529
 omlish/formats/props.py,sha256=cek3JLFLIrpE76gvs8rs_B8yF4SpY8ooDH8apWsquwE,18953
+omlish/formats/repr.py,sha256=kYrNs4o-ji8nOdp6u_L3aMgBMWN1ZAZJSAWgQQfStSQ,414
 omlish/formats/toml.py,sha256=AhpVNAy87eBohBCsvIvwH2ucASWxnWXMEsMH8zB7rpI,340
 omlish/formats/xml.py,sha256=ggiOwSERt4d9XmZwLZiDIh5qnFJS4jdmow9m9_9USps,1491
 omlish/formats/yaml.py,sha256=ffOwGnLA6chdiFyaS7X0TBMGmHG9AoGudzKVWfQ1UOs,7389
@@ -377,7 +378,7 @@ omlish/lite/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omlish/lite/cached.py,sha256=O7ozcoDNFm1Hg2wtpHEqYSp_i_nCLNOP6Ueq_Uk-7mU,1300
 omlish/lite/check.py,sha256=0PD-GKtaDqDX6jU5KbzbMvH-vl6jH82xgYfplmfTQkg,12941
 omlish/lite/contextmanagers.py,sha256=m9JO--p7L7mSl4cycXysH-1AO27weDKjP3DZG61cwwM,1683
-omlish/lite/dataclasses.py,sha256=gpEim20a_qRnK18WUipEcAFq4Hn1S0u0SpanbfZ8LWQ,848
+omlish/lite/dataclasses.py,sha256=M6UD4VwGo0Ky7RNzKWbO0IOy7iBZVCIbTiC6EYbFnX8,1035
 omlish/lite/inject.py,sha256=EEaioN9ESAveVCMe2s5osjwI97FPRUVoU8P95vGUiYo,23376
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
@@ -451,11 +452,11 @@ omlish/os/linux.py,sha256=whJ6scwMKSFBdXiVhJW0BCpJV4jOGMr-a_a3Bhwz6Ls,18938
 omlish/os/paths.py,sha256=hqPiyg_eYaRoIVPdAeX4oeLEV4Kpln_XsH0tHvbOf8Q,844
 omlish/os/pidfile.py,sha256=S4Nbe00oSxckY0qCC9AeTEZe7NSw4eJudnQX7wCXzks,1738
 omlish/os/sizes.py,sha256=ohkALLvqSqBX4iR-7DMKJ4pfOCRdZXV8htH4QywUNM0,152
-omlish/reflect/__init__.py,sha256=4-EuCSX1qpEWfScCFzAJv_XghHFu4cXxpxKeBKrosQ4,720
+omlish/reflect/__init__.py,sha256=5TAeB3SoPR8MgnkdyVMHpAoTtlQX0BWpQYV0yDaECuM,756
 omlish/reflect/inspect.py,sha256=veJ424-9oZrqyvhVpvxOi7hcKW-PDBkdYL2yjrFlk4o,495
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
-omlish/reflect/subst.py,sha256=JM2RGv2-Rcex8wCqhmgvRG59zD242P9jM3O2QLjKWWo,3586
-omlish/reflect/types.py,sha256=B1zbq3yHo6B5JeNOXbmaxm78kqZTRb_4jIWY5GxzY4Q,8155
+omlish/reflect/subst.py,sha256=g3q7NmNWsmc67mcchmCE3WFPCMDSBq-FXn4ah-DWL_U,3622
+omlish/reflect/types.py,sha256=lYxK_hlC4kVDMKeDYJp0mymSth21quwuFAMAEFBznyE,9151
 omlish/secrets/__init__.py,sha256=SGB1KrlNrxlNpazEHYy95NTzteLi8ndoEgMhU7luBl8,420
 omlish/secrets/crypto.py,sha256=6CsLy0UEqCrBK8Xx_3-iFF6SKtu2GlEqUQ8-MliY3tk,3709
 omlish/secrets/marshal.py,sha256=U9uSRTWzZmumfNZeh_dROwVdGrARsp155TylRbjilP8,2048
@@ -568,9 +569,9 @@ omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,329
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev171.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev171.dist-info/METADATA,sha256=0hYDFnaM-AGoyj3RuGe2-D1Woeusff6QLA9SD-xoR74,4264
-omlish-0.0.0.dev171.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omlish-0.0.0.dev171.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev171.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev171.dist-info/RECORD,,
+omlish-0.0.0.dev173.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev173.dist-info/METADATA,sha256=aPEQU46sbHnNUIeFdMJpzGlI3UPn_pJED6zSN3odpiw,4264
+omlish-0.0.0.dev173.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omlish-0.0.0.dev173.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev173.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev173.dist-info/RECORD,,