put panel_id berfore panel_uri

Author: Mike Prosser

src/nipanel/_panel.py

@@ -18,26 +18,26 @@ class Panel(ABC):
     """This class allows you to connect to a panel and specify values for its controls."""
 
     _stub: PythonPanelServiceStub | None
-    _panel_uri: str
     _panel_id: str
+    _panel_uri: str
 
-    __slots__ = ["_stub", "_panel_uri", "_panel_id", "__weakref__"]
+    __slots__ = ["_stub", "_panel_id", "_panel_uri", "__weakref__"]
 
-    def __init__(self, panel_uri: str, panel_id: str) -> None:
+    def __init__(self, panel_id: str, panel_uri: str) -> None:
         """Initialize the panel."""
-        self._panel_uri = panel_uri
         self._panel_id = panel_id
-
-    @property
-    def panel_uri(self) -> str:
-        """Read-only accessor for the panel URI."""
-        return self._panel_uri
+        self._panel_uri = panel_uri
 
     @property
     def panel_id(self) -> str:
         """Read-only accessor for the panel ID."""
         return self._panel_id
 
+    @property
+    def panel_uri(self) -> str:
+        """Read-only accessor for the panel URI."""
+        return self._panel_uri
+
     def __enter__(self) -> Self:
         """Enter the runtime context related to this object."""
         self.connect()

src/nipanel/_streamlit_panel.py

@@ -6,17 +6,17 @@ class StreamlitPanel(Panel):
 
     __slots__ = ()
 
-    def __init__(self, streamlit_script_uri: str, panel_id: str) -> None:
+    def __init__(self, panel_id: str, streamlit_script_uri: str) -> None:
         """Create a panel using a Streamlit script for the user interface.
 
         Args:
-            streamlit_script_uri: The file path of the Streamlit script.
             panel_id: A unique identifier for the panel.
+            streamlit_script_uri: The file path of the Streamlit script.
 
         Returns:
             A new StreamlitPanel instance.
         """
-        super().__init__(streamlit_script_uri, panel_id)
+        super().__init__(panel_id, streamlit_script_uri)
 
     def _resolve_service_location(self) -> str:
         # TODO: AB#3095680 - resolve to the Streamlit PythonPanelService

tests/unit/test_panel.py

@@ -2,13 +2,13 @@
 
 
 def test___streamlit_panel___has_panel_id_and_panel_uri() -> None:
-    panel = nipanel.StreamlitPanel("path/to/script", "my_panel")
-    assert panel.panel_uri == "path/to/script"
+    panel = nipanel.StreamlitPanel("my_panel", "path/to/script")
     assert panel.panel_id == "my_panel"
+    assert panel.panel_uri == "path/to/script"
 
 
 def test___connected_panel___set_value___gets_same_value() -> None:
-    panel = nipanel.StreamlitPanel("path/to/script", "my_panel")
+    panel = nipanel.StreamlitPanel("my_panel", "path/to/script")
     panel.connect()
 
     panel.set_value("test_id", "test_value")
@@ -19,7 +19,7 @@ def test___connected_panel___set_value___gets_same_value() -> None:
 
 
 def test___with_panel___set_value___gets_same_value() -> None:
-    with nipanel.StreamlitPanel("path/to/script", "my_panel") as panel:
+    with nipanel.StreamlitPanel("my_panel", "path/to/script") as panel:
 
         panel.set_value("test_id", "test_value")