ominfra 0.0.0.dev136__tar.gz → 0.0.0.dev137__tar.gz

{ominfra-0.0.0.dev136/ominfra.egg-info → ominfra-0.0.0.dev137}/PKG-INFO

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

{ominfra-0.0.0.dev136 → ominfra-0.0.0.dev137}/ominfra/manage/new/_manage.py

@@ -1534,6 +1534,9 @@ def _recv_obj(f: ta.IO, ty: type) -> ta.Any:
     return unmarshal_obj(j, ty)
 
 
+##
+
+
 def _remote_main() -> None:
     rt = pyremote_bootstrap_finalize()  # noqa
 
@@ -1547,6 +1550,41 @@ def _remote_main() -> None:
         _send_obj(rt.output, o)
 
 
+##
+
+
+@cached_nullary
+def _get_self_src() -> str:
+    return inspect.getsource(sys.modules[__name__])
+
+
+def _is_src_amalg(src: str) -> bool:
+    for l in src.splitlines():  # noqa
+        if l.startswith('# @omlish-amalg-output '):
+            return True
+    return False
+
+
+@cached_nullary
+def _is_self_amalg() -> bool:
+    return _is_src_amalg(_get_self_src())
+
+
+def _get_amalg_src(*, amalg_file: ta.Optional[str]) -> str:
+    if amalg_file is not None:
+        with open(amalg_file) as f:
+            return f.read()
+
+    if _is_self_amalg():
+        return _get_self_src()
+
+    import importlib.resources
+    return importlib.resources.read_text(__package__, '_manage.py')
+
+
+##
+
+
 def _main() -> None:
     import argparse
 
@@ -1561,23 +1599,7 @@ def _main() -> None:
 
     #
 
-    self_src = inspect.getsource(sys.modules[__name__])
-    self_src_lines = self_src.splitlines()
-    for l in self_src_lines:
-        if l.startswith('# @omlish-amalg-output '):
-            is_self_amalg = True
-            break
-    else:
-        is_self_amalg = False
-
-    if is_self_amalg:
-        amalg_src = self_src
-    else:
-        amalg_file = args._amalg_file  # noqa
-        if amalg_file is None:
-            amalg_file = os.path.join(os.path.dirname(__file__), '_manage.py')
-        with open(amalg_file) as f:
-            amalg_src = f.read()
+    amalg_src = _get_amalg_src(amalg_file=args._amalg_file)  # noqa
 
     #
 

{ominfra-0.0.0.dev136 → ominfra-0.0.0.dev137}/ominfra/manage/new/main.py

@@ -3,13 +3,13 @@
 # ruff: noqa: UP006 UP007
 import inspect
 import json
-import os
 import shlex
 import struct
 import subprocess
 import sys
 import typing as ta
 
+from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check_not_none
 from omlish.lite.json import json_dumps_compact
 from omlish.lite.marshal import marshal_obj
@@ -50,6 +50,9 @@ def _recv_obj(f: ta.IO, ty: type) -> ta.Any:
     return unmarshal_obj(j, ty)
 
 
+##
+
+
 def _remote_main() -> None:
     rt = pyremote_bootstrap_finalize()  # noqa
 
@@ -63,6 +66,41 @@ def _remote_main() -> None:
         _send_obj(rt.output, o)
 
 
+##
+
+
+@cached_nullary
+def _get_self_src() -> str:
+    return inspect.getsource(sys.modules[__name__])
+
+
+def _is_src_amalg(src: str) -> bool:
+    for l in src.splitlines():  # noqa
+        if l.startswith('# @omlish-amalg-output '):
+            return True
+    return False
+
+
+@cached_nullary
+def _is_self_amalg() -> bool:
+    return _is_src_amalg(_get_self_src())
+
+
+def _get_amalg_src(*, amalg_file: ta.Optional[str]) -> str:
+    if amalg_file is not None:
+        with open(amalg_file) as f:
+            return f.read()
+
+    if _is_self_amalg():
+        return _get_self_src()
+
+    import importlib.resources
+    return importlib.resources.read_text(__package__, '_manage.py')
+
+
+##
+
+
 def _main() -> None:
     import argparse
 
@@ -77,23 +115,7 @@ def _main() -> None:
 
     #
 
-    self_src = inspect.getsource(sys.modules[__name__])
-    self_src_lines = self_src.splitlines()
-    for l in self_src_lines:
-        if l.startswith('# @omlish-amalg-output '):
-            is_self_amalg = True
-            break
-    else:
-        is_self_amalg = False
-
-    if is_self_amalg:
-        amalg_src = self_src
-    else:
-        amalg_file = args._amalg_file  # noqa
-        if amalg_file is None:
-            amalg_file = os.path.join(os.path.dirname(__file__), '_manage.py')
-        with open(amalg_file) as f:
-            amalg_src = f.read()
+    amalg_src = _get_amalg_src(amalg_file=args._amalg_file)  # noqa
 
     #
 

{ominfra-0.0.0.dev136 → ominfra-0.0.0.dev137/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev136 → ominfra-0.0.0.dev137}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev136
-omlish==0.0.0.dev136
+omdev==0.0.0.dev137
+omlish==0.0.0.dev137
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev136 → ominfra-0.0.0.dev137}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev136'
+version = '0.0.0.dev137'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev136',
-    'omlish == 0.0.0.dev136',
+    'omdev == 0.0.0.dev137',
+    'omlish == 0.0.0.dev137',
 ]
 
 [project.optional-dependencies]