ominfra 0.0.0.dev174__py3-none-any.whl → 0.0.0.dev176__py3-none-any.whl

ominfra/configs.py

@@ -6,7 +6,8 @@ import typing as ta
 
 from omdev.toml.parser import toml_loads
 from omlish.lite.check import check
-from omlish.lite.marshal import unmarshal_obj
+from omlish.lite.marshal import OBJ_MARSHALER_MANAGER
+from omlish.lite.marshal import ObjMarshalerManager
 
 
 T = ta.TypeVar('T')
@@ -46,6 +47,7 @@ def read_config_file(
         cls: ta.Type[T],
         *,
         prepare: ta.Optional[ta.Callable[[ConfigMapping], ConfigMapping]] = None,
+        msh: ObjMarshalerManager = OBJ_MARSHALER_MANAGER,
 ) -> T:
     with open(path) as cf:
         config_dct = parse_config_file(os.path.basename(path), cf)
@@ -53,7 +55,7 @@ def read_config_file(
     if prepare is not None:
         config_dct = prepare(config_dct)
 
-    return unmarshal_obj(config_dct, cls)
+    return msh.unmarshal_obj(config_dct, cls)
 
 
 def build_config_named_children(

ominfra/manage/commands/marshal.py

@@ -13,7 +13,7 @@ def install_command_marshaling(
         lambda c: c,
         lambda c: c.Output,
     ]:
-        msh.register_opj_marshaler(
+        msh.set_obj_marshaler(
             fn(Command),
             PolymorphicObjMarshaler.of([
                 PolymorphicObjMarshaler.Impl(

ominfra/manage/deploy/apps.py

@@ -86,6 +86,8 @@ class DeployAppManager(DeployPathOwner):
         os.makedirs(deploy_dir, exist_ok=True)
 
         deploying_link = os.path.join(deploy_home, 'deploys/deploying')
+        if os.path.exists(deploying_link):
+            os.unlink(deploying_link)
         relative_symlink(
             deploy_dir,
             deploying_link,

ominfra/manage/deploy/conf.py

@@ -24,13 +24,12 @@ from omlish.os.paths import is_path_in_dir
 from omlish.os.paths import relative_symlink
 
 from .paths.paths import DeployPath
-from .specs import AllActiveDeployAppConfLink
-from .specs import CurrentOnlyDeployAppConfLink
 from .specs import DeployAppConfFile
 from .specs import DeployAppConfLink
 from .specs import DeployAppConfSpec
 from .tags import DEPLOY_TAG_SEPARATOR
 from .tags import DeployApp
+from .tags import DeployConf
 from .tags import DeployTagMap
 from .types import DeployHome
 
@@ -63,6 +62,7 @@ class DeployConfManager:
     #
 
     class _ComputedConfLink(ta.NamedTuple):
+        conf: DeployConf
         is_dir: bool
         link_src: str
         link_dst: str
@@ -70,8 +70,9 @@ class DeployConfManager:
     _UNIQUE_LINK_NAME_STR = '@app--@time--@app-key'
     _UNIQUE_LINK_NAME = DeployPath.parse(_UNIQUE_LINK_NAME_STR)
 
+    @classmethod
     def _compute_app_conf_link_dst(
-            self,
+            cls,
             link: DeployAppConfLink,
             tags: DeployTagMap,
             app_conf_dir: str,
@@ -85,6 +86,7 @@ class DeployConfManager:
         if (is_dir := link.src.endswith('/')):
             # @conf/ - links a directory in root of app conf dir to conf/@conf/@dst/
             check.arg(link.src.count('/') == 1)
+            conf = DeployConf(link.src.split('/')[0])
             link_dst_pfx = link.src
             link_dst_sfx = ''
 
@@ -92,6 +94,7 @@ class DeployConfManager:
             # @conf/file - links a single file in a single subdir to conf/@conf/@dst--file
             d, f = os.path.split(link.src)
             # TODO: check filename :|
+            conf = DeployConf(d)
             link_dst_pfx = d + '/'
             link_dst_sfx = DEPLOY_TAG_SEPARATOR + f
 
@@ -99,18 +102,20 @@ class DeployConfManager:
             # @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
             if '.' in link.src:
                 l, _, r = link.src.partition('.')
+                conf = DeployConf(l)
                 link_dst_pfx = l + '/'
                 link_dst_sfx = '.' + r
             else:
+                conf = DeployConf(link.src)
                 link_dst_pfx = link.src + '/'
                 link_dst_sfx = ''
 
         #
 
-        if isinstance(link, CurrentOnlyDeployAppConfLink):
+        if link.kind == 'current_only':
             link_dst_mid = str(tags[DeployApp].s)
-        elif isinstance(link, AllActiveDeployAppConfLink):
-            link_dst_mid = self._UNIQUE_LINK_NAME.render(tags)
+        elif link.kind == 'all_active':
+            link_dst_mid = cls._UNIQUE_LINK_NAME.render(tags)
         else:
             raise TypeError(link)
 
@@ -124,6 +129,7 @@ class DeployConfManager:
         link_dst = os.path.join(conf_link_dir, link_dst_name)
 
         return DeployConfManager._ComputedConfLink(
+            conf=conf,
             is_dir=is_dir,
             link_src=link_src,
             link_dst=link_dst,

ominfra/manage/deploy/paths/paths.py

@@ -170,7 +170,7 @@ class FileDeployPathPart(DeployPathPart):
         return 'file'
 
 
-#
+##
 
 
 @dc.dataclass(frozen=True)
@@ -197,7 +197,7 @@ class DeployPath:
         return pd
 
     @property
-    def kind(self) -> ta.Literal['file', 'dir']:
+    def kind(self) -> DeployPathKind:
         return self.parts[-1].kind
 
     def render(self, tags: ta.Optional[DeployTagMap] = None) -> str:

ominfra/manage/deploy/specs.py

@@ -95,7 +95,7 @@ class DeployAppConfFile:
 
 
 @dc.dataclass(frozen=True)
-class DeployAppConfLink(abc.ABC):  # noqa
+class DeployAppConfLink:  # noqa
     """
     May be either:
      - @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
@@ -105,20 +105,14 @@ class DeployAppConfLink(abc.ABC):  # noqa
 
     src: str
 
+    kind: ta.Literal['current_only', 'all_active'] = 'current_only'
+
     def __post_init__(self) -> None:
         check_valid_deploy_spec_path(self.src)
         if '/' in self.src:
             check.equal(self.src.count('/'), 1)
 
 
-class CurrentOnlyDeployAppConfLink(DeployAppConfLink):
-    pass
-
-
-class AllActiveDeployAppConfLink(DeployAppConfLink):
-    pass
-
-
 #
 
 

ominfra/manage/deploy/tags.py

@@ -4,6 +4,8 @@ import dataclasses as dc
 import typing as ta
 
 from omlish.lite.check import check
+from omlish.lite.marshal import SingleFieldObjMarshaler
+from omlish.lite.marshal import register_type_obj_marshaler
 
 
 ##
@@ -82,6 +84,8 @@ def _register_deploy_tag(cls):
     _DEPLOY_TAGS_BY_NAME[cls.tag_name] = cls
     _DEPLOY_TAGS_BY_KWARG[cls.tag_kwarg] = cls
 
+    register_type_obj_marshaler(cls, SingleFieldObjMarshaler(cls, 's'))
+
     return cls
 
 

ominfra/manage/deploy/venvs.py

@@ -6,7 +6,10 @@ TODO:
 """
 import os.path
 
+from omdev.interp.resolvers import DEFAULT_INTERP_RESOLVER
+from omdev.interp.types import InterpSpecifier
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.check import check
 from omlish.os.atomics import AtomicPathSwapping
 
 from .specs import DeployVenvSpec
@@ -28,7 +31,14 @@ class DeployVenvManager:
             git_dir: str,
             venv_dir: str,
     ) -> None:
-        sys_exe = 'python3'
+        if spec.interp is not None:
+            i = InterpSpecifier.parse(check.not_none(spec.interp))
+            o = check.not_none(await DEFAULT_INTERP_RESOLVER.resolve(i))
+            sys_exe = o.exe
+        else:
+            sys_exe = 'python3'
+
+        #
 
         # !! NOTE: (most) venvs cannot be relocated, so an atomic swap can't be used. it's up to the path manager to
         # garbage collect orphaned dirs.

ominfra/manage/main.py

@@ -35,6 +35,8 @@ from .targets.targets import ManageTarget
 
 @dc.dataclass(frozen=True)
 class ManageConfig:
+    deploy_home: ta.Optional[str] = None
+
     targets: ta.Optional[ta.Mapping[str, ManageTarget]] = None
 
 
@@ -69,7 +71,8 @@ class MainCli(ArgparseCli):
         argparse_arg('--deploy-home'),
 
         argparse_arg('target'),
-        argparse_arg('command', nargs='+'),
+        argparse_arg('-f', '--command-file', action='append'),
+        argparse_arg('command', nargs='*'),
     )
     async def run(self) -> None:
         bs = MainBootstrap(
@@ -80,7 +83,7 @@ class MainCli(ArgparseCli):
             ),
 
             deploy_config=DeployConfig(
-                deploy_home=self.args.deploy_home,
+                deploy_home=self.args.deploy_home or self.config().deploy_home,
             ),
 
             remote_config=RemoteConfig(
@@ -115,13 +118,19 @@ class MainCli(ArgparseCli):
         #
 
         cmds: ta.List[Command] = []
+
         cmd: Command
-        for c in self.args.command:
+
+        for c in self.args.command or []:
             if not c.startswith('{'):
                 c = json.dumps({c: {}})
             cmd = msh.unmarshal_obj(json.loads(c), Command)
             cmds.append(cmd)
 
+        for cf in self.args.command_file or []:
+            cmd = read_config_file(cf, Command, msh=msh)
+            cmds.append(cmd)
+
         #
 
         async with injector[ManageTargetConnector].connect(tgt) as ce:

ominfra/scripts/journald2aws.py

@@ -2686,6 +2686,18 @@ class FieldsObjMarshaler(ObjMarshaler):
         })
 
 
+@dc.dataclass(frozen=True)
+class SingleFieldObjMarshaler(ObjMarshaler):
+    ty: type
+    fld: str
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return getattr(o, self.fld)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty(**{self.fld: o})
+
+
 @dc.dataclass(frozen=True)
 class PolymorphicObjMarshaler(ObjMarshaler):
     class Impl(ta.NamedTuple):
@@ -2760,7 +2772,7 @@ _DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
     **{t: IterableObjMarshaler(t, DynamicObjMarshaler()) for t in (list, tuple, set, frozenset)},
     **{t: MappingObjMarshaler(t, DynamicObjMarshaler(), DynamicObjMarshaler()) for t in (dict,)},
 
-    ta.Any: DynamicObjMarshaler(),
+    **{t: DynamicObjMarshaler() for t in (ta.Any, object)},
 
     **{t: DatetimeObjMarshaler(t) for t in (datetime.date, datetime.time, datetime.datetime)},
     decimal.Decimal: DecimalObjMarshaler(),
@@ -2785,6 +2797,16 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
 ##
 
 
+_REGISTERED_OBJ_MARSHALERS_BY_TYPE: ta.MutableMapping[type, ObjMarshaler] = weakref.WeakKeyDictionary()
+
+
+def register_type_obj_marshaler(ty: type, om: ObjMarshaler) -> None:
+    _REGISTERED_OBJ_MARSHALERS_BY_TYPE[ty] = om
+
+
+##
+
+
 class ObjMarshalerManager:
     def __init__(
             self,
@@ -2794,6 +2816,8 @@ class ObjMarshalerManager:
             default_obj_marshalers: ta.Dict[ta.Any, ObjMarshaler] = _DEFAULT_OBJ_MARSHALERS,  # noqa
             generic_mapping_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_MAPPING_TYPES,  # noqa
             generic_iterable_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES,  # noqa
+
+            registered_obj_marshalers: ta.Mapping[type, ObjMarshaler] = _REGISTERED_OBJ_MARSHALERS_BY_TYPE,
     ) -> None:
         super().__init__()
 
@@ -2802,6 +2826,7 @@ class ObjMarshalerManager:
         self._obj_marshalers = dict(default_obj_marshalers)
         self._generic_mapping_types = generic_mapping_types
         self._generic_iterable_types = generic_iterable_types
+        self._registered_obj_marshalers = registered_obj_marshalers
 
         self._lock = threading.RLock()
         self._marshalers: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
@@ -2817,6 +2842,9 @@ class ObjMarshalerManager:
             non_strict_fields: bool = False,
     ) -> ObjMarshaler:
         if isinstance(ty, type):
+            if (reg := self._registered_obj_marshalers.get(ty)) is not None:
+                return reg
+
             if abc.ABC in ty.__bases__:
                 impls = [ity for ity in deep_subclasses(ty) if abc.ABC not in ity.__bases__]  # type: ignore
                 if all(ity.__qualname__.endswith(ty.__name__) for ity in impls):
@@ -2881,9 +2909,15 @@ class ObjMarshalerManager:
 
     #
 
-    def register_opj_marshaler(self, ty: ta.Any, m: ObjMarshaler) -> None:
+    def set_obj_marshaler(
+            self,
+            ty: ta.Any,
+            m: ObjMarshaler,
+            *,
+            override: bool = False,
+    ) -> None:
         with self._lock:
-            if ty in self._obj_marshalers:
+            if not override and ty in self._obj_marshalers:
                 raise KeyError(ty)
             self._obj_marshalers[ty] = m
 
@@ -2974,7 +3008,7 @@ class ObjMarshalContext:
 
 OBJ_MARSHALER_MANAGER = ObjMarshalerManager()
 
-register_opj_marshaler = OBJ_MARSHALER_MANAGER.register_opj_marshaler
+set_obj_marshaler = OBJ_MARSHALER_MANAGER.set_obj_marshaler
 get_obj_marshaler = OBJ_MARSHALER_MANAGER.get_obj_marshaler
 
 marshal_obj = OBJ_MARSHALER_MANAGER.marshal_obj
@@ -3259,6 +3293,7 @@ def read_config_file(
         cls: ta.Type[T],
         *,
         prepare: ta.Optional[ta.Callable[[ConfigMapping], ConfigMapping]] = None,
+        msh: ObjMarshalerManager = OBJ_MARSHALER_MANAGER,
 ) -> T:
     with open(path) as cf:
         config_dct = parse_config_file(os.path.basename(path), cf)
@@ -3266,7 +3301,7 @@ def read_config_file(
     if prepare is not None:
         config_dct = prepare(config_dct)
 
-    return unmarshal_obj(config_dct, cls)
+    return msh.unmarshal_obj(config_dct, cls)
 
 
 def build_config_named_children(