Merge pull request #159 from tiqi-group/158-defining-task-without-autostart-fails

fix: defining task without autostart fails

README.md

@@ -105,7 +105,7 @@ class Device(pydase.DataService):
 
 if __name__ == "__main__":
     service = Device()
-    pydase.Server(service=service).run()
+    pydase.Server(service=service, web_port=8001).run()
 ```
 
 In the above example, we define a `Device` class that inherits from `pydase.DataService`. 
@@ -122,10 +122,13 @@ import pydase
 
 if __name__ == "__main__":
     service = Device()
-    pydase.Server(service=service).run()
+    pydase.Server(service=service, web_port=8001).run()
 ```
 
-This will start the server, making your `Device` service accessible on [http://localhost:8001](http://localhost:8001).
+This will start the server, making your `Device` service accessible on 
+[http://localhost:8001](http://localhost:8001). The port number for the web server can 
+be customised in the server constructor or through environment variables and defaults 
+to `8001`.
 
 ### Accessing the Web Interface
 
@@ -144,7 +147,7 @@ import pydase
 
 # Replace the hostname and port with the IP address and the port of the machine where 
 # the service is running, respectively
-client_proxy = pydase.Client(url="ws://<ip_addr>:<service_port>").proxy
+client_proxy = pydase.Client(url="ws://<ip_addr>:<web_port>").proxy
 # client_proxy = pydase.Client(url="wss://your-domain.ch").proxy  # if your service uses ssl-encryption
 
 # After the connection, interact with the service attributes as if they were local
@@ -170,7 +173,7 @@ import json
 import requests
 
 response = requests.get(
-    "http://<hostname>:<port>/api/v1/get_value?access_path=<full_access_path>"
+    "http://<hostname>:<web_port>/api/v1/get_value?access_path=<full_access_path>"
 )
 serialized_value = json.loads(response.text)
 ```

frontend/src/components/NumberComponent.tsx

@@ -132,6 +132,8 @@ const handleNumericKey = (
   selectionStart: number,
   selectionEnd: number,
 ) => {
+  let newValue = value;
+
   // Check if a number key or a decimal point key is pressed
   if (key === "." && value.includes(".")) {
     // Check if value already contains a decimal. If so, ignore input.
@@ -139,14 +141,34 @@ const handleNumericKey = (
     return { value, selectionStart };
   }
 
-  let newValue = value;
+  // Handle minus sign input
+  if (key === "-") {
+    if (selectionStart === 0 && selectionEnd > selectionStart) {
+      // Replace selection with minus if selection starts at 0
+      newValue = "-" + value.slice(selectionEnd);
+      selectionStart = 1;
+    } else if (selectionStart === 0 && !value.startsWith("-")) {
+      // Add minus at the beginning if it doesn't exist
+      newValue = "-" + value;
+      selectionStart = 1;
+    } else if (
+      (selectionStart === 0 || selectionStart === 1) &&
+      value.startsWith("-")
+    ) {
+      // Remove minus if it exists
+      newValue = value.slice(1);
+      selectionStart = 0;
+    }
+
+    return { value: newValue, selectionStart };
+  }
 
   // Add the new key at the cursor's position
   if (selectionEnd > selectionStart) {
     // If there is a selection, replace it with the key
     newValue = value.slice(0, selectionStart) + key + value.slice(selectionEnd);
   } else {
-    // otherwise, append the key after the selection start
+    // Otherwise, insert the key at the cursor position
     newValue = value.slice(0, selectionStart) + key + value.slice(selectionStart);
   }
 
@@ -201,17 +223,7 @@ export const NumberComponent = React.memo((props: NumberComponentProps) => {
       // Select everything when pressing Ctrl + a
       inputTarget.setSelectionRange(0, value.length);
       return;
-    } else if (key === "-") {
-      if (selectionStart === 0 && !value.startsWith("-")) {
-        newValue = "-" + value;
-        selectionStart++;
-      } else if (value.startsWith("-") && selectionStart === 1) {
-        newValue = value.substring(1); // remove minus sign
-        selectionStart--;
-      } else {
-        return; // Ignore "-" pressed in other positions
-      }
-    } else if (key >= "0" && key <= "9") {
+    } else if ((key >= "0" && key <= "9") || key === "-") {
       // Check if a number key or a decimal point key is pressed
       ({ value: newValue, selectionStart } = handleNumericKey(
         key,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydase"
-version = "0.10.0"
+version = "0.10.2"
 description = "A flexible and robust Python library for creating, managing, and interacting with data services, with built-in support for web and RPC servers, and customizable features for diverse use cases."
 authors = ["Mose Mueller <mosmuell@ethz.ch>"]
 readme = "README.md"

src/pydase/frontend/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="Web site displaying a pydase UI." />
-  <script type="module" crossorigin src="/assets/index-DI9re3au.js"></script>
+  <script type="module" crossorigin src="/assets/index-BjsjosWf.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-D2aktF3W.css">
 </head>
 

src/pydase/task/autostart.py

@@ -17,16 +17,18 @@ def autostart_service_tasks(
     """
 
     for attr in dir(service):
-        if is_property_attribute(service, attr):  # prevent eval of property attrs
+        if is_property_attribute(service, attr) or attr in {
+            "_observers",
+            "__dict__",
+        }:  # prevent eval of property attrs and recursion
             continue
 
         val = getattr(service, attr)
-        if (
-            isinstance(val, pydase.task.task.Task)
-            and val.autostart
-            and val.status == TaskStatus.NOT_RUNNING
-        ):
-            val.start()
+        if isinstance(val, pydase.task.task.Task):
+            if val.autostart and val.status == TaskStatus.NOT_RUNNING:
+                val.start()
+            else:
+                continue
         else:
             autostart_nested_service_tasks(val)
 
@@ -38,7 +40,7 @@ def autostart_nested_service_tasks(
         autostart_service_tasks(service)
     elif isinstance(service, list):
         for entry in service:
-            autostart_service_tasks(entry)
+            autostart_nested_service_tasks(entry)
     elif isinstance(service, dict):
         for entry in service.values():
-            autostart_service_tasks(entry)
+            autostart_nested_service_tasks(entry)

tests/task/test_task.py

@@ -18,23 +18,30 @@ async def test_start_and_stop_task(caplog: LogCaptureFixture) -> None:
     class MyService(pydase.DataService):
         @task()
         async def my_task(self) -> None:
+            logger.info("Triggered task.")
             while True:
-                logger.debug("Logging message")
-                await asyncio.sleep(0.01)
+                await asyncio.sleep(1)
 
     # Your test code here
     service_instance = MyService()
     state_manager = StateManager(service_instance)
     DataServiceObserver(state_manager)
+
+    autostart_service_tasks(service_instance)
+    await asyncio.sleep(0.1)
+    assert service_instance.my_task.status == TaskStatus.NOT_RUNNING
+
     service_instance.my_task.start()
     await asyncio.sleep(0.1)
+    assert service_instance.my_task.status == TaskStatus.RUNNING
 
     assert "'my_task.status' changed to 'TaskStatus.RUNNING'" in caplog.text
-    assert "Logging message" in caplog.text
+    assert "Triggered task." in caplog.text
     caplog.clear()
 
     service_instance.my_task.stop()
     await asyncio.sleep(0.1)
+    assert service_instance.my_task.status == TaskStatus.NOT_RUNNING
     assert "Task 'my_task' was cancelled" in caplog.text
 
 
@@ -44,6 +51,8 @@ async def test_autostart_task(caplog: LogCaptureFixture) -> None:
         @task(autostart=True)
         async def my_task(self) -> None:
             logger.info("Triggered task.")
+            while True:
+                await asyncio.sleep(1)
 
     # Your test code here
     service_instance = MyService()
@@ -53,6 +62,7 @@ async def test_autostart_task(caplog: LogCaptureFixture) -> None:
     autostart_service_tasks(service_instance)
 
     await asyncio.sleep(0.1)
+    assert service_instance.my_task.status == TaskStatus.RUNNING
 
     assert "'my_task.status' changed to 'TaskStatus.RUNNING'" in caplog.text
 
@@ -65,6 +75,8 @@ async def test_nested_list_autostart_task(
         @task(autostart=True)
         async def my_task(self) -> None:
             logger.info("Triggered task.")
+            while True:
+                await asyncio.sleep(1)
 
     class MyService(pydase.DataService):
         sub_services_list = [MySubService() for i in range(2)]
@@ -75,6 +87,8 @@ async def test_nested_list_autostart_task(
     autostart_service_tasks(service_instance)
 
     await asyncio.sleep(0.1)
+    assert service_instance.sub_services_list[0].my_task.status == TaskStatus.RUNNING
+    assert service_instance.sub_services_list[1].my_task.status == TaskStatus.RUNNING
 
     assert (
         "'sub_services_list[0].my_task.status' changed to 'TaskStatus.RUNNING'"
@@ -111,6 +125,10 @@ async def test_nested_dict_autostart_task(
     assert (
         service_instance.sub_services_dict["first"].my_task.status == TaskStatus.RUNNING
     )
+    assert (
+        service_instance.sub_services_dict["second"].my_task.status
+        == TaskStatus.RUNNING
+    )
 
     assert (
         "'sub_services_dict[\"first\"].my_task.status' changed to 'TaskStatus.RUNNING'"