ominfra 0.0.0.dev254__py3-none-any.whl → 0.0.0.dev256__py3-none-any.whl

ominfra/pyremote.py

@@ -35,46 +35,82 @@ class PyremoteBootstrapOptions:
 
 @dc.dataclass(frozen=True)
 class PyremoteEnvInfo:
-    sys_base_prefix: str
-    sys_byteorder: str
-    sys_defaultencoding: str
-    sys_exec_prefix: str
-    sys_executable: str
-    sys_implementation_name: str
-    sys_path: ta.List[str]
-    sys_platform: str
-    sys_prefix: str
-    sys_version: str
-    sys_version_info: ta.List[ta.Union[int, str]]
-
-    platform_architecture: ta.List[str]
-    platform_machine: str
-    platform_platform: str
-    platform_processor: str
-    platform_system: str
-    platform_release: str
-    platform_version: str
-
-    site_userbase: str
-
-    os_cwd: str
-    os_gid: int
-    os_loadavg: ta.List[float]
-    os_login: ta.Optional[str]
-    os_pgrp: int
-    os_pid: int
-    os_ppid: int
-    os_uid: int
-
-    pw_name: str
-    pw_uid: int
-    pw_gid: int
-    pw_gecos: str
-    pw_dir: str
-    pw_shell: str
+    @dc.dataclass(frozen=True)
+    class Sys:
+        base_prefix: str
+        byteorder: str
+        defaultencoding: str
+        exec_prefix: str
+        executable: str
+        implementation_name: str
+        path: ta.List[str]
+        platform: str
+        prefix: str
+        version: str
+        version_info: ta.List[ta.Union[int, str]]
+
+    sys: Sys
+
+    @dc.dataclass(frozen=True)
+    class Platform:
+        architecture: ta.List[str]
+        machine: str
+        platform: str
+        processor: str
+        system: str
+        release: str
+        version: str
+
+    platform: Platform
+
+    @dc.dataclass(frozen=True)
+    class Site:
+        userbase: str
+
+    site: Site
+
+    @dc.dataclass(frozen=True)
+    class Os:
+        cwd: str
+        gid: int
+        loadavg: ta.List[float]
+        login: ta.Optional[str]
+        pgrp: int
+        pid: int
+        ppid: int
+        uid: int
+
+    os: Os
+
+    @dc.dataclass(frozen=True)
+    class Pw:
+        name: str
+        uid: int
+        gid: int
+        gecos: str
+        dir: str
+        shell: str
+
+    pw: Pw
 
     env_path: ta.Optional[str]
 
+    #
+
+    def to_dict(self) -> dict:
+        return {
+            f.name: dc.asdict(v) if dc.is_dataclass(v := getattr(self, f.name)) else v  # type: ignore[arg-type]
+            for f in dc.fields(self)
+        }
+
+    @classmethod
+    def from_dict(cls, dct: dict) -> 'PyremoteEnvInfo':
+        flds_dct = {f.name: f for f in dc.fields(cls)}
+        return cls(**{
+            k: ft(**v) if isinstance((ft := flds_dct[k].type), type) and dc.is_dataclass(ft) is not None else v
+            for k, v in dct.items()
+        })
+
 
 def _get_pyremote_env_info() -> PyremoteEnvInfo:
     os_uid = os.getuid()
@@ -88,43 +124,53 @@ def _get_pyremote_env_info() -> PyremoteEnvInfo:
         os_login = None
 
     return PyremoteEnvInfo(
-        sys_base_prefix=sys.base_prefix,
-        sys_byteorder=sys.byteorder,
-        sys_defaultencoding=sys.getdefaultencoding(),
-        sys_exec_prefix=sys.exec_prefix,
-        sys_executable=sys.executable,
-        sys_implementation_name=sys.implementation.name,
-        sys_path=sys.path,
-        sys_platform=sys.platform,
-        sys_prefix=sys.prefix,
-        sys_version=sys.version,
-        sys_version_info=list(sys.version_info),
-
-        platform_architecture=list(platform.architecture()),
-        platform_machine=platform.machine(),
-        platform_platform=platform.platform(),
-        platform_processor=platform.processor(),
-        platform_system=platform.system(),
-        platform_release=platform.release(),
-        platform_version=platform.version(),
-
-        site_userbase=site.getuserbase(),
-
-        os_cwd=os.getcwd(),
-        os_gid=os.getgid(),
-        os_loadavg=list(os.getloadavg()),
-        os_login=os_login,
-        os_pgrp=os.getpgrp(),
-        os_pid=os.getpid(),
-        os_ppid=os.getppid(),
-        os_uid=os_uid,
-
-        pw_name=pw.pw_name,
-        pw_uid=pw.pw_uid,
-        pw_gid=pw.pw_gid,
-        pw_gecos=pw.pw_gecos,
-        pw_dir=pw.pw_dir,
-        pw_shell=pw.pw_shell,
+        sys=PyremoteEnvInfo.Sys(
+            base_prefix=sys.base_prefix,
+            byteorder=sys.byteorder,
+            defaultencoding=sys.getdefaultencoding(),
+            exec_prefix=sys.exec_prefix,
+            executable=sys.executable,
+            implementation_name=sys.implementation.name,
+            path=sys.path,
+            platform=sys.platform,
+            prefix=sys.prefix,
+            version=sys.version,
+            version_info=list(sys.version_info),
+        ),
+
+        platform=PyremoteEnvInfo.Platform(
+            architecture=list(platform.architecture()),
+            machine=platform.machine(),
+            platform=platform.platform(),
+            processor=platform.processor(),
+            system=platform.system(),
+            release=platform.release(),
+            version=platform.version(),
+        ),
+
+        site=PyremoteEnvInfo.Site(
+            userbase=site.getuserbase(),
+        ),
+
+        os=PyremoteEnvInfo.Os(
+            cwd=os.getcwd(),
+            gid=os.getgid(),
+            loadavg=list(os.getloadavg()),
+            login=os_login,
+            pgrp=os.getpgrp(),
+            pid=os.getpid(),
+            ppid=os.getppid(),
+            uid=os_uid,
+        ),
+
+        pw=PyremoteEnvInfo.Pw(
+            name=pw.pw_name,
+            uid=pw.pw_uid,
+            gid=pw.pw_gid,
+            gecos=pw.pw_gecos,
+            dir=pw.pw_dir,
+            shell=pw.pw_shell,
+        ),
 
         env_path=os.environ.get('PATH'),
     )
@@ -335,7 +381,7 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
 
     # Write env info
     env_info = _get_pyremote_env_info()
-    env_info_json = json.dumps(dc.asdict(env_info), indent=None, separators=(',', ':'))  # noqa
+    env_info_json = json.dumps(env_info.to_dict(), indent=None, separators=(',', ':'))  # noqa
     os.write(1, struct.pack('<I', len(env_info_json)))
     os.write(1, env_info_json.encode('utf-8'))
 
@@ -449,7 +495,7 @@ class PyremoteBootstrapDriver:
         env_info_json_len = struct.unpack('<I', d)[0]
         d = yield from self._read(env_info_json_len)
         env_info_json = d.decode('utf-8')
-        env_info = PyremoteEnvInfo(**json.loads(env_info_json))
+        env_info = PyremoteEnvInfo.from_dict(json.loads(env_info_json))
 
         # Read fourth ack (after finalization completed)
         yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK3)

ominfra/scripts/manage.py

@@ -697,46 +697,82 @@ class PyremoteBootstrapOptions:
 
 @dc.dataclass(frozen=True)
 class PyremoteEnvInfo:
-    sys_base_prefix: str
-    sys_byteorder: str
-    sys_defaultencoding: str
-    sys_exec_prefix: str
-    sys_executable: str
-    sys_implementation_name: str
-    sys_path: ta.List[str]
-    sys_platform: str
-    sys_prefix: str
-    sys_version: str
-    sys_version_info: ta.List[ta.Union[int, str]]
-
-    platform_architecture: ta.List[str]
-    platform_machine: str
-    platform_platform: str
-    platform_processor: str
-    platform_system: str
-    platform_release: str
-    platform_version: str
-
-    site_userbase: str
-
-    os_cwd: str
-    os_gid: int
-    os_loadavg: ta.List[float]
-    os_login: ta.Optional[str]
-    os_pgrp: int
-    os_pid: int
-    os_ppid: int
-    os_uid: int
-
-    pw_name: str
-    pw_uid: int
-    pw_gid: int
-    pw_gecos: str
-    pw_dir: str
-    pw_shell: str
+    @dc.dataclass(frozen=True)
+    class Sys:
+        base_prefix: str
+        byteorder: str
+        defaultencoding: str
+        exec_prefix: str
+        executable: str
+        implementation_name: str
+        path: ta.List[str]
+        platform: str
+        prefix: str
+        version: str
+        version_info: ta.List[ta.Union[int, str]]
+
+    sys: Sys
+
+    @dc.dataclass(frozen=True)
+    class Platform:
+        architecture: ta.List[str]
+        machine: str
+        platform: str
+        processor: str
+        system: str
+        release: str
+        version: str
+
+    platform: Platform
+
+    @dc.dataclass(frozen=True)
+    class Site:
+        userbase: str
+
+    site: Site
+
+    @dc.dataclass(frozen=True)
+    class Os:
+        cwd: str
+        gid: int
+        loadavg: ta.List[float]
+        login: ta.Optional[str]
+        pgrp: int
+        pid: int
+        ppid: int
+        uid: int
+
+    os: Os
+
+    @dc.dataclass(frozen=True)
+    class Pw:
+        name: str
+        uid: int
+        gid: int
+        gecos: str
+        dir: str
+        shell: str
+
+    pw: Pw
 
     env_path: ta.Optional[str]
 
+    #
+
+    def to_dict(self) -> dict:
+        return {
+            f.name: dc.asdict(v) if dc.is_dataclass(v := getattr(self, f.name)) else v  # type: ignore[arg-type]
+            for f in dc.fields(self)
+        }
+
+    @classmethod
+    def from_dict(cls, dct: dict) -> 'PyremoteEnvInfo':
+        flds_dct = {f.name: f for f in dc.fields(cls)}
+        return cls(**{
+            k: ft(**v) if isinstance((ft := flds_dct[k].type), type) and dc.is_dataclass(ft) is not None else v
+            for k, v in dct.items()
+        })
+
 
 def _get_pyremote_env_info() -> PyremoteEnvInfo:
     os_uid = os.getuid()
@@ -750,43 +786,53 @@ def _get_pyremote_env_info() -> PyremoteEnvInfo:
         os_login = None
 
     return PyremoteEnvInfo(
-        sys_base_prefix=sys.base_prefix,
-        sys_byteorder=sys.byteorder,
-        sys_defaultencoding=sys.getdefaultencoding(),
-        sys_exec_prefix=sys.exec_prefix,
-        sys_executable=sys.executable,
-        sys_implementation_name=sys.implementation.name,
-        sys_path=sys.path,
-        sys_platform=sys.platform,
-        sys_prefix=sys.prefix,
-        sys_version=sys.version,
-        sys_version_info=list(sys.version_info),
-
-        platform_architecture=list(platform.architecture()),
-        platform_machine=platform.machine(),
-        platform_platform=platform.platform(),
-        platform_processor=platform.processor(),
-        platform_system=platform.system(),
-        platform_release=platform.release(),
-        platform_version=platform.version(),
-
-        site_userbase=site.getuserbase(),
-
-        os_cwd=os.getcwd(),
-        os_gid=os.getgid(),
-        os_loadavg=list(os.getloadavg()),
-        os_login=os_login,
-        os_pgrp=os.getpgrp(),
-        os_pid=os.getpid(),
-        os_ppid=os.getppid(),
-        os_uid=os_uid,
-
-        pw_name=pw.pw_name,
-        pw_uid=pw.pw_uid,
-        pw_gid=pw.pw_gid,
-        pw_gecos=pw.pw_gecos,
-        pw_dir=pw.pw_dir,
-        pw_shell=pw.pw_shell,
+        sys=PyremoteEnvInfo.Sys(
+            base_prefix=sys.base_prefix,
+            byteorder=sys.byteorder,
+            defaultencoding=sys.getdefaultencoding(),
+            exec_prefix=sys.exec_prefix,
+            executable=sys.executable,
+            implementation_name=sys.implementation.name,
+            path=sys.path,
+            platform=sys.platform,
+            prefix=sys.prefix,
+            version=sys.version,
+            version_info=list(sys.version_info),
+        ),
+
+        platform=PyremoteEnvInfo.Platform(
+            architecture=list(platform.architecture()),
+            machine=platform.machine(),
+            platform=platform.platform(),
+            processor=platform.processor(),
+            system=platform.system(),
+            release=platform.release(),
+            version=platform.version(),
+        ),
+
+        site=PyremoteEnvInfo.Site(
+            userbase=site.getuserbase(),
+        ),
+
+        os=PyremoteEnvInfo.Os(
+            cwd=os.getcwd(),
+            gid=os.getgid(),
+            loadavg=list(os.getloadavg()),
+            login=os_login,
+            pgrp=os.getpgrp(),
+            pid=os.getpid(),
+            ppid=os.getppid(),
+            uid=os_uid,
+        ),
+
+        pw=PyremoteEnvInfo.Pw(
+            name=pw.pw_name,
+            uid=pw.pw_uid,
+            gid=pw.pw_gid,
+            gecos=pw.pw_gecos,
+            dir=pw.pw_dir,
+            shell=pw.pw_shell,
+        ),
 
         env_path=os.environ.get('PATH'),
     )
@@ -997,7 +1043,7 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
 
     # Write env info
     env_info = _get_pyremote_env_info()
-    env_info_json = json.dumps(dc.asdict(env_info), indent=None, separators=(',', ':'))  # noqa
+    env_info_json = json.dumps(env_info.to_dict(), indent=None, separators=(',', ':'))  # noqa
     os.write(1, struct.pack('<I', len(env_info_json)))
     os.write(1, env_info_json.encode('utf-8'))
 
@@ -1111,7 +1157,7 @@ class PyremoteBootstrapDriver:
         env_info_json_len = struct.unpack('<I', d)[0]
         d = yield from self._read(env_info_json_len)
         env_info_json = d.decode('utf-8')
-        env_info = PyremoteEnvInfo(**json.loads(env_info_json))
+        env_info = PyremoteEnvInfo.from_dict(json.loads(env_info_json))
 
         # Read fourth ack (after finalization completed)
         yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK3)

{ominfra-0.0.0.dev254.dist-info → ominfra-0.0.0.dev256.dist-info}/METADATA

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

{ominfra-0.0.0.dev254.dist-info → ominfra-0.0.0.dev256.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ominfra/.manifests.json,sha256=8KREXxMAlsilZOktXPYru1ND3V5hFI22vnrp6hT3bio,589
 ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote.py,sha256=qjY3Bj0GhuYznQ3bhqXmU9zyIVZkhD9Wv76QUG34ZME,15198
+ominfra/pyremote.py,sha256=I8775ohUGn1DsI-6NQFAV2hxa6TPsH4ksINHxeIEw0w,16228
 ominfra/systemd.py,sha256=d61NVrJoItzSaqhMDgKGrQjbrxEVAujUMDsj8WggXos,1022
 ominfra/threadworkers.py,sha256=ADWHAdvjzPxm94yJcEt5_nM7q7aahdQUNP_EGQeOWAw,4974
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -113,7 +113,7 @@ ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhh
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=vvuAU6O3tu5deEg5TjPjepgytXCqEvi7EQAMnGZ8NjY,168285
-ominfra/scripts/manage.py,sha256=YSuCcEYgj-t8uiIG_hyymIIXuSBzJvLVgi4-rZ7fEyg,378493
+ominfra/scripts/manage.py,sha256=Jpsbj9DUB852agbxWS2wOBWOJUZ1wK-WlRfyDvbhiVs,379523
 ominfra/scripts/supervisor.py,sha256=U9soYrTfOpwei1681aNdCkq94HqGxh5g1IHTMiqM8oU,296898
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev254.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev254.dist-info/METADATA,sha256=eAu1ItjX_mQlTNvscVjmfrsBPBEkjCR3rsQUBDSTQBI,731
-ominfra-0.0.0.dev254.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-ominfra-0.0.0.dev254.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev254.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev254.dist-info/RECORD,,
+ominfra-0.0.0.dev256.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev256.dist-info/METADATA,sha256=PGAUnHBdPLbXdWT6OHuKvELOuMjNYzeI_i0jMiRfXs8,731
+ominfra-0.0.0.dev256.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+ominfra-0.0.0.dev256.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev256.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev256.dist-info/RECORD,,

{ominfra-0.0.0.dev254.dist-info → ominfra-0.0.0.dev256.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any