ominfra 0.0.0.dev424__tar.gz → 0.0.0.dev425__tar.gz

{ominfra-0.0.0.dev424/ominfra.egg-info → ominfra-0.0.0.dev425}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev424
+Version: 0.0.0.dev425
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev424
-Requires-Dist: omlish==0.0.0.dev424
+Requires-Dist: omdev==0.0.0.dev425
+Requires-Dist: omlish==0.0.0.dev425
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425}/ominfra/clouds/aws/models/services/ec2.py

@@ -1328,6 +1328,37 @@ class InstanceType(_enum.Enum):
     R8I_FLEX_8XLARGE = 'r8i-flex.8xlarge'
     R8I_FLEX_12XLARGE = 'r8i-flex.12xlarge'
     R8I_FLEX_16XLARGE = 'r8i-flex.16xlarge'
+    M8I_LARGE = 'm8i.large'
+    M8I_XLARGE = 'm8i.xlarge'
+    M8I_2XLARGE = 'm8i.2xlarge'
+    M8I_4XLARGE = 'm8i.4xlarge'
+    M8I_8XLARGE = 'm8i.8xlarge'
+    M8I_12XLARGE = 'm8i.12xlarge'
+    M8I_16XLARGE = 'm8i.16xlarge'
+    M8I_24XLARGE = 'm8i.24xlarge'
+    M8I_32XLARGE = 'm8i.32xlarge'
+    M8I_48XLARGE = 'm8i.48xlarge'
+    M8I_96XLARGE = 'm8i.96xlarge'
+    M8I_METAL_48XL = 'm8i.metal-48xl'
+    M8I_METAL_96XL = 'm8i.metal-96xl'
+    M8I_FLEX_LARGE = 'm8i-flex.large'
+    M8I_FLEX_XLARGE = 'm8i-flex.xlarge'
+    M8I_FLEX_2XLARGE = 'm8i-flex.2xlarge'
+    M8I_FLEX_4XLARGE = 'm8i-flex.4xlarge'
+    M8I_FLEX_8XLARGE = 'm8i-flex.8xlarge'
+    M8I_FLEX_12XLARGE = 'm8i-flex.12xlarge'
+    M8I_FLEX_16XLARGE = 'm8i-flex.16xlarge'
+    I8GE_LARGE = 'i8ge.large'
+    I8GE_XLARGE = 'i8ge.xlarge'
+    I8GE_2XLARGE = 'i8ge.2xlarge'
+    I8GE_3XLARGE = 'i8ge.3xlarge'
+    I8GE_6XLARGE = 'i8ge.6xlarge'
+    I8GE_12XLARGE = 'i8ge.12xlarge'
+    I8GE_18XLARGE = 'i8ge.18xlarge'
+    I8GE_24XLARGE = 'i8ge.24xlarge'
+    I8GE_48XLARGE = 'i8ge.48xlarge'
+    I8GE_METAL_24XL = 'i8ge.metal-24xl'
+    I8GE_METAL_48XL = 'i8ge.metal-48xl'
 
 
 class InstanceTypeHypervisor(_enum.Enum):

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425}/ominfra/scripts/journald2aws.py

@@ -2356,13 +2356,13 @@ def format_num_bytes(num_bytes: int) -> str:
 
 
 ########################################
-# ../../../../../omlish/logs/filters.py
+# ../../../../../omlish/logs/std/filters.py
 
 
 ##
 
 
-class TidLogFilter(logging.Filter):
+class TidLoggingFilter(logging.Filter):
     def filter(self, record):
         # FIXME: handle better - missing from wasm and cosmos
         if hasattr(threading, 'get_native_id'):
@@ -2373,13 +2373,13 @@ class TidLogFilter(logging.Filter):
 
 
 ########################################
-# ../../../../../omlish/logs/proxy.py
+# ../../../../../omlish/logs/std/proxy.py
 
 
 ##
 
 
-class ProxyLogFilterer(logging.Filterer):
+class ProxyLoggingFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
 
@@ -2405,9 +2405,9 @@ class ProxyLogFilterer(logging.Filterer):
         return self._underlying.filter(record)
 
 
-class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+class ProxyLoggingHandler(ProxyLoggingFilterer, logging.Handler):
     def __init__(self, underlying: logging.Handler) -> None:  # noqa
-        ProxyLogFilterer.__init__(self, underlying)
+        ProxyLoggingFilterer.__init__(self, underlying)
 
     _underlying: logging.Handler
 
@@ -4618,7 +4618,7 @@ def check_lite_runtime_version() -> None:
 
 
 ########################################
-# ../../../../../omlish/logs/json.py
+# ../../../../../omlish/logs/std/json.py
 """
 TODO:
  - translate json keys
@@ -4628,7 +4628,7 @@ TODO:
 ##
 
 
-class JsonLogFormatter(logging.Formatter):
+class JsonLoggingFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,
         'msg': False,
@@ -4957,6 +4957,7 @@ def load_config_file_obj(
 # ../../../../../omlish/logs/standard.py
 """
 TODO:
+ - !! move to std !!
  - structured
  - prefixed
  - debug
@@ -4978,7 +4979,7 @@ STANDARD_LOG_FORMAT_PARTS = [
 ]
 
 
-class StandardLogFormatter(logging.Formatter):
+class StandardLoggingFormatter(logging.Formatter):
     @staticmethod
     def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
         return ' '.join(v for k, v in parts)
@@ -4997,7 +4998,7 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardConfiguredLogHandler(ProxyLogHandler):
+class StandardConfiguredLoggingHandler(ProxyLoggingHandler):
     def __init_subclass__(cls, **kwargs):
         raise TypeError('This class serves only as a marker and should not be subclassed.')
 
@@ -5030,7 +5031,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardConfiguredLogHandler]:
+) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -5038,7 +5039,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLoggingHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -5052,14 +5053,14 @@ def configure_standard_logging(
 
         formatter: logging.Formatter
         if json:
-            formatter = JsonLogFormatter()
+            formatter = JsonLoggingFormatter()
         else:
-            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
         handler.setFormatter(formatter)
 
         #
 
-        handler.addFilter(TidLogFilter())
+        handler.addFilter(TidLoggingFilter())
 
         #
 
@@ -5072,7 +5073,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardConfiguredLogHandler(handler)
+        return StandardConfiguredLoggingHandler(handler)
 
 
 ########################################

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425}/ominfra/scripts/manage.py

@@ -3659,13 +3659,13 @@ def typing_annotations_attr() -> str:
 
 
 ########################################
-# ../../../omlish/logs/filters.py
+# ../../../omlish/logs/std/filters.py
 
 
 ##
 
 
-class TidLogFilter(logging.Filter):
+class TidLoggingFilter(logging.Filter):
     def filter(self, record):
         # FIXME: handle better - missing from wasm and cosmos
         if hasattr(threading, 'get_native_id'):
@@ -3676,13 +3676,13 @@ class TidLogFilter(logging.Filter):
 
 
 ########################################
-# ../../../omlish/logs/proxy.py
+# ../../../omlish/logs/std/proxy.py
 
 
 ##
 
 
-class ProxyLogFilterer(logging.Filterer):
+class ProxyLoggingFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
 
@@ -3708,9 +3708,9 @@ class ProxyLogFilterer(logging.Filterer):
         return self._underlying.filter(record)
 
 
-class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+class ProxyLoggingHandler(ProxyLoggingFilterer, logging.Handler):
     def __init__(self, underlying: logging.Handler) -> None:  # noqa
-        ProxyLogFilterer.__init__(self, underlying)
+        ProxyLoggingFilterer.__init__(self, underlying)
 
     _underlying: logging.Handler
 
@@ -7277,7 +7277,7 @@ class PredicateTimeout(Timeout):
 
 
 ########################################
-# ../../../omlish/logs/json.py
+# ../../../omlish/logs/std/json.py
 """
 TODO:
  - translate json keys
@@ -7287,7 +7287,7 @@ TODO:
 ##
 
 
-class JsonLogFormatter(logging.Formatter):
+class JsonLoggingFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,
         'msg': False,
@@ -9386,6 +9386,7 @@ inj = InjectionApi()
 # ../../../omlish/logs/standard.py
 """
 TODO:
+ - !! move to std !!
  - structured
  - prefixed
  - debug
@@ -9407,7 +9408,7 @@ STANDARD_LOG_FORMAT_PARTS = [
 ]
 
 
-class StandardLogFormatter(logging.Formatter):
+class StandardLoggingFormatter(logging.Formatter):
     @staticmethod
     def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
         return ' '.join(v for k, v in parts)
@@ -9426,7 +9427,7 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardConfiguredLogHandler(ProxyLogHandler):
+class StandardConfiguredLoggingHandler(ProxyLoggingHandler):
     def __init_subclass__(cls, **kwargs):
         raise TypeError('This class serves only as a marker and should not be subclassed.')
 
@@ -9459,7 +9460,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardConfiguredLogHandler]:
+) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -9467,7 +9468,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLoggingHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -9481,14 +9482,14 @@ def configure_standard_logging(
 
         formatter: logging.Formatter
         if json:
-            formatter = JsonLogFormatter()
+            formatter = JsonLoggingFormatter()
         else:
-            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
         handler.setFormatter(formatter)
 
         #
 
-        handler.addFilter(TidLogFilter())
+        handler.addFilter(TidLoggingFilter())
 
         #
 
@@ -9501,7 +9502,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardConfiguredLogHandler(handler)
+        return StandardConfiguredLoggingHandler(handler)
 
 
 ########################################

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425}/ominfra/scripts/supervisor.py

@@ -2742,13 +2742,13 @@ def typing_annotations_attr() -> str:
 
 
 ########################################
-# ../../../omlish/logs/filters.py
+# ../../../omlish/logs/std/filters.py
 
 
 ##
 
 
-class TidLogFilter(logging.Filter):
+class TidLoggingFilter(logging.Filter):
     def filter(self, record):
         # FIXME: handle better - missing from wasm and cosmos
         if hasattr(threading, 'get_native_id'):
@@ -2759,13 +2759,13 @@ class TidLogFilter(logging.Filter):
 
 
 ########################################
-# ../../../omlish/logs/proxy.py
+# ../../../omlish/logs/std/proxy.py
 
 
 ##
 
 
-class ProxyLogFilterer(logging.Filterer):
+class ProxyLoggingFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
 
@@ -2791,9 +2791,9 @@ class ProxyLogFilterer(logging.Filterer):
         return self._underlying.filter(record)
 
 
-class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+class ProxyLoggingHandler(ProxyLoggingFilterer, logging.Handler):
     def __init__(self, underlying: logging.Handler) -> None:  # noqa
-        ProxyLogFilterer.__init__(self, underlying)
+        ProxyLoggingFilterer.__init__(self, underlying)
 
     _underlying: logging.Handler
 
@@ -5726,7 +5726,7 @@ def check_lite_runtime_version() -> None:
 
 
 ########################################
-# ../../../omlish/logs/json.py
+# ../../../omlish/logs/std/json.py
 """
 TODO:
  - translate json keys
@@ -5736,7 +5736,7 @@ TODO:
 ##
 
 
-class JsonLogFormatter(logging.Formatter):
+class JsonLoggingFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,
         'msg': False,
@@ -5855,7 +5855,7 @@ SD_LOG_LEVEL_MAP: ta.Mapping[int, int] = {
 }
 
 
-class JournaldLogHandler(logging.Handler):
+class JournaldLoggingHandler(logging.Handler):
     """
     TODO:
      - fallback handler for when this barfs
@@ -5924,7 +5924,7 @@ class JournaldLogHandler(logging.Handler):
             self.handleError(record)
 
 
-def journald_log_handler_factory(
+def journald_logging_handler_factory(
         *,
         no_tty_check: bool = False,
         no_fallback: bool = False,
@@ -5934,7 +5934,7 @@ def journald_log_handler_factory(
             (no_tty_check or not sys.stderr.isatty()) and
             (no_fallback or sd_try_libsystemd() is not None)
     ):
-        return JournaldLogHandler()
+        return JournaldLoggingHandler()
 
     return logging.StreamHandler()
 
@@ -7735,6 +7735,7 @@ inj = InjectionApi()
 # ../../../omlish/logs/standard.py
 """
 TODO:
+ - !! move to std !!
  - structured
  - prefixed
  - debug
@@ -7756,7 +7757,7 @@ STANDARD_LOG_FORMAT_PARTS = [
 ]
 
 
-class StandardLogFormatter(logging.Formatter):
+class StandardLoggingFormatter(logging.Formatter):
     @staticmethod
     def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
         return ' '.join(v for k, v in parts)
@@ -7775,7 +7776,7 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardConfiguredLogHandler(ProxyLogHandler):
+class StandardConfiguredLoggingHandler(ProxyLoggingHandler):
     def __init_subclass__(cls, **kwargs):
         raise TypeError('This class serves only as a marker and should not be subclassed.')
 
@@ -7808,7 +7809,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardConfiguredLogHandler]:
+) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -7816,7 +7817,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLoggingHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -7830,14 +7831,14 @@ def configure_standard_logging(
 
         formatter: logging.Formatter
         if json:
-            formatter = JsonLogFormatter()
+            formatter = JsonLoggingFormatter()
         else:
-            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
         handler.setFormatter(formatter)
 
         #
 
-        handler.addFilter(TidLogFilter())
+        handler.addFilter(TidLoggingFilter())
 
         #
 
@@ -7850,7 +7851,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardConfiguredLogHandler(handler)
+        return StandardConfiguredLoggingHandler(handler)
 
 
 ########################################
@@ -11023,7 +11024,7 @@ def main(
     if not no_logging:
         configure_standard_logging(
             'INFO',
-            handler_factory=journald_log_handler_factory if not (args.no_journald or is_debugger_attached()) else None,
+            handler_factory=journald_logging_handler_factory if not (args.no_journald or is_debugger_attached()) else None,  # noqa
         )
 
     #

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425}/ominfra/supervisor/main.py

@@ -42,7 +42,7 @@ from omlish.lite.configs import load_config_file_obj
 from omlish.lite.inject import inj
 from omlish.lite.runtime import is_debugger_attached
 from omlish.logs.standard import configure_standard_logging
-from omlish.os.journald import journald_log_handler_factory
+from omlish.os.journald import journald_logging_handler_factory
 
 from .configs import ServerConfig
 from .configs import prepare_server_config
@@ -83,7 +83,7 @@ def main(
     if not no_logging:
         configure_standard_logging(
             'INFO',
-            handler_factory=journald_log_handler_factory if not (args.no_journald or is_debugger_attached()) else None,
+            handler_factory=journald_logging_handler_factory if not (args.no_journald or is_debugger_attached()) else None,  # noqa
         )
 
     #

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev424
+Version: 0.0.0.dev425
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev424
-Requires-Dist: omlish==0.0.0.dev424
+Requires-Dist: omdev==0.0.0.dev425
+Requires-Dist: omlish==0.0.0.dev425
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425}/ominfra.egg-info/SOURCES.txt

@@ -2,7 +2,7 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
-ominfra/.manifests.json
+ominfra/.omlish-manifests.json
 ominfra/__about__.py
 ominfra/__init__.py
 ominfra/pyremote.py

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev424
-omlish==0.0.0.dev424
+omdev==0.0.0.dev425
+omlish==0.0.0.dev425
 
 [all]
 paramiko~=4.0

{ominfra-0.0.0.dev424 → ominfra-0.0.0.dev425}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev424'
+version = '0.0.0.dev425'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev424',
-    'omlish == 0.0.0.dev424',
+    'omdev == 0.0.0.dev425',
+    'omlish == 0.0.0.dev425',
 ]
 
 [project.optional-dependencies]
@@ -60,7 +60,7 @@ exclude = [
     '*.cu',
     '*.g4',
     '*.h',
-    '.manifests.json',
+    '.omlish-manifests.json',
     'LICENSE',
     'LICENSE.txt',
     'clouds/aws/instancetypes/cache.json.gz',