Cr 607 comparing branch (DO NOR MERGE)

src/vtlengine/API/_InternalApi.py

@@ -76,15 +76,9 @@ def _extract_data_type(component: Dict[str, Any]) -> Tuple[str, Any]:
     Raises:
         InputValidationException: If the data type key or value is invalid
     """
-    if "type" in component:
-        key = "type"
-        value = component["type"]
-    else:
-        key = "data_type"
-        value = component["data_type"]
-
-    check_key(key, _SCALAR_TYPE_KEYS, value)
-    return key, SCALAR_TYPES[value]
+    key = "type" if "type" in component else "data_type"
+    check_key(key, _SCALAR_TYPE_KEYS, component[key])
+    return key, SCALAR_TYPES[component[key]]
 
 
 def _load_dataset_from_structure(

src/vtlengine/AST/ASTConstructorModules/Expr.py

@@ -147,7 +147,9 @@ def visitExpr(self, ctx: Parser.ExprContext):
                 condition = self.visitExpr(ctx_list[i + 1])
                 thenOp = self.visitExpr(ctx_list[i + 3])
                 case_obj = CaseObj(
-                    condition=condition, thenOp=thenOp, **extract_token_info(ctx_list[i + 1])
+                    condition=condition,
+                    thenOp=thenOp,
+                    **extract_token_info(ctx_list[i + 1]),
                 )
                 cases.append(case_obj)
 
@@ -572,7 +574,10 @@ def visitCastExprDataset(self, ctx: Parser.CastExprDatasetContext):
             children_nodes = expr_node + basic_scalar_type
 
             return ParamOp(
-                op=op, children=children_nodes, params=param_node, **extract_token_info(ctx)
+                op=op,
+                children=children_nodes,
+                params=param_node,
+                **extract_token_info(ctx),
             )
 
         else:
@@ -587,7 +592,9 @@ def visitParameter(self, ctx: Parser.ParameterContext):
             return self.visitExpr(c)
         elif isinstance(c, TerminalNodeImpl):
             return ID(
-                type_="OPTIONAL", value=c.getSymbol().text, **extract_token_info(c.getSymbol())
+                type_="OPTIONAL",
+                value=c.getSymbol().text,
+                **extract_token_info(c.getSymbol()),
             )
         else:
             raise NotImplementedError
@@ -639,7 +646,10 @@ def visitSubstrAtom(self, ctx: Parser.SubstrAtomContext):
                 params_nodes.append(self.visitOptionalExpr(param))
 
         return ParamOp(
-            op=op_node, children=children_nodes, params=params_nodes, **extract_token_info(ctx)
+            op=op_node,
+            children=children_nodes,
+            params=params_nodes,
+            **extract_token_info(ctx),
         )
 
     def visitReplaceAtom(self, ctx: Parser.ReplaceAtomContext):
@@ -662,7 +672,10 @@ def visitReplaceAtom(self, ctx: Parser.ReplaceAtomContext):
         params_nodes = [expressions[1]] + params
 
         return ParamOp(
-            op=op_node, children=children_nodes, params=params_nodes, **extract_token_info(ctx)
+            op=op_node,
+            children=children_nodes,
+            params=params_nodes,
+            **extract_token_info(ctx),
         )
 
     def visitInstrAtom(self, ctx: Parser.InstrAtomContext):
@@ -685,7 +698,10 @@ def visitInstrAtom(self, ctx: Parser.InstrAtomContext):
         params_nodes = [expressions[1]] + params
 
         return ParamOp(
-            op=op_node, children=children_nodes, params=params_nodes, **extract_token_info(ctx)
+            op=op_node,
+            children=children_nodes,
+            params=params_nodes,
+            **extract_token_info(ctx),
         )
 
     """
@@ -733,7 +749,10 @@ def visitUnaryWithOptionalNumeric(self, ctx: Parser.UnaryWithOptionalNumericCont
                 params_nodes.append(self.visitOptionalExpr(param))
 
         return ParamOp(
-            op=op_node, children=children_nodes, params=params_nodes, **extract_token_info(ctx)
+            op=op_node,
+            children=children_nodes,
+            params=params_nodes,
+            **extract_token_info(ctx),
         )
 
     def visitBinaryNumeric(self, ctx: Parser.BinaryNumericContext):
@@ -911,7 +930,10 @@ def visitFillTimeAtom(self, ctx: Parser.FillTimeAtomContext):
             param_constant_node = []
 
         return ParamOp(
-            op=op, children=children_node, params=param_constant_node, **extract_token_info(ctx)
+            op=op,
+            children=children_node,
+            params=param_constant_node,
+            **extract_token_info(ctx),
         )
 
     def visitTimeAggAtom(self, ctx: Parser.TimeAggAtomContext):
@@ -996,7 +1018,10 @@ def visitTimeAddAtom(self, ctx: Parser.TimeShiftAtomContext):
                 param_constant_node.append(self.visitExpr(ctx_list[6]))
 
         return ParamOp(
-            op=op, children=children_node, params=param_constant_node, **extract_token_info(ctx)
+            op=op,
+            children=children_node,
+            params=param_constant_node,
+            **extract_token_info(ctx),
         )
 
     """
@@ -1050,7 +1075,9 @@ def visitUnionAtom(self, ctx: Parser.UnionAtomContext):
         ]
 
         return MulOp(
-            op=ctx_list[0].getSymbol().text, children=exprs_nodes, **extract_token_info(ctx)
+            op=ctx_list[0].getSymbol().text,
+            children=exprs_nodes,
+            **extract_token_info(ctx),
         )
 
     def visitIntersectAtom(self, ctx: Parser.IntersectAtomContext):
@@ -1060,7 +1087,9 @@ def visitIntersectAtom(self, ctx: Parser.IntersectAtomContext):
         ]
 
         return MulOp(
-            op=ctx_list[0].getSymbol().text, children=exprs_nodes, **extract_token_info(ctx)
+            op=ctx_list[0].getSymbol().text,
+            children=exprs_nodes,
+            **extract_token_info(ctx),
         )
 
     def visitSetOrSYmDiffAtom(self, ctx: Parser.SetOrSYmDiffAtomContext):
@@ -1070,7 +1099,9 @@ def visitSetOrSYmDiffAtom(self, ctx: Parser.SetOrSYmDiffAtomContext):
         ]
 
         return MulOp(
-            op=ctx_list[0].getSymbol().text, children=exprs_nodes, **extract_token_info(ctx)
+            op=ctx_list[0].getSymbol().text,
+            children=exprs_nodes,
+            **extract_token_info(ctx),
         )
 
     """
@@ -1124,7 +1155,9 @@ def visitHierarchyFunctions(self, ctx: Parser.HierarchyFunctionsContext):
             if rule_element.kind == "DatasetID":
                 check_hierarchy_rule = rule_element.value
                 rule_comp = Identifier(
-                    value=check_hierarchy_rule, kind="ComponentID", **extract_token_info(ctx)
+                    value=check_hierarchy_rule,
+                    kind="ComponentID",
+                    **extract_token_info(ctx),
                 )
             else:  # ValuedomainID
                 raise SemanticError("1-1-10-4", op=op)
@@ -1546,7 +1579,9 @@ def visitRenameClause(self, ctx: Parser.RenameClauseContext):
             rename_nodes.append(self.visitRenameClauseItem(ctx_rename))
 
         return RegularAggregation(
-            op=ctx_list[0].getSymbol().text, children=rename_nodes, **extract_token_info(ctx)
+            op=ctx_list[0].getSymbol().text,
+            children=rename_nodes,
+            **extract_token_info(ctx),
         )
 
     def visitRenameClauseItem(self, ctx: Parser.RenameClauseItemContext):
@@ -1771,14 +1806,34 @@ def visitGroupAll(self, ctx: Parser.GroupAllContext):
 
         # Check if TIME_AGG is present (more than just GROUP ALL)
         if len(ctx_list) > 2:
-            period_to, conf = self._extract_time_agg_tokens(ctx_list)
+            period_to = None
+            period_from = None
+            operand_node = None
+            conf = None
+
+            for child in ctx_list:
+                if isinstance(child, TerminalNodeImpl):
+                    token = child.getSymbol()
+                    if token.type == Parser.STRING_CONSTANT:
+                        if period_to is None:
+                            period_to = token.text[1:-1]
+                        else:
+                            period_from = token.text[1:-1]
+                    elif token.type in [Parser.FIRST, Parser.LAST]:
+                        conf = token.text
+                elif isinstance(child, Parser.OptionalExprContext):
+                    operand_node = self.visitOptionalExpr(child)
+                    if isinstance(operand_node, ID):
+                        operand_node = None
+                    elif isinstance(operand_node, Identifier):
+                        operand_node = VarID(value=operand_node.value, **extract_token_info(child))
 
             children_nodes = [
                 TimeAggregation(
                     op="time_agg",
-                    operand=None,
+                    operand=operand_node,
                     period_to=period_to,
-                    period_from=None,
+                    period_from=period_from,
                     conf=conf,
                     **extract_token_info(ctx),
                 )
@@ -1853,7 +1908,9 @@ def visitCalcClauseItem(self, ctx: Parser.CalcClauseItemContext):
             )
             if role is None:
                 return UnaryOp(
-                    op=Role.MEASURE.value.lower(), operand=operand_node, **extract_token_info(c)
+                    op=Role.MEASURE.value.lower(),
+                    operand=operand_node,
+                    **extract_token_info(c),
                 )
             return UnaryOp(op=role.value.lower(), operand=operand_node, **extract_token_info(c))
         else:
@@ -1865,7 +1922,9 @@ def visitCalcClauseItem(self, ctx: Parser.CalcClauseItemContext):
                 left=left_node, op=op_node, right=right_node, **extract_token_info(ctx)
             )
             return UnaryOp(
-                op=Role.MEASURE.value.lower(), operand=operand_node, **extract_token_info(ctx)
+                op=Role.MEASURE.value.lower(),
+                operand=operand_node,
+                **extract_token_info(ctx),
             )
 
     def visitKeepOrDropClause(self, ctx: Parser.KeepOrDropClauseContext):

src/vtlengine/AST/Grammar/parser.py

@@ -3292,7 +3292,8 @@ def exprComponent(self, _p: int = 0):
                     la_ = self._interp.adaptivePredict(self._input, 10, self._ctx)
                     if la_ == 1:
                         localctx = Parser.ArithmeticExprCompContext(
-                            self, Parser.ExprComponentContext(self, _parentctx, _parentState)
+                            self,
+                            Parser.ExprComponentContext(self, _parentctx, _parentState),
                         )
                         localctx.left = _prevctx
                         self.pushNewRecursionContext(localctx, _startState, self.RULE_exprComponent)
@@ -3315,7 +3316,8 @@ def exprComponent(self, _p: int = 0):
 
                     elif la_ == 2:
                         localctx = Parser.ArithmeticExprOrConcatCompContext(
-                            self, Parser.ExprComponentContext(self, _parentctx, _parentState)
+                            self,
+                            Parser.ExprComponentContext(self, _parentctx, _parentState),
                         )
                         localctx.left = _prevctx
                         self.pushNewRecursionContext(localctx, _startState, self.RULE_exprComponent)
@@ -3338,7 +3340,8 @@ def exprComponent(self, _p: int = 0):
 
                     elif la_ == 3:
                         localctx = Parser.ComparisonExprCompContext(
-                            self, Parser.ExprComponentContext(self, _parentctx, _parentState)
+                            self,
+                            Parser.ExprComponentContext(self, _parentctx, _parentState),
                         )
                         localctx.left = _prevctx
                         self.pushNewRecursionContext(localctx, _startState, self.RULE_exprComponent)
@@ -3355,7 +3358,8 @@ def exprComponent(self, _p: int = 0):
 
                     elif la_ == 4:
                         localctx = Parser.BooleanExprCompContext(
-                            self, Parser.ExprComponentContext(self, _parentctx, _parentState)
+                            self,
+                            Parser.ExprComponentContext(self, _parentctx, _parentState),
                         )
                         localctx.left = _prevctx
                         self.pushNewRecursionContext(localctx, _startState, self.RULE_exprComponent)
@@ -3372,7 +3376,8 @@ def exprComponent(self, _p: int = 0):
 
                     elif la_ == 5:
                         localctx = Parser.BooleanExprCompContext(
-                            self, Parser.ExprComponentContext(self, _parentctx, _parentState)
+                            self,
+                            Parser.ExprComponentContext(self, _parentctx, _parentState),
                         )
                         localctx.left = _prevctx
                         self.pushNewRecursionContext(localctx, _startState, self.RULE_exprComponent)
@@ -3395,7 +3400,8 @@ def exprComponent(self, _p: int = 0):
 
                     elif la_ == 6:
                         localctx = Parser.InNotInExprCompContext(
-                            self, Parser.ExprComponentContext(self, _parentctx, _parentState)
+                            self,
+                            Parser.ExprComponentContext(self, _parentctx, _parentState),
                         )
                         localctx.left = _prevctx
                         self.pushNewRecursionContext(localctx, _startState, self.RULE_exprComponent)
@@ -6893,7 +6899,14 @@ def numericOperators(self):
             self.state = 780
             self._errHandler.sync(self)
             token = self._input.LA(1)
-            if token in [Parser.ABS, Parser.LN, Parser.EXP, Parser.CEIL, Parser.FLOOR, Parser.SQRT]:
+            if token in [
+                Parser.ABS,
+                Parser.LN,
+                Parser.EXP,
+                Parser.CEIL,
+                Parser.FLOOR,
+                Parser.SQRT,
+            ]:
                 localctx = Parser.UnaryNumericContext(self, localctx)
                 self.enterOuterAlt(localctx, 1)
                 self.state = 759
@@ -7138,7 +7151,14 @@ def numericOperatorsComponent(self):
             self.state = 803
             self._errHandler.sync(self)
             token = self._input.LA(1)
-            if token in [Parser.ABS, Parser.LN, Parser.EXP, Parser.CEIL, Parser.FLOOR, Parser.SQRT]:
+            if token in [
+                Parser.ABS,
+                Parser.LN,
+                Parser.EXP,
+                Parser.CEIL,
+                Parser.FLOOR,
+                Parser.SQRT,
+            ]:
                 localctx = Parser.UnaryNumericComponentContext(self, localctx)
                 self.enterOuterAlt(localctx, 1)
                 self.state = 782
@@ -13121,7 +13141,11 @@ def rulesetType(self):
                 self.state = 1542
                 self.match(Parser.RULESET)
                 pass
-            elif token in [Parser.DATAPOINT, Parser.DATAPOINT_ON_VD, Parser.DATAPOINT_ON_VAR]:
+            elif token in [
+                Parser.DATAPOINT,
+                Parser.DATAPOINT_ON_VD,
+                Parser.DATAPOINT_ON_VAR,
+            ]:
                 self.enterOuterAlt(localctx, 2)
                 self.state = 1543
                 self.dpRuleset()

src/vtlengine/Exceptions/messages.py

@@ -224,6 +224,14 @@
         "description": "Raised when URL datapoints are provided but data_structures is not a "
         "file path or URL for fetching the SDMX structure definition.",
     },
+    # Env var errors
+    "0-4-1-1": {
+        "message": "Invalid value for {env_var}: {value}. "
+        "Expected an integer between {min_value} and {max_value}, "
+        "or {disable_value} to disable.",
+        "description": "Raised when the provided time period output format "
+        "is not one of the supported representations.",
+    },
     # ------------Operators-------------
     # General Semantic errors
     "1-1-1-1": {

src/vtlengine/Interpreter/__init__.py

@@ -855,8 +855,7 @@ def visit_VarID(self, node: AST.VarID) -> Any:  # noqa: C901
                     return copy(self.scalars[node.value])
                 if (
                     self.is_from_join
-                    and node.value
-                    not in self.regular_aggregation_dataset.get_components_names()
+                    and node.value not in self.regular_aggregation_dataset.get_components_names()
                 ):
                     is_partial_present = 0
                     found_comp = None

src/vtlengine/Operators/Numeric.py

@@ -469,9 +469,9 @@ class Random(Parameterized):
     def validate(cls, seed: Any, index: Any = None) -> Any:
         if index.data_type != Integer:
             index.data_type = binary_implicit_promotion(index.data_type, Integer)
-        if index.value < 0:
+        if index.value is not None and index.value < 0:
             raise SemanticError("2-1-15-2", op=cls.op, value=index)
-        if index.value > 10000:
+        if index.value is not None and index.value > 10000:
             warnings.warn(
                 "Random: The value of 'index' is very big. This can affect performance.",
                 UserWarning,