pydpm_xl 0.2.12__py3-none-any.whl → 0.2.14__py3-none-any.whl

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"

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",
             }
         }
 

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.dist-info → pydpm_xl-0.2.14.dist-info}/METADATA

@@ -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.dist-info → pydpm_xl-0.2.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-py_dpm/__init__.py,sha256=ymVfDvLwtVz1BFDL70Tv8rY5NBXcAYLeNmZomO1_0XM,1859
+py_dpm/__init__.py,sha256=rgsGNZWfSYntEZEJZQ9VrdpTXSqGikt7JMPcEgwnixQ,1859
 py_dpm/api/__init__.py,sha256=bPWo4KWW99GmGkQbq0yQ3_tbTxvidEVVrWmcDXWz-xA,828
 py_dpm/api/dpm/__init__.py,sha256=HQflgiRbs1eDi3KTadNhxS1NoaG6PGQDVMvFnuIEfXo,506
 py_dpm/api/dpm/data_dictionary.py,sha256=q6w_5bFdc6WPd5Z601PpDaCcnIw39CnI4wdby3GJmFU,29893
@@ -7,7 +7,7 @@ py_dpm/api/dpm/hierarchical_queries.py,sha256=X4AbpsWy3iItOTVIdVbtaTmRgOHPf0Y64I
 py_dpm/api/dpm/instance.py,sha256=v3DWzdaM5gPCecLjwjZ49FGfqZzUR3dPC0U8zGwdttk,3795
 py_dpm/api/dpm/migration.py,sha256=9FT7zzz4QdUIRR6MD01gMODBtfq9HH_RF4hRgZqMcZc,2404
 py_dpm/api/dpm_xl/__init__.py,sha256=SOsCtwxuCkFQIdYoTcU6tVJdK1j96dPF4ZQpr8okLPc,576
-py_dpm/api/dpm_xl/ast_generator.py,sha256=38Kvz9b_SxX1rCMeJ5FqD4y73yNxoQvAPlmqGT5aMNM,100504
+py_dpm/api/dpm_xl/ast_generator.py,sha256=KviFmAW65gMy4Bq1l2IUR7hRHRhC1yWRAhf2UcGK-Jo,100504
 py_dpm/api/dpm_xl/complete_ast.py,sha256=jjn9tsns4X7EN4RV5mFh5DRxxZfBOuX2b1wic4oB_ls,3967
 py_dpm/api/dpm_xl/operation_scopes.py,sha256=v2t3f2-AiF39hspNtpf_PA94T69JqbymFK9a5hpckRs,48831
 py_dpm/api/dpm_xl/semantic.py,sha256=Ddmh2Wj_iXIpQZ4jCjqOI-6ddFCquaO9RTu6W9i1Rts,13968
@@ -69,16 +69,16 @@ py_dpm/dpm_xl/utils/data_handlers.py,sha256=a0E-IaP_-CDKLcj-Gt2ggAziKIOUiwnT2D9I
 py_dpm/dpm_xl/utils/operands_mapping.py,sha256=LG0hPlUuTM2X2uWOtiD6HkmNeDEJkWJ8gV-Fxej_8QM,2241
 py_dpm/dpm_xl/utils/operator_mapping.py,sha256=BFgbVbSCSuutFNHJ4gtgm5VuG38pcl8Kmfi-sefg6JU,1913
 py_dpm/dpm_xl/utils/scopes_calculator.py,sha256=do_emsUqD1TbrjguKlOOqFleaVhxzqm-NnlgdrdIb6I,20906
-py_dpm/dpm_xl/utils/serialization.py,sha256=leCZFHyaPjskLM1P27oupXfTdO5Pcbf7R_MFsLCMT28,33429
+py_dpm/dpm_xl/utils/serialization.py,sha256=W1Bi0Ge8dQxS0TIwLiq-uroGqvcATQEuUfndRUiAwBw,34071
 py_dpm/dpm_xl/utils/tokens.py,sha256=VRIrPDi5ttwgH-on5Qt4-l4ho4bLA755-nfTalponcA,3496
 py_dpm/exceptions/__init__.py,sha256=yDERfUxYW7NUUEiTQChGpuJx6abr7IDe2XUpwVFPtvM,416
 py_dpm/exceptions/exceptions.py,sha256=6S3p-_i5O1oStvSMixt_JQG0xwTeSfBcdzrwL8yBy6Q,2413
 py_dpm/exceptions/messages.py,sha256=UwY6QIK8c-POcDCc9HYbZFGArCIYAanUGNh2LNKPx3U,7534
 py_dpm/instance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_dpm/instance/instance.py,sha256=gRSg2dh1nEa0Srx9yKcN3bxiYidvZyRU_jsTNaKkP5I,10882
-pydpm_xl-0.2.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pydpm_xl-0.2.12.dist-info/METADATA,sha256=lVK_kKSvGgw03PWz5sgSETcEPgeoep0tr9xf7E6L5yA,9154
-pydpm_xl-0.2.12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pydpm_xl-0.2.12.dist-info/entry_points.txt,sha256=6DDmBfw-AjtgvMHgq_I730i_LAAs_7-N3C95HD_bRr4,47
-pydpm_xl-0.2.12.dist-info/top_level.txt,sha256=495PvWZRoKl2NvbQU25W7dqWIBHqY-mFMPt83uxPpcM,7
-pydpm_xl-0.2.12.dist-info/RECORD,,
+pydpm_xl-0.2.14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pydpm_xl-0.2.14.dist-info/METADATA,sha256=jy6zXc80F3Hf7DXNhtJo66wXiZwNi0-bu6yBufOmWQA,9154
+pydpm_xl-0.2.14.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pydpm_xl-0.2.14.dist-info/entry_points.txt,sha256=6DDmBfw-AjtgvMHgq_I730i_LAAs_7-N3C95HD_bRr4,47
+pydpm_xl-0.2.14.dist-info/top_level.txt,sha256=495PvWZRoKl2NvbQU25W7dqWIBHqY-mFMPt83uxPpcM,7
+pydpm_xl-0.2.14.dist-info/RECORD,,