nardial 0.3.1__tar.gz → 0.3.2__tar.gz

{nardial-0.3.1 → nardial-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nardial
-Version: 0.3.1
+Version: 0.3.2
 Summary: Nardial Dialog System
 Author-email: Mike Ligthart <m.e.u.ligthart@vu.nl>
 Maintainer: Clara Fayyad, Landon Brown, Evelyne Prodescu

{nardial-0.3.1 → nardial-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nardial"
-version = "0.3.1"
+version = "0.3.2"
 description = "Nardial Dialog System"
 readme = "README.md"
 requires-python = ">=3.12"

{nardial-0.3.1 → nardial-0.3.2}/src/nardial/providers/screen/pepper_tablet.py

@@ -37,6 +37,7 @@ constructor.  The connection request is sent before the page URL is opened.
 from __future__ import annotations
 
 import logging
+from pathlib import Path
 
 from nardial.providers.screen.sic_adapter import SICScreenAdapter
 
@@ -72,6 +73,8 @@ class PepperTabletScreenAdapter(SICScreenAdapter):
     wifi_security : str
         Security type — one of ``"open"``, ``"wep"``, ``"wpa"``, ``"wpa2"``
         (default: ``"wpa2"``).
+    assets_root : str or None
+        Optional root directory for local assets (images, videos)
     """
 
     def __init__(
@@ -84,9 +87,10 @@ class PepperTabletScreenAdapter(SICScreenAdapter):
         wifi_ssid: str | None = None,
         wifi_password: str = "",
         wifi_security: str = "wpa2",
+        assets_root: Path | None = None,
     ) -> None:
         # Parent registers the button-click callback on the webserver.
-        super().__init__(webserver=webserver)
+        super().__init__(webserver=webserver, assets_root=assets_root)
         self._tablet = tablet
 
         if wifi_ssid:
@@ -132,19 +136,9 @@ class PepperTabletScreenAdapter(SICScreenAdapter):
         except Exception:
             logger.exception("PepperTabletScreenAdapter: failed to open URL on tablet")
 
-    def refresh_tablet(self) -> None:
-        """Refresh the tablet display by re-sending the current URL.
-
-        This can be used to recover if the tablet goes to sleep or loses the
-        page for some reason.  Failures are logged and swallowed.
-        """
-        logger.info("PepperTabletScreenAdapter: refreshing tablet display")
-        self._open_on_tablet(self.tablet_url)
-
     async def show_image(self, src: str) -> None:
         """Override parent method to also refresh pepper's tablet."""
         await super().show_image(src)
-        self.refresh_tablet()
 
     # ------------------------------------------------------------------
     # Lifecycle

{nardial-0.3.1 → nardial-0.3.2}/src/nardial/providers/screen/sic_adapter.py

@@ -36,6 +36,7 @@ from __future__ import annotations
 import base64
 import logging
 import mimetypes
+import shutil
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -56,15 +57,80 @@ class SICScreenAdapter(ScreenProvider):
     webserver : Webserver
         An already-instantiated SIC ``Webserver`` connector.  The caller is
         responsible for its lifecycle (creation and teardown).
+    assets_root : str, optional
+        Path to a directory of static assets (e.g. images or videos) to serve.
     """
 
-    def __init__(self, webserver) -> None:
+    def __init__(self, webserver,  assets_root: Path = None) -> None:
         self._webserver = webserver
         self._bus: "EventBus | None" = None
         # Register the SIC callback immediately. If _bus is None when a click
         # arrives the event is dropped with a WARNING (see _on_button_clicked).
         self._webserver.register_callback(self._on_button_clicked)
 
+        # Path to a directory of static assets (e.g. images or videos) to serve.
+        self._assets_root = assets_root
+
+        # Resolve the package's bundled web/static directory.
+        try:
+            import nardial.providers.screen as _screen_pkg
+            self._static_dir = Path(_screen_pkg.__file__).parent / "web" / "static"
+        except Exception:
+            logger.exception("SICScreenAdapter: failed to determine package static dir")
+            self._static_dir = Path.cwd() / "static"
+
+        self._asset_link_dir = self._static_dir / "user_assets"
+        self._ensure_asset_symlink()
+
+    def _ensure_asset_symlink(self) -> None:
+        try:
+            if not self._assets_root:
+                return
+
+            if not self._assets_root.exists():
+                logger.warning("Asset root does not exist: %s", self._assets_root)
+                return
+
+            self._static_dir.mkdir(parents=True, exist_ok=True)
+
+            if self._asset_link_dir.exists() or self._asset_link_dir.is_symlink():
+                try:
+                    self._asset_link_dir.unlink()
+                except Exception:
+                    logger.exception("Failed to remove old asset link")
+
+            try:
+                self._asset_link_dir.symlink_to(
+                    self._assets_root,
+                    target_is_directory=True
+                )
+                self._asset_mode = "symlink"
+            except Exception:
+                logger.warning("Symlink failed; assets will not be served via /static")
+                self._asset_mode = "fallback"
+
+        except Exception:
+            logger.exception("Asset setup failed")
+
+    @staticmethod
+    def _resolve_media_src(src: str) -> str:
+        if not src:
+            return src
+
+        src = str(src)
+
+        # Already valid for browser
+        if src.startswith(("http://", "https://", "data:")):
+            return src
+
+        # Asset handling
+        if src.startswith("assets/"):
+            relative = src[len("assets/"):]
+            return f"/static/user_assets/{relative}"
+
+        # fallback: assume it's already a valid static path or malformed input
+        return src
+
     # ------------------------------------------------------------------
     # EventBus wiring (called by SessionManager.run_async)
     # ------------------------------------------------------------------
@@ -160,104 +226,13 @@ class SICScreenAdapter(ScreenProvider):
 
     async def show_image(self, src: str) -> None:
         """Display an image from a local path or URL. """
-        resolved = self._resolve_image_src(src)
+        resolved = self._resolve_media_src(src)
         self._send_screen({"type": "image", "src": resolved})
 
-    def _resolve_image_src(self, image_path: str) -> str:
-        """Resolve an image path to a browser-usable src.
-
-        - If the path is an absolute URL (http/https/data) it is returned unchanged.
-        - If the file exists inside the package web static dir it is rewritten to
-          the webserver's /static/... URL so the webserver can serve it.
-        - Otherwise, if a matching file exists on disk (project root, examples,
-          or absolute path), it is embedded as a base64 data URI so the browser
-          will display it without requiring the webserver to expose the file.
-        - If nothing is found, the original image_path is returned unchanged.
-        """
-        if not image_path:
-            return image_path
-        image_path = str(image_path)
-        lowered = image_path.lower()
-        if lowered.startswith("http://") or lowered.startswith("https://") or lowered.startswith("data:"):
-            return image_path
-
-        # Attempt to find the file on disk. Consider common locations:
-        #  - packaged web static dir (served at /static/...)
-        #  - project root / examples / provided relative path
-        try:
-            this_file = Path(__file__).resolve()
-            # project root: ../../../../ (src/nardial/providers/screen -> go up 4)
-            project_root = this_file.parents[4]
-        except Exception:
-            project_root = Path(".")
-
-        # 1) Check packaged web static dir (src/nardial/providers/screen/web/static)
-        web_static = Path(__file__).resolve().parent / "web" / "static"
-        candidate = web_static / image_path
-        if candidate.exists():
-            # expose via the webserver's /static/ path
-            # normalize forward slashes for the URL
-            rel = candidate.relative_to(web_static).as_posix()
-            return f"/static/{rel}"
-
-        # 2) Check project locations: project_root / image_path and project_root / examples / image_path
-        candidates = [
-            project_root / image_path,
-            project_root / "examples" / image_path,
-            Path(image_path),
-        ]
-        for c in candidates:
-            if c.exists():
-                try:
-                    mime, _ = mimetypes.guess_type(str(c))
-                    if not mime:
-                        mime = "application/octet-stream"
-                    data = c.read_bytes()
-                    b64 = base64.b64encode(data).decode("ascii")
-                    return f"data:{mime};base64,{b64}"
-                except Exception:
-                    logger.exception("Failed to embed image '%s' as data URI", c)
-                    break
-
-        # Nothing found — return original path and let the browser attempt to load it.
-        return image_path
-
-    def create_image_page(self, image_path: str):
-        """Create HTML page showing current image."""
-        resolved_src = self._resolve_image_src(image_path)
-        return f"""<!DOCTYPE html>
-                <html>
-                <head>
-                    <meta charset="UTF-8">
-                    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                    <title>Image</title>
-                    <style>
-                        body {{
-                            margin: 0;
-                            padding: 0;
-                            background-color: #000;
-                            display: flex;
-                            align-items: center;
-                            justify-content: center;
-                            height: 100vh;
-                            overflow: hidden;
-                        }}
-                        img {{
-                            max-width: 100%;
-                            max-height: 100%;
-                            object-fit: contain;
-                        }}
-                    </style>
-                </head>
-                <body>
-                    <img src="{resolved_src}" alt="Displayed Image">
-                </body>
-                </html>
-                """
-
     async def show_video(self, src: str) -> None:
         """Display a video from a local path or an embeddable URL."""
-        self._send_screen({"type": "video", "src": src})
+        resolved = self._resolve_media_src(src)
+        self._send_screen({"type": "video", "src": resolved})
 
     async def show_iframe(self, url: str) -> None:
         """Embed an external URL in an iframe on the screen."""
@@ -285,4 +260,13 @@ class SICScreenAdapter(ScreenProvider):
         self._send_screen({"type": "black"})
 
     async def close(self) -> None:
-        """No-op — the SIC ``Webserver`` connector is managed by the caller."""
+        # Clean up any symlink created for the assets root.
+        if self._asset_mode == "symlink":
+            try:
+                self._asset_link_dir.unlink()
+            except Exception:
+                logger.exception("Failed to remove asset symlink")
+
+        # No other shutdown actions here; the webserver is owned by the caller.
+
+

{nardial-0.3.1 → nardial-0.3.2}/src/nardial/session_manager.py

@@ -97,7 +97,35 @@ class SessionManager:
         return session_block
 
     def run(self):
-        asyncio.run(self.run_async())
+        """Run the session synchronously and ensure a graceful shutdown.
+
+        This wraps asyncio.run(self.run_async()) and guarantees that the
+        agent's orchestrator is disconnected (providers closed) even if
+        the session raises an exception.
+        """
+        try:
+            asyncio.run(self.run_async())
+        finally:
+            # Attempt best-effort graceful shutdown of provider resources.
+            try:
+                if hasattr(self.agent, "orchestrator") and self.agent.orchestrator is not None:
+                    try:
+                        # Stop any logging thread first (if used)
+                        if hasattr(self.agent.orchestrator, "stop_logging"):
+                            try:
+                                self.agent.orchestrator.stop_logging()
+                            except Exception:
+                                pass
+                        # Disconnect providers (TTS, device, vector store, screen)
+                        if hasattr(self.agent.orchestrator, "disconnect"):
+                            self.agent.orchestrator.disconnect()
+                    except Exception:
+                        # Swallow errors during shutdown but print for debug
+                        print("[WARN] Error while disconnecting orchestrator:", end=" ")
+                        import traceback
+                        traceback.print_exc()
+            except Exception:
+                pass
 
     async def run_async(self):
         """

{nardial-0.3.1 → nardial-0.3.2}/src/nardial.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nardial
-Version: 0.3.1
+Version: 0.3.2
 Summary: Nardial Dialog System
 Author-email: Mike Ligthart <m.e.u.ligthart@vu.nl>
 Maintainer: Clara Fayyad, Landon Brown, Evelyne Prodescu