Merge branch 'dev'

Pipfile

@@ -7,7 +7,7 @@ name = "pypi"
 jupyter = "==1.1.1"
 bitarray = "==3.0.0"
 notebook = "==7.2.2"
-websockets = "==12.0"
+websockets = "==14.1"
 ipykernel = "==6.29.5"
 nest-asyncio = "==1.6.0"
 aiofiles = "==24.1.0"
@@ -17,12 +17,13 @@ numpy = "==1.26.0"
 bokeh = "==2.4.3"
 panel = "==0.14.4"
 jupyter-bokeh = "==3.0.5"
+pandas = "==2.2.3"
 
 [dev-packages]
 twine = "*"
 pip-chill = "*"
-sphinx = "*"
-sphinx-rtd-theme = "*"
+sphinx = "==7.4.7"
+sphinx-rtd-theme = "==3.0.2"
 build = "*"
 pipdeptree = "*"
 

dev/dev.prepare-requires.py

@@ -6,17 +6,17 @@ def filter_pybela_packages(file_path):
     for line in lines:
         if 'pybela' in line and line.startswith('#'):
             pybela_packages.append(line.split('#')[1].split(' ')[1])
-
+    print(pybela_packages)
     return pybela_packages
 
 
 def write_pybela_packages_to_file(pybela_packages, output_file_path):
+    print(f"Writing pybela packages to file: {output_file_path}")
     with open(output_file_path, 'w') as file:
         for package in pybela_packages:
             file.write(f"{package}\n")
 
 
-# Example usage
 file_path = 'pip-chill.txt'
 output_file_path = 'requirements.txt'
 pybela_packages = filter_pybela_packages(file_path)

dev/dev.test-dist.sh

@@ -7,7 +7,7 @@ echo "\nCreating test-env..."
 python -m venv test-env
 source test-env/bin/activate
 echo "\nInstalling pybela from dist..." 
-pip install ../dist/pybela-1.0.2-py3-none-any.whl
+pip install ../dist/pybela-2.0.0-py3-none-any.whl
 echo "\nRunning test.py..."
 python test.py
 deactivate

pybela/Controller.py

@@ -33,12 +33,13 @@ def start_controlling(self, variables=[]):
 
         async def async_wait_for_control_mode_to_be_set(variables=variables):
             # wait for variables to be set as 'controlled' in list
-            _controlled_status = self.get_controlled_status(
+            _controlled_status = await self._async_get_controlled_status(
                 variables)  # avoid multiple calls to list
             while not all([_controlled_status[var] for var in variables]):
-                await asyncio.sleep(0.5)
+                await asyncio.sleep(0.2)
 
-        asyncio.run(async_wait_for_control_mode_to_be_set(variables=variables))
+        self.loop.run_until_complete(
+            async_wait_for_control_mode_to_be_set(variables=variables))
 
         _print_info(
             f"Started controlling variables {variables}... Run stop_controlling() to stop controlling the variable values.")
@@ -58,12 +59,13 @@ def stop_controlling(self, variables=[]):
 
         async def async_wait_for_control_mode_to_be_set(variables=variables):
             # wait for variables to be set as 'uncontrolled' in list
-            _controlled_status = self.get_controlled_status(
+            _controlled_status = await self._async_get_controlled_status(
                 variables)  # avoid multiple calls to list
             while all([_controlled_status[var] for var in variables]):
                 await asyncio.sleep(0.5)
 
-        asyncio.run(async_wait_for_control_mode_to_be_set(variables=variables))
+        self.loop.run_until_complete(
+            async_wait_for_control_mode_to_be_set(variables=variables))
 
         _print_info(f"Stopped controlling variables {variables}.")
 
@@ -96,6 +98,12 @@ def send_value(self, variables, values):
         self.send_ctrl_msg(
             {"watcher": [{"cmd": "set", "watchers": variables, "values": values}]})
 
+    async def _async_get_controlled_status(self, variables=[]):
+        """Async version of get_controller_status"""
+        variables = self._var_arg_checker(variables)
+        _list = await self._async_list()
+        return {var['name']: var['controlled'] for var in _list['watchers'] if var['name'] in variables}
+
     def get_controlled_status(self, variables=[]):
         """Gets the controlled status (controlled or uncontrolled) of the variables