omlish 0.0.0.dev249__py3-none-any.whl → 0.0.0.dev250__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev249'
-__revision__ = '0ad7e21d0ef610493354b1fbd22f7c3be5fc9bea'
+__version__ = '0.0.0.dev250'
+__revision__ = '0e6e1316b474c6f882784e2474e809a478c54732'
 
 
 #

omlish/lang/__init__.py

@@ -217,8 +217,8 @@ from .params import (  # noqa
     ParamSeparator,
     ParamSpec,
     PosOnlyParam,
-    ValueParam,
-    VariadicParam,
+    ValParam,
+    VarParam,
     param_render,
 )
 

omlish/lang/cached/function.py

@@ -24,7 +24,7 @@ from ..params import KwargsParam
 from ..params import Param
 from ..params import ParamSeparator
 from ..params import ParamSpec
-from ..params import ValueParam
+from ..params import ValParam
 from ..params import param_render
 
 
@@ -52,7 +52,7 @@ _PRE_MADE_CACHE_KEY_MAKERS = [
 
 
 _PRE_MADE_CACHE_KEY_MAKERS_BY_PARAM_SPEC: ta.Mapping[ParamSpec, CacheKeyMaker] = {
-    ParamSpec.of_signature(inspect.signature(fn)): fn  # type: ignore
+    ParamSpec.inspect(fn): fn  # type: ignore
     for fn in _PRE_MADE_CACHE_KEY_MAKERS
 }
 
@@ -68,8 +68,8 @@ def _make_unwrapped_cache_key_maker(
     if inspect.isgeneratorfunction(fn) or inspect.iscoroutinefunction(fn):
         raise TypeError(fn)
 
-    ps = ParamSpec.of_signature(
-        inspect.signature(fn),
+    ps = ParamSpec.inspect(
+        fn,
         offset=1 if bound else 0,
         strip_annotations=True,
     )
@@ -100,7 +100,7 @@ def _make_unwrapped_cache_key_maker(
         if not isinstance(p, Param):
             raise TypeError(p)
 
-        if isinstance(p, ValueParam) and p.default.present:
+        if isinstance(p, ValParam) and p.default.present:
             ns[p.name] = p.default
 
         src_params.append(param_render(

omlish/lang/params.py

@@ -21,10 +21,12 @@ T = ta.TypeVar('T')
 ##
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass(frozen=True, unsafe_hash=True)
 class Param(Sealed, Abstract):
     name: str
 
+    annotation: Maybe = empty()
+
     prefix: ta.ClassVar[str] = ''
 
     @property
@@ -35,18 +37,18 @@ class Param(Sealed, Abstract):
 #
 
 
-@dc.dataclass(frozen=True)
-class VariadicParam(Param, Abstract):
-    annotation: Maybe = empty()
+@dc.dataclass(frozen=True, unsafe_hash=True)
+class VarParam(Param, Abstract):
+    pass
 
 
-@dc.dataclass(frozen=True)
-class ArgsParam(VariadicParam, Final):
+@dc.dataclass(frozen=True, unsafe_hash=True)
+class ArgsParam(VarParam, Final):
     prefix: ta.ClassVar[str] = '*'
 
 
-@dc.dataclass(frozen=True)
-class KwargsParam(VariadicParam, Final):
+@dc.dataclass(frozen=True, unsafe_hash=True)
+class KwargsParam(VarParam, Final):
     prefix: ta.ClassVar[str] = '**'
 
 
@@ -54,18 +56,17 @@ class KwargsParam(VariadicParam, Final):
 
 
 @dc.dataclass(frozen=True, unsafe_hash=True)
-class ValueParam(Param):
+class ValParam(Param):
     default: Maybe = empty()
-    annotation: Maybe = empty()
 
 
 @dc.dataclass(frozen=True, unsafe_hash=True)
-class PosOnlyParam(ValueParam, Final):
+class PosOnlyParam(ValParam, Final):
     pass
 
 
 @dc.dataclass(frozen=True, unsafe_hash=True)
-class KwOnlyParam(ValueParam, Final):
+class KwOnlyParam(ValParam, Final):
     pass
 
 
@@ -95,8 +96,8 @@ class ParamSpec(ta.Sequence[Param], Final):
 
         self._hash: int | None = None
 
-        self._has_defaults: bool | None = None
         self._has_annotations: bool | None = None
+        self._has_defaults: bool | None = None
 
         self._with_seps: tuple[Param | ParamSeparator, ...] | None = None
 
@@ -108,8 +109,8 @@ class ParamSpec(ta.Sequence[Param], Final):
             sig: inspect.Signature,
             *,
             offset: int = 0,
-            strip_defaults: bool = False,
             strip_annotations: bool = False,
+            strip_defaults: bool = False,
     ) -> 'ParamSpec':
         ps: list[Param] = []
 
@@ -118,29 +119,40 @@ class ParamSpec(ta.Sequence[Param], Final):
             if i < offset:
                 continue
 
-            dfl = _inspect_empty_to_maybe(ip.default) if not strip_defaults else empty()
             ann = _inspect_empty_to_maybe(ip.annotation) if not strip_annotations else empty()
+            dfl = _inspect_empty_to_maybe(ip.default) if not strip_defaults else empty()
 
             if ip.kind == inspect.Parameter.POSITIONAL_ONLY:
-                ps.append(PosOnlyParam(ip.name, dfl, ann))
+                ps.append(PosOnlyParam(ip.name, ann, dfl))
 
             elif ip.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD:
-                ps.append(ValueParam(ip.name, dfl, ann))
+                ps.append(ValParam(ip.name, ann, dfl))
 
             elif ip.kind == inspect.Parameter.VAR_POSITIONAL:
-                ps.append(ArgsParam(ip.name))
-
-            elif ip.kind == inspect.Parameter.VAR_KEYWORD:
-                ps.append(KwargsParam(ip.name))
+                ps.append(ArgsParam(ip.name, ann))
 
             elif ip.kind == inspect.Parameter.KEYWORD_ONLY:
-                ps.append(KwOnlyParam(ip.name, dfl, ann))
+                ps.append(KwOnlyParam(ip.name, ann, dfl))
+
+            elif ip.kind == inspect.Parameter.VAR_KEYWORD:
+                ps.append(KwargsParam(ip.name, ann))
 
             else:
                 raise ValueError(ip.kind)
 
         return cls(*ps)
 
+    @classmethod
+    def inspect(
+            cls,
+            obj: ta.Any,
+            **kwargs: ta.Any,
+    ) -> 'ParamSpec':
+        return cls.of_signature(
+            inspect.signature(obj),
+            **kwargs,
+        )
+
     #
 
     def __repr__(self) -> str:
@@ -159,26 +171,26 @@ class ParamSpec(ta.Sequence[Param], Final):
 
     #
 
+    @property
+    def has_annotations(self) -> bool:
+        if (ha := self._has_annotations) is not None:
+            return ha
+        self._has_annotations = ha = any(
+            isinstance(p, (VarParam, ValParam)) and p.annotation.present
+            for p in self._ps
+        )
+        return ha
+
     @property
     def has_defaults(self) -> bool:
         if (hd := self._has_defaults) is not None:
             return hd
         self._has_defaults = hd = any(
-            isinstance(p, ValueParam) and p.default.present
+            isinstance(p, ValParam) and p.default.present
             for p in self._ps
         )
         return hd
 
-    @property
-    def has_annotations(self) -> bool:
-        if (ha := self._has_defaults) is not None:
-            return ha
-        self._has_annotations = ha = any(
-            isinstance(p, (VariadicParam, ValueParam)) and p.annotation.present
-            for p in self._ps
-        )
-        return ha
-
     #
 
     @property
@@ -228,22 +240,22 @@ class ParamSpec(ta.Sequence[Param], Final):
 def param_render(
         p: Param | ParamSeparator,
         *,
-        render_default: ta.Callable[[ta.Any], str] | None = None,
         render_annotation: ta.Callable[[ta.Any], str] | None = None,
+        render_default: ta.Callable[[ta.Any], str] | None = None,
 ) -> str:
     if isinstance(p, Param):
         dfl_s: str | None = None
-        if isinstance(p, ValueParam) and p.default.present:
-            if render_default is None:
-                raise ValueError(f'Param {p.name} has a default but no default renderer provided')
-            dfl_s = render_default(p.default.must())
-
         ann_s: str | None = None
-        if isinstance(p, (VariadicParam, ValueParam)) and p.annotation.present:
+        if isinstance(p, (VarParam, ValParam)) and p.annotation.present:
             if render_annotation is None:
                 raise ValueError(f'Param {p.name} has an annotation but no annotation renderer provided')
             ann_s = render_annotation(p.annotation.must())
 
+        if isinstance(p, ValParam) and p.default.present:
+            if render_default is None:
+                raise ValueError(f'Param {p.name} has a default but no default renderer provided')
+            dfl_s = render_default(p.default.must())
+
         if ann_s is not None:
             if dfl_s is not None:
                 return f'{p.name_with_prefix}: {ann_s} = {dfl_s}'

omlish/lang/resources.py

@@ -1,9 +1,19 @@
 import dataclasses as dc
 import functools
-import importlib.resources
 import os.path
 import typing as ta
 
+from .imports import proxy_import
+
+
+if ta.TYPE_CHECKING:
+    import importlib.resources as importlib_resources
+else:
+    importlib_resources = proxy_import('importlib.resources')
+
+
+##
+
 
 @dc.dataclass(frozen=True)
 class ReadableResource:
@@ -18,7 +28,7 @@ class ReadableResource:
 def get_package_resources(anchor: str) -> ta.Mapping[str, ReadableResource]:
     lst: list[ReadableResource] = []
 
-    for pf in importlib.resources.files(anchor).iterdir():
+    for pf in importlib_resources.files(anchor).iterdir():
         lst.append(ReadableResource(
             name=pf.name,
             is_file=pf.is_file(),
@@ -65,7 +75,7 @@ def get_relative_resources(
         if num_up:
             pkg_parts = pkg_parts[:-num_up]
         anchor = '.'.join([*pkg_parts, *path_parts])
-        for pf in importlib.resources.files(anchor).iterdir():
+        for pf in importlib_resources.files(anchor).iterdir():
             lst.append(ReadableResource(
                 name=pf.name,
                 is_file=pf.is_file(),

{omlish-0.0.0.dev249.dist-info → omlish-0.0.0.dev250.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev249
+Version: 0.0.0.dev250
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev249.dist-info → omlish-0.0.0.dev250.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=x26AIwDzScUvnX-p4xlq6Zc5QYrAo0Vmgf1qHc1KL_M,8253
-omlish/__about__.py,sha256=PjdfPdJQSIUlnk8M2lh4cIvBDuBsym-PBbz4Y6tueh4,3380
+omlish/__about__.py,sha256=LCIKYHw0FYdPvCdmhqyF7FaJsL17sOU3m3dX5HFBUbg,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -400,7 +400,7 @@ omlish/iterators/iterators.py,sha256=iTQQwBE6Wzoy36dnbPIws17zbjE3zNN4KwVw4Fzh-gY
 omlish/iterators/recipes.py,sha256=53mkexitMhkwXQZbL6DrhpT0WePQ_56uXd5Jaw3DfzI,467
 omlish/iterators/tools.py,sha256=Pi4ybXytUXVZ3xwK89xpPImQfYYId9p1vIFQvVqVLqA,2551
 omlish/iterators/unique.py,sha256=0jAX3kwzVfRNhe0Tmh7kVP_Q2WBIn8POo_O-rgFV0rQ,1390
-omlish/lang/__init__.py,sha256=Az9r0956Gc4tdqdrkQholNkiR5W4lMazHILuHGupig0,4899
+omlish/lang/__init__.py,sha256=TKxKq0L7Q34kdV0_UcxC81Umx64Uz_TPUgH6cy7Uzck,4892
 omlish/lang/attrs.py,sha256=fofCKN0X8TMu1yGqHpLpNLih9r9HWl3D3Vn3b6O791w,3891
 omlish/lang/clsdct.py,sha256=sJYadm-fwzti-gsi98knR5qQUxriBmOqQE_qz3RopNk,1743
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
@@ -415,14 +415,14 @@ omlish/lang/imports.py,sha256=Gdl6xCF89xiMOE1yDmdvKWamLq8HX-XPianO58Jdpmw,9218
 omlish/lang/iterables.py,sha256=HOjcxOwyI5bBApDLsxRAGGhTTmw7fdZl2kEckxRVl-0,1994
 omlish/lang/maybes.py,sha256=dAgrUoAhCgyrHRqa73CkaGnpXwGc-o9n-NIThrNXnbU,3416
 omlish/lang/objects.py,sha256=65XsD7UtblRdNe2ID1-brn_QvRkJhBIk5nyZWcQNeqU,4574
-omlish/lang/params.py,sha256=ojzyfao5e8tdBjJD57WWlipfh-5PV4Y0bLAcniflCRU,6436
+omlish/lang/params.py,sha256=AaUHI59qBLV7I-q1qPIEPTKGvgXzSRsmkNR2jTma5ZY,6688
 omlish/lang/resolving.py,sha256=OuN2mDTPNyBUbcrswtvFKtj4xgH4H4WglgqSKv3MTy0,1606
-omlish/lang/resources.py,sha256=N64KeVE-rYMxqBBRp91qzgVqpOVR2uX7k1WlS_bo5hM,2681
+omlish/lang/resources.py,sha256=WKkAddC3ctMK1bvGw-elGe8ZxAj2IaUTKVSu2nfgHTo,2839
 omlish/lang/strings.py,sha256=egdv8PxLNG40-5V93agP5j2rBUDIsahCx048zV7uEbU,4690
 omlish/lang/sys.py,sha256=UoZz_PJYVKLQAKqYxxn-LHz1okK_38I__maZgnXMcxU,406
 omlish/lang/typing.py,sha256=Zdad9Zv0sa-hIaUXPrzPidT7sDVpRcussAI7D-j-I1c,3296
 omlish/lang/cached/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/lang/cached/function.py,sha256=00ChRDuDv3n6IRYTumKz7d-nA5pVzTHAWlaZfopeyQw,9240
+omlish/lang/cached/function.py,sha256=3AeTVfpzovMMWbnjFuT5mM7kT1dBuk7fa66FOJKikYw,9188
 omlish/lang/cached/property.py,sha256=kzbao_35PlszdK_9oJBWrMmFFlVK_Xhx7YczHhTJ6cc,2764
 omlish/lang/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/lang/classes/abstract.py,sha256=bIcuAetV_aChhpSURypmjjcqP07xi20uVYPKh1kvQNU,3710
@@ -735,9 +735,9 @@ omlish/text/mangle.py,sha256=kfzFLfvepH-chl1P89_mdc5vC4FSqyPA2aVtgzuB8IY,1133
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=JkNZpyR2tv2CNcTaWJJhpQ9E4F0yPR8P_YfDbZfMtwQ,6182
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev249.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev249.dist-info/METADATA,sha256=3WFq8RmEWWOgGChudW07i3DErPgEqz2rPmH343HgkYo,4176
-omlish-0.0.0.dev249.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-omlish-0.0.0.dev249.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev249.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev249.dist-info/RECORD,,
+omlish-0.0.0.dev250.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev250.dist-info/METADATA,sha256=I94K5DI1DH2JEs5HA15SkuwlyDsnTF5PYIeSr5rKrGo,4176
+omlish-0.0.0.dev250.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+omlish-0.0.0.dev250.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev250.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev250.dist-info/RECORD,,