pydpm_xl 0.2.12__tar.gz → 0.2.14__tar.gz

{pydpm_xl-0.2.12/pydpm_xl.egg-info → pydpm_xl-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydpm_xl
-Version: 0.2.12
+Version: 0.2.14
 Summary: Python library for DPM-XL data processing and analysis
 Author-email: "MeaningfulData S.L." <info@meaningfuldata.eu>
 License: GPL-3.0-or-later

{pydpm_xl-0.2.12 → pydpm_xl-0.2.14}/py_dpm/__init__.py

@@ -41,7 +41,7 @@ Available packages:
 - pydpm.api: Main APIs for migration, syntax, and semantic analysis
 """
 
-__version__ = "0.2.12"
+__version__ = "0.2.14"
 __author__ = "MeaningfulData S.L."
 __email__ = "info@meaningfuldata.eu"
 __license__ = "GPL-3.0-or-later"

{pydpm_xl-0.2.12 → pydpm_xl-0.2.14}/py_dpm/api/dpm_xl/ast_generator.py

@@ -838,7 +838,7 @@ class ASTGeneratorAPI:
                 "root_operator_id": 24,  # Default for now
                 "ast": ast_with_coords,
                 "from_submission_date": submission_date,
-                "severity": "Error",
+                "severity": "error",
             }
         }
 

{pydpm_xl-0.2.12 → pydpm_xl-0.2.14}/py_dpm/dpm_xl/utils/serialization.py

@@ -413,19 +413,28 @@ class ASTToJSONVisitor(NodeVisitor):
             'component': node.component
         }
 
-        # Include property_id if present (required by adam-engine)
-        if hasattr(node, 'property_id') and node.property_id is not None:
-            result['property_id'] = node.property_id
-
         return result
 
     def visit_SubOp(self, node):
         """Visit SubOp nodes and serialize as SubClauseOp."""
+        # Create a Dimension node for the property_code
+        dimension = {
+            'class_name': 'Dimension',
+            'dimension_code': node.property_code
+        }
+        
+        # Create a BinOp with "=" operator
+        condition = {
+            'class_name': 'BinOp',
+            'op': '=',
+            'left': dimension,
+            'right': self.visit(node.value)
+        }
+        
         return {
             'class_name': 'SubClauseOp',
             'operand': self.visit(node.operand),
-            'property_code': node.property_code,
-            'value': self.visit(node.value)
+            'condition': condition
         }
 
     def visit_WhereClauseOp(self, node):
@@ -695,6 +704,16 @@ def serialize_ast(ast_obj):
     if isinstance(expanded_obj, dict):
         return {key: serialize_ast(value) for key, value in expanded_obj.items()}
 
+    # Use visitor pattern for GetOp and SubOp to get correct structure
+    # This must be checked BEFORE toJSON() to ensure nested nodes are handled correctly
+    if hasattr(ASTObjects, 'GetOp') and isinstance(expanded_obj, ASTObjects.GetOp):
+        visitor = ASTToJSONVisitor()
+        return visitor.visit(expanded_obj)
+    
+    if hasattr(ASTObjects, 'SubOp') and isinstance(expanded_obj, ASTObjects.SubOp):
+        visitor = ASTToJSONVisitor()
+        return visitor.visit(expanded_obj)
+
     if hasattr(expanded_obj, 'toJSON'):
         serialized = expanded_obj.toJSON()
         # Recursively serialize nested AST objects

{pydpm_xl-0.2.12 → pydpm_xl-0.2.14/pydpm_xl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydpm_xl
-Version: 0.2.12
+Version: 0.2.14
 Summary: Python library for DPM-XL data processing and analysis
 Author-email: "MeaningfulData S.L." <info@meaningfuldata.eu>
 License: GPL-3.0-or-later

{pydpm_xl-0.2.12 → pydpm_xl-0.2.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pydpm_xl"
-version = "0.2.12"
+version = "0.2.14"
 description = "Python library for DPM-XL data processing and analysis"
 authors = [
     {name = "MeaningfulData S.L.", email = "info@meaningfuldata.eu"}
@@ -52,7 +52,7 @@ exclude = []
 
 [tool.poetry]
 name = "pydpm_xl"
-version = "0.2.12"
+version = "0.2.14"
 description = "Python library for DPM-XL data processing and analysis"
 authors = ["MeaningfulData S.L. <info@meaningfuldata.eu>"]
 readme = "README.md"