Merge pull request #76 from finos/develop

Update CDM Build Scripts to work with new environment

Author: dschwartznyc

src/main/java/com/regnosys/rosetta/generator/python/PythonCodeGeneratorCLI.java

@@ -174,7 +174,7 @@ private static void processRosettaFiles(List<Path> rosettaFiles, String tgtDir)
         Map<String, CharSequence> generatedPython = new HashMap<>();
         pythonCodeGenerator.beforeAllGenerate(resourceSet, models, version);
         for (RosettaModel model : models) {
-            System.out.println("Processing: " + model.getName());
+            LOGGER.info("Processing: " + model.getName());
             generatedPython.putAll(pythonCodeGenerator.beforeGenerate(model.eResource(), model, version));
             generatedPython.putAll(pythonCodeGenerator.generate(model.eResource(), model, version));
             generatedPython.putAll(pythonCodeGenerator.afterGenerate(model.eResource(), model, version));

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

@@ -96,7 +96,7 @@ class PythonExpressionGenerator {
             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")'''
+            ToZonedDateTimeOperation:'''rune_zoned_date_time(«generateExpression(expr.argument, ifLevel, isLambda)»)'''
             // Rune Operations
             RosettaAbsentExpression: '''(not rune_attr_exists(«generateExpression(expr.argument, ifLevel, isLambda)»))'''
             RosettaBinaryOperation: generateBinaryExpression(expr, ifLevel, isLambda)

test/cdm_tests/cdm_setup/get_cdm.sh

@@ -24,7 +24,7 @@ rm -rf ../common-domain-model
 mkdir ../common-domain-model
 cd ../common-domain-model
 echo "***** pull CDM rosetta definitions"
-# CDM_VERSION="5.22.1"
+# CDM_VERSION="5.x.x"
 CDM_VERSION="master"
 git init
 git config core.sparseCheckout true

test/cdm_tests/semantics/test_cdm_5x_pydantic_simple.py

@@ -0,0 +1,40 @@
+# pylint: disable=unused-import,missing-function-docstring,invalid-name
+
+# Works with CDM 5.x.x
+
+from datetime import date
+from cdm.event.common.Trade import Trade
+from cdm.event.common.TradeIdentifier import TradeIdentifier
+from cdm.product.template.TradableProduct import TradableProduct
+from cdm.product.template.Product import Product
+from cdm.product.template.TradeLot import TradeLot
+from cdm.base.staticdata.party.Counterparty import Counterparty
+from cdm.product.common.settlement.PriceQuantity import PriceQuantity
+from cdm.base.staticdata.party.CounterpartyRoleEnum import CounterpartyRoleEnum
+from cdm.base.staticdata.party.Party import Party
+from cdm.base.staticdata.party.PartyIdentifier import PartyIdentifier
+from cdm.base.staticdata.identifier.AssignedIdentifier import AssignedIdentifier
+
+def test_trade():
+    product = Product()
+    price_quantity = PriceQuantity()
+    trade_lot = TradeLot(priceQuantity=[price_quantity])
+    party_reference = Party(partyId=[PartyIdentifier(identifier="test")])
+    counterparty = [Counterparty(role=CounterpartyRoleEnum.PARTY_1, partyReference=party_reference),
+                    Counterparty(role=CounterpartyRoleEnum.PARTY_2, partyReference=party_reference)]
+    tradable_product = TradableProduct(product=product, tradeLot=[trade_lot], counterparty=counterparty)
+    trade_identifier=[TradeIdentifier(assignedIdentifier=[AssignedIdentifier(identifier="Acme")])]
+
+    t = Trade(
+        tradeDate=date(2023, 1, 1),
+        tradableProduct=tradable_product,
+        tradeIdentifier=trade_identifier
+    )
+    print(t.model_dump())
+    print('Done!')
+
+
+if __name__ == '__main__':
+    test_trade()
+
+# EOF

test/cdm_tests/setup_cdm_test_env.sh

@@ -23,13 +23,13 @@ MY_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd ${MY_PATH} || error
 
 echo "***** setting up common environment"
-BUILDPATH="../../build"
-source $MY_PATH/$BUILDPATH/setup_python_env.sh
+PYTHONSETUPPATH="../python_setup"
+source $MY_PATH/$PYTHONSETUPPATH/setup_python_env.sh
 
 echo "***** activating virtual environment"
 VENV_NAME=".pyenv"
-VENV_PATH=".."
-source $MY_PATH/$BUILDPATH/$VENV_PATH/$VENV_NAME/${PY_SCRIPTS}/activate || error
+VENV_PATH="../.."
+source $MY_PATH/$PYTHONSETUPPATH/$VENV_PATH/$VENV_NAME/${PY_SCRIPTS}/activate || error
 
 # install cdm package
 PYTHONCDMDIR="../../target/python-cdm"

test/python_setup/requirements.txt

@@ -1,2 +1,3 @@
 setuptools>=62.0
+tzdata>=2023.3
 pytest

test/python_unit_tests/semantics/test_to_zoned_date_time.py

@@ -1,22 +1,42 @@
 '''to-zoned-date-time unit tests'''
-
 import datetime
+from zoneinfo import ZoneInfo
 
 import pytest
 
 from rosetta_dsl.test.semantic.zoned_date_time_operator.ZonedDateTimeOperatorTest import ZonedDateTimeOperatorTest
 
-def test_to_zoned_date_time_passes(): 
-    '''no doc'''
-    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-05-26 14:30:00 +0900 UTC",b=datetime.datetime(2025, 5, 26, 14, 30, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9), 'UTC')))
+
+def test_to_zoned_date_time_offset_and_time_zone():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-07-07 15:30:00 +0100 Europe/Lisbon",b=datetime.datetime(2025,7, 7, 15, 30, 0, tzinfo=ZoneInfo("Europe/Lisbon")))
+    to_zoned_date_time_test.validate_model()
+    
+def test_to_zoned_date_time_only_time_zone():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-07-07 15:30:00 Europe/Lisbon",b=datetime.datetime(2025,7, 7, 15, 30, 0, tzinfo=ZoneInfo("Europe/Lisbon")))
+    to_zoned_date_time_test.validate_model()
+
+def test_to_zoned_date_time_only_time_zone2():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-03-15 12:00:00 Zulu",b=datetime.datetime(2025,3, 15, 12, 0, 0, tzinfo=ZoneInfo("Zulu")))
     to_zoned_date_time_test.validate_model()
 
+def test_to_zoned_date_time_only_offset():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-05-26 14:30:00 +0900",b=datetime.datetime(2025,5, 26, 14, 30, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9))))
+    to_zoned_date_time_test.validate_model()
+    
 def test_to_zoned_date_time_fails():
-    '''no doc'''
-    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-05-26 14:30:00 +09x0 UTC",b=datetime.datetime(2025, 5, 26, 14, 30, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9), 'UTC')))
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-12-15 15:30:00 +0100 Europe/Lisbon",b=datetime.datetime(2025, 5, 26, 14, 30, 0, tzinfo=ZoneInfo("Europe/Lisbon")))
+    with pytest.raises(Exception):
+        to_zoned_date_time_test.validate_model()
+
+def test_to_zoned_date_time_fails_format():
+    to_zoned_date_time_test= ZonedDateTimeOperatorTest(a="2025-05-26 14:30:00 +09x0",b=datetime.datetime(2025, 5, 26, 14, 30, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9))))
     with pytest.raises(Exception):
         to_zoned_date_time_test.validate_model()
 
 if __name__ == "__main__":
-    test_to_zoned_date_time_passes()
-    test_to_zoned_date_time_fails()
+    test_to_zoned_date_time_offset_and_time_zone()
+    test_to_zoned_date_time_only_time_zone()
+    test_to_zoned_date_time_only_time_zone2()
+    test_to_zoned_date_time_only_offset()
+    test_to_zoned_date_time_fails()
+    test_to_zoned_date_time_fails_format()