vtlengine 1.1rc2__py3-none-any.whl → 1.2.0__py3-none-any.whl

vtlengine/AST/__init__.py

@@ -11,7 +11,7 @@ from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Type, Union
 
 from vtlengine.DataTypes import ScalarType
-from vtlengine.Model import Role
+from vtlengine.Model import Dataset, Role
 
 
 @dataclass
@@ -20,6 +20,11 @@ class AST:
     AST: (children)
     """
 
+    line_start: int
+    column_start: int
+    line_stop: int
+    column_stop: int
+
     @classmethod
     def __all_annotations(cls) -> Dict[str, Any]:
         class_attributes = {}
@@ -47,6 +52,30 @@ class AST:
 
     __repr__ = __str__
 
+    def ast_equality(self, other):
+        if not isinstance(other, self.__class__):
+            return False
+        for k in self.__all_annotations():
+            if (
+                getattr(self, k) != getattr(other, k)
+                and k not in AST.__annotations__
+                and k != "children"  # We do not want to compare the children order here
+            ):
+                return False
+        return True
+
+    __eq__ = ast_equality
+
+
+@dataclass
+class Comment(AST):
+    """
+    Comment: (value)
+    """
+
+    value: str
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Start(AST):
@@ -56,6 +85,8 @@ class Start(AST):
 
     children: List[AST]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Assignment(AST):
@@ -67,6 +98,8 @@ class Assignment(AST):
     op: str
     right: AST
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class PersistentAssignment(Assignment):
@@ -85,7 +118,9 @@ class VarID(AST):
     Could be: DATASET or a COMPONENT.
     """
 
-    value: Any
+    value: str
+
+    __eq__ = AST.ast_equality
 
 
 @dataclass
@@ -100,6 +135,8 @@ class UnaryOp(AST):
     op: str
     operand: AST
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class BinOp(AST):
@@ -113,6 +150,8 @@ class BinOp(AST):
     op: str
     right: AST
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class MulOp(AST):
@@ -124,6 +163,8 @@ class MulOp(AST):
     op: str
     children: List[AST]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class ParamOp(AST):
@@ -137,12 +178,16 @@ class ParamOp(AST):
     children: List[AST]
     params: List[AST]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class UDOCall(AST):
     op: str
     params: List[AST]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class JoinOp(AST):
@@ -156,9 +201,11 @@ class JoinOp(AST):
 
     op: str
     clauses: List[AST]
-    using: Optional[List[AST]]
+    using: Optional[List[str]]
     isLast: bool = False
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Constant(AST):
@@ -172,6 +219,8 @@ class Constant(AST):
     type_: str
     value: Optional[Union[str, int, float, bool]]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class ParamConstant(Constant):
@@ -184,6 +233,8 @@ class ParamConstant(Constant):
     type_: str
     value: str
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Identifier(AST):
@@ -194,6 +245,8 @@ class Identifier(AST):
     value: str
     kind: str
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class ID(AST):
@@ -206,6 +259,8 @@ class ID(AST):
     type_: str
     value: str
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Collection(AST):
@@ -220,6 +275,8 @@ class Collection(AST):
     children: List[AST]
     kind: str = "Set"
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Windowing(AST):
@@ -234,11 +291,13 @@ class Windowing(AST):
     """
 
     type_: str
-    start: str
+    start: Union[int, str]
     start_mode: str
     stop: Union[int, str]
     stop_mode: str
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class OrderBy(AST):
@@ -249,6 +308,8 @@ class OrderBy(AST):
         if self.order not in ["asc", "desc"]:
             raise ValueError(f"Invalid order: {self.order}")
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Analytic(AST):
@@ -274,6 +335,8 @@ class Analytic(AST):
         if self.partition_by is None and self.order_by is None:
             raise ValueError("Partition by or order by must be provided on Analytic.")
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class RegularAggregation(AST):
@@ -288,6 +351,8 @@ class RegularAggregation(AST):
     dataset: Optional[AST] = None
     isLast: bool = False
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class RenameNode(AST):
@@ -298,6 +363,8 @@ class RenameNode(AST):
     old_name: str
     new_name: str
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Aggregation(AST):
@@ -316,6 +383,8 @@ class Aggregation(AST):
     grouping: Optional[List[AST]] = None
     having_clause: Optional[AST] = None
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class TimeAggregation(AST):
@@ -331,6 +400,8 @@ class TimeAggregation(AST):
     operand: Optional[AST] = None
     conf: Optional[str] = None
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class If(AST):
@@ -342,15 +413,14 @@ class If(AST):
     thenOp: AST
     elseOp: AST
 
+    __eq__ = AST.ast_equality
+
 
-class CaseObj:
+@dataclass
+class CaseObj(AST):
     condition: AST
     thenOp: AST
 
-    def __init__(self, condition: AST, thenOp: AST):
-        self.condition = condition
-        self.thenOp = thenOp
-
 
 @dataclass
 class Case(AST):
@@ -361,6 +431,8 @@ class Case(AST):
     cases: List[CaseObj]
     elseOp: AST
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Validation(AST):
@@ -375,6 +447,8 @@ class Validation(AST):
     imbalance: Optional[AST]
     invalid: bool
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class ComponentType(AST):
@@ -386,6 +460,8 @@ class ComponentType(AST):
     data_type: Optional[Type[ScalarType]] = None
     role: Optional[Role] = None
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class ASTScalarType(AST):
@@ -400,6 +476,8 @@ class DatasetType(AST):
 
     components: List[ComponentType]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Types(AST):
@@ -418,6 +496,8 @@ class Types(AST):
     nullable: Optional[bool]
     name: Optional[str] = None
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Argument(AST):
@@ -429,6 +509,8 @@ class Argument(AST):
     type_: Type[ScalarType]
     default: Optional[AST]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class Operator(AST):
@@ -441,6 +523,8 @@ class Operator(AST):
     output_type: str
     expression: AST
 
+    __eq__ = AST.ast_equality
+
 
 # TODO: Is this class necessary?
 @dataclass
@@ -452,6 +536,8 @@ class DefIdentifier(AST):
     value: str
     kind: str
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class DPRIdentifier(AST):
@@ -463,6 +549,8 @@ class DPRIdentifier(AST):
     kind: str
     alias: Optional[str] = None
 
+    __eq__ = AST.ast_equality
+
 
 # TODO: Are HRBinOp and HRUnOp necessary?
 @dataclass
@@ -476,6 +564,8 @@ class HRBinOp(AST):
     op: str
     right: DefIdentifier
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class HRUnOp(AST):
@@ -487,6 +577,8 @@ class HRUnOp(AST):
     op: str
     operand: DefIdentifier
 
+    __eq__ = AST.ast_equality
+
 
 # TODO: Unify HRule and DPRule?
 @dataclass
@@ -497,8 +589,10 @@ class HRule(AST):
 
     name: Optional[str]
     rule: HRBinOp
-    erCode: Optional[Constant]
-    erLevel: Optional[Constant]
+    erCode: Optional[str]
+    erLevel: Optional[int]
+
+    __eq__ = AST.ast_equality
 
 
 @dataclass
@@ -509,8 +603,10 @@ class DPRule(AST):
 
     name: Optional[str]
     rule: HRBinOp
-    erCode: Optional[Constant]
-    erLevel: Optional[Constant]
+    erCode: Optional[str]
+    erLevel: Optional[int]
+
+    __eq__ = AST.ast_equality
 
 
 # TODO: Unify HRuleset and DPRuleset?
@@ -525,6 +621,8 @@ class HRuleset(AST):
     element: DefIdentifier
     rules: List[HRule]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class DPRuleset(AST):
@@ -537,6 +635,8 @@ class DPRuleset(AST):
     params: Union[DefIdentifier, list]
     rules: List[DPRule]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class EvalOp(AST):
@@ -548,9 +648,11 @@ class EvalOp(AST):
 
     name: str
     operands: List[AST]
-    output: Optional[str]
+    output: Optional[Dataset]
     language: Optional[str]
 
+    __eq__ = AST.ast_equality
+
 
 @dataclass
 class NoOp(AST):
@@ -559,3 +661,14 @@ class NoOp(AST):
     """
 
     pass
+
+
+@dataclass
+class ParFunction(AST):
+    """
+    ParFunction: (operand)
+    """
+
+    operand: AST
+
+    __eq__ = AST.ast_equality

vtlengine/Exceptions/messages.py

@@ -9,12 +9,22 @@ All exceptions exposed by the Vtl engine.
 
 centralised_messages = {
     # Input Validation errors
+    "0-1-1-1": "invalid script format type: {format_}. Input must be a string, "
+    "TransformationScheme or Path object",
     "0-1-2-1": "Invalid json structure because additional properties have been supplied "
     "on file {filename}.",
     "0-1-2-2": "Errors found on file {filename}: {errors}",
     "0-1-2-3": "Component {component} is duplicated.",
     "0-1-2-4": "Invalid json structure because {err} on file {filename}.",
     "0-1-2-5": "File {file} must be encoded in utf-8 (without BOM).",
+    # Run SDMX errors
+    "0-1-3-1": "Expected exactly one input dataset in the whole script, found: {number_datasets}",
+    "0-1-3-2": "SDMX Dataset {schema} requires to have a Schema object defined as structure",
+    "0-1-3-3": "If no mappings are provided, only one dataset is allowed.",
+    "0-1-3-4": "Dataset {short_urn} not found in mapping dictionary.",
+    "0-1-3-5": "Dataset {dataset_name} not found in the input datasets.",
+    "0-1-3-6": "Input name {missing} not found in the input datasets.",
+    "0-1-3-7": "Invalid input datasets type: {type_}. Expected a sequence of PandasDataset.",
     # JSON Schema validations
     "0-3-1-1": "Dataset {dataset} is not valid according to JSON schema",
     # Infer Data Structure errors
@@ -206,6 +216,8 @@ centralised_messages = {
     "1-1-19-9": "At op {op}: {op} can only be applied to a {comp_type} with a {param}",
     # New Unary time operators
     "1-1-19-10": "{op} can only be applied to operands with data type as Date or Time Period",
+    "1-1-19-11": "The time aggregation operand has to be "
+    "defined if not used inside an aggregation.",
     # Other time operators
     "2-1-19-1": "At op {op}: Invalid values {value_1} and {value_2} for duration, "
     "periodIndTo parameter must be a larger duration value than the "
@@ -232,8 +244,8 @@ centralised_messages = {
     "2-3-1": "{comp_type} {comp_name} not found.",
     "2-3-2": "{op_type} cannot be used with {node_op} operators.",
     "2-3-4": "{op} operator must have a {comp}",
-    "2-3-5": "Expected {param_type}, got {type_name} on UDO {op}, parameter {param_name}",
-    "2-3-6": "Dataset {dataset_name} not found, please check input datastructures",
+    "2-3-5": "Expected {param_type}, got {type_name} on UDO {op}, parameter {param_name}.",
+    "2-3-6": "Dataset or scalar {dataset_name} not found, please check input datastructures.",
     "2-3-9": "{comp_type} {comp_name} not found in {param}.",
     "2-3-10": "No {comp_type} have been defined.",
     "2-3-11": "{pos} operand must be a dataset.",