ominfra 0.0.0.dev174__tar.gz → 0.0.0.dev175__tar.gz

{ominfra-0.0.0.dev174/ominfra.egg-info → ominfra-0.0.0.dev175}/PKG-INFO

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

{ominfra-0.0.0.dev174 → ominfra-0.0.0.dev175}/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-0.0.0.dev174 → ominfra-0.0.0.dev175}/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-0.0.0.dev174 → ominfra-0.0.0.dev175}/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-0.0.0.dev174 → ominfra-0.0.0.dev175}/ominfra/scripts/manage.py

@@ -7084,7 +7084,7 @@ class FileDeployPathPart(DeployPathPart):
         return 'file'
 
 
-#
+##
 
 
 @dc.dataclass(frozen=True)
@@ -7111,7 +7111,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:
@@ -7206,7 +7206,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)*
@@ -7216,20 +7216,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
-
-
 #
 
 
@@ -7917,6 +7911,7 @@ class DeployConfManager:
     #
 
     class _ComputedConfLink(ta.NamedTuple):
+        conf: DeployConf
         is_dir: bool
         link_src: str
         link_dst: str
@@ -7924,8 +7919,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,
@@ -7939,6 +7935,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 = ''
 
@@ -7946,6 +7943,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
 
@@ -7953,18 +7951,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)
 
@@ -7978,6 +7978,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-0.0.0.dev174 → ominfra-0.0.0.dev175/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev174 → ominfra-0.0.0.dev175}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev174
-omlish==0.0.0.dev174
+omdev==0.0.0.dev175
+omlish==0.0.0.dev175
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev174 → ominfra-0.0.0.dev175}/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.dev174'
+version = '0.0.0.dev175'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev174',
-    'omlish == 0.0.0.dev174',
+    'omdev == 0.0.0.dev175',
+    'omlish == 0.0.0.dev175',
 ]
 
 [project.optional-dependencies]