omlish 0.0.0.dev364__tar.gz → 0.0.0.dev366__tar.gz

{omlish-0.0.0.dev364/omlish.egg-info → omlish-0.0.0.dev366}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev364
+Version: 0.0.0.dev366
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -25,7 +25,7 @@ Requires-Dist: brotli~=1.1; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.2; extra == "all"
 Requires-Dist: psutil~=7.0; extra == "all"
-Requires-Dist: orjson~=3.10; extra == "all"
+Requires-Dist: orjson~=3.11; extra == "all"
 Requires-Dist: ujson~=5.10; extra == "all"
 Requires-Dist: pyyaml~=6.0; extra == "all"
 Requires-Dist: cbor2~=5.6; extra == "all"
@@ -49,7 +49,7 @@ Requires-Dist: anyio~=4.9; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.2; extra == "all"
-Requires-Dist: orjson~=3.10; extra == "all"
+Requires-Dist: orjson~=3.11; extra == "all"
 Requires-Dist: pyyaml~=6.0; extra == "all"
 Requires-Dist: wrapt~=1.17; extra == "all"
 Provides-Extra: async
@@ -68,7 +68,7 @@ Requires-Dist: asttokens~=3.0; extra == "diag"
 Requires-Dist: executing~=2.2; extra == "diag"
 Requires-Dist: psutil~=7.0; extra == "diag"
 Provides-Extra: formats
-Requires-Dist: orjson~=3.10; extra == "formats"
+Requires-Dist: orjson~=3.11; extra == "formats"
 Requires-Dist: ujson~=5.10; extra == "formats"
 Requires-Dist: pyyaml~=6.0; extra == "formats"
 Requires-Dist: cbor2~=5.6; extra == "formats"
@@ -100,7 +100,7 @@ Requires-Dist: anyio~=4.9; extra == "plus"
 Requires-Dist: sniffio~=1.3; extra == "plus"
 Requires-Dist: asttokens~=3.0; extra == "plus"
 Requires-Dist: executing~=2.2; extra == "plus"
-Requires-Dist: orjson~=3.10; extra == "plus"
+Requires-Dist: orjson~=3.11; extra == "plus"
 Requires-Dist: pyyaml~=6.0; extra == "plus"
 Requires-Dist: wrapt~=1.17; extra == "plus"
 Dynamic: license-file

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev364'
-__revision__ = 'efbc21858b1c3354b55f4666e435a1bd79b1a23a'
+__version__ = '0.0.0.dev366'
+__revision__ = 'c55c3c03ccdc096a29316198acb1ecaa50da5814'
 
 
 #
@@ -60,7 +60,7 @@ class Project(ProjectBase):
         ],
 
         'formats': [
-            'orjson ~= 3.10',
+            'orjson ~= 3.11',
             'ujson ~= 5.10',
 
             'pyyaml ~= 6.0',

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366}/omlish/manifests/load.py

@@ -9,6 +9,7 @@ TODO:
 import dataclasses as dc
 import importlib.machinery
 import importlib.resources
+import importlib.util
 import json
 import os.path
 import threading
@@ -121,18 +122,40 @@ class ManifestLoader:
 
     #
 
+    def _read_pkg_file_text(self, pkg_name: str, file_name: str) -> ta.Optional[str]:
+        # importlib.resources.files actually imports the package - to avoid this, if possible, the file is read straight
+        # off the filesystem.
+        spec = importlib.util.find_spec(pkg_name)
+        if (
+                spec is not None and
+                isinstance(spec.loader, importlib.machinery.SourceFileLoader) and
+                spec.origin is not None and
+                os.path.basename(spec.origin) == '__init__.py' and
+                os.path.isfile(spec.origin)
+        ):
+            file_path = os.path.join(os.path.dirname(spec.origin), file_name)
+            if os.path.isfile(file_path):
+                with open(file_path, encoding='utf-8') as f:
+                    return f.read()
+
+        t = importlib.resources.files(pkg_name).joinpath(file_name)
+        if not t.is_file():
+            return None
+        return t.read_text('utf-8')
+
+    MANIFESTS_FILE_NAME: ta.ClassVar[str] = '.manifests.json'
+
     def _load_raw(self, pkg_name: str) -> ta.Optional[ta.Sequence[Manifest]]:
         try:
             return self._raw_cache[pkg_name]
         except KeyError:
             pass
 
-        t = importlib.resources.files(pkg_name).joinpath('.manifests.json')
-        if not t.is_file():
+        src = self._read_pkg_file_text(pkg_name, self.MANIFESTS_FILE_NAME)
+        if src is None:
             self._raw_cache[pkg_name] = None
             return None
 
-        src = t.read_text('utf-8')
         obj = json.loads(src)
         if not isinstance(obj, (list, tuple)):
             raise TypeError(obj)

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366}/omlish/metadata.py

@@ -91,7 +91,15 @@ def append_object_metadata(obj: T, *mds: ObjectMetadata) -> T:
     return obj
 
 
-def get_object_metadata(obj: ta.Any, *, strict: bool = False) -> ta.Sequence[ObjectMetadata]:
+_type = type
+
+
+def get_object_metadata(
+        obj: ta.Any,
+        *,
+        strict: bool = False,
+        type: ta.Type | tuple[ta.Type, ...] | None = None,  # noqa
+) -> ta.Sequence[ObjectMetadata]:
     try:
         tgt = _unwrap_object_metadata_target(obj)
     except ObjectMetadataTargetTypeError:
@@ -104,7 +112,12 @@ def get_object_metadata(obj: ta.Any, *, strict: bool = False) -> ta.Sequence[Obj
     except AttributeError:
         return ()
 
-    return dct.get(_OBJECT_METADATA_ATTR, ())
+    ret = dct.get(_OBJECT_METADATA_ATTR, ())
+
+    if type is not None:
+        ret = [o for o in ret if isinstance(o, type)]
+
+    return ret
 
 
 ##

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366}/omlish/os/paths.py

@@ -7,6 +7,31 @@ import typing as ta
 ##
 
 
+@ta.overload
+def path_dirname(p: str, n: int = 1) -> str:
+    ...
+
+
+@ta.overload
+def path_dirname(p: bytes, n: int = 1) -> bytes:
+    ...
+
+
+def path_dirname(p, n=1):
+    if isinstance(p, bytes):
+        sep: ta.Any = b'/'
+    else:
+        sep = '/'
+    p = os.fspath(p)
+    i = -1
+    for _ in range(n):
+        i = p.rindex(sep, 0, i)
+    head = p[:i + 1]
+    if head and head != sep * len(head):
+        head = head.rstrip(sep)
+    return head
+
+
 def abs_real_path(p: str) -> str:
     return os.path.abspath(os.path.realpath(p))
 

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366}/omlish/term/confirm.py

@@ -15,6 +15,9 @@ def confirm_action(
         stdin = sys.stdin
     if not stdin.isatty():
         raise OSError(f'stdin {stdin!r} is not a tty')
+    # FIXME: we want to make sure we only run on a tty, but we als want input()'s readline goodies..
+    if stdin is not sys.stdin:
+        raise RuntimeError('Unsupported stdin')
 
     if stdout is None:
         stdout = sys.stdout
@@ -37,4 +40,4 @@ def confirm_action(
         elif c == 'n':
             return False
         else:
-            print("Please enter 'y' for yes or 'n' for no.")
+            print("Please enter 'y' for yes or 'n' for no.", file=stdout)

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366}/omlish/text/templating.py

@@ -1,6 +1,7 @@
 """
 TODO:
  - find_vars
+ - some kind of EnvKey / EnvMarker(lang.Marker), namespace-able env keys - but how to weave these into tmpl srcs?
 """
 import abc
 import dataclasses as dc
@@ -23,6 +24,11 @@ else:
 
 
 class Templater(lang.Abstract):
+    """
+    This is named a 'templatER', not 'template', because it probably refers to a bigger thing itself called a
+    'template' (like a `jinja2.Template`).
+    """
+
     @dc.dataclass(frozen=True)
     class Context:
         env: ta.Mapping[str, ta.Any] | None = None

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev364
+Version: 0.0.0.dev366
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -25,7 +25,7 @@ Requires-Dist: brotli~=1.1; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.2; extra == "all"
 Requires-Dist: psutil~=7.0; extra == "all"
-Requires-Dist: orjson~=3.10; extra == "all"
+Requires-Dist: orjson~=3.11; extra == "all"
 Requires-Dist: ujson~=5.10; extra == "all"
 Requires-Dist: pyyaml~=6.0; extra == "all"
 Requires-Dist: cbor2~=5.6; extra == "all"
@@ -49,7 +49,7 @@ Requires-Dist: anyio~=4.9; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.2; extra == "all"
-Requires-Dist: orjson~=3.10; extra == "all"
+Requires-Dist: orjson~=3.11; extra == "all"
 Requires-Dist: pyyaml~=6.0; extra == "all"
 Requires-Dist: wrapt~=1.17; extra == "all"
 Provides-Extra: async
@@ -68,7 +68,7 @@ Requires-Dist: asttokens~=3.0; extra == "diag"
 Requires-Dist: executing~=2.2; extra == "diag"
 Requires-Dist: psutil~=7.0; extra == "diag"
 Provides-Extra: formats
-Requires-Dist: orjson~=3.10; extra == "formats"
+Requires-Dist: orjson~=3.11; extra == "formats"
 Requires-Dist: ujson~=5.10; extra == "formats"
 Requires-Dist: pyyaml~=6.0; extra == "formats"
 Requires-Dist: cbor2~=5.6; extra == "formats"
@@ -100,7 +100,7 @@ Requires-Dist: anyio~=4.9; extra == "plus"
 Requires-Dist: sniffio~=1.3; extra == "plus"
 Requires-Dist: asttokens~=3.0; extra == "plus"
 Requires-Dist: executing~=2.2; extra == "plus"
-Requires-Dist: orjson~=3.10; extra == "plus"
+Requires-Dist: orjson~=3.11; extra == "plus"
 Requires-Dist: pyyaml~=6.0; extra == "plus"
 Requires-Dist: wrapt~=1.17; extra == "plus"
 Dynamic: license-file

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366}/omlish.egg-info/requires.txt

@@ -12,7 +12,7 @@ brotli~=1.1
 asttokens~=3.0
 executing~=2.2
 psutil~=7.0
-orjson~=3.10
+orjson~=3.11
 ujson~=5.10
 pyyaml~=6.0
 cbor2~=5.6
@@ -52,7 +52,7 @@ executing~=2.2
 psutil~=7.0
 
 [formats]
-orjson~=3.10
+orjson~=3.11
 ujson~=5.10
 pyyaml~=6.0
 cbor2~=5.6
@@ -69,7 +69,7 @@ anyio~=4.9
 sniffio~=1.3
 asttokens~=3.0
 executing~=2.2
-orjson~=3.10
+orjson~=3.11
 pyyaml~=6.0
 wrapt~=1.17
 

{omlish-0.0.0.dev364 → omlish-0.0.0.dev366}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.13'
-version = '0.0.0.dev364'
+version = '0.0.0.dev366'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -36,7 +36,7 @@ all = [
     'asttokens ~= 3.0',
     'executing ~= 2.2',
     'psutil ~= 7.0',
-    'orjson ~= 3.10',
+    'orjson ~= 3.11',
     'ujson ~= 5.10',
     'pyyaml ~= 6.0',
     'cbor2 ~= 5.6',
@@ -60,7 +60,7 @@ all = [
     'sniffio ~= 1.3',
     'asttokens ~= 3.0',
     'executing ~= 2.2',
-    'orjson ~= 3.10',
+    'orjson ~= 3.11',
     'pyyaml ~= 6.0',
     'wrapt ~= 1.17',
 ]
@@ -83,7 +83,7 @@ diag = [
     'psutil ~= 7.0',
 ]
 formats = [
-    'orjson ~= 3.10',
+    'orjson ~= 3.11',
     'ujson ~= 5.10',
     'pyyaml ~= 6.0',
     'cbor2 ~= 5.6',
@@ -123,7 +123,7 @@ plus = [
     'sniffio ~= 1.3',
     'asttokens ~= 3.0',
     'executing ~= 2.2',
-    'orjson ~= 3.10',
+    'orjson ~= 3.11',
     'pyyaml ~= 6.0',
     'wrapt ~= 1.17',
 ]