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

vtlengine/Operators/Analytic.py

@@ -1,4 +1,3 @@
-import os
 from copy import copy
 from typing import List, Optional
 
@@ -6,21 +5,33 @@ import duckdb
 
 from vtlengine.Exceptions import SemanticError
 
-if os.environ.get("SPARK"):
-    import pyspark.pandas as pd
-else:
-    import pandas as pd
+# if os.environ.get("SPARK"):
+#     import pyspark.pandas as pd
+# else:
+#     import pandas as pd
+import pandas as pd
 
 import vtlengine.Operators as Operator
 from vtlengine.AST import OrderBy, Windowing
-from vtlengine.AST.Grammar.tokens import AVG, COUNT, FIRST_VALUE, LAG, LAST_VALUE, LEAD, MAX, \
-    MEDIAN, MIN, \
-    RANK, RATIO_TO_REPORT, STDDEV_POP, \
-    STDDEV_SAMP, \
-    SUM, VAR_POP, \
-    VAR_SAMP
-from vtlengine.DataTypes import COMP_NAME_MAPPING, Integer, Number, \
-    unary_implicit_promotion
+from vtlengine.AST.Grammar.tokens import (
+    AVG,
+    COUNT,
+    FIRST_VALUE,
+    LAG,
+    LAST_VALUE,
+    LEAD,
+    MAX,
+    MEDIAN,
+    MIN,
+    RANK,
+    RATIO_TO_REPORT,
+    STDDEV_POP,
+    STDDEV_SAMP,
+    SUM,
+    VAR_POP,
+    VAR_SAMP,
+)
+from vtlengine.DataTypes import COMP_NAME_MAPPING, Integer, Number, unary_implicit_promotion
 from vtlengine.Model import Component, Dataset, Role
 
 
@@ -36,14 +47,18 @@ class Analytic(Operator.Unary):
         analyticfunc: Specify class method that returns a dataframe using the duckdb library.
         Evaluate: Ensures the type of data is the correct one to perform the Analytic operators.
     """
-    sql_op = None
+
+    sql_op: Optional[str] = None
 
     @classmethod
-    def validate(cls, operand: Dataset,
-                 partitioning: List[str],
-                 ordering: Optional[List[OrderBy]],
-                 window: Optional[Windowing],
-                 params: Optional[List[int]]) -> Dataset:
+    def validate(  # type: ignore[override]
+        cls,
+        operand: Dataset,
+        partitioning: List[str],
+        ordering: Optional[List[OrderBy]],
+        window: Optional[Windowing],
+        params: Optional[List[int]],
+    ) -> Dataset:
         if ordering is None:
             order_components = []
         else:
@@ -53,15 +68,21 @@ class Analytic(Operator.Unary):
 
         for comp_name in partitioning:
             if comp_name not in operand.components:
-                raise SemanticError("1-1-1-10", op=cls.op, comp_name=comp_name,
-                                    dataset_name=operand.name)
+                raise SemanticError(
+                    "1-1-1-10", op=cls.op, comp_name=comp_name, dataset_name=operand.name
+                )
             if comp_name not in identifier_names:
-                raise SemanticError("1-1-3-2", op=cls.op, id_name=comp_name,
-                                    id_type=operand.components[comp_name].role)
+                raise SemanticError(
+                    "1-1-3-2",
+                    op=cls.op,
+                    id_name=comp_name,
+                    id_type=operand.components[comp_name].role,
+                )
         for comp_name in order_components:
             if comp_name not in operand.components:
-                raise SemanticError("1-1-1-10", op=cls.op, comp_name=comp_name,
-                                    dataset_name=operand.name)
+                raise SemanticError(
+                    "1-1-1-10", op=cls.op, comp_name=comp_name, dataset_name=operand.name
+                )
         measures = operand.get_measures()
         if measures is None:
             raise SemanticError("1-1-1-8", op=cls.op, name=operand.name)
@@ -79,24 +100,26 @@ class Analytic(Operator.Unary):
             if len(measures) == 1:
                 del result_components[measures[0].name]
             result_components[measure_name] = Component(
-                name=measure_name,
-                data_type=cls.return_type,
-                role=Role.MEASURE,
-                nullable=nullable
+                name=measure_name, data_type=cls.return_type, role=Role.MEASURE, nullable=nullable
             )
 
         return Dataset(name="result", components=result_components, data=None)
 
     @classmethod
-    def analyticfunc(cls, df: pd.DataFrame, partitioning: List[str],
-                     identifier_names: List[str],
-                     measure_names: List[str],
-                     ordering: List[OrderBy],
-                     window: Optional[Windowing],
-                     params: Optional[List[int]] = None):
+    def analyticfunc(
+        cls,
+        df: pd.DataFrame,
+        partitioning: List[str],
+        identifier_names: List[str],
+        measure_names: List[str],
+        ordering: List[OrderBy],
+        window: Optional[Windowing],
+        params: Optional[List[int]] = None,
+    ) -> pd.DataFrame:
         """Annotation class
 
-        It is used to analyze the attributes specified bellow ensuring that the type of data is the correct one to perform
+        It is used to analyze the attributes specified bellow
+        ensuring that the type of data is the correct one to perform
         the operation.
 
         Attributes:
@@ -110,18 +133,26 @@ class Analytic(Operator.Unary):
         window_str = ""
         if window is not None:
             mode = "ROWS" if window.type_ == "data" else "RANGE"
-            start_mode = window.start_mode if window.start_mode != 'current' and window.start != 'CURRENT ROW' else ''
-            stop_mode = window.stop_mode if window.stop_mode != 'current' and window.stop != 'CURRENT ROW' else ''
-            if window.start == -1:
-                window.start = 'UNBOUNDED'
+            start_mode = (
+                window.start_mode
+                if window.start_mode != "current" and window.start != "CURRENT ROW"
+                else ""
+            )
+            stop_mode = (
+                window.stop_mode
+                if window.stop_mode != "current" and window.stop != "CURRENT ROW"
+                else ""
+            )
+            if isinstance(window.start, int) and window.start == -1:
+                window.start = "UNBOUNDED"
 
-            if stop_mode == '' and window.stop == 0:
-                window.stop = 'CURRENT ROW'
+            if stop_mode == "" and window.stop == 0:
+                window.stop = "CURRENT ROW"
             window_str = f"{mode} BETWEEN {window.start} {start_mode} AND {window.stop} {stop_mode}"
 
         # Partitioning
         if len(partitioning) > 0:
-            partition = "PARTITION BY " + ', '.join(partitioning)
+            partition = "PARTITION BY " + ", ".join(partitioning)
         else:
             partition = ""
 
@@ -143,7 +174,7 @@ class Analytic(Operator.Unary):
             elif cls.op == RATIO_TO_REPORT:
                 measure_query = f"CAST({measure} AS REAL) / SUM(CAST({measure} AS REAL))"
             elif cls.op in [LAG, LEAD]:
-                measure_query = f"{cls.sql_op}({measure}, {','.join(map(str, params))})"
+                measure_query = f"{cls.sql_op}({measure}, {','.join(map(str, params or []))})"
             else:
                 measure_query = f"{cls.sql_op}({measure})"
             if cls.op == COUNT and len(measure_names) == 1:
@@ -153,33 +184,42 @@ class Analytic(Operator.Unary):
             measure_queries.append(measure_query)
         if cls.op == COUNT and len(measure_names) == 0:
             measure_queries.append(
-                f"COUNT(*) {analytic_str} as {COMP_NAME_MAPPING[cls.return_type]}")
+                f"COUNT(*) {analytic_str} as {COMP_NAME_MAPPING[cls.return_type]}"
+            )
 
-        measures_sql = ', '.join(measure_queries)
-        identifiers_sql = ', '.join(identifier_names)
+        measures_sql = ", ".join(measure_queries)
+        identifiers_sql = ", ".join(identifier_names)
         query = f"SELECT {identifiers_sql} , {measures_sql} FROM df"
 
         if cls.op == COUNT:
             df[measure_names] = df[measure_names].fillna(-1)
-        if os.getenv("SPARK", False):
-            df = df.to_pandas()
+        # if os.getenv("SPARK", False):
+        #     df = df.to_pandas()
         return duckdb.query(query).to_df()
 
     @classmethod
-    def evaluate(cls, operand: Dataset,
-                 partitioning: List[str],
-                 ordering: Optional[List[OrderBy]],
-                 window: Optional[Windowing],
-                 params: Optional[List[int]]) -> Dataset:
+    def evaluate(  # type: ignore[override]
+        cls,
+        operand: Dataset,
+        partitioning: List[str],
+        ordering: Optional[List[OrderBy]],
+        window: Optional[Windowing],
+        params: Optional[List[int]],
+    ) -> Dataset:
         result = cls.validate(operand, partitioning, ordering, window, params)
-        df = operand.data.copy()
+        df = operand.data.copy() if operand.data is not None else pd.DataFrame()
         measure_names = operand.get_measures_names()
         identifier_names = operand.get_identifiers_names()
 
-        result.data = cls.analyticfunc(df=df, partitioning=partitioning,
-                                       identifier_names=identifier_names,
-                                       measure_names=measure_names,
-                                       ordering=ordering, window=window, params=params)
+        result.data = cls.analyticfunc(
+            df=df,
+            partitioning=partitioning,
+            identifier_names=identifier_names,
+            measure_names=measure_names,
+            ordering=ordering or [],
+            window=window,
+            params=params,
+        )
         return result
 
 
@@ -187,6 +227,7 @@ class Max(Analytic):
     """
     Max operator
     """
+
     op = MAX
     sql_op = "MAX"
 
@@ -195,6 +236,7 @@ class Min(Analytic):
     """
     Min operator
     """
+
     op = MIN
     sql_op = "MIN"
 
@@ -203,6 +245,7 @@ class Sum(Analytic):
     """
     Sum operator
     """
+
     op = SUM
     type_to_check = Number
     return_type = Number
@@ -213,6 +256,7 @@ class Count(Analytic):
     """
     Count operator
     """
+
     op = COUNT
     type_to_check = None
     return_type = Integer
@@ -223,6 +267,7 @@ class Avg(Analytic):
     """
     Average operator
     """
+
     op = AVG
     type_to_check = Number
     return_type = Number
@@ -233,6 +278,7 @@ class Median(Analytic):
     """
     Median operator
     """
+
     op = MEDIAN
     type_to_check = Number
     return_type = Number
@@ -243,6 +289,7 @@ class PopulationStandardDeviation(Analytic):
     """
     Population deviation operator
     """
+
     op = STDDEV_POP
     type_to_check = Number
     return_type = Number
@@ -253,6 +300,7 @@ class SampleStandardDeviation(Analytic):
     """
     Sample standard deviation operator.
     """
+
     op = STDDEV_SAMP
     type_to_check = Number
     return_type = Number
@@ -263,6 +311,7 @@ class PopulationVariance(Analytic):
     """
     Variance operator
     """
+
     op = VAR_POP
     type_to_check = Number
     return_type = Number
@@ -273,6 +322,7 @@ class SampleVariance(Analytic):
     """
     Sample variance operator
     """
+
     op = VAR_SAMP
     type_to_check = Number
     return_type = Number
@@ -283,6 +333,7 @@ class FirstValue(Analytic):
     """
     First value operator
     """
+
     op = FIRST_VALUE
     sql_op = "FIRST"
 
@@ -291,6 +342,7 @@ class LastValue(Analytic):
     """
     Last value operator
     """
+
     op = LAST_VALUE
     sql_op = "LAST"
 
@@ -299,6 +351,7 @@ class Lag(Analytic):
     """
     Lag operator
     """
+
     op = LAG
     sql_op = "LAG"
 
@@ -307,6 +360,7 @@ class Lead(Analytic):
     """
     Lead operator
     """
+
     op = LEAD
     sql_op = "LEAD"
 
@@ -315,6 +369,7 @@ class Rank(Analytic):
     """
     Rank operator
     """
+
     op = RANK
     sql_op = "RANK"
     return_type = Integer
@@ -324,6 +379,7 @@ class RatioToReport(Analytic):
     """
     Ratio operator
     """
+
     op = RATIO_TO_REPORT
     type_to_check = Number
     return_type = Number

vtlengine/Operators/Assignment.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Union, Any
 
 from vtlengine.Operators import Binary
 
@@ -11,12 +11,15 @@ ALL_MODEL_TYPES = Union[DataComponent, Dataset]
 class Assignment(Binary):
 
     @classmethod
-    def validate(cls, left_operand: str, right_operand: ALL_MODEL_TYPES) -> ALL_MODEL_TYPES:
-        if isinstance(right_operand, DataComponent) and right_operand.role == "IDENTIFIER":
+    def validate(cls, left_operand: Any, right_operand: Any) -> ALL_MODEL_TYPES:
+        if (
+            isinstance(right_operand, DataComponent)
+            and right_operand.role.__str__() == "IDENTIFIER"
+        ):
             raise SemanticError("1-1-6-13", op=cls.op, comp_name=right_operand.name)
         right_operand.name = left_operand
         return right_operand
 
     @classmethod
-    def evaluate(cls, left_operand: str, right_operand: ALL_MODEL_TYPES) -> ALL_MODEL_TYPES:
+    def evaluate(cls, left_operand: Any, right_operand: Any) -> ALL_MODEL_TYPES:
         return cls.validate(left_operand, right_operand)

vtlengine/Operators/Boolean.py

@@ -1,11 +1,8 @@
-import os
-
-import numba
-
-if os.environ.get("SPARK", False):
-    import pyspark.pandas as pd
-else:
-    import pandas as pd
+# if os.environ.get("SPARK", False):
+#     import pyspark.pandas as pd
+# else:
+#     import pandas as pd
+import pandas as pd
 
 from typing import Optional, Any
 
@@ -22,22 +19,20 @@ class Unary(Operator.Unary):
 class Binary(Operator.Binary):
     type_to_check = Boolean
     return_type = Boolean
-    comp_op = None
+    comp_op: Any = None
 
     @classmethod
-    def apply_operation_series_scalar(cls, series: pd.Series, scalar: Any,
-                                      series_left: bool) -> Any:
+    def apply_operation_series_scalar(cls, series: Any, scalar: Any, series_left: bool) -> Any:
         if series_left:
             return series.map(lambda x: cls.py_op(x, scalar))
         else:
             return series.map(lambda x: cls.py_op(scalar, x))
 
     @classmethod
-    def apply_operation_two_series(cls,
-                                   left_series: Any,
-                                   right_series: Any) -> Any:
-        result = cls.comp_op(left_series.astype('bool[pyarrow]'),
-                             right_series.astype('bool[pyarrow]'))
+    def apply_operation_two_series(cls, left_series: Any, right_series: Any) -> Any:
+        result = cls.comp_op(
+            left_series.astype("bool[pyarrow]"), right_series.astype("bool[pyarrow]")
+        )
         return result.replace({pd.NA: None}).astype(object)
 
     @classmethod
@@ -50,7 +45,7 @@ class And(Binary):
     comp_op = pd.Series.__and__
 
     @staticmethod
-    @numba.njit
+    # @numba.njit
     def py_op(x: Optional[bool], y: Optional[bool]) -> Optional[bool]:
         if (x is None and y == False) or (x == False and y is None):
             return False
@@ -58,9 +53,9 @@ class And(Binary):
             return None
         return x and y
 
-    @classmethod
-    def spark_op(cls, x: pd.Series, y: pd.Series) -> pd.Series:
-        return x & y
+    # @classmethod
+    # def spark_op(cls, x: pd.Series, y: pd.Series) -> pd.Series:
+    #     return x & y
 
 
 class Or(Binary):
@@ -68,7 +63,7 @@ class Or(Binary):
     comp_op = pd.Series.__or__
 
     @staticmethod
-    @numba.njit
+    # @numba.njit
     def py_op(x: Optional[bool], y: Optional[bool]) -> Optional[bool]:
         if (x is None and y == True) or (x == True and y is None):
             return True
@@ -76,9 +71,9 @@ class Or(Binary):
             return None
         return x or y
 
-    @classmethod
-    def spark_op(cls, x: pd.Series, y: pd.Series) -> pd.Series:
-        return x | y
+    # @classmethod
+    # def spark_op(cls, x: pd.Series, y: pd.Series) -> pd.Series:
+    #     return x | y
 
 
 class Xor(Binary):
@@ -91,23 +86,23 @@ class Xor(Binary):
             return None
         return (x and not y) or (not x and y)
 
-    @classmethod
-    def spark_op(cls, x: pd.Series, y: pd.Series) -> pd.Series:
-        return x ^ y
+    # @classmethod
+    # def spark_op(cls, x: pd.Series, y: pd.Series) -> pd.Series:
+    #     return x ^ y
 
 
 class Not(Unary):
     op = NOT
 
     @staticmethod
-    @numba.njit
+    # @numba.njit
     def py_op(x: Optional[bool]) -> Optional[bool]:
         return None if x is None else not x
 
-    @classmethod
-    def spark_op(cls, series: pd.Series) -> pd.Series:
-        return ~series
+    # @classmethod
+    # def spark_op(cls, series: pd.Series) -> pd.Series:
+    #     return ~series
 
     @classmethod
     def apply_operation_component(cls, series: Any) -> Any:
-        return series.map(lambda x: not x, na_action='ignore')
+        return series.map(lambda x: not x, na_action="ignore")