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

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

@@ -65,12 +65,10 @@ class PyLegendPrimitiveEqualsExpression(PyLegendBinaryExpression, PyLegendExpres
             operand1,
             operand2,
             PyLegendPrimitiveEqualsExpression.__to_sql_func,
-            PyLegendPrimitiveEqualsExpression.__to_pure_func
+            PyLegendPrimitiveEqualsExpression.__to_pure_func,
+            non_nullable=True,
         )
 
-    def is_non_nullable(self) -> bool:
-        return True
-
 
 class PyLegendPrimitiveNotEqualsExpression(PyLegendBinaryExpression, PyLegendExpressionBooleanReturn):
 
@@ -94,12 +92,10 @@ class PyLegendPrimitiveNotEqualsExpression(PyLegendBinaryExpression, PyLegendExp
             operand1,
             operand2,
             PyLegendPrimitiveNotEqualsExpression.__to_sql_func,
-            PyLegendPrimitiveNotEqualsExpression.__to_pure_func
+            PyLegendPrimitiveNotEqualsExpression.__to_pure_func,
+            non_nullable=True,
         )
 
-    def is_non_nullable(self) -> bool:
-        return True
-
 
 class PyLegendIsEmptyExpression(PyLegendUnaryExpression, PyLegendExpressionBooleanReturn):
 
@@ -121,12 +117,10 @@ class PyLegendIsEmptyExpression(PyLegendUnaryExpression, PyLegendExpressionBoole
             self,
             operand,
             PyLegendIsEmptyExpression.__to_sql_func,
-            PyLegendIsEmptyExpression.__to_pure_func
+            PyLegendIsEmptyExpression.__to_pure_func,
+            non_nullable=True,
         )
 
-    def is_non_nullable(self) -> bool:
-        return True
-
 
 class PyLegendIsNotEmptyExpression(PyLegendUnaryExpression, PyLegendExpressionBooleanReturn):
 
@@ -148,8 +142,6 @@ class PyLegendIsNotEmptyExpression(PyLegendUnaryExpression, PyLegendExpressionBo
             self,
             operand,
             PyLegendIsNotEmptyExpression.__to_sql_func,
-            PyLegendIsNotEmptyExpression.__to_pure_func
+            PyLegendIsNotEmptyExpression.__to_pure_func,
+            non_nullable=True,
         )
-
-    def is_non_nullable(self) -> bool:
-        return True

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

@@ -84,7 +84,7 @@ class PyLegendStringLengthExpression(PyLegendUnaryExpression, PyLegendExpression
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("length", [op_expr], auto_map=True)
+        return generate_pure_functional_call("length", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -92,7 +92,9 @@ class PyLegendStringLengthExpression(PyLegendUnaryExpression, PyLegendExpression
             self,
             operand,
             PyLegendStringLengthExpression.__to_sql_func,
-            PyLegendStringLengthExpression.__to_pure_func
+            PyLegendStringLengthExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )
 
 
@@ -192,7 +194,7 @@ class PyLegendStringUpperExpression(PyLegendUnaryExpression, PyLegendExpressionS
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("toUpper", [op_expr], auto_map=True)
+        return generate_pure_functional_call("toUpper", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionStringReturn.__init__(self)
@@ -200,7 +202,9 @@ class PyLegendStringUpperExpression(PyLegendUnaryExpression, PyLegendExpressionS
             self,
             operand,
             PyLegendStringUpperExpression.__to_sql_func,
-            PyLegendStringUpperExpression.__to_pure_func
+            PyLegendStringUpperExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )
 
 
@@ -216,7 +220,7 @@ class PyLegendStringLowerExpression(PyLegendUnaryExpression, PyLegendExpressionS
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("toLower", [op_expr], auto_map=True)
+        return generate_pure_functional_call("toLower", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionStringReturn.__init__(self)
@@ -224,7 +228,9 @@ class PyLegendStringLowerExpression(PyLegendUnaryExpression, PyLegendExpressionS
             self,
             operand,
             PyLegendStringLowerExpression.__to_sql_func,
-            PyLegendStringLowerExpression.__to_pure_func
+            PyLegendStringLowerExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )
 
 
@@ -240,7 +246,7 @@ class PyLegendStringLTrimExpression(PyLegendUnaryExpression, PyLegendExpressionS
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("ltrim", [op_expr], auto_map=True)
+        return generate_pure_functional_call("ltrim", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionStringReturn.__init__(self)
@@ -248,7 +254,9 @@ class PyLegendStringLTrimExpression(PyLegendUnaryExpression, PyLegendExpressionS
             self,
             operand,
             PyLegendStringLTrimExpression.__to_sql_func,
-            PyLegendStringLTrimExpression.__to_pure_func
+            PyLegendStringLTrimExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )
 
 
@@ -264,7 +272,7 @@ class PyLegendStringRTrimExpression(PyLegendUnaryExpression, PyLegendExpressionS
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("rtrim", [op_expr], auto_map=True)
+        return generate_pure_functional_call("rtrim", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionStringReturn.__init__(self)
@@ -272,7 +280,9 @@ class PyLegendStringRTrimExpression(PyLegendUnaryExpression, PyLegendExpressionS
             self,
             operand,
             PyLegendStringRTrimExpression.__to_sql_func,
-            PyLegendStringRTrimExpression.__to_pure_func
+            PyLegendStringRTrimExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )
 
 
@@ -288,7 +298,7 @@ class PyLegendStringBTrimExpression(PyLegendUnaryExpression, PyLegendExpressionS
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("trim", [op_expr], auto_map=True)
+        return generate_pure_functional_call("trim", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionStringReturn.__init__(self)
@@ -296,7 +306,9 @@ class PyLegendStringBTrimExpression(PyLegendUnaryExpression, PyLegendExpressionS
             self,
             operand,
             PyLegendStringBTrimExpression.__to_sql_func,
-            PyLegendStringBTrimExpression.__to_pure_func
+            PyLegendStringBTrimExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )
 
 
@@ -313,7 +325,7 @@ class PyLegendStringPosExpression(PyLegendBinaryExpression, PyLegendExpressionIn
 
     @staticmethod
     def __to_pure_func(op1_expr: str, op2_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("indexOf", [op1_expr, op2_expr], auto_map=True)
+        return generate_pure_functional_call("indexOf", [op1_expr, op2_expr])
 
     def __init__(self, operand1: PyLegendExpressionStringReturn, operand2: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -322,12 +334,12 @@ class PyLegendStringPosExpression(PyLegendBinaryExpression, PyLegendExpressionIn
             operand1,
             operand2,
             PyLegendStringPosExpression.__to_sql_func,
-            PyLegendStringPosExpression.__to_pure_func
+            PyLegendStringPosExpression.__to_pure_func,
+            non_nullable=True,
+            first_operand_needs_to_be_non_nullable=True,
+            second_operand_needs_to_be_non_nullable=True
         )
 
-    def to_pure_expression(self, config: FrameToPureConfig) -> str:
-        return PyLegendBinaryExpression.to_pure_expression_with_to_one_on_second_operand(self, config)
-
 
 class PyLegendStringParseIntExpression(PyLegendUnaryExpression, PyLegendExpressionIntegerReturn):
 
@@ -341,7 +353,7 @@ class PyLegendStringParseIntExpression(PyLegendUnaryExpression, PyLegendExpressi
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("parseInteger", [op_expr], auto_map=True)
+        return generate_pure_functional_call("parseInteger", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionIntegerReturn.__init__(self)
@@ -349,7 +361,9 @@ class PyLegendStringParseIntExpression(PyLegendUnaryExpression, PyLegendExpressi
             self,
             operand,
             PyLegendStringParseIntExpression.__to_sql_func,
-            PyLegendStringParseIntExpression.__to_pure_func
+            PyLegendStringParseIntExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )
 
 
@@ -365,7 +379,7 @@ class PyLegendStringParseFloatExpression(PyLegendUnaryExpression, PyLegendExpres
 
     @staticmethod
     def __to_pure_func(op_expr: str, config: FrameToPureConfig) -> str:
-        return generate_pure_functional_call("parseFloat", [op_expr], auto_map=True)
+        return generate_pure_functional_call("parseFloat", [op_expr])
 
     def __init__(self, operand: PyLegendExpressionStringReturn) -> None:
         PyLegendExpressionFloatReturn.__init__(self)
@@ -373,7 +387,9 @@ class PyLegendStringParseFloatExpression(PyLegendUnaryExpression, PyLegendExpres
             self,
             operand,
             PyLegendStringParseFloatExpression.__to_sql_func,
-            PyLegendStringParseFloatExpression.__to_pure_func
+            PyLegendStringParseFloatExpression.__to_pure_func,
+            non_nullable=True,
+            operand_needs_to_be_non_nullable=True,
         )
 
 
@@ -399,12 +415,12 @@ class PyLegendStringConcatExpression(PyLegendBinaryExpression, PyLegendExpressio
             operand1,
             operand2,
             PyLegendStringConcatExpression.__to_sql_func,
-            PyLegendStringConcatExpression.__to_pure_func
+            PyLegendStringConcatExpression.__to_pure_func,
+            non_nullable=True,
+            first_operand_needs_to_be_non_nullable=True,
+            second_operand_needs_to_be_non_nullable=True
         )
 
-    def to_pure_expression(self, config: FrameToPureConfig) -> str:
-        return PyLegendBinaryExpression.to_pure_expression_with_to_one_on_both_operands(self, config)
-
 
 class PyLegendStringLessThanExpression(PyLegendBinaryExpression, PyLegendExpressionBooleanReturn):
 
@@ -528,7 +544,8 @@ class PyLegendCurrentUserExpression(PyLegendNullaryExpression, PyLegendExpressio
         PyLegendNullaryExpression.__init__(
             self,
             PyLegendCurrentUserExpression.__to_sql_func,
-            PyLegendCurrentUserExpression.__to_pure_func
+            PyLegendCurrentUserExpression.__to_pure_func,
+            non_nullable=True
         )
 
 

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

@@ -21,6 +21,7 @@ from pylegend._typing import (
 from pylegend.core.language.shared.expression import (
     PyLegendExpression,
 )
+from pylegend.core.language.shared.helpers import expr_has_matching_start_and_end_parentheses
 from pylegend.core.sql.metamodel import (
     Expression,
     QuerySpecification,
@@ -41,6 +42,8 @@ class PyLegendUnaryExpression(PyLegendExpression, metaclass=ABCMeta):
         Expression
     ]
     __to_pure_func: PyLegendCallable[[str, FrameToPureConfig], str]
+    __non_nullable: bool
+    __operand_needs_to_be_non_nullable: bool
 
     def __init__(
             self,
@@ -49,11 +52,15 @@ class PyLegendUnaryExpression(PyLegendExpression, metaclass=ABCMeta):
                 [Expression, PyLegendDict[str, QuerySpecification], FrameToSqlConfig],
                 Expression
             ],
-            to_pure_func: PyLegendCallable[[str, FrameToPureConfig], str]
+            to_pure_func: PyLegendCallable[[str, FrameToPureConfig], str],
+            non_nullable: bool = False,
+            operand_needs_to_be_non_nullable: bool = False,
     ) -> None:
         self.__operand = operand
         self.__to_sql_func = to_sql_func
         self.__to_pure_func = to_pure_func
+        self.__non_nullable = non_nullable
+        self.__operand_needs_to_be_non_nullable = operand_needs_to_be_non_nullable
 
     def to_sql_expression(
             self,
@@ -69,4 +76,12 @@ class PyLegendUnaryExpression(PyLegendExpression, metaclass=ABCMeta):
 
     def to_pure_expression(self, config: FrameToPureConfig) -> str:
         op_expr = self.__operand.to_pure_expression(config)
+        if self.__operand_needs_to_be_non_nullable:
+            op_expr = (
+                op_expr if self.__operand.is_non_nullable() else
+                f"toOne({op_expr[1:-1] if expr_has_matching_start_and_end_parentheses(op_expr) else op_expr})"
+            )
         return self.__to_pure_func(op_expr, config)
+
+    def is_non_nullable(self) -> bool:
+        return self.__non_nullable

{pylegend-0.5.0.dist-info → pylegend-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pylegend
-Version: 0.5.0
+Version: 0.6.0
 Summary: Python language binding for Legend data management platform
 License: Apache-2.0
 Author: PyLegend Maintainers

{pylegend-0.5.0.dist-info → pylegend-0.6.0.dist-info}/RECORD

@@ -17,20 +17,20 @@ pylegend/core/language/shared/__init__.py,sha256=g6w4WCuQ2pqQG6yyn-QLLXED3ttOOB8
 pylegend/core/language/shared/column_expressions.py,sha256=qWHVvwPGwKroQX94a_ovUrxCPnosVMX3tBWlTj7uJ6k,4333
 pylegend/core/language/shared/expression.py,sha256=-XDJ3JfkyQ2FunACUEGI4CeTgqCvBexp55_YCaZUD1k,2446
 pylegend/core/language/shared/functions.py,sha256=G94EiFdZV4jorJTX23ErxKP1GusKl61G3qQN1e26Zws,1495
-pylegend/core/language/shared/helpers.py,sha256=PKse5aunaf3OMeXG0kt39XljAtN60pDDDFZ-d43-UU0,2777
+pylegend/core/language/shared/helpers.py,sha256=E7IKZwb__qj4_JpoBT2cra_umvfKP58c5U5bygMqh_o,2379
 pylegend/core/language/shared/literal_expressions.py,sha256=bU9pO-H9DxNyDlWVMiJC__YPzHQLo_v9aedllozBzVo,6185
 pylegend/core/language/shared/operations/__init__.py,sha256=LXTDJSDmHQXtnMDZouhZp9IZQVpY6ONkINbUYjtnMkE,578
-pylegend/core/language/shared/operations/binary_expression.py,sha256=zQuwPHUQzrhqOwSpajB2xososioCPVZYi-67DSaYBvg,4020
-pylegend/core/language/shared/operations/boolean_operation_expressions.py,sha256=GQZp4xQttW-ayntXvyvnxhRIdcnuCFyUK7zsf8c5wJQ,4618
+pylegend/core/language/shared/operations/binary_expression.py,sha256=I3CIWwbKlKq1R8ekUXY8QKyHro8b7fIgeM8hTPwN5jA,4006
+pylegend/core/language/shared/operations/boolean_operation_expressions.py,sha256=6NYAilcC6QEn4J_mWTZdDCJhbPMam36Xl6Ai9N1kJsQ,4630
 pylegend/core/language/shared/operations/collection_operation_expressions.py,sha256=PuyICSjPadQNWkp8aZnCZblRnG_uh7lPEXMDN9nwKRI,22412
-pylegend/core/language/shared/operations/date_operation_expressions.py,sha256=q20u_NfcJFiE7GHhp0uxJzIqfwynCvVkJ5taPc45tKM,26503
-pylegend/core/language/shared/operations/float_operation_expressions.py,sha256=XXZRgSUFLW0GLn6fMynQvFaHTxNJ5fln1UqpdhhDM18,6969
-pylegend/core/language/shared/operations/integer_operation_expressions.py,sha256=UfxJJW3QOh-U1skZwXRIM2k2nvQTwjnT3FMrrI_a2qU,8302
-pylegend/core/language/shared/operations/nullary_expression.py,sha256=svlZ5ejYqz843v3xkcImizcKia6RiWXXD_hA_QFT2wg,2083
-pylegend/core/language/shared/operations/number_operation_expressions.py,sha256=BIayvrXqPjD5OQr7ttO0JgkV9zos6cCJ2OUZ5Vhq8SM,29700
-pylegend/core/language/shared/operations/primitive_operation_expressions.py,sha256=4emM6WwCQtcgUucHW5xRR2r9pQMrDT5u7bz1U_AGqOs,5409
-pylegend/core/language/shared/operations/string_operation_expressions.py,sha256=bkoV7mxLgZnrbKElXv-mfixqlktlp07CknhNK5R5zg8,20377
-pylegend/core/language/shared/operations/unary_expression.py,sha256=tJCHacGspj-dkr4fepB8i9MntFMWqFVLBGORvhcly7U,2400
+pylegend/core/language/shared/operations/date_operation_expressions.py,sha256=NFgOjS2GyviFIq2eR7wT1niO2NIGr8FeeYNIhmDjig0,27905
+pylegend/core/language/shared/operations/float_operation_expressions.py,sha256=GsKflYlswzfvb2eEqObRgcoO218zdNj3atS-5g8YzJI,6849
+pylegend/core/language/shared/operations/integer_operation_expressions.py,sha256=4LcGyJvGyraoSP26_JI6VhLGETahKiVVG9qEvMIBt4U,8142
+pylegend/core/language/shared/operations/nullary_expression.py,sha256=dMq3hi7_t0TFboOoQQHjuNZ7D9hLYfc_NozNaUCJTtI,2242
+pylegend/core/language/shared/operations/number_operation_expressions.py,sha256=sqbjVocq2YwuevLGrpBzg7pJch6QmCYYcqZGK62UsiY,30367
+pylegend/core/language/shared/operations/primitive_operation_expressions.py,sha256=UsNe3RN_HuxIfQwcWI6l2xtTgrLIbrJd2nRPJYCTsXA,5297
+pylegend/core/language/shared/operations/string_operation_expressions.py,sha256=90T02mRtJ2lHSPauD-HXeKyNEVFaJB-Cg4HVQbPGAMk,20886
+pylegend/core/language/shared/operations/unary_expression.py,sha256=1VWE43rN4x4NLc6aL3xRzleK9c_UfrLawlyYgX3SG48,3132
 pylegend/core/language/shared/primitive_collection.py,sha256=ShUtgdZkZ8cKdQJLP5iU_zYDK7piMzWlimvjhnyfnGk,13098
 pylegend/core/language/shared/primitives/__init__.py,sha256=9p7VVRhzeRQwTkxXQBBZuJY6P9V-yX0Q_elviaYIgPg,1649
 pylegend/core/language/shared/primitives/boolean.py,sha256=x0JgS8E9AXv0fkExuCCyD9Paim2xwfU9cn-1Jh3bqtI,4058
@@ -147,9 +147,9 @@ pylegend/extensions/tds/result_handler/to_pandas_df_result_handler.py,sha256=tvV
 pylegend/legacy_api_tds_client.py,sha256=IXfo2pdBFV3M3S4RYKJcvudMc_OGdR0yvJhTV-ovI3s,2319
 pylegend/utils/__init__.py,sha256=LXTDJSDmHQXtnMDZouhZp9IZQVpY6ONkINbUYjtnMkE,578
 pylegend/utils/class_utils.py,sha256=t4PpF3jAXS_D6p9TqlSppryNYNOuy5C-kbKn2Kgb4QU,973
-pylegend-0.5.0.dist-info/LICENSE,sha256=AGR96_qQPZO66Gjqq4G6r_g670K35VtW-IobTAkmZJM,11343
-pylegend-0.5.0.dist-info/LICENSE.spdx,sha256=i7TsBclLotUvMjx9vZ_6S8Pp0r4uknWGw1RwiKBBvQ4,207
-pylegend-0.5.0.dist-info/METADATA,sha256=ggohQnjEXzNQyJsn8l54276zCqQOl8yx8VK9Fif7nTs,4210
-pylegend-0.5.0.dist-info/NOTICE,sha256=2Lr4FqiscyRI7-vyn7c2z-zqUw2p6x7upJyBvFKkHjk,167
-pylegend-0.5.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pylegend-0.5.0.dist-info/RECORD,,
+pylegend-0.6.0.dist-info/LICENSE,sha256=AGR96_qQPZO66Gjqq4G6r_g670K35VtW-IobTAkmZJM,11343
+pylegend-0.6.0.dist-info/LICENSE.spdx,sha256=i7TsBclLotUvMjx9vZ_6S8Pp0r4uknWGw1RwiKBBvQ4,207
+pylegend-0.6.0.dist-info/METADATA,sha256=1r4OHJqsKLYtsVxZSmEF65vBQBnLSTcXhHTzkDmfrTU,4210
+pylegend-0.6.0.dist-info/NOTICE,sha256=2Lr4FqiscyRI7-vyn7c2z-zqUw2p6x7upJyBvFKkHjk,167
+pylegend-0.6.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pylegend-0.6.0.dist-info/RECORD,,