Merge branch 'feature/prepare-for-extendability' of https://github.co…

…m/Avaiga/taipy into feature/prepare-for-extendability
Avaiga · Jan 30, 2025 · 5481f7c · 5481f7c
2 parents 24013ce + 40b5184
commit 5481f7c
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/taipy/core/config/checkers/_data_node_config_checker.py b/taipy/core/config/checkers/_data_node_config_checker.py
@@ -10,6 +10,7 @@
 # specific language governing permissions and limitations under the License.
 
 from datetime import timedelta
+from inspect import isclass
 from typing import Callable, Dict, List, cast
 
 from taipy.common.config._config import _Config
@@ -216,21 +217,28 @@ def _check_property_types(self, data_node_config_id: str, data_node_config: Data
             for prop_key, prop_type in property_types.items():
                 prop_value = data_node_config.properties.get(prop_key) if data_node_config.properties else None
 
-                if prop_value and not isinstance(prop_value, prop_type) and not issubclass(prop_value, prop_type):
-                    self._error(
-                        prop_key,
-                        prop_value,
-                        f"`{prop_key}` of DataNodeConfig `{data_node_config_id}` must be"
-                        f" populated with a {prop_type}.",
-                    )
-
-                if prop_type == Callable and callable(prop_value) and prop_value.__name__ == "<lambda>":
-                    self._error(
-                        prop_key,
-                        prop_value,
-                        f"`{prop_key}` of DataNodeConfig `{data_node_config_id}` must be"
-                        f" populated with a serializable typing.Callable function but not a lambda.",
-                    )
+                if prop_value:
+                    if isclass(prop_type) and isclass(prop_value) and not issubclass(prop_value, prop_type):
+                        self._error(
+                            prop_key,
+                            prop_value,
+                            f"`{prop_key}` of DataNodeConfig `{data_node_config_id}` must be"
+                            f" populated with a subclass of {prop_type}.",
+                        )
+                    if not isinstance(prop_value, prop_type):
+                        self._error(
+                            prop_key,
+                            prop_value,
+                            f"`{prop_key}` of DataNodeConfig `{data_node_config_id}` must be"
+                            f" populated with a {prop_type}.",
+                        )
+                    if prop_type == Callable and callable(prop_value) and prop_value.__name__ == "<lambda>":
+                        self._error(
+                            prop_key,
+                            prop_value,
+                            f"`{prop_key}` of DataNodeConfig `{data_node_config_id}` must be"
+                            f" populated with a serializable typing.Callable function but not a lambda.",
+                        )
 
     def _check_exposed_type(self, data_node_config_id: str, data_node_config: DataNodeConfig):
         if not isinstance(data_node_config.exposed_type, str):