dhti-cli 1.0.1 → 1.1.0

package/dist/commands/conch.d.ts

@@ -9,8 +9,9 @@ export default class Conch extends Command {
         branch: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         git: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        local: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        sources: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        sources: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         workdir: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/conch.js

@@ -15,6 +15,7 @@ export default class Conch extends Command {
         '<%= config.bin %> <%= command.id %> install -n my-app -w ~/projects',
         '<%= config.bin %> <%= command.id %> init -n my-app -w ~/projects',
         '<%= config.bin %> <%= command.id %> start -n my-app -w ~/projects',
+        '<%= config.bin %> <%= command.id %> start -n my-app -w ~/projects -s packages/chatbot -s packages/utils',
     ];
     static flags = {
         branch: Flags.string({
@@ -31,10 +32,15 @@ export default class Conch extends Command {
             default: 'dermatologist/openmrs-esm-dhti-template',
             description: 'GitHub repository to install (for install operation)',
         }),
+        local: Flags.string({
+            char: 'l',
+            description: 'Local path to use instead of calculated workdir/name path (for start operation)',
+        }),
         name: Flags.string({ char: 'n', description: 'Name of the conch' }),
         sources: Flags.string({
             char: 's',
-            description: 'Additional sources to include when starting (e.g., packages/esm-chatbot-agent)',
+            description: 'Additional sources to include when starting (e.g., packages/esm-chatbot-agent, packages/esm-another-app)',
+            multiple: true,
         }),
         workdir: Flags.string({
             char: 'w',
@@ -91,21 +97,26 @@ export default class Conch extends Command {
         }
         if (args.op === 'start') {
             // Validate required flags
-            if (!flags.workdir) {
-                console.error(chalk.red('Error: workdir flag is required for start operation'));
-                this.exit(1);
-            }
-            if (!flags.name) {
-                console.error(chalk.red('Error: name flag is required for start operation'));
-                this.exit(1);
+            if (!flags.local) {
+                // If --local is not provided, require workdir and name
+                if (!flags.workdir) {
+                    console.error(chalk.red('Error: workdir flag is required for start operation (unless --local is provided)'));
+                    this.exit(1);
+                }
+                if (!flags.name) {
+                    console.error(chalk.red('Error: name flag is required for start operation (unless --local is provided)'));
+                    this.exit(1);
+                }
             }
-            const targetDir = path.join(flags.workdir, flags.name);
+            const targetDir = flags.local || path.join(flags.workdir, flags.name);
             if (flags['dry-run']) {
                 console.log(chalk.yellow('[DRY RUN] Would execute start operation:'));
                 console.log(chalk.cyan(`  cd ${targetDir}`));
                 let dryRunCommand = 'corepack enable && yarn install && yarn start';
-                if (flags.sources) {
-                    dryRunCommand += ` --sources '${flags.sources}'`;
+                if (flags.sources && flags.sources.length > 0) {
+                    for (const source of flags.sources) {
+                        dryRunCommand += ` --sources '${source}'`;
+                    }
                 }
                 console.log(chalk.cyan(`  ${dryRunCommand}`));
                 return;
@@ -113,7 +124,9 @@ export default class Conch extends Command {
             // Check if directory exists (not in dry-run mode)
             if (!fs.existsSync(targetDir)) {
                 console.error(chalk.red(`Error: Directory does not exist: ${targetDir}`));
-                console.log(chalk.yellow(`Run 'dhti-cli conch init -n ${flags.name} -w ${flags.workdir}' first`));
+                if (!flags.local) {
+                    console.log(chalk.yellow(`Run 'dhti-cli conch init -n ${flags.name} -w ${flags.workdir}' first`));
+                }
                 this.exit(1);
             }
             try {
@@ -121,8 +134,10 @@ export default class Conch extends Command {
                 console.log(chalk.yellow('Press Ctrl-C to stop\n'));
                 // Build the start command with sources flag if provided
                 let startCommand = 'corepack enable && yarn install && yarn start';
-                if (flags.sources) {
-                    startCommand += ` --sources '${flags.sources}'`;
+                if (flags.sources && flags.sources.length > 0) {
+                    for (const source of flags.sources) {
+                        startCommand += ` --sources '${source}'`;
+                    }
                 }
                 // Spawn corepack enable && yarn install && yarn start with stdio inheritance to show output and allow Ctrl-C
                 const child = spawn(startCommand, {
@@ -166,7 +181,7 @@ export default class Conch extends Command {
                 this.exit(1);
             }
             // Warn if sources flag is used with install (not applicable)
-            if (flags.sources) {
+            if (flags.sources && flags.sources.length > 0) {
                 console.warn(chalk.yellow('Warning: --sources flag is not applicable for install operation. It will be ignored.'));
                 console.warn(chalk.yellow('Use --sources with the start operation instead.'));
             }
@@ -185,8 +200,10 @@ export default class Conch extends Command {
                 console.log(chalk.green(`\n✓ Installation complete! Your app is ready at ${targetDir}`));
                 console.log(chalk.blue(`\nTo start development, run:`));
                 let startCmd = `dhti-cli conch start -n ${flags.name} -w ${flags.workdir}`;
-                if (flags.sources) {
-                    startCmd += ` -s '${flags.sources}'`;
+                if (flags.sources && flags.sources.length > 0) {
+                    for (const source of flags.sources) {
+                        startCmd += ` -s '${source}'`;
+                    }
                 }
                 console.log(chalk.cyan(`  ${startCmd}`));
             }

package/dist/commands/elixir.js

@@ -299,43 +299,46 @@ export default class Elixir extends Command {
             }
             return;
         }
-        // Create a directory to install the elixir
-        if (!fs.existsSync(`${flags.workdir}/elixir`)) {
+        // Create a directory to install the elixir (only on first install)
+        const elixirDir = `${flags.workdir}/elixir`;
+        const isFirstInstall = !fs.existsSync(elixirDir);
+        if (isFirstInstall) {
             if (flags['dry-run']) {
-                console.log(chalk.yellow(`[DRY RUN] Would create directory: ${flags.workdir}/elixir`));
+                console.log(chalk.yellow(`[DRY RUN] Would create directory: ${elixirDir}`));
+                console.log(chalk.yellow(`[DRY RUN] Would copy resources from ${RESOURCES_DIR}/genai to ${elixirDir}`));
             }
             else {
-                fs.mkdirSync(`${flags.workdir}/elixir`);
+                fs.mkdirSync(elixirDir);
+                fs.cpSync(path.join(RESOURCES_DIR, 'genai'), elixirDir, { recursive: true });
+                console.log(chalk.blue(`✓ Initialized elixir directory at ${elixirDir}`));
             }
         }
-        if (flags['dry-run']) {
-            console.log(chalk.yellow(`[DRY RUN] Would copy resources from ${RESOURCES_DIR}/genai to ${flags.workdir}/elixir`));
+        else if (args.op === 'install') {
+            console.log(chalk.blue(`Using existing elixir directory at ${elixirDir}`));
         }
-        else {
-            fs.cpSync(path.join(RESOURCES_DIR, 'genai'), `${flags.workdir}/elixir`, { recursive: true });
-        }
-        // if whl is not none, copy the whl file to thee whl directory
+        // if whl is not none, copy the whl file to the whl directory
         if (flags.whl !== 'none') {
-            if (!fs.existsSync(`${flags.workdir}/elixir/whl/`)) {
+            const whlDir = `${elixirDir}/whl/`;
+            if (!fs.existsSync(whlDir)) {
                 if (flags['dry-run']) {
-                    console.log(chalk.yellow(`[DRY RUN] Would create directory: ${flags.workdir}/whl/`));
+                    console.log(chalk.yellow(`[DRY RUN] Would create directory: ${whlDir}`));
                 }
                 else {
-                    fs.mkdirSync(`${flags.workdir}/whl/`);
+                    fs.mkdirSync(whlDir);
                 }
             }
             if (flags['dry-run']) {
-                console.log(chalk.yellow(`[DRY RUN] Would copy ${flags.whl} to ${flags.workdir}/elixir/whl/${path.basename(flags.whl)}`));
-                console.log(chalk.cyan('[DRY RUN] Installing elixir from whl file. Please modify boostrap.py file if needed'));
+                console.log(chalk.yellow(`[DRY RUN] Would copy ${flags.whl} to ${whlDir}${path.basename(flags.whl)}`));
+                console.log(chalk.cyan('[DRY RUN] Installing elixir from whl file. Please modify bootstrap.py file if needed'));
             }
             else {
-                fs.cpSync(flags.whl, `${flags.workdir}/elixir/whl/${path.basename(flags.whl)}`);
-                console.log('Installing elixir from whl file. Please modify boostrap.py file if needed');
+                fs.cpSync(flags.whl, `${whlDir}${path.basename(flags.whl)}`);
+                console.log('Installing elixir from whl file. Please modify bootstrap.py file if needed');
             }
         }
         // Install the elixir from git adding to the pyproject.toml file
-        let pyproject = flags['dry-run'] ? '' : fs.readFileSync(`${flags.workdir}/elixir/pyproject.toml`, 'utf8');
-        const originalServer = flags['dry-run'] ? '' : fs.readFileSync(`${flags.workdir}/elixir/app/server.py`, 'utf8');
+        // Always read from the current state, not the template
+        let pyproject = flags['dry-run'] ? '' : fs.readFileSync(`${elixirDir}/pyproject.toml`, 'utf8');
         let lineToAdd = '';
         if (flags.whl !== 'none') {
             lineToAdd = `${flags.name} = { file = "whl/${path.basename(flags.whl)}" }`;
@@ -366,11 +369,49 @@ export default class Elixir extends Command {
             }
             lineToAdd = `${flags.name} = { path = "${absolutePath}" }`;
         }
+        // Helper function to add dependency to pyproject.toml
+        const addDependencyToPyproject = (content, depName) => {
+            // Check if dependency already exists
+            if (content.includes(`"${depName}"`)) {
+                return content;
+            }
+            // Add to dependencies array
+            return content.replace('dependencies = [', `dependencies = [\n"${depName}",`);
+        };
+        // Helper function to add source to pyproject.toml
+        const addSourceToPyproject = (content, source) => {
+            // Check if source already exists (by checking for the package name)
+            if (content.includes(`${flags.name} =`)) {
+                return content;
+            }
+            // Add to [tool.uv.sources] section
+            return content.replace('[tool.uv.sources]', `[tool.uv.sources]\n${source}\n`);
+        };
+        // Helper function to remove dependency from pyproject.toml
+        const removeDependencyFromPyproject = (content, depName) => {
+            // Remove from dependencies array - handle both formats: "depName", or "depName",\n
+            let result = content.replace(`"${depName}",`, '').replace(`"${depName}"`, '');
+            // Also try to remove with newline variations
+            result = result.replace(`\n"${depName}",`, '').replace(`"${depName}",\n`, '');
+            return result;
+        };
+        // Helper function to remove source from pyproject.toml
+        const removeSourceFromPyproject = (content, pkgName) => {
+            // Remove source line for this package
+            const sourceRegex = new RegExp(`${pkgName}\\s*=\\s*\\{[^}]*\\}\n?`, 'g');
+            return content.replace(sourceRegex, '');
+        };
+        let newPyproject = pyproject;
         if (!flags['dry-run']) {
-            pyproject = pyproject.replace('dependencies = [', `dependencies = [\n"${flags.name}",`);
-            pyproject = pyproject.replace('[tool.uv.sources]', `[tool.uv.sources]\n${lineToAdd}\n`);
+            if (args.op === 'install') {
+                newPyproject = addDependencyToPyproject(pyproject, flags.name);
+                newPyproject = addSourceToPyproject(newPyproject, lineToAdd);
+            }
+            else if (args.op === 'uninstall') {
+                newPyproject = removeDependencyFromPyproject(pyproject, flags.name);
+                newPyproject = removeSourceFromPyproject(newPyproject, flags.name);
+            }
         }
-        const newPyproject = pyproject;
         // Add the elixir import and bootstrap to the server.py file
         let CliImport = `from ${expoName}.bootstrap import bootstrap as ${expoName}_bootstrap\n`;
         CliImport += `${expoName}_bootstrap()\n`;
@@ -380,54 +421,99 @@ ${expoName}_chain = ${expoName}_chain_class().get_chain_as_langchain_tool()
 ${expoName}_mcp_tool = ${expoName}_chain_class().get_chain_as_mcp_tool
 mcp_server.add_tool(${expoName}_mcp_tool) # type: ignore
     `;
-        let newCliImport = '';
-        if (!flags['dry-run']) {
-            newCliImport = fs
-                .readFileSync(`${flags.workdir}/elixir/app/server.py`, 'utf8')
-                .replace('# DHTI_CLI_IMPORT', `#DHTI_CLI_IMPORT\n${CliImport}`);
-        }
         const langfuseRoute = `add_routes(app, ${expoName}_chain.with_config(config), path="/langserve/${expoName}")`;
-        const newLangfuseRoute = flags['dry-run']
-            ? ''
-            : newCliImport.replace('# DHTI_LANGFUSE_ROUTE', `#DHTI_LANGFUSE_ROUTE\n    ${langfuseRoute}`);
         const normalRoute = `add_routes(app, ${expoName}_chain, path="/langserve/${expoName}")`;
-        const newNormalRoute = flags['dry-run']
-            ? ''
-            : newLangfuseRoute.replace('# DHTI_NORMAL_ROUTE', `#DHTI_NORMAL_ROUTE\n    ${normalRoute}`);
         const commonRoutes = `\nadd_invokes(app, path="/langserve/${expoName}")\nadd_services(app, path="/langserve/${expoName}")`;
-        const finalRoute = flags['dry-run']
-            ? ''
-            : newNormalRoute.replace('# DHTI_COMMON_ROUTE', `#DHTI_COMMON_ROUTES${commonRoutes}`);
-        // if args.op === install, add the line to the pyproject.toml file
+        // Helper function to add elixir to server.py
+        // The strategy is to append imports BEFORE the 'import uvicorn' line
+        // and append routes AFTER the route marker comments
+        const addElixirToServer = (elixirName) => {
+            // Read fresh file content each time to get the current state
+            const content = flags['dry-run'] ? '' : fs.readFileSync(`${elixirDir}/app/server.py`, 'utf8');
+            if (flags['dry-run'] || content === '') {
+                return '';
+            }
+            // Check if elixir already installed
+            if (content.includes(`${elixirName}_bootstrap`)) {
+                return content;
+            }
+            let result = content;
+            // Find where to insert the import - look for 'import uvicorn' and insert before it
+            // This way, all imports are together before uvicorn import
+            if (!result.includes('import uvicorn')) {
+                console.error(chalk.red('Error: Could not find "import uvicorn" marker in server.py'));
+                return content;
+            }
+            result = result.replace('import uvicorn', `${CliImport}\nimport uvicorn`);
+            // For routes, we need to insert into both langfuse and normal route sections
+            // But only if they exist
+            // Find the langfuse try block and insert before 'except'
+            if (result.includes('except:')) {
+                // Insert langfuse route before except with proper indentation
+                result = result.replace('except:', `    ${langfuseRoute}\n\nexcept:`);
+                // Insert normal route in the except block, after the '# DHTI_NORMAL_ROUTE' marker
+                result = result.replace('# DHTI_NORMAL_ROUTE\n', `# DHTI_NORMAL_ROUTE\n    ${normalRoute}\n`);
+            }
+            // For common routes, look for the marker and append with proper indentation
+            const commonRoutesMarker = '# DHTI_COMMON_ROUTE';
+            if (result.includes(commonRoutesMarker)) {
+                // Get the exact indentation by checking what comes after the marker
+                const markerIndex = result.indexOf(commonRoutesMarker);
+                const afterMarker = result.substring(markerIndex + commonRoutesMarker.length);
+                const newlineAndIndent = afterMarker.match(/\n[ \t]*/)?.[0] || '\n';
+                result = result.replace(commonRoutesMarker, `${commonRoutesMarker}${newlineAndIndent}${commonRoutes}`);
+            }
+            return result;
+        };
+        // Helper function to remove elixir from server.py
+        const removeElixirFromServer = () => {
+            // Read fresh file content each time to get the current state
+            const content = flags['dry-run'] ? '' : fs.readFileSync(`${elixirDir}/app/server.py`, 'utf8');
+            if (flags['dry-run'] || content === '') {
+                return '';
+            }
+            let result = content;
+            result = result.replace(CliImport, '');
+            result = result.replace(langfuseRoute, '');
+            result = result.replace(normalRoute, '');
+            result = result.replace(commonRoutes, '');
+            return result;
+        };
+        let finalRoute = '';
+        if (!flags['dry-run'] && args.op === 'install') {
+            finalRoute = addElixirToServer(expoName);
+        }
+        else if (!flags['dry-run'] && args.op === 'uninstall') {
+            finalRoute = removeElixirFromServer();
+        }
         if (args.op === 'install') {
             if (flags['dry-run']) {
                 console.log(chalk.yellow('[DRY RUN] Would update files:'));
-                console.log(chalk.cyan(`  - ${flags.workdir}/elixir/pyproject.toml`));
+                console.log(chalk.cyan(`  - ${elixirDir}/pyproject.toml`));
                 console.log(chalk.green(`    Add dependency: "${flags.name}"`));
                 console.log(chalk.green(`    Add source: ${lineToAdd}`));
-                console.log(chalk.cyan(`  - ${flags.workdir}/elixir/app/server.py`));
+                console.log(chalk.cyan(`  - ${elixirDir}/app/server.py`));
                 console.log(chalk.green(`    Add import and routes for ${expoName}`));
             }
             else {
-                fs.writeFileSync(`${flags.workdir}/elixir/pyproject.toml`, newPyproject);
-                fs.writeFileSync(`${flags.workdir}/elixir/app/server.py`, finalRoute);
+                fs.writeFileSync(`${elixirDir}/pyproject.toml`, newPyproject);
+                fs.writeFileSync(`${elixirDir}/app/server.py`, finalRoute);
+                console.log(chalk.green(`✓ Elixir '${flags.name}' installed successfully`));
             }
         }
         if (args.op === 'uninstall') {
             if (flags['dry-run']) {
                 console.log(chalk.yellow('[DRY RUN] Would update files:'));
-                console.log(chalk.cyan(`  - ${flags.workdir}/elixir/pyproject.toml`));
+                console.log(chalk.cyan(`  - ${elixirDir}/pyproject.toml`));
+                console.log(chalk.green(`    Remove dependency: "${flags.name}"`));
                 console.log(chalk.green(`    Remove source: ${lineToAdd}`));
-                console.log(chalk.cyan(`  - ${flags.workdir}/elixir/app/server.py`));
+                console.log(chalk.cyan(`  - ${elixirDir}/app/server.py`));
                 console.log(chalk.green(`    Remove import and routes for ${expoName}`));
             }
             else {
-                // if args.op === uninstall, remove the line from the pyproject.toml file
-                fs.writeFileSync(`${flags.workdir}/elixir/pyproject.toml`, pyproject.replace(lineToAdd, ''));
-                let newServer = originalServer.replace(CliImport, '');
-                newServer = newServer.replace(langfuseRoute, '');
-                newServer = newServer.replace(normalRoute, '');
-                fs.writeFileSync(`${flags.workdir}/elixir/app/server.py`, newServer);
+                fs.writeFileSync(`${elixirDir}/pyproject.toml`, newPyproject);
+                fs.writeFileSync(`${elixirDir}/app/server.py`, finalRoute);
+                console.log(chalk.green(`✓ Elixir '${flags.name}' uninstalled successfully`));
             }
         }
     }

package/dist/resources/docker-compose-master.yml

@@ -215,7 +215,7 @@ services:
     environment:
       - REDIS_HOSTS=local:redis:6379
     ports:
-      - "8081:8081"
+      - "8181:8081"
 
   neo4j:
     image: neo4j:5.1-enterprise

package/oclif.manifest.json

@@ -95,7 +95,8 @@
       "examples": [
         "<%= config.bin %> <%= command.id %> install -n my-app -w ~/projects",
         "<%= config.bin %> <%= command.id %> init -n my-app -w ~/projects",
-        "<%= config.bin %> <%= command.id %> start -n my-app -w ~/projects"
+        "<%= config.bin %> <%= command.id %> start -n my-app -w ~/projects",
+        "<%= config.bin %> <%= command.id %> start -n my-app -w ~/projects -s packages/chatbot -s packages/utils"
       ],
       "flags": {
         "branch": {
@@ -122,6 +123,14 @@
           "multiple": false,
           "type": "option"
         },
+        "local": {
+          "char": "l",
+          "description": "Local path to use instead of calculated workdir/name path (for start operation)",
+          "name": "local",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "name": {
           "char": "n",
           "description": "Name of the conch",
@@ -132,10 +141,10 @@
         },
         "sources": {
           "char": "s",
-          "description": "Additional sources to include when starting (e.g., packages/esm-chatbot-agent)",
+          "description": "Additional sources to include when starting (e.g., packages/esm-chatbot-agent, packages/esm-another-app)",
           "name": "sources",
           "hasDynamicHelp": false,
-          "multiple": false,
+          "multiple": true,
           "type": "option"
         },
         "workdir": {
@@ -796,5 +805,5 @@
       ]
     }
   },
-  "version": "1.0.1"
+  "version": "1.1.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dhti-cli",
   "description": "DHTI CLI",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "author": "Bell Eapen",
   "bin": {
     "dhti-cli": "bin/run.js"