Merge pull request #21 from finos/develop

Develop

Author: dschwartz-ftadvisory

EXPRESSION_SUPPORT.md

@@ -39,13 +39,13 @@
 | SumOperation                           | ✓       |
 | SwitchOperation                        | ✓       |
 | ThenOperation                          | ✓       |
-| ToDateOperation                        |         |
-| ToDateTimeOperation                    |         |
+| ToDateOperation                        | ✓       |
+| ToDateTimeOperation                    | ✓       |
 | ToEnumOperation                        | ✓       |
-| ToIntOperation                         |         |
+| ToIntOperation                         | ✓       |
 | ToStringOperation                      | ✓       |
-| ToTimeOperation                        |         |
-| ToZonedDateTimeOperation               |         |
+| ToTimeOperation                        | ✓       |
+| ToZonedDateTimeOperation               | ✓       |
 | UnaryFunctionalOperation               |         |
 | RosettaAbsentOperation                 | ✓       |
 | RosettaBinaryOperation                 | ✓       |

src/main/java/com/regnosys/rosetta/generator/python/expressions/PythonExpressionGenerator.xtend

@@ -39,6 +39,11 @@ import com.regnosys.rosetta.rosetta.expression.SortOperation
 import com.regnosys.rosetta.rosetta.expression.SumOperation
 import com.regnosys.rosetta.rosetta.expression.ThenOperation
 import com.regnosys.rosetta.rosetta.expression.ToStringOperation
+import com.regnosys.rosetta.rosetta.expression.ToDateOperation
+import com.regnosys.rosetta.rosetta.expression.ToDateTimeOperation
+import com.regnosys.rosetta.rosetta.expression.ToIntOperation
+import com.regnosys.rosetta.rosetta.expression.ToTimeOperation
+import com.regnosys.rosetta.rosetta.expression.ToZonedDateTimeOperation
 import com.regnosys.rosetta.rosetta.expression.ToEnumOperation
 import com.regnosys.rosetta.rosetta.expression.RosettaDeepFeatureCall
 import com.regnosys.rosetta.rosetta.expression.MinOperation
@@ -87,6 +92,11 @@ class PythonExpressionGenerator {
             SwitchOperation: generateSwitchOperation(expr, ifLevel, isLambda)
             ToEnumOperation: '''«expr.enumeration.name»(«generateExpression(expr.argument, ifLevel, isLambda)»)'''
             ToStringOperation: '''rune_str(«generateExpression(expr.argument, ifLevel, isLambda)»)'''
+            ToDateOperation: '''datetime.datetime.strptime(«generateExpression(expr.argument, ifLevel, isLambda)», "%Y-%m-%d").date()'''
+            ToDateTimeOperation: '''datetime.datetime.strptime(«generateExpression(expr.argument, ifLevel, isLambda)», "%Y-%m-%d %H:%M:%S")'''
+            ToIntOperation: '''int(«generateExpression(expr.argument, ifLevel, isLambda)»)'''
+            ToTimeOperation: '''datetime.datetime.strptime(«generateExpression(expr.argument, ifLevel, isLambda)», "%H:%M:%S").time()'''
+            ToZonedDateTimeOperation:'''datetime.datetime.strptime(«generateExpression(expr.argument, ifLevel, isLambda)», "%Y-%m-%d %H:%M:%S %z %Z")'''
             // Rune Operations
             RosettaAbsentExpression: '''(not rune_attr_exists(«generateExpression(expr.argument, ifLevel, isLambda)»))'''
             RosettaBinaryOperation: generateBinaryExpression(expr, ifLevel, isLambda)
@@ -248,6 +258,7 @@ class PythonExpressionGenerator {
 
         return _builder.toString
     }
+             
 
     private def String generateReference(RosettaReference expr, int ifLevel, boolean isLambda) {
         switch (expr) {

test/python_unit_tests/rosetta/ToDate.rosetta

@@ -0,0 +1,7 @@
+namespace rosetta_dsl.test.semantic.toDateOp : <"generate Python unit tests from Rosetta.">
+
+type TestDateOp:
+    a string (1..1)
+    b date (0..1)
+    condition Test:
+        b = a to-date

test/python_unit_tests/rosetta/ToDateTime.rosetta

@@ -0,0 +1,7 @@
+namespace rosetta_dsl.test.semantic.toDateTimeOp : <"generate Python unit tests from Rosetta.">
+
+type TestDateTimeOp:
+    a string (1..1)
+    b dateTime (0..1)
+    condition Test:
+        b = a to-date-time

test/python_unit_tests/rosetta/ToInt.rosetta

@@ -0,0 +1,7 @@
+namespace rosetta_dsl.test.semantic.toIntOp : <"generate Python unit tests from Rosetta.">
+
+type TestToIntOp:
+    a string (1..1)
+    b int (0..1)
+    condition Test:
+        b = a to-int

test/python_unit_tests/rosetta/ToTime.rosetta

@@ -0,0 +1,7 @@
+namespace rosetta_dsl.test.semantic.toTimeOp : <"generate Python unit tests from Rosetta.">
+
+type TestToTimeOp:
+    a string (1..1)
+    b time (0..1)
+    condition Test:
+        b = a to-time

test/python_unit_tests/rosetta/ToZonedDateTime.rosetta

@@ -0,0 +1,7 @@
+namespace rosetta_dsl.test.semantic.toZonedDateTimeOp : <"generate Python unit tests from Rosetta.">
+
+type TestToZonedDateTimeOp:
+    a string (1..1)
+    b zonedDateTime (0..1)
+    condition Test:
+        b = a to-zoned-date-time

test/python_unit_tests/semantics/test_to_date_operator.py

@@ -0,0 +1,18 @@
+'''to-date unit tests'''
+from datetime import date
+
+import pytest
+
+from rosetta_dsl.test.semantic.toDateOp.TestDateOp import TestDateOp
+
+def test_to_date_passes():
+    to_date_test= TestDateOp(a="2025-05-26",b=date(2025, 5, 26))
+    to_date_test.validate_model()
+def test_to_date_invalid_format_fails():
+    to_date_test= TestDateOp(a="2025/05/26", b=date(2025,5,26))
+    with pytest.raises(Exception):
+        to_date_test.validate_model()
+
+if __name__ == "__main__":
+    test_to_date_passes()
+    test_to_date_invalid_format_fails()

test/python_unit_tests/semantics/test_to_date_time.py

@@ -0,0 +1,20 @@
+'''to-date-time unit tests'''
+
+import datetime
+
+import pytest
+
+from rosetta_dsl.test.semantic.toDateTimeOp.TestDateTimeOp import TestDateTimeOp
+
+def test_to_date_time_passes():
+    to_date_time_test= TestDateTimeOp(a="2025-05-26 14:30:00",b=datetime.datetime(2025, 5, 26,14,30,0))
+    to_date_time_test.validate_model()
+
+def test_to_date_time_fails():
+    to_date_time_test=TestDateTimeOp(a="2025-05-26 14-30-00",b=datetime.datetime(2025, 5, 26,14,30,0))
+    with pytest.raises(Exception):
+        to_date_time_test.validate_model()
+        
+if __name__ == "__main__":
+    test_to_date_time_passes()
+    test_to_date_time_fails()

test/python_unit_tests/semantics/test_to_int.py

@@ -0,0 +1,19 @@
+'''to-int unit tests'''
+
+import pytest
+
+from rosetta_dsl.test.semantic.toIntOp.TestToIntOp import TestToIntOp
+
+
+def test_to_int_passes():
+    to_int_test = TestToIntOp(a="1",b=1)
+    to_int_test.validate_model()
+
+def test_to_int_fails():
+    to_int_test= TestToIntOp(a="a",b=1)
+    with pytest.raises(Exception):
+        to_int_test.validate_model()
+        
+if __name__ == "__main__":
+    test_to_int_passes()
+    test_to_int_fails()