ominfra 0.0.0.dev191__tar.gz → 0.0.0.dev192__tar.gz

{ominfra-0.0.0.dev191/ominfra.egg-info → ominfra-0.0.0.dev192}/PKG-INFO

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

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/manage/deploy/apps.py

@@ -84,6 +84,8 @@ class DeployAppManager(DeployPathOwner):
             spec: DeployAppSpec,
             home: DeployHome,
             tags: DeployTagMap,
+            *,
+            conf_string_ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
     ) -> PreparedApp:
         spec_json = json_dumps_pretty(self._msh.marshal_obj(spec))
 
@@ -140,9 +142,17 @@ class DeployAppManager(DeployPathOwner):
         if spec.conf is not None:
             conf_dir = os.path.join(app_dir, 'conf')
             rkw.update(conf_dir=conf_dir)
+
+            conf_ns: ta.Dict[str, ta.Any] = dict(
+                **(conf_string_ns or {}),
+                app=spec.app.s,
+                app_dir=app_dir.rstrip('/'),
+            )
+
             await self._conf.write_app_conf(
                 spec.conf,
                 conf_dir,
+                string_ns=conf_ns,
             )
 
         #

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/manage/deploy/conf/manager.py

@@ -133,9 +133,15 @@ class DeployConfManager:
             self,
             spec: DeployAppConfSpec,
             app_conf_dir: str,
+            *,
+            string_ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
     ) -> None:
-        def process_str(s: str) -> str:
-            return s
+        process_str: ta.Any
+        if string_ns is not None:
+            def process_str(s: str) -> str:
+                return s.format(**string_ns)
+        else:
+            process_str = None
 
         for acf in spec.files or []:
             await self._write_app_conf_file(

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/manage/deploy/deploy.py

@@ -30,7 +30,7 @@ from .types import DeployHome
 ##
 
 
-DEPLOY_TAG_DATETIME_FMT = '%Y%m%dT%H%M%SZ'
+DEPLOY_TAG_DATETIME_FMT = '%Y-%m-%d-T-%H-%M-%S-%f-Z'
 
 
 DeployManagerUtcClock = ta.NewType('DeployManagerUtcClock', Func0[datetime.datetime])
@@ -183,8 +183,9 @@ class DeployDriver:
 
         das: ta.Set[DeployApp] = {a.app for a in self._spec.apps}
         las: ta.Set[DeployApp] = set(self._spec.app_links.apps)
-        if (ras := das & las):
-            raise RuntimeError(f'Must not specify apps as both deploy and link: {sorted(a.s for a in ras)}')
+        ras: ta.Set[DeployApp] = set(self._spec.app_links.removed_apps)
+        check.empty(das & (las | ras))
+        check.empty(las & ras)
 
         #
 
@@ -230,10 +231,10 @@ class DeployDriver:
             cad = abs_real_path(os.path.join(current_link, 'apps'))
             if os.path.exists(cad):
                 for d in os.listdir(cad):
-                    if (da := DeployApp(d)) not in das:
+                    if (da := DeployApp(d)) not in das and da not in ras:
                         las.add(da)
 
-        for la in self._spec.app_links.apps:
+        for la in las:
             await self._drive_app_link(
                 la,
                 current_link,
@@ -263,10 +264,16 @@ class DeployDriver:
     #
 
     async def _drive_app_deploy(self, app: DeployAppSpec) -> None:
+        current_deploy_link = os.path.join(self._home, self._deploys.CURRENT_DEPLOY_LINK.render())
+
         pa = await self._apps.prepare_app(
             app,
             self._home,
             self.tags,
+            conf_string_ns=dict(
+                deploy_home=self._home,
+                current_deploy_link=current_deploy_link,
+            ),
         )
 
         #

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/manage/deploy/git.py

@@ -91,7 +91,9 @@ class DeployGitManager(SingleDirDeployPathOwner):
 
         async def fetch(self, rev: DeployRev) -> None:
             await self.init()
-            await self._call('git', 'fetch', '--depth=1', 'origin', rev)
+
+            # This fetch shouldn't be depth=1 - git doesn't reuse local data with shallow fetches.
+            await self._call('git', 'fetch', 'origin', rev)
 
         #
 

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/manage/deploy/specs.py

@@ -95,6 +95,8 @@ class DeployAppSpec(DeploySpecKeyed[DeployAppKey]):
 class DeployAppLinksSpec:
     apps: ta.Sequence[DeployApp] = ()
 
+    removed_apps: ta.Sequence[DeployApp] = ()
+
     exclude_unspecified: bool = False
 
 

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/manage/deploy/systemd.py

@@ -8,6 +8,7 @@ TODO:
   - ominfra.systemd / x.sd_orphans
 """
 import os.path
+import shutil
 import sys
 import typing as ta
 
@@ -101,7 +102,7 @@ class DeploySystemdManager:
 
         #
 
-        if sys.platform == 'linux':
+        if sys.platform == 'linux' and shutil.which('systemctl') is not None:
             async def reload() -> None:
                 await asyncio_subprocesses.check_call('systemctl', '--user', 'daemon-reload')
 

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/scripts/manage.py

@@ -9353,9 +9353,15 @@ class DeployConfManager:
             self,
             spec: DeployAppConfSpec,
             app_conf_dir: str,
+            *,
+            string_ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
     ) -> None:
-        def process_str(s: str) -> str:
-            return s
+        process_str: ta.Any
+        if string_ns is not None:
+            def process_str(s: str) -> str:
+                return s.format(**string_ns)
+        else:
+            process_str = None
 
         for acf in spec.files or []:
             await self._write_app_conf_file(
@@ -9608,6 +9614,8 @@ class DeployAppSpec(DeploySpecKeyed[DeployAppKey]):
 class DeployAppLinksSpec:
     apps: ta.Sequence[DeployApp] = ()
 
+    removed_apps: ta.Sequence[DeployApp] = ()
+
     exclude_unspecified: bool = False
 
 
@@ -10967,7 +10975,9 @@ class DeployGitManager(SingleDirDeployPathOwner):
 
         async def fetch(self, rev: DeployRev) -> None:
             await self.init()
-            await self._call('git', 'fetch', '--depth=1', 'origin', rev)
+
+            # This fetch shouldn't be depth=1 - git doesn't reuse local data with shallow fetches.
+            await self._call('git', 'fetch', 'origin', rev)
 
         #
 
@@ -11125,7 +11135,7 @@ class DeploySystemdManager:
 
         #
 
-        if sys.platform == 'linux':
+        if sys.platform == 'linux' and shutil.which('systemctl') is not None:
             async def reload() -> None:
                 await asyncio_subprocesses.check_call('systemctl', '--user', 'daemon-reload')
 
@@ -11614,6 +11624,8 @@ class DeployAppManager(DeployPathOwner):
             spec: DeployAppSpec,
             home: DeployHome,
             tags: DeployTagMap,
+            *,
+            conf_string_ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
     ) -> PreparedApp:
         spec_json = json_dumps_pretty(self._msh.marshal_obj(spec))
 
@@ -11670,9 +11682,17 @@ class DeployAppManager(DeployPathOwner):
         if spec.conf is not None:
             conf_dir = os.path.join(app_dir, 'conf')
             rkw.update(conf_dir=conf_dir)
+
+            conf_ns: ta.Dict[str, ta.Any] = dict(
+                **(conf_string_ns or {}),
+                app=spec.app.s,
+                app_dir=app_dir.rstrip('/'),
+            )
+
             await self._conf.write_app_conf(
                 spec.conf,
                 conf_dir,
+                string_ns=conf_ns,
             )
 
         #
@@ -11735,7 +11755,7 @@ class DeployAppManager(DeployPathOwner):
 ##
 
 
-DEPLOY_TAG_DATETIME_FMT = '%Y%m%dT%H%M%SZ'
+DEPLOY_TAG_DATETIME_FMT = '%Y-%m-%d-T-%H-%M-%S-%f-Z'
 
 
 DeployManagerUtcClock = ta.NewType('DeployManagerUtcClock', Func0[datetime.datetime])
@@ -11888,8 +11908,9 @@ class DeployDriver:
 
         das: ta.Set[DeployApp] = {a.app for a in self._spec.apps}
         las: ta.Set[DeployApp] = set(self._spec.app_links.apps)
-        if (ras := das & las):
-            raise RuntimeError(f'Must not specify apps as both deploy and link: {sorted(a.s for a in ras)}')
+        ras: ta.Set[DeployApp] = set(self._spec.app_links.removed_apps)
+        check.empty(das & (las | ras))
+        check.empty(las & ras)
 
         #
 
@@ -11935,10 +11956,10 @@ class DeployDriver:
             cad = abs_real_path(os.path.join(current_link, 'apps'))
             if os.path.exists(cad):
                 for d in os.listdir(cad):
-                    if (da := DeployApp(d)) not in das:
+                    if (da := DeployApp(d)) not in das and da not in ras:
                         las.add(da)
 
-        for la in self._spec.app_links.apps:
+        for la in las:
             await self._drive_app_link(
                 la,
                 current_link,
@@ -11968,10 +11989,16 @@ class DeployDriver:
     #
 
     async def _drive_app_deploy(self, app: DeployAppSpec) -> None:
+        current_deploy_link = os.path.join(self._home, self._deploys.CURRENT_DEPLOY_LINK.render())
+
         pa = await self._apps.prepare_app(
             app,
             self._home,
             self.tags,
+            conf_string_ns=dict(
+                deploy_home=self._home,
+                current_deploy_link=current_deploy_link,
+            ),
         )
 
         #

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/scripts/supervisor.py

@@ -6481,6 +6481,12 @@ class ServerConfig:
     # TODO: implement - make sure to accept broken symlinks
     group_config_dirs: ta.Optional[ta.Sequence[str]] = None
 
+    #
+
+    http_port: ta.Optional[int] = None
+
+    #
+
     @classmethod
     def new(
             cls,
@@ -8354,7 +8360,7 @@ class HttpServer(HasDispatchers):
     def __init__(
             self,
             handler: Handler,
-            addr: Address = Address(('localhost', 8000)),
+            addr: Address,  # = Address(('localhost', 8000)),
             *,
             exit_stack: contextlib.ExitStack,
     ) -> None:
@@ -9617,16 +9623,19 @@ def bind_server(
 
     #
 
-    def _provide_http_handler(s: SupervisorHttpHandler) -> HttpServer.Handler:
-        return HttpServer.Handler(s.handle)
+    if config.http_port is not None:
+        def _provide_http_handler(s: SupervisorHttpHandler) -> HttpServer.Handler:
+            return HttpServer.Handler(s.handle)
 
-    lst.extend([
-        inj.bind(HttpServer, singleton=True, eager=True),
-        inj.bind(HasDispatchers, array=True, to_key=HttpServer),
+        lst.extend([
+            inj.bind(HttpServer, singleton=True, eager=True),
+            inj.bind(HasDispatchers, array=True, to_key=HttpServer),
 
-        inj.bind(SupervisorHttpHandler, singleton=True),
-        inj.bind(_provide_http_handler),
-    ])
+            inj.bind(HttpServer.Address(('localhost', config.http_port))),
+
+            inj.bind(SupervisorHttpHandler, singleton=True),
+            inj.bind(_provide_http_handler),
+        ])
 
     #
 

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/supervisor/configs.py

@@ -248,6 +248,12 @@ class ServerConfig:
     # TODO: implement - make sure to accept broken symlinks
     group_config_dirs: ta.Optional[ta.Sequence[str]] = None
 
+    #
+
+    http_port: ta.Optional[int] = None
+
+    #
+
     @classmethod
     def new(
             cls,

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/supervisor/http.py

@@ -60,7 +60,7 @@ class HttpServer(HasDispatchers):
     def __init__(
             self,
             handler: Handler,
-            addr: Address = Address(('localhost', 8000)),
+            addr: Address,  # = Address(('localhost', 8000)),
             *,
             exit_stack: contextlib.ExitStack,
     ) -> None:

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra/supervisor/inject.py

@@ -131,16 +131,19 @@ def bind_server(
 
     #
 
-    def _provide_http_handler(s: SupervisorHttpHandler) -> HttpServer.Handler:
-        return HttpServer.Handler(s.handle)
+    if config.http_port is not None:
+        def _provide_http_handler(s: SupervisorHttpHandler) -> HttpServer.Handler:
+            return HttpServer.Handler(s.handle)
 
-    lst.extend([
-        inj.bind(HttpServer, singleton=True, eager=True),
-        inj.bind(HasDispatchers, array=True, to_key=HttpServer),
+        lst.extend([
+            inj.bind(HttpServer, singleton=True, eager=True),
+            inj.bind(HasDispatchers, array=True, to_key=HttpServer),
 
-        inj.bind(SupervisorHttpHandler, singleton=True),
-        inj.bind(_provide_http_handler),
-    ])
+            inj.bind(HttpServer.Address(('localhost', config.http_port))),
+
+            inj.bind(SupervisorHttpHandler, singleton=True),
+            inj.bind(_provide_http_handler),
+        ])
 
     #
 

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/ominfra.egg-info/requires.txt

@@ -1,6 +1,6 @@
-omdev==0.0.0.dev191
-omlish==0.0.0.dev191
-omserv==0.0.0.dev191
+omdev==0.0.0.dev192
+omlish==0.0.0.dev192
+omserv==0.0.0.dev192
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev191 → ominfra-0.0.0.dev192}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev191'
+version = '0.0.0.dev192'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,9 +22,9 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev191',
-    'omlish == 0.0.0.dev191',
-    'omserv == 0.0.0.dev191',
+    'omdev == 0.0.0.dev192',
+    'omlish == 0.0.0.dev192',
+    'omserv == 0.0.0.dev192',
 ]
 
 [project.optional-dependencies]