pydpm_xl 0.1.39rc23__py3-none-any.whl → 0.1.39rc25__py3-none-any.whl

py_dpm/AST/check_operands.py

@@ -429,6 +429,8 @@ class OperandsChecking(ASTTemplate, ABC):
 
     def visit_GetOp(self, node: GetOp):
         """Visit GetOp nodes to collect component codes for property_id lookup."""
+        # Visit the operand first to ensure it's properly validated
+        self.visit(node.operand)
         if node.component not in self.getop_components:
             self.getop_components.append(node.component)
         # Store reference to node for property_id enrichment

py_dpm/Utils/ast_serialization.py

@@ -190,7 +190,8 @@ class ASTToJSONVisitor(NodeVisitor):
                         entries_by_row[row_code] = []
                     entries_by_row[row_code].append(record)
 
-                rows = list(entries_by_row.keys())
+                # Sort rows to ensure consistent numerical ordering for x-coordinate calculation
+                rows = sorted(entries_by_row.keys())
 
                 # Helper function to detect range syntax (e.g., '0010-0080')
                 def _has_range_syntax(values):
@@ -211,6 +212,19 @@ class ASTToJSONVisitor(NodeVisitor):
                         if col and col not in seen_cols:
                             context_cols.append(col)
                             seen_cols.add(col)
+                    # Sort to ensure consistent numerical ordering for y-coordinate calculation
+                    context_cols.sort()
+
+                # Build sheet order from data for z-coordinate calculation
+                # Extract unique sheets and sort them for consistent ordering
+                context_sheets = []
+                seen_sheets = set()
+                for record in data_records:
+                    sheet = record.get('sheet_code', '')
+                    if sheet and sheet not in seen_sheets:
+                        context_sheets.append(sheet)
+                        seen_sheets.add(sheet)
+                context_sheets.sort()
 
                 # Transform the data to match expected JSON structure
                 transformed_data = []
@@ -247,8 +261,11 @@ class ASTToJSONVisitor(NodeVisitor):
 
                             # Add z coordinate if sheet data exists
                             if sheet_code:
-                                # For now, use a simple index; could be enhanced with sheet position logic
-                                transformed_record['z'] = 1  # This could be enhanced with actual sheet indexing
+                                # Find z coordinate based on sheet position in context
+                                z_index = 1  # default
+                                if context_sheets and sheet_code in context_sheets:
+                                    z_index = context_sheets.index(sheet_code) + 1
+                                transformed_record['z'] = z_index
 
                         # Note: column and row are at VarID level, not in data entries
 

py_dpm/__init__.py

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

{pydpm_xl-0.1.39rc23.dist-info → pydpm_xl-0.1.39rc25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydpm_xl
-Version: 0.1.39rc23
+Version: 0.1.39rc25
 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.1.39rc23.dist-info → pydpm_xl-0.1.39rc25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-py_dpm/__init__.py,sha256=warY-f2q-G1sWP3PRCIud4QoevDsnbmhtp3So8DGhiQ,1863
+py_dpm/__init__.py,sha256=lTGcMQ4FVtmqOhI9kmCqXFePSYZxtVUAZVL5DIFXib0,1863
 py_dpm/client.py,sha256=DspAS6lVLh62nLlyOy4UEBy00GLR0bb9Wbd6hOZ6bHY,19491
 py_dpm/data_handlers.py,sha256=_aJqkyflJr1oNsOQ24nB9yzfrpxu28NPrpoil2aAm58,4395
 py_dpm/db_utils.py,sha256=f0da6FT7HusGpLfGen4fceSvcojW4bzrp5sucgt6XVQ,7822
@@ -13,7 +13,7 @@ py_dpm/AST/ModuleAnalyzer.py,sha256=D93NORVMyEMiaAeVsRuw1qMSd5V5fF1Syh4mpo2gtKA,
 py_dpm/AST/ModuleDependencies.py,sha256=3Rx5rNLlaeM8UaqCR2lwy5uAK-jwum8eYGfJwzWAua8,8332
 py_dpm/AST/WhereClauseChecker.py,sha256=zsySpOPMmZgznZnN8Y6WdS-4qARingBmQa2c19xvYlc,322
 py_dpm/AST/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-py_dpm/AST/check_operands.py,sha256=tq4DP47IIU4Nm6vH-Ldorx0R_VIjVYBPQ9Ij8rk0t34,20877
+py_dpm/AST/check_operands.py,sha256=byrhQWif3ZA1V9sR0p8YsUsU38utlYgXFjAqdPP2kAw,20978
 py_dpm/DataTypes/ScalarTypes.py,sha256=annQugU0iV457lruDDR2rNyZB-qGw-ei0J-p1CPp0Xs,6882
 py_dpm/DataTypes/TimeClasses.py,sha256=MmxsHn9sqBCQ-YkTKlGn-yow-Y-XVMRvrUEthqhT0JM,11379
 py_dpm/DataTypes/TypePromotion.py,sha256=Js_HBczw_cLdauzg5XtfDdJOGJdmQGtMnV_aTNkYgR0,9587
@@ -35,7 +35,7 @@ py_dpm/Operators/TimeOperators.py,sha256=klcFIYFonGVRNhr66Ipu1lwOr9CxzDGIbA3QQLm
 py_dpm/Operators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_dpm/Utils/ValidationsGenerationUtils.py,sha256=1yINJ_ANqr9BbIDdPm4WxRG2EQu0yaRICikYG1nIhzs,22652
 py_dpm/Utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-py_dpm/Utils/ast_serialization.py,sha256=hD9vpz-pQh65Mttlkr9hHLN0w-7HW0Md5n4Ov1e1wcI,30984
+py_dpm/Utils/ast_serialization.py,sha256=MmFR1XJ9DqnNLNdGMv2P2nzMDEl_FN14uxwFFMJyQkw,31898
 py_dpm/Utils/operands_mapping.py,sha256=CDWvoKxh-nBcEKMxrUmMnaCveE8dExjeuFUa-lgK8Rg,2239
 py_dpm/Utils/operator_mapping.py,sha256=SK8utWaUaQJybSmErkF_2blzUIgiVOUNGFozIk7dBg8,1926
 py_dpm/Utils/tokens.py,sha256=VRIrPDi5ttwgH-on5Qt4-l4ho4bLA755-nfTalponcA,3496
@@ -88,9 +88,9 @@ py_dpm/views/precondition_info.sql,sha256=l24U8c6NtwFcUDFwb2FqH9h0xgpoi9WbvsKUgJ
 py_dpm/views/report_type_operand_reference_info.sql,sha256=_lBK9HQILk9yLD7cW9Ieud-vfTc-KQiU3WGAnN6LuNY,977
 py_dpm/views/subcategory_info.sql,sha256=V8UZiGjicmOWfBEHX2v6ktSMR4r_f1YiGD_LeN9Gn6o,812
 py_dpm/views/table_info.sql,sha256=htRXIVJya44CZAqjO5sVaJJwiQBQ30oiLFFu5DiBpR4,793
-pydpm_xl-0.1.39rc23.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pydpm_xl-0.1.39rc23.dist-info/METADATA,sha256=oeGPQfv2IIwmR9lUKuH6aEWDypvtke1VFujxkH4tA80,1592
-pydpm_xl-0.1.39rc23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pydpm_xl-0.1.39rc23.dist-info/entry_points.txt,sha256=W9j5xCzgvdfzOKSfEpkk2jSRhEcpmXZUVMwHrsEFAbY,45
-pydpm_xl-0.1.39rc23.dist-info/top_level.txt,sha256=495PvWZRoKl2NvbQU25W7dqWIBHqY-mFMPt83uxPpcM,7
-pydpm_xl-0.1.39rc23.dist-info/RECORD,,
+pydpm_xl-0.1.39rc25.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pydpm_xl-0.1.39rc25.dist-info/METADATA,sha256=3RLFGT5RdPfaLspYarV3n8lILuHG-CsqIyRrZRkuTpM,1592
+pydpm_xl-0.1.39rc25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pydpm_xl-0.1.39rc25.dist-info/entry_points.txt,sha256=W9j5xCzgvdfzOKSfEpkk2jSRhEcpmXZUVMwHrsEFAbY,45
+pydpm_xl-0.1.39rc25.dist-info/top_level.txt,sha256=495PvWZRoKl2NvbQU25W7dqWIBHqY-mFMPt83uxPpcM,7
+pydpm_xl-0.1.39rc25.dist-info/RECORD,,