ripple-down-rules 0.5.58__tar.gz → 0.5.59__tar.gz

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.5.58
+Version: 0.5.59
 Summary: Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning.
 Author-email: Abdelrhman Bassiouny <abassiou@uni-bremen.de>
 License:                     GNU GENERAL PUBLIC LICENSE

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/src/ripple_down_rules/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.5.58"
+__version__ = "0.5.59"
 
 import logging
 logger = logging.Logger("rdr")

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/src/ripple_down_rules/rdr.py

@@ -493,7 +493,8 @@ class RDRWithCodeWriter(RippleDownRules, ABC):
         return self.start_rule.conclusion_name
 
     def _to_json(self) -> Dict[str, Any]:
-        return {"start_rule": self.start_rule.to_json(),  "generated_python_file_name": self.generated_python_file_name,
+        return {"start_rule": self.start_rule.to_json(),
+                "generated_python_file_name": self.generated_python_file_name,
                 "name": self.name,
                 "case_type": get_full_class_name(self.case_type) if self.case_type is not None else None,
                 "case_name": self.case_name}

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/src/ripple_down_rules/utils.py

@@ -497,21 +497,8 @@ def serialize_dataclass(obj: Any, seen=None) -> Any:
             value = getattr(obj, f.name)
             result['fields'][f.name] = serialize_dataclass(value, seen)
         return result
-    elif isinstance(obj, list):
-        return [serialize_dataclass(v, seen) for v in obj]
-    elif isinstance(obj, dict):
-        serialized_dict = {}
-        for k, v in obj.items():
-            if not isinstance(k, (str, int, bool, float, type(None))):
-                continue
-            serialized_dict[k] = serialize_dataclass(v, seen)
-        return serialized_dict
     else:
-        try:
-            json.dumps(obj)  # Check if the object is JSON serializable
-            return obj
-        except TypeError:
-            return None
+        return SubclassJSONSerializer.to_json_static(obj, seen)
 
 
 def deserialize_dataclass(data: Any, refs: Optional[Dict[str, Any]] = None) -> Any:
@@ -875,10 +862,26 @@ class SubclassJSONSerializer:
         return data
 
     @staticmethod
-    def to_json_static(obj) -> Dict[str, Any]:
-        if is_dataclass(obj):
-            return serialize_dataclass(obj)
-        return {"_type": get_full_class_name(obj.__class__), **obj._to_json()}
+    def to_json_static(obj, seen=None) -> Any:
+        if isinstance(obj, SubclassJSONSerializer):
+            return {"_type": get_full_class_name(obj.__class__), **obj._to_json()}
+        elif is_dataclass(obj):
+            return serialize_dataclass(obj, seen)
+        elif isinstance(obj, list):
+            return [SubclassJSONSerializer.to_json_static(v, seen) for v in obj]
+        elif isinstance(obj, dict):
+            serialized_dict = {}
+            for k, v in obj.items():
+                if not isinstance(k, (str, int, bool, float, type(None))):
+                    continue
+                serialized_dict[k] = SubclassJSONSerializer.to_json_static(v, seen)
+            return serialized_dict
+        else:
+            try:
+                json.dumps(obj)  # Check if the object is JSON serializable
+                return obj
+            except TypeError:
+                return None
 
     def to_json(self) -> Dict[str, Any]:
         return self.to_json_static(self)

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.5.58
+Version: 0.5.59
 Summary: Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning.
 Author-email: Abdelrhman Bassiouny <abassiou@uni-bremen.de>
 License:                     GNU GENERAL PUBLIC LICENSE

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/test/test_results/datasets_physical_object_is_a_robot/rdr_metadata/datasets_physical_object_is_a_robot.json

@@ -12,9 +12,9 @@
                         "builtins.bool"
                     ],
                     "scope": {
-                        "PhysicalObject": "datasets.PhysicalObject",
                         "Robot": "datasets.Robot",
-                        "Dict": "typing.Dict"
+                        "Dict": "typing.Dict",
+                        "PhysicalObject": "datasets.PhysicalObject"
                     },
                     "conclusion": {
                         "_type": "builtins.NoneType",
@@ -29,9 +29,9 @@
                         "builtins.bool"
                     ],
                     "scope": {
-                        "PhysicalObject": "datasets.PhysicalObject",
                         "Robot": "datasets.Robot",
-                        "Dict": "typing.Dict"
+                        "Dict": "typing.Dict",
+                        "PhysicalObject": "datasets.PhysicalObject"
                     },
                     "conclusion": {
                         "_type": "builtins.NoneType",

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_output__mcrdr.py

@@ -6,7 +6,7 @@ from ripple_down_rules.rdr import MultiClassRDR
 
 
 attribute_name = 'output_'
-conclusion_type = (set, list, PhysicalObject,)
+conclusion_type = (set, PhysicalObject, list,)
 type_ = MultiClassRDR
 
 

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/test/test_results/datasets_physical_object_is_a_robot/physical_object_is_a_robot_output__scrdr_defs.py

@@ -1,6 +1,6 @@
-from datasets import PhysicalObject
-from datasets import Robot
 from typing import Dict
+from datasets import Robot
+from datasets import PhysicalObject
 
 
 def conditions_226969243620390858682731042391766665817(case):

{ripple_down_rules-0.5.58 → ripple_down_rules-0.5.59}/test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_output__mcrdr_defs.py

@@ -1,8 +1,8 @@
 from typing import List
 from datasets import Robot
-from datasets import PhysicalObject
 from typing import Union
 from typing import Dict
+from datasets import PhysicalObject
 from typing_extensions import Union