pylegend 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

pylegend/core/language/shared/helpers.py

@@ -24,8 +24,7 @@ __all__ = [
 def generate_pure_functional_call(
         func: str,
         params: PyLegendList[str],
-        force_prefix: bool = False,
-        auto_map: bool = False
+        force_prefix: bool = False
 ) -> str:
     should_prefix = force_prefix or (len(params) == 0)
 
@@ -39,13 +38,6 @@ def generate_pure_functional_call(
         else:
             updated_params.append(param)
 
-    if auto_map and len(updated_params) == 1:
-        return f"{params[0]}->map(op | {generate_pure_functional_call(func, ['$op'], force_prefix, False)})"
-
-    if auto_map and len(updated_params) == 2:
-        new_params = ['$op'] + [updated_params[1]]
-        return f"{params[0]}->map(op | {generate_pure_functional_call(func, new_params, force_prefix, False)})"
-
     if should_prefix:
         return f"{func}({', '.join(updated_params)})"
     else:

pylegend/core/language/shared/operations/binary_expression.py

@@ -43,6 +43,9 @@ class PyLegendBinaryExpression(PyLegendExpression, metaclass=ABCMeta):
         Expression
     ]
     __to_pure_func: PyLegendCallable[[str, str, FrameToPureConfig], str]
+    __non_nullable: bool
+    __first_operand_needs_to_be_non_nullable: bool
+    __second_operand_needs_to_be_non_nullable: bool
 
     def __init__(
             self,
@@ -52,12 +55,18 @@ class PyLegendBinaryExpression(PyLegendExpression, metaclass=ABCMeta):
                 [Expression, Expression, PyLegendDict[str, QuerySpecification], FrameToSqlConfig],
                 Expression
             ],
-            to_pure_func: PyLegendCallable[[str, str, FrameToPureConfig], str]
+            to_pure_func: PyLegendCallable[[str, str, FrameToPureConfig], str],
+            non_nullable: bool = False,
+            first_operand_needs_to_be_non_nullable: bool = False,
+            second_operand_needs_to_be_non_nullable: bool = False,
     ) -> None:
         self.__operand1 = operand1
         self.__operand2 = operand2
         self.__to_sql_func = to_sql_func
         self.__to_pure_func = to_pure_func
+        self.__non_nullable = non_nullable
+        self.__first_operand_needs_to_be_non_nullable = first_operand_needs_to_be_non_nullable
+        self.__second_operand_needs_to_be_non_nullable = second_operand_needs_to_be_non_nullable
 
     def to_sql_expression(
             self,
@@ -75,27 +84,18 @@ class PyLegendBinaryExpression(PyLegendExpression, metaclass=ABCMeta):
 
     def to_pure_expression(self, config: FrameToPureConfig) -> str:
         op1_expr = self.__operand1.to_pure_expression(config)
+        if self.__first_operand_needs_to_be_non_nullable:
+            op1_expr = (
+                op1_expr if self.__operand1.is_non_nullable() else
+                f"toOne({op1_expr[1:-1] if expr_has_matching_start_and_end_parentheses(op1_expr) else op1_expr})"
+            )
         op2_expr = self.__operand2.to_pure_expression(config)
+        if self.__second_operand_needs_to_be_non_nullable:
+            op2_expr = (
+                op2_expr if self.__operand2.is_non_nullable() else
+                f"toOne({op2_expr[1:-1] if expr_has_matching_start_and_end_parentheses(op2_expr) else op2_expr})"
+            )
         return self.__to_pure_func(op1_expr, op2_expr, config)
 
-    def to_pure_expression_with_to_one_on_both_operands(self, config: FrameToPureConfig) -> str:
-        op1_expr = self.__operand1.to_pure_expression(config)
-        op1_expr = (
-            op1_expr if self.__operand1.is_non_nullable() else
-            f"toOne({op1_expr[1:-1] if expr_has_matching_start_and_end_parentheses(op1_expr) else op1_expr})"
-        )
-        op2_expr = self.__operand2.to_pure_expression(config)
-        op2_expr = (
-            op2_expr if self.__operand2.is_non_nullable() else
-            f"toOne({op2_expr[1:-1] if expr_has_matching_start_and_end_parentheses(op2_expr) else op2_expr})"
-        )
-        return self.__to_pure_func(op1_expr, op2_expr, config)
-
-    def to_pure_expression_with_to_one_on_second_operand(self, config: FrameToPureConfig) -> str:
-        op1_expr = self.__operand1.to_pure_expression(config)
-        op2_expr = self.__operand2.to_pure_expression(config)
-        op2_expr = (
-            op2_expr if self.__operand2.is_non_nullable() else
-            f"toOne({op2_expr[1:-1] if expr_has_matching_start_and_end_parentheses(op2_expr) else op2_expr})"
-        )
-        return self.__to_pure_func(op1_expr, op2_expr, config)
+    def is_non_nullable(self) -> bool:
+        return self.__non_nullable

pylegend/core/language/shared/operations/boolean_operation_expressions.py

@@ -19,6 +19,7 @@ from pylegend._typing import (
 from pylegend.core.language.shared.expression import (
     PyLegendExpressionBooleanReturn,
 )
+from pylegend.core.language.shared.helpers import generate_pure_functional_call
 from pylegend.core.language.shared.operations.binary_expression import PyLegendBinaryExpression
 from pylegend.core.language.shared.operations.unary_expression import PyLegendUnaryExpression
 from pylegend.core.sql.metamodel import (
@@ -61,15 +62,12 @@ class PyLegendBooleanOrExpression(PyLegendBinaryExpression, PyLegendExpressionBo
             operand1,
             operand2,
             PyLegendBooleanOrExpression.__to_sql_func,
-            PyLegendBooleanOrExpression.__to_pure_func
+            PyLegendBooleanOrExpression.__to_pure_func,
+            non_nullable=True,
+            first_operand_needs_to_be_non_nullable=True,
+            second_operand_needs_to_be_non_nullable=True
         )
 
-    def is_non_nullable(self) -> bool:
-        return True
-
-    def to_pure_expression(self, config: FrameToPureConfig) -> str:
-        return PyLegendBinaryExpression.to_pure_expression_with_to_one_on_both_operands(self, config)
-
 
 class PyLegendBooleanAndExpression(PyLegendBinaryExpression, PyLegendExpressionBooleanReturn):
 
@@ -93,15 +91,12 @@ class PyLegendBooleanAndExpression(PyLegendBinaryExpression, PyLegendExpressionB
             operand1,
             operand2,
             PyLegendBooleanAndExpression.__to_sql_func,
-            PyLegendBooleanAndExpression.__to_pure_func
+            PyLegendBooleanAndExpression.__to_pure_func,
+            non_nullable=True,
+            first_operand_needs_to_be_non_nullable=True,
+            second_operand_needs_to_be_non_nullable=True
         )
 
-    def is_non_nullable(self) -> bool:
-        return True
-
-    def to_pure_expression(self, config: FrameToPureConfig) -> str:
-        return PyLegendBinaryExpression.to_pure_expression_with_to_one_on_both_operands(self, config)
-
 
 class PyLegendBooleanNotExpression(PyLegendUnaryExpression, PyLegendExpressionBooleanReturn):
 
@@ -115,7 +110,7 @@ class PyLegendBooleanNotExpression(PyLegendUnaryExpression, PyLegendExpressionBo
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return f"{op_expr}->map(op | !$op)"
+        return generate_pure_functional_call("not", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionBooleanReturn) -> None:
         PyLegendExpressionBooleanReturn.__init__(self)
@@ -123,5 +118,7 @@ class PyLegendBooleanNotExpression(PyLegendUnaryExpression, PyLegendExpressionBo
             self,
             operand,
             PyLegendBooleanNotExpression.__to_sql_func,
-            PyLegendBooleanNotExpression.__to_pure_func
+            PyLegendBooleanNotExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )

pylegend/core/language/shared/operations/date_operation_expressions.py

@@ -106,7 +106,7 @@ class PyLegendFirstDayOfYearExpression(PyLegendUnaryExpression, PyLegendExpressi
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("firstDayOfYear", [op_expr], auto_map=True)
+        return generate_pure_functional_call("firstDayOfYear", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionDateReturn.__init__(self)
@@ -114,7 +114,9 @@ class PyLegendFirstDayOfYearExpression(PyLegendUnaryExpression, PyLegendExpressi
             self,
             operand,
             PyLegendFirstDayOfYearExpression.__to_sql_func,
-            PyLegendFirstDayOfYearExpression.__to_pure_func
+            PyLegendFirstDayOfYearExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -130,7 +132,7 @@ class PyLegendFirstDayOfQuarterExpression(PyLegendUnaryExpression, PyLegendExpre
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("firstDayOfQuarter", [op_expr], auto_map=True)
+        return generate_pure_functional_call("firstDayOfQuarter", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionDateReturn.__init__(self)
@@ -138,7 +140,9 @@ class PyLegendFirstDayOfQuarterExpression(PyLegendUnaryExpression, PyLegendExpre
             self,
             operand,
             PyLegendFirstDayOfQuarterExpression.__to_sql_func,
-            PyLegendFirstDayOfQuarterExpression.__to_pure_func
+            PyLegendFirstDayOfQuarterExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -154,7 +158,7 @@ class PyLegendFirstDayOfMonthExpression(PyLegendUnaryExpression, PyLegendExpress
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("firstDayOfMonth", [op_expr], auto_map=True)
+        return generate_pure_functional_call("firstDayOfMonth", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionDateReturn.__init__(self)
@@ -162,7 +166,9 @@ class PyLegendFirstDayOfMonthExpression(PyLegendUnaryExpression, PyLegendExpress
             self,
             operand,
             PyLegendFirstDayOfMonthExpression.__to_sql_func,
-            PyLegendFirstDayOfMonthExpression.__to_pure_func
+            PyLegendFirstDayOfMonthExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -178,7 +184,7 @@ class PyLegendFirstDayOfWeekExpression(PyLegendUnaryExpression, PyLegendExpressi
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("firstDayOfWeek", [op_expr], auto_map=True)
+        return generate_pure_functional_call("firstDayOfWeek", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionDateReturn.__init__(self)
@@ -186,7 +192,9 @@ class PyLegendFirstDayOfWeekExpression(PyLegendUnaryExpression, PyLegendExpressi
             self,
             operand,
             PyLegendFirstDayOfWeekExpression.__to_sql_func,
-            PyLegendFirstDayOfWeekExpression.__to_pure_func
+            PyLegendFirstDayOfWeekExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -202,7 +210,7 @@ class PyLegendFirstHourOfDayExpression(PyLegendUnaryExpression, PyLegendExpressi
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("firstHourOfDay", [op_expr], auto_map=True)
+        return generate_pure_functional_call("firstHourOfDay", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionDateTimeReturn.__init__(self)
@@ -210,7 +218,9 @@ class PyLegendFirstHourOfDayExpression(PyLegendUnaryExpression, PyLegendExpressi
             self,
             operand,
             PyLegendFirstHourOfDayExpression.__to_sql_func,
-            PyLegendFirstHourOfDayExpression.__to_pure_func
+            PyLegendFirstHourOfDayExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -226,7 +236,7 @@ class PyLegendFirstMinuteOfHourExpression(PyLegendUnaryExpression, PyLegendExpre
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("firstMinuteOfHour", [op_expr], auto_map=True)
+        return generate_pure_functional_call("firstMinuteOfHour", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionDateTimeReturn.__init__(self)
@@ -234,7 +244,9 @@ class PyLegendFirstMinuteOfHourExpression(PyLegendUnaryExpression, PyLegendExpre
             self,
             operand,
             PyLegendFirstMinuteOfHourExpression.__to_sql_func,
-            PyLegendFirstMinuteOfHourExpression.__to_pure_func
+            PyLegendFirstMinuteOfHourExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -250,7 +262,7 @@ class PyLegendFirstSecondOfMinuteExpression(PyLegendUnaryExpression, PyLegendExp
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("firstSecondOfMinute", [op_expr], auto_map=True)
+        return generate_pure_functional_call("firstSecondOfMinute", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionDateTimeReturn.__init__(self)
@@ -258,7 +270,9 @@ class PyLegendFirstSecondOfMinuteExpression(PyLegendUnaryExpression, PyLegendExp
             self,
             operand,
             PyLegendFirstSecondOfMinuteExpression.__to_sql_func,
-            PyLegendFirstSecondOfMinuteExpression.__to_pure_func
+            PyLegendFirstSecondOfMinuteExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -274,7 +288,7 @@ class PyLegendFirstMillisecondOfSecondExpression(PyLegendUnaryExpression, PyLege
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("firstMillisecondOfSecond", [op_expr], auto_map=True)
+        return generate_pure_functional_call("firstMillisecondOfSecond", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionDateTimeReturn.__init__(self)
@@ -282,7 +296,9 @@ class PyLegendFirstMillisecondOfSecondExpression(PyLegendUnaryExpression, PyLege
             self,
             operand,
             PyLegendFirstMillisecondOfSecondExpression.__to_sql_func,
-            PyLegendFirstMillisecondOfSecondExpression.__to_pure_func
+            PyLegendFirstMillisecondOfSecondExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -298,7 +314,7 @@ class PyLegendYearExpression(PyLegendUnaryExpression, PyLegendExpressionIntegerR
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("year", [op_expr], auto_map=True)
+        return generate_pure_functional_call("year", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -306,7 +322,9 @@ class PyLegendYearExpression(PyLegendUnaryExpression, PyLegendExpressionIntegerR
             self,
             operand,
             PyLegendYearExpression.__to_sql_func,
-            PyLegendYearExpression.__to_pure_func
+            PyLegendYearExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -322,7 +340,7 @@ class PyLegendQuarterExpression(PyLegendUnaryExpression, PyLegendExpressionInteg
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("quarter", [op_expr], auto_map=True)
+        return generate_pure_functional_call("quarter", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -330,7 +348,9 @@ class PyLegendQuarterExpression(PyLegendUnaryExpression, PyLegendExpressionInteg
             self,
             operand,
             PyLegendQuarterExpression.__to_sql_func,
-            PyLegendQuarterExpression.__to_pure_func
+            PyLegendQuarterExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -346,7 +366,7 @@ class PyLegendMonthExpression(PyLegendUnaryExpression, PyLegendExpressionInteger
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("month", [op_expr], auto_map=True)
+        return generate_pure_functional_call("month", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -354,7 +374,9 @@ class PyLegendMonthExpression(PyLegendUnaryExpression, PyLegendExpressionInteger
             self,
             operand,
             PyLegendMonthExpression.__to_sql_func,
-            PyLegendMonthExpression.__to_pure_func
+            PyLegendMonthExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -370,7 +392,7 @@ class PyLegendWeekOfYearExpression(PyLegendUnaryExpression, PyLegendExpressionIn
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("weekOfYear", [op_expr], auto_map=True)
+        return generate_pure_functional_call("weekOfYear", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -378,7 +400,9 @@ class PyLegendWeekOfYearExpression(PyLegendUnaryExpression, PyLegendExpressionIn
             self,
             operand,
             PyLegendWeekOfYearExpression.__to_sql_func,
-            PyLegendWeekOfYearExpression.__to_pure_func
+            PyLegendWeekOfYearExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -394,7 +418,7 @@ class PyLegendDayOfYearExpression(PyLegendUnaryExpression, PyLegendExpressionInt
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("dayOfYear", [op_expr], auto_map=True)
+        return generate_pure_functional_call("dayOfYear", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -402,7 +426,9 @@ class PyLegendDayOfYearExpression(PyLegendUnaryExpression, PyLegendExpressionInt
             self,
             operand,
             PyLegendDayOfYearExpression.__to_sql_func,
-            PyLegendDayOfYearExpression.__to_pure_func
+            PyLegendDayOfYearExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -418,7 +444,7 @@ class PyLegendDayOfMonthExpression(PyLegendUnaryExpression, PyLegendExpressionIn
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("dayOfMonth", [op_expr], auto_map=True)
+        return generate_pure_functional_call("dayOfMonth", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -426,7 +452,9 @@ class PyLegendDayOfMonthExpression(PyLegendUnaryExpression, PyLegendExpressionIn
             self,
             operand,
             PyLegendDayOfMonthExpression.__to_sql_func,
-            PyLegendDayOfMonthExpression.__to_pure_func
+            PyLegendDayOfMonthExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -442,7 +470,7 @@ class PyLegendDayOfWeekExpression(PyLegendUnaryExpression, PyLegendExpressionInt
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("dayOfWeekNumber", [op_expr], auto_map=True)
+        return generate_pure_functional_call("dayOfWeekNumber", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -450,7 +478,9 @@ class PyLegendDayOfWeekExpression(PyLegendUnaryExpression, PyLegendExpressionInt
             self,
             operand,
             PyLegendDayOfWeekExpression.__to_sql_func,
-            PyLegendDayOfWeekExpression.__to_pure_func
+            PyLegendDayOfWeekExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -466,7 +496,7 @@ class PyLegendHourExpression(PyLegendUnaryExpression, PyLegendExpressionIntegerR
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("hour", [op_expr], auto_map=True)
+        return generate_pure_functional_call("hour", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -474,7 +504,9 @@ class PyLegendHourExpression(PyLegendUnaryExpression, PyLegendExpressionIntegerR
             self,
             operand,
             PyLegendHourExpression.__to_sql_func,
-            PyLegendHourExpression.__to_pure_func
+            PyLegendHourExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -490,7 +522,7 @@ class PyLegendMinuteExpression(PyLegendUnaryExpression, PyLegendExpressionIntege
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("minute", [op_expr], auto_map=True)
+        return generate_pure_functional_call("minute", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -498,7 +530,9 @@ class PyLegendMinuteExpression(PyLegendUnaryExpression, PyLegendExpressionIntege
             self,
             operand,
             PyLegendMinuteExpression.__to_sql_func,
-            PyLegendMinuteExpression.__to_pure_func
+            PyLegendMinuteExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -514,7 +548,7 @@ class PyLegendSecondExpression(PyLegendUnaryExpression, PyLegendExpressionIntege
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("second", [op_expr], auto_map=True)
+        return generate_pure_functional_call("second", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -522,7 +556,9 @@ class PyLegendSecondExpression(PyLegendUnaryExpression, PyLegendExpressionIntege
             self,
             operand,
             PyLegendSecondExpression.__to_sql_func,
-            PyLegendSecondExpression.__to_pure_func
+            PyLegendSecondExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -538,7 +574,7 @@ class PyLegendEpochExpression(PyLegendUnaryExpression, PyLegendExpressionInteger
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("toEpochValue", [op_expr], auto_map=True)
+        return generate_pure_functional_call("toEpochValue", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionDateReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -546,7 +582,9 @@ class PyLegendEpochExpression(PyLegendUnaryExpression, PyLegendExpressionInteger
             self,
             operand,
             PyLegendEpochExpression.__to_sql_func,
-            PyLegendEpochExpression.__to_pure_func
+            PyLegendEpochExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -568,7 +606,8 @@ class PyLegendTodayExpression(PyLegendNullaryExpression, PyLegendExpressionStric
         PyLegendNullaryExpression.__init__(
             self,
             PyLegendTodayExpression.__to_sql_func,
-            PyLegendTodayExpression.__to_pure_func
+            PyLegendTodayExpression.__to_pure_func,
+            non_nullable=True
         )
 
 
@@ -590,7 +629,8 @@ class PyLegendNowExpression(PyLegendNullaryExpression, PyLegendExpressionDateTim
         PyLegendNullaryExpression.__init__(
             self,
             PyLegendNowExpression.__to_sql_func,
-            PyLegendNowExpression.__to_pure_func
+            PyLegendNowExpression.__to_pure_func,
+            non_nullable=True
         )
 
 
@@ -609,7 +649,7 @@ class PyLegendDatePartExpression(PyLegendUnaryExpression, PyLegendExpressionStri
         return generate_pure_functional_call(
             "cast",
             [
-                generate_pure_functional_call("datePart", [op_expr], auto_map=True),
+                generate_pure_functional_call("datePart", [op_expr]),
                 "@StrictDate",
             ]
         )
@@ -620,7 +660,9 @@ class PyLegendDatePartExpression(PyLegendUnaryExpression, PyLegendExpressionStri
             self,
             operand,
             PyLegendDatePartExpression.__to_sql_func,
-            PyLegendDatePartExpression.__to_pure_func
+            PyLegendDatePartExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 

pylegend/core/language/shared/operations/float_operation_expressions.py

@@ -67,15 +67,12 @@ class PyLegendFloatAddExpression(PyLegendBinaryExpression, PyLegendExpressionFlo
             operand1,
             operand2,
             PyLegendFloatAddExpression.__to_sql_func,
-            PyLegendFloatAddExpression.__to_pure_func
+            PyLegendFloatAddExpression.__to_pure_func,
+            non_nullable=True,
+            first_operand_needs_to_be_non_nullable=True,
+            second_operand_needs_to_be_non_nullable=True
         )
 
-    def is_non_nullable(self) -> bool:
-        return True
-
-    def to_pure_expression(self, config: FrameToPureConfig) -> str:
-        return PyLegendBinaryExpression.to_pure_expression_with_to_one_on_both_operands(self, config)
-
 
 class PyLegendFloatSubtractExpression(PyLegendBinaryExpression, PyLegendExpressionFloatReturn):
 
@@ -99,15 +96,12 @@ class PyLegendFloatSubtractExpression(PyLegendBinaryExpression, PyLegendExpressi
             operand1,
             operand2,
             PyLegendFloatSubtractExpression.__to_sql_func,
-            PyLegendFloatSubtractExpression.__to_pure_func
+            PyLegendFloatSubtractExpression.__to_pure_func,
+            non_nullable=True,
+            first_operand_needs_to_be_non_nullable=True,
+            second_operand_needs_to_be_non_nullable=True
         )
 
-    def is_non_nullable(self) -> bool:
-        return True
-
-    def to_pure_expression(self, config: FrameToPureConfig) -> str:
-        return PyLegendBinaryExpression.to_pure_expression_with_to_one_on_both_operands(self, config)
-
 
 class PyLegendFloatMultiplyExpression(PyLegendBinaryExpression, PyLegendExpressionFloatReturn):
 
@@ -131,15 +125,12 @@ class PyLegendFloatMultiplyExpression(PyLegendBinaryExpression, PyLegendExpressi
             operand1,
             operand2,
             PyLegendFloatMultiplyExpression.__to_sql_func,
-            PyLegendFloatMultiplyExpression.__to_pure_func
+            PyLegendFloatMultiplyExpression.__to_pure_func,
+            non_nullable=True,
+            first_operand_needs_to_be_non_nullable=True,
+            second_operand_needs_to_be_non_nullable=True
         )
 
-    def is_non_nullable(self) -> bool:
-        return True
-
-    def to_pure_expression(self, config: FrameToPureConfig) -> str:
-        return PyLegendBinaryExpression.to_pure_expression_with_to_one_on_both_operands(self, config)
-
 
 class PyLegendFloatAbsoluteExpression(PyLegendUnaryExpression, PyLegendExpressionFloatReturn):
 
@@ -153,7 +144,7 @@ class PyLegendFloatAbsoluteExpression(PyLegendUnaryExpression, PyLegendExpressio
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("abs", [op_expr], auto_map=True)
+        return generate_pure_functional_call("abs", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionFloatReturn) -> None:
         PyLegendExpressionFloatReturn.__init__(self)
@@ -161,7 +152,9 @@ class PyLegendFloatAbsoluteExpression(PyLegendUnaryExpression, PyLegendExpressio
             self,
             operand,
             PyLegendFloatAbsoluteExpression.__to_sql_func,
-            PyLegendFloatAbsoluteExpression.__to_pure_func
+            PyLegendFloatAbsoluteExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True
         )
 
 
@@ -177,7 +170,7 @@ class PyLegendFloatNegativeExpression(PyLegendUnaryExpression, PyLegendExpressio
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("minus", [op_expr], auto_map=True)
+        return generate_pure_functional_call("minus", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionFloatReturn) -> None:
         PyLegendExpressionFloatReturn.__init__(self)
@@ -185,5 +178,7 @@ class PyLegendFloatNegativeExpression(PyLegendUnaryExpression, PyLegendExpressio
             self,
             operand,
             PyLegendFloatNegativeExpression.__to_sql_func,
-            PyLegendFloatNegativeExpression.__to_pure_func
+            PyLegendFloatNegativeExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )