omlish 0.0.0.dev364__py3-none-any.whl → 0.0.0.dev366__py3-none-any.whl

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/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/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/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/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/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.dist-info → omlish-0.0.0.dev366.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev366.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=jPad_LyUf2h4QZmz7cjzDxV8N2Q7ba3FdRz1o5SXyK0,3478
+omlish/__about__.py,sha256=yGFVJ5HaFgcShdvs7RHmReyCjUqPpQc1naBG93xR4oU,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
@@ -8,7 +8,7 @@ omlish/datetimes.py,sha256=7dh4aiVRWXWECH3JLF8kkRbgJ1qyGlAlQVp1vCXdTBE,2168
 omlish/defs.py,sha256=-4UuZoJUUNO_bZ6eSSdhR4CK4NKN2Wwr1FfUvfTF--8,4918
 omlish/dynamic.py,sha256=zy0oO70_Vlh5dW8Nwav_O9bhIzQ6L16UgSuKR6y43VU,6526
 omlish/libc.py,sha256=mNY2FWZ2BjSucOx5TEW8IP_B5n84tVZWuVPL3Z3sUH8,15644
-omlish/metadata.py,sha256=-noAyXT-7wV0SXul6wV1fPe7EYKxluuuYh1VmM39IPk,3593
+omlish/metadata.py,sha256=l_GGk0g_GkxltQYNDr-P9TTtvIggkdFtnfIffYtaieQ,3797
 omlish/runmodule.py,sha256=vQ9VZN_c3sQX9rj036dW9lXuMWTjGOfWnwDcWTSWnn0,705
 omlish/shlex.py,sha256=rlbgHWxjwpkCBRphOPqSIN_KD6qWJMLldNJUILulKT0,253
 omlish/sync.py,sha256=-2gVJZFl8hvp7jvrnX8GcZVOecqAym6AcyK1QtMR9Ic,2979
@@ -493,7 +493,7 @@ omlish/logs/timing.py,sha256=qsQ3DB6swts1pxrFlmLWQzhH-3nzDrq1MUu7PxjjUyU,1519
 omlish/logs/utils.py,sha256=OkFWf1exmWImmT7BaSiIC7c0Fk9tAis-PRqo8H4ny3c,398
 omlish/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/manifests/base.py,sha256=5CmayiuzdXXv9hB5tDnWqfAosAoEQ26YG0B-emkiTXU,941
-omlish/manifests/load.py,sha256=XYSWJve4dYSaXNO4vSTv5REB6dqJEy9u-S0hoWOx8ko,6661
+omlish/manifests/load.py,sha256=NLpD8eBz078MNjQ9bEafhbpPBPfM_cVQVnkdmtQv7Gk,7666
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
 omlish/manifests/types.py,sha256=5hQuY-WZ9VMqHZXr-9Dayg380JsnX2vJzXyw6vC6UDs,317
 omlish/marshal/__init__.py,sha256=QeWqXKb6_Jk8vpX9Z-apWlM3nUbJY3uCPOm0k8Lw8b8,3584
@@ -559,7 +559,7 @@ omlish/os/forkhooks.py,sha256=sLrDCOletKcuiKTKIstksmvYw8GNg5e5yHUGuJ0dEeo,5678
 omlish/os/journald.py,sha256=Ysm-lyjBfTvRA9PZtkdNxeFNNuSdLwoCXnBgePeRu3Y,3909
 omlish/os/linux.py,sha256=CfnYR1vJooo74OfeiSB6EaB1KN5SLz9x3b1KXtJIRQ4,18949
 omlish/os/mangle.py,sha256=1Z_gYNiRiHn7wAA8tGEumra3lD4r9Isn581Ml2auJZI,531
-omlish/os/paths.py,sha256=Eok1nx4H3SjO86EroTKRl1upA1VNjgvlwYbR5pGpSO4,855
+omlish/os/paths.py,sha256=lnO2JJWo8rWgmrmNUiRuGyXVWdmfalDsGmH0UsyRsHA,1304
 omlish/os/signals.py,sha256=k2nSiuefwzjRkqxBf2gZX2QDANDpHHB1Xfsvv49nQHc,358
 omlish/os/sizes.py,sha256=ohGartgu_us6Eo6qT2pz5MvLeHfMes1Fxq8om_z0cak,157
 omlish/os/temp.py,sha256=TkiBU89aq0vHHaMKFNEFsKV6F_wTPZJCdnmwvGygD0Q,1209
@@ -742,7 +742,7 @@ omlish/subprocesses/wrap.py,sha256=AhGV8rsnaVUMQCFYKkrjj35fs3O-VJLZC1hZ14dz3C8,7
 omlish/term/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/term/codes.py,sha256=fDRhUYzCzllcvCfMMgEroJaQoxqFsfTivpYdVmnwcCE,6390
 omlish/term/coloring.py,sha256=MCFYV_JTvEObTCJE12wfalW8OFFQB_KIFBKDtfES6Nk,2559
-omlish/term/confirm.py,sha256=5aqZnfy60K9CBSfXDsD-zA84HJm5fBWb_Y1T1x8gRnw,918
+omlish/term/confirm.py,sha256=M3DAyyPO2yREhSXOAWF-KQcLTHRRZCVsg2nrIKT8kHI,1111
 omlish/term/progressbar.py,sha256=em2o2emwbfmJIB-EHljQBCkwHd-Zw8Zydl3n73IYvX0,3678
 omlish/term/vt100/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/term/vt100/c.py,sha256=93HARU6Dd1rVF-n8cAyXqkEqleYLcofuLgSUNd6-GbU,3537
@@ -791,7 +791,7 @@ omlish/text/mangle.py,sha256=k7mYavVgxJ2ENV2wfjw3c9u3hqH5NeVpjoxYbyaYC0Y,2796
 omlish/text/minja.py,sha256=eyOA_zUCzyqaBfiPX-hV2xdK9_cqlDEhbVTkZUTZgQo,7521
 omlish/text/parts.py,sha256=MpiCUyfpcL4PLb2Etj8V7Yj4qofhy0xVwBrIL6RfNdg,6646
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
-omlish/text/templating.py,sha256=4dw0EGEPze6AtI6767PVvwnU3Vn9nyl6NI-ieqY7wQ0,3041
+omlish/text/templating.py,sha256=Nf5BVDgrYBf0WmYwV6SnHPDvl9XVMu8v7MX78pInLTw,3325
 omlish/text/antlr/__init__.py,sha256=88bMl_28cfSKslgOkMGYXqALgsHz3KC4LFvAVtzj7k8,89
 omlish/text/antlr/delimit.py,sha256=wvpZ-FlVoGwRjBALKT1in9cIriIwvyFqmHxgliNJEi8,3472
 omlish/text/antlr/dot.py,sha256=-WHO-xDSv-Ir00TZ4sVIwunKYtZkRveaQ4m5FKj_bRs,962
@@ -872,9 +872,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev364.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev364.dist-info/METADATA,sha256=ZOYVCoR87JVc1QxFTVZMhgI4L5a_nQN_HgZiDLraDY4,4416
-omlish-0.0.0.dev364.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev364.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev364.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev364.dist-info/RECORD,,
+omlish-0.0.0.dev366.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev366.dist-info/METADATA,sha256=y2efGFNp_VAZoZcZx_Pq7FYHst4s70iopzDtnyHK-F0,4416
+omlish-0.0.0.dev366.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev366.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev366.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev366.dist-info/RECORD,,