ominfra 0.0.0.dev178__tar.gz → 0.0.0.dev180__tar.gz

{ominfra-0.0.0.dev178/ominfra.egg-info → ominfra-0.0.0.dev180}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev178
+Version: 0.0.0.dev180
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev178
-Requires-Dist: omlish==0.0.0.dev178
+Requires-Dist: omdev==0.0.0.dev180
+Requires-Dist: omlish==0.0.0.dev180
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev178 → ominfra-0.0.0.dev180}/ominfra/clouds/aws/cli.py

@@ -5,7 +5,7 @@ from . import metadata
 
 
 class Cli(ap.Cli):
-    @ap.command(
+    @ap.cmd(
         ap.arg('key', nargs='*'),
         ap.arg('--url'),
     )

{ominfra-0.0.0.dev178 → ominfra-0.0.0.dev180}/ominfra/manage/deploy/driver.py

@@ -1,16 +1,14 @@
 # ruff: noqa: UP006 UP007
-import os.path
 import typing as ta
 
-from omlish.lite.check import check
 from omlish.lite.typing import Func1
 
 from .apps import DeployAppManager
-from .deploy import DeployManager
 from .paths.manager import DeployPathsManager
 from .specs import DeploySpec
 from .tags import DeployAppRev
 from .tags import DeployTagMap
+from .tags import DeployTime
 from .types import DeployHome
 
 
@@ -23,16 +21,18 @@ class DeployDriver:
             self,
             *,
             spec: DeploySpec,
+            home: DeployHome,
+            time: DeployTime,
 
-            deploys: DeployManager,
             paths: DeployPathsManager,
             apps: DeployAppManager,
     ) -> None:
         super().__init__()
 
         self._spec = spec
+        self._home = home
+        self._time = time
 
-        self._deploys = deploys
         self._paths = paths
         self._apps = apps
 
@@ -41,17 +41,8 @@ class DeployDriver:
 
         #
 
-        hs = check.non_empty_str(self._spec.home)
-        hs = os.path.expanduser(hs)
-        hs = os.path.realpath(hs)
-        hs = os.path.abspath(hs)
-
-        home = DeployHome(hs)
-
-        #
-
         deploy_tags = DeployTagMap(
-            self._deploys.make_deploy_time(),
+            self._time,
             self._spec.key(),
         )
 
@@ -66,6 +57,6 @@ class DeployDriver:
 
             await self._apps.prepare_app(
                 app,
-                home,
+                self._home,
                 app_tags,
             )

{ominfra-0.0.0.dev178 → ominfra-0.0.0.dev180}/ominfra/manage/deploy/inject.py

@@ -1,7 +1,9 @@
 # ruff: noqa: UP006 UP007
 import contextlib
+import os.path
 import typing as ta
 
+from omlish.lite.check import check
 from omlish.lite.inject import ContextvarInjectorScope
 from omlish.lite.inject import Injector
 from omlish.lite.inject import InjectorBindingOrBindings
@@ -23,15 +25,64 @@ from .interp import InterpCommandExecutor
 from .paths.inject import bind_deploy_paths
 from .paths.owners import DeployPathOwner
 from .specs import DeploySpec
+from .tags import DeployTime
 from .tmp import DeployHomeAtomics
 from .tmp import DeployTmpManager
+from .types import DeployHome
 from .venvs import DeployVenvManager
 
 
+##
+
+
 class DeployInjectorScope(ContextvarInjectorScope):
     pass
 
 
+def bind_deploy_scope() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind_scope(DeployInjectorScope),
+        inj.bind_scope_seed(DeploySpec, DeployInjectorScope),
+
+        inj.bind(DeployDriver, in_=DeployInjectorScope),
+    ]
+
+    #
+
+    def provide_deploy_driver_factory(injector: Injector, sc: DeployInjectorScope) -> DeployDriverFactory:
+        @contextlib.contextmanager
+        def factory(spec: DeploySpec) -> ta.Iterator[DeployDriver]:
+            with sc.enter({
+                inj.as_key(DeploySpec): spec,
+            }):
+                yield injector[DeployDriver]
+        return DeployDriverFactory(factory)
+    lst.append(inj.bind(provide_deploy_driver_factory, singleton=True))
+
+    #
+
+    def provide_deploy_home(deploy: DeploySpec) -> DeployHome:
+        hs = check.non_empty_str(deploy.home)
+        hs = os.path.expanduser(hs)
+        hs = os.path.realpath(hs)
+        hs = os.path.abspath(hs)
+        return DeployHome(hs)
+    lst.append(inj.bind(provide_deploy_home, in_=DeployInjectorScope))
+
+    #
+
+    def provide_deploy_time(deploys: DeployManager) -> DeployTime:
+        return deploys.make_deploy_time()
+    lst.append(inj.bind(provide_deploy_time, in_=DeployInjectorScope))
+
+    #
+
+    return inj.as_bindings(*lst)
+
+
+##
+
+
 def bind_deploy(
         *,
         deploy_config: DeployConfig,
@@ -40,6 +91,8 @@ def bind_deploy(
         inj.bind(deploy_config),
 
         bind_deploy_paths(),
+
+        bind_deploy_scope(),
     ]
 
     #
@@ -75,25 +128,6 @@ def bind_deploy(
 
     #
 
-    def provide_deploy_driver_factory(injector: Injector, sc: DeployInjectorScope) -> DeployDriverFactory:
-        @contextlib.contextmanager
-        def factory(spec: DeploySpec) -> ta.Iterator[DeployDriver]:
-            with sc.enter({
-                inj.as_key(DeploySpec): spec,
-            }):
-                yield injector[DeployDriver]
-        return DeployDriverFactory(factory)
-    lst.append(inj.bind(provide_deploy_driver_factory, singleton=True))
-
-    lst.extend([
-        inj.bind_scope(DeployInjectorScope),
-        inj.bind_scope_seed(DeploySpec, DeployInjectorScope),
-
-        inj.bind(DeployDriver, in_=DeployInjectorScope),
-    ])
-
-    #
-
     lst.extend([
         bind_command(DeployCommand, DeployCommandExecutor),
         bind_command(InterpCommand, InterpCommandExecutor),

{ominfra-0.0.0.dev178 → ominfra-0.0.0.dev180}/ominfra/manage/deploy/interp.py

@@ -1,7 +1,7 @@
 # ruff: noqa: UP006 UP007
 import dataclasses as dc
 
-from omdev.interp.resolvers import DEFAULT_INTERP_RESOLVER
+from omdev.interp.default import get_default_interp_resolver
 from omdev.interp.types import InterpOpts
 from omdev.interp.types import InterpSpecifier
 from omlish.lite.check import check
@@ -28,7 +28,7 @@ class InterpCommand(Command['InterpCommand.Output']):
 class InterpCommandExecutor(CommandExecutor[InterpCommand, InterpCommand.Output]):
     async def execute(self, cmd: InterpCommand) -> InterpCommand.Output:
         i = InterpSpecifier.parse(check.not_none(cmd.spec))
-        o = check.not_none(await DEFAULT_INTERP_RESOLVER.resolve(i, install=cmd.install))
+        o = check.not_none(await get_default_interp_resolver().resolve(i, install=cmd.install))
         return InterpCommand.Output(
             exe=o.exe,
             version=str(o.version.version),

{ominfra-0.0.0.dev178 → ominfra-0.0.0.dev180}/ominfra/manage/deploy/venvs.py

@@ -6,7 +6,7 @@ TODO:
 """
 import os.path
 
-from omdev.interp.resolvers import DEFAULT_INTERP_RESOLVER
+from omdev.interp.default import get_default_interp_resolver
 from omdev.interp.types import InterpSpecifier
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
@@ -25,7 +25,7 @@ class DeployVenvManager:
     ) -> None:
         if spec.interp is not None:
             i = InterpSpecifier.parse(check.not_none(spec.interp))
-            o = check.not_none(await DEFAULT_INTERP_RESOLVER.resolve(i))
+            o = check.not_none(await get_default_interp_resolver().resolve(i))
             sys_exe = o.exe
         else:
             sys_exe = 'python3'

{ominfra-0.0.0.dev178 → ominfra-0.0.0.dev180}/ominfra/manage/main.py

@@ -14,7 +14,7 @@ import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_command
+from omlish.argparse.cli import argparse_cmd
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.logs import log  # noqa
@@ -55,7 +55,7 @@ class MainCli(ArgparseCli):
 
     #
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('--_payload-file'),
 
         argparse_arg('--pycharm-debug-port', type=int),

{ominfra-0.0.0.dev178 → ominfra-0.0.0.dev180}/ominfra/manage/remote/spawning.py

@@ -9,7 +9,7 @@ import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
-from omlish.lite.shlex import shlex_maybe_quote
+from omlish.shlex import shlex_maybe_quote
 from omlish.subprocesses import SUBPROCESS_CHANNEL_OPTION_VALUES
 from omlish.subprocesses import SubprocessChannelOption