cleanup and tests

Author: Mike Prosser

src/nipanel/_panel_client.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import pathlib
 import threading
 from typing import Callable, TypeVar
 
@@ -51,8 +52,8 @@ def start_streamlit_panel(
         self, panel_id: str, panel_script_path: str, python_interpreter_path: str
     ) -> str:
 
-        panel_script_url = self._to_file_url(panel_script_path)
-        python_interpreter_url = self._to_file_url(python_interpreter_path)
+        panel_script_url = pathlib.Path(panel_script_path).absolute().as_uri()
+        python_interpreter_url = pathlib.Path(python_interpreter_path).absolute().as_uri()
         streamlit_panel_configuration = StreamlitPanelConfiguration(
             panel_script_url=panel_script_url, python_interpreter_url=python_interpreter_url
         )
@@ -131,6 +132,3 @@ def _invoke_with_retry(
                 self._stub = None
                 return method(*args, **kwargs)
             raise
-
-    def _to_file_url(self, path: str) -> str:
-        return path if path.startswith("file://") else f"file://{path}"

tests/unit/test_streamlit_panel.py

@@ -509,15 +509,25 @@ def test___panel___panel_is_running_and_in_memory(
     assert is_panel_running(panel)
 
 
-def test___panel___python_path_is_in_venv(
+def test___panel___python_interpreter_url_is_in_venv(
     fake_python_panel_service: FakePythonPanelService,
     fake_panel_channel: grpc.Channel,
 ) -> None:
     StreamlitPanel("my_panel", "path/to/script", grpc_channel=fake_panel_channel)
 
+    assert fake_python_panel_service.servicer.python_interpreter_url.startswith("file://")
     assert ".venv" in fake_python_panel_service.servicer.python_interpreter_url
 
 
+def test___panel___python_script_url_starts_with_file(
+    fake_python_panel_service: FakePythonPanelService,
+    fake_panel_channel: grpc.Channel,
+) -> None:
+    StreamlitPanel("my_panel", "path/to/script", grpc_channel=fake_panel_channel)
+
+    assert fake_python_panel_service.servicer.python_script_url.startswith("file://")
+
+
 def is_panel_in_memory(panel: StreamlitPanel) -> bool:
     return panel.panel_id in panel._panel_client.enumerate_panels().keys()
 

tests/utils/_fake_python_panel_servicer.py

@@ -32,6 +32,7 @@ def __init__(self) -> None:
         self._set_count: int = 0
         self._notification_count: int = 0
         self._python_interpreter_url: str = ""
+        self._python_script_url: str = ""
 
     def StartPanel(  # noqa: N802
         self, request: StartPanelRequest, context: Any
@@ -40,6 +41,7 @@ def StartPanel(  # noqa: N802
         streamlit_panel_configuration = StreamlitPanelConfiguration()
         request.panel_configuration.Unpack(streamlit_panel_configuration)
         self._python_interpreter_url = streamlit_panel_configuration.python_interpreter_url
+        self._python_script_url = streamlit_panel_configuration.panel_script_url
         if self._fail_next_start_panel:
             self._fail_next_start_panel = False
             context.abort(grpc.StatusCode.UNAVAILABLE, "Simulated failure")
@@ -106,9 +108,14 @@ def notification_count(self) -> int:
 
     @property
     def python_interpreter_url(self) -> str:
-        """Get the Python path used to start the panel."""
+        """Get the Python interpreter url."""
         return self._python_interpreter_url
 
+    @property
+    def python_script_url(self) -> str:
+        """Get the Python script url."""
+        return self._python_script_url
+
     def _init_panel(self, panel_id: str) -> None:
         if panel_id not in self._panel_ids:
             self._panel_ids.append(panel_id)