Merge branch 'main' into output-mode

Author: kirkbrauer

docs/source/installation/python-package.md

@@ -1,6 +1,12 @@
 # Python Packages and CLI
 
 ## Release install
+
+```{warning}
+Until we release 0.6.0 please continue to use the [developer install method](#development-install). 0.5.0 is
+heavily outdated and not fully released to pip, it is not recommended now.
+```
+
 The [Jumpstarter Python packages](https://docs.jumpstarter.dev/packages/)
 contain all the necessary tools to run an exporter or interact with your
 hardware as a client.

packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/driver.py

@@ -1,29 +1,37 @@
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
 
+from anyio import (
+    create_memory_object_stream,
+)
+from anyio._backends._asyncio import StreamReaderWrapper, StreamWriterWrapper
 from anyio.abc import ObjectStream
-from anyio.to_thread import run_sync
-from serial import Serial, serial_for_url
+from anyio.streams.stapled import StapledObjectStream
+from serial import serial_for_url
+from serial_asyncio import open_serial_connection
 
 from jumpstarter.driver import Driver, exportstream
 
+LOOP = "loop://"
+
 
 @dataclass(kw_only=True)
 class AsyncSerial(ObjectStream):
-    device: Serial
+    reader: StreamReaderWrapper
+    writer: StreamWriterWrapper
 
     async def send(self, item):
-        await run_sync(self.device.write, item)
+        await self.writer.send(item)
 
     async def receive(self):
-        size = max(self.device.in_waiting, 1)
-        return await run_sync(self.device.read, size)
+        return await self.reader.receive()
 
     async def send_eof(self):
-        await run_sync(self.device.close)
+        pass
 
     async def aclose(self):
-        await run_sync(self.device.close)
+        await self.writer.aclose()
+        await self.reader.aclose()
 
 
 @dataclass(kw_only=True)
@@ -35,7 +43,7 @@ class PySerial(Driver):
     def __post_init__(self):
         if hasattr(super(), "__post_init__"):
             super().__post_init__()
-        if self.check_present:
+        if self.check_present and self.url != LOOP:
             serial_for_url(self.url, baudrate=self.baudrate)
 
     @classmethod
@@ -46,7 +54,16 @@ def client(cls) -> str:
     @asynccontextmanager
     async def connect(self):
         self.logger.info("Connecting to %s, baudrate: %d", self.url, self.baudrate)
-        device = await run_sync(serial_for_url, self.url, self.baudrate)
-        async with AsyncSerial(device=device) as stream:
-            yield stream
-        self.logger.info("Disconnected from %s", self.url)
+        if self.url != LOOP:
+            reader, writer = await open_serial_connection(url=self.url, baudrate=self.baudrate, limit=1)
+            writer.transport.set_write_buffer_limits(high=4096, low=0)
+            async with AsyncSerial(
+                reader=StreamReaderWrapper(reader),
+                writer=StreamWriterWrapper(writer),
+            ) as stream:
+                yield stream
+            self.logger.info("Disconnected from %s", self.url)
+        else:
+            tx, rx = create_memory_object_stream[bytes](32)
+            async with StapledObjectStream(tx, rx) as stream:
+                yield stream

packages/jumpstarter-driver-pyserial/pyproject.toml

@@ -13,7 +13,8 @@ dependencies = [
     "jumpstarter",
     "jumpstarter-driver-network",
     "pyserial>=3.5",
-    "asyncclick>=8.1.7.2"
+    "asyncclick>=8.1.7.2",
+    "pyserial-asyncio>=0.6",
 ]
 
 [dependency-groups]

packages/jumpstarter/jumpstarter/config/common.py

@@ -1,8 +1,13 @@
+from os import getenv
+from pathlib import Path
+
 from pydantic import BaseModel
 from xdg_base_dirs import xdg_config_home
 
+from .env import JMP_CLIENT_CONFIG_HOME
+
 CONFIG_API_VERSION = "jumpstarter.dev/v1alpha1"
-CONFIG_PATH = xdg_config_home() / "jumpstarter"
+CONFIG_PATH = Path(getenv(JMP_CLIENT_CONFIG_HOME, xdg_config_home() / "jumpstarter"))
 
 
 class ObjectMeta(BaseModel):

packages/jumpstarter/jumpstarter/config/env.py

@@ -1,4 +1,5 @@
 # Common environment variables for client/exporter config
+JMP_CLIENT_CONFIG_HOME = "JMP_CLIENT_CONFIG_HOME"
 JMP_CLIENT_CONFIG = "JMP_CLIENT_CONFIG"
 JMP_NAMESPACE = "JMP_NAMESPACE"
 JMP_NAME = "JMP_NAME"