vtlengine 1.2.0__py3-none-any.whl → 1.2.1rc1__py3-none-any.whl

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/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/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/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/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/__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.1rc1"

{vtlengine-1.2.0.dist-info → vtlengine-1.2.1rc1.dist-info}/METADATA

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

{vtlengine-1.2.0.dist-info → vtlengine-1.2.1rc1.dist-info}/RECORD

@@ -26,19 +26,19 @@ vtlengine/DataTypes/TimeHandling.py,sha256=CYnC0sb1qbRjTnCSsA3wgez7QftOzrXHxbuZX
 vtlengine/DataTypes/__init__.py,sha256=LYXrde68bYm7MLeMLmr4haeOTSE4Fnpq9G2Ewy7DiaU,23084
 vtlengine/Exceptions/__init__.py,sha256=rSSskV_qCBFzg_W67Q1QBAL7Lnq88D7yi2BDYo1hytw,4727
 vtlengine/Exceptions/messages.py,sha256=h2RHfgolbNsYXO39FXT3NTe2RwG-1AK5NL9k6utPtCA,19658
-vtlengine/Interpreter/__init__.py,sha256=PKFBU6HW6_tIoycZU49GexxNbK-_CNWlQ7BFKAiy2Z8,85030
+vtlengine/Interpreter/__init__.py,sha256=aO7CGEzFgg0W6kkXFYHzogVxsiVI0l9pJ3wH8m1WuPE,85502
 vtlengine/Model/__init__.py,sha256=xWrwhdUOj8Y-5x38zP5XnmFPw8IkBVBBG2bPsUBGLA8,15869
-vtlengine/Operators/Aggregation.py,sha256=aB64ZcH3oR0WEYMFlwkML2CEc3pggKoFpIb_CoOCgJM,12002
+vtlengine/Operators/Aggregation.py,sha256=BI4cHzdWWtxEHisg1cr87twg8gvc1MHfR05JsiXpo6M,11956
 vtlengine/Operators/Analytic.py,sha256=adm8y4mTeen4iVMsQvcvxM9U5f6Xj9UNjdCQI2OBINE,12934
 vtlengine/Operators/Assignment.py,sha256=xyJgGPoFYbq6mzX06gz7Q7L8jXJxpUkgzdY3Lrne2hw,793
 vtlengine/Operators/Boolean.py,sha256=3U5lHkxW5d7QQdGDNxXeXqejlPfFrXKG8_TqknrC8Ls,2856
 vtlengine/Operators/CastOperator.py,sha256=pXTSs0UYBeR5hS3J2HWUyaHmoZoifl2EFch6ol_Taok,17115
 vtlengine/Operators/Clause.py,sha256=Lu6zjcUBkShN6kQmjEZu_7ytaFGwfH-yB4ROoCSkLGI,15505
 vtlengine/Operators/Comparison.py,sha256=CRMvs9qXVXUW32pxAnCua8b7ZHpJy0-Egvs691ekOCk,17403
-vtlengine/Operators/Conditional.py,sha256=NDJa3yMdcfk8ninE1skNa5JBxLgTIKAKOeBDxlzm3oo,20258
+vtlengine/Operators/Conditional.py,sha256=lu0S06GtBzVR_pbq9_QyAGeUC0Xcawag-3wBh5W93Xc,20340
 vtlengine/Operators/General.py,sha256=ltRK8Sw686sb4rC5ji2OX-GYVxaK_PpL0Lev8P5OFHI,6828
 vtlengine/Operators/HROperators.py,sha256=YybwD70906AA00c0k4IP6sjeta0pg7hqb2EUVsFqdmA,8979
-vtlengine/Operators/Join.py,sha256=WhHnepjNrQiYC3keo5uuJ5RhcMxklccyKaOUOH2G5Zc,18229
+vtlengine/Operators/Join.py,sha256=lYmC_jGlJ4RRmn2vplB13Ysrxgv6O8sNFEHQYZzun5s,18393
 vtlengine/Operators/Numeric.py,sha256=icYTWzEsw6VQFLYc5Wucgr8961d8ZwTFx_wfZ8Wp9Co,12083
 vtlengine/Operators/RoleSetter.py,sha256=mHZIdcHC3wflj81ekLbioDG1f8yHZXYDQFymV-KnyXA,2274
 vtlengine/Operators/Set.py,sha256=f1uLeY4XZF0cWEwpXRB_CczgbXr6s33DYPuFt39HlEg,7084
@@ -46,10 +46,10 @@ vtlengine/Operators/String.py,sha256=ghWtYl6oUEAAzynY1a9Hg4yqRA9Sa7uk2B6iF9uuSqQ
 vtlengine/Operators/Time.py,sha256=ESn6ldPg73bdZxOXZYJuIwCLDQnXDGTqR1y7ckQmV1M,43025
 vtlengine/Operators/Validation.py,sha256=tnHRZ7o0Z_AE1Bb2DtRVP6pGGUtSs5KVwNSEJxzzGnk,10162
 vtlengine/Operators/__init__.py,sha256=N1zi9RFC_l0qggRm5IPLOkPFtFS4CGAg-r1taHOrbTI,37667
-vtlengine/Utils/__Virtual_Assets.py,sha256=t6cAikOjDVHilORXD6pzC3_twrl6BOutkSaaipQqEwU,856
+vtlengine/Utils/__Virtual_Assets.py,sha256=0jPXysZrBr0hYVzqFoyg9La8ZcZoZ01Ql245X5vrth4,862
 vtlengine/Utils/__init__.py,sha256=zhGPJA8MjHmtEEwMS4CxEFYL0tk2L5F0YPn7bitdRzM,8954
 vtlengine/__extras_check.py,sha256=Wr-lxGZhXJZEacVV5cUkvKt7XM-mry0kYAe3VxNrVcY,614
-vtlengine/__init__.py,sha256=H1x4pfJSReVNIm472bKjZUbUf3Z0eusLQ4j-T9S5L2E,188
+vtlengine/__init__.py,sha256=l8c8MEFiqOOnoRwhFkch3oZAxLsyNg2vIj0c96LYZmU,191
 vtlengine/files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vtlengine/files/output/__init__.py,sha256=4tmf-p1Y1u5Ohrwt3clQA-FMGaijKI3HC_iwn3H9J8c,1250
 vtlengine/files/output/_time_period_representation.py,sha256=D5XCSXyEuX_aBzTvBV3sZxACcgwXz2Uu_YH3loMP8q0,1610
@@ -57,7 +57,7 @@ vtlengine/files/parser/__init__.py,sha256=JamEIWI0pFZxT0sKYE6Fii8H2JQcsFn4Nf3T0O
 vtlengine/files/parser/_rfc_dialect.py,sha256=Y8kAYBxH_t9AieN_tYg7QRh5A4DgvabKarx9Ko3QeCQ,462
 vtlengine/files/parser/_time_checking.py,sha256=UAC_Pv-eQJKrhgTguWb--xfqMMs6quyMeiAkGBt_vgI,4725
 vtlengine/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vtlengine-1.2.0.dist-info/LICENSE.md,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
-vtlengine-1.2.0.dist-info/METADATA,sha256=L-6dsHpZwMO9A7T3UoSvXpU4NEEbgyvdZjneTzNGD1s,4132
-vtlengine-1.2.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-vtlengine-1.2.0.dist-info/RECORD,,
+vtlengine-1.2.1rc1.dist-info/LICENSE.md,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
+vtlengine-1.2.1rc1.dist-info/METADATA,sha256=OgvVzj7n35H2Z9qPn3vzXcUXAPiFcYUzzACX7PA053A,4135
+vtlengine-1.2.1rc1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+vtlengine-1.2.1rc1.dist-info/RECORD,,