ominfra 0.0.0.dev194__tar.gz → 0.0.0.dev196__tar.gz

{ominfra-0.0.0.dev194/ominfra.egg-info → ominfra-0.0.0.dev196}/PKG-INFO

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

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/manage/commands/inject.py

@@ -18,6 +18,7 @@ from .base import CommandNameMap
 from .base import CommandRegistration
 from .base import CommandRegistrations
 from .base import build_command_name_map
+from .injection import bind_command
 from .local import LocalCommandExecutor
 from .marshal import install_command_marshaling
 from .ping import PingCommand
@@ -30,26 +31,6 @@ from .types import CommandExecutorMap
 ##
 
 
-def bind_command(
-        command_cls: ta.Type[Command],
-        executor_cls: ta.Optional[ta.Type[CommandExecutor]],
-) -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = [
-        inj.bind(CommandRegistration(command_cls), array=True),
-    ]
-
-    if executor_cls is not None:
-        lst.extend([
-            inj.bind(executor_cls, singleton=True),
-            inj.bind(CommandExecutorRegistration(command_cls, executor_cls), array=True),
-        ])
-
-    return inj.as_bindings(*lst)
-
-
-##
-
-
 @dc.dataclass(frozen=True)
 class _FactoryCommandExecutor(CommandExecutor):
     factory: ta.Callable[[], CommandExecutor]

ominfra-0.0.0.dev196/ominfra/manage/commands/injection.py

@@ -0,0 +1,28 @@
+# ruff: noqa: UP006 UP007
+import typing as ta
+
+from omlish.lite.inject import InjectorBindingOrBindings
+from omlish.lite.inject import InjectorBindings
+from omlish.lite.inject import inj
+
+from .base import Command
+from .base import CommandExecutor
+from .base import CommandExecutorRegistration
+from .base import CommandRegistration
+
+
+def bind_command(
+        command_cls: ta.Type[Command],
+        executor_cls: ta.Optional[ta.Type[CommandExecutor]],
+) -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(CommandRegistration(command_cls), array=True),
+    ]
+
+    if executor_cls is not None:
+        lst.extend([
+            inj.bind(executor_cls, singleton=True),
+            inj.bind(CommandExecutorRegistration(command_cls, executor_cls), array=True),
+        ])
+
+    return inj.as_bindings(*lst)

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/manage/deploy/conf/inject.py

@@ -5,7 +5,7 @@ from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
 
-from ..inject_ import bind_deploy_manager
+from ..injection import bind_deploy_manager
 from .manager import DeployConfManager
 
 

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/manage/deploy/git.py

@@ -1,10 +1,8 @@
 # ruff: noqa: UP006 UP007
 """
 TODO:
- - 'repos'?
-
-git/github.com/wrmsr/omlish <- bootstrap repo
- - shallow clone off bootstrap into /apps
+ - parse refs, resolve revs
+ - non-subtree shallow clone
 
 github.com/wrmsr/omlish@rev
 """
@@ -12,6 +10,7 @@ import functools
 import os.path
 import typing as ta
 
+from omdev.git.subtrees import GitSubtreeCloner
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
@@ -41,6 +40,16 @@ class DeployGitManager(SingleDirDeployPathOwner):
 
         self._repo_dirs: ta.Dict[DeployGitRepo, DeployGitManager.RepoDir] = {}
 
+    #
+
+    def make_repo_url(self, repo: DeployGitRepo) -> str:
+        if repo.username is not None:
+            return f'{repo.username}@{repo.host}:{repo.path}'
+        else:
+            return f'https://{repo.host}/{repo.path}'
+
+    #
+
     class RepoDir:
         def __init__(
                 self,
@@ -59,16 +68,15 @@ class DeployGitManager(SingleDirDeployPathOwner):
                 check.non_empty_str(repo.path),
             )
 
+        #
+
         @property
         def repo(self) -> DeployGitRepo:
             return self._repo
 
         @property
         def url(self) -> str:
-            if self._repo.username is not None:
-                return f'{self._repo.username}@{self._repo.host}:{self._repo.path}'
-            else:
-                return f'https://{self._repo.host}/{self._repo.path}'
+            return self._git.make_repo_url(self._repo)
 
         #
 
@@ -129,16 +137,64 @@ class DeployGitManager(SingleDirDeployPathOwner):
             )
             return repo_dir
 
+    #
+
+    async def shallow_clone(
+            self,
+            spec: DeployGitSpec,
+            home: DeployHome,
+            dst_dir: str,
+    ) -> None:
+        check.state(not os.path.exists(dst_dir))
+        with self._atomics(home).begin_atomic_path_swap(  # noqa
+                'dir',
+                dst_dir,
+                auto_commit=True,
+                make_dirs=True,
+        ) as dst_swap:
+            tdn = '.omlish-git-shallow-clone'
+
+            for cmd in GitSubtreeCloner(
+                    base_dir=dst_swap.tmp_path,
+                    repo_url=self.make_repo_url(spec.repo),
+                    repo_dir=tdn,
+                    rev=spec.rev,
+                    repo_subtrees=spec.subtrees,
+            ).build_commands():
+                await asyncio_subprocesses.check_call(
+                    *cmd.cmd,
+                    cwd=cmd.cwd,
+                )
+
+            td = os.path.join(dst_swap.tmp_path, tdn)
+            check.state(os.path.isdir(td))
+            for n in sorted(os.listdir(td)):
+                os.rename(
+                    os.path.join(td, n),
+                    os.path.join(dst_swap.tmp_path, n),
+                )
+            os.rmdir(td)
+
+    #
+
     async def checkout(
             self,
             spec: DeployGitSpec,
             home: DeployHome,
             dst_dir: str,
     ) -> None:
-        await self.get_repo_dir(
-            spec.repo,
-            home,
-        ).checkout(
-            spec,
-            dst_dir,
-        )
+        if spec.shallow:
+            await self.shallow_clone(
+                spec,
+                home,
+                dst_dir,
+            )
+
+        else:
+            await self.get_repo_dir(
+                spec.repo,
+                home,
+            ).checkout(
+                spec,
+                dst_dir,
+            )

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/manage/deploy/inject.py

@@ -10,7 +10,7 @@ from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
 
-from ..commands.inject import bind_command
+from ..commands.injection import bind_command
 from .apps import DeployAppManager
 from .commands import DeployCommand
 from .commands import DeployCommandExecutor
@@ -20,7 +20,7 @@ from .deploy import DeployDriver
 from .deploy import DeployDriverFactory
 from .deploy import DeployManager
 from .git import DeployGitManager
-from .inject_ import bind_deploy_manager
+from .injection import bind_deploy_manager
 from .interp import InterpCommand
 from .interp import InterpCommandExecutor
 from .paths.inject import bind_deploy_paths

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/manage/deploy/specs.py

@@ -53,6 +53,8 @@ class DeployGitSpec:
 
     subtrees: ta.Optional[ta.Sequence[str]] = None
 
+    shallow: bool = False
+
     def __post_init__(self) -> None:
         check.non_empty_str(self.rev)
         if self.subtrees is not None:

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/manage/system/inject.py

@@ -5,7 +5,7 @@ from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
 
-from ..commands.inject import bind_command
+from ..commands.injection import bind_command
 from .commands import CheckSystemPackageCommand
 from .commands import CheckSystemPackageCommandExecutor
 from .config import SystemConfig

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/scripts/manage.py

@@ -7301,6 +7301,27 @@ def bind_interp_uv() -> InjectorBindings:
     return inj.as_bindings(*lst)
 
 
+########################################
+# ../commands/injection.py
+
+
+def bind_command(
+        command_cls: ta.Type[Command],
+        executor_cls: ta.Optional[ta.Type[CommandExecutor]],
+) -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(CommandRegistration(command_cls), array=True),
+    ]
+
+    if executor_cls is not None:
+        lst.extend([
+            inj.bind(executor_cls, singleton=True),
+            inj.bind(CommandExecutorRegistration(command_cls, executor_cls), array=True),
+        ])
+
+    return inj.as_bindings(*lst)
+
+
 ########################################
 # ../commands/marshal.py
 
@@ -8327,6 +8348,103 @@ class AbstractAsyncSubprocesses(BaseSubprocesses):
             return ret.decode().strip()
 
 
+########################################
+# ../../../omdev/git/subtrees.py
+
+
+@dc.dataclass(frozen=True)
+class GitSubtreeCloner:
+    base_dir: str
+    repo_url: str
+    repo_dir: str
+
+    # _: dc.KW_ONLY
+
+    repo_subtrees: ta.Optional[ta.Sequence[str]] = None
+
+    branch: ta.Optional[str] = None
+    rev: ta.Optional[str] = None
+
+    def __post_init__(self) -> None:
+        if not bool(self.branch) ^ bool(self.rev):
+            raise ValueError('must set branch or rev')
+
+        if isinstance(self.repo_subtrees, str):
+            raise TypeError(self.repo_subtrees)
+
+    @dc.dataclass(frozen=True)
+    class Command:
+        cmd: ta.Sequence[str]
+        cwd: str
+
+    def build_commands(self) -> ta.Iterator[Command]:
+        git_opts = [
+            '-c', 'advice.detachedHead=false',
+        ]
+
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'clone',
+                '-n',
+                '--depth=1',
+                '--filter=tree:0',
+                *(['-b', self.branch] if self.branch else []),
+                '--single-branch',
+                self.repo_url,
+                self.repo_dir,
+            ),
+            cwd=self.base_dir,
+        )
+
+        rd = os.path.join(self.base_dir, self.repo_dir)
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'sparse-checkout',
+                'set',
+                '--no-cone',
+                *(self.repo_subtrees or []),
+            ),
+            cwd=rd,
+        )
+
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'checkout',
+                *([self.rev] if self.rev else []),
+            ),
+            cwd=rd,
+        )
+
+
+def git_clone_subtree(
+        *,
+        base_dir: str,
+        repo_url: str,
+        repo_dir: str,
+        branch: ta.Optional[str] = None,
+        rev: ta.Optional[str] = None,
+        repo_subtrees: ta.Optional[ta.Sequence[str]] = None,
+) -> None:
+    for cmd in GitSubtreeCloner(
+        base_dir=base_dir,
+        repo_url=repo_url,
+        repo_dir=repo_dir,
+        branch=branch,
+        rev=rev,
+        repo_subtrees=repo_subtrees,
+    ).build_commands():
+        subprocesses.check_call(
+            *cmd.cmd,
+            cwd=cmd.cwd,
+        )
+
+
 ########################################
 # ../../../omdev/interp/providers/base.py
 """
@@ -8645,6 +8763,8 @@ class DeployGitSpec:
 
     subtrees: ta.Optional[ta.Sequence[str]] = None
 
+    shallow: bool = False
+
     def __post_init__(self) -> None:
         check.non_empty_str(self.rev)
         if self.subtrees is not None:
@@ -10740,26 +10860,6 @@ class PyenvVersionInstaller:
 ##
 
 
-def bind_command(
-        command_cls: ta.Type[Command],
-        executor_cls: ta.Optional[ta.Type[CommandExecutor]],
-) -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = [
-        inj.bind(CommandRegistration(command_cls), array=True),
-    ]
-
-    if executor_cls is not None:
-        lst.extend([
-            inj.bind(executor_cls, singleton=True),
-            inj.bind(CommandExecutorRegistration(command_cls, executor_cls), array=True),
-        ])
-
-    return inj.as_bindings(*lst)
-
-
-##
-
-
 @dc.dataclass(frozen=True)
 class _FactoryCommandExecutor(CommandExecutor):
     factory: ta.Callable[[], CommandExecutor]
@@ -10834,7 +10934,7 @@ def bind_commands(
 
 
 ########################################
-# ../deploy/inject_.py
+# ../deploy/injection.py
 
 
 def bind_deploy_manager(cls: type) -> InjectorBindings:
@@ -11218,10 +11318,8 @@ def bind_deploy_conf() -> InjectorBindings:
 # ../deploy/git.py
 """
 TODO:
- - 'repos'?
-
-git/github.com/wrmsr/omlish <- bootstrap repo
- - shallow clone off bootstrap into /apps
+ - parse refs, resolve revs
+ - non-subtree shallow clone
 
 github.com/wrmsr/omlish@rev
 """
@@ -11244,6 +11342,16 @@ class DeployGitManager(SingleDirDeployPathOwner):
 
         self._repo_dirs: ta.Dict[DeployGitRepo, DeployGitManager.RepoDir] = {}
 
+    #
+
+    def make_repo_url(self, repo: DeployGitRepo) -> str:
+        if repo.username is not None:
+            return f'{repo.username}@{repo.host}:{repo.path}'
+        else:
+            return f'https://{repo.host}/{repo.path}'
+
+    #
+
     class RepoDir:
         def __init__(
                 self,
@@ -11262,16 +11370,15 @@ class DeployGitManager(SingleDirDeployPathOwner):
                 check.non_empty_str(repo.path),
             )
 
+        #
+
         @property
         def repo(self) -> DeployGitRepo:
             return self._repo
 
         @property
         def url(self) -> str:
-            if self._repo.username is not None:
-                return f'{self._repo.username}@{self._repo.host}:{self._repo.path}'
-            else:
-                return f'https://{self._repo.host}/{self._repo.path}'
+            return self._git.make_repo_url(self._repo)
 
         #
 
@@ -11332,19 +11439,67 @@ class DeployGitManager(SingleDirDeployPathOwner):
             )
             return repo_dir
 
+    #
+
+    async def shallow_clone(
+            self,
+            spec: DeployGitSpec,
+            home: DeployHome,
+            dst_dir: str,
+    ) -> None:
+        check.state(not os.path.exists(dst_dir))
+        with self._atomics(home).begin_atomic_path_swap(  # noqa
+                'dir',
+                dst_dir,
+                auto_commit=True,
+                make_dirs=True,
+        ) as dst_swap:
+            tdn = '.omlish-git-shallow-clone'
+
+            for cmd in GitSubtreeCloner(
+                    base_dir=dst_swap.tmp_path,
+                    repo_url=self.make_repo_url(spec.repo),
+                    repo_dir=tdn,
+                    rev=spec.rev,
+                    repo_subtrees=spec.subtrees,
+            ).build_commands():
+                await asyncio_subprocesses.check_call(
+                    *cmd.cmd,
+                    cwd=cmd.cwd,
+                )
+
+            td = os.path.join(dst_swap.tmp_path, tdn)
+            check.state(os.path.isdir(td))
+            for n in sorted(os.listdir(td)):
+                os.rename(
+                    os.path.join(td, n),
+                    os.path.join(dst_swap.tmp_path, n),
+                )
+            os.rmdir(td)
+
+    #
+
     async def checkout(
             self,
             spec: DeployGitSpec,
             home: DeployHome,
             dst_dir: str,
     ) -> None:
-        await self.get_repo_dir(
-            spec.repo,
-            home,
-        ).checkout(
-            spec,
-            dst_dir,
-        )
+        if spec.shallow:
+            await self.shallow_clone(
+                spec,
+                home,
+                dst_dir,
+            )
+
+        else:
+            await self.get_repo_dir(
+                spec.repo,
+                home,
+            ).checkout(
+                spec,
+                dst_dir,
+            )
 
 
 ########################################

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/scripts/supervisor.py

@@ -4,6 +4,10 @@
 # @omlish-script
 # @omlish-amalg-output ../supervisor/main.py
 # ruff: noqa: N802 UP006 UP007 UP012 UP036
+#
+# Supervisor is Copyright (c) 2006-2015 Agendaless Consulting and Contributors.
+# (http://www.agendaless.com), All Rights Reserved
+#
 # Supervisor is licensed under the following license:
 #
 #  A copyright notice accompanies this license document that identifies the copyright holders.

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/supervisor/LICENSE.txt

@@ -1,3 +1,6 @@
+Supervisor is Copyright (c) 2006-2015 Agendaless Consulting and Contributors.
+(http://www.agendaless.com), All Rights Reserved
+
 Supervisor is licensed under the following license:
 
  A copyright notice accompanies this license document that identifies the copyright holders.

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra/supervisor/main.py

@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
 # ruff: noqa: UP006 UP007
 # @omlish-amalg ../scripts/supervisor.py
+#
+# Supervisor is Copyright (c) 2006-2015 Agendaless Consulting and Contributors.
+# (http://www.agendaless.com), All Rights Reserved
+#
 # Supervisor is licensed under the following license:
 #
 #  A copyright notice accompanies this license document that identifies the copyright holders.

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ ominfra/manage/marshal.py
 ominfra/manage/commands/__init__.py
 ominfra/manage/commands/base.py
 ominfra/manage/commands/inject.py
+ominfra/manage/commands/injection.py
 ominfra/manage/commands/local.py
 ominfra/manage/commands/marshal.py
 ominfra/manage/commands/ping.py
@@ -60,7 +61,7 @@ ominfra/manage/deploy/config.py
 ominfra/manage/deploy/deploy.py
 ominfra/manage/deploy/git.py
 ominfra/manage/deploy/inject.py
-ominfra/manage/deploy/inject_.py
+ominfra/manage/deploy/injection.py
 ominfra/manage/deploy/interp.py
 ominfra/manage/deploy/nginx.py
 ominfra/manage/deploy/specs.py

{ominfra-0.0.0.dev194 → ominfra-0.0.0.dev196}/ominfra.egg-info/requires.txt

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

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