omlish 0.0.0.dev419__py3-none-any.whl → 0.0.0.dev421__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev419'
-__revision__ = 'ec06deda53ea93f16a7dc690230fe51edce49e7b'
+__version__ = '0.0.0.dev421'
+__revision__ = 'e94a9ef0aba686505b9880c69a5e4dbd2621ad44'
 
 
 #

omlish/asyncs/bluelet/core.py

@@ -5,12 +5,12 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-import abc
 import dataclasses as dc
 import time
 import types
 import typing as ta
 
+from ...lite.abstract import Abstract
 from .events import BlueletEvent
 from .events import BlueletFuture
 from .events import WaitableBlueletEvent
@@ -52,7 +52,7 @@ class _BlueletAwaitableDriver:
 ##
 
 
-class CoreBlueletEvent(BlueletEvent, abc.ABC):  # noqa
+class CoreBlueletEvent(BlueletEvent, Abstract):
     pass
 
 

omlish/asyncs/bluelet/events.py

@@ -5,10 +5,11 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-import abc
 import dataclasses as dc
 import typing as ta
 
+from ...lite.abstract import Abstract
+
 
 R = ta.TypeVar('R')
 
@@ -20,7 +21,7 @@ BlueletWaitable = ta.Union[int, 'BlueletHasFileno']  # ta.TypeAlias
 ##
 
 
-class BlueletEvent(abc.ABC):  # noqa
+class BlueletEvent(Abstract):
     """
     Just a base class identifying Bluelet events. An event is an object yielded from a Bluelet coro coroutine to
     suspend operation and communicate with the scheduler.
@@ -44,7 +45,7 @@ class BlueletWaitables:
     x: ta.Sequence[BlueletWaitable] = ()
 
 
-class WaitableBlueletEvent(BlueletEvent, abc.ABC):  # noqa
+class WaitableBlueletEvent(BlueletEvent, Abstract):
     """
     A waitable event is one encapsulating an action that can be waited for using a select() call. That is, it's an event
     with an associated file descriptor.

omlish/asyncs/bluelet/files.py

@@ -5,10 +5,10 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-import abc
 import dataclasses as dc
 import typing as ta
 
+from ...lite.abstract import Abstract
 from .core import DelegationBlueletEvent
 from .core import ReturnBlueletEvent
 from .events import BlueletEvent
@@ -19,7 +19,7 @@ from .events import WaitableBlueletEvent
 ##
 
 
-class FileBlueletEvent(BlueletEvent, abc.ABC):
+class FileBlueletEvent(BlueletEvent, Abstract):
     pass
 
 

omlish/asyncs/bluelet/sockets.py

@@ -5,11 +5,11 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-import abc
 import dataclasses as dc
 import socket
 import typing as ta
 
+from ...lite.abstract import Abstract
 from .core import BlueletCoro
 from .core import ReturnBlueletEvent
 from .core import ValueBlueletEvent
@@ -130,7 +130,7 @@ class BlueletConnection:
 ##
 
 
-class SocketBlueletEvent(BlueletEvent, abc.ABC):  # noqa
+class SocketBlueletEvent(BlueletEvent, Abstract):
     pass
 
 

omlish/collections/frozen.py

@@ -15,7 +15,7 @@ V = ta.TypeVar('V')
 
 
 class Frozen(ta.Hashable, abc.ABC):
-    pass
+    """Explicitly an abc.ABC, not a lang.Abstract, to support virtual subclassing."""
 
 
 class FrozenDict(ta.Mapping[K, V], Frozen):

omlish/collections/kv/base.py

@@ -45,7 +45,7 @@ class Kv(lang.Abstract, ta.Generic[K, V]):
         raise NotImplementedError
 
 
-class MutableKv(Kv[K, V], lang.Abstract):  # noqa
+class MutableKv(Kv[K, V], lang.Abstract):
     @abc.abstractmethod
     def __setitem__(self, k: K, v: V, /) -> None:
         raise NotImplementedError

omlish/collections/multimaps.py

@@ -13,7 +13,7 @@ MV = ta.TypeVar('MV', bound=ta.Iterable)
 
 
 class MultiMap(ta.Mapping[K, MV], abc.ABC, ta.Generic[K, V, MV]):
-    pass
+    """Explicitly an abc.ABC, not a lang.Abstract, to support virtual subclassing."""
 
 
 SequenceMultiMap: ta.TypeAlias = MultiMap[K, V, ta.Sequence[V]]

omlish/collections/persistent/treapmap.py

@@ -20,6 +20,7 @@ import abc
 import random
 import typing as ta
 
+from ... import lang
 from ..sorted.sorted import SortedItems
 from . import treap
 from .persistent import PersistentMap
@@ -154,7 +155,7 @@ def new_treap_dict(cmp: ta.Callable[[tuple[K, V], tuple[K, V]], int]) -> Persist
 ##
 
 
-class BaseTreapMapIterator(abc.ABC, ta.Iterator[tuple[K, V]], ta.Generic[K, V]):
+class BaseTreapMapIterator(lang.Abstract, ta.Iterator[tuple[K, V]], ta.Generic[K, V]):
     __slots__ = ('_st', '_n')
 
     def __init__(

omlish/concurrent/threadlets.py

@@ -19,7 +19,7 @@ else:
 ##
 
 
-class Threadlet(abc.ABC):
+class Threadlet(lang.Abstract):
     """Not safe to identity-key - use `underlying`."""
 
     def __hash__(self):
@@ -52,7 +52,7 @@ class Threadlet(abc.ABC):
         raise NotImplementedError
 
 
-class Threadlets(abc.ABC):
+class Threadlets(lang.Abstract):
     @abc.abstractmethod
     def spawn(self, fn: ta.Callable[[], None]) -> Threadlet:
         raise NotImplementedError

omlish/configs/all.py

@@ -1,47 +1,54 @@
-# ruff: noqa: I001
-from .classes import (  # noqa
-    Configurable,
-)
+# rufF: noqa: I001
+from .. import lang as _lang
 
-from .formats import (  # noqa
-    ConfigData as Data,
 
-    ConfigLoader as Loader,
+with _lang.auto_proxy_init(globals()):
+    ##
 
-    ConfigRenderer as Renderer,
+    from .classes import (  # noqa
+        Configurable,
+    )
 
-    ObjConfigData as ObjData,
+    from .formats import (  # noqa
+        ConfigData as Data,
 
-    JsonConfigData as JsonData,
-    JsonConfigLoader as JsonLoader,
-    JsonConfigRenderer as JsonRenderer,
+        ConfigLoader as Loader,
 
-    TomlConfigData as TomlData,
-    TomlConfigLoader as TomlLoader,
-    TomlConfigRenderer as TomlRenderer,
+        ConfigRenderer as Renderer,
 
-    YamlConfigData as YamlData,
-    YamlConfigLoader as YamlLoader,
-    YamlConfigRenderer as YamlRenderer,
+        ObjConfigData as ObjData,
 
-    IniConfigData as IniData,
-    IniConfigLoader as IniLoader,
-    IniConfigRenderer as IniRenderer,
+        JsonConfigData as JsonData,
+        JsonConfigLoader as JsonLoader,
+        JsonConfigRenderer as JsonRenderer,
 
-    SwitchedConfigFileLoader as SwitchedFileLoader,
+        TomlConfigData as TomlData,
+        TomlConfigLoader as TomlLoader,
+        TomlConfigRenderer as TomlRenderer,
 
-    DEFAULT_CONFIG_LOADERS as DEFAULT_LOADERS,
-    DEFAULT_CONFIG_LOADER as DEFAULT_LOADER,
-    DEFAULT_CONFIG_FILE_LOADER as DEFAULT_FILE_LOADER,
+        YamlConfigData as YamlData,
+        YamlConfigLoader as YamlLoader,
+        YamlConfigRenderer as YamlRenderer,
 
-    SwitchedConfigRenderer as SwitchedRenderer,
+        IniConfigData as IniData,
+        IniConfigLoader as IniLoader,
+        IniConfigRenderer as IniRenderer,
 
-    DEFAULT_CONFIG_RENDERERS as DEFAULT_RENDERERS,
-    DEFAULT_CONFIG_RENDERER as DEFAULT_RENDERER,
-)
+        SwitchedConfigFileLoader as SwitchedFileLoader,
+
+        DEFAULT_CONFIG_LOADERS as DEFAULT_LOADERS,
+        DEFAULT_CONFIG_LOADER as DEFAULT_LOADER,
+        DEFAULT_CONFIG_FILE_LOADER as DEFAULT_FILE_LOADER,
+
+        SwitchedConfigRenderer as SwitchedRenderer,
+
+        DEFAULT_CONFIG_RENDERERS as DEFAULT_RENDERERS,
+        DEFAULT_CONFIG_RENDERER as DEFAULT_RENDERER,
+    )
+
+    from .types import (  # noqa
+        ConfigMap as Map,
+    )
 
-from .types import (  # noqa
-    ConfigMap as Map,
-)
 
 from .processing import all as processing  # noqa

omlish/configs/formats.py

@@ -23,6 +23,7 @@ from ..formats.ini.sections import extract_ini_sections
 from ..formats.ini.sections import render_ini_sections
 from ..formats.toml.parser import toml_loads
 from ..formats.toml.writer import TomlWriter
+from ..lite.abstract import Abstract
 from ..lite.check import check
 from ..lite.json import json_dumps_pretty
 from .types import ConfigMap
@@ -36,7 +37,7 @@ ConfigDataT = ta.TypeVar('ConfigDataT', bound='ConfigData')
 
 
 @dc.dataclass(frozen=True)
-class ConfigData(abc.ABC):  # noqa
+class ConfigData(Abstract):
     @abc.abstractmethod
     def as_map(self) -> ConfigMap:
         raise NotImplementedError
@@ -45,7 +46,7 @@ class ConfigData(abc.ABC):  # noqa
 #
 
 
-class ConfigLoader(abc.ABC, ta.Generic[ConfigDataT]):
+class ConfigLoader(Abstract, ta.Generic[ConfigDataT]):
     @property
     def file_exts(self) -> ta.Sequence[str]:
         return ()
@@ -67,7 +68,7 @@ class ConfigLoader(abc.ABC, ta.Generic[ConfigDataT]):
 #
 
 
-class ConfigRenderer(abc.ABC, ta.Generic[ConfigDataT]):
+class ConfigRenderer(Abstract, ta.Generic[ConfigDataT]):
     @property
     @abc.abstractmethod
     def data_cls(self) -> ta.Type[ConfigDataT]:
@@ -87,7 +88,7 @@ class ConfigRenderer(abc.ABC, ta.Generic[ConfigDataT]):
 
 
 @dc.dataclass(frozen=True)
-class ObjConfigData(ConfigData, abc.ABC):
+class ObjConfigData(ConfigData, Abstract):
     obj: ta.Any
 
     def as_map(self) -> ConfigMap:

omlish/configs/processing/all.py

@@ -1,37 +1,43 @@
 # ruff: noqa: I001
-from .flattening import (  # noqa
-    ConfigFlattening as Flattening,
-)
+from ... import lang as _lang
 
-from .inheritance import (  # noqa
-    build_config_inherited_values as build_inherited_values,
-)
 
-from .matching import (  # noqa
-    MatchingConfigRewriter as MatchingRewriter,
+with _lang.auto_proxy_init(globals()):
+    ##
 
-    matched_config_rewrite as matched_rewrite,
-)
+    from .flattening import (  # noqa
+        ConfigFlattening as Flattening,
+    )
 
-from .merging import (  # noqa
-    merge_configs as merge,
-)
+    from .inheritance import (  # noqa
+        build_config_inherited_values as build_inherited_values,
+    )
 
-from .names import (  # noqa
-    build_config_named_children as build_named_children,
-)
+    from .matching import (  # noqa
+        MatchingConfigRewriter as MatchingRewriter,
 
-from .rewriting import (  # noqa
-    ConfigRewriterItem as RewriterItem,
-    ConfigRewriterPath as RewriterPath,
+        matched_config_rewrite as matched_rewrite,
+    )
 
-    RawConfigMetadata as RawMetadata,
+    from .merging import (  # noqa
+        merge_configs as merge,
+    )
 
-    ConfigRewriter as Rewriter,
-)
+    from .names import (  # noqa
+        build_config_named_children as build_named_children,
+    )
 
-from .strings import (  # noqa
-    StringConfigRewriter as StringRewriter,
+    from .rewriting import (  # noqa
+        ConfigRewriterItem as RewriterItem,
+        ConfigRewriterPath as RewriterPath,
 
-    format_config_strings as format_strings,
-)
+        RawConfigMetadata as RawMetadata,
+
+        ConfigRewriter as Rewriter,
+    )
+
+    from .strings import (  # noqa
+        StringConfigRewriter as StringRewriter,
+
+        format_config_strings as format_strings,
+    )

omlish/configs/processing/flattening.py

@@ -3,6 +3,7 @@
 import abc
 import typing as ta
 
+from ...lite.abstract import Abstract
 from ...lite.check import check
 
 
@@ -54,7 +55,7 @@ class ConfigFlattening:
         rec([], unflattened)
         return ret
 
-    class UnflattenNode(abc.ABC, ta.Generic[K]):
+    class UnflattenNode(Abstract, ta.Generic[K]):
         @abc.abstractmethod
         def get(self, key: K) -> ta.Any:
             raise NotImplementedError

omlish/configs/processing/rewriting.py

@@ -1,10 +1,10 @@
 # ruff: noqa: UP006 UP007 UP045
 # @omlish-lite
-import abc
 import collections.abc
 import dataclasses as dc
 import typing as ta
 
+from ...lite.abstract import Abstract
 from ...lite.check import check
 from ...lite.types import BUILTIN_SCALAR_ITERABLE_TYPES
 
@@ -26,7 +26,7 @@ class RawConfigMetadata:
         raise TypeError
 
 
-class ConfigRewriter(abc.ABC):  # noqa
+class ConfigRewriter(Abstract):
     @dc.dataclass(frozen=True)
     class Context(ta.Generic[T]):
         obj: T

omlish/configs/shadow.py

@@ -11,6 +11,7 @@ import abc
 import os.path
 import typing as ta
 
+from ..lite.abstract import Abstract
 from ..lite.check import check
 from ..os.mangle import mangle_path
 from .formats import DEFAULT_CONFIG_LOADERS
@@ -23,13 +24,13 @@ ShadowConfig = ta.Mapping[str, ta.Any]  # ta.TypeAlias
 ##
 
 
-class ShadowConfigs(abc.ABC):
+class ShadowConfigs(Abstract):
     @abc.abstractmethod
     def get_shadow_config(self, path: str) -> ta.Optional[ShadowConfig]:
         raise NotImplementedError
 
 
-class FileShadowConfigs(ShadowConfigs, abc.ABC):
+class FileShadowConfigs(ShadowConfigs, Abstract):
     @abc.abstractmethod
     def get_shadow_config_file_path(self, path: str) -> str:
         raise NotImplementedError

omlish/daemons/spawning.py

@@ -44,13 +44,13 @@ class Spawn(dc.Frozen, final=True):
     inherit_fds: ta.Collection[int] | None = None
 
 
-class Spawner(lang.ContextManaged, abc.ABC):
+class Spawner(lang.ContextManaged, lang.Abstract):
     @abc.abstractmethod
     def spawn(self, spawn: Spawn) -> None:
         raise NotImplementedError
 
 
-class InProcessSpawner(Spawner, abc.ABC):
+class InProcessSpawner(Spawner, lang.Abstract):
     pass
 
 

omlish/daemons/targets.py

@@ -44,7 +44,7 @@ class Target(dc.Case):
             raise TypeError(obj)
 
 
-class TargetRunner(abc.ABC):
+class TargetRunner(lang.Abstract):
     @abc.abstractmethod
     def run(self) -> None:
         raise NotImplementedError

omlish/daemons/waiting.py

@@ -4,6 +4,7 @@ import socket
 import typing as ta
 
 from .. import dataclasses as dc
+from .. import lang
 
 
 ##
@@ -13,7 +14,7 @@ class Wait(dc.Case):
     pass
 
 
-class Waiter(abc.ABC):
+class Waiter(lang.Abstract):
     @abc.abstractmethod
     def do_wait(self) -> bool:
         raise NotImplementedError

omlish/dataclasses/impl/generation/base.py

@@ -2,6 +2,7 @@ import abc
 import dataclasses as dc
 import typing as ta
 
+from .... import lang
 from ..processing.base import ProcessingContext
 from .ops import Op
 from .ops import OpRefMap
@@ -15,7 +16,7 @@ PlanT = ta.TypeVar('PlanT')
 
 
 @dc.dataclass(frozen=True)
-class Plan(abc.ABC):  # noqa
+class Plan(lang.Abstract):
     pass
 
 
@@ -28,7 +29,7 @@ class PlanResult(ta.Generic[PlanT]):
     ref_map: OpRefMap | None = None
 
 
-class Generator(abc.ABC, ta.Generic[PlanT]):
+class Generator(lang.Abstract, ta.Generic[PlanT]):
     @abc.abstractmethod
     def plan(self, ctx: ProcessingContext) -> PlanResult[PlanT] | None:
         raise NotImplementedError

omlish/dataclasses/impl/generation/compilation.py

@@ -7,6 +7,7 @@ import dataclasses as dc
 import typing as ta
 
 from .... import check
+from .... import lang
 from ..utils import repr_round_trip_value
 from .globals import FN_GLOBAL_IMPORTS
 from .globals import FN_GLOBALS
@@ -32,7 +33,7 @@ T = ta.TypeVar('T')
 
 
 class OpCompiler:
-    class Style(abc.ABC):
+    class Style(lang.Abstract):
         @abc.abstractmethod
         def header_lines(self) -> ta.Sequence[str]:
             raise NotImplementedError

omlish/dataclasses/impl/generation/ops.py

@@ -1,7 +1,7 @@
-import abc
 import dataclasses as dc
 import typing as ta
 
+from .... import lang
 from .globals import FnGlobal
 from .idents import IDENT_PREFIX
 
@@ -50,7 +50,7 @@ IfAttrPresent: ta.TypeAlias = ta.Literal['skip', 'replace', 'error']
 
 
 @dc.dataclass(frozen=True)
-class Op(abc.ABC):  # noqa
+class Op(lang.Abstract):
     pass
 
 

omlish/dataclasses/impl/generation/processor.py

@@ -60,7 +60,7 @@ class Codegen(ProcessingOption):
 
 @register_processor_type(priority=ProcessorPriority.GENERATION)
 class GeneratorProcessor(Processor):
-    class Mode(abc.ABC):
+    class Mode(lang.Abstract):
         @abc.abstractmethod
         def _process(self, gp: 'GeneratorProcessor', cls: type) -> None:
             raise NotImplementedError

omlish/dataclasses/metaclass/meta.py

@@ -1,5 +1,6 @@
 """
 TODO:
+ - DataABCMeta
  - Rewrite lol
  - Enum - enforce Abstract or Final
 """

omlish/dataclasses/tools/static.py

@@ -88,7 +88,11 @@ class Static(lang.Abstract):
         #
 
         expected_fld_order: ta.Sequence[str] | None = None
-        is_abstract = lang.is_abstract_class(cls) or abc.ABC in cls.__bases__
+        is_abstract = (
+            lang.is_abstract_class(cls) or
+            abc.ABC in cls.__bases__ or
+            lang.Abstract in cls.__bases__
+        )
         if not is_abstract:
             if is_immediate_dataclass(cls):
                 raise TypeError(cls)

omlish/formats/dotenv.py

@@ -35,6 +35,8 @@ import shutil
 import tempfile
 import typing as ta
 
+from ..lite.abstract import Abstract
+
 
 ##
 
@@ -52,7 +54,7 @@ _dotenv_posix_variable_pat: ta.Pattern[str] = re.compile(
 )
 
 
-class DotenvAtom(metaclass=abc.ABCMeta):
+class DotenvAtom(Abstract):
     def __ne__(self, other: object) -> bool:
         result = self.__eq__(other)
         if result is NotImplemented:

omlish/formats/json/backends/default.py

@@ -2,9 +2,15 @@ import typing as ta
 
 from .... import lang
 from .base import Backend
-from .orjson import orjson_backend
 from .std import std_backend
-from .ujson import ujson_backend
+
+
+if ta.TYPE_CHECKING:
+    from . import orjson as oj
+    from . import ujson as uj
+else:
+    oj = lang.proxy_import('.orjson', __package__)
+    uj = lang.proxy_import('.ujson', __package__)
 
 
 ##
@@ -12,12 +18,13 @@ from .ujson import ujson_backend
 
 @lang.cached_function
 def default_backend() -> Backend:
-    for fn in [
-        orjson_backend,
-        ujson_backend,
+    for (im, bm, fn) in [
+        ('orjson', oj, 'orjson_backend'),
+        ('ujson', uj, 'ujson_backend'),
     ]:
-        if (be := fn()) is not None:
-            return be
+        if lang.can_import(im):
+            if (be := getattr(bm, fn)()) is not None:
+                return be
 
     return std_backend()