pydpm_xl 0.2.11__py3-none-any.whl → 0.2.13__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.11"
+__version__ = "0.2.13"
 __author__ = "MeaningfulData S.L."
 __email__ = "info@meaningfuldata.eu"
 __license__ = "GPL-3.0-or-later"

py_dpm/api/dpm_xl/ast_generator.py

@@ -358,6 +358,7 @@ class ASTGeneratorAPI:
         module_code: Optional[str] = None,
         preferred_module_dependencies: Optional[List[str]] = None,
         module_version_number: Optional[str] = None,
+        add_all_tables: bool = True,
     ) -> Dict[str, Any]:
         """
         Generate validations script with engine-ready AST and framework structure.
@@ -413,6 +414,10 @@ class ASTGeneratorAPI:
                 Mutually exclusive with release_code and release_id.
                 If none of release_code, release_id, or module_version_number are provided,
                 the latest (active) module version is used.
+            add_all_tables: If True (default), include all tables and variables from the
+                module version in the output, regardless of whether they are referenced in
+                the validations. If False, only include tables and variables that are
+                actually referenced in the expressions.
 
         Returns:
             dict: {
@@ -483,6 +488,7 @@ class ASTGeneratorAPI:
                 primary_module_vid=primary_module_vid,
                 module_code=module_code,
                 preferred_module_dependencies=preferred_module_dependencies,
+                add_all_tables=add_all_tables,
             )
 
             # Save to file if output_path is provided
@@ -960,6 +966,7 @@ class ASTGeneratorAPI:
         primary_module_vid: Optional[int] = None,
         module_code: Optional[str] = None,
         preferred_module_dependencies: Optional[List[str]] = None,
+        add_all_tables: bool = True,
     ) -> Dict[str, Any]:
         """
         Add framework structure for multiple expressions (operations, variables, tables, preconditions).
@@ -975,6 +982,8 @@ class ASTGeneratorAPI:
             primary_module_vid: Module VID being exported (to identify external dependencies)
             module_code: Optional module code to specify the main module
             preferred_module_dependencies: Optional list of module codes to prefer for dependencies
+            add_all_tables: If True, include all tables and variables from the module version.
+                If False, only include tables referenced in expressions.
 
         Returns:
             Dict with the enriched AST structure
@@ -1208,6 +1217,35 @@ class ASTGeneratorAPI:
                 if not cross_deps:
                     all_intra_instance_ops.append(operation_code)
 
+            # After processing all expressions, add remaining tables from the module if requested
+            if add_all_tables and primary_module_info:
+                resolved_module_vid = primary_module_info.get("module_vid")
+                if resolved_module_vid:
+                    # Get all tables belonging to the primary module
+                    module_tables = data_dict_api.get_all_tables_for_module(resolved_module_vid)
+
+                    for table_info in module_tables:
+                        table_code = table_info.get("table_code")
+                        table_vid = table_info.get("table_vid")
+
+                        # Skip if already added from expressions
+                        if table_code in all_tables:
+                            continue
+
+                        # Get all variables for this table
+                        table_variables = data_dict_api.get_all_variables_for_table(table_vid)
+
+                        # Query open keys for this table
+                        open_keys_list = data_dict_api.get_open_keys_for_table(table_code, release_id)
+                        open_keys = {item["property_code"]: item["data_type_code"] for item in open_keys_list}
+
+                        all_tables[table_code] = {"variables": table_variables, "open_keys": open_keys}
+                        all_variables.update(table_variables)
+
+                    # If we added any tables, mark that we have primary module operations
+                    if module_tables:
+                        has_primary_module_operation = True
+
         finally:
             data_dict_api.close()
 

py_dpm/dpm_xl/utils/serialization.py

@@ -406,19 +406,37 @@ class ASTToJSONVisitor(NodeVisitor):
         }
 
     def visit_GetOp(self, node):
-        """Visit GetOp nodes."""
+        """Visit GetOp nodes and serialize as GetClauseOp."""
         result = {
-            'class_name': 'GetOp',
+            'class_name': 'GetClauseOp',
             'operand': self.visit(node.operand),
             '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),
+            'condition': condition
+        }
+
     def visit_WhereClauseOp(self, node):
         """Visit WhereClauseOp nodes."""
         return {

{pydpm_xl-0.2.11.dist-info → pydpm_xl-0.2.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydpm_xl
-Version: 0.2.11
+Version: 0.2.13
 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.11.dist-info → pydpm_xl-0.2.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-py_dpm/__init__.py,sha256=mCQT4E9AM2a8Gg_V4tbxaQkfJ_CB9uUJR0fH7DR9uVI,1859
+py_dpm/__init__.py,sha256=O1GJpDuVJzcJ9nucBiFkTlcTnATKEkhn6GgTtfALxLc,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=53Hq1I2Uey6VqNmehU-6vSjyUnfU56GhcJKZuNZAEFw,98334
+py_dpm/api/dpm_xl/ast_generator.py,sha256=38Kvz9b_SxX1rCMeJ5FqD4y73yNxoQvAPlmqGT5aMNM,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=4ZBHIP-67_19QSxqzkv8GPh3RNJ861if26GKbV9Bxj8,33088
+py_dpm/dpm_xl/utils/serialization.py,sha256=0wlSARdmOew3MFnEbhL6Dn16CinnZ0DqQlMSV_eYzfo,33578
 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.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pydpm_xl-0.2.11.dist-info/METADATA,sha256=JXXtaUl9tMD7TSrGR5G9KWu_d1gTwutLIVpWYBJY18g,9154
-pydpm_xl-0.2.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pydpm_xl-0.2.11.dist-info/entry_points.txt,sha256=6DDmBfw-AjtgvMHgq_I730i_LAAs_7-N3C95HD_bRr4,47
-pydpm_xl-0.2.11.dist-info/top_level.txt,sha256=495PvWZRoKl2NvbQU25W7dqWIBHqY-mFMPt83uxPpcM,7
-pydpm_xl-0.2.11.dist-info/RECORD,,
+pydpm_xl-0.2.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pydpm_xl-0.2.13.dist-info/METADATA,sha256=3j_wcyURncDD3dffd-OWw_OTjmOKHz9-iEwPBvR-mO4,9154
+pydpm_xl-0.2.13.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pydpm_xl-0.2.13.dist-info/entry_points.txt,sha256=6DDmBfw-AjtgvMHgq_I730i_LAAs_7-N3C95HD_bRr4,47
+pydpm_xl-0.2.13.dist-info/top_level.txt,sha256=495PvWZRoKl2NvbQU25W7dqWIBHqY-mFMPt83uxPpcM,7
+pydpm_xl-0.2.13.dist-info/RECORD,,