From 6dc267b65d9c16a5ea1e452066eaf9a4f8ef3ce0 Mon Sep 17 00:00:00 2001
From: Yohann Paris <github@yohannparis.com>
Date: Thu, 29 Feb 2024 10:21:40 -0600
Subject: [PATCH 1/6] First pass

---
 packages/client/hmi-client/src/ace-config.ts  | 53 +++++++++++++++++++
 .../ops/model-edit/tera-model-edit.vue        | 19 ++++---
 2 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 packages/client/hmi-client/src/ace-config.ts

diff --git a/packages/client/hmi-client/src/ace-config.ts b/packages/client/hmi-client/src/ace-config.ts
new file mode 100644
index 0000000000..b46cc36c69
--- /dev/null
+++ b/packages/client/hmi-client/src/ace-config.ts
@@ -0,0 +1,53 @@
+import ace from 'ace-builds';
+
+import modeJsonUrl from 'ace-builds/src-noconflict/mode-json?url';
+
+import modeJavascriptUrl from 'ace-builds/src-noconflict/mode-javascript?url';
+
+import modeHtmlUrl from 'ace-builds/src-noconflict/mode-html?url';
+
+import modeYamlUrl from 'ace-builds/src-noconflict/mode-yaml?url';
+
+import themeGithubUrl from 'ace-builds/src-noconflict/theme-github?url';
+
+import themeChromeUrl from 'ace-builds/src-noconflict/theme-chrome?url';
+
+import themeMonokaiUrl from 'ace-builds/src-noconflict/theme-monokai?url';
+
+import workerBaseUrl from 'ace-builds/src-noconflict/worker-base?url';
+
+import workerJsonUrl from 'ace-builds/src-noconflict/worker-json?url';
+
+import workerJavascriptUrl from 'ace-builds/src-noconflict/worker-javascript?url';
+
+import workerHtmlUrl from 'ace-builds/src-noconflict/worker-html?url';
+
+import workerYamlUrl from 'ace-builds/src-noconflict/worker-yaml?url';
+
+import snippetsHtmlUrl from 'ace-builds/src-noconflict/snippets/html?url';
+
+import snippetsJsUrl from 'ace-builds/src-noconflict/snippets/javascript?url';
+
+import snippetsYamlUrl from 'ace-builds/src-noconflict/snippets/yaml?url';
+
+import snippetsJsonUrl from 'ace-builds/src-noconflict/snippets/json?url';
+
+import 'ace-builds/src-noconflict/ext-language_tools';
+
+ace.config.setModuleUrl('ace/mode/json', modeJsonUrl);
+ace.config.setModuleUrl('ace/mode/javascript', modeJavascriptUrl);
+ace.config.setModuleUrl('ace/mode/html', modeHtmlUrl);
+ace.config.setModuleUrl('ace/mode/yaml', modeYamlUrl);
+ace.config.setModuleUrl('ace/theme/github', themeGithubUrl);
+ace.config.setModuleUrl('ace/theme/chrome', themeChromeUrl);
+ace.config.setModuleUrl('ace/theme/monokai', themeMonokaiUrl);
+ace.config.setModuleUrl('ace/mode/base', workerBaseUrl);
+ace.config.setModuleUrl('ace/mode/json_worker', workerJsonUrl);
+ace.config.setModuleUrl('ace/mode/javascript_worker', workerJavascriptUrl);
+ace.config.setModuleUrl('ace/mode/html_worker', workerHtmlUrl);
+ace.config.setModuleUrl('ace/mode/yaml_worker', workerYamlUrl);
+ace.config.setModuleUrl('ace/snippets/html', snippetsHtmlUrl);
+ace.config.setModuleUrl('ace/snippets/javascript', snippetsJsUrl);
+ace.config.setModuleUrl('ace/snippets/javascript', snippetsYamlUrl);
+ace.config.setModuleUrl('ace/snippets/json', snippetsJsonUrl);
+ace.require('ace/ext/language_tools');
diff --git a/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue b/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
index 20fc4d9a97..22827e1baf 100644
--- a/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
+++ b/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
@@ -85,7 +85,7 @@
 
 <script setup lang="ts">
 import _ from 'lodash';
-import { onMounted, onUnmounted, ref, watch, computed } from 'vue';
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import Button from 'primevue/button';
 import InputText from 'primevue/inputtext';
 import type { Model } from '@/types/Types';
@@ -97,12 +97,12 @@ import { useProjects } from '@/composables/project';
 import { logger } from '@/utils/logger';
 import { VAceEditor } from 'vue3-ace-editor';
 import { VAceEditorInstance } from 'vue3-ace-editor/types';
+import '@/ace-config';
 import { v4 as uuidv4 } from 'uuid';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 import TeraDrilldownPreview from '@/components/drilldown/tera-drilldown-preview.vue';
 import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
 import { KernelSessionManager } from '@/services/jupyter';
-import TeraModelTemplateEditor from '@/components/model-template/tera-model-template-editor.vue';
 import TeraNotebookJupyterInput from '@/components/llm/tera-notebook-jupyter-input.vue';
 import { ModelEditOperationState } from './model-edit-operation';
 
@@ -153,12 +153,17 @@ const sampleAgentQuestions = [
 	'Rename the transition infection to inf.'
 ];
 
-const codeText = ref(
-	'# This environment contains the variable "model" \n# which is displayed on the right'
-);
+const defaultCodeText =
+	'# This environment contains the variable "model" \n# which is displayed on the right';
+const codeText = ref(defaultCodeText);
 
 const appendCode = (data: any, property: string) => {
-	codeText.value = codeText.value.concat(' \n', data.content[property] as string);
+	const code = data.content[property] as string;
+	if (code) {
+		codeText.value = (codeText.value ?? defaultCodeText).concat(' \n', code);
+	} else {
+		logger.error('No code to append');
+	}
 };
 
 const syncWithMiraModel = (data: any) => {
@@ -221,7 +226,7 @@ const handleResetResponse = (data: any) => {
 	if (data.content.success) {
 		// updateStratifyGroupForm(blankStratifyGroup);
 
-		codeText.value = '';
+		codeText.value = defaultCodeText;
 		saveCodeToState('', false);
 
 		logger.info('Model reset');

From f079860c6ea6a63e7c0bcca8eeaf5b2757ea7d43 Mon Sep 17 00:00:00 2001
From: Yohann Paris <github@yohannparis.com>
Date: Thu, 29 Feb 2024 10:24:23 -0600
Subject: [PATCH 2/6] Update ace-config.ts

---
 packages/client/hmi-client/src/ace-config.ts | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/packages/client/hmi-client/src/ace-config.ts b/packages/client/hmi-client/src/ace-config.ts
index b46cc36c69..ba9463d9ca 100644
--- a/packages/client/hmi-client/src/ace-config.ts
+++ b/packages/client/hmi-client/src/ace-config.ts
@@ -1,37 +1,20 @@
 import ace from 'ace-builds';
-
 import modeJsonUrl from 'ace-builds/src-noconflict/mode-json?url';
-
 import modeJavascriptUrl from 'ace-builds/src-noconflict/mode-javascript?url';
-
 import modeHtmlUrl from 'ace-builds/src-noconflict/mode-html?url';
-
 import modeYamlUrl from 'ace-builds/src-noconflict/mode-yaml?url';
-
 import themeGithubUrl from 'ace-builds/src-noconflict/theme-github?url';
-
 import themeChromeUrl from 'ace-builds/src-noconflict/theme-chrome?url';
-
 import themeMonokaiUrl from 'ace-builds/src-noconflict/theme-monokai?url';
-
 import workerBaseUrl from 'ace-builds/src-noconflict/worker-base?url';
-
 import workerJsonUrl from 'ace-builds/src-noconflict/worker-json?url';
-
 import workerJavascriptUrl from 'ace-builds/src-noconflict/worker-javascript?url';
-
 import workerHtmlUrl from 'ace-builds/src-noconflict/worker-html?url';
-
 import workerYamlUrl from 'ace-builds/src-noconflict/worker-yaml?url';
-
 import snippetsHtmlUrl from 'ace-builds/src-noconflict/snippets/html?url';
-
 import snippetsJsUrl from 'ace-builds/src-noconflict/snippets/javascript?url';
-
 import snippetsYamlUrl from 'ace-builds/src-noconflict/snippets/yaml?url';
-
 import snippetsJsonUrl from 'ace-builds/src-noconflict/snippets/json?url';
-
 import 'ace-builds/src-noconflict/ext-language_tools';
 
 ace.config.setModuleUrl('ace/mode/json', modeJsonUrl);

From 342693b8ba9891420a6909662d6c2952e56bf216 Mon Sep 17 00:00:00 2001
From: Yohann Paris <github@yohannparis.com>
Date: Thu, 29 Feb 2024 10:27:50 -0600
Subject: [PATCH 3/6] Update tera-model-edit.vue

---
 .../hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue b/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
index 22827e1baf..6a91e07dc2 100644
--- a/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
+++ b/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
@@ -256,7 +256,7 @@ const inputChangeHandler = async () => {
 	amr.value = await getModel(modelId);
 	if (!amr.value) return;
 
-	codeText.value = props.node.state.modelEditCodeHistory?.[0]?.code;
+	codeText.value = props.node.state.modelEditCodeHistory?.[0]?.code ?? defaultCodeText;
 
 	// Create a new session and context based on model
 	try {

From 458ee013da67c0f76add4a6d6b4e39988c3b6689 Mon Sep 17 00:00:00 2001
From: Yohann Paris <github@yohannparis.com>
Date: Thu, 29 Feb 2024 10:55:28 -0600
Subject: [PATCH 4/6] Update tera-model-edit.vue

---
 .../hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue b/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
index 6a91e07dc2..6925c74c70 100644
--- a/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
+++ b/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
@@ -103,6 +103,7 @@ import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 import TeraDrilldownPreview from '@/components/drilldown/tera-drilldown-preview.vue';
 import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
 import { KernelSessionManager } from '@/services/jupyter';
+import TeraModelTemplateEditor from '@/components/model-template/tera-model-template-editor.vue';
 import TeraNotebookJupyterInput from '@/components/llm/tera-notebook-jupyter-input.vue';
 import { ModelEditOperationState } from './model-edit-operation';
 

From 7bca3614ed9d9c21f223f72adcd05505bed40d53 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Thu, 29 Feb 2024 12:20:55 -0500
Subject: [PATCH 5/6] import ace-config where ace is used

---
 packages/client/hmi-client/src/ace-config.ts                | 6 ++++++
 .../client/hmi-client/src/components/code/tera-code.vue     | 4 +---
 .../src/components/widgets/tera-import-github-file.vue      | 1 +
 .../src/workflow/ops/model-config/tera-model-config.vue     | 1 +
 .../src/workflow/ops/model-coupling/tera-model-coupling.vue | 1 +
 .../workflow/ops/model-from-code/tera-model-from-code.vue   | 4 +---
 .../src/workflow/ops/stratify-mira/tera-stratify-mira.vue   | 1 +
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/client/hmi-client/src/ace-config.ts b/packages/client/hmi-client/src/ace-config.ts
index ba9463d9ca..6ab1289272 100644
--- a/packages/client/hmi-client/src/ace-config.ts
+++ b/packages/client/hmi-client/src/ace-config.ts
@@ -3,6 +3,9 @@ import modeJsonUrl from 'ace-builds/src-noconflict/mode-json?url';
 import modeJavascriptUrl from 'ace-builds/src-noconflict/mode-javascript?url';
 import modeHtmlUrl from 'ace-builds/src-noconflict/mode-html?url';
 import modeYamlUrl from 'ace-builds/src-noconflict/mode-yaml?url';
+import modePythonUrl from 'ace-builds/src-noconflict/mode-python?url';
+import modeJuliaUrl from 'ace-builds/src-noconflict/mode-julia?url';
+import modeRUrl from 'ace-builds/src-noconflict/mode-r?url';
 import themeGithubUrl from 'ace-builds/src-noconflict/theme-github?url';
 import themeChromeUrl from 'ace-builds/src-noconflict/theme-chrome?url';
 import themeMonokaiUrl from 'ace-builds/src-noconflict/theme-monokai?url';
@@ -21,6 +24,9 @@ ace.config.setModuleUrl('ace/mode/json', modeJsonUrl);
 ace.config.setModuleUrl('ace/mode/javascript', modeJavascriptUrl);
 ace.config.setModuleUrl('ace/mode/html', modeHtmlUrl);
 ace.config.setModuleUrl('ace/mode/yaml', modeYamlUrl);
+ace.config.setModuleUrl('ace/mode/python', modePythonUrl);
+ace.config.setModuleUrl('ace/mode/julia', modeJuliaUrl);
+ace.config.setModuleUrl('ace/mode/r', modeRUrl);
 ace.config.setModuleUrl('ace/theme/github', themeGithubUrl);
 ace.config.setModuleUrl('ace/theme/chrome', themeChromeUrl);
 ace.config.setModuleUrl('ace/theme/monokai', themeMonokaiUrl);
diff --git a/packages/client/hmi-client/src/components/code/tera-code.vue b/packages/client/hmi-client/src/components/code/tera-code.vue
index a3dd688834..63ad392c94 100644
--- a/packages/client/hmi-client/src/components/code/tera-code.vue
+++ b/packages/client/hmi-client/src/components/code/tera-code.vue
@@ -185,9 +185,7 @@
 import { computed, ref, watch } from 'vue';
 import { VAceEditor } from 'vue3-ace-editor';
 import { VAceEditorInstance } from 'vue3-ace-editor/types';
-import 'ace-builds/src-noconflict/mode-python';
-import 'ace-builds/src-noconflict/mode-julia';
-import 'ace-builds/src-noconflict/mode-r';
+import '@/ace-config';
 import Button from 'primevue/button';
 import {
 	getCodeAsset,
diff --git a/packages/client/hmi-client/src/components/widgets/tera-import-github-file.vue b/packages/client/hmi-client/src/components/widgets/tera-import-github-file.vue
index 7802d733f0..b2adfa1f09 100644
--- a/packages/client/hmi-client/src/components/widgets/tera-import-github-file.vue
+++ b/packages/client/hmi-client/src/components/widgets/tera-import-github-file.vue
@@ -200,6 +200,7 @@ import { AssetType, FileCategory } from '@/types/Types';
 import { VAceEditor } from 'vue3-ace-editor';
 import { VAceEditorInstance } from 'vue3-ace-editor/types';
 import { getModeForPath } from 'ace-builds/src-noconflict/ext-modelist';
+import '@/ace-config';
 import Checkbox from 'primevue/checkbox';
 import Dropdown, { DropdownChangeEvent } from 'primevue/dropdown';
 import Breadcrumb from 'primevue/breadcrumb';
diff --git a/packages/client/hmi-client/src/workflow/ops/model-config/tera-model-config.vue b/packages/client/hmi-client/src/workflow/ops/model-config/tera-model-config.vue
index 4cce1bd976..0dfa47464c 100644
--- a/packages/client/hmi-client/src/workflow/ops/model-config/tera-model-config.vue
+++ b/packages/client/hmi-client/src/workflow/ops/model-config/tera-model-config.vue
@@ -268,6 +268,7 @@ import { VAceEditor } from 'vue3-ace-editor';
 import TeraDrilldownPreview from '@/components/drilldown/tera-drilldown-preview.vue';
 import { KernelSessionManager } from '@/services/jupyter';
 import { VAceEditorInstance } from 'vue3-ace-editor/types';
+import '@/ace-config';
 import LoadingWateringCan from '@/assets/images/lottie-loading-wateringCan.json';
 import EmptySeed from '@/assets/images/lottie-empty-seed.json';
 import { Vue3Lottie } from 'vue3-lottie';
diff --git a/packages/client/hmi-client/src/workflow/ops/model-coupling/tera-model-coupling.vue b/packages/client/hmi-client/src/workflow/ops/model-coupling/tera-model-coupling.vue
index aa674031d7..a731cb06eb 100644
--- a/packages/client/hmi-client/src/workflow/ops/model-coupling/tera-model-coupling.vue
+++ b/packages/client/hmi-client/src/workflow/ops/model-coupling/tera-model-coupling.vue
@@ -96,6 +96,7 @@ import { useProjects } from '@/composables/project';
 import { logger } from '@/utils/logger';
 import { VAceEditor } from 'vue3-ace-editor';
 import { VAceEditorInstance } from 'vue3-ace-editor/types';
+import '@/ace-config';
 import { v4 as uuidv4 } from 'uuid';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 import TeraDrilldownPreview from '@/components/drilldown/tera-drilldown-preview.vue';
diff --git a/packages/client/hmi-client/src/workflow/ops/model-from-code/tera-model-from-code.vue b/packages/client/hmi-client/src/workflow/ops/model-from-code/tera-model-from-code.vue
index b202ab5c65..78f833d6fa 100644
--- a/packages/client/hmi-client/src/workflow/ops/model-from-code/tera-model-from-code.vue
+++ b/packages/client/hmi-client/src/workflow/ops/model-from-code/tera-model-from-code.vue
@@ -144,9 +144,7 @@ import { cloneDeep, isEmpty } from 'lodash';
 import Dropdown from 'primevue/dropdown';
 import Button from 'primevue/button';
 import { VAceEditor } from 'vue3-ace-editor';
-import 'ace-builds/src-noconflict/mode-python';
-import 'ace-builds/src-noconflict/mode-julia';
-import 'ace-builds/src-noconflict/mode-r';
+import '@/ace-config';
 import { AssetType, ProgrammingLanguage } from '@/types/Types';
 import type { Card, Code, DocumentAsset, Model } from '@/types/Types';
 import { AssetBlock, WorkflowNode, WorkflowOutput } from '@/types/workflow';
diff --git a/packages/client/hmi-client/src/workflow/ops/stratify-mira/tera-stratify-mira.vue b/packages/client/hmi-client/src/workflow/ops/stratify-mira/tera-stratify-mira.vue
index 1f42846c4d..12d1a8d25b 100644
--- a/packages/client/hmi-client/src/workflow/ops/stratify-mira/tera-stratify-mira.vue
+++ b/packages/client/hmi-client/src/workflow/ops/stratify-mira/tera-stratify-mira.vue
@@ -115,6 +115,7 @@ import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import { VAceEditor } from 'vue3-ace-editor';
 import { VAceEditorInstance } from 'vue3-ace-editor/types';
 import { useToastService } from '@/services/toast';
+import '@/ace-config';
 
 /* Jupyter imports */
 import { KernelSessionManager } from '@/services/jupyter';

From b518f02dba14e4a0f3eb6959db9458c76118ac2c Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Thu, 29 Feb 2024 13:04:55 -0500
Subject: [PATCH 6/6] rm useless thats vue thinks is a prop

---
 .../workflow/ops/model-edit/tera-model-edit.vue   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue b/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
index cb387d1b7c..b3e489f5b9 100644
--- a/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
+++ b/packages/client/hmi-client/src/workflow/ops/model-edit/tera-model-edit.vue
@@ -19,15 +19,14 @@
 						outlined
 						severity="secondary"
 						size="small"
-						@click="runFromCodeWrapper(editor?.getValue() as string)"
+						@click="runFromCodeWrapper"
 					/>
 				</div>
 				<Suspense>
 					<tera-notebook-jupyter-input
 						:kernel-manager="kernelManager"
-						:defaultOptions="sampleAgentQuestions"
+						:default-options="sampleAgentQuestions"
 						@llm-output="(data: any) => appendCode(data, 'code')"
-						class="ai-assistant-container"
 					/>
 				</Suspense>
 				<v-ace-editor
@@ -171,10 +170,10 @@ const syncWithMiraModel = (data: any) => {
 };
 
 // Reset model, then execute the code
-const runFromCodeWrapper = (code: string) => {
+const runFromCodeWrapper = () => {
 	// Reset model
 	kernelManager.sendMessage('reset_request', {}).register('reset_response', () => {
-		runFromCode(code);
+		runFromCode(editor?.getValue() as string);
 	});
 };
 
@@ -271,7 +270,7 @@ const inputChangeHandler = async () => {
 		}
 
 		if (codeText.value && codeText.value.length > 0) {
-			runFromCodeWrapper(codeText.value);
+			runFromCodeWrapper();
 		}
 	} catch (error) {
 		logger.error(`Error initializing Jupyter session: ${error}`);
@@ -381,10 +380,6 @@ onUnmounted(() => {
 	align-items: center;
 }
 
-.ai-assistant-container {
-	margin-left: var(--gap);
-}
-
 .preview-container {
 	display: flex;
 	flex-direction: column;