omlish 0.0.0.dev236__py3-none-any.whl → 0.0.0.dev238__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev236'
-__revision__ = '492e9f7254561d4c5576a6df3dfb94fdf94d9f7a'
+__version__ = '0.0.0.dev238'
+__revision__ = '0ab60b1d75e5b0b298707ba55797958e528c69b5'
 
 
 #

omlish/collections/__init__.py

@@ -57,11 +57,6 @@ from .identity import (  # noqa
     IdentityWeakSet,
 )
 
-from .indexed import (  # noqa
-    IndexedSeq,
-    IndexedSetSeq,
-)
-
 from .mappings import (  # noqa
     MissingDict,
     TypeMap,
@@ -91,6 +86,11 @@ else:
         'new_treap_map',
     ])
 
+from .ranked import (  # noqa
+    RankedSeq,
+    RankedSetSeq,
+)
+
 if _ta.TYPE_CHECKING:
     from .sorted.skiplist import (  # noqa
         SkipList,

omlish/collections/ranked.py

@@ -0,0 +1,79 @@
+import typing as ta
+
+from .identity import IdentityKeyDict
+from .identity import IdentitySet
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+class RankedSeq(ta.Sequence[T]):
+    def __init__(self, it: ta.Iterable[T], *, identity: bool = False) -> None:
+        super().__init__()
+
+        self._lst = list(it)
+        self._ranks: ta.Mapping[T, int] = (IdentityKeyDict if identity else dict)((e, i) for i, e in enumerate(self._lst))  # noqa
+        if len(self._ranks) != len(self._lst):
+            raise ValueError(f'{len(self._ranks)} != {len(self._lst)}')
+
+    @property
+    def debug(self) -> ta.Sequence[T]:
+        return self._lst
+
+    def __iter__(self) -> ta.Iterator[T]:
+        return iter(self._lst)
+
+    def __getitem__(self, rank: int) -> T:  # type: ignore
+        return self._lst[rank]
+
+    def __len__(self) -> int:
+        return len(self._lst)
+
+    def __contains__(self, obj: T) -> bool:  # type: ignore
+        return obj in self._ranks
+
+    @property
+    def ranks(self) -> ta.Mapping[T, int]:
+        return self._ranks
+
+    def rank(self, obj: T) -> int:
+        return self._ranks[obj]
+
+
+##
+
+
+class RankedSetSeq(ta.Sequence[ta.AbstractSet[T]]):
+    def __init__(self, it: ta.Iterable[ta.Iterable[T]], *, identity: bool = False) -> None:
+        super().__init__()
+
+        self._lst = [(IdentitySet if identity else set)(e) for e in it]
+        self._ranks: ta.Mapping[T, int] = (IdentityKeyDict if identity else dict)((e, i) for i, es in enumerate(self._lst) for e in es)  # noqa
+        if len(self._ranks) != sum(map(len, self._lst)):
+            raise ValueError(f'{len(self._ranks)} != {sum(map(len, self._lst))}')
+
+    @property
+    def debug(self) -> ta.Sequence[ta.AbstractSet[T]]:
+        return self._lst
+
+    def __iter__(self) -> ta.Iterator[ta.AbstractSet[T]]:
+        return iter(self._lst)
+
+    def __getitem__(self, rank: int) -> ta.AbstractSet[T]:  # type: ignore
+        return self._lst[rank]
+
+    def __len__(self) -> int:
+        return len(self._lst)
+
+    def __contains__(self, obj: T) -> bool:  # type: ignore
+        return obj in self._ranks
+
+    @property
+    def ranks(self) -> ta.Mapping[T, int]:
+        return self._ranks
+
+    def rank(self, obj: T) -> int:
+        return self._ranks[obj]

omlish/configs/classes.py

@@ -1,53 +1,35 @@
 import typing as ta
-import weakref
 
 from .. import check
 from .. import dataclasses as dc
 from .. import lang
 
 
-class Config(
-    dc.Data,
-    lang.Abstract,
-    frozen=True,
-    reorder=True,
-    confer=frozenset([
-        'frozen',
-        'reorder',
-        'confer',
-    ]),
-):
-    pass
+ConfigurableConfigT = ta.TypeVar('ConfigurableConfigT', bound='Configurable.Config')
 
 
-ConfigT = ta.TypeVar('ConfigT', bound='Config')
+class Configurable(ta.Generic[ConfigurableConfigT], lang.Abstract):
+    @dc.dataclass(frozen=True, kw_only=True)
+    class Config:
+        """Does not use any dc metaclasses to preserve typechecking."""
 
-_CONFIG_CLS_MAP: ta.MutableMapping[type[Config], type['Configurable']] = weakref.WeakValueDictionary()
-
-
-class Configurable(ta.Generic[ConfigT], lang.Abstract):
-
-    # FIXME: https://github.com/python/mypy/issues/5144
-    Config: ta.ClassVar[type[ConfigT]]  # type: ignore  # noqa
+        configurable_cls: ta.ClassVar[type['Configurable']]
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
-        cfg_cls = check.issubclass(cls.__dict__['Config'], Config)
-        check.not_in(cfg_cls, _CONFIG_CLS_MAP)
-        _CONFIG_CLS_MAP[cfg_cls] = cls
+        if not lang.is_abstract_class(cls):
+            check.in_('Config', cls.__dict__)
+            cfg_cls = check.issubclass(cls.Config, Configurable.Config)
+            check.not_in('configurable_cls', cfg_cls.__dict__)
+            check.state(dc.is_immediate_dataclass(cfg_cls))
+            cfg_cls.configurable_cls = cls
 
-    def __init__(self, config: ConfigT) -> None:
+    def __init__(self, config: ConfigurableConfigT) -> None:
         super().__init__()
 
-        self._config: ConfigT = check.isinstance(config, self.Config)
-
+        self._config: ConfigurableConfigT = check.isinstance(config, self.Config)  # type: ignore[assignment]
 
-def get_impl(cfg: type[Config] | Config) -> type[Configurable]:
-    if isinstance(cfg, type):
-        cfg_cls = check.issubclass(cfg, Config)  # noqa
-    elif isinstance(cfg, Config):
-        cfg_cls = type(cfg)
-    else:
-        raise TypeError(cfg)
-    return _CONFIG_CLS_MAP[cfg_cls]
+    @property
+    def config(self) -> ConfigurableConfigT:
+        return self._config

omlish/configs/processing/all.py

@@ -13,6 +13,10 @@ from .matching import (  # noqa
     matched_config_rewrite as matched_rewrite,
 )
 
+from .merging import (  # noqa
+    merge_configs as merge,
+)
+
 from .names import (  # noqa
     build_config_named_children as build_named_children,
 )

omlish/configs/processing/merging.py

@@ -0,0 +1,33 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+"""
+TODO:
+ - smarter merging than just dumb dict-squashing
+"""
+import typing as ta
+
+from ..types import ConfigMap
+
+
+##
+
+
+def merge_configs(*ms: ConfigMap) -> ConfigMap:
+    def rec(o, i):
+        for k, v in i.items():
+            try:
+                e = o[k]
+            except KeyError:
+                o[k] = v
+            else:
+                if isinstance(e, ta.Mapping) and isinstance(v, ta.Mapping):
+                    rec(e, v)  # noqa
+                else:
+                    if isinstance(v, ta.Mapping):
+                        v = dict(v)
+                    o[k] = v
+
+    o: dict = {}
+    for i in ms:
+        rec(o, i)
+    return o

omlish/configs/shadow.py

@@ -0,0 +1,92 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+"""
+TODO:
+ - cascading?
+ - caching?
+ - purging?
+ - wishlist: piecewise config parts, unmarshal, registered via manifests
+"""
+import abc
+import os.path
+import typing as ta
+
+from ..lite.check import check
+from ..os.mangle import mangle_path
+from .formats import DEFAULT_CONFIG_LOADERS
+from .formats import ConfigLoader
+
+
+ShadowConfig = ta.Mapping[str, ta.Any]  # ta.TypeAlias
+
+
+##
+
+
+class ShadowConfigs(abc.ABC):
+    @abc.abstractmethod
+    def get_shadow_config(self, path: str) -> ta.Optional[ShadowConfig]:
+        raise NotImplementedError
+
+
+class FileShadowConfigs(ShadowConfigs, abc.ABC):
+    @abc.abstractmethod
+    def get_shadow_config_file_path(self, path: str) -> str:
+        raise NotImplementedError
+
+
+##
+
+
+class NopShadowConfigs(ShadowConfigs):
+    def get_shadow_config(self, path: str) -> ta.Optional[ShadowConfig]:
+        return None
+
+
+##
+
+
+class MangledFilesShadowConfigs(FileShadowConfigs):
+    def __init__(
+            self,
+            path: str,
+            *,
+            create: bool = False,
+            ext: str = 'yml',
+            loader: ta.Optional[ConfigLoader] = None,
+    ) -> None:  # noqa
+        super().__init__()
+
+        check.arg(not ext.startswith('.'))
+        check.non_empty_str(ext)
+
+        if loader is None:
+            for dl in DEFAULT_CONFIG_LOADERS:
+                if dl.match_file(f'.{ext}'):
+                    loader = dl
+                    break
+            else:
+                raise KeyError(ext)
+
+        self._path = path
+        self._create = create
+        self._ext = ext
+        self._loader = loader
+
+    def get_shadow_config_file_path(self, path: str) -> str:
+        mangled = '.'.join([mangle_path(os.path.abspath(path)), self._ext])
+        return os.path.abspath(os.path.join(self._path, mangled))
+
+    def get_shadow_config(self, path: str) -> ta.Optional[ShadowConfig]:
+        file_path = self.get_shadow_config_file_path(path)
+
+        if self._create:
+            os.makedirs(self._path, exist_ok=True)
+
+        try:
+            with open(file_path) as f:
+                content = f.read()
+        except FileNotFoundError:
+            return None
+
+        return self._loader.load_str(content).as_map()

omlish/daemons/daemon.py

@@ -38,14 +38,9 @@ log = logging.getLogger(__name__)
 
 
 class Daemon:
-    """
-    Instances of these should most likely be effectively singletons, but that's up to the user.
-    """
-
     @dc.dataclass(frozen=True, kw_only=True)
     class Config:
-        target: Target
-        spawning: Spawning
+        spawning: Spawning | None = None
 
         #
 
@@ -68,11 +63,20 @@ class Daemon:
         def __post_init__(self) -> None:
             check.isinstance(self.pid_file, (str, None))
 
-    def __init__(self, config: Config) -> None:
+    def __init__(
+            self,
+            target: Target,
+            config: Config = Config(),
+    ) -> None:
         super().__init__()
 
+        self._target = target
         self._config = config
 
+    @property
+    def target(self) -> Target:
+        return self._target
+
     @property
     def config(self) -> Config:
         return self._config
@@ -124,8 +128,8 @@ class Daemon:
 
     def launch_no_wait(self) -> None:
         launcher = Launcher(
-            target=self._config.target,
-            spawning=self._config.spawning,
+            target=self._target,
+            spawning=check.not_none(self._config.spawning),
 
             pid_file=self._config.pid_file,
             reparent_process=self._config.reparent_process,

omlish/daemons/services.py

@@ -0,0 +1,108 @@
+import abc
+import typing as ta
+
+from .. import cached
+from .. import check
+from .. import dataclasses as dc
+from .. import lang
+from ..configs.classes import Configurable
+from .daemon import Daemon
+from .targets import Target
+from .targets import TargetRunner
+from .targets import target_runner_for
+
+
+ServiceConfigT = ta.TypeVar('ServiceConfigT', bound='Service.Config')
+
+
+##
+
+
+class Service(Configurable[ServiceConfigT], lang.Abstract):
+    class Config(Configurable.Config, lang.Abstract):
+        pass
+
+    @classmethod
+    def from_config(cls, config: Config) -> 'Service':
+        return check.isinstance(config.configurable_cls(config), cls)
+
+    #
+
+    @abc.abstractmethod
+    def _run(self) -> None:
+        raise NotImplementedError
+
+    def run(self) -> None:
+        self._run()
+
+    @classmethod
+    def run_config(cls, config: Config) -> None:
+        return cls.from_config(config).run()
+
+
+##
+
+
+class ServiceTarget(Target):
+    svc: Service
+
+
+class ServiceTargetRunner(TargetRunner, dc.Frozen):
+    target: ServiceTarget
+
+    def run(self) -> None:
+        self.target.svc.run()
+
+
+@target_runner_for.register
+def _(target: ServiceTarget) -> ServiceTargetRunner:
+    return ServiceTargetRunner(target)
+
+
+#
+
+
+class ServiceConfigTarget(Target):
+    cfg: Service.Config
+
+
+class ServiceConfigTargetRunner(TargetRunner, dc.Frozen):
+    target: ServiceConfigTarget
+
+    def run(self) -> None:
+        Service.run_config(self.target.cfg)
+
+
+@target_runner_for.register
+def _(target: ServiceConfigTarget) -> ServiceConfigTargetRunner:
+    return ServiceConfigTargetRunner(target)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ServiceDaemon(lang.Final):
+    service: Service | Service.Config
+
+    @cached.function
+    def service_(self) -> Service:
+        if isinstance(self.service, Service):
+            return self.service
+        elif isinstance(self.service, Service.Config):
+            return Service.from_config(self.service)
+        else:
+            raise TypeError(self.service)
+
+    #
+
+    daemon: Daemon | Daemon.Config = Daemon.Config()
+
+    @cached.function
+    def daemon_(self) -> Daemon:
+        if isinstance(self.daemon, Daemon):
+            return self.daemon
+        elif isinstance(self.daemon, Daemon.Config):
+            return Daemon(Target.of(self.service_()), self.daemon)
+        else:
+            raise TypeError(self.daemon)

omlish/daemons/targets.py

@@ -10,15 +10,38 @@ from .. import lang
 
 if ta.TYPE_CHECKING:
     import runpy
+
+    from . import services
+
 else:
     runpy = lang.proxy_import('runpy')
 
+    services = lang.proxy_import('.services', __package__)
+
 
 ##
 
 
 class Target(dc.Case):
-    pass
+    @classmethod
+    def of(cls, obj: ta.Any) -> 'Target':
+        if isinstance(obj, Target):
+            return obj
+
+        elif isinstance(obj, str):
+            return NameTarget(obj)
+
+        elif callable(obj):
+            return FnTarget(obj)
+
+        elif isinstance(obj, services.Service):
+            return services.ServiceTarget(obj)
+
+        elif isinstance(obj, services.Service.Config):
+            return services.ServiceConfigTarget(obj)
+
+        else:
+            raise TypeError(obj)
 
 
 class TargetRunner(abc.ABC):
@@ -36,14 +59,18 @@ def target_runner_for(target: Target) -> TargetRunner:
 
 
 class FnTarget(Target):
-    fn: ta.Callable[[], None]
+    fn: ta.Callable[[], ta.Any]
 
 
 class FnTargetRunner(TargetRunner, dc.Frozen):
     target: FnTarget
 
     def run(self) -> None:
-        self.target.fn()
+        obj = self.target.fn()
+        if obj is not None:
+            tgt = Target.of(obj)
+            tr = target_runner_for(tgt)
+            tr.run()
 
 
 @target_runner_for.register
@@ -57,6 +84,23 @@ def _(target: FnTarget) -> FnTargetRunner:
 class NameTarget(Target):
     name: str
 
+    @classmethod
+    def for_obj(
+            cls,
+            obj: ta.Any,
+            *,
+            globals: ta.Mapping[str, ta.Any] | None = None,  # noqa
+            no_module_name_lookup: bool = False,
+    ) -> 'NameTarget':
+        if globals is None:
+            globals = obj.__globals__  # noqa
+        if not no_module_name_lookup:
+            mn = lang.get_real_module_name(globals)
+        else:
+            mn = globals['__name__']
+        qn = obj.__qualname__
+        return NameTarget('.'.join([mn, qn]))
+
 
 class NameTargetRunner(TargetRunner, dc.Frozen):
     target: NameTarget
@@ -67,7 +111,14 @@ class NameTargetRunner(TargetRunner, dc.Frozen):
             runpy._run_module_as_main(name)  # type: ignore  # noqa
         else:
             obj = lang.import_attr(self.target.name)
-            obj()
+            tgt = Target.of(obj)
+            tr = target_runner_for(tgt)
+            tr.run()
+
+
+@target_runner_for.register
+def _(target: NameTarget) -> NameTargetRunner:
+    return NameTargetRunner(target)
 
 
 ##
@@ -76,11 +127,16 @@ class NameTargetRunner(TargetRunner, dc.Frozen):
 class ExecTarget(Target):
     cmd: ta.Sequence[str] = dc.xfield(coerce=check.of_not_isinstance(str))
 
+    cwd: str | None = None
+
 
 class ExecTargetRunner(TargetRunner, dc.Frozen):
     target: ExecTarget
 
     def run(self) -> None:
+        if (cwd := self.target.cwd) is not None:
+            os.chdir(os.path.expanduser(cwd))
+
         os.execl(*self.target.cmd)
 
 

omlish/dataclasses/__init__.py

@@ -91,9 +91,11 @@ from .impl.reflect import (  # noqa
     reflect,
 )
 
-from .utils import (  # noqa
-    is_immediate_dataclass,
+from .static import (  # noqa
+    Static,
+)
 
+from .utils import (  # noqa
     opt_repr,
     truthy_repr,
 
@@ -116,5 +118,7 @@ from .utils import (  # noqa
 ##
 
 from ..lite.dataclasses import (  # noqa
+    is_immediate_dataclass,
+
     dataclass_maybe_post_init as maybe_post_init,
 )