plexus-python 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

plexus/__init__.py

@@ -10,5 +10,5 @@ Plexus — thin Python SDK for sending telemetry to the Plexus gateway.
 from plexus.client import Plexus, PlexusError, AuthenticationError, read_mjpeg_frames
 from plexus.config import RetryConfig
 
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 __all__ = ["Plexus", "PlexusError", "AuthenticationError", "RetryConfig", "read_mjpeg_frames"]

plexus/client.py

@@ -55,9 +55,7 @@ from plexus.config import (
     get_endpoint,
     get_gateway_url,
     get_gateway_ws_url,
-    get_install_id,
     get_source_id,
-    set_source_id,
 )
 
 logger = logging.getLogger(__name__)
@@ -414,9 +412,7 @@ class Plexus:
             api_key=self.api_key,
             source_id=self.source_id,
             ws_url=self._ws_url,
-            install_id=get_install_id(),
             agent_version=__version__,
-            on_source_id_assigned=self._on_source_id_assigned,
             on_clock_synced=self._on_clock_synced,
         )
         self._ws.start()
@@ -428,16 +424,6 @@ class Plexus:
     def _on_clock_synced(self, offset_ms: int) -> None:
         self._clock_offset_ms = offset_ms
 
-    def _on_source_id_assigned(self, assigned: str) -> None:
-        """Callback from WebSocketTransport when the gateway returns an
-        auto-suffixed source_id. Persists it so subsequent runs (and the HTTP
-        fallback path in this process) use the assigned name directly."""
-        self.source_id = assigned
-        try:
-            set_source_id(assigned)
-        except Exception as e:  # pragma: no cover - persistence failure is non-fatal
-            logger.debug("failed to persist assigned source_id: %s", e)
-
     def _encode_frame(self, frame, quality: int) -> Tuple[bytes, int, int]:
         """Normalize any supported frame type to (jpeg_bytes, width, height).
 
@@ -700,6 +686,7 @@ class Plexus:
         *,
         description: Optional[str] = None,
         params: Optional[List[Dict[str, Any]]] = None,
+        concurrency: str = "accept",
     ) -> None:
         """Register a command handler (WebSocket transport only).
 
@@ -709,6 +696,12 @@ class Plexus:
 
         Must be called before the first send() so the command is advertised
         in the auth frame.
+
+        concurrency: "accept" (default) runs overlapping invocations of the
+            same command concurrently; "reject" refuses a new invocation with
+            an error result while a previous one is still running. Use
+            "reject" for handlers that drive exclusive hardware (e.g. a pump
+            init) so a retry or double-click can't start two at once.
         """
         ws = self._ensure_ws()
         if ws.is_authenticated:
@@ -718,7 +711,10 @@ class Plexus:
                 "Call on_command() before the first send().",
                 name,
             )
-        ws.register_command(name, handler, description=description, params=params)
+        ws.register_command(
+            name, handler, description=description, params=params,
+            concurrency=concurrency,
+        )
 
     def _send_points(self, points: List[Dict[str, Any]]) -> bool:
         """Send data points to the gateway with retry and buffering.

plexus/config.py

@@ -49,8 +49,8 @@ CONFIG_DIR = Path.home() / ".plexus"
 CONFIG_FILE = CONFIG_DIR / "config.json"
 
 PLEXUS_ENDPOINT = "https://app.plexus.company"
-PLEXUS_GATEWAY_URL = "https://plexus-gateway.fly.dev"
-PLEXUS_GATEWAY_WS_URL = "wss://plexus-gateway.fly.dev"
+PLEXUS_GATEWAY_URL = "https://gateway.plexus.company"
+PLEXUS_GATEWAY_WS_URL = "wss://gateway.plexus.company"
 
 DEFAULT_CONFIG = {
     "api_key": None,
@@ -145,54 +145,6 @@ def get_source_id() -> Optional[str]:
     return source_id
 
 
-def get_install_id() -> str:
-    """Get the device install ID, generating one if not set.
-
-    The install_id is a stable per-installation UUID. It is generated lazily
-    on first run (NOT at image-build time) so that cloned SD-card images
-    naturally get distinct install_ids on their first boot. The gateway uses
-    it to tell "same device reconnecting" from "different device claiming the
-    same name" when resolving source_id collisions.
-
-    Resolution order:
-      1. ``PLEXUS_INSTALL_ID`` env var — lets ephemeral containers (Fly
-         machines, CI runners, Kubernetes pods) pin a stable identity
-         across restarts when the config filesystem is ephemeral. Without
-         this, every redeploy generates a new install_id and the gateway
-         auto-suffixes the source_id to avoid a collision with the prior
-         install ("gw-001" → "gw-001_2" → "gw-001_3"…).
-      2. ``install_id`` in the on-disk config.
-      3. Newly-generated UUID, persisted to config.
-    """
-    env_id = os.environ.get("PLEXUS_INSTALL_ID", "").strip()
-    if env_id:
-        return env_id
-
-    config = load_config()
-    install_id = config.get("install_id")
-
-    if not install_id:
-        import uuid
-        install_id = uuid.uuid4().hex
-        config["install_id"] = install_id
-        save_config(config)
-
-    return install_id
-
-
-def set_source_id(source_id: str) -> None:
-    """Persist an updated source_id to the config file.
-
-    Called by the SDK when the gateway returns an auto-suffixed name so the
-    assigned name is stable across reconnects.
-    """
-    config = load_config()
-    if config.get("source_id") == source_id:
-        return
-    config["source_id"] = source_id
-    save_config(config)
-
-
 def get_persistent_buffer() -> bool:
     """Get persistent buffer setting. Default True (store-and-forward enabled)."""
     config = load_config()

plexus/ws.py

@@ -62,6 +62,11 @@ class _RegisteredCommand:
     handler: CommandHandler
     description: Optional[str] = None
     params: List[Dict[str, Any]] = field(default_factory=list)
+    # "accept" (default): run overlapping invocations concurrently.
+    # "reject": refuse a new invocation with an error result while a
+    # previous one of the same command is still running.
+    concurrency: str = "accept"
+    _lock: threading.Lock = field(default_factory=threading.Lock, repr=False)
 
     def to_manifest(self) -> Dict[str, Any]:
         m: Dict[str, Any] = {"name": self.name}
@@ -89,11 +94,9 @@ class WebSocketTransport:
         source_id: str,
         ws_url: str,
         *,
-        install_id: str = "",
         agent_version: str = "0.0.0",
         platform: str = "python-sdk",
         auto_reconnect: bool = True,
-        on_source_id_assigned: Optional[Callable[[str], None]] = None,
         on_clock_synced: Optional[Callable[[int], None]] = None,
     ):
         if not api_key:
@@ -103,12 +106,10 @@ class WebSocketTransport:
 
         self.api_key = api_key
         self.source_id = source_id
-        self.install_id = install_id
         self.ws_url = _ensure_device_path(ws_url)
         self.agent_version = agent_version
         self.platform = platform
         self.auto_reconnect = auto_reconnect
-        self._on_source_id_assigned = on_source_id_assigned
         self._on_clock_synced = on_clock_synced
 
         self._commands: Dict[str, _RegisteredCommand] = {}
@@ -131,11 +132,24 @@ class WebSocketTransport:
         *,
         description: Optional[str] = None,
         params: Optional[List[Dict[str, Any]]] = None,
+        concurrency: str = "accept",
     ) -> None:
         """Register a command handler. Must be called before start() to be
-        advertised in the auth frame."""
+        advertised in the auth frame.
+
+        concurrency controls what happens when a command arrives while a
+        previous invocation of the *same* command is still running:
+            "accept" (default) — run it concurrently on a new thread.
+            "reject"           — refuse it with an error result until the
+                                 in-flight invocation finishes.
+        """
+        if concurrency not in ("accept", "reject"):
+            raise ValueError(
+                f"concurrency must be 'accept' or 'reject', got {concurrency!r}"
+            )
         self._commands[name] = _RegisteredCommand(
-            name=name, handler=handler, description=description, params=params or []
+            name=name, handler=handler, description=description,
+            params=params or [], concurrency=concurrency,
         )
 
     def start(self) -> None:
@@ -278,16 +292,13 @@ class WebSocketTransport:
             self._ws = ws
 
         # 1. Send device_auth
-        desired_source_id = self.source_id
         auth = {
             "type": "device_auth",
             "api_key": self.api_key,
-            "source_id": desired_source_id,
+            "source_id": self.source_id,
             "platform": self.platform,
             "agent_version": self.agent_version,
         }
-        if self.install_id:
-            auth["install_id"] = self.install_id
         if self._commands:
             auth["commands"] = [c.to_manifest() for c in self._commands.values()]
         ws.send(json.dumps(auth))
@@ -312,22 +323,6 @@ class WebSocketTransport:
                 except Exception as e:
                     logger.debug("on_clock_synced callback raised: %s", e)
 
-        # The gateway may return a different source_id if the desired name
-        # was already claimed by another install — adopt the assigned value
-        # so all subsequent frames (heartbeats, future reconnects) use it.
-        assigned = msg.get("source_id")
-        if isinstance(assigned, str) and assigned and assigned != self.source_id:
-            logger.info(
-                "plexus ws source_id auto-suffixed: requested=%s assigned=%s",
-                desired_source_id, assigned,
-            )
-            self.source_id = assigned
-            if self._on_source_id_assigned is not None:
-                try:
-                    self._on_source_id_assigned(assigned)
-                except Exception as e:  # pragma: no cover - callback errors must not break auth
-                    logger.debug("on_source_id_assigned callback raised: %s", e)
-
         was_reconnect = self._backoff_attempt > 0
         self._authenticated.set()
         self._backoff_attempt = 0
@@ -394,13 +389,42 @@ class WebSocketTransport:
             })
             return
 
+        # concurrency="reject": if an invocation is already running, refuse
+        # this one immediately rather than starting a second in parallel.
+        holds_lock = False
+        if reg.concurrency == "reject":
+            if not reg._lock.acquire(blocking=False):
+                self._send_frame({
+                    "type": "command_result",
+                    "id": cmd_id,
+                    "command": command,
+                    "event": "error",
+                    "error": f"command already in progress: {command}",
+                })
+                return
+            holds_lock = True
+
         # Run the handler off the read-loop thread so a slow handler doesn't
         # block heartbeats or other inbound frames.
-        threading.Thread(
-            target=self._run_handler,
-            args=(reg, cmd_id, command, params),
-            daemon=True,
-        ).start()
+        try:
+            threading.Thread(
+                target=self._run_handler,
+                args=(reg, cmd_id, command, params, holds_lock),
+                daemon=True,
+            ).start()
+        except Exception as e:
+            # Thread creation failed (e.g. resource exhaustion). Release the
+            # concurrency lock so the command isn't wedged as "in progress",
+            # and report the failure rather than leaving it silently un-acked.
+            if holds_lock:
+                reg._lock.release()
+            self._send_frame({
+                "type": "command_result",
+                "id": cmd_id,
+                "command": command,
+                "event": "error",
+                "error": f"failed to start command handler: {e}",
+            })
 
     def _run_handler(
         self,
@@ -408,6 +432,7 @@ class WebSocketTransport:
         cmd_id: str,
         command: str,
         params: Dict[str, Any],
+        holds_lock: bool = False,
     ) -> None:
         try:
             result = reg.handler(command, params)
@@ -420,6 +445,11 @@ class WebSocketTransport:
                 "error": str(e),
             })
             return
+        finally:
+            # Release the concurrency lock (if held) as soon as the handler
+            # returns, regardless of success or failure.
+            if holds_lock:
+                reg._lock.release()
         self._send_frame({
             "type": "command_result",
             "id": cmd_id,

{plexus_python-0.7.0.dist-info → plexus_python-0.8.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: plexus-python
-Version: 0.7.0
+Version: 0.8.0
 Summary: Thin Python SDK for Plexus — send telemetry in one line
-Project-URL: Homepage, https://plexus.dev
-Project-URL: Documentation, https://docs.plexus.dev
+Project-URL: Homepage, https://plexus.company
+Project-URL: Documentation, https://docs.plexus.company
 Project-URL: Repository, https://github.com/plexus-oss/plexus-python
 Project-URL: Issues, https://github.com/plexus-oss/plexus-python/issues
-Author-email: Plexus <hello@plexus.dev>
+Author-email: Plexus <info@plexus.company>
 License-Expression: Apache-2.0
 License-File: LICENSE
 Keywords: fleet,hardware,iot,monitoring,observability,telemetry
@@ -270,8 +270,8 @@ The SDK sends an `ack` frame before invoking the handler, then a `result` frame
 | Variable                | Description                  | Default                          |
 | ----------------------- | ---------------------------- | -------------------------------- |
 | `PLEXUS_API_KEY`        | API key (required)           | none                             |
-| `PLEXUS_GATEWAY_URL`    | HTTP ingest URL              | `https://plexus-gateway.fly.dev` |
-| `PLEXUS_GATEWAY_WS_URL` | WebSocket URL              | `wss://plexus-gateway.fly.dev`   |
+| `PLEXUS_GATEWAY_URL`    | HTTP ingest URL              | `https://gateway.plexus.company` |
+| `PLEXUS_GATEWAY_WS_URL` | WebSocket URL              | `wss://gateway.plexus.company`   |
 
 ## Architecture
 

plexus_python-0.8.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+plexus/__init__.py,sha256=O9GpL-CqlDKRoEfQq5ojYNsIMa7CtXuYvdw3zCrC8pg,447
+plexus/_log.py,sha256=3fjXrHFZghQ_17umMcvDUjjTH6aTQB3J4SpVDBiH03w,335
+plexus/buffer.py,sha256=0i6PLgoj904jFNv9RCrlskvPQsPSu_KNdYWMasFOvsg,9596
+plexus/cli.py,sha256=-2wvHXQzobx3_tDGTXpaE2PlHv884y93Mu29kZE8qZE,14214
+plexus/client.py,sha256=12qnUgmZbTEXuSFtMCAXqosh-V84odSiqagbhtfjAc8,36280
+plexus/config.py,sha256=Y4rPo1zeqAOnz-pQWrDBAXZ1gjfr0UD5Q6HHTMmbKew,4450
+plexus/ws.py,sha256=PSVVrS1vpGi20qGdRfTi4LWCXzt3Dx3hR09FuoT-QIs,18643
+plexus/cameras/__init__.py,sha256=OvnU9KGKxkVtFLlk56H9x-ATa6UvpLI7PANa0HQO2cc,490
+plexus/cameras/thermal.py,sha256=7o33QsF1RiZLManTxZ2E36nO8lRAHppCDkS3zXBHCxs,12047
+plexus_python-0.8.0.dist-info/METADATA,sha256=MfH0vB7R8uBYeJhTTY8Xbd_Qi3qCYZ3jzSIS8cPFNmg,11750
+plexus_python-0.8.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+plexus_python-0.8.0.dist-info/entry_points.txt,sha256=YlkOtTn_7Q_IGuJaKdvpU-90dCeBSPx2p_UTGMAz5Zs,43
+plexus_python-0.8.0.dist-info/licenses/LICENSE,sha256=nm3qP1F-JAGcfLpRVtIX24L20LMnRpxmZ2oKZzFpLVo,10755
+plexus_python-0.8.0.dist-info/RECORD,,

{plexus_python-0.7.0.dist-info → plexus_python-0.8.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.30.1
 Root-Is-Purelib: true
 Tag: py3-none-any

plexus_python-0.7.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-plexus/__init__.py,sha256=HNRVhpDrkyyT-SQqfFzNf3E_uwbwQA-XcDKPoBytdEo,447
-plexus/_log.py,sha256=3fjXrHFZghQ_17umMcvDUjjTH6aTQB3J4SpVDBiH03w,335
-plexus/buffer.py,sha256=0i6PLgoj904jFNv9RCrlskvPQsPSu_KNdYWMasFOvsg,9596
-plexus/cli.py,sha256=-2wvHXQzobx3_tDGTXpaE2PlHv884y93Mu29kZE8qZE,14214
-plexus/client.py,sha256=DaCPURIhVswwjf4oGrp381Atiy02gk3viLy6NioBAtQ,36480
-plexus/config.py,sha256=wsG6lhNLmKe3JRlVycyRUKQeywnPUPPfrWkXFxYwELE,6179
-plexus/ws.py,sha256=_c--U-yySZbMXZsaj0fUaYKF_WesolHsrMDx4oWYfFQ,17428
-plexus/cameras/__init__.py,sha256=OvnU9KGKxkVtFLlk56H9x-ATa6UvpLI7PANa0HQO2cc,490
-plexus/cameras/thermal.py,sha256=7o33QsF1RiZLManTxZ2E36nO8lRAHppCDkS3zXBHCxs,12047
-plexus_python-0.7.0.dist-info/METADATA,sha256=tlsktssdsOI7dyA7O2I6azPay2Xj998Z4zNxbFf4H6s,11739
-plexus_python-0.7.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-plexus_python-0.7.0.dist-info/entry_points.txt,sha256=YlkOtTn_7Q_IGuJaKdvpU-90dCeBSPx2p_UTGMAz5Zs,43
-plexus_python-0.7.0.dist-info/licenses/LICENSE,sha256=nm3qP1F-JAGcfLpRVtIX24L20LMnRpxmZ2oKZzFpLVo,10755
-plexus_python-0.7.0.dist-info/RECORD,,