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

py_dpm/api/dpm_xl/ast_generator.py

@@ -2206,12 +2206,11 @@ class ASTGeneratorAPI:
                                 entry["x"] = x_index
 
                         # Calculate y coordinate (column position)
+                        # Only add y if there are multiple columns
                         if cols and col_code in cols:
                             y_index = cols.index(col_code) + 1
-                            entry["y"] = y_index
-                        elif not cols:
-                            # Default to 1 if no column info
-                            entry["y"] = 1
+                            if len(cols) > 1:
+                                entry["y"] = y_index
 
                         # Calculate z coordinate (sheet position)
                         if sheets and sheet_code in sheets:
@@ -2238,13 +2237,16 @@ class ASTGeneratorAPI:
         Remove extra fields from data entries in the AST.
 
         Keeps only the fields required by the engine:
-        - datapoint, operand_reference_id, y, column, x (if multiple rows), z (if multiple sheets)
+        - datapoint, operand_reference_id (always)
+        - x and row (only if multiple rows - rows are variable)
+        - y and column (only if multiple columns - columns are variable)
+        - z and sheet (only if multiple sheets - sheets are variable)
 
         Removes internal/debug fields:
-        - data_type, cell_code, table_code, table_vid, row
+        - data_type, cell_code, table_code, table_vid
         """
-        # Fields to keep in data entries
-        ALLOWED_FIELDS = {"datapoint", "operand_reference_id", "x", "y", "z", "column", "sheet"}
+        # Base fields to always keep in data entries
+        BASE_FIELDS = {"datapoint", "operand_reference_id"}
 
         def clean_node(node):
             if isinstance(node, dict):
@@ -2252,9 +2254,22 @@ class ASTGeneratorAPI:
                 if node.get("class_name") == "VarID" and "data" in node:
                     cleaned_data = []
                     for data_entry in node["data"]:
+                        # Build allowed fields based on which coordinates are present
+                        # Only keep row/column/sheet if the corresponding x/y/z coordinate exists
+                        allowed = set(BASE_FIELDS)
+                        if "x" in data_entry:
+                            allowed.add("x")
+                            allowed.add("row")
+                        if "y" in data_entry:
+                            allowed.add("y")
+                            allowed.add("column")
+                        if "z" in data_entry:
+                            allowed.add("z")
+                            allowed.add("sheet")
+
                         # Keep only allowed fields
                         cleaned_entry = {
-                            k: v for k, v in data_entry.items() if k in ALLOWED_FIELDS
+                            k: v for k, v in data_entry.items() if k in allowed
                         }
                         cleaned_data.append(cleaned_entry)
                     node["data"] = cleaned_data

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

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

@@ -1,4 +1,4 @@
-py_dpm/__init__.py,sha256=8RZiE-F0XPTFPGEyFhEp9cS-0ahXQN5PMGSlLRrarL8,1859
+py_dpm/__init__.py,sha256=mCQT4E9AM2a8Gg_V4tbxaQkfJ_CB9uUJR0fH7DR9uVI,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=hmfy2qV5t_RFGgmid7YuCXbrkjknv1KuQaJGxbXuHLs,97583
+py_dpm/api/dpm_xl/ast_generator.py,sha256=53Hq1I2Uey6VqNmehU-6vSjyUnfU56GhcJKZuNZAEFw,98334
 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
@@ -76,9 +76,9 @@ py_dpm/exceptions/exceptions.py,sha256=6S3p-_i5O1oStvSMixt_JQG0xwTeSfBcdzrwL8yBy
 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.10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pydpm_xl-0.2.10.dist-info/METADATA,sha256=SPIgOJT90xDaqE4CYrE2VIsWXOAzGmXbLlI8Yl7yv9I,9154
-pydpm_xl-0.2.10.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-pydpm_xl-0.2.10.dist-info/entry_points.txt,sha256=6DDmBfw-AjtgvMHgq_I730i_LAAs_7-N3C95HD_bRr4,47
-pydpm_xl-0.2.10.dist-info/top_level.txt,sha256=495PvWZRoKl2NvbQU25W7dqWIBHqY-mFMPt83uxPpcM,7
-pydpm_xl-0.2.10.dist-info/RECORD,,
+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.10.dist-info → pydpm_xl-0.2.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any