vtlengine 1.2.0__tar.gz → 1.2.1__tar.gz

{vtlengine-1.2.0 → vtlengine-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: vtlengine
-Version: 1.2.0
+Version: 1.2.1
 Summary: Run and Validate VTL Scripts
 License: AGPL-3.0
 Keywords: vtl,sdmx,vtlengine,Validation and Transformation Language

{vtlengine-1.2.0 → vtlengine-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vtlengine"
-version = "1.2.0"
+version = "1.2.1"
 description = "Run and Validate VTL Scripts"
 license = "AGPL-3.0"
 readme = "README.md"
@@ -55,10 +55,10 @@ pytest = "^8.4"
 pytest-cov = "^6.2.1"
 pytest-xdist = "^3.8.0"
 line-profiler-pycharm = "^1.2.0"
-mypy = "1.16.1"
+mypy = "1.17.1"
 pandas-stubs = "2.2.2.240807"
-ruff = "^0.12.3"
-types-jsonschema = "4.24.0.20250708"
+ruff = "^0.12.7"
+types-jsonschema = "4.25.0.20250720"
 
 [tool.poetry.group.docs.dependencies]
 sphinx = "^7.4.7"
@@ -77,7 +77,7 @@ lint.select = [
 lint.ignore = ["B023", "B028", "B904", "C403", "D100", "D101", "D102", "D103", "D104", "D105",
     "D107", "D200", "D201", "D202", "D203", "D205", "D209", "D212", "D213", "D301",
     "D400", "D401", "D404", "D411", "D413", "D415", "D419", "E203", "S608"]
-lint.exclude = ["*/Grammar/*"]
+lint.exclude = ["*/Grammar/*", "*/main.py"]
 
 [tool.ruff.lint.per-file-ignores]
 "tests/*" = ["S101", "PT006", "PT012", "PT013", "E501", "W605"]

{vtlengine-1.2.0 → vtlengine-1.2.1}/src/vtlengine/Interpreter/__init__.py

@@ -591,16 +591,25 @@ class InterpreterAnalyzer(ASTTemplate):
             else:
                 operand_comp = self.visit(node.operand)
                 component_name = operand_comp.name
+                id_names = self.regular_aggregation_dataset.get_identifiers_names()
                 measure_names = self.regular_aggregation_dataset.get_measures_names()
+                attribute_names = self.regular_aggregation_dataset.get_attributes_names()
                 dataset_components = self.regular_aggregation_dataset.components.copy()
-                for name in measure_names:
-                    if name != operand_comp.name:
-                        dataset_components.pop(name)
+                for name in measure_names + attribute_names:
+                    dataset_components.pop(name)
+
+                dataset_components[operand_comp.name] = Component(
+                    name=operand_comp.name,
+                    data_type=operand_comp.data_type,
+                    role=operand_comp.role,
+                    nullable=operand_comp.nullable,
+                )
 
                 if self.only_semantic or self.regular_aggregation_dataset.data is None:
                     data = None
                 else:
-                    data = self.regular_aggregation_dataset.data[dataset_components.keys()]
+                    data = self.regular_aggregation_dataset.data[id_names].copy()
+                    data[operand_comp.name] = operand_comp.data
 
                 operand = Dataset(
                     name=self.regular_aggregation_dataset.name,

{vtlengine-1.2.0 → vtlengine-1.2.1}/src/vtlengine/Operators/Aggregation.py

@@ -103,12 +103,12 @@ class Aggregation(Operator.Unary):
             elif measure.data_type == Duration:
                 if mode == "input":
                     data[measure.name] = data[measure.name].map(
-                        lambda x: PERIOD_IND_MAPPING[x],  # type: ignore[index]
+                        lambda x: PERIOD_IND_MAPPING[x],
                         na_action="ignore",
                     )
                 else:
                     data[measure.name] = data[measure.name].map(
-                        lambda x: PERIOD_IND_MAPPING_REVERSE[x],  # type: ignore[index]
+                        lambda x: PERIOD_IND_MAPPING_REVERSE[x],
                         na_action="ignore",
                     )
             elif measure.data_type == Boolean:

{vtlengine-1.2.0 → vtlengine-1.2.1}/src/vtlengine/Operators/Conditional.py

@@ -157,15 +157,19 @@ class If(Operator):
                     op=cls.op,
                     type=SCALAR_TYPES_CLASS_REVERSE[condition.data_type],
                 )
-            if not isinstance(left, Scalar) or not isinstance(right, Scalar):
-                nullable = condition.nullable
-            else:
-                if left.data_type == Null or right.data_type == Null:
-                    nullable = True
-            if isinstance(left, DataComponent):
-                nullable |= left.nullable
-            if isinstance(right, DataComponent):
-                nullable |= right.nullable
+
+            if (
+                isinstance(left, Scalar)
+                and isinstance(right, Scalar)
+                and (left.data_type == Null or right.data_type == Null)
+            ):
+                nullable = True
+            if isinstance(left, DataComponent) and isinstance(right, DataComponent):
+                nullable = left.nullable or right.nullable
+            elif isinstance(left, DataComponent):
+                nullable = left.nullable or right.data_type == Null
+            elif isinstance(right, DataComponent):
+                nullable = left.data_type == Null or right.nullable
             return DataComponent(
                 name=comp_name,
                 data=None,
@@ -433,11 +437,9 @@ class Case(Operator):
                     raise SemanticError("2-1-9-4", op=cls.op, name=condition.name)
 
             nullable = any(
-                (thenOp.nullable if isinstance(thenOp, DataComponent) else thenOp.data_type == Null)
-                for thenOp in ops
+                (op.nullable if isinstance(op, DataComponent) else op.data_type == Null)
+                for op in ops
             )
-            nullable |= any(condition.nullable for condition in conditions)
-
             data_type = ops[0].data_type
             for op in ops[1:]:
                 data_type = binary_implicit_promotion(data_type, op.data_type)

{vtlengine-1.2.0 → vtlengine-1.2.1}/src/vtlengine/Operators/Join.py

@@ -9,6 +9,7 @@ from typing import Any, Dict, List, Optional
 import pandas as pd
 
 from vtlengine.AST import BinOp
+from vtlengine.AST.Grammar.tokens import CROSS_JOIN, FULL_JOIN, INNER_JOIN, LEFT_JOIN
 from vtlengine.DataTypes import binary_implicit_promotion
 from vtlengine.Exceptions import SemanticError
 from vtlengine.Model import Component, Dataset, Role
@@ -276,6 +277,7 @@ class Join(Operator):
 
 
 class InnerJoin(Join):
+    op = INNER_JOIN
     how = "inner"
 
     @classmethod
@@ -296,10 +298,12 @@ class InnerJoin(Join):
 
 
 class LeftJoin(Join):
+    op = LEFT_JOIN
     how = "left"
 
 
 class FullJoin(Join):
+    op = FULL_JOIN
     how = "outer"
 
     @classmethod
@@ -320,6 +324,7 @@ class FullJoin(Join):
 
 
 class CrossJoin(Join):
+    op = CROSS_JOIN
     how = "cross"
 
     @classmethod

{vtlengine-1.2.0 → vtlengine-1.2.1}/src/vtlengine/Utils/__Virtual_Assets.py

@@ -24,11 +24,11 @@ class VirtualCounter:
     @classmethod
     def _new_ds_name(cls) -> str:
         cls.dataset_count += 1
-        name = f"@VDS_{copy(cls.dataset_count)}"
+        name = f"__VDS_{copy(cls.dataset_count)}__"
         return name
 
     @classmethod
     def _new_dc_name(cls) -> str:
         cls.component_count += 1
-        name = f"@VDC_{copy(cls.component_count)}"
+        name = f"__VDC_{copy(cls.component_count)}__"
         return name

{vtlengine-1.2.0 → vtlengine-1.2.1}/src/vtlengine/__init__.py

@@ -2,4 +2,4 @@ from vtlengine.API import generate_sdmx, prettify, run, run_sdmx, semantic_analy
 
 __all__ = ["semantic_analysis", "run", "generate_sdmx", "run_sdmx", "prettify"]
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"