Removed dependency on rune.common

dschwartz-ftadvisory · dschwartz-ftadvisory · commit 9afa76e45edd · 2025-08-06T17:44:19.000-04:00
Updated CDM build script to optionally skip downloading CDM
Updated release notes
diff --git a/RELEASE.md b/RELEASE.md
@@ -2,13 +2,19 @@
 
 _What is being released?_
 
-This release adds support for meta data and for serialization / deserialization consistent with the [serialization specifications in CDM issue #3236](https://github.com/finos/common-domain-model/issues/3236)
+This release adds support for metadata and for serialization / deserialization consistent with the [serialization specifications in CDM issue #3236](https://github.com/finos/common-domain-model/issues/3236)
 
 Also included is support for:
 
 - circular Type definitions
 - increased testing of operators
 - generating Python across multiple namespaces
+- Command line (CLI) generation of Python from a Rune source file or directory.  To execute the CLI (assuming
+the default process wherein the JAR is built in the target directory): 
+
+```bash
+ java -cp target/python-0.0.0.main-SNAPSHOT.jar com.regnosys.rosetta.generator.python.PythonCodeGeneratorCLI -s [rune source files] -t [target directory for generated Python]
+```
 
 ## Reading From and Writing To a String
 
diff --git a/build/build_cdm.sh b/build/build_cdm.sh
@@ -27,32 +27,49 @@ if ! $PYEXE -c 'import sys; assert sys.version_info >= (3,11)' > /dev/null 2>&1;
         exit 1
 fi
 
-MY_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-cd ${MY_PATH} || error
+BUILD_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+PROJECT_ROOT_PATH=$BUILD_PATH/..
+PYTHON_TARGET_PATH=$PROJECT_ROOT_PATH/target/python-cdm
+cd ${BUILD_PATH} || error
+
+# Parse command-line arguments for --skip-cdm
+SKIP_CDM=0
+for arg in "$@"; do
+  if [[ "$arg" == "--skip-cdm" ]]; then
+    SKIP_CDM=1
+  fi
+done
+
+if [[ $SKIP_CDM -eq 0 ]]; then
+    source $BUILD_PATH/get_cdm.sh
+else
+    echo "Skipping get_cdm.sh as requested."
+fi
 
-source $MY_PATH/../build/get_cdm.sh
 echo "***** build CDM"
-cd $MY_PATH/..
-mvn clean install
+java -cp $PROJECT_ROOT_PATH/target/python-0.0.0.main-SNAPSHOT.jar com.regnosys.rosetta.generator.python.PythonCodeGeneratorCLI -s $BUILD_PATH//common-domain-model/rosetta-source/src/main/rosetta/ -t $PYTHON_TARGET_PATH
+JAVA_EXIT_CODE=$?
+if [[ $JAVA_EXIT_CODE -eq 1 ]]; then
+    echo "Java program returned exit code 1. Stopping script."
+    exit 1
+fi
+
 echo "***** setting up common environment"
-BUILDPATH="../build"
-source $MY_PATH/$BUILDPATH/setup_python_env.sh
+source $BUILD_PATH/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
+source $PROJECT_ROOT_PATH/$VENV_NAME/${PY_SCRIPTS}/activate || error
 
 echo "***** build CDM Python package"
-PYTHONSOURCEDIR=$MY_PATH/"../target/python-cdm"
-cd $PYTHONSOURCEDIR
+cd $PYTHON_TARGET_PATH
 rm python_cdm-*.*.*-py3-none-any.whl
 $PYEXE -m pip wheel --no-deps --only-binary :all: . || processError
 
 echo "***** cleanup"
 
 deactivate
-source $MY_PATH/$BUILDPATH/cleanup_python_env.sh
+source $BUILD_PATH/cleanup_python_env.sh
 
 echo ""
 echo ""
diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,6 @@
         <stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
 
         <rosetta.dsl.version>9.63.0</rosetta.dsl.version>
-        <rosetta.bundle.version>11.75.0</rosetta.bundle.version>
 
         <xtext.version>2.38.0</xtext.version>
         <guice.version>6.0.0</guice.version>
@@ -107,6 +106,7 @@
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <!-- Used by the Python generator -->
         <cdm.rosetta.source.path>build/common-domain-model/rosetta-source/src/main/rosetta</cdm.rosetta.source.path>
         <cdm.python.output.path>target/python-cdm</cdm.python.output.path>
@@ -285,11 +285,6 @@
             <artifactId>com.regnosys.rosetta.tests</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.regnosys</groupId>
-            <artifactId>rosetta-common</artifactId>
-            <version>${rosetta.bundle.version}</version>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
diff --git a/src/main/java/com/regnosys/rosetta/generator/python/PythonCodeGeneratorCLI.java b/src/main/java/com/regnosys/rosetta/generator/python/PythonCodeGeneratorCLI.java
@@ -6,13 +6,10 @@
 import com.regnosys.rosetta.RosettaRuntimeModule;
 import com.regnosys.rosetta.RosettaStandaloneSetup;
 import com.regnosys.rosetta.builtin.RosettaBuiltinsService;
-import com.regnosys.rosetta.common.util.ClassPathUtils;
-import com.regnosys.rosetta.common.util.UrlUtils;
 import com.regnosys.rosetta.generator.external.ExternalGenerator;
 import com.regnosys.rosetta.generator.external.ExternalGenerators;
 import com.regnosys.rosetta.rosetta.RosettaModel;
 import org.apache.commons.cli.*;
-import org.apache.commons.io.FileUtils;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.resource.XtextResourceSet;
@@ -22,12 +19,10 @@
 import org.slf4j.LoggerFactory;
 
 import jakarta.inject.Inject;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.*;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Command-line interface for generating Python code from Rosetta models.
@@ -92,7 +87,6 @@ public static void main(String[] args) {
             if (cmd.hasOption("s")) {
                 String srcDir = cmd.getOptionValue("s");
                 translateFromSourceDir(srcDir, tgtDir);
-                translateFromSourceDir2(srcDir, tgtDir + "-2");
             } else if (cmd.hasOption("f")) {
                 String srcFile = cmd.getOptionValue("f");
                 translateFromSourceFile(srcFile, tgtDir);
@@ -111,132 +105,79 @@ private static void printUsage(Options options) {
         formatter.printHelp("PythonCodeGeneratorCLI", options, true);
     }
 
-    private static void translateFromSourceDir(String srcDir, String tgtDir) {
-        LOGGER.info("Reading from directory: {} and writing to: {}", srcDir, tgtDir);
+    private static void translateFromSourceDir (String srcDir, String tgtDir) {
+        // Find all .rosetta files in a directory
         Path srcDirPath = Paths.get(srcDir);
         if (!Files.exists(srcDirPath)) {
-            System.err.println("Source directory does not exist: " + srcDir);
-            return;
+            LOGGER.error("Source directory does not exist: {}", srcDir);
+            System.exit(1);
         }
         if (!Files.isDirectory(srcDirPath)) {
-            System.err.println("Source directory is not a directory: " + srcDir);
-            return;
+            LOGGER.error("Source directory is not a directory: {}", srcDir);
+            System.exit(1);
         }
-        List<Path> rosettaFiles = new ArrayList<>();
-        try (Stream<Path> paths = Files.walk(srcDirPath)) {
-            paths.filter(Files::isRegularFile)
-                    .filter(f -> f.getFileName().toString().endsWith(".rosetta"))
-                    .forEach(rosettaFiles::add);
-        } catch (IOException e) {
-            System.err.println("Error reading source directory: " + e.getMessage());
-            return;
-        }
-        LOGGER.info("Found {} .rosetta files in directory {}", rosettaFiles.size(), srcDir);
-        translateRosetta(rosettaFiles, tgtDir);
-    }
-
-    private static void translateFromSourceDir2(String srcDir, String tgtDir) {
-        LOGGER.info("translateFromSourceDir2 ... Reading from directory: {} and writing to: {}", srcDir, tgtDir);
-        Path srcDirPath = Paths.get(srcDir);
-        if (!Files.exists(srcDirPath)) {
-            System.err.println("Source directory does not exist: " + srcDir);
-            return;
-        }
-        if (!Files.isDirectory(srcDirPath)) {
-            System.err.println("Source directory is not a directory: " + srcDir);
-            return;
-        }
-        Injector injector = new PythonRosettaStandaloneSetup().createInjectorAndDoEMFRegistration();
-        PythonCodeGenerator pythonCodeGenerator = injector.getInstance(PythonCodeGenerator.class);
-        PythonModelLoader modelLoader = injector.getInstance(PythonModelLoader.class);
-        ResourceSet resourceSet = injector.getInstance(ResourceSet.class);
-
-        List<Resource> resources = new LinkedList<>();
-
-        RosettaBuiltinsService builtins = injector.getInstance(RosettaBuiltinsService.class);
-        resources.add (resourceSet.getResource(builtins.basicTypesURI, true));
-        resources.add (resourceSet.getResource(builtins.annotationsURI, true));
         try {
-            // Find all .rosetta files in the directory and load them from disk
-            Files.walk(srcDirPath)
-                    .filter(path -> path.toString().endsWith(".rosetta"))
-                    .map(file -> resourceSet.getResource(URI.createFileURI(file.toString()), true))
-                    .forEach(resources::add);
+            List<Path> rosettaFiles = Files.walk(srcDirPath)
+                    .filter(Files::isRegularFile)
+                    .filter(f -> f.getFileName().toString().endsWith(".rosetta"))
+                    .collect(Collectors.toList());
+            processRosettaFiles(rosettaFiles, tgtDir);
         } catch (IOException e) {
-            System.err.println("Error reading source directory: " + e.getMessage());
-            return;
-        }
-        LOGGER.info("translateFromSourceDir2 ... Found {} .rosetta files in directory {}", resources.size(), srcDir);
-
-
-        List<RosettaModel> models = modelLoader.rosettaModels2(resources);
-        if (models.isEmpty()) {
-            System.err.println("No valid Rosetta models found.");
-            return;
-        }
-        String version = models.get(0).getVersion();
-
-        LOGGER.info("translateFromSourceDir2 ... Processing {} models, version: {}", models.size(), version);
-
-        Map<String, CharSequence> generatedPython = new HashMap<>();
-        pythonCodeGenerator.beforeAllGenerate(resourceSet, models, version);
-        for (RosettaModel model : models) {
-            System.out.println("translateFromSourceDir2 ... 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));
+            LOGGER.error("Failed to process source directory: {}", srcDir, e);
         }
-        generatedPython.putAll(pythonCodeGenerator.afterAllGenerate(resourceSet, models, version));
-
-        writePythonFiles(generatedPython, tgtDir);
     }
-
-
-    private static void translateFromSourceFile(String srcFile, String tgtDir) {
-        LOGGER.info("Reading from file: {} and writing to: {}", srcFile, tgtDir);
+    private static void translateFromSourceFile (String srcFile, String tgtDir) {
         Path srcFilePath = Paths.get(srcFile);
         if (!Files.exists(srcFilePath)) {
-            System.err.println("Source file does not exist: " + srcFile);
-            return;
+            LOGGER.error("Source file does not exist: {}", srcFile);
+            System.exit(1);
         }
         if (Files.isDirectory(srcFilePath)) {
-            System.err.println("Source file is a directory: " + srcFile);
-            return;
+            LOGGER.error("Source file is a directory: {}", srcFile);
+            System.exit(1);
         }
-        translateRosetta(Collections.singletonList(srcFilePath), tgtDir);
+        if (!srcFilePath.toString().endsWith(".rosetta")) {
+            LOGGER.error("Source file does not end with .rosetta: {}", srcFile);
+            System.exit(1);
+        }
+        List<Path> rosettaFiles = List.of(srcFilePath);
+        processRosettaFiles(rosettaFiles, tgtDir);
     }
+    // Common processing function
+    private static void processRosettaFiles(List<Path> rosettaFiles, String tgtDir) {
+        LOGGER.info("Processing {} .rosetta files, writing to: {}", rosettaFiles.size(), tgtDir);
 
-    private static void translateRosetta(List<Path> rosettaFiles, String tgtDir) {
-        LOGGER.info("Cleaning target directory: {}", tgtDir);
-        File directory = new File(tgtDir);
-        try {
-            if (directory.exists() && directory.isDirectory()) {
-                FileUtils.cleanDirectory(directory);
-            }
-        } catch (IOException e) {
-            System.err.println("Failed to clean the directory: " + e.getMessage());
-            return;
+        if (rosettaFiles.isEmpty()) {
+            System.err.println("No .rosetta files found to process.");
+            System.exit(1);
         }
 
         Injector injector = new PythonRosettaStandaloneSetup().createInjectorAndDoEMFRegistration();
+        ResourceSet resourceSet = injector.getInstance(ResourceSet.class);
+        List<Resource> resources = new LinkedList<>();
+        RosettaBuiltinsService builtins = injector.getInstance(RosettaBuiltinsService.class);
+        resources.add (resourceSet.getResource(builtins.basicTypesURI, true));
+        resources.add (resourceSet.getResource(builtins.annotationsURI, true));
+        rosettaFiles.stream()
+                .map(path -> resourceSet.getResource(URI.createFileURI(path.toString()), true))
+                .forEach(resources::add);
+
         PythonCodeGenerator pythonCodeGenerator = injector.getInstance(PythonCodeGenerator.class);
         PythonModelLoader modelLoader = injector.getInstance(PythonModelLoader.class);
 
-        List<Path> staticRosettaFilePaths = ClassPathUtils.findStaticRosettaFilePaths();
-        List<RosettaModel> models = modelLoader.rosettaModels(staticRosettaFilePaths, rosettaFiles);
+        List<RosettaModel> models = modelLoader.getRosettaModels(resources);
         if (models.isEmpty()) {
-            System.err.println("No valid Rosetta models found.");
-            return;
+            LOGGER.error("No valid Rosetta models found.");
+            System.exit(1);
         }
-        XtextResourceSet resourceSet = modelLoader.getResourceSet();
-        String version = models.get(0).getVersion();
+        String version = models.getFirst().getVersion();
 
         LOGGER.info("Processing {} models, version: {}", models.size(), version);
 
         Map<String, CharSequence> generatedPython = new HashMap<>();
         pythonCodeGenerator.beforeAllGenerate(resourceSet, models, version);
         for (RosettaModel model : models) {
-            System.out.println("translateRosetta ... processing: " + model.getName());
+            System.out.println("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));
@@ -261,27 +202,12 @@ private static void writePythonFiles(Map<String, CharSequence> generatedPython,
         }
         LOGGER.info("Wrote {} files to {}", generatedPython.size(), tgtDir);
     }
-
     // --- Helper classes for model loading and Guice setup ---
 
     static class PythonModelLoader {
         @Inject Provider<XtextResourceSet> resourceSetProvider;
-
-        public List<RosettaModel> rosettaModels(List<Path> statics, List<Path> sourceFiles) {
-            XtextResourceSet resourceSet = resourceSetProvider.get();
-            return Stream.concat(statics.stream(), sourceFiles.stream())
-                    .map(UrlUtils::toUrl)
-                    .map(PythonModelLoader::url)
-                    .map(f -> getResource(resourceSet, f))
-                    .filter(Objects::nonNull)
-                    .map(Resource::getContents)
-                    .flatMap(Collection::stream)
-                    .filter(r -> r instanceof RosettaModel)
-                    .map(r -> (RosettaModel) r)
-                    .collect(Collectors.toList());
-        }
-
-        public List<RosettaModel> rosettaModels2(List<Resource> resources) {
+        
+        public List<RosettaModel> getRosettaModels(List<Resource> resources) {
             return resources.stream()
                     .filter(Objects::nonNull)
                     .map(Resource::getContents)
@@ -343,4 +269,4 @@ public Injector createInjector() {
             return Guice.createInjector(new PythonRosettaRuntimeModule());
         }
     }
-}
+}
