pydpm_xl 0.1.39rc24__tar.gz → 0.1.39rc26__tar.gz

{pydpm_xl-0.1.39rc24 → pydpm_xl-0.1.39rc26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydpm_xl
-Version: 0.1.39rc24
+Version: 0.1.39rc26
 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.39rc24 → pydpm_xl-0.1.39rc26}/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 = []
@@ -226,45 +240,29 @@ class ASTToJSONVisitor(NodeVisitor):
                         if 'cell_id' in record and record['cell_id'] is not None:
                             transformed_record['operand_reference_id'] = int(record['cell_id'])
 
-                        # Check if data type is scalar (no x/y/z coordinates)
-                        # Scalar types: b (boolean), s (string), e (enumeration/item)
-                        # Non-scalar types: i, r, m, p (integer, decimal, monetary, percentage)
-                        data_type = record.get('data_type', '')
-                        is_scalar_type = data_type in ['b', 's', 'e']
-
                         column_code = record.get('column_code', '')
                         sheet_code = record.get('sheet_code', '')
 
-                        # Add x/y/z coordinates for non-scalar types only
-                        if not is_scalar_type:
-                            transformed_record['x'] = x_index
-
-                            # Find y coordinate based on column position in context
-                            y_index = 1  # default
-                            if context_cols and column_code in context_cols:
-                                y_index = context_cols.index(column_code) + 1
-                            transformed_record['y'] = y_index
-
-                            # 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
-
-                        # Note: column and row are at VarID level, not in data entries
-
-                        # Add additional fields required by ADAM engine
-                        # CRITICAL: data_type determines how the engine processes values
-                        if 'data_type' in record and record['data_type'] is not None:
-                            transformed_record['data_type'] = record['data_type']
-
-                        # Add metadata fields (cell_code, table_code, table_vid)
-                        # NOTE: row, column, sheet are NOT included in data - they're at VarID level
-                        if 'cell_code' in record and record['cell_code'] is not None:
-                            transformed_record['cell_code'] = record['cell_code']
-                        if 'table_code' in record and record['table_code'] is not None:
-                            transformed_record['table_code'] = record['table_code']
-                        if 'table_vid' in record and record['table_vid'] is not None:
-                            transformed_record['table_vid'] = int(record['table_vid'])
+                        # Add x/y/z coordinates for ALL data types
+                        # Coordinates are added unconditionally, then common ones are removed later
+                        transformed_record['x'] = x_index
+
+                        # Find y coordinate based on column position in context
+                        y_index = 1  # default
+                        if context_cols and column_code in context_cols:
+                            y_index = context_cols.index(column_code) + 1
+                        transformed_record['y'] = y_index
+
+                        # Add z coordinate if sheet data exists
+                        if sheet_code:
+                            # 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: data_type, cell_code, table_code, table_vid are NOT included
+                        # in data entries - working fixtures don't have these fields
 
                         transformed_data.append(transformed_record)
 
@@ -302,19 +300,17 @@ class ASTToJSONVisitor(NodeVisitor):
                         'z': 'sheet'
                     }
 
-                    # Add dimension codes to each data entry
-                    # IMPORTANT: adam-engine requires BOTH row AND column in every data item
-                    # We add all dimension codes (row, column, sheet) when they exist in the original record
-                    # We need to match each transformed record back to its original record
+                    # Add dimension codes only for VARIABLE coordinates
+                    # Working fixtures show dimension codes are only included when that dimension varies
+                    # Example: {c*, s*} with fixed row has y/column, z/sheet but NO x/row
                     record_index = 0
                     for x_index, row_code in enumerate(rows, 1):
                         for original_record in entries_by_row[row_code]:
                             if record_index < len(transformed_data):
                                 transformed_record = transformed_data[record_index]
 
-                                # Add ALL dimension codes (row, column, sheet) to every data item
-                                # This is required by adam-engine even when the coordinate is common
-                                for coord in ['x', 'y', 'z']:
+                                # Only add dimension codes for VARIABLE coordinates
+                                for coord in variable_coords:
                                     dimension_field = coord_to_dimension[coord]
                                     output_field = coord_to_field[coord]
 

{pydpm_xl-0.1.39rc24 → pydpm_xl-0.1.39rc26}/py_dpm/__init__.py

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

{pydpm_xl-0.1.39rc24 → pydpm_xl-0.1.39rc26}/pydpm_xl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydpm_xl
-Version: 0.1.39rc24
+Version: 0.1.39rc26
 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.39rc24 → pydpm_xl-0.1.39rc26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pydpm_xl"
-version = "0.1.39rc24"
+version = "0.1.39rc26"
 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.1.39rc24"
+version = "0.1.39rc26"
 description = "Python library for DPM-XL data processing and analysis"
 authors = ["MeaningfulData S.L. <info@meaningfuldata.eu>"]
 readme = "README.md"