ominfra 0.0.0.dev23__py3-none-any.whl → 0.0.0.dev25__py3-none-any.whl

ominfra/__about__.py

@@ -25,3 +25,13 @@ class Setuptools(SetuptoolsBase):
         'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],
     }
+
+    package_data = {
+        **SetuptoolsBase.package_data,
+
+        '*': [
+            *SetuptoolsBase.package_data['*'],
+
+            'Dockerfile',
+        ],
+    }

ominfra/_manifests.json

@@ -0,0 +1 @@
+[]

ominfra/deploy/_executor.py

@@ -320,13 +320,134 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
+class ProxyLogFilterer(logging.Filterer):
+    def __init__(self, underlying: logging.Filterer) -> None:  # noqa
+        self._underlying = underlying
+
+    @property
+    def underlying(self) -> logging.Filterer:
+        return self._underlying
+
+    @property
+    def filters(self):
+        return self._underlying.filters
+
+    @filters.setter
+    def filters(self, filters):
+        self._underlying.filters = filters
+
+    def addFilter(self, filter):  # noqa
+        self._underlying.addFilter(filter)
+
+    def removeFilter(self, filter):  # noqa
+        self._underlying.removeFilter(filter)
+
+    def filter(self, record):
+        return self._underlying.filter(record)
+
+
+class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+    def __init__(self, underlying: logging.Handler) -> None:  # noqa
+        ProxyLogFilterer.__init__(self, underlying)
+
+    _underlying: logging.Handler
+
+    @property
+    def underlying(self) -> logging.Handler:
+        return self._underlying
+
+    def get_name(self):
+        return self._underlying.get_name()
+
+    def set_name(self, name):
+        self._underlying.set_name(name)
+
+    @property
+    def name(self):
+        return self._underlying.name
+
+    @property
+    def level(self):
+        return self._underlying.level
+
+    @level.setter
+    def level(self, level):
+        self._underlying.level = level
+
+    @property
+    def formatter(self):
+        return self._underlying.formatter
+
+    @formatter.setter
+    def formatter(self, formatter):
+        self._underlying.formatter = formatter
+
+    def createLock(self):
+        self._underlying.createLock()
+
+    def acquire(self):
+        self._underlying.acquire()
+
+    def release(self):
+        self._underlying.release()
+
+    def setLevel(self, level):
+        self._underlying.setLevel(level)
+
+    def format(self, record):
+        return self._underlying.format(record)
+
+    def emit(self, record):
+        self._underlying.emit(record)
+
+    def handle(self, record):
+        return self._underlying.handle(record)
+
+    def setFormatter(self, fmt):
+        self._underlying.setFormatter(fmt)
+
+    def flush(self):
+        self._underlying.flush()
+
+    def close(self):
+        self._underlying.close()
+
+    def handleError(self, record):
+        self._underlying.handleError(record)
+
+
+##
+
+
+class StandardLogHandler(ProxyLogHandler):
+    pass
+
+
+##
+
+
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
         json: bool = False,
-) -> logging.Handler:
+        target: ta.Optional[logging.Logger] = None,
+        no_check: bool = False,
+) -> ta.Optional[StandardLogHandler]:
+    if target is None:
+        target = logging.root
+
+    #
+
+    if not no_check:
+        if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+            return None
+
+    #
+
     handler = logging.StreamHandler()
 
+    #
+
     formatter: logging.Formatter
     if json:
         formatter = JsonLogFormatter()
@@ -334,14 +455,22 @@ def configure_standard_logging(
         formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
     handler.setFormatter(formatter)
 
+    #
+
     handler.addFilter(TidLogFilter())
 
-    logging.root.addHandler(handler)
+    #
+
+    target.addHandler(handler)
+
+    #
 
     if level is not None:
-        logging.root.setLevel(level)
+        target.setLevel(level)
+
+    #
 
-    return handler
+    return StandardLogHandler(handler)
 
 
 ########################################

ominfra/deploy/poly/_main.py

@@ -383,13 +383,134 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
+class ProxyLogFilterer(logging.Filterer):
+    def __init__(self, underlying: logging.Filterer) -> None:  # noqa
+        self._underlying = underlying
+
+    @property
+    def underlying(self) -> logging.Filterer:
+        return self._underlying
+
+    @property
+    def filters(self):
+        return self._underlying.filters
+
+    @filters.setter
+    def filters(self, filters):
+        self._underlying.filters = filters
+
+    def addFilter(self, filter):  # noqa
+        self._underlying.addFilter(filter)
+
+    def removeFilter(self, filter):  # noqa
+        self._underlying.removeFilter(filter)
+
+    def filter(self, record):
+        return self._underlying.filter(record)
+
+
+class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+    def __init__(self, underlying: logging.Handler) -> None:  # noqa
+        ProxyLogFilterer.__init__(self, underlying)
+
+    _underlying: logging.Handler
+
+    @property
+    def underlying(self) -> logging.Handler:
+        return self._underlying
+
+    def get_name(self):
+        return self._underlying.get_name()
+
+    def set_name(self, name):
+        self._underlying.set_name(name)
+
+    @property
+    def name(self):
+        return self._underlying.name
+
+    @property
+    def level(self):
+        return self._underlying.level
+
+    @level.setter
+    def level(self, level):
+        self._underlying.level = level
+
+    @property
+    def formatter(self):
+        return self._underlying.formatter
+
+    @formatter.setter
+    def formatter(self, formatter):
+        self._underlying.formatter = formatter
+
+    def createLock(self):
+        self._underlying.createLock()
+
+    def acquire(self):
+        self._underlying.acquire()
+
+    def release(self):
+        self._underlying.release()
+
+    def setLevel(self, level):
+        self._underlying.setLevel(level)
+
+    def format(self, record):
+        return self._underlying.format(record)
+
+    def emit(self, record):
+        self._underlying.emit(record)
+
+    def handle(self, record):
+        return self._underlying.handle(record)
+
+    def setFormatter(self, fmt):
+        self._underlying.setFormatter(fmt)
+
+    def flush(self):
+        self._underlying.flush()
+
+    def close(self):
+        self._underlying.close()
+
+    def handleError(self, record):
+        self._underlying.handleError(record)
+
+
+##
+
+
+class StandardLogHandler(ProxyLogHandler):
+    pass
+
+
+##
+
+
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
         json: bool = False,
-) -> logging.Handler:
+        target: ta.Optional[logging.Logger] = None,
+        no_check: bool = False,
+) -> ta.Optional[StandardLogHandler]:
+    if target is None:
+        target = logging.root
+
+    #
+
+    if not no_check:
+        if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+            return None
+
+    #
+
     handler = logging.StreamHandler()
 
+    #
+
     formatter: logging.Formatter
     if json:
         formatter = JsonLogFormatter()
@@ -397,14 +518,22 @@ def configure_standard_logging(
         formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
     handler.setFormatter(formatter)
 
+    #
+
     handler.addFilter(TidLogFilter())
 
-    logging.root.addHandler(handler)
+    #
+
+    target.addHandler(handler)
+
+    #
 
     if level is not None:
-        logging.root.setLevel(level)
+        target.setLevel(level)
+
+    #
 
-    return handler
+    return StandardLogHandler(handler)
 
 
 ########################################

ominfra/pyremote/_runcommands.py

@@ -403,13 +403,134 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
+class ProxyLogFilterer(logging.Filterer):
+    def __init__(self, underlying: logging.Filterer) -> None:  # noqa
+        self._underlying = underlying
+
+    @property
+    def underlying(self) -> logging.Filterer:
+        return self._underlying
+
+    @property
+    def filters(self):
+        return self._underlying.filters
+
+    @filters.setter
+    def filters(self, filters):
+        self._underlying.filters = filters
+
+    def addFilter(self, filter):  # noqa
+        self._underlying.addFilter(filter)
+
+    def removeFilter(self, filter):  # noqa
+        self._underlying.removeFilter(filter)
+
+    def filter(self, record):
+        return self._underlying.filter(record)
+
+
+class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+    def __init__(self, underlying: logging.Handler) -> None:  # noqa
+        ProxyLogFilterer.__init__(self, underlying)
+
+    _underlying: logging.Handler
+
+    @property
+    def underlying(self) -> logging.Handler:
+        return self._underlying
+
+    def get_name(self):
+        return self._underlying.get_name()
+
+    def set_name(self, name):
+        self._underlying.set_name(name)
+
+    @property
+    def name(self):
+        return self._underlying.name
+
+    @property
+    def level(self):
+        return self._underlying.level
+
+    @level.setter
+    def level(self, level):
+        self._underlying.level = level
+
+    @property
+    def formatter(self):
+        return self._underlying.formatter
+
+    @formatter.setter
+    def formatter(self, formatter):
+        self._underlying.formatter = formatter
+
+    def createLock(self):
+        self._underlying.createLock()
+
+    def acquire(self):
+        self._underlying.acquire()
+
+    def release(self):
+        self._underlying.release()
+
+    def setLevel(self, level):
+        self._underlying.setLevel(level)
+
+    def format(self, record):
+        return self._underlying.format(record)
+
+    def emit(self, record):
+        self._underlying.emit(record)
+
+    def handle(self, record):
+        return self._underlying.handle(record)
+
+    def setFormatter(self, fmt):
+        self._underlying.setFormatter(fmt)
+
+    def flush(self):
+        self._underlying.flush()
+
+    def close(self):
+        self._underlying.close()
+
+    def handleError(self, record):
+        self._underlying.handleError(record)
+
+
+##
+
+
+class StandardLogHandler(ProxyLogHandler):
+    pass
+
+
+##
+
+
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
         json: bool = False,
-) -> logging.Handler:
+        target: ta.Optional[logging.Logger] = None,
+        no_check: bool = False,
+) -> ta.Optional[StandardLogHandler]:
+    if target is None:
+        target = logging.root
+
+    #
+
+    if not no_check:
+        if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+            return None
+
+    #
+
     handler = logging.StreamHandler()
 
+    #
+
     formatter: logging.Formatter
     if json:
         formatter = JsonLogFormatter()
@@ -417,14 +538,22 @@ def configure_standard_logging(
         formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
     handler.setFormatter(formatter)
 
+    #
+
     handler.addFilter(TidLogFilter())
 
-    logging.root.addHandler(handler)
+    #
+
+    target.addHandler(handler)
+
+    #
 
     if level is not None:
-        logging.root.setLevel(level)
+        target.setLevel(level)
+
+    #
 
-    return handler
+    return StandardLogHandler(handler)
 
 
 ########################################

{ominfra-0.0.0.dev23.dist-info → ominfra-0.0.0.dev25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev23
+Version: 0.0.0.dev25
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev23
+Requires-Dist: omlish ==0.0.0.dev25
 Provides-Extra: all
 Requires-Dist: paramiko ~=3.4 ; extra == 'all'
 Requires-Dist: asyncssh ~=2.17 ; (python_version < "3.13") and extra == 'all'

{ominfra-0.0.0.dev23.dist-info → ominfra-0.0.0.dev25.dist-info}/RECORD

@@ -1,12 +1,13 @@
-ominfra/__about__.py,sha256=5DfZfpjDGdRPquXrfFEFaeTLkc69qr1i-ELbJ0R-HKI,625
+ominfra/__about__.py,sha256=eG50SkpKgLC04fk3UMeI3rCgGDyK5RqyJkxZoO2Plqw,793
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ominfra/_manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
 ominfra/ssh.py,sha256=U-JCvx41KI0B0riHy7cpFCKCx_LAHeSn-Irz5aAao2w,5393
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/auth.py,sha256=eV6ayidQDKrhsgoRSg4_1tSvTMa1TzFvzxS7D_gjlCc,5499
 ominfra/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/deploy/_executor.py,sha256=Gh6yNy9SeiXzF3IvDES3GlDWwUTY1ElyCvPMuMySPPQ,28830
+ominfra/deploy/_executor.py,sha256=txU0eH3rVc_8a8PLac9WXCD0EsdK8NDPf2PdE7TKIGc,31519
 ominfra/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
 ominfra/deploy/remote.py,sha256=LJSe3AJlpvNgb_5QtUiK2JIkKC2OgMvjSD1701_y2uI,2147
 ominfra/deploy/executor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -21,7 +22,7 @@ ominfra/deploy/executor/concerns/systemd.py,sha256=MtsSEToEa1HNouern_JukcYTnypw_
 ominfra/deploy/executor/concerns/user.py,sha256=j5LDfQXquIp-eEM7t6aShsrYoQrM_ILXZycTmTcRVxA,686
 ominfra/deploy/executor/concerns/venv.py,sha256=jbRriqJHO4r9Zyo5Hfl_qVmcU6Qm6UgrouBroKcPn2g,775
 ominfra/deploy/poly/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-ominfra/deploy/poly/_main.py,sha256=oqGwNPxcvLIaYR7vr75tmEzYXY0JPfufbz9dSFUn3J8,20062
+ominfra/deploy/poly/_main.py,sha256=PtFGmt5MA87KTgni9goPaz0r4HuzD2HgpmsCtjFQ_v8,22751
 ominfra/deploy/poly/base.py,sha256=Bd-CzUTaDvTRbdXKiTxMxs77WCEXItwNoBYCRnTk1u4,4167
 ominfra/deploy/poly/configs.py,sha256=9bzWdbxhOk_Q4KokDjmRz254KHnUU71Vl1frLlhQyU4,584
 ominfra/deploy/poly/deploy.py,sha256=tMYKslXLjstcv86siRt5j37USsS0Wd6lsfeGRE26zio,544
@@ -35,13 +36,13 @@ ominfra/deploy/poly/venv.py,sha256=BoipDEa4NTeodjf3L57KJfq9eGKLagFNKwD8pS4yrzA,1
 ominfra/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/manage.py,sha256=gS2FvvdZTmNqD2dEXWTCFgCXNCepFSHVojBZ5WG6mqk,65
 ominfra/pyremote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote/_runcommands.py,sha256=w1Rgx-2Vqh5_Fs24cCBTR0iuHn9abXX35vZs5K52fK0,22650
+ominfra/pyremote/_runcommands.py,sha256=Lo138TWUkFWhpIzNAllnUuTz5QgpqpnzdGNA2J3Nfj4,25339
 ominfra/pyremote/bootstrap.py,sha256=ybXxNitrNKuPAIl0SrU55Ktn-4R-bDveAm_ZURrmfF0,3368
 ominfra/pyremote/runcommands.py,sha256=hXXP41rvgL46Oe_HOcLSp2Y84ZMQfEZqqV_jNd1x7Ak,1570
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=vgLgohPwRog8e5pEljI2hOGg-Li5fcwjj-nXj2j8IQo,5918
-ominfra-0.0.0.dev23.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev23.dist-info/METADATA,sha256=2gSiFi6YxmTIHIndpY-i3Ths3F1ml7DdpQg7LjOjXfg,764
-ominfra-0.0.0.dev23.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-ominfra-0.0.0.dev23.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev23.dist-info/RECORD,,
+ominfra-0.0.0.dev25.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev25.dist-info/METADATA,sha256=jGQeB1sKqyuN7dUSUqzN1WtPd3aJaTJAWIm-Qw9YU2c,764
+ominfra-0.0.0.dev25.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+ominfra-0.0.0.dev25.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev25.dist-info/RECORD,,