Fix command errors in Nebari server run for templates (#317)

* Fix command errors in Nebari server run for templates

* fmt fix

* Reformat the nebari part in getNbCells

* fix error in the commands

* Update functions/utils.js

Co-authored-by: vfdev <[email protected]>

* To fix last commit issues in Nebari

* fix the commit hash fetch in nebari.js

* Revert "To fix last commit issues in Nebari"

This reverts commit 73339b8.

---------

Co-authored-by: vfdev <[email protected]>

Author: guptaaryan16

functions/nebari.js

@@ -29,16 +29,19 @@ exports.handler = async function (event, _) {
     .join(' ')
 
   // get notebook cell structure
-  const nb = getNbCells(title, zipRes, argparser, template)
+  const nb = getNbCells(title, zipRes, argparser, template, (nebari = true))
+
+  // Updating UUID for nebari-test-fix
+  const nbUid_nebari = nbUid + '-nebari'
 
   // Create the notebook on GitHub
   await pushToGitHub(
     Buffer.from(JSON.stringify(nb)).toString('base64'),
     nbName,
-    nbUid
+    nbUid_nebari
   )
 
-  const nebariLink = `${nebariInstanceLink}/user/${userName}/lab/tree/GitHub%3A${repoOwner}/${repo}/nbs/${nbUid}/${nbName}`
+  const nebariLink = `${nebariInstanceLink}/user/${userName}/lab/tree/GitHub%3A${repoOwner}/${repo}/nbs/${nbUid_nebari}/${nbName}`
 
   return {
     statusCode: 200,

functions/utils.js

@@ -110,9 +110,10 @@ export function getRootUrlWithoutTrailingSlash(url) {
  * @param {string} zipRes
  * @param {string} argparser
  * @param {string} template
+ * @param {boolean} nebari
  * @returns {JSON} nb
  */
-export function getNbCells(title, zipRes, argparser, template) {
+export function getNbCells(title, zipRes, argparser, template, nebari = false) {
   function create_nb_cell(source_array, cell_type) {
     return {
       cell_type: cell_type,
@@ -136,20 +137,30 @@ export function getNbCells(title, zipRes, argparser, template) {
     'Please, run the cell below to execute your code.'
   ]
 
-  const common_nb_commands = [
+  let common_nb_commands = [
     `!wget ${zipRes}\n`,
     `!unzip ${template}.zip\n`,
     '!pip install -r requirements.txt'
   ]
 
-  const execution_nb_commands = [
+  let execution_nb_commands = [
     `!python main.py ${
       argparser === 'hydra'
         ? '#--config-dir=/content/ --config-name=config.yaml'
         : 'config.yaml'
     }`
   ]
 
+  // To have seperate folder in Nebari server for downloading and executing files
+  if (nebari) {
+    common_nb_commands = [
+      'cur_dir = !mkdir pytorch-ignite-template-`date "+%Y%m%d-%H%M%S"` && cd $_ && echo $PWD\n',
+      `%cd {cur_dir[0]}\n`,
+      ...common_nb_commands
+    ]
+    execution_nb_commands = [`%cd {cur_dir[0]}\n`, ...execution_nb_commands]
+  }
+
   let nb_cells = [
     create_nb_cell(md_cell, 'markdown'),
     create_nb_cell(common_nb_commands, 'code')