Merge pull request #83 from finos/main

dschwartznyc · web-flow · commit df8b85073b7a · 2025-10-03T17:04:33.000-04:00
sync renovate/maven-surefire-plugin.version with main
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -51,6 +51,15 @@
         "!com.regnosys.rosetta:com.regnosys.rosetta",
         "!rosetta.dsl.version"
       ]
-    }
+    },
+    {
+      "description": "Always open PRs immediately for Renovate GitHub Action updates",
+      "matchManagers": ["github-actions"],
+        "matchPackageNames": ["renovatebot/github-action"],
+        "prCreation": "immediate",
+        "stabilityDays": 0,
+        "minimumReleaseAge": "0 days",
+        "schedule": ["at any time"]
+    }    
   ]
 }
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -30,7 +30,7 @@ jobs:
 
       # Java
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: ${{ inputs.java-version }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
@@ -80,7 +80,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
@@ -26,7 +26,7 @@ jobs:
 
       # Runs the Renovate GitHub Action
       - name: Renovate
-        uses: renovatebot/github-action@v43.0.10
+        uses: renovatebot/github-action@v43.0.12
         with:
           token: ${{ secrets.GITHUB_TOKEN }} # required to create PRs/issues
           configurationFile: .github/renovate.json
diff --git a/.github/workflows/run-build-and-test.yml b/.github/workflows/run-build-and-test.yml
@@ -0,0 +1,23 @@
+# .github/workflows/run-build-and-test.yml
+
+name: Run Build and Test (manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+      java-version:
+        description: Java version (Temurin)
+        required: false
+        default: '21'
+      python-version:
+        description: Python version
+        required: false
+        default: '3.11'
+
+jobs:
+  run-core-build-and-test:
+    uses: ./.github/workflows/build-and-test.yml
+    with:
+      java-version: ${{ inputs.java-version }}
+      python-version: ${{ inputs.python-version }}
+    secrets: inherit
diff --git a/.github/workflows/scan-cve.yml b/.github/workflows/scan-cve.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
       - name: Setup JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'
diff --git a/.github/workflows/scan-license.yml b/.github/workflows/scan-license.yml
@@ -55,7 +55,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Set up JDK 21
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 21
         cache: maven
diff --git a/pom.xml b/pom.xml
@@ -81,7 +81,7 @@
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
 
-        <rosetta.dsl.version>9.65.1</rosetta.dsl.version>
+        <rosetta.dsl.version>9.66.0</rosetta.dsl.version>
 
         <xtext.version>2.38.0</xtext.version>
         <guice.version>6.0.0</guice.version>
@@ -307,7 +307,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>3.9.10</version>
+            <version>3.9.11</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -454,7 +454,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <configuration>
                     <createDependencyReducedPom>true</createDependencyReducedPom>
                 </configuration>
diff --git a/src/main/java/com/regnosys/rosetta/generator/python/PythonCodeGeneratorCLI.java b/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));
diff --git a/src/main/java/com/regnosys/rosetta/generator/python/expressions/PythonExpressionGenerator.xtend b/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)
diff --git a/src/main/java/com/regnosys/rosetta/generator/python/object/PythonAttributeProcessor.xtend b/src/main/java/com/regnosys/rosetta/generator/python/object/PythonAttributeProcessor.xtend
@@ -198,7 +198,7 @@ class PythonAttributeProcessor {
         val otherMeta = new ArrayList<String>()
 
         // process attribute metadata
-        if (attrRMAT.hasMeta) {
+        if (attrRMAT.hasAttributeMeta) {
             attrRMAT.getMetaAttributes.forEach [ma |
                 switch(ma.getName) {
                     case "key", case "id": {
diff --git a/src/test/java/com/regnosys/rosetta/generator/python/generated_syntax/PythonMetaDataGeneratorTest.xtend b/src/test/java/com/regnosys/rosetta/generator/python/generated_syntax/PythonMetaDataGeneratorTest.xtend
@@ -148,10 +148,10 @@ class PythonMetaDataGeneratorTest {
         class test_generated_syntax_metadata_NodeRef(BaseDataClass):
             _FQRTN = 'test.generated_syntax.metadata.NodeRef'
             typeA: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator()]] = Field(None, description='')
-            aReference: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator(('@ref', '@ref:external'))]] = Field(None, description='')
+            aReference: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator(('@key', '@key:external', '@ref', '@ref:external'))]] = Field(None, description='')
             
             _KEY_REF_CONSTRAINTS = {
-                'aReference': {'@ref', '@ref:external'}
+                'aReference': {'@key', '@key:external', '@ref', '@ref:external'}
             }
         '''
         testUtils.assertGeneratedContainsExpectedString(generatedBundle, expectedNodeRef)
diff --git a/src/test/java/com/regnosys/rosetta/generator/python/generated_syntax/PythonMetaKeyRefGeneratorTest.xtend b/src/test/java/com/regnosys/rosetta/generator/python/generated_syntax/PythonMetaKeyRefGeneratorTest.xtend
@@ -63,10 +63,10 @@ class PythonMetaKeyRefGeneratorTest {
         '''
         class test_generated_syntax_meta_key_ref_KeyRef(BaseDataClass):
             _FQRTN = 'test.generated_syntax.meta_key_ref.KeyRef'
-            fieldA: Annotated[StrWithMeta, StrWithMeta.serializer(), StrWithMeta.validator(('@key', '@key:external', '@ref', '@ref:external'))] = Field(..., description='')
+            fieldA: Annotated[StrWithMeta, StrWithMeta.serializer(), StrWithMeta.validator(('@ref', '@ref:external', '@key', '@key:external'))] = Field(..., description='')
             
             _KEY_REF_CONSTRAINTS = {
-                'fieldA': {'@key', '@key:external', '@ref', '@ref:external'}
+                'fieldA': {'@ref', '@ref:external', '@key', '@key:external'}
             }
         '''
         testUtils.assertGeneratedContainsExpectedString(generatedBundle, expectedKeyRef)
diff --git a/test/cdm_tests/cdm_setup/get_cdm.sh b/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
diff --git a/test/cdm_tests/semantics/test_cdm_5x_pydantic_simple.py b/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
diff --git a/test/cdm_tests/setup_cdm_test_env.sh b/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"
diff --git a/test/python_setup/requirements.txt b/test/python_setup/requirements.txt
@@ -1,2 +1,3 @@
 setuptools>=62.0
+tzdata>=2023.3
 pytest
diff --git a/test/python_unit_tests/semantics/test_to_zoned_date_time.py b/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()

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,15 @@`
`51`	`51`	`"!com.regnosys.rosetta:com.regnosys.rosetta",`
`52`	`52`	`"!rosetta.dsl.version"`
`53`	`53`	`]`
`54`		`- }`
	`54`	`+ },`
	`55`	`+ {`
	`56`	`+ "description": "Always open PRs immediately for Renovate GitHub Action updates",`
	`57`	`+ "matchManagers": ["github-actions"],`
	`58`	`+ "matchPackageNames": ["renovatebot/github-action"],`
	`59`	`+ "prCreation": "immediate",`
	`60`	`+ "stabilityDays": 0,`
	`61`	`+ "minimumReleaseAge": "0 days",`
	`62`	`+ "schedule": ["at any time"]`
	`63`	`+ }`
`55`	`64`	`]`
`56`	`65`	`}`