vtlengine 1.0.3rc2__tar.gz → 1.0.4__tar.gz

{vtlengine-1.0.3rc2 → vtlengine-1.0.4}/PKG-INFO

@@ -1,34 +1,36 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: vtlengine
-Version: 1.0.3rc2
+Version: 1.0.4
 Summary: Run and Validate VTL Scripts
 License: AGPL-3.0
 Keywords: vtl,sdmx,vtlengine,Validation and Transformation Language
 Author: MeaningfulData
 Author-email: info@meaningfuldata.eu
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
 Requires-Dist: antlr4-python3-runtime (==4.9.2)
-Requires-Dist: bottleneck (>=1.3.4,<2.0.0)
-Requires-Dist: duckdb (>=1.1.1,<2.0.0)
+Requires-Dist: duckdb (>=1.1,<2.0)
+Requires-Dist: jsonschema (>=4.23.0,<5.0.0)
 Requires-Dist: networkx (>=2.8.8,<3.0.0)
 Requires-Dist: numexpr (>=2.9.0,<3.0.0)
 Requires-Dist: pandas (>=2.1.4,<3.0.0)
-Requires-Dist: s3fs (>=2024.9.0,<2025.0.0)
+Requires-Dist: s3fs (>=2025.2.0,<2026.0.0)
 Requires-Dist: sqlglot (>=22.2.0,<23.0.0)
 Project-URL: Authors, https://github.com/Meaningful-Data/vtlengine/graphs/contributors
-Project-URL: BugTracker, https://github.com/Meaningful-Data/vtlengine/issues
 Project-URL: Documentation, https://docs.vtlengine.meaningfuldata.eu
+Project-URL: IssueTracker, https://github.com/Meaningful-Data/vtlengine/issues
+Project-URL: MeaningfulData, https://www.meaningfuldata.eu/
 Project-URL: Repository, https://github.com/Meaningful-Data/vtlengine
 Description-Content-Type: text/markdown
 

{vtlengine-1.0.3rc2 → vtlengine-1.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vtlengine"
-version = "1.0.3rc2"
+version = "1.0.4"
 description = "Run and Validate VTL Scripts"
 authors = ["MeaningfulData <info@meaningfuldata.eu>"]
 license = "AGPL-3.0"
@@ -17,37 +17,38 @@ classifiers = [
 keywords = ['vtl', 'sdmx', 'vtlengine', 'Validation and Transformation Language']
 
 [tool.poetry.urls]
-BugTracker = 'https://github.com/Meaningful-Data/vtlengine/issues'
-Documentation = 'https://docs.vtlengine.meaningfuldata.eu'
 Repository = 'https://github.com/Meaningful-Data/vtlengine'
+Documentation = 'https://docs.vtlengine.meaningfuldata.eu'
+MeaningfulData = 'https://www.meaningfuldata.eu/'
+IssueTracker = 'https://github.com/Meaningful-Data/vtlengine/issues'
 Authors = 'https://github.com/Meaningful-Data/vtlengine/graphs/contributors'
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.9"
 # PyPi dependencies
-duckdb = "^1.1.1"
+duckdb = "^1.1"
 #numba = "^0.60.0"
-s3fs = "^2024.9.0"
+s3fs = "^2025.2.0"
+jsonschema = "^4.23.0"
 
 # APT dependencies
 antlr4-python3-runtime = "4.9.2"
 networkx = "^2.8.8"
 numexpr = "^2.9.0"
 pandas = "^2.1.4"
-bottleneck = "^1.3.4"
 sqlglot = "^22.2.0"
 
-[tool.poetry.dev-dependencies]
-pytest = "^7.3"
-pytest-cov = "^5.0.0"
+[tool.poetry.group.dev.dependencies]
+pytest = "^8.3"
+pytest-cov = "^6.0.0"
 line-profiler-pycharm = "^1.2.0"
-sphinx = "^7.4"
-sphinx-rtd-theme = "^2.0.0"
-mypy = "^1.11.2"
-pandas-stubs = "^2.2.3.241009"
-stubs = "^1.0.0"
+sphinx = "^7.4.7"
+sphinx-rtd-theme = "^3.0.2"
+mypy = "1.14.1"
+pandas-stubs = "^2.1.4.231227"
 toml = "^0.10.2"
-ruff = "^0.7.1"
+ruff = "^0.9.4"
+types-jsonschema = "4.23.0.20241208"
 
 [tool.ruff]
 line-length = 100
@@ -83,6 +84,12 @@ enable_error_code = [
 ]
 warn_return_any = false
 
+[tool.pytest.ini_options]
+addopts = "--strict-markers"
+markers = [
+    "input_path: directory where tests data files are stored"
+]
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

{vtlengine-1.0.3rc2 → vtlengine-1.0.4}/src/vtlengine/API/_InternalApi.py

@@ -3,12 +3,13 @@ import os
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Union
 
+import jsonschema
 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.Exceptions import check_key
+from vtlengine.Exceptions import InputValidationException, check_key
 from vtlengine.files.parser import _fill_dataset_empty_data, _validate_pandas
 from vtlengine.Model import (
     Component,
@@ -21,13 +22,9 @@ from vtlengine.Model import (
 )
 
 base_path = Path(__file__).parent
-filepath_VTL = base_path / "data" / "vtl"
-filepath_ValueDomains = base_path / "data" / "ValueDomain"
-filepath_sql = base_path / "data" / "sql"
-filepath_json = base_path / "data" / "DataStructure" / "input"
-filepath_csv = base_path / "data" / "DataSet" / "input"
-filepath_out_json = base_path / "data" / "DataStructure" / "output"
-filepath_out_csv = base_path / "data" / "DataSet" / "output"
+schema_path = base_path / "data" / "schema"
+with open(schema_path / "json_schema_2.1.json", "r") as file:
+    schema = json.load(file)
 
 
 def _load_dataset_from_structure(structures: Dict[str, Any]) -> Dict[str, Any]:
@@ -41,22 +38,60 @@ def _load_dataset_from_structure(structures: Dict[str, Any]) -> Dict[str, Any]:
             dataset_name = dataset_json["name"]
             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"],
-                )
+            if "structure" in dataset_json:
+                structure_name = dataset_json["structure"]
+                structure_json = None
+                for s in structures["structures"]:
+                    if s["name"] == structure_name:
+                        structure_json = s
+                if structure_json is None:
+                    raise InputValidationException(code="0-3-1-1", message="Structure not found.")
+                try:
+                    jsonschema.validate(instance=structure_json, schema=schema)
+                except jsonschema.exceptions.ValidationError as e:
+                    raise InputValidationException(code="0-3-1-1", message=e.message)
+
+                for component in structure_json["components"]:
+                    check_key("data_type", SCALAR_TYPES.keys(), component["data_type"])
+                    if component["role"] == "ViralAttribute":
+                        component["role"] = "Attribute"
+
+                    check_key("role", Role_keys, component["role"])
+
+                    if "nullable" not in component:
+                        if Role(component["role"]) == Role.IDENTIFIER:
+                            component["nullable"] = False
+                        elif Role(component["role"]) in (Role.MEASURE, Role.ATTRIBUTE):
+                            component["nullable"] = True
+                        else:
+                            component["nullable"] = False
+
+                    components[component["name"]] = Component(
+                        name=component["name"],
+                        data_type=SCALAR_TYPES[component["data_type"]],
+                        role=Role(component["role"]),
+                        nullable=component["nullable"],
+                    )
+
+            if "DataStructure" in dataset_json:
+                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"],
+                    )
 
             datasets[dataset_name] = Dataset(name=dataset_name, components=components, data=None)
     if "scalars" in structures:
         for scalar_json in structures["scalars"]:
             scalar_name = scalar_json["name"]
             scalar = Scalar(
-                name=scalar_name, data_type=SCALAR_TYPES[scalar_json["type"]], value=None
+                name=scalar_name,
+                data_type=SCALAR_TYPES[scalar_json["type"]],
+                value=None,
             )
             datasets[scalar_name] = scalar  # type: ignore[assignment]
     return datasets
@@ -115,7 +150,7 @@ def _load_single_datapoint(datapoint: Union[str, Path]) -> Dict[str, Any]:
 
 
 def _load_datapoints_path(
-    datapoints: Union[Path, str, List[Union[str, Path]]]
+    datapoints: Union[Path, str, List[Union[str, Path]]],
 ) -> Dict[str, Dataset]:
     """
     Returns a dict with the data given from a Path.
@@ -156,7 +191,7 @@ def _load_datastructure_single(data_structure: Union[Dict[str, Any], Path]) -> D
 
 
 def load_datasets(
-    data_structure: Union[Dict[str, Any], Path, List[Union[Dict[str, Any], Path]]]
+    data_structure: Union[Dict[str, Any], Path, List[Union[Dict[str, Any], Path]]],
 ) -> Dict[str, Dataset]:
     """
     Loads multiple datasets.

{vtlengine-1.0.3rc2 → vtlengine-1.0.4}/src/vtlengine/API/__init__.py

@@ -32,7 +32,13 @@ class __VTLSingleErrorListener(ErrorListener):  # type: ignore[misc]
     """ """
 
     def syntaxError(
-        self, recognizer: Any, offendingSymbol: str, line: str, column: str, msg: str, e: Any
+        self,
+        recognizer: Any,
+        offendingSymbol: str,
+        line: str,
+        column: str,
+        msg: str,
+        e: Any,
     ) -> None:
         raise Exception(
             f"Not valid VTL Syntax \n "
@@ -150,7 +156,10 @@ def semantic_analysis(
 
     # Running the interpreter
     interpreter = InterpreterAnalyzer(
-        datasets=structures, value_domains=vd, external_routines=ext_routines, only_semantic=True
+        datasets=structures,
+        value_domains=vd,
+        external_routines=ext_routines,
+        only_semantic=True,
     )
     with pd.option_context("future.no_silent_downcasting", True):
         result = interpreter.visit(ast)

vtlengine-1.0.4/src/vtlengine/API/data/schema/json_schema_2.1.json

@@ -0,0 +1,116 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "description": "VTL Metadata JSON serialization",
+    "$defs": {
+        "vtl-id": {
+            "type": "string",
+            "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$|^'.*'$"
+        },
+        "set-type": {
+            "type": "array",
+            "uniqueItems": true,
+            "oneOf": [
+                { "items": { "oneOf": [ { "type": "string" }, { "type": "null" } ] } },
+                { "items": { "oneOf": [ { "type": "number" }, { "type": "null" } ] } }
+            ]
+        },
+        "identifiable": {
+            "type": "object",
+            "properties": {
+                "name": { "$ref": "#/$defs/vtl-id" },
+                "description": { "type": "string" }
+            },
+            "required": [ "name" ]
+        }
+    },
+    "type": "object",
+    "properties": {
+        "datasets": {
+            "type": "array",
+            "items": {
+                "allOf": [ { "$ref": "#/$defs/identifiable" } ],
+                "properties": {
+                    "source": { "type": "string" },
+                    "structure": { "$ref": "#/$defs/vtl-id" }
+                },
+                "required": [ "structure" ]
+            }
+        },
+        "structures": {
+            "type": "array",
+            "items": {
+                "allOf": [ { "$ref": "#/$defs/identifiable" } ],
+                "properties": {
+                    "components": {
+                        "type": "array",
+                        "items": {
+                            "allOf": [ { "$ref": "#/$defs/identifiable" } ],
+                            "properties": {
+                                "role": {
+                                    "type": "string",
+                                    "enum": [ "Identifier", "Measure", "Attribute", "Viral Attribute" ]
+                                },
+                                "subset": { "$ref": "#/$defs/vtl-id" },
+                                "nullable": { "type": "boolean" },
+                                "data_type": {
+                                    "type": "string",
+                                    "enum": [ "String", "Number", "Integer", "Boolean", "Time", "TimePeriod", "Date", "Duration" ]
+                                }
+                            },
+                            "required": [ "role" ]
+                        }
+                    }
+                },
+                "required": [ "components" ]
+            }
+        },
+        "variables": {
+            "type": "array",
+            "items": {
+                "allOf": [ { "$ref": "#/$defs/identifiable" } ],
+                "properties": {
+                    "domain": { "$ref": "#/$defs/vtl-id" }
+                },
+                "required": [ "domain" ]
+            }
+        },
+        "domains": {
+            "type": "array",
+            "items": {
+                "allOf": [ { "$ref": "#/$defs/identifiable" } ],
+                "unevaluatedProperties": false,
+                "oneOf": [
+                    {
+                        "properties": {
+                            "externalRef": { "type": "string" }
+                        },
+                        "required": [ "externalRef" ]
+                    }, {
+                        "properties": {
+                            "parent": { "$ref": "#/$defs/vtl-id" }
+                        },
+                        "required": [ "parent" ],
+                        "oneOf": [{
+                                "properties": {
+                                    "restriction": { "$ref": "#/$defs/set-type" }
+                                },
+                                "required": [ "restriction" ]
+                            }, {
+                                "properties": {
+                                    "enumerated": { "$ref": "#/$defs/set-type" }
+                                },
+                                "required": [ "enumerated" ]
+                            }, {
+                                "properties": {
+                                    "described": { "type": "string" }
+                                },
+                                "required": [ "described" ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        }
+    }
+}
+

{vtlengine-1.0.3rc2 → vtlengine-1.0.4}/src/vtlengine/AST/ASTConstructor.py

@@ -382,7 +382,8 @@ class ASTVisitor(VtlVisitor):
         if conditions:
             identifiers_list = [
                 DefIdentifier(
-                    value=elto.alias if getattr(elto, "alias", None) else elto.value, kind=kind
+                    value=elto.alias if getattr(elto, "alias", None) else elto.value,
+                    kind=kind,
                 )
                 for elto in conditions[0]
             ]
@@ -395,7 +396,7 @@ class ASTVisitor(VtlVisitor):
     def visitValueDomainSignature(self, ctx: Parser.ValueDomainSignatureContext):
         """
         valueDomainSignature: CONDITION IDENTIFIER (AS IDENTIFIER)? (',' IDENTIFIER (AS IDENTIFIER)?)* ;
-        """ # noqa E501
+        """  # noqa E501
         # AST_ASTCONSTRUCTOR.7
         ctx_list = list(ctx.getChildren())
         component_nodes = [
@@ -459,7 +460,7 @@ class ASTVisitor(VtlVisitor):
         codeItemRelation: ( WHEN expr THEN )? codeItemRef codeItemRelationClause (codeItemRelationClause)* ;
                         ( WHEN exprComponent THEN )? codetemRef=valueDomainValue comparisonOperand? codeItemRelationClause (codeItemRelationClause)*
 
-        """ # noqa E501
+        """  # noqa E501
 
         ctx_list = list(ctx.getChildren())
 
@@ -512,7 +513,7 @@ class ASTVisitor(VtlVisitor):
     def visitCodeItemRelationClause(self, ctx: Parser.CodeItemRelationClauseContext):
         """
         (opAdd=( PLUS | MINUS  ))? rightCodeItem=valueDomainValue ( QLPAREN  rightCondition=exprComponent  QRPAREN )?
-        """ # noqa E501
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
 
         expr = [expr for expr in ctx_list if isinstance(expr, Parser.ExprContext)]

{vtlengine-1.0.3rc2 → vtlengine-1.0.4}/src/vtlengine/AST/ASTConstructorModules/Expr.py

@@ -45,7 +45,8 @@ class Expr(VtlVisitor):
 
                                 Expr Definition.
 
-    _______________________________________________________________________________________"""
+    _______________________________________________________________________________________
+    """
 
     def visitExpr(self, ctx: Parser.ExprContext):
         """
@@ -66,7 +67,7 @@ class Expr(VtlVisitor):
                | constant														        # constantExpr
                | varID															        # varIdExpr
         ;
-        """ # noqa E501
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -121,7 +122,6 @@ class Expr(VtlVisitor):
 
         # 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.")
 
@@ -221,7 +221,6 @@ class Expr(VtlVisitor):
         return previous_node
 
     def visitClauseExpr(self, ctx: Parser.ClauseExprContext):
-
         ctx_list = list(ctx.getChildren())
 
         dataset = self.visitExpr(ctx_list[0])
@@ -347,7 +346,7 @@ class Expr(VtlVisitor):
 
     def visitJoinClause(self, ctx: Parser.JoinClauseContext):
         """
-        joinClauseItem (COMMA joinClauseItem)* (USING componentID (COMMA componentID)*)?
+        JoinClauseItem (COMMA joinClauseItem)* (USING componentID (COMMA componentID)*)?
         """
         ctx_list = list(ctx.getChildren())
 
@@ -373,7 +372,7 @@ class Expr(VtlVisitor):
     def visitJoinClauseWithoutUsing(self, ctx: Parser.JoinClauseWithoutUsingContext):
         """
         joinClause: joinClauseItem (COMMA joinClauseItem)* (USING componentID (COMMA componentID)*)? ;
-        """ # noqa E501
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
 
         clause_nodes = []
@@ -388,7 +387,7 @@ class Expr(VtlVisitor):
     def visitJoinBody(self, ctx: Parser.JoinBodyContext):
         """
         joinBody: filterClause? (calcClause|joinApplyClause|aggrClause)? (keepOrDropClause)? renameClause?
-        """ # noqa E501
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
 
         body_nodes = []
@@ -457,7 +456,7 @@ 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     # evalAtom
-        """ # noqa E501
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
 
         routine_name = Terminals().visitRoutineName(ctx_list[2])
@@ -505,7 +504,7 @@ class Expr(VtlVisitor):
     def visitCastExprDataset(self, ctx: Parser.CastExprDatasetContext):
         """
         | CAST LPAREN expr COMMA (basicScalarType|valueDomainName) (COMMA STRING_CONSTANT)? RPAREN        # castExprDataset
-        """ # noqa E501
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -795,15 +794,19 @@ class Expr(VtlVisitor):
             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)):
-
+        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
@@ -825,26 +828,6 @@ 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 ')' ;
@@ -878,7 +861,7 @@ 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
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -911,7 +894,11 @@ class Expr(VtlVisitor):
             # AST_ASTCONSTRUCTOR.17
             raise Exception("Optional as expression node is not allowed in Time Aggregation")
         return TimeAggregation(
-            op=op, operand=operand_node, period_to=period_to, period_from=period_from, conf=conf
+            op=op,
+            operand=operand_node,
+            period_to=period_to,
+            period_from=period_from,
+            conf=conf,
         )
 
     def visitFlowAtom(self, ctx: Parser.FlowAtomContext):
@@ -988,7 +975,7 @@ class Expr(VtlVisitor):
         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
+        """  # noqa E501
         if isinstance(ctx, Parser.UnionAtomContext):
             return self.visitUnionAtom(ctx)
         elif isinstance(ctx, Parser.IntersectAtomContext):
@@ -1031,7 +1018,7 @@ 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
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -1102,7 +1089,7 @@ class Expr(VtlVisitor):
     def visitValidateDPruleset(self, ctx: Parser.ValidateDPrulesetContext):
         """
         validationDatapoint: CHECK_DATAPOINT '(' expr ',' IDENTIFIER (COMPONENTS componentID (',' componentID)*)? (INVALID|ALL_MEASURES|ALL)? ')' ;
-        """ # noqa E501
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
 
@@ -1137,7 +1124,7 @@ class Expr(VtlVisitor):
     def visitValidateHRruleset(self, ctx: Parser.ValidateHRrulesetContext):
         """
         CHECK_HIERARCHY LPAREN op=expr COMMA hrName=IDENTIFIER conditionClause? (RULE componentID)? validationMode? inputMode? validationOutput? RPAREN     # validateHRruleset
-        """ # noqa E501
+        """  # noqa E501
 
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
@@ -1199,7 +1186,7 @@ class Expr(VtlVisitor):
     def visitValidationSimple(self, ctx: Parser.ValidationSimpleContext):
         """
         | CHECK LPAREN op=expr (codeErr=erCode)? (levelCode=erLevel)? imbalanceExpr?  output=(INVALID|ALL)? RPAREN	        # validationSimple
-        """ # noqa E501
+        """  # noqa E501
         ctx_list = list(ctx.getChildren())
         c = ctx_list[0]
         token = c.getSymbol()
@@ -1331,11 +1318,19 @@ class Expr(VtlVisitor):
 
         if window is None:
             window = Windowing(
-                type_="data", start=-1, stop=0, start_mode="preceding", stop_mode="current"
+                type_="data",
+                start=-1,
+                stop=0,
+                start_mode="preceding",
+                stop_mode="current",
             )
 
         return Analytic(
-            op=op_node, operand=operand, partition_by=partition_by, order_by=order_by, window=window
+            op=op_node,
+            operand=operand,
+            partition_by=partition_by,
+            order_by=order_by,
+            window=window,
         )
 
     def visitLagOrLeadAn(self, ctx: Parser.LagOrLeadAnContext):
@@ -1369,7 +1364,11 @@ class Expr(VtlVisitor):
             raise Exception(f"{op_node} requires an offset parameter.")
 
         return Analytic(
-            op=op_node, operand=operand, partition_by=partition_by, order_by=order_by, params=params
+            op=op_node,
+            operand=operand,
+            partition_by=partition_by,
+            order_by=order_by,
+            params=params,
         )
 
     def visitRatioToReportAn(self, ctx: Parser.RatioToReportAnContext):