From d8aa944e6da6c48f87ac9c6e9f4be12f32f45fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mose=20M=C3=BCller?= <mosemueller@gmail.com>
Date: Wed, 9 Aug 2023 16:15:51 +0200
Subject: [PATCH] using helper function to get component class names

The type of the DataService instance (and instances of derived classes)
should always be "DataService" unless it is a component.
Also changing some logic.
---
 src/pydase/data_service/data_service.py | 18 +++++++++---------
 src/pydase/utils/helpers.py             | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/pydase/data_service/data_service.py b/src/pydase/data_service/data_service.py
index dcd9832..f50d773 100644
--- a/src/pydase/data_service/data_service.py
+++ b/src/pydase/data_service/data_service.py
@@ -9,10 +9,14 @@ import rpyc
 from loguru import logger
 
 import pydase.units as u
+from pydase.data_service.abstract_data_service import AbstractDataService
+from pydase.data_service.callback_manager import CallbackManager
+from pydase.data_service.task_manager import TaskManager
 from pydase.utils.helpers import (
     convert_arguments_to_hinted_types,
     generate_paths_from_DataService_dict,
     get_class_and_instance_attributes,
+    get_component_class_names,
     get_nested_value_by_path_and_key,
     get_object_attr_from_path,
     parse_list_attr_and_index,
@@ -22,10 +26,6 @@ from pydase.utils.warnings import (
     warn_if_instance_class_does_not_inherit_from_DataService,
 )
 
-from .abstract_data_service import AbstractDataService
-from .callback_manager import CallbackManager
-from .task_manager import TaskManager
-
 
 def process_callable_attribute(attr: Any, args: dict[str, Any]) -> Any:
     converted_args_or_error_msg = convert_arguments_to_hinted_types(
@@ -226,7 +226,7 @@ class DataService(rpyc.Service, AbstractDataService):
             if isinstance(value, DataService):
                 result[key] = {
                     "type": type(value).__name__
-                    if type(value).__name__ in ("NumberSlider")
+                    if type(value).__name__ in get_component_class_names()
                     else "DataService",
                     "value": value.serialize(),
                     "readonly": False,
@@ -237,10 +237,10 @@ class DataService(rpyc.Service, AbstractDataService):
                     "type": "list",
                     "value": [
                         {
-                            "type": "DataService"
-                            if isinstance(item, DataService)
-                            and type(item).__name__ not in ("NumberSlider")
-                            else type(item).__name__,
+                            "type": type(item).__name__
+                            if not isinstance(item, DataService)
+                            or type(item).__name__ in get_component_class_names()
+                            else "DataService",
                             "value": item.serialize()
                             if isinstance(item, DataService)
                             else item,
diff --git a/src/pydase/utils/helpers.py b/src/pydase/utils/helpers.py
index 3599cd6..f48bcf0 100644
--- a/src/pydase/utils/helpers.py
+++ b/src/pydase/utils/helpers.py
@@ -309,3 +309,18 @@ def parse_list_attr_and_index(attr_string: str) -> tuple[str, Optional[int]]:
         attr_name, idx = attr_string[:-1].split("[")
         index = int(idx)
     return attr_name, index
+
+
+def get_component_class_names() -> list[str]:
+    """
+    Returns the names of the component classes in a list.
+
+    It takes the names from the pydase/components/__init__.py file, so this file should
+    always be up-to-date with the currently available components.
+
+    Returns:
+        list[str]: List of component class names
+    """
+    import pydase.components
+
+    return pydase.components.__all__