syd 0.1.1__tar.gz → 0.1.3__tar.gz

{syd-0.1.1 → syd-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syd
-Version: 0.1.1
+Version: 0.1.3
 Summary: A Python package for making GUIs for data science easy.
 Project-URL: Homepage, https://github.com/landoskape/syd
 Author-email: Andrew Landau <andrew+tyler+landau+getridofthisanddtheplusses@gmail.com>

{syd-0.1.1 → syd-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "syd"
-version = "0.1.1"
+version = "0.1.3"
 authors = [
     {name = "Andrew Landau", email = "andrew+tyler+landau+getridofthisanddtheplusses@gmail.com"},
 ]

syd-0.1.3/syd/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.3"

{syd-0.1.1 → syd-0.1.3}/syd/interactive_viewer.py

@@ -1,4 +1,4 @@
-from typing import List, Any, Callable, Dict
+from typing import List, Any, Callable, Dict, Tuple
 from functools import wraps
 from contextlib import contextmanager
 from matplotlib.figure import Figure
@@ -76,7 +76,7 @@ class InteractiveViewer:
         self.state = {}
         self._app_deployed = False
 
-    def param_dict(self) -> Dict[str, Any]:
+    def get_state(self) -> Dict[str, Any]:
         return {name: param.value for name, param in self.parameters.items()}
 
     def plot(self, **kwargs) -> Figure:
@@ -94,8 +94,9 @@ class InteractiveViewer:
     def perform_callbacks(self, name: str) -> bool:
         """Perform callbacks for all parameters that have changed"""
         if name in self.callbacks:
+            state = self.get_state()
             for callback in self.callbacks[name]:
-                callback(self.parameters[name].value)
+                callback(state)
 
     def on_change(self, parameter_name: str, callback: Callable):
         """Register a function to be called when a parameter changes."""
@@ -122,47 +123,45 @@ class InteractiveViewer:
         self.parameters[name] = ParameterType.text.value(name, default)
 
     @validate_parameter_operation("add", ParameterType.selection)
-    def add_selection(self, name: str, options: List[Any], default: str = None) -> None:
+    def add_selection(self, name: str, options: List[Any], default: Any = None) -> None:
         self.parameters[name] = ParameterType.selection.value(name, options, default)
 
     @validate_parameter_operation("add", ParameterType.multiple_selection)
-    def add_multiple_selection(self, name: str, options: List[Any], defaults: List[Any] = None) -> None:
-        self.parameters[name] = ParameterType.multiple_selection.value(name, options, defaults)
+    def add_multiple_selection(self, name: str, options: List[Any], default: List[Any] = None) -> None:
+        self.parameters[name] = ParameterType.multiple_selection.value(name, options, default)
 
     @validate_parameter_operation("add", ParameterType.boolean)
-    def add_boolean(self, name: str, default: bool = False) -> None:
+    def add_boolean(self, name: str, default: bool = True) -> None:
         self.parameters[name] = ParameterType.boolean.value(name, default)
 
     @validate_parameter_operation("add", ParameterType.integer)
-    def add_integer(self, name: str, min_value: int, max_value: int, default: int = None) -> None:
+    def add_integer(self, name: str, min_value: int = None, max_value: int = None, default: int = 0) -> None:
         self.parameters[name] = ParameterType.integer.value(name, min_value, max_value, default)
 
     @validate_parameter_operation("add", ParameterType.float)
-    def add_float(self, name: str, min_value: float, max_value: float, step: float = 0.1, default: float = None) -> None:
-        self.parameters[name] = ParameterType.float.value(name, min_value, max_value, step, default)
+    def add_float(self, name: str, min_value: float = None, max_value: float = None, default: float = 0.0, step: float = 0.1) -> None:
+        self.parameters[name] = ParameterType.float.value(name, min_value, max_value, default, step)
 
     @validate_parameter_operation("add", ParameterType.integer_pair)
     def add_integer_pair(
         self,
         name: str,
-        min_value: int,
-        max_value: int,
-        default_low: int = None,
-        default_high: int = None,
+        default: Tuple[int, int],
+        min_value: int = None,
+        max_value: int = None,
     ) -> None:
-        self.parameters[name] = ParameterType.integer_pair.value(name, min_value, max_value, default_low, default_high)
+        self.parameters[name] = ParameterType.integer_pair.value(name, default, min_value, max_value)
 
     @validate_parameter_operation("add", ParameterType.float_pair)
     def add_float_pair(
         self,
         name: str,
-        min_value: float,
-        max_value: float,
+        default: Tuple[float, float],
+        min_value: float = None,
+        max_value: float = None,
         step: float = 0.1,
-        default_low: float = None,
-        default_high: float = None,
     ) -> None:
-        self.parameters[name] = ParameterType.float_pair.value(name, min_value, max_value, step, default_low, default_high)
+        self.parameters[name] = ParameterType.float_pair.value(name, default, min_value, max_value, step)
 
     # -------------------- parameter update methods --------------------
     @validate_parameter_operation("update", ParameterType.text)
@@ -170,44 +169,42 @@ class InteractiveViewer:
         self.parameters[name] = ParameterType.text.value(name, default)
 
     @validate_parameter_operation("update", ParameterType.selection)
-    def update_selection(self, name: str, options: List[Any], default: str = None) -> None:
+    def update_selection(self, name: str, options: List[Any], default: Any = None) -> None:
         self.parameters[name] = ParameterType.selection.value(name, options, default)
 
     @validate_parameter_operation("update", ParameterType.multiple_selection)
-    def update_multiple_selection(self, name: str, options: List[Any], defaults: List[Any] = None) -> None:
-        self.parameters[name] = ParameterType.multiple_selection.value(name, options, defaults)
+    def update_multiple_selection(self, name: str, options: List[Any], default: List[Any] = None) -> None:
+        self.parameters[name] = ParameterType.multiple_selection.value(name, options, default)
 
     @validate_parameter_operation("update", ParameterType.boolean)
-    def update_boolean(self, name: str, default: bool = False) -> None:
+    def update_boolean(self, name: str, default: bool = True) -> None:
         self.parameters[name] = ParameterType.boolean.value(name, default)
 
     @validate_parameter_operation("update", ParameterType.integer)
-    def update_integer(self, name: str, min_value: int, max_value: int, default: int = None) -> None:
+    def update_integer(self, name: str, min_value: int = None, max_value: int = None, default: int = 0) -> None:
         self.parameters[name] = ParameterType.integer.value(name, min_value, max_value, default)
 
     @validate_parameter_operation("update", ParameterType.float)
-    def update_float(self, name: str, min_value: float, max_value: float, step: float = 0.1, default: float = None) -> None:
-        self.parameters[name] = ParameterType.float.value(name, min_value, max_value, step, default)
+    def update_float(self, name: str, min_value: float = None, max_value: float = None, default: float = 0.0, step: float = 0.1) -> None:
+        self.parameters[name] = ParameterType.float.value(name, min_value, max_value, default, step)
 
     @validate_parameter_operation("update", ParameterType.integer_pair)
     def update_integer_pair(
         self,
         name: str,
-        min_value: int,
-        max_value: int,
-        default_low: int = None,
-        default_high: int = None,
+        default: Tuple[int, int],
+        min_value: int = None,
+        max_value: int = None,
     ) -> None:
-        self.parameters[name] = ParameterType.integer_pair.value(name, min_value, max_value, default_low, default_high)
+        self.parameters[name] = ParameterType.integer_pair.value(name, default, min_value, max_value)
 
     @validate_parameter_operation("update", ParameterType.float_pair)
     def update_float_pair(
         self,
         name: str,
-        min_value: float,
-        max_value: float,
+        default: Tuple[float, float],
+        min_value: float = None,
+        max_value: float = None,
         step: float = 0.1,
-        default_low: float = None,
-        default_high: float = None,
     ) -> None:
-        self.parameters[name] = ParameterType.float_pair.value(name, min_value, max_value, step, default_low, default_high)
+        self.parameters[name] = ParameterType.float_pair.value(name, default, min_value, max_value, step)

{syd-0.1.1 → syd-0.1.3}/syd/notebook_deploy.py

@@ -220,7 +220,7 @@ class NotebookDeployment:
         """Update the plot with current parameters and size."""
         self._current_fig.clear()
         self._current_fig.set_size_inches(self.fig_width, self.fig_height)
-        self._current_fig = self.viewer.plot(fig=self._current_fig, state=self.viewer.param_dict())
+        self._current_fig = self.viewer.plot(fig=self._current_fig, state=self.viewer.get_state())
 
         # Apply tight layout to remove dead space
         self._current_fig.tight_layout()
@@ -266,7 +266,7 @@ class NotebookDeployment:
         # Create initial plot
         self._current_fig = plt.figure(figsize=(self.fig_width, self.fig_height))
         plt.close(self._current_fig)  # close the figure to prevent it from being displayed
-        self._current_fig = self.viewer.plot(fig=self._current_fig, state=self.viewer.param_dict())
+        self._current_fig = self.viewer.plot(fig=self._current_fig, state=self.viewer.get_state())
         with self.plot_output:
             display(self._current_fig)
 

{syd-0.1.1 → syd-0.1.3}/syd/parameters.py

@@ -182,7 +182,7 @@ class PairParameter(Parameter[Tuple[T, T]], ABC):
         raise NotImplementedError("Need to define in subclass for proper IDE support")
 
     @abstractmethod
-    def _validate_value(self, value: Any) -> T:
+    def _validate(self, value: Any) -> T:
         raise NotImplementedError
 
 

syd-0.1.1/syd/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.1"