ominfra 0.0.0.dev156__tar.gz → 0.0.0.dev157__tar.gz

{ominfra-0.0.0.dev156/ominfra.egg-info → ominfra-0.0.0.dev157}/PKG-INFO

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

{ominfra-0.0.0.dev156 → ominfra-0.0.0.dev157}/ominfra/manage/main.py

@@ -6,18 +6,23 @@ manage.py -s 'docker run -i python:3.12'
 manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 """
 import asyncio
+import dataclasses as dc
 import json
+import os.path
 import sys
 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.lite.cached import cached_nullary
+from omlish.lite.check import check
 from omlish.lite.logs import log  # noqa
 from omlish.lite.marshal import ObjMarshalerManager
 from omlish.lite.marshal import ObjMarshalOptions
 from omlish.lite.pycharm import PycharmRemoteDebug
 
+from ..configs import read_config_file
 from .bootstrap import MainBootstrap
 from .bootstrap_ import main_bootstrap
 from .commands.base import Command
@@ -28,7 +33,28 @@ from .targets.connection import ManageTargetConnector
 from .targets.targets import ManageTarget
 
 
+@dc.dataclass(frozen=True)
+class ManageConfig:
+    targets: ta.Optional[ta.Mapping[str, ManageTarget]] = None
+
+
 class MainCli(ArgparseCli):
+    config_file: ta.Optional[str] = argparse_arg('--config-file', help='Config file path')  # type: ignore
+
+    @cached_nullary
+    def config(self) -> ManageConfig:
+        if (cf := self.config_file) is None:
+            cf = os.path.expanduser('~/.omlish/manage.yml')
+            if not os.path.isfile(cf):
+                cf = None
+
+        if cf is None:
+            return ManageConfig()
+        else:
+            return read_config_file(cf, ManageConfig)
+
+    #
+
     @argparse_command(
         argparse_arg('--_payload-file'),
 
@@ -80,10 +106,13 @@ class MainCli(ArgparseCli):
 
         msh = injector[ObjMarshalerManager]
 
-        ts = self.args.target
-        if not ts.startswith('{'):
-            ts = json.dumps({ts: {}})
-        tgt: ManageTarget = msh.unmarshal_obj(json.loads(ts), ManageTarget)
+        tgt: ManageTarget
+        if not (ts := self.args.target).startswith('{'):
+            tgt = check.not_none(self.config().targets)[ts]
+        else:
+            tgt = msh.unmarshal_obj(json.loads(ts), ManageTarget)
+
+        #
 
         cmds: ta.List[Command] = []
         cmd: Command

{ominfra-0.0.0.dev156 → ominfra-0.0.0.dev157}/ominfra/manage/remote/spawning.py

@@ -11,7 +11,6 @@ from omlish.lite.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
 from omlish.lite.subprocesses import SUBPROCESS_CHANNEL_OPTION_VALUES
 from omlish.lite.subprocesses import SubprocessChannelOption
-from omlish.lite.subprocesses import subprocess_maybe_shell_wrap_exec
 
 
 ##
@@ -82,12 +81,8 @@ class SubprocessRemoteSpawning(RemoteSpawning):
     ) -> ta.AsyncGenerator[RemoteSpawning.Spawned, None]:
         pc = self._prepare_cmd(tgt, src)
 
-        cmd = pc.cmd
-        if not debug:
-            cmd = subprocess_maybe_shell_wrap_exec(*cmd)
-
         async with asyncio_subprocesses.popen(
-                *cmd,
+                *pc.cmd,
                 shell=pc.shell,
                 stdin=subprocess.PIPE,
                 stdout=subprocess.PIPE,

{ominfra-0.0.0.dev156 → ominfra-0.0.0.dev157}/ominfra/scripts/journald2aws.py

@@ -932,8 +932,8 @@ class _CachedNullary(_AbstractCachedNullary):
         return self._value
 
 
-def cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
-    return _CachedNullary(fn)
+def cached_nullary(fn: CallableT) -> CallableT:
+    return _CachedNullary(fn)  # type: ignore
 
 
 def static_init(fn: CallableT) -> CallableT:
@@ -2559,6 +2559,7 @@ TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
  - namedtuple
  - literals
+ - newtypes?
 """