ominfra 0.0.0.dev368__py3-none-any.whl → 0.0.0.dev501__py3-none-any.whl

ominfra/{.manifests.json → .omlish-manifests.json}

@@ -5,9 +5,9 @@
     "file": "ominfra/clouds/aws/__main__.py",
     "line": 4,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "aws",
-        "mod_name": "ominfra.clouds.aws.__main__"
+      "!omdev.cli.types.CliModule": {
+        "name": "aws",
+        "module": "ominfra.clouds.aws.__main__"
       }
     }
   },
@@ -17,12 +17,12 @@
     "file": "ominfra/tailscale/cli.py",
     "line": 118,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": [
+      "!omdev.cli.types.CliModule": {
+        "name": [
           "tailscale",
           "ts"
         ],
-        "mod_name": "ominfra.tailscale.cli"
+        "module": "ominfra.tailscale.cli"
       }
     }
   }

ominfra/README.md

@@ -0,0 +1,26 @@
+# Overview
+
+Infrastructure and cloud code.
+
+# Notable packages
+
+- **[clouds.aws](https://github.com/wrmsr/omlish/blob/master/ominfra/clouds/aws)** - boto-less aws tools, including
+  authentication and generated service dataclasses.
+
+- **[journald2aws](https://github.com/wrmsr/omlish/blob/master/ominfra/clouds/aws/journald2aws)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/ominfra/scripts/journald2aws.py)) - a self-contained little tool
+  that forwards journald to cloudwatch.
+
+- **[pyremote](https://github.com/wrmsr/omlish/blob/master/ominfra/pyremote.py)** - does the
+  [mitogen trick](https://mitogen.networkgenomics.com/howitworks.html) to facilitate remote execution of python code.
+  due to amalgamation, import shenanigans aren't required to do useful work.
+
+- **[manage](https://github.com/wrmsr/omlish/blob/master/ominfra/manage)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/ominfra/scripts/manage.py)) - a remote system management tool,
+  including a code deployment system. inspired by things like [mitogen](https://mitogen.networkgenomics.com/),
+  [pyinfra](https://github.com/pyinfra-dev/pyinfra), [piku](https://github.com/piku/piku). uses pyremote.
+
+- **[supervisor](https://github.com/wrmsr/omlish/blob/master/ominfra/supervisor)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/ominfra/scripts/supervisor.py)) - an overhauled,
+  [amalgamated](https://github.com/wrmsr/omlish/blob/master/omdev#amalgamation) fork of
+  [supervisor](https://github.com/Supervisor/supervisor)

ominfra/__about__.py

@@ -8,15 +8,18 @@ class Project(ProjectBase):
     description = 'ominfra'
 
     dependencies = [
-        f'omdev == {__version__}',
         f'omlish == {__version__}',
     ]
 
     optional_dependencies = {
+        'omdev': [
+            f'omdev == {__version__}',
+        ],
+
         'ssh': [
-            'paramiko ~= 3.5',  # !! LGPL
+            'paramiko ~= 4.0',  # !! LGPL
 
-            'asyncssh ~= 2.21',  # cffi
+            'asyncssh ~= 2.22',  # cffi
         ],
     }
 

ominfra/clouds/aws/auth.py

@@ -31,6 +31,7 @@ class AwsSigner:
             service_name: str,
     ) -> None:
         super().__init__()
+
         self._creds = creds
         self._region_name = region_name
         self._service_name = service_name

ominfra/clouds/aws/instancetypes/cli.py

@@ -31,7 +31,7 @@ def _get_secrets() -> sec.Secrets:
     return load_secrets()
 
 
-def get_ec2_instance_types(session: boto3.Session) -> dict[str, dict[str, ta.Any]]:
+def get_ec2_instance_types(session: 'boto3.Session') -> dict[str, dict[str, ta.Any]]:
     ec2 = session.client('ec2')
     next_token = None
     dct = {}

ominfra/clouds/aws/journald2aws/cursor.py

@@ -2,7 +2,10 @@
 import os.path
 import typing as ta
 
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
+
+
+log = get_module_logger(globals())  # noqa
 
 
 ##
@@ -16,6 +19,7 @@ class JournalctlToAwsCursor:
             ensure_locked: ta.Optional[ta.Callable[[], None]] = None,
     ) -> None:
         super().__init__()
+
         self._cursor_file = cursor_file
         self._ensure_locked = ensure_locked
 

ominfra/clouds/aws/journald2aws/driver.py

@@ -40,8 +40,8 @@ import typing as ta
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import ExitStacked
-from omlish.lite.logs import log
 from omlish.lite.runtime import is_debugger_attached
+from omlish.logs.modules import get_module_logger
 from omlish.os.pidfiles.pidfile import Pidfile
 
 from ....journald.messages import JournalctlMessage  # noqa
@@ -53,6 +53,9 @@ from .cursor import JournalctlToAwsCursor
 from .poster import JournalctlToAwsPosterWorker
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

ominfra/clouds/aws/journald2aws/main.py

@@ -5,7 +5,7 @@ import os.path
 import sys
 
 from omlish.lite.configs import load_config_file_obj
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.std.standard import configure_standard_logging
 
 from .driver import JournalctlToAwsDriver
 

ominfra/clouds/aws/journald2aws/poster.py

@@ -9,7 +9,7 @@ import time
 import typing as ta
 import urllib.request
 
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 from ....journald.messages import JournalctlMessage  # noqa
 from ....threadworkers import ThreadWorker
@@ -18,6 +18,9 @@ from ..logs import AwsPutLogEventsResponse
 from .cursor import JournalctlToAwsCursor
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -34,6 +37,7 @@ class JournalctlToAwsPosterWorker(ThreadWorker):
             **kwargs: ta.Any,
     ) -> None:
         super().__init__(**kwargs)
+
         self._queue = queue
         self._builder = builder
         self._cursor = cursor

ominfra/clouds/aws/models/{base.py → base/__init__.py}

@@ -1,4 +1,3 @@
-import abc
 import typing as ta
 
 from omlish import cached
@@ -8,6 +7,12 @@ from omlish import dataclasses as dc
 from omlish import lang
 
 
+dc.init_package(
+    globals(),
+    codegen=True,
+)
+
+
 DateTime = ta.NewType('DateTime', str)
 MillisecondDateTime = ta.NewType('MillisecondDateTime', str)
 
@@ -29,7 +34,7 @@ TagList: ta.TypeAlias = ta.Sequence[Tag]
 ##
 
 
-class ValueType(abc.ABC):  # noqa
+class ValueType(lang.Abstract):
     pass