ominfra 0.0.0.dev177__tar.gz → 0.0.0.dev178__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev177
+Version: 0.0.0.dev178
 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.dev177
-Requires-Dist: omlish==0.0.0.dev177
+Requires-Dist: omdev==0.0.0.dev178
+Requires-Dist: omlish==0.0.0.dev178
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev177 → ominfra-0.0.0.dev178}/ominfra/manage/deploy/commands.py

@@ -5,7 +5,7 @@ from omlish.lite.logs import log
 
 from ..commands.base import Command
 from ..commands.base import CommandExecutor
-from .deploy import DeployManager
+from .driver import DeployDriverFactory
 from .specs import DeploySpec
 
 
@@ -23,11 +23,12 @@ class DeployCommand(Command['DeployCommand.Output']):
 
 @dc.dataclass(frozen=True)
 class DeployCommandExecutor(CommandExecutor[DeployCommand, DeployCommand.Output]):
-    _deploy: DeployManager
+    _driver_factory: DeployDriverFactory
 
     async def execute(self, cmd: DeployCommand) -> DeployCommand.Output:
         log.info('Deploying! %r', cmd.spec)
 
-        await self._deploy.run_deploy(cmd.spec)
+        with self._driver_factory(cmd.spec) as driver:
+            await driver.drive_deploy()
 
         return DeployCommand.Output()

ominfra-0.0.0.dev178/ominfra/manage/deploy/deploy.py

@@ -0,0 +1,34 @@
+# ruff: noqa: UP006 UP007
+import datetime
+import typing as ta
+
+from omlish.lite.typing import Func0
+
+from .tags import DeployTime
+
+
+DEPLOY_TAG_DATETIME_FMT = '%Y%m%dT%H%M%SZ'
+
+
+DeployManagerUtcClock = ta.NewType('DeployManagerUtcClock', Func0[datetime.datetime])
+
+
+class DeployManager:
+    def __init__(
+            self,
+            *,
+
+            utc_clock: ta.Optional[DeployManagerUtcClock] = None,
+    ):
+        super().__init__()
+
+        self._utc_clock = utc_clock
+
+    def _utc_now(self) -> datetime.datetime:
+        if self._utc_clock is not None:
+            return self._utc_clock()  # noqa
+        else:
+            return datetime.datetime.now(tz=datetime.timezone.utc)  # noqa
+
+    def make_deploy_time(self) -> DeployTime:
+        return DeployTime(self._utc_now().strftime(DEPLOY_TAG_DATETIME_FMT))

ominfra-0.0.0.dev177/ominfra/manage/deploy/deploy.py → ominfra-0.0.0.dev178/ominfra/manage/deploy/driver.py

@@ -1,60 +1,47 @@
 # ruff: noqa: UP006 UP007
-import datetime
 import os.path
 import typing as ta
 
 from omlish.lite.check import check
-from omlish.lite.typing import Func0
+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
 
 
-DEPLOY_TAG_DATETIME_FMT = '%Y%m%dT%H%M%SZ'
+class DeployDriverFactory(Func1[DeploySpec, ta.ContextManager['DeployDriver']]):
+    pass
 
 
-DeployManagerUtcClock = ta.NewType('DeployManagerUtcClock', Func0[datetime.datetime])
-
-
-class DeployManager:
+class DeployDriver:
     def __init__(
             self,
             *,
-            apps: DeployAppManager,
-            paths: DeployPathsManager,
+            spec: DeploySpec,
 
-            utc_clock: ta.Optional[DeployManagerUtcClock] = None,
-    ):
+            deploys: DeployManager,
+            paths: DeployPathsManager,
+            apps: DeployAppManager,
+    ) -> None:
         super().__init__()
 
-        self._apps = apps
-        self._paths = paths
-
-        self._utc_clock = utc_clock
+        self._spec = spec
 
-    def _utc_now(self) -> datetime.datetime:
-        if self._utc_clock is not None:
-            return self._utc_clock()  # noqa
-        else:
-            return datetime.datetime.now(tz=datetime.timezone.utc)  # noqa
-
-    def _make_deploy_time(self) -> DeployTime:
-        return DeployTime(self._utc_now().strftime(DEPLOY_TAG_DATETIME_FMT))
+        self._deploys = deploys
+        self._paths = paths
+        self._apps = apps
 
-    async def run_deploy(
-            self,
-            spec: DeploySpec,
-    ) -> None:
+    async def drive_deploy(self) -> None:
         self._paths.validate_deploy_paths()
 
         #
 
-        hs = check.non_empty_str(spec.home)
+        hs = check.non_empty_str(self._spec.home)
         hs = os.path.expanduser(hs)
         hs = os.path.realpath(hs)
         hs = os.path.abspath(hs)
@@ -64,13 +51,13 @@ class DeployManager:
         #
 
         deploy_tags = DeployTagMap(
-            self._make_deploy_time(),
-            spec.key(),
+            self._deploys.make_deploy_time(),
+            self._spec.key(),
         )
 
         #
 
-        for app in spec.apps:
+        for app in self._spec.apps:
             app_tags = deploy_tags.add(
                 app.app,
                 app.key(),

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

@@ -1,6 +1,9 @@
 # ruff: noqa: UP006 UP007
+import contextlib
 import typing as ta
 
+from omlish.lite.inject import ContextvarInjectorScope
+from omlish.lite.inject import Injector
 from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
@@ -12,16 +15,23 @@ from .commands import DeployCommandExecutor
 from .conf import DeployConfManager
 from .config import DeployConfig
 from .deploy import DeployManager
+from .driver import DeployDriver
+from .driver import DeployDriverFactory
 from .git import DeployGitManager
 from .interp import InterpCommand
 from .interp import InterpCommandExecutor
 from .paths.inject import bind_deploy_paths
 from .paths.owners import DeployPathOwner
+from .specs import DeploySpec
 from .tmp import DeployHomeAtomics
 from .tmp import DeployTmpManager
 from .venvs import DeployVenvManager
 
 
+class DeployInjectorScope(ContextvarInjectorScope):
+    pass
+
+
 def bind_deploy(
         *,
         deploy_config: DeployConfig,
@@ -65,6 +75,25 @@ 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),