vtlengine 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

vtlengine/API/_InternalApi.py

@@ -1,15 +1,24 @@
 import json
 import os
 from pathlib import Path
-from typing import Union, Optional, Dict, List, Any
+from typing import Any, Dict, List, Optional, Union
 
 import pandas as pd
 from s3fs import S3FileSystem  # type: ignore[import-untyped]
 
 from vtlengine.AST import PersistentAssignment, Start
 from vtlengine.DataTypes import SCALAR_TYPES
-from vtlengine.Model import ValueDomain, Dataset, Scalar, Component, Role, ExternalRoutine
-from vtlengine.files.parser import _validate_pandas, _fill_dataset_empty_data
+from vtlengine.Exceptions import check_key
+from vtlengine.files.parser import _fill_dataset_empty_data, _validate_pandas
+from vtlengine.Model import (
+    Component,
+    Dataset,
+    ExternalRoutine,
+    Role,
+    Role_keys,
+    Scalar,
+    ValueDomain,
+)
 
 base_path = Path(__file__).parent
 filepath_VTL = base_path / "data" / "vtl"
@@ -30,15 +39,17 @@ def _load_dataset_from_structure(structures: Dict[str, Any]) -> Dict[str, Any]:
     if "datasets" in structures:
         for dataset_json in structures["datasets"]:
             dataset_name = dataset_json["name"]
-            components = {
-                component["name"]: Component(
+            components = {}
+
+            for component in dataset_json["DataStructure"]:
+                check_key("data_type", SCALAR_TYPES.keys(), component["type"])
+                check_key("role", Role_keys, component["role"])
+                components[component["name"]] = Component(
                     name=component["name"],
                     data_type=SCALAR_TYPES[component["type"]],
                     role=Role(component["role"]),
                     nullable=component["nullable"],
                 )
-                for component in dataset_json["DataStructure"]
-            }
 
             datasets[dataset_name] = Dataset(name=dataset_name, components=components, data=None)
     if "scalars" in structures:
@@ -208,7 +219,7 @@ def load_datasets_with_data(data_structures: Any, datapoints: Optional[Any] = No
         return datasets, None
     # Handling dictionary of paths
     dict_datapoints = _load_datapoints_path(datapoints)
-    for dataset_name, file_path in dict_datapoints.items():
+    for dataset_name, _ in dict_datapoints.items():
         if dataset_name not in datasets:
             raise Exception(f"Not found dataset {dataset_name}")
 

vtlengine/API/__init__.py

@@ -1,29 +1,29 @@
 from pathlib import Path
-from typing import Any, Union, List, Optional, Dict
+from typing import Any, Dict, List, Optional, Union
 
 import pandas as pd
 from antlr4 import CommonTokenStream, InputStream  # type: ignore[import-untyped]
 from antlr4.error.ErrorListener import ErrorListener  # type: ignore[import-untyped]
 
 from vtlengine.API._InternalApi import (
-    load_vtl,
+    _check_output_folder,
+    _return_only_persistent_datasets,
     load_datasets,
-    load_value_domains,
-    load_external_routines,
     load_datasets_with_data,
-    _return_only_persistent_datasets,
-    _check_output_folder,
+    load_external_routines,
+    load_value_domains,
+    load_vtl,
 )
 from vtlengine.AST import Start
 from vtlengine.AST.ASTConstructor import ASTVisitor
 from vtlengine.AST.DAG import DAGAnalyzer
 from vtlengine.AST.Grammar.lexer import Lexer
 from vtlengine.AST.Grammar.parser import Parser
-from vtlengine.Interpreter import InterpreterAnalyzer
 from vtlengine.files.output._time_period_representation import (
-    format_time_period_external_representation,
     TimePeriodRepresentation,
+    format_time_period_external_representation,
 )
+from vtlengine.Interpreter import InterpreterAnalyzer
 
 pd.options.mode.chained_assignment = None
 
@@ -78,7 +78,7 @@ def create_ast(text: str) -> Start:
     stream = _lexer(text)
     cst = _parser(stream)
     visitor = ASTVisitor()
-    ast = visitor.visit(cst)
+    ast = visitor.visitStart(cst)
     DAGAnalyzer.createDAG(ast)
     return ast
 

vtlengine/AST/ASTConstructor.py

@@ -10,18 +10,18 @@ Node Creator.
 from antlr4.tree.Tree import TerminalNodeImpl
 
 from vtlengine.AST import (
-    Start,
-    Assignment,
-    PersistentAssignment,
-    Operator,
     Argument,
+    Assignment,
+    DefIdentifier,
+    DPRule,
     DPRuleset,
     HRBinOp,
-    DPRule,
-    HRuleset,
-    DefIdentifier,
     HRule,
+    HRuleset,
     HRUnOp,
+    Operator,
+    PersistentAssignment,
+    Start,
 )
 from vtlengine.AST.ASTConstructorModules.Expr import Expr
 from vtlengine.AST.ASTConstructorModules.ExprComponents import ExprComp
@@ -30,8 +30,7 @@ from vtlengine.AST.ASTDataExchange import de_ruleset_elements
 from vtlengine.AST.Grammar.parser import Parser
 from vtlengine.AST.VtlVisitor import VtlVisitor
 from vtlengine.Exceptions import SemanticError
-from vtlengine.Model import Scalar, Component, Dataset
-
+from vtlengine.Model import Component, Dataset, Scalar
 
 # pylint: disable=unreachable,expression-not-assigned
 # pylint: disable=assignment-from-no-return
@@ -280,19 +279,13 @@ class ASTVisitor(VtlVisitor):
             for erCode_name in ctx_list
             if isinstance(erCode_name, Parser.ErCodeContext)
         ]
-        if len(er_code) == 0:
-            er_code = None
-        else:
-            er_code = er_code[0]
+        er_code = None if len(er_code) == 0 else er_code[0]
         er_level = [
             Terminals().visitErLevel(erLevel_name)
             for erLevel_name in ctx_list
             if isinstance(erLevel_name, Parser.ErLevelContext)
         ]
-        if len(er_level) == 0:
-            er_level = None
-        else:
-            er_level = er_level[0]
+        er_level = None if len(er_level) == 0 else er_level[0]
 
         return DPRule(name=rule_name, rule=rule_node, erCode=er_code, erLevel=er_level)
 
@@ -317,11 +310,7 @@ class ASTVisitor(VtlVisitor):
             for element in ctx_list
             if isinstance(element, Parser.ScalarItemContext)
         ]
-
-        if len(argument_default) == 0:
-            argument_default = None
-        else:
-            argument_default = argument_default[0]
+        argument_default = None if len(argument_default) == 0 else argument_default[0]
 
         if isinstance(argument_type, (Dataset, Component, Scalar)):
             argument_type.name = argument_name.value
@@ -375,10 +364,7 @@ class ASTVisitor(VtlVisitor):
             if isinstance(valueDomain, TerminalNodeImpl)
             and valueDomain.getSymbol().type == Parser.VALUE_DOMAIN
         ]
-        if len(value_domain) != 0:
-            kind = "ValuedomainID"
-        else:
-            kind = "DatasetID"
+        kind = "ValuedomainID" if len(value_domain) != 0 else "DatasetID"
 
         conditions = [
             self.visitValueDomainSignature(vtlsig)
@@ -408,8 +394,8 @@ class ASTVisitor(VtlVisitor):
     # TODO Support for valueDomainSignature.
     def visitValueDomainSignature(self, ctx: Parser.ValueDomainSignatureContext):
         """
-        valueDomainSignature: CONDITION IDENTIFIER (AS IDENTIFIER)? (',' IDENTIFIER (AS IDENTIFIER)?)* ; # noqa E501
-        """
+        valueDomainSignature: CONDITION IDENTIFIER (AS IDENTIFIER)? (',' IDENTIFIER (AS IDENTIFIER)?)* ;
+        """ # noqa E501
         # AST_ASTCONSTRUCTOR.7
         ctx_list = list(ctx.getChildren())
         component_nodes = [
@@ -458,28 +444,22 @@ class ASTVisitor(VtlVisitor):
             for erCode_name in ctx_list
             if isinstance(erCode_name, Parser.ErCodeContext)
         ]
-        if len(er_code) == 0:
-            er_code = None
-        else:
-            er_code = er_code[0]
+        er_code = None if len(er_code) == 0 else er_code[0]
         er_level = [
             Terminals().visitErLevel(erLevel_name)
             for erLevel_name in ctx_list
             if isinstance(erLevel_name, Parser.ErLevelContext)
         ]
-        if len(er_level) == 0:
-            er_level = None
-        else:
-            er_level = er_level[0]
+        er_level = None if len(er_level) == 0 else er_level[0]
 
         return HRule(name=rule_name, rule=rule_node, erCode=er_code, erLevel=er_level)
 
     def visitCodeItemRelation(self, ctx: Parser.CodeItemRelationContext):
         """
-        codeItemRelation: ( WHEN expr THEN )? codeItemRef codeItemRelationClause (codeItemRelationClause)* ; # noqa E501
-                        ( WHEN exprComponent THEN )? codetemRef=valueDomainValue comparisonOperand? codeItemRelationClause (codeItemRelationClause)* # noqa E501
+        codeItemRelation: ( WHEN expr THEN )? codeItemRef codeItemRelationClause (codeItemRelationClause)* ;
+                        ( WHEN exprComponent THEN )? codetemRef=valueDomainValue comparisonOperand? codeItemRelationClause (codeItemRelationClause)*
 
-        """
+        """ # noqa E501
 
         ctx_list = list(ctx.getChildren())
 
@@ -531,8 +511,8 @@ class ASTVisitor(VtlVisitor):
 
     def visitCodeItemRelationClause(self, ctx: Parser.CodeItemRelationClauseContext):
         """
-        (opAdd=( PLUS | MINUS  ))? rightCodeItem=valueDomainValue ( QLPAREN  rightCondition=exprComponent  QRPAREN )? # noqa E501
-        """
+        (opAdd=( PLUS | MINUS  ))? rightCodeItem=valueDomainValue ( QLPAREN  rightCondition=exprComponent  QRPAREN )?
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
 
         expr = [expr for expr in ctx_list if isinstance(expr, Parser.ExprContext)]
@@ -552,13 +532,13 @@ class ASTVisitor(VtlVisitor):
 
             code_item = DefIdentifier(value=value, kind="CodeItemID")
             if right_condition:
-                setattr(code_item, "_right_condition", right_condition[0])
+                code_item._right_condition = right_condition[0]
 
             return HRBinOp(left=None, op=op, right=code_item)
         else:
             value = Terminals().visitValueDomainValue(ctx_list[0])
             code_item = DefIdentifier(value=value, kind="CodeItemID")
             if right_condition:
-                setattr(code_item, "_right_condition", right_condition[0])
+                code_item._right_condition = right_condition[0]
 
             return code_item

vtlengine/AST/ASTConstructorModules/Expr.py

@@ -1,30 +1,33 @@
 import re
 from copy import copy
+from typing import Any
 
 from antlr4.tree.Tree import TerminalNodeImpl
 
 from vtlengine.AST import (
-    If,
+    ID,
+    Aggregation,
+    Analytic,
+    Assignment,
     BinOp,
-    RenameNode,
-    UDOCall,
-    UnaryOp,
-    JoinOp,
-    Identifier,
-    ParamOp,
+    Case,
+    CaseObj,
+    Constant,
     EvalOp,
-    ParamConstant,
+    Identifier,
+    If,
+    JoinOp,
     MulOp,
+    ParamConstant,
+    ParamOp,
     RegularAggregation,
-    Assignment,
-    Aggregation,
-    ID,
+    RenameNode,
     TimeAggregation,
-    Constant,
+    UDOCall,
+    UnaryOp,
     Validation,
-    Analytic,
-    Windowing,
     VarID,
+    Windowing,
 )
 from vtlengine.AST.ASTConstructorModules.ExprComponents import ExprComp
 from vtlengine.AST.ASTConstructorModules.Terminals import Terminals
@@ -47,22 +50,23 @@ class Expr(VtlVisitor):
     def visitExpr(self, ctx: Parser.ExprContext):
         """
         expr:
-            LPAREN expr RPAREN											            # parenthesisExpr # noqa E501
-               | functions                                                             # functionsExpression # noqa E501
-               | dataset=expr  QLPAREN  clause=datasetClause  QRPAREN                  # clauseExpr # noqa E501
-               | expr MEMBERSHIP simpleComponentId                                     # membershipExpr # noqa E501
-               | op=(PLUS|MINUS|NOT) right=expr                                        # unaryExpr # noqa E501
-               | left=expr op=(MUL|DIV) right=expr                                     # arithmeticExpr # noqa E501
-               | left=expr op=(PLUS|MINUS|CONCAT) right=expr                           # arithmeticExprOrConcat # noqa E501
-               | left=expr op=comparisonOperand  right=expr                            # comparisonExpr # noqa E501
-               | left=expr op=(IN|NOT_IN)(lists|valueDomainID)                         # inNotInExpr # noqa E501
-               | left=expr op=AND right=expr                                           # booleanExpr # noqa E501
-               | left=expr op=(OR|XOR) right=expr							            # booleanExpr # noqa E501
-               | IF  conditionalExpr=expr  THEN thenExpr=expr ELSE elseExpr=expr       # ifExpr # noqa E501
-               | constant														        # constantExpr # noqa E501
-               | varID															        # varIdExpr # noqa E501
+            LPAREN expr RPAREN											            # parenthesisExpr
+               | functions                                                             # functionsExpression
+               | dataset=expr  QLPAREN  clause=datasetClause  QRPAREN                  # clauseExpr
+               | expr MEMBERSHIP simpleComponentId                                     # membershipExpr
+               | op=(PLUS|MINUS|NOT) right=expr                                        # unaryExpr
+               | left=expr op=(MUL|DIV) right=expr                                     # arithmeticExpr
+               | left=expr op=(PLUS|MINUS|CONCAT) right=expr                           # arithmeticExprOrConcat
+               | left=expr op=comparisonOperand  right=expr                            # comparisonExpr
+               | left=expr op=(IN|NOT_IN)(lists|valueDomainID)                         # inNotInExpr
+               | left=expr op=AND right=expr                                           # booleanExpr
+               | left=expr op=(OR|XOR) right=expr							            # booleanExpr
+               | IF  conditionalExpr=expr  THEN thenExpr=expr ELSE elseExpr=expr       # ifExpr
+               | CASE WHEN expr THEN expr ELSE expr END                             # caseExpr
+               | constant														        # constantExpr
+               | varID															        # varIdExpr
         ;
-        """
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -115,6 +119,26 @@ class Expr(VtlVisitor):
 
             return if_node
 
+        # CASE WHEN expr THEN expr ELSE expr END                             # caseExpr
+        elif isinstance(c, TerminalNodeImpl) and (c.getSymbol().type == Parser.CASE):
+
+            if len(ctx_list) % 4 != 3:
+                raise ValueError("Syntax error.")
+
+            else_node = self.visitExpr(ctx_list[-1])
+            ctx_list = ctx_list[1:-2]
+            cases = []
+
+            for i in range(0, len(ctx_list), 4):
+                condition = self.visitExpr(ctx_list[i + 1])
+                thenOp = self.visitExpr(ctx_list[i + 3])
+                case_obj = CaseObj(condition, thenOp)
+                cases.append(case_obj)
+
+            case_node = Case(cases, else_node)
+
+            return case_node
+
         # constant
         elif isinstance(ctx, Parser.ConstantExprContext):
             return Terminals().visitConstant(c)
@@ -348,8 +372,8 @@ class Expr(VtlVisitor):
 
     def visitJoinClauseWithoutUsing(self, ctx: Parser.JoinClauseWithoutUsingContext):
         """
-        joinClause: joinClauseItem (COMMA joinClauseItem)* (USING componentID (COMMA componentID)*)? ; # noqa E501
-        """
+        joinClause: joinClauseItem (COMMA joinClauseItem)* (USING componentID (COMMA componentID)*)? ;
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
 
         clause_nodes = []
@@ -363,8 +387,8 @@ class Expr(VtlVisitor):
 
     def visitJoinBody(self, ctx: Parser.JoinBodyContext):
         """
-        joinBody: filterClause? (calcClause|joinApplyClause|aggrClause)? (keepOrDropClause)? renameClause? # noqa E501
-        """
+        joinBody: filterClause? (calcClause|joinApplyClause|aggrClause)? (keepOrDropClause)? renameClause?
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
 
         body_nodes = []
@@ -432,8 +456,8 @@ class Expr(VtlVisitor):
 
     def visitEvalAtom(self, ctx: Parser.EvalAtomContext):
         """
-        | EVAL LPAREN routineName LPAREN (varID|scalarItem)? (COMMA (varID|scalarItem))* RPAREN (LANGUAGE STRING_CONSTANT)? (RETURNS evalDatasetType)? RPAREN # noqa E501                       # evalAtom
-        """
+        | EVAL LPAREN routineName LPAREN (varID|scalarItem)? (COMMA (varID|scalarItem))* RPAREN (LANGUAGE STRING_CONSTANT)? (RETURNS evalDatasetType)? RPAREN     # evalAtom
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
 
         routine_name = Terminals().visitRoutineName(ctx_list[2])
@@ -480,8 +504,8 @@ class Expr(VtlVisitor):
 
     def visitCastExprDataset(self, ctx: Parser.CastExprDatasetContext):
         """
-        | CAST LPAREN expr COMMA (basicScalarType|valueDomainName) (COMMA STRING_CONSTANT)? RPAREN # noqa E501                                                                          # castExprDataset
-        """
+        | CAST LPAREN expr COMMA (basicScalarType|valueDomainName) (COMMA STRING_CONSTANT)? RPAREN        # castExprDataset
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -755,7 +779,8 @@ class Expr(VtlVisitor):
 
     def visitTimeFunctions(self, ctx: Parser.TimeFunctionsContext):
         if isinstance(ctx, Parser.PeriodAtomContext):
-            return self.visitPeriodAtom(ctx)
+            # return self.visitPeriodAtom(ctx)
+            return self.visitTimeUnaryAtom(ctx)
         elif isinstance(ctx, Parser.FillTimeAtomContext):
             return self.visitFillTimeAtom(ctx)
         elif isinstance(ctx, Parser.FlowAtomContext):
@@ -766,13 +791,24 @@ class Expr(VtlVisitor):
             return self.visitTimeAggAtom(ctx)
         elif isinstance(ctx, Parser.CurrentDateAtomContext):
             return self.visitCurrentDateAtom(ctx)
+        elif isinstance(ctx, Parser.DateDiffAtomContext):
+            return self.visitTimeDiffAtom(ctx)
+        elif isinstance(ctx, Parser.DateAddAtomContext):
+            return self.visitTimeAddAtom(ctx)
+        elif isinstance(ctx, (Parser.YearAtomContext,
+                              Parser.MonthAtomContext,
+                              Parser.DayOfMonthAtomContext,
+                              Parser.DayOfYearAtomContext,
+                              Parser.DayToYearAtomContext,
+                              Parser.DayToMonthAtomContext,
+                              Parser.YearTodayAtomContext,
+                              Parser.MonthTodayAtomContext)):
+
+            return self.visitTimeUnaryAtom(ctx)
         else:
             raise NotImplementedError
 
-    def visitPeriodAtom(self, ctx: Parser.PeriodAtomContext):
-        """
-        periodExpr: PERIOD_INDICATOR '(' expr? ')' ;
-        """
+    def visitTimeUnaryAtom(self, ctx: Any):
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -789,6 +825,26 @@ class Expr(VtlVisitor):
 
         return UnaryOp(op=op, operand=operand_node[0])
 
+    # def visitPeriodAtom(self, ctx: Parser.PeriodAtomContext):
+    #     """
+    #     periodExpr: PERIOD_INDICATOR '(' expr? ')' ;
+    #     """
+    #     ctx_list = list(ctx.getChildren())
+    #     c = ctx_list[0]
+    #
+    #     op = c.getSymbol().text
+    #     operand_node = [
+    #         self.visitExpr(operand)
+    #         for operand in ctx_list
+    #         if isinstance(operand, Parser.ExprContext)
+    #     ]
+    #
+    #     if len(operand_node) == 0:
+    #         # AST_ASTCONSTRUCTOR.15
+    #         raise NotImplementedError
+    #
+    #     return UnaryOp(op=op, operand=operand_node[0])
+
     def visitTimeShiftAtom(self, ctx: Parser.TimeShiftAtomContext):
         """
         timeShiftExpr: TIMESHIFT '(' expr ',' INTEGER_CONSTANT ')' ;
@@ -821,8 +877,8 @@ class Expr(VtlVisitor):
 
     def visitTimeAggAtom(self, ctx: Parser.TimeAggAtomContext):
         """
-        TIME_AGG LPAREN periodIndTo=STRING_CONSTANT (COMMA periodIndFrom=(STRING_CONSTANT| OPTIONAL ))? (COMMA op=optionalExpr)? (COMMA (FIRST|LAST))? RPAREN     # timeAggAtom # noqa E501
-        """
+        TIME_AGG LPAREN periodIndTo=STRING_CONSTANT (COMMA periodIndFrom=(STRING_CONSTANT| OPTIONAL ))? (COMMA op=optionalExpr)? (COMMA (FIRST|LAST))? RPAREN     # timeAggAtom
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -840,10 +896,7 @@ class Expr(VtlVisitor):
             and str_.getSymbol().type in [Parser.FIRST, Parser.LAST]
         ]
 
-        if len(conf) == 0:
-            conf = None
-        else:
-            conf = conf[0]
+        conf = None if len(conf) == 0 else conf[0]
 
         if ctx.op is not None:
             operand_node = self.visitOptionalExpr(ctx.op)
@@ -872,6 +925,35 @@ class Expr(VtlVisitor):
         c = list(ctx.getChildren())[0]
         return MulOp(op=c.getSymbol().text, children=[])
 
+    def visitTimeDiffAtom(self, ctx: Parser.TimeShiftAtomContext):
+        """ """
+        ctx_list = list(ctx.getChildren())
+        c = ctx_list[0]
+
+        op = c.getSymbol().text
+        left_node = self.visitExpr(ctx_list[2])
+        right_node = self.visitExpr(ctx_list[4])
+
+        return BinOp(left=left_node, op=op, right=right_node)
+
+    def visitTimeAddAtom(self, ctx: Parser.TimeShiftAtomContext):
+        """ """
+
+        ctx_list = list(ctx.getChildren())
+        c = ctx_list[0]
+
+        op = c.getSymbol().text
+        children_node = [self.visitExpr(ctx_list[2])]
+
+        param_constant_node = []
+
+        if len(ctx_list) > 4:
+            param_constant_node = [self.visitExpr(ctx_list[4])]
+            if len(ctx_list) > 6:
+                param_constant_node.append(self.visitExpr(ctx_list[6]))
+
+        return ParamOp(op=op, children=children_node, params=param_constant_node)
+
     """
                             -----------------------------------
                                     Conditional Functions
@@ -903,10 +985,10 @@ class Expr(VtlVisitor):
 
     def visitSetFunctions(self, ctx: Parser.SetFunctionsContext):
         """
-        setExpr:     UNION LPAREN left=expr (COMMA expr)+ RPAREN                             # unionAtom # noqa E501
-                    | INTERSECT LPAREN left=expr (COMMA expr)+ RPAREN                       # intersectAtom # noqa E501
-                    | op=(SETDIFF|SYMDIFF) LPAREN left=expr COMMA right=expr RPAREN         # setOrSYmDiffAtom # noqa E501
-        """
+        setExpr:     UNION LPAREN left=expr (COMMA expr)+ RPAREN                             # unionAtom
+                    | INTERSECT LPAREN left=expr (COMMA expr)+ RPAREN                       # intersectAtom
+                    | op=(SETDIFF|SYMDIFF) LPAREN left=expr COMMA right=expr RPAREN         # setOrSYmDiffAtom
+        """ # noqa E501
         if isinstance(ctx, Parser.UnionAtomContext):
             return self.visitUnionAtom(ctx)
         elif isinstance(ctx, Parser.IntersectAtomContext):
@@ -948,8 +1030,8 @@ class Expr(VtlVisitor):
 
     def visitHierarchyFunctions(self, ctx: Parser.HierarchyFunctionsContext):
         """
-        HIERARCHY LPAREN op=expr COMMA hrName=IDENTIFIER (conditionClause)? (RULE ruleComponent=componentID)? (validationMode)? (inputModeHierarchy)? outputModeHierarchy? RPAREN # noqa E501
-        """
+        HIERARCHY LPAREN op=expr COMMA hrName=IDENTIFIER (conditionClause)? (RULE ruleComponent=componentID)? (validationMode)? (inputModeHierarchy)? outputModeHierarchy? RPAREN
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -1019,8 +1101,8 @@ class Expr(VtlVisitor):
 
     def visitValidateDPruleset(self, ctx: Parser.ValidateDPrulesetContext):
         """
-        validationDatapoint: CHECK_DATAPOINT '(' expr ',' IDENTIFIER (COMPONENTS componentID (',' componentID)*)? (INVALID|ALL_MEASURES|ALL)? ')' ; # noqa E501
-        """
+        validationDatapoint: CHECK_DATAPOINT '(' expr ',' IDENTIFIER (COMPONENTS componentID (',' componentID)*)? (INVALID|ALL_MEASURES|ALL)? ')' ;
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -1054,8 +1136,8 @@ class Expr(VtlVisitor):
     # TODO Not fully implemented only basic usage available.
     def visitValidateHRruleset(self, ctx: Parser.ValidateHRrulesetContext):
         """
-        CHECK_HIERARCHY LPAREN op=expr COMMA hrName=IDENTIFIER conditionClause? (RULE componentID)? validationMode? inputMode? validationOutput? RPAREN # noqa E501 	                # validateHRruleset
-        """
+        CHECK_HIERARCHY LPAREN op=expr COMMA hrName=IDENTIFIER conditionClause? (RULE componentID)? validationMode? inputMode? validationOutput? RPAREN     # validateHRruleset
+        """ # noqa E501
 
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
@@ -1116,8 +1198,8 @@ class Expr(VtlVisitor):
 
     def visitValidationSimple(self, ctx: Parser.ValidationSimpleContext):
         """
-        | CHECK LPAREN op=expr (codeErr=erCode)? (levelCode=erLevel)? imbalanceExpr?  output=(INVALID|ALL)? RPAREN # noqa E501													        # validationSimple
-        """
+        | CHECK LPAREN op=expr (codeErr=erCode)? (levelCode=erLevel)? imbalanceExpr?  output=(INVALID|ALL)? RPAREN	        # validationSimple
+        """ # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
         token = c.getSymbol()
@@ -1136,11 +1218,7 @@ class Expr(VtlVisitor):
                 inbalance_node = self.visitImbalanceExpr(param)
 
         invalid = ctx_list[-2] if isinstance(ctx_list[-2], TerminalNodeImpl) else None
-
-        if invalid is None:
-            invalid_value = False
-        else:
-            invalid_value = True if invalid.getSymbol().text == "invalid" else False
+        invalid_value = False if invalid is None else invalid.getSymbol().text == "invalid"
 
         return Validation(
             op=token.text,
@@ -1200,7 +1278,7 @@ class Expr(VtlVisitor):
             grouping_op, group_node = self.visitGroupingClause(groups[0])
         if len(haves) != 0:
             have_node, expr = self.visitHavingClause(haves[0])
-            setattr(have_node, "expr", expr)
+            have_node.expr = expr
 
         return Aggregation(
             op=op_node,
@@ -1277,9 +1355,7 @@ class Expr(VtlVisitor):
             elif isinstance(c, Parser.OrderByClauseContext):
                 order_by = Terminals().visitOrderByClause(c)
                 continue
-            elif isinstance(c, Parser.SignedIntegerContext) or isinstance(
-                c, Parser.ScalarItemContext
-            ):
+            elif isinstance(c, (Parser.SignedIntegerContext, Parser.ScalarItemContext)):
                 if params is None:
                     params = []
                 if isinstance(c, Parser.SignedIntegerContext):
@@ -1445,7 +1521,7 @@ class Expr(VtlVisitor):
         right_node = ExprComp().visitAggregateFunctionsComponents(ctx_list[base_index + 2])
         # Encoding the role information inside the Assignment for easiness and simplicity.
         # Cannot find another way with less lines of code
-        setattr(left_node, "role", role)
+        left_node.role = role
 
         return Assignment(left_node, op_node, right_node)
 
@@ -1472,7 +1548,7 @@ class Expr(VtlVisitor):
             grouping_op, group_node = self.visitGroupingClause(groups[0])
         if len(haves) > 0:
             have_node, expr = self.visitHavingClause(haves[0])
-            setattr(have_node, "expr", expr)
+            have_node.expr = expr
         for element in aggregate_nodes:
             element.right = Aggregation(
                 op=element.right.op,