ominfra 0.0.0.dev315__py3-none-any.whl → 0.0.0.dev488__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/__about__.py

@@ -8,13 +8,16 @@ 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
         ],

ominfra/clouds/aws/auth.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 # @omlish-lite
 """
 https://docs.aws.amazon.com/IAM/latest/UserGuide/create-signed-request.html
@@ -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/cli.py

@@ -4,6 +4,9 @@ from omlish.formats import json
 from . import metadata
 
 
+##
+
+
 class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('key', nargs='*'),

ominfra/clouds/aws/dataclasses.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 # @omlish-lite
 import collections.abc
 import dataclasses as dc
@@ -11,6 +11,9 @@ from omlish.lite.reflect import is_optional_alias
 from omlish.lite.strings import camel_case
 
 
+##
+
+
 class AwsDataclass:
     class Raw(dict):
         pass

ominfra/clouds/aws/instancetypes/cache.py

@@ -5,6 +5,9 @@ from omlish import lang
 from omlish.formats import json
 
 
+##
+
+
 @lang.cached_function()
 def load_instance_types() -> ta.Mapping[str, ta.Mapping[str, ta.Any]]:
     raw = lang.get_relative_resources(globals=globals())['cache.json.gz'].read_bytes()

ominfra/clouds/aws/instancetypes/cli.py

@@ -18,6 +18,9 @@ else:
     boto3 = lang.proxy_import('boto3')
 
 
+##
+
+
 # Use a hardcoded gz mtime to prevent the gz file from changing when the contents don't. We still have the git metadata
 # to track modifications.
 FIXED_CACHE_TIMESTAMP = datetime.datetime(2025, 1, 1, tzinfo=datetime.UTC).timestamp()
@@ -28,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

@@ -1,8 +1,14 @@
-# ruff: noqa: UP007
+# ruff: noqa: UP007 UP045
 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
+
+
+##
 
 
 class JournalctlToAwsCursor:
@@ -13,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

@@ -1,4 +1,4 @@
-# ruff: noqa: UP007
+# ruff: noqa: UP007 UP045
 """
 TODO:
  - create log group
@@ -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

@@ -10,6 +10,9 @@ from omlish.logs.standard import configure_standard_logging
 from .driver import JournalctlToAwsDriver
 
 
+##
+
+
 def _main() -> None:
     parser = argparse.ArgumentParser()
 

ominfra/clouds/aws/journald2aws/poster.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP007
+# ruff: noqa: UP007 UP045
 """
 TODO:
  - retries
@@ -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,12 @@ from ..logs import AwsPutLogEventsResponse
 from .cursor import JournalctlToAwsCursor
 
 
+log = get_module_logger(globals())  # noqa
+
+
+##
+
+
 class JournalctlToAwsPosterWorker(ThreadWorker):
     def __init__(
             self,
@@ -31,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/logs.py

@@ -1,5 +1,5 @@
 # @omlish-lite
-# ruff: noqa: UP007
+# ruff: noqa: UP007 UP045
 """
 https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutLogEvents.html :
  - The maximum batch size is 1,048,576 bytes. This size is calculated as the sum of all event messages in UTF-8, plus 26

ominfra/clouds/aws/metadata.py

@@ -13,6 +13,9 @@ from omlish import check
 from omlish import lang
 
 
+##
+
+
 DEFAULT_METADATA_URL = 'http://169.254.169.254/'
 
 METADATA_TOKEN_HEADER = 'X-aws-ec2-metadata-token'  # noqa

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