diff --git a/.editorconfig b/.editorconfig index 1dbe9d41ae..9fd9bfe4fa 100644 --- a/.editorconfig +++ b/.editorconfig @@ -35,3 +35,7 @@ end_of_line = crlf [*.gradle] indent_size = 4 indent_style = space + +[*.py] +indent_size = 4 +indent_style = space diff --git a/containers/scripts/docker-compose-taskrunner.yml b/containers/scripts/docker-compose-taskrunner.yml index 277ae1acc0..bb358e4c08 100644 --- a/containers/scripts/docker-compose-taskrunner.yml +++ b/containers/scripts/docker-compose-taskrunner.yml @@ -20,9 +20,9 @@ services: extra_hosts: - "${local_host_name}:host-gateway" volumes: - - ../../packages/gollm:/gollm_task + - ../../packages/gollm:/gollm - ../../packages/taskrunner:/taskrunner - command: /gollm_task/dev.sh + command: /gollm/dev.sh mira-taskrunner: build: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41557..df97d72b8b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/packages/client/hmi-client/src/components/documents/tera-document-asset.vue b/packages/client/hmi-client/src/components/documents/tera-document-asset.vue index 14ab6a2e7e..411edbb800 100644 --- a/packages/client/hmi-client/src/components/documents/tera-document-asset.vue +++ b/packages/client/hmi-client/src/components/documents/tera-document-asset.vue @@ -5,111 +5,9 @@ :name="document?.name ?? ''" :overline="document?.source ?? ''" @close-preview="emit('close-preview')" - :hide-intro="view === DocumentView.PDF" :is-loading="documentLoading" > - - - - - -

- - - - - -

-
- - - - - - - - - - - - -
-

- PDF Extractions are processing please come back in some time... -

+

PDF Loading...

diff --git a/packages/client/hmi-client/src/components/workflow/ops/document/tera-document-operation-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/document/tera-document-operation-drilldown.vue index c86a8811aa..3a1bf5862d 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/document/tera-document-operation-drilldown.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/document/tera-document-operation-drilldown.vue @@ -9,96 +9,20 @@ - -
{{ document?.name }}
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue index cfc7e2a1df..24a4831051 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue @@ -106,14 +106,18 @@
    -
  • +
    • -
    • +
    • {{ intervention.name }}
      • ; }>(); -const emit = defineEmits(['close', 'update-state', 'select-output', 'append-output', 'update-output-port']); +const emit = defineEmits(['close', 'update-state', 'select-output', 'append-output']); const confirm = useConfirm(); @@ -279,10 +288,7 @@ const stateOptions = computed(() => { }); const groupedOutputParameters = computed(() => - groupBy( - knobs.value.transientInterventionPolicy.interventions, - (item) => item.dynamicInterventions[0]?.appliedTo || item.staticInterventions[0]?.appliedTo - ) + groupBy(flattenInterventionData(knobs.value.transientInterventionPolicy.interventions), 'appliedTo') ); const preparedCharts = computed(() => @@ -297,6 +303,19 @@ const preparedCharts = computed(() => ) ); +const getInterventionsAppliedTo = (appliedTo: string) => + knobs.value.transientInterventionPolicy.interventions + .map((i) => { + const staticInterventions = i.staticInterventions.filter((s) => s.appliedTo === appliedTo); + const dynamicInterventions = i.dynamicInterventions.filter((d) => d.appliedTo === appliedTo); + return { + name: i.name, + staticInterventions, + dynamicInterventions + }; + }) + .filter((i) => i.dynamicInterventions.length + i.staticInterventions.length > 0); + const initialize = async (overwriteWithState: boolean = false) => { const state = props.node.state; const modelId = props.node.inputs[0].value?.[0]; diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-node.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-node.vue index fe00404409..e1507220eb 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-node.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-node.vue @@ -22,7 +22,7 @@ import { WorkflowNode, WorkflowPortStatus } from '@/types/workflow'; import Button from 'primevue/button'; import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue'; import _, { cloneDeep, groupBy } from 'lodash'; -import { blankIntervention } from '@/services/intervention-policy'; +import { blankIntervention, flattenInterventionData } from '@/services/intervention-policy'; import { createInterventionChart } from '@/services/charts'; import VegaChart from '@/components/widgets/VegaChart.vue'; import { InterventionPolicyState } from './intervention-policy-operation'; @@ -35,7 +35,9 @@ const props = defineProps<{ const modelInput = props.node.inputs.find((input) => input.type === 'modelId'); const isModelInputConnected = computed(() => modelInput?.status === WorkflowPortStatus.CONNECTED); -const groupedOutputParameters = computed(() => groupBy(props.node.state.interventionPolicy.interventions, 'appliedTo')); +const groupedOutputParameters = computed(() => + groupBy(flattenInterventionData(props.node.state.interventionPolicy.interventions), 'appliedTo') +); const preparedCharts = computed(() => _.mapValues(groupedOutputParameters.value, (interventions, key) => diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue index 4ca8d5ff48..d23d623d5e 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue @@ -263,7 +263,7 @@ const isEditingDescription = ref(false); const newDescription = ref(''); const descriptionTextareaRef = ref | null>(null); -const emit = defineEmits(['append-output', 'update-state', 'select-output', 'close', 'update-output-port']); +const emit = defineEmits(['append-output', 'update-state', 'select-output', 'close']); interface BasicKnobs { transientModelConfig: ModelConfiguration; @@ -676,7 +676,7 @@ const resetConfiguration = () => { const updateThoughts = (data: any) => { llmThoughts.value.push(data); const llmResponse = llmThoughts.value.findLast((thought) => thought?.msg_type === 'llm_response'); - // If the last thought is an llm response, update the notebook response + // If the last thought is a LLM response, update the notebook response if (llmResponse) { notebookResponse.value = llmResponse.content.text; } diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue b/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue index 6cb541ae59..ef5068b8ca 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue @@ -132,7 +132,7 @@ import { ModelEditOperationState, ModelEditOperation } from './model-edit-operat const props = defineProps<{ node: WorkflowNode; }>(); -const emit = defineEmits(['append-output', 'update-state', 'close', 'select-output', 'update-output-port']); +const emit = defineEmits(['append-output', 'update-state', 'close', 'select-output', 'update-output']); const outputs = computed(() => { if (!isEmpty(props.node.outputs)) { @@ -404,7 +404,7 @@ function updateNode(model: Model) { if (!outputPort) return; outputPort.label = model.header.name; - emit('update-output-port', outputPort); + emit('update-output', outputPort); } onMounted(async () => { diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue index 65b3759f31..2524d25bec 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue @@ -1,6 +1,7 @@ -