omdev 0.0.38__tar.gz → 0.0.40__tar.gz

{omdev-0.0.38/omdev.egg-info → omdev-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.38
+Version: 0.0.40
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -13,10 +13,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.38
+Requires-Dist: omcore==0.0.40
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.38; extra == "all"
-Requires-Dist: omllm==0.0.38; extra == "all"
+Requires-Dist: ominfra==0.0.40; extra == "all"
+Requires-Dist: omllm==0.0.40; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -35,9 +35,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.38; extra == "ominfra"
+Requires-Dist: ominfra==0.0.40; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.38; extra == "omllm"
+Requires-Dist: omllm==0.0.40; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c

{omdev-0.0.38 → omdev-0.0.40}/omdev/.om-manifests.json

@@ -562,7 +562,7 @@
     "module": ".tools.shell",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/shell.py",
-    "line": 110,
+    "line": 230,
     "value": {
       "!.cli.types.CliModule": {
         "name": [

{omdev-0.0.38 → omdev-0.0.40}/omdev/cache/data/actions.py

@@ -18,7 +18,7 @@ from .consts import SERIALIZATION_VERSION
 
 
 @dc.dataclass(frozen=True)
-@msh.set_polymorphic_from_subclasses(naming=msh.Naming.SNAKE, strip_suffix=True)
+@msh.set_polymorphic(naming='snake', suffix_stripping='required')
 class Action(lang.Abstract, lang.Sealed):
     serialization_version: int = dc.field(default=SERIALIZATION_VERSION, kw_only=True)
 

{omdev-0.0.38 → omdev-0.0.40}/omdev/cache/data/specs.py

@@ -20,7 +20,7 @@ from .consts import SERIALIZATION_VERSION
 
 
 @dc.dataclass(frozen=True)
-@msh.set_polymorphic_from_subclasses(naming=msh.Naming.SNAKE, strip_suffix=True)
+@msh.set_polymorphic(naming='snake', suffix_stripping='required')
 class Spec(lang.Abstract, lang.Sealed):
     serialization_version: int = dc.field(default=SERIALIZATION_VERSION, kw_only=True)
 

{omdev-0.0.38 → omdev-0.0.40}/omdev/ci/cli.py

@@ -113,6 +113,8 @@ class CiCli(ArgparseCli):
         argparse_arg('-e', '--env', action='append'),
         argparse_arg('-v', '--volume', action='append'),
 
+        argparse_arg('--pre-cmd', action='append'),
+
         argparse_arg('cmd', nargs=argparse.REMAINDER),
     )
     async def run(self) -> None:
@@ -126,8 +128,10 @@ class CiCli(ArgparseCli):
 
         #
 
-        cmd = ' '.join(self.args.cmd)
-        check.non_empty_str(cmd)
+        cmd = ' && '.join([
+            *[check.non_empty_str(pc) for pc in (self.args.pre_cmd or [])],
+            check.non_empty_str(' '.join(self.args.cmd)),
+        ])
 
         #
 

{omdev-0.0.38 → omdev-0.0.40}/omdev/dockerdev/gen.py

@@ -138,6 +138,11 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         cache_mount_args=[f'uid={cfg.uid}', f'gid={cfg.gid}'],
     ))
 
+    ##
+    # self
+
+    ops.append(fragment_section('om'))
+
     ##
     # ownership
 

omdev-0.0.40/omdev/dockerdev/resources/.python-versions.json

@@ -0,0 +1,19 @@
+{
+  "8": "3.8.20",
+  "9": "3.9.25",
+  "10": "3.10.20",
+  "11": "3.11.15",
+  "12": "3.12.13",
+  "13": "3.13.15",
+  "13d": "3.13.15d",
+  "13t": "3.13.15t",
+  "13dt": "3.13.15dt",
+  "14": "3.14.7",
+  "14d": "3.14.7d",
+  "14t": "3.14.7t",
+  "14dt": "3.14.7dt",
+  "15": "3.15.0rc1",
+  "15d": "3.15.0rc1d",
+  "15t": "3.15.0rc1t",
+  "15dt": "3.15.0rc1dt"
+}

omdev-0.0.40/omdev/dockerdev/resources/fragments/om.sh

@@ -0,0 +1,20 @@
+curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.py' | bash --login -c 'python3 - $@' - \
+  omcore-cext \
+  omdev-cext \
+  ominfra \
+  omllm \
+  \
+  pip \
+  \
+  asttokens \
+  executing \
+  \
+  orjson \
+  pyyaml \
+  \
+  textual \
+  textual-speedups \
+  \
+  pg8000 \
+  pymysql \
+;

{omdev-0.0.38 → omdev-0.0.40}/omdev/packaging/marshal.py

@@ -44,7 +44,11 @@ class RequirementMarkerListMarshaler(msh.Marshaler):
 
 
 class RequirementMarkerListMarshalerFactory(msh.MarshalerFactory):
-    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, spec: msh.Spec) -> ta.Callable[[], msh.Marshaler] | None:
+        if not isinstance(spec, rfl.Type):
+            return None
+        rty = spec
+
         if rty.runtime_object is not MarshalRequirementMarkerList:
             return None
         return lambda: RequirementMarkerListMarshaler(
@@ -60,11 +64,11 @@ class RequirementMarkerListMarshalerFactory(msh.MarshalerFactory):
 def _install_standard_marshaling(cfgs: msh.ConfigRegistry) -> None:
     requires_node_poly = msh.Polymorphism(
         RequirementNode,
-        [
-            msh.Impl(RequirementVariable, 'variable'),
-            msh.Impl(RequirementValue, 'value'),
-            msh.Impl(RequirementOp, 'op'),
-        ],
+        msh.SubtypeInfos([
+            msh.SubtypeInfo(RequirementVariable, 'variable'),
+            msh.SubtypeInfo(RequirementValue, 'value'),
+            msh.SubtypeInfo(RequirementOp, 'op'),
+        ]),
     )
     msh.install_standard_factories(
         cfgs,

{omdev-0.0.38 → omdev-0.0.40}/omdev/scripts/ci.py

@@ -142,7 +142,7 @@ def __om_amalg__():  # noqa
             dict(path='../../omcore/lite/marshal.py', sha1='9b3f4ff802344313147f412f8f028922afc52b2f'),
             dict(path='../../omcore/lite/maybes.py', sha1='5ac5f92e5610c6795b0a228c38e7bcd272bf6305'),
             dict(path='../../omcore/lite/runtime.py', sha1='2e752a27ae2bf89b1bb79b4a2da522a3ec360c70'),
-            dict(path='../../omcore/lite/timeouts.py', sha1='e7b2d3b364e7b99aba287f0f97f4dc8a5492bd94'),
+            dict(path='../../omcore/lite/timeouts.py', sha1='f534acc131c6506d485f4d29e9597dfd3f0fb072'),
             dict(path='../../omcore/logs/infos.py', sha1='c6a4599ad727fbee7c3d8eb1bce80846f8106079'),
             dict(path='../../omcore/logs/metrics/base.py', sha1='38429b7e804533da9a1dd356cf563ac4cff82aa2'),
             dict(path='../../omcore/logs/protocols.py', sha1='2e13388c65699c4aa89f32b78be8496b94fc40bb'),
@@ -156,7 +156,7 @@ def __om_amalg__():  # noqa
             dict(path='../specs/oci/datarefs.py', sha1='19c6cf61c96efe6f667608a8eda120a0ad1ef466'),
             dict(path='../specs/oci/pack/unpacking.py', sha1='6cc7a1a64a91b96144c150ac4e0006bfe2caa3e0'),
             dict(path='../../omcore/argparse/cli.py', sha1='643ea018c916268b80efe227a13979c84c59be3c'),
-            dict(path='../../omcore/asyncs/asyncio/sockets.py', sha1='57bfaf9aaf1cc8263dc3292d9b1397de9e81ce5d'),
+            dict(path='../../omcore/asyncs/asyncio/sockets.py', sha1='2e3ccc17b95307033f4d7980850a463617d3c357'),
             dict(path='../../omcore/asyncs/asyncio/timeouts.py', sha1='79905340353b28e51bcd02a62026787f41b731b9'),
             dict(path='../../omcore/formats/yaml/goyaml/tokens.py', sha1='3c3cb038c1008425577157906ec0ccce4b5ce14d'),
             dict(path='../../omcore/http/pipelines/bodymodes.py', sha1='fa4169dd860a83c00cf13f6f48583fffd3c2bcf5'),
@@ -193,7 +193,7 @@ def __om_amalg__():  # noqa
             dict(path='../../omcore/logs/std/records.py', sha1='fb1e2d887248cc24b0463156836d9965a06c8ab6'),
             dict(path='../../omcore/logs/std/standard.py', sha1='223e3cba0f2854c5093fb60d6cef2f27b80c193c'),
             dict(path='../../omcore/secrets/tempssl.py', sha1='bbf47f864752f318f4122e539523ad5e6ed0a3b9'),
-            dict(path='../../omcore/subprocesses/base.py', sha1='902de24f7135858a9f539fab378cacb96f5cc672'),
+            dict(path='../../omcore/subprocesses/base.py', sha1='9c2f2d0a7627a255953315ae429224822407c597'),
             dict(path='../dataserver/handlers.py', sha1='f290d30b0e286d9152b9e7ff8135f2fdd222ceca'),
             dict(path='../dataserver/routes.py', sha1='f65920d9104c79ab186d4d04f0d52f2c6ad185b6'),
             dict(path='../specs/oci/media.py', sha1='803842842e9b3f1d51ccb48c41c7fb7df9d833b3'),
@@ -252,7 +252,7 @@ def __om_amalg__():  # noqa
             dict(path='docker/cacheserved/cache.py', sha1='a1e3481bd93412a2c572fc306786d52e06406eee'),
             dict(path='docker/inject.py', sha1='4755881c4f90bfa7508c4e8aa03d9f030a9123d8'),
             dict(path='inject.py', sha1='277c5529fd72cc023f136da599e10f9547ef9d60'),
-            dict(path='cli.py', sha1='457b154c601f8cfe7387fefc0be85c2a03b300d3'),
+            dict(path='cli.py', sha1='37fe9aeb930875a4b13fc0ff694fea6aa3c16962'),
         ],
     )
 
@@ -10299,7 +10299,7 @@ class Timeout(Abstract):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         """Evaluates time remaining via remaining() if this timeout can expire, otherwise returns `o`."""
 
         raise NotImplementedError
@@ -10398,7 +10398,7 @@ class DeadlineTimeout(Timeout):
             return rem
         raise self.exc
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         return self()
 
 
@@ -10419,7 +10419,7 @@ class InfiniteTimeout(Timeout):
     def __call__(self) -> float:
         return float('inf')
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         return o
 
 
@@ -10445,7 +10445,7 @@ class CompositeTimeout(Timeout):
     def __call__(self) -> float:
         return min((c() for c in self.children), default=float('inf'))
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         if self.can_expire:
             return self()
         return o
@@ -10480,8 +10480,10 @@ class PredicateTimeout(Timeout):
             return float('inf')
         raise self.exc
 
-    def or_(self, o: ta.Any) -> ta.Any:
-        return self()
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
+        if not math.isinf(f := self()):
+            return f
+        return o
 
 
 ########################################
@@ -12282,7 +12284,7 @@ async def asyncio_wait_until_can_connect(
 
             else:
                 writer.close()
-                await asyncio.wait_for(writer.wait_closed(), timeout=timeout.or_(None))
+                await asyncio.wait_for(writer.wait_closed(), timeout=timeout.remaining_or(None))
                 break
 
             await asyncio.sleep(min(sleep_s, timeout.remaining()))
@@ -22857,7 +22859,7 @@ class BaseSubprocesses(Abstract):
         #
 
         if 'timeout' in kwargs:
-            kwargs['timeout'] = Timeout.of(kwargs['timeout']).or_(None)
+            kwargs['timeout'] = Timeout.of(kwargs['timeout']).remaining_or(None)
 
         #
 
@@ -36451,6 +36453,8 @@ class CiCli(ArgparseCli):
         argparse_arg('-e', '--env', action='append'),
         argparse_arg('-v', '--volume', action='append'),
 
+        argparse_arg('--pre-cmd', action='append'),
+
         argparse_arg('cmd', nargs=argparse.REMAINDER),
     )
     async def run(self) -> None:
@@ -36464,8 +36468,10 @@ class CiCli(ArgparseCli):
 
         #
 
-        cmd = ' '.join(self.args.cmd)
-        check.non_empty_str(cmd)
+        cmd = ' && '.join([
+            *[check.non_empty_str(pc) for pc in (self.args.pre_cmd or [])],
+            check.non_empty_str(' '.join(self.args.cmd)),
+        ])
 
         #
 

{omdev-0.0.38 → omdev-0.0.40}/omdev/scripts/interp.py

@@ -27,6 +27,7 @@ import inspect
 import itertools
 import json
 import logging
+import math
 import operator
 import os
 import os.path
@@ -69,7 +70,7 @@ def __om_amalg__():  # noqa
             dict(path='../../omcore/lite/json.py', sha1='01124e62093ebd4078602f16df0ec04cb724a612'),
             dict(path='../../omcore/lite/maybes.py', sha1='5ac5f92e5610c6795b0a228c38e7bcd272bf6305'),
             dict(path='../../omcore/lite/runtime.py', sha1='2e752a27ae2bf89b1bb79b4a2da522a3ec360c70'),
-            dict(path='../../omcore/lite/timeouts.py', sha1='e7b2d3b364e7b99aba287f0f97f4dc8a5492bd94'),
+            dict(path='../../omcore/lite/timeouts.py', sha1='f534acc131c6506d485f4d29e9597dfd3f0fb072'),
             dict(path='../../omcore/logs/protocols.py', sha1='2e13388c65699c4aa89f32b78be8496b94fc40bb'),
             dict(path='../packaging/specifiers.py', sha1='baec4e53b7187f99e8d8b36bdf48bf61af82c252'),
             dict(path='../../omcore/argparse/cli.py', sha1='643ea018c916268b80efe227a13979c84c59be3c'),
@@ -80,7 +81,7 @@ def __om_amalg__():  # noqa
             dict(path='../../omcore/subprocesses/wrap.py', sha1='12d94dc2357951cd0fed1c50a46817d30d628927'),
             dict(path='types.py', sha1='c53a8d45d29f2010244760adeb8dcd02a4a240e1'),
             dict(path='../../omcore/logs/std/standard.py', sha1='223e3cba0f2854c5093fb60d6cef2f27b80c193c'),
-            dict(path='../../omcore/subprocesses/base.py', sha1='902de24f7135858a9f539fab378cacb96f5cc672'),
+            dict(path='../../omcore/subprocesses/base.py', sha1='9c2f2d0a7627a255953315ae429224822407c597'),
             dict(path='providers/base.py', sha1='bb952ac8a8c2ceeac41a777753a1a4e60439f3d4'),
             dict(path='../../omcore/subprocesses/asyncs.py', sha1='8d428af73220f793d2c0e93f5c9966fac9474246'),
             dict(path='resolvers.py', sha1='817b8e76401cd7a19eb43ca54d65272e4c8a4b0e'),
@@ -2670,7 +2671,7 @@ class Timeout(Abstract):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         """Evaluates time remaining via remaining() if this timeout can expire, otherwise returns `o`."""
 
         raise NotImplementedError
@@ -2769,7 +2770,7 @@ class DeadlineTimeout(Timeout):
             return rem
         raise self.exc
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         return self()
 
 
@@ -2790,7 +2791,7 @@ class InfiniteTimeout(Timeout):
     def __call__(self) -> float:
         return float('inf')
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         return o
 
 
@@ -2816,7 +2817,7 @@ class CompositeTimeout(Timeout):
     def __call__(self) -> float:
         return min((c() for c in self.children), default=float('inf'))
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         if self.can_expire:
             return self()
         return o
@@ -2851,8 +2852,10 @@ class PredicateTimeout(Timeout):
             return float('inf')
         raise self.exc
 
-    def or_(self, o: ta.Any) -> ta.Any:
-        return self()
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
+        if not math.isinf(f := self()):
+            return f
+        return o
 
 
 ########################################
@@ -5116,7 +5119,7 @@ class BaseSubprocesses(Abstract):
         #
 
         if 'timeout' in kwargs:
-            kwargs['timeout'] = Timeout.of(kwargs['timeout']).or_(None)
+            kwargs['timeout'] = Timeout.of(kwargs['timeout']).remaining_or(None)
 
         #
 

{omdev-0.0.38 → omdev-0.0.40}/omdev/scripts/pidfiles.py

@@ -27,6 +27,7 @@ import functools
 import inspect
 import json
 import logging
+import math
 import operator
 import os
 import os.path
@@ -68,7 +69,7 @@ def __om_amalg__():  # noqa
             dict(path='../../lite/marshal.py', sha1='9b3f4ff802344313147f412f8f028922afc52b2f'),
             dict(path='../../lite/maybes.py', sha1='5ac5f92e5610c6795b0a228c38e7bcd272bf6305'),
             dict(path='../../lite/runtime.py', sha1='2e752a27ae2bf89b1bb79b4a2da522a3ec360c70'),
-            dict(path='../../lite/timeouts.py', sha1='e7b2d3b364e7b99aba287f0f97f4dc8a5492bd94'),
+            dict(path='../../lite/timeouts.py', sha1='f534acc131c6506d485f4d29e9597dfd3f0fb072'),
             dict(path='../../logs/protocols.py', sha1='2e13388c65699c4aa89f32b78be8496b94fc40bb'),
             dict(path='../../argparse/cli.py', sha1='643ea018c916268b80efe227a13979c84c59be3c'),
             dict(path='../../lite/args.py', sha1='ae96b0baeb376617a63c0e64632ab2c5ff4171a8'),
@@ -76,7 +77,7 @@ def __om_amalg__():  # noqa
             dict(path='../../subprocesses/wrap.py', sha1='12d94dc2357951cd0fed1c50a46817d30d628927'),
             dict(path='../../diag/cmds/lslocks.py', sha1='46725d80fd8e016d2d13a4b5c1ad1352b982841e'),
             dict(path='../../diag/cmds/lsof.py', sha1='cdb2aaaed6f7c6fbddbd8cc165fd82c1f8f2ebb3'),
-            dict(path='../../subprocesses/base.py', sha1='902de24f7135858a9f539fab378cacb96f5cc672'),
+            dict(path='../../subprocesses/base.py', sha1='9c2f2d0a7627a255953315ae429224822407c597'),
             dict(path='../../subprocesses/sync.py', sha1='df383531e888c4652a285defb522dd90ce916b6a'),
             dict(path='pinning.py', sha1='436eb3fc76ae7106605c8c26de60e36899ad0b8a'),
             dict(path='cli.py', sha1='fb926284e3a92c28573c91a69295ea8d99f6f134'),
@@ -3314,7 +3315,7 @@ class Timeout(Abstract):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         """Evaluates time remaining via remaining() if this timeout can expire, otherwise returns `o`."""
 
         raise NotImplementedError
@@ -3413,7 +3414,7 @@ class DeadlineTimeout(Timeout):
             return rem
         raise self.exc
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         return self()
 
 
@@ -3434,7 +3435,7 @@ class InfiniteTimeout(Timeout):
     def __call__(self) -> float:
         return float('inf')
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         return o
 
 
@@ -3460,7 +3461,7 @@ class CompositeTimeout(Timeout):
     def __call__(self) -> float:
         return min((c() for c in self.children), default=float('inf'))
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         if self.can_expire:
             return self()
         return o
@@ -3495,8 +3496,10 @@ class PredicateTimeout(Timeout):
             return float('inf')
         raise self.exc
 
-    def or_(self, o: ta.Any) -> ta.Any:
-        return self()
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
+        if not math.isinf(f := self()):
+            return f
+        return o
 
 
 ########################################
@@ -4243,7 +4246,7 @@ class BaseSubprocesses(Abstract):
         #
 
         if 'timeout' in kwargs:
-            kwargs['timeout'] = Timeout.of(kwargs['timeout']).or_(None)
+            kwargs['timeout'] = Timeout.of(kwargs['timeout']).remaining_or(None)
 
         #
 

{omdev-0.0.38 → omdev-0.0.40}/omdev/scripts/pyproject.py

@@ -52,6 +52,7 @@ import io
 import itertools
 import json
 import logging
+import math
 import multiprocessing as mp
 import operator
 import os
@@ -116,7 +117,7 @@ def __om_amalg__():  # noqa
             dict(path='../../omcore/lite/marshal.py', sha1='9b3f4ff802344313147f412f8f028922afc52b2f'),
             dict(path='../../omcore/lite/maybes.py', sha1='5ac5f92e5610c6795b0a228c38e7bcd272bf6305'),
             dict(path='../../omcore/lite/runtime.py', sha1='2e752a27ae2bf89b1bb79b4a2da522a3ec360c70'),
-            dict(path='../../omcore/lite/timeouts.py', sha1='e7b2d3b364e7b99aba287f0f97f4dc8a5492bd94'),
+            dict(path='../../omcore/lite/timeouts.py', sha1='f534acc131c6506d485f4d29e9597dfd3f0fb072'),
             dict(path='../../omcore/logs/infos.py', sha1='c6a4599ad727fbee7c3d8eb1bce80846f8106079'),
             dict(path='../../omcore/logs/metrics/base.py', sha1='38429b7e804533da9a1dd356cf563ac4cff82aa2'),
             dict(path='../../omcore/logs/protocols.py', sha1='2e13388c65699c4aa89f32b78be8496b94fc40bb'),
@@ -136,7 +137,7 @@ def __om_amalg__():  # noqa
             dict(path='../../omcore/logs/base.py', sha1='4195705c64f3ec1c4263c2c76c63351d9dacdd5c'),
             dict(path='../../omcore/logs/std/records.py', sha1='fb1e2d887248cc24b0463156836d9965a06c8ab6'),
             dict(path='../../omcore/logs/std/standard.py', sha1='223e3cba0f2854c5093fb60d6cef2f27b80c193c'),
-            dict(path='../../omcore/subprocesses/base.py', sha1='902de24f7135858a9f539fab378cacb96f5cc672'),
+            dict(path='../../omcore/subprocesses/base.py', sha1='9c2f2d0a7627a255953315ae429224822407c597'),
             dict(path='../interp/providers/base.py', sha1='bb952ac8a8c2ceeac41a777753a1a4e60439f3d4'),
             dict(path='../../omcore/logs/asyncs.py', sha1='6b444494a0512f7b7ea2c93be5c4a9868deb7251'),
             dict(path='../../omcore/logs/std/loggers.py', sha1='144a96b3b190a5641f3b7cc2656d6ffa4e45b5a9'),
@@ -5620,7 +5621,7 @@ class Timeout(Abstract):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         """Evaluates time remaining via remaining() if this timeout can expire, otherwise returns `o`."""
 
         raise NotImplementedError
@@ -5719,7 +5720,7 @@ class DeadlineTimeout(Timeout):
             return rem
         raise self.exc
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         return self()
 
 
@@ -5740,7 +5741,7 @@ class InfiniteTimeout(Timeout):
     def __call__(self) -> float:
         return float('inf')
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         return o
 
 
@@ -5766,7 +5767,7 @@ class CompositeTimeout(Timeout):
     def __call__(self) -> float:
         return min((c() for c in self.children), default=float('inf'))
 
-    def or_(self, o: ta.Any) -> ta.Any:
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
         if self.can_expire:
             return self()
         return o
@@ -5801,8 +5802,10 @@ class PredicateTimeout(Timeout):
             return float('inf')
         raise self.exc
 
-    def or_(self, o: ta.Any) -> ta.Any:
-        return self()
+    def remaining_or(self, o: T) -> ta.Union[float, T]:
+        if not math.isinf(f := self()):
+            return f
+        return o
 
 
 ########################################
@@ -10808,7 +10811,7 @@ class BaseSubprocesses(Abstract):
         #
 
         if 'timeout' in kwargs:
-            kwargs['timeout'] = Timeout.of(kwargs['timeout']).or_(None)
+            kwargs['timeout'] = Timeout.of(kwargs['timeout']).remaining_or(None)
 
         #
 

{omdev-0.0.38 → omdev-0.0.40}/omdev/specs/jsonschema/codegen/cli.py

@@ -4,7 +4,7 @@ import typing as ta
 
 from omcore.argparse import all as ap
 from omcore.formats.json import all as json
-from omcore.logs.std.standard import configure_standard_logging
+from omcore.logs import all as logs
 from omcore.specs import jsonschema as jsch
 
 from .generator import JsonSchemaCodeGen
@@ -51,7 +51,7 @@ class Cli(ap.Cli):
 
 
 def _main() -> None:
-    configure_standard_logging()
+    logs.configure_standard_logging()
 
     Cli().cli_run_and_exit()
 

{omdev-0.0.38 → omdev-0.0.40}/omdev/specs/jsonschema/codegen/names.py

@@ -2,8 +2,6 @@ import re
 import typing as ta
 
 from omcore import lang
-from omcore.lang.casing import StringCasingError
-from omcore.marshal.api.naming import Naming
 
 
 ##
@@ -19,7 +17,7 @@ _WORD_PAT: ta.Final = re.compile(r'[A-Za-z0-9]+')
 def split_loose_words(s: str) -> list[str]:
     try:
         return lang.split_string_casing(s)
-    except StringCasingError:
+    except lang.StringCasingError:
         pass
 
     words = [m.group(0).lower() for m in _WORD_PAT.finditer(s)]
@@ -40,7 +38,7 @@ def ref_name(ref_str: str) -> str:
 def python_class_name(json_name: str) -> str:
     try:
         return _SNAKE_TO_CAMEL(_LOW_CAMEL_TO_SNAKE(json_name))
-    except StringCasingError:
+    except lang.StringCasingError:
         pass
 
     try:
@@ -56,7 +54,7 @@ def python_field_name(json_name: str) -> str:
 
     try:
         return _LOW_CAMEL_TO_SNAKE(json_name)
-    except StringCasingError:
+    except lang.StringCasingError:
         pass
 
     try:
@@ -69,21 +67,21 @@ def tag_to_camel(tag: str) -> str:
     return lang.CAMEL_CASE.join(*split_loose_words(tag))
 
 
-def infer_naming(names: ta.Iterable[str]) -> Naming | None:
-    counts: dict[Naming, int] = {}
+def infer_naming(names: ta.Iterable[str]) -> lang.StringCasing | None:
+    counts: dict[lang.StringCasing, int] = {}
     for name in names:
         if name.startswith('_'):
             continue
-        for naming, casing in [
-            (Naming.CAMEL, lang.CAMEL_CASE),
-            (Naming.LOW_CAMEL, lang.LOW_CAMEL_CASE),
-            (Naming.SNAKE, lang.SNAKE_CASE),
-            (Naming.UP_SNAKE, lang.UP_SNAKE_CASE),
-            (Naming.KEBAB, lang.KEBAB_CASE),
-            (Naming.UP_KEBAB, lang.UP_KEBAB_CASE),
+        for casing in [
+            lang.CAMEL_CASE,
+            lang.LOW_CAMEL_CASE,
+            lang.SNAKE_CASE,
+            lang.UP_SNAKE_CASE,
+            lang.KEBAB_CASE,
+            lang.UP_KEBAB_CASE,
         ]:
             if casing.match(name):
-                counts[naming] = counts.get(naming, 0) + 1
+                counts[casing] = counts.get(casing, 0) + 1
 
     if not counts:
         return None