feat: CLI requires the package name and fails if not provided

Author: dschwartz-ftadvisory

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

@@ -186,7 +186,6 @@ public void setNamespacePrefix(String namespacePrefix) {
         return result;
     }
 
-    //todo: manage defining project name when there are multiple namespaces - currently it will just use the first one it encounters, but this may not be ideal
     @Override
     public Map<String, ? extends CharSequence> afterAllGenerate(
             ResourceSet set,
@@ -201,9 +200,22 @@ public void setNamespacePrefix(String namespacePrefix) {
             result.putAll(generateInits(subfolders));
             result.putAll(processDAG(nameSpace, context, cleanVersion));
         }
-        String resolvedProjectName = (projectName != null && !projectName.isBlank())
-                ? projectName
-                : "python-" + contexts.keySet().stream().findFirst().map(ns -> ns.split("\\.")[0]).orElse("unknown");
+        String resolvedProjectName;
+        if (projectName != null && !projectName.isBlank()) {
+            resolvedProjectName = projectName;
+        } else {
+            String derivedNamespace = contexts.entrySet().stream()
+                    .max(Comparator.comparingInt(e -> e.getValue().getSubfolders().size()))
+                    .map(Map.Entry::getKey)
+                    .orElse("unknown");
+            resolvedProjectName = "python-" + derivedNamespace;
+            if (contexts.size() > 1) {
+                LOGGER.warn(
+                        "Multiple top-level namespaces found: {}. Defaulting pyproject.toml project name to '{}' "
+                                + "(largest namespace by file count). Set an explicit project name via setProjectName() to suppress this warning.",
+                        contexts.keySet(), resolvedProjectName);
+            }
+        }
         result.put(PYPROJECT_TOML, PythonCodeGeneratorUtil.createToml(resolvedProjectName, cleanVersion));
         return result;
     }

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

@@ -56,9 +56,8 @@
  * process</li>
  * <li><b>-t, --tgt &lt;target-dir&gt;</b>: Target directory for generated
  * Python code (defaults to <code>./python</code> if not specified)</li>
- * <li><b>-p, --project-name &lt;projectName&gt;</b>: Override the
- * <code>pyproject.toml</code> project name (default:
- * <code>python-&lt;first-namespace-segment&gt;</code>)</li>
+ * <li><b>-p, --project-name &lt;projectName&gt;</b>: The
+ * <code>pyproject.toml</code> project name (required)</li>
  * <li><b>-x, --namespace-prefix &lt;prefix&gt;</b>: Prepend a prefix segment
  * to every generated namespace (e.g. {@code finos} turns {@code cdm.x.y} into
  * {@code finos.cdm.x.y})</li>
@@ -119,7 +118,7 @@ public int execute(String[] args) {
         Option failOnWarningsOpt = Option.builder("w").longOpt("fail-on-warnings")
                 .desc("Treat validation warnings as errors").build();
         Option projectNameOpt = Option.builder("p").longOpt("project-name").argName("projectName")
-                .desc("Override the pyproject.toml project name (default: python-<first-namespace-segment>)")
+                .desc("The pyproject.toml project name (required)")
                 .hasArg().build();
         Option namespacePrefixOpt = Option.builder("x").longOpt("namespace-prefix").argName("namespacePrefix")
                 .desc("Prepend a prefix segment to every namespace (e.g. 'finos' turns 'cdm.x.y' into 'finos.cdm.x.y')")
@@ -162,6 +161,12 @@ public int execute(String[] args) {
                 }
             }
 
+            if (projectName == null || projectName.isBlank()) {
+                System.err.println("Project name (-p / --project-name) is required.");
+                printUsage(options);
+                return 1;
+            }
+
             if (cmd.hasOption("s")) {
                 String srcDir = cmd.getOptionValue("s");
                 return translateFromSourceDir(

src/test/java/com/regnosys/rosetta/generator/python/PythonCodeGeneratorCLITest.java

@@ -49,6 +49,17 @@ void testInvalidSourceFileReturnsError() {
         assertEquals(1, exitCode, "Should return 1 when source file does not exist");
     }
 
+    @Test
+    void testMissingProjectNameReturnsError() throws IOException {
+        Path validFile = createValidRosettaFile(tempDir);
+        PythonCodeGeneratorCLI cli = new PythonCodeGeneratorCLI();
+        int exitCode = cli.execute(new String[] {
+                "-f", validFile.toString(),
+                "-t", tempDir.resolve("python").toString()
+        });
+        assertEquals(1, exitCode, "Should return 1 when -p is not provided");
+    }
+
     @Test
     void testValidationErrorsFailByDefault() throws IOException {
         Path validFile = createValidRosettaFile(tempDir); // Use valid file, let MockValidator inject error
@@ -57,7 +68,8 @@ void testValidationErrorsFailByDefault() throws IOException {
 
         int exitCode = cli.execute(new String[] {
                 "-f", validFile.toString(),
-                "-t", tempDir.resolve("python").toString()
+                "-t", tempDir.resolve("python").toString(),
+                "-p", "test-project"
         });
 
         assertEquals(1, exitCode, "Should return 1 (fail) when validation errors occur by default");
@@ -72,6 +84,7 @@ void testAllowErrorsPasses() throws IOException {
         int exitCode = cli.execute(new String[] {
                 "-f", validFile.toString(),
                 "-t", tempDir.resolve("python").toString(),
+                "-p", "test-project",
                 "-e"
         });
 
@@ -87,6 +100,7 @@ void testWarningsFailWithFlag() throws IOException {
         int exitCode = cli.execute(new String[] {
                 "-f", validFile.toString(),
                 "-t", tempDir.resolve("python").toString(),
+                "-p", "test-project",
                 "-w" // --fail-on-warnings
         });
 
@@ -123,6 +137,7 @@ void testDevVersionFormatIsAcceptedAndConverted() throws IOException {
         int exitCode = cli.execute(new String[] {
                 "-f", validFile.toString(),
                 "-t", outputDir.toString(),
+                "-p", "test-project",
                 "-v", "1.2.3-dev.4"
         });
 
@@ -143,6 +158,7 @@ void testDevVersionWithZeroPatchIsAccepted() throws IOException {
         int exitCode = cli.execute(new String[] {
                 "-f", validFile.toString(),
                 "-t", outputDir.toString(),
+                "-p", "test-project",
                 "-v", "1.2.3-dev.0"
         });
 
@@ -168,6 +184,7 @@ void testValidVersionAppearsInToml() throws IOException {
         int exitCode = cli.execute(new String[] {
                 "-f", validFile.toString(),
                 "-t", outputDir.toString(),
+                "-p", "test-project",
                 "-v", "2.5.1"
         });
 

test/cdm_tests/cdm_setup/build_cdm.sh

@@ -46,7 +46,7 @@ CDM_SOURCE_PATH="$MY_PATH/../rosetta"
 PYTHON_TARGET_PATH=$PROJECT_ROOT_PATH/target/python-cdm
 PYTHON_SETUP_PATH="$MY_PATH/../../python_setup"
 JAR_PATH="$PROJECT_ROOT_PATH/target/python-0.0.0.main-SNAPSHOT.jar"
-CDM_PROJECT_NAME="finos_cdm"
+CDM_PROJECT_NAME="finos-cdm"
 cd ${MY_PATH} || error
 
 # Parse command-line arguments for --skip-cdm