ominfra 0.0.0.dev133__tar.gz → 0.0.0.dev134__tar.gz

{ominfra-0.0.0.dev133/ominfra.egg-info → ominfra-0.0.0.dev134}/PKG-INFO

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

{ominfra-0.0.0.dev133 → ominfra-0.0.0.dev134}/ominfra/pyremote.py

@@ -17,9 +17,6 @@ import textwrap
 import typing as ta
 import zlib
 
-from omlish.lite.check import check_isinstance
-from omlish.lite.check import check_none
-
 
 ##
 
@@ -32,8 +29,8 @@ _PYREMOTE_BOOTSTRAP_ARGV0_VAR = '_OPYR_ARGV0'
 
 _PYREMOTE_BOOTSTRAP_ACK0 = b'OPYR000\n'
 _PYREMOTE_BOOTSTRAP_ACK1 = b'OPYR001\n'
-_PYREMOTE_BOOTSTRAP_ACK2 = b'OPYR001\n'
-_PYREMOTE_BOOTSTRAP_ACK3 = b'OPYR001\n'
+_PYREMOTE_BOOTSTRAP_ACK2 = b'OPYR002\n'
+_PYREMOTE_BOOTSTRAP_ACK3 = b'OPYR003\n'
 
 _PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT = '(pyremote:%s)'
 
@@ -256,6 +253,8 @@ class PyremoteBootstrapDriver:
         self._main_src = main_src
         self._main_z = zlib.compress(main_src.encode('utf-8'))
 
+    #
+
     @dc.dataclass(frozen=True)
     class Read:
         sz: int
@@ -272,7 +271,7 @@ class PyremoteBootstrapDriver:
         pid: int
         env_info: PyremoteEnvInfo
 
-    def __call__(self) -> ta.Generator[ta.Union[Read, Write], ta.Optional[bytes], Result]:
+    def gen(self) -> ta.Generator[ta.Union[Read, Write], ta.Optional[bytes], Result]:
         # Read first ack
         yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK0)
 
@@ -281,8 +280,8 @@ class PyremoteBootstrapDriver:
         pid = struct.unpack('<Q', d)[0]
 
         # Write main src
-        check_none((yield self.Write(struct.pack('<I', len(self._main_z)))))
-        check_none((yield self.Write(self._main_z)))
+        yield from self._write(struct.pack('<I', len(self._main_z)))
+        yield from self._write(self._main_z)
 
         # Read second and third ack
         yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK1)
@@ -305,7 +304,9 @@ class PyremoteBootstrapDriver:
         )
 
     def _read(self, sz: int) -> ta.Generator[Read, bytes, bytes]:
-        d = check_isinstance((yield self.Read(sz)), bytes)
+        d = yield self.Read(sz)
+        if not isinstance(d, bytes):
+            raise self.ProtocolError(f'Expected bytes after read, got {d!r}')
         if len(d) != sz:
             raise self.ProtocolError(f'Read {len(d)} bytes, expected {sz}')
         return d
@@ -315,17 +316,47 @@ class PyremoteBootstrapDriver:
         if d != e:
             raise self.ProtocolError(f'Read {d!r}, expected {e!r}')
 
+    def _write(self, d: bytes) -> ta.Generator[Write, ta.Optional[bytes], None]:
+        i = yield self.Write(d)
+        if i is not None:
+            raise self.ProtocolError('Unexpected input after write')
+
+    #
+
+    def run(self, stdin: ta.IO, stdout: ta.IO) -> Result:
+        gen = self.gen()
+
+        gi: bytes | None = None
+        while True:
+            try:
+                if gi is not None:
+                    go = gen.send(gi)
+                else:
+                    go = next(gen)
+            except StopIteration as e:
+                return e.value
+
+            if isinstance(go, self.Read):
+                gi = stdout.read(go.sz)
+            elif isinstance(go, self.Write):
+                gi = None
+                stdin.write(go.d)
+                stdin.flush()
+            else:
+                raise TypeError(go)
+
 
 ##
 
 
 @dc.dataclass(frozen=True)
-class PyremoteBootstrapPayloadRuntime:
+class PyremotePayloadRuntime:
     input: ta.BinaryIO
     main_src: str
+    env_info: PyremoteEnvInfo
 
 
-def pyremote_bootstrap_finalize() -> PyremoteBootstrapPayloadRuntime:
+def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
     # Restore original argv0
     sys.executable = os.environ.pop(_PYREMOTE_BOOTSTRAP_ARGV0_VAR)
 
@@ -351,7 +382,8 @@ def pyremote_bootstrap_finalize() -> PyremoteBootstrapPayloadRuntime:
     os.write(1, _PYREMOTE_BOOTSTRAP_ACK3)
 
     # Return
-    return PyremoteBootstrapPayloadRuntime(
+    return PyremotePayloadRuntime(
         input=os.fdopen(_PYREMOTE_BOOTSTRAP_COMM_FD, 'rb', 0),
         main_src=main_src,
+        env_info=env_info,
     )

{ominfra-0.0.0.dev133 → ominfra-0.0.0.dev134/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev133 → ominfra-0.0.0.dev134}/ominfra.egg-info/requires.txt

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

{ominfra-0.0.0.dev133 → ominfra-0.0.0.dev134}/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.dev133'
+version = '0.0.0.dev134'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev133',
-    'omlish == 0.0.0.dev133',
+    'omdev == 0.0.0.dev134',
+    'omlish == 0.0.0.dev134',
 ]
 
 [project.optional-dependencies]