omlish 0.0.0.dev249__tar.gz → 0.0.0.dev250__tar.gz

{omlish-0.0.0.dev249/omlish.egg-info → omlish-0.0.0.dev250}/PKG-INFO

@@ -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 → omlish-0.0.0.dev250}/omlish/__about__.py

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

{omlish-0.0.0.dev249 → omlish-0.0.0.dev250}/omlish/lang/__init__.py

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

{omlish-0.0.0.dev249 → omlish-0.0.0.dev250}/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-0.0.0.dev249 → omlish-0.0.0.dev250}/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-0.0.0.dev249 → omlish-0.0.0.dev250}/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 → omlish-0.0.0.dev250/omlish.egg-info}/PKG-INFO

@@ -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 → omlish-0.0.0.dev250}/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.dev249'
+version = '0.0.0.dev250'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',