From 683b20aa5b7de4feb386f0d6546e1ac589c01e3e Mon Sep 17 00:00:00 2001
From: Juan Pablo Sarmiento <pablo.sarmiento@twosigma.com>
Date: Wed, 13 Nov 2024 18:38:17 -0500
Subject: [PATCH 1/4] Fixed typescript errors

---
 .../FieldsetSchemasEditor/FieldSchemaRow.tsx  | 50 ++++++++++++++++---
 .../FieldsetSchemaBlock.tsx                   | 12 +----
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldSchemaRow.tsx b/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldSchemaRow.tsx
index 708fc8f..17fa484 100644
--- a/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldSchemaRow.tsx
+++ b/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldSchemaRow.tsx
@@ -7,11 +7,14 @@ import {
   Checkbox,
   Select,
   ComboboxItem,
+  TagsInput,
+  Group,
 } from '@mantine/core';
 import { IconCheck, IconEdit } from '@tabler/icons-react';
 import { FieldSchema, ParamReference } from '../../../client';
 import { useDisclosure } from '@mantine/hooks';
 import { useField } from '@mantine/form';
+import { modals } from '@mantine/modals';
 
 type Props = {
   fieldIndex: number;
@@ -66,7 +69,6 @@ export function FieldSchemaRow({
   onFieldSchemaChange,
 }: Props): JSX.Element {
   const [isEditModeOn, editModeActions] = useDisclosure(false);
-
   const nameField = useField({ initialValue: fieldSchema.name });
   const isRequiredField = useField({
     initialValue: fieldSchema.required,
@@ -83,6 +85,19 @@ export function FieldSchemaRow({
     initialValue: fieldSchema.allowEmptyValues,
     type: 'checkbox',
   });
+  const allowedValuesField = useField({
+    initialValue: Array.isArray(fieldSchema.allowedValues)
+      ? fieldSchema.allowedValues
+      : undefined,
+  });
+
+  const openAllowedValuesModal = () =>
+    modals.openConfirmModal({
+      title: 'Allowed values',
+      children: <TagsInput {...allowedValuesField.getInputProps()} />,
+      labels: { confirm: 'Save', cancel: 'Cancel' },
+      confirmProps: { color: 'blue' },
+    });
 
   const nameColumn = isEditModeOn ? (
     <TextInput {...nameField.getInputProps()} />
@@ -116,6 +131,32 @@ export function FieldSchemaRow({
     <Text size="sm">{booleanToString(fieldSchema.allowEmptyValues)}</Text>
   );
 
+  const allowedValuesColumn = isEditModeOn ? (
+    <Text size="sm">
+      <Group>
+        {allowedValueListToString(fieldSchema.allowedValues)}
+        {isEditModeOn ? (
+          <ActionIcon
+            aria-label="Edit allowed values"
+            variant="transparent"
+            color="dark"
+            size="sm"
+          >
+            <IconEdit
+              onClick={() => {
+                openAllowedValuesModal();
+              }}
+            />
+          </ActionIcon>
+        ) : (
+          ''
+        )}
+      </Group>
+    </Text>
+  ) : (
+    <Text size="sm">{allowedValueListToString(fieldSchema.allowedValues)}</Text>
+  );
+
   return (
     <Table.Tr key={fieldSchema.name}>
       <Table.Td>{nameColumn}</Table.Td>
@@ -123,12 +164,7 @@ export function FieldSchemaRow({
       <Table.Td>{dataTypeColumn}</Table.Td>
       <Table.Td>{isCaseSensitiveColumn}</Table.Td>
       <Table.Td>{allowEmptyValuesColumn}</Table.Td>
-
-      <Table.Td>
-        <Text size="sm">
-          {allowedValueListToString(fieldSchema.allowedValues)}
-        </Text>
-      </Table.Td>
+      <Table.Td>{allowedValuesColumn}</Table.Td>
 
       <Table.Td>
         <ActionIcon
diff --git a/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldsetSchemaBlock.tsx b/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldsetSchemaBlock.tsx
index 85fd074..069b05c 100644
--- a/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldsetSchemaBlock.tsx
+++ b/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldsetSchemaBlock.tsx
@@ -11,7 +11,6 @@ import {
   Button,
   ActionIcon,
   Select,
-  Group,
 } from '@mantine/core';
 import * as Papa from 'papaparse';
 import { IconTrash } from '@tabler/icons-react';
@@ -19,7 +18,6 @@ import { modals } from '@mantine/modals';
 import { FieldSchemaRow } from './FieldSchemaRow';
 import { FieldSchema, FieldsetSchema_Output } from '../../../client';
 import { useField } from '@mantine/form';
-import { InfoTooltip } from '../../ui/InfoTooltip';
 
 type Props = {
   fieldsetSchema: FieldsetSchema_Output;
@@ -137,15 +135,7 @@ export function FieldsetSchemaBlock({
               <Table.Th>Data type</Table.Th>
               <Table.Th>Case sensitive</Table.Th>
               <Table.Th>Allows empty values</Table.Th>
-              <Table.Th>
-                <Group>
-                  Allowed values
-                  <InfoTooltip
-                    tooltip="This feature is not implemented yet"
-                    color="red"
-                  />
-                </Group>
-              </Table.Th>
+              <Table.Th>Allowed values</Table.Th>
               <Table.Th />
             </Table.Tr>
           </Table.Thead>

From 6a867e6c135ace236dd10d484c9b899b1a9a5a5d Mon Sep 17 00:00:00 2001
From: Juan Pablo Sarmiento <pablo.sarmiento@twosigma.com>
Date: Fri, 15 Nov 2024 13:32:36 -0500
Subject: [PATCH 2/4] Added UI to set allowable values

---
 .../AllowedValuesModalContent.tsx             | 131 ++++++++++++++++++
 .../FieldsetSchemasEditor/FieldSchemaRow.tsx  | 124 +++++++++++------
 .../FieldsetSchemaBlock.tsx                   |   9 +-
 .../FieldsetSchemasEditor/index.tsx           |   4 +
 .../SingleWorkflowView/Workspace/index.tsx    |   1 +
 5 files changed, 228 insertions(+), 41 deletions(-)
 create mode 100644 src/components/SingleWorkflowView/FieldsetSchemasEditor/AllowedValuesModalContent.tsx

diff --git a/src/components/SingleWorkflowView/FieldsetSchemasEditor/AllowedValuesModalContent.tsx b/src/components/SingleWorkflowView/FieldsetSchemasEditor/AllowedValuesModalContent.tsx
new file mode 100644
index 0000000..838068a
--- /dev/null
+++ b/src/components/SingleWorkflowView/FieldsetSchemasEditor/AllowedValuesModalContent.tsx
@@ -0,0 +1,131 @@
+import {
+  SegmentedControl,
+  Select,
+  Stack,
+  TagsInput,
+  Text,
+} from '@mantine/core';
+import * as React from 'react';
+import { ParamReference, WorkflowParam } from '../../../client';
+
+export type AllowedValues = string[] | ParamReference | null;
+
+type Props = {
+  defaultAllowedValues: AllowedValues;
+  workflowParams: WorkflowParam[];
+};
+
+export type AllowedValuesModalContentRef = {
+  getAllowedValues(): AllowedValues;
+};
+
+function isParamReference(
+  allowedValues: unknown,
+): allowedValues is ParamReference {
+  return (
+    typeof allowedValues === 'object' &&
+    allowedValues !== null &&
+    'paramId' in allowedValues
+  );
+}
+
+export const AllowedValuesModalContent = React.forwardRef(function (
+  { defaultAllowedValues, workflowParams }: Props,
+  ref: React.ForwardedRef<AllowedValuesModalContentRef>,
+): JSX.Element {
+  const [allowedValues, setAllowedValues] =
+    React.useState<AllowedValues>(defaultAllowedValues);
+
+  const [pickerMode, setPickerMode] = React.useState<
+    'workflow-params' | 'value-list'
+  >(!Array.isArray(defaultAllowedValues) ? 'workflow-params' : 'value-list');
+
+  React.useImperativeHandle(
+    ref,
+    () => {
+      return {
+        getAllowedValues: () => {
+          return allowedValues;
+        },
+      };
+    },
+    [allowedValues],
+  );
+
+  // Filter to only string list params as they're the only valid type for allowed values
+  const paramOptions = workflowParams
+    .filter((param) => param.type === 'string list')
+    .map((param) => ({
+      value: param.id,
+      label: param.displayName,
+    }));
+
+  const onSwitchChange = (value: string) => {
+    setPickerMode(value as 'workflow-params' | 'value-list');
+    setAllowedValues(value === 'value-list' ? [] : null);
+  };
+
+  const renderWorkflowParamsPicker = () => {
+    if (isParamReference(allowedValues) || allowedValues === null) {
+      if (paramOptions.length === 0) {
+        return (
+          <Text size="sm">There are no workflow inputs of type Text List.</Text>
+        );
+      }
+
+      return (
+        <Select
+          value={allowedValues?.paramId}
+          allowDeselect={false}
+          label="Select a parameter"
+          placeholder="Select a parameter"
+          data={paramOptions}
+          onChange={(value) => {
+            if (value) {
+              setAllowedValues({ paramId: value });
+            }
+          }}
+        />
+      );
+    }
+    return null;
+  };
+
+  const renderValueListPicker = () => {
+    if (Array.isArray(allowedValues)) {
+      return (
+        <TagsInput
+          value={allowedValues}
+          label="Press Enter to add a value"
+          placeholder="Enter values"
+          onChange={setAllowedValues}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              event.preventDefault();
+              event.stopPropagation();
+            }
+          }}
+        />
+      );
+    }
+    return null;
+  };
+
+  return (
+    <Stack>
+      <SegmentedControl
+        fullWidth
+        data={[
+          { label: 'Manually enter values', value: 'value-list' },
+          { label: 'Use workflow input', value: 'workflow-params' },
+        ]}
+        value={pickerMode}
+        onChange={onSwitchChange}
+      />
+      {pickerMode === 'workflow-params' ? renderWorkflowParamsPicker() : null}
+      {pickerMode === 'value-list' ? renderValueListPicker() : null}
+    </Stack>
+  );
+});
+
+AllowedValuesModalContent.displayName = 'AllowedValuesModalContent';
diff --git a/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldSchemaRow.tsx b/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldSchemaRow.tsx
index 17fa484..e41023e 100644
--- a/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldSchemaRow.tsx
+++ b/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldSchemaRow.tsx
@@ -1,25 +1,31 @@
-import pluralize from 'pluralize';
 import {
   ActionIcon,
-  Text,
-  Table,
-  TextInput,
   Checkbox,
-  Select,
   ComboboxItem,
-  TagsInput,
   Group,
+  Select,
+  Table,
+  Text,
+  TextInput,
 } from '@mantine/core';
-import { IconCheck, IconEdit } from '@tabler/icons-react';
-import { FieldSchema, ParamReference } from '../../../client';
-import { useDisclosure } from '@mantine/hooks';
 import { useField } from '@mantine/form';
+import { useDisclosure } from '@mantine/hooks';
 import { modals } from '@mantine/modals';
+import { IconCheck, IconEdit } from '@tabler/icons-react';
+import pluralize from 'pluralize';
+import * as React from 'react';
+import { FieldSchema, ParamReference, WorkflowParam } from '../../../client';
+import {
+  AllowedValues,
+  AllowedValuesModalContent,
+  AllowedValuesModalContentRef,
+} from './AllowedValuesModalContent';
 
 type Props = {
   fieldIndex: number;
   fieldSchema: FieldSchema;
   onFieldSchemaChange: (index: number, fieldSchema: FieldSchema) => void;
+  workflowParams: WorkflowParam[];
 };
 
 const DATA_TYPE_OPTIONS: ComboboxItem[] = [
@@ -47,10 +53,11 @@ function booleanToString(val: boolean): string {
 
 function allowedValueListToString(
   allowedValues: string[] | ParamReference | null,
+  workflowParams: WorkflowParam[],
 ): string {
   const EMPTY = '--';
 
-  if (allowedValues === null) {
+  if (allowedValues === null || allowedValues === undefined) {
     return EMPTY;
   }
 
@@ -60,13 +67,18 @@ function allowedValueListToString(
       : pluralize('values', allowedValues.length, true);
   }
 
-  return allowedValues.paramId;
+  const param = workflowParams.find((p) => p.id === allowedValues.paramId);
+  if (param === undefined) {
+    return 'ERROR: Param not found';
+  }
+  return param.displayName;
 }
 
 export function FieldSchemaRow({
   fieldSchema,
   fieldIndex,
   onFieldSchemaChange,
+  workflowParams,
 }: Props): JSX.Element {
   const [isEditModeOn, editModeActions] = useDisclosure(false);
   const nameField = useField({ initialValue: fieldSchema.name });
@@ -85,19 +97,68 @@ export function FieldSchemaRow({
     initialValue: fieldSchema.allowEmptyValues,
     type: 'checkbox',
   });
-  const allowedValuesField = useField({
-    initialValue: Array.isArray(fieldSchema.allowedValues)
-      ? fieldSchema.allowedValues
-      : undefined,
-  });
 
-  const openAllowedValuesModal = () =>
+  const allowedValuesModalRef =
+    React.useRef<AllowedValuesModalContentRef | null>(null);
+  const [currentAllowedValues, setCurrentAllowedValues] =
+    React.useState<AllowedValues>(fieldSchema.allowedValues);
+
+  const openAllowedValuesModal = () => {
     modals.openConfirmModal({
       title: 'Allowed values',
-      children: <TagsInput {...allowedValuesField.getInputProps()} />,
+      children: (
+        <AllowedValuesModalContent
+          ref={allowedValuesModalRef}
+          defaultAllowedValues={currentAllowedValues}
+          workflowParams={workflowParams}
+        />
+      ),
       labels: { confirm: 'Save', cancel: 'Cancel' },
       confirmProps: { color: 'blue' },
+      onConfirm: () => {
+        setCurrentAllowedValues(
+          allowedValuesModalRef.current?.getAllowedValues() ?? null,
+        );
+      },
+      onCancel: () => {
+        setCurrentAllowedValues(fieldSchema.allowedValues);
+      },
+      onKeyDown: (event) => {
+        if (event.key === 'Enter') {
+          event.preventDefault();
+          event.stopPropagation();
+          modals.closeAll();
+        }
+      },
+      trapFocus: true,
     });
+  };
+
+  const onSaveFieldSchema = () => {
+    editModeActions.close();
+
+    // update the field schema
+    const dataType = dataTypeField.getValue();
+    const newFieldSchema: FieldSchema = {
+      ...fieldSchema,
+      allowedValues: currentAllowedValues ?? null,
+      name: nameField.getValue(),
+      required: isRequiredField.getValue(),
+      dataTypeValidation:
+        dataType === 'timestamp'
+          ? {
+              dataType,
+              dateTimeFormat: 'YYYY-MM-DD HH:mm:ss',
+            }
+          : { dataType },
+      caseSensitive: isCaseSensitiveField.getValue(),
+      allowEmptyValues: allowEmptyValuesField.getValue(),
+    };
+
+    console.log('new field schema', newFieldSchema);
+
+    onFieldSchemaChange(fieldIndex, newFieldSchema);
+  };
 
   const nameColumn = isEditModeOn ? (
     <TextInput {...nameField.getInputProps()} />
@@ -134,7 +195,7 @@ export function FieldSchemaRow({
   const allowedValuesColumn = isEditModeOn ? (
     <Text size="sm">
       <Group>
-        {allowedValueListToString(fieldSchema.allowedValues)}
+        {allowedValueListToString(currentAllowedValues, workflowParams)}
         {isEditModeOn ? (
           <ActionIcon
             aria-label="Edit allowed values"
@@ -154,7 +215,9 @@ export function FieldSchemaRow({
       </Group>
     </Text>
   ) : (
-    <Text size="sm">{allowedValueListToString(fieldSchema.allowedValues)}</Text>
+    <Text size="sm">
+      {allowedValueListToString(fieldSchema.allowedValues, workflowParams)}
+    </Text>
   );
 
   return (
@@ -173,26 +236,7 @@ export function FieldSchemaRow({
           size="sm"
           onClick={() => {
             if (isEditModeOn) {
-              editModeActions.close();
-
-              // update the field schema
-              const dataType = dataTypeField.getValue();
-              const newFieldSchema = {
-                ...fieldSchema,
-                name: nameField.getValue(),
-                required: isRequiredField.getValue(),
-                dataTypeValidation:
-                  dataType === 'timestamp'
-                    ? {
-                        dataType,
-                        dateTimeFormat: 'YYYY-MM-DD HH:mm:ss',
-                      }
-                    : { dataType },
-                caseSensitive: isCaseSensitiveField.getValue(),
-                allowEmptyValues: allowEmptyValuesField.getValue(),
-              };
-
-              onFieldSchemaChange(fieldIndex, newFieldSchema);
+              onSaveFieldSchema();
             } else {
               editModeActions.open();
             }
diff --git a/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldsetSchemaBlock.tsx b/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldsetSchemaBlock.tsx
index 069b05c..4946713 100644
--- a/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldsetSchemaBlock.tsx
+++ b/src/components/SingleWorkflowView/FieldsetSchemasEditor/FieldsetSchemaBlock.tsx
@@ -16,7 +16,11 @@ import * as Papa from 'papaparse';
 import { IconTrash } from '@tabler/icons-react';
 import { modals } from '@mantine/modals';
 import { FieldSchemaRow } from './FieldSchemaRow';
-import { FieldSchema, FieldsetSchema_Output } from '../../../client';
+import {
+  FieldSchema,
+  FieldsetSchema_Output,
+  WorkflowParam,
+} from '../../../client';
 import { useField } from '@mantine/form';
 
 type Props = {
@@ -27,6 +31,7 @@ type Props = {
     fieldsetSchema: FieldsetSchema_Output,
   ) => void;
   onFieldsetSchemaDelete: (index: number) => void;
+  workflowParams: WorkflowParam[];
 };
 
 const ALLOW_EXTRA_COLUMNS_OPTIONS = [
@@ -53,6 +58,7 @@ export function FieldsetSchemaBlock({
   index,
   onFieldsetSchemaChange,
   onFieldsetSchemaDelete,
+  workflowParams,
 }: Props): JSX.Element {
   const nameField = useField({ initialValue: fieldsetSchema.name });
   const orderMattersField = useField({
@@ -148,6 +154,7 @@ export function FieldsetSchemaBlock({
                   fieldSchema={fieldSchema}
                   fieldIndex={i}
                   onFieldSchemaChange={onFieldSchemaChange}
+                  workflowParams={workflowParams}
                 />
               );
             })}
diff --git a/src/components/SingleWorkflowView/FieldsetSchemasEditor/index.tsx b/src/components/SingleWorkflowView/FieldsetSchemasEditor/index.tsx
index 0da5f85..c2c782c 100644
--- a/src/components/SingleWorkflowView/FieldsetSchemasEditor/index.tsx
+++ b/src/components/SingleWorkflowView/FieldsetSchemasEditor/index.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Text, Button, Stack } from '@mantine/core';
 import { v4 as uuid } from 'uuid';
 import type { FieldsetSchema_Output } from '../../../client';
+import type { WorkflowParam } from '../../../client'; // assuming WorkflowParam is defined in the same file as FieldsetSchema_Output
 import { FieldsetSchemaBlock } from './FieldsetSchemaBlock';
 
 function makeEmptyFieldsetSchema(idx: number): FieldsetSchema_Output {
@@ -17,11 +18,13 @@ function makeEmptyFieldsetSchema(idx: number): FieldsetSchema_Output {
 type Props = {
   fieldsetSchemas: FieldsetSchema_Output[];
   onFieldsetSchemasChange: (fieldsetSchemas: FieldsetSchema_Output[]) => void;
+  workflowParams: WorkflowParam[];
 };
 
 export function FieldsetSchemasEditor({
   fieldsetSchemas,
   onFieldsetSchemasChange,
+  workflowParams,
 }: Props): JSX.Element {
   const onFieldsetSchemaChange = React.useCallback(
     (index: number, fieldsetSchema: FieldsetSchema_Output) => {
@@ -69,6 +72,7 @@ export function FieldsetSchemasEditor({
                   fieldsetSchema={fieldsetSchema}
                   onFieldsetSchemaChange={onFieldsetSchemaChange}
                   onFieldsetSchemaDelete={onFieldsetSchemaDelete}
+                  workflowParams={workflowParams}
                 />
               );
             })
diff --git a/src/components/SingleWorkflowView/Workspace/index.tsx b/src/components/SingleWorkflowView/Workspace/index.tsx
index debc3ad..8680dc9 100644
--- a/src/components/SingleWorkflowView/Workspace/index.tsx
+++ b/src/components/SingleWorkflowView/Workspace/index.tsx
@@ -102,6 +102,7 @@ export function Workspace({
               <FieldsetSchemasEditor
                 fieldsetSchemas={fieldsetSchemas}
                 onFieldsetSchemasChange={onFieldsetSchemasChange}
+                workflowParams={params}
               />
             </Stack>
           </Stack>

From 16fb2afc1fa58a8934ac2cf052c91a0b0c0b2a92 Mon Sep 17 00:00:00 2001
From: Juan Pablo Sarmiento <pablo.sarmiento@twosigma.com>
Date: Fri, 15 Nov 2024 14:50:32 -0500
Subject: [PATCH 3/4] Added ability to reference allowed values from a param
 input

---
 server/api/views.py                           |  5 +-
 server/workflow_runner/validators.py          | 51 ++++++++++++++-----
 server/workflow_runner/workflow_runner.py     | 20 +++-----
 .../AllowedValuesModalContent.tsx             |  4 +-
 .../TestWorkflowBlock/ParamFormInput.tsx      | 18 +++++--
 5 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/server/api/views.py b/server/api/views.py
index 03e1420..067ee07 100644
--- a/server/api/views.py
+++ b/server/api/views.py
@@ -32,7 +32,8 @@
 )
 from server.models.workflow.db_model import DBWorkflow
 from server.models.workflow.workflow_schema import CsvData, WorkflowSchema
-from server.workflow_runner.workflow_runner import process_workflow, WorkflowParamValue
+from server.workflow_runner.workflow_runner import process_workflow
+from server.workflow_runner.validators import WorkflowParamValue
 
 LOG = logging.getLogger(__name__)
 
@@ -53,7 +54,7 @@ class Settings(BaseSettings):
     AZURE_POLICY_AUTH_NAME: str = Field(default="")
     AZURE_B2C_SCOPES: str = Field(default="")
 
-    model_config: SettingsConfigDict = SettingsConfigDict(
+    model_config: SettingsConfigDict = SettingsConfigDict(  # type: ignore
         env_file=".env.server", case_sensitive=True
     )
 
diff --git a/server/workflow_runner/validators.py b/server/workflow_runner/validators.py
index ecd3956..cfc3848 100644
--- a/server/workflow_runner/validators.py
+++ b/server/workflow_runner/validators.py
@@ -1,10 +1,5 @@
-from typing import Any
-from dataclasses import dataclass
 import datetime
-
 from frictionless import validate, Resource
-from pydantic import BaseModel, Field
-
 from server.models.workflow.workflow_schema import (
     BasicFieldDataTypeSchema,
     FieldSchema,
@@ -12,9 +7,22 @@
     FileTypeValidation,
     RowCountValidation,
     TimestampDataTypeSchema,
-    CsvData,
+    WorkflowParam,
 )
 from server.models.workflow.api_schemas import ValidationFailure
+from .exceptions import ParameterDefinitionNotFoundException
+
+WorkflowParamValue = int | str | list[str] | None
+
+
+def _get_param_schema_by_id(
+    param_schemas: dict[str, WorkflowParam], param_id: str
+) -> WorkflowParam:
+    if param_id in param_schemas:
+        return param_schemas[param_id]
+    raise ParameterDefinitionNotFoundException(
+        f"Parameter definition for id '{param_id}' not found in schema."
+    )
 
 
 def parse_frictionless(
@@ -120,7 +128,11 @@ def _check_csv_columns(
 
 
 def _validate_field(
-    row_num: int, row: dict, field: FieldSchema, params: dict[str, Any]
+    row_num: int,
+    row: dict,
+    field: FieldSchema,
+    param_schemas: dict[str, WorkflowParam],
+    param_values: dict[str, WorkflowParamValue],
 ) -> list[ValidationFailure]:
     """Validate a field in a row."""
     validations = []
@@ -147,7 +159,7 @@ def _validate_field(
             pass  # no additional validation needed
         case BasicFieldDataTypeSchema(data_type="number"):
             try:
-                float(value)
+                float(value)  # type: ignore
             # TypeError is raised if value is None
             except (TypeError, ValueError) as e:
                 # if value is None, and we haven't already added a validation failure for a missing value,
@@ -165,7 +177,7 @@ def _validate_field(
             data_type="timestamp", date_time_format=date_time_format
         ):
             try:
-                datetime.datetime.strptime(value, date_time_format)
+                datetime.datetime.strptime(value, date_time_format)  # type: ignore
             except ValueError:
                 validations.append(
                     ValidationFailure(
@@ -179,8 +191,12 @@ def _validate_field(
         if isinstance(field.allowed_values, list):
             allowed_values = field.allowed_values
         else:
-            allowed_values = params[field.allowed_values.param_id]
-        if value not in allowed_values:
+            param = _get_param_schema_by_id(
+                param_schemas, field.allowed_values.param_id
+            )
+            allowed_values = param_values[param.name]
+
+        if value not in allowed_values:  # type: ignore
             validations.append(
                 ValidationFailure(
                     row_number=row_num,
@@ -195,7 +211,8 @@ def validate_fieldset(
     csv_columns,
     csv_data: list[dict],
     fieldset_schema: FieldsetSchema,
-    params: dict[str, Any],
+    param_schemas: dict[str, WorkflowParam],
+    param_values: dict[str, WorkflowParamValue],
 ) -> list[ValidationFailure]:
     """Validate the fieldset schema of a file."""
     validations = []
@@ -203,6 +220,14 @@ def validate_fieldset(
     validations.extend(_check_csv_columns(csv_columns, fieldset_schema))
     for row_num, row in enumerate(csv_data):
         for field in fieldset_schema.fields:
-            validations.extend(_validate_field(row_num + 1, row, field, params))
+            validations.extend(
+                _validate_field(
+                    row_num=row_num + 1,
+                    row=row,
+                    field=field,
+                    param_schemas=param_schemas,
+                    param_values=param_values,
+                )
+            )
 
     return validations
diff --git a/server/workflow_runner/workflow_runner.py b/server/workflow_runner/workflow_runner.py
index 1161c2f..65ab69c 100644
--- a/server/workflow_runner/workflow_runner.py
+++ b/server/workflow_runner/workflow_runner.py
@@ -1,6 +1,4 @@
 from typing import Any
-import csv
-import io
 
 from frictionless import Resource
 
@@ -20,14 +18,14 @@
     ParameterDefinitionNotFoundException,
 )
 from .validators import (
+    _get_param_schema_by_id,
     validate_fieldset,
     validate_file_type,
     validate_row_count,
     parse_frictionless,
+    WorkflowParamValue,
 )
 
-WorkflowParamValue = int | str | list[str] | None
-
 
 def process_workflow(
     file_name: str,
@@ -131,16 +129,9 @@ def _validate_csv(
                             operation.fieldset_schema, schema.fieldset_schemas
                         )
                     case ParamReference():
-                        param_id = operation.fieldset_schema.param_id
-                        param = param_schemas.get(param_id, None)
-
-                        if not param:
-                            return [
-                                ValidationFailure(
-                                    message=f"Param with id {param_id} could not be found in the param schemas."
-                                )
-                            ]
-
+                        param = _get_param_schema_by_id(
+                            param_schemas, operation.fieldset_schema.param_id
+                        )
                         fieldset_schema_name = param_values[param.name]
                         if type(fieldset_schema_name) != str:
                             return [
@@ -157,6 +148,7 @@ def _validate_csv(
                         csv_data.column_names,
                         csv_data.data,
                         fieldset_schema,
+                        param_schemas,
                         param_values,
                     )
                 )
diff --git a/src/components/SingleWorkflowView/FieldsetSchemasEditor/AllowedValuesModalContent.tsx b/src/components/SingleWorkflowView/FieldsetSchemasEditor/AllowedValuesModalContent.tsx
index 838068a..aad8725 100644
--- a/src/components/SingleWorkflowView/FieldsetSchemasEditor/AllowedValuesModalContent.tsx
+++ b/src/components/SingleWorkflowView/FieldsetSchemasEditor/AllowedValuesModalContent.tsx
@@ -60,7 +60,7 @@ export const AllowedValuesModalContent = React.forwardRef(function (
       label: param.displayName,
     }));
 
-  const onSwitchChange = (value: string) => {
+  const onPickerModeChange = (value: string) => {
     setPickerMode(value as 'workflow-params' | 'value-list');
     setAllowedValues(value === 'value-list' ? [] : null);
   };
@@ -120,7 +120,7 @@ export const AllowedValuesModalContent = React.forwardRef(function (
           { label: 'Use workflow input', value: 'workflow-params' },
         ]}
         value={pickerMode}
-        onChange={onSwitchChange}
+        onChange={onPickerModeChange}
       />
       {pickerMode === 'workflow-params' ? renderWorkflowParamsPicker() : null}
       {pickerMode === 'value-list' ? renderValueListPicker() : null}
diff --git a/src/components/SingleWorkflowView/TestWorkflowBlock/ParamFormInput.tsx b/src/components/SingleWorkflowView/TestWorkflowBlock/ParamFormInput.tsx
index f849d6b..1c17a3d 100644
--- a/src/components/SingleWorkflowView/TestWorkflowBlock/ParamFormInput.tsx
+++ b/src/components/SingleWorkflowView/TestWorkflowBlock/ParamFormInput.tsx
@@ -1,7 +1,7 @@
-import { WorkflowParam } from '../../../client';
-import { NumberInput, Text, TextInput } from '@mantine/core';
-import { match } from 'ts-pattern';
+import { NumberInput, TagsInput, TextInput } from '@mantine/core';
 import { UseFormReturnType } from '@mantine/form';
+import { match } from 'ts-pattern';
+import { WorkflowParam } from '../../../client';
 import { WorkflowParamValues } from './types';
 
 type Props = {
@@ -26,6 +26,7 @@ export function ParamFormInput({ param, paramsForm }: Props): JSX.Element {
             {...inputProps}
             required={param.required}
             label={param.displayName}
+            description={param.description}
           />
         ))
         .with('string', () => (
@@ -34,13 +35,20 @@ export function ParamFormInput({ param, paramsForm }: Props): JSX.Element {
             {...inputProps}
             required={param.required}
             label={param.displayName}
+            description={param.description}
           />
         ))
         .with('string list', () => {
           return (
             <>
-              <Text>{param.displayName}</Text>
-              <Text color="red">String list params are not supported yet.</Text>
+              <TagsInput
+                key={inputKey}
+                {...inputProps}
+                required={param.required}
+                label={param.displayName}
+                description={param.description}
+                placeholder="Press Enter to add a value"
+              />
             </>
           );
         })

From 2198b016ab2ec2340bbbccc763ac5e11b6532890 Mon Sep 17 00:00:00 2001
From: Juan Pablo Sarmiento <pablo.sarmiento@twosigma.com>
Date: Fri, 15 Nov 2024 15:00:18 -0500
Subject: [PATCH 4/4] Fixed python tests

---
 server/models/workflow/api_schemas.py         |  8 ++-
 .../tests/workflow_runner/test_validators.py  | 62 ++++++++++++-------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/server/models/workflow/api_schemas.py b/server/models/workflow/api_schemas.py
index ee9979d..1b5216e 100644
--- a/server/models/workflow/api_schemas.py
+++ b/server/models/workflow/api_schemas.py
@@ -1,4 +1,5 @@
 """Workflow schemas that are used in the API."""
+
 from datetime import datetime
 from typing import Any
 
@@ -35,6 +36,7 @@ class WorkflowUpdate(FullWorkflow):
 
     pass
 
+
 class ValidationFailure(BaseModel):
     """
     A validation failure with a message.
@@ -44,13 +46,17 @@ class ValidationFailure(BaseModel):
     - row_number (int | None) -- The row number of the error. Or None if there
         is no row number (e.g. if this is a file type error).
     """
+
     message: str
     row_number: int | None = Field(default=None, serialization_alias="rowNumber")
 
+
 class WorkflowRunReport(BaseModel):
     """Report for a server-side run of a workflow."""
 
     row_count: int = Field(serialization_alias="rowCount")
     filename: str
     workflow_id: str = Field(serialization_alias="workflowId")
-    validation_failures: list[ValidationFailure] = Field(serialization_alias="validationFailures")
+    validation_failures: list[ValidationFailure] = Field(
+        serialization_alias="validationFailures"
+    )
diff --git a/server/tests/workflow_runner/test_validators.py b/server/tests/workflow_runner/test_validators.py
index 8bcfca3..01033e0 100644
--- a/server/tests/workflow_runner/test_validators.py
+++ b/server/tests/workflow_runner/test_validators.py
@@ -2,6 +2,7 @@
 from unittest.mock import MagicMock
 
 from server.models.workflow.workflow_schema import (
+    WorkflowParam,
     BasicFieldDataTypeSchema,
     FieldSchema,
     FileTypeValidation,
@@ -9,9 +10,11 @@
     RowCountValidation,
     FieldsetSchema,
     TimestampDataTypeSchema,
+    WorkflowParam,
 )
 from server.workflow_runner.validators import (
     ValidationFailure,
+    WorkflowParamValue,
     _check_csv_columns,
     _validate_field,
     validate_file_type,
@@ -242,9 +245,9 @@ def test_validate_field_case_insensitive(self):
             allow_empty_values=False,
             allowed_values=None,
         )
-        self.assertEqual(_validate_field(1, {"Name": "John"}, field, {}), [])
+        self.assertEqual(_validate_field(1, {"Name": "John"}, field, {}, {}), [])
         self.assertEqual(
-            _validate_field(1, {"Name": ""}, field, {}),
+            _validate_field(1, {"Name": ""}, field, {}, {}),
             [
                 ValidationFailure(
                     row_number=1, message="Empty value for the field 'name'"
@@ -258,18 +261,18 @@ def test_validate_field_allow_empty(self):
             "name",
             allow_empty_values=True,
         )
-        self.assertEqual(_validate_field(1, {"name": "John"}, field, {}), [])
-        self.assertEqual(_validate_field(1, {"name": ""}, field, {}), [])
-        self.assertEqual(_validate_field(1, {"name": None}, field, {}), [])
+        self.assertEqual(_validate_field(1, {"name": "John"}, field, {}, {}), [])
+        self.assertEqual(_validate_field(1, {"name": ""}, field, {}, {}), [])
+        self.assertEqual(_validate_field(1, {"name": None}, field, {}, {}), [])
 
         # now disallow empty values
         field = mock_field_schema(
             "name",
             allow_empty_values=False,
         )
-        self.assertEqual(_validate_field(1, {"name": "John"}, field, {}), [])
+        self.assertEqual(_validate_field(1, {"name": "John"}, field, {}, {}), [])
         self.assertEqual(
-            _validate_field(1, {"name": ""}, field, {}),
+            _validate_field(1, {"name": ""}, field, {}, {}),
             [
                 ValidationFailure(
                     row_number=1, message="Empty value for the field 'name'"
@@ -277,7 +280,7 @@ def test_validate_field_allow_empty(self):
             ],
         )
         self.assertEqual(
-            _validate_field(1, {"name": None}, field, {}),
+            _validate_field(1, {"name": None}, field, {}, {}),
             [
                 ValidationFailure(
                     row_number=1, message="Empty value for the field 'name'"
@@ -293,10 +296,10 @@ def test_validate_field_allowed_values(self):
             allow_empty_values=False,
             allowed_values=["John", "Jane"],
         )
-        self.assertEqual(_validate_field(1, {"name": "John"}, field, {}), [])
-        self.assertEqual(_validate_field(1, {"name": "Jane"}, field, {}), [])
+        self.assertEqual(_validate_field(1, {"name": "John"}, field, {}, {}), [])
+        self.assertEqual(_validate_field(1, {"name": "Jane"}, field, {}, {}), [])
         self.assertEqual(
-            _validate_field(1, {"name": "Bob"}, field, {}),
+            _validate_field(1, {"name": "Bob"}, field, {}, {}),
             [
                 ValidationFailure(
                     row_number=1, message="Value 'Bob' is not allowed for field 'name'"
@@ -310,13 +313,27 @@ def test_validate_field_allowed_values_from_param(self):
             required=True,
             case_sensitive=True,
             allow_empty_values=False,
-            allowed_values=ParamReference(paramId="allowed_names"),
+            allowed_values=ParamReference(paramId="allowed_names_uuid"),
+        )
+        param_schemas = {
+            "allowed_names_uuid": WorkflowParam(
+                id="allowed_names_uuid",
+                name="allowed_names",
+                displayName="Allowed names",
+                required=True,
+                description="",
+                type="string list",
+            )
+        }
+        params: dict[str, WorkflowParamValue] = {"allowed_names": ["John", "Jane"]}
+        self.assertEqual(
+            _validate_field(1, {"name": "John"}, field, param_schemas, params), []
+        )
+        self.assertEqual(
+            _validate_field(1, {"name": "Jane"}, field, param_schemas, params), []
         )
-        params = {"allowed_names": ["John", "Jane"]}
-        self.assertEqual(_validate_field(1, {"name": "John"}, field, params), [])
-        self.assertEqual(_validate_field(1, {"name": "Jane"}, field, params), [])
         self.assertEqual(
-            _validate_field(1, {"name": "Bob"}, field, params),
+            _validate_field(1, {"name": "Bob"}, field, param_schemas, params),
             [
                 ValidationFailure(
                     row_number=1, message="Value 'Bob' is not allowed for field 'name'"
@@ -333,10 +350,10 @@ def test_validate_field_number_type(self):
             allowed_values=None,
             data_type_validation=BasicFieldDataTypeSchema(dataType="number"),
         )
-        self.assertEqual(_validate_field(1, {"age": "42"}, field, {}), [])
-        self.assertEqual(_validate_field(1, {"age": "42.0"}, field, {}), [])
+        self.assertEqual(_validate_field(1, {"age": "42"}, field, {}, {}), [])
+        self.assertEqual(_validate_field(1, {"age": "42.0"}, field, {}, {}), [])
         self.assertEqual(
-            _validate_field(1, {"age": "42.0.0"}, field, {}),
+            _validate_field(1, {"age": "42.0.0"}, field, {}, {}),
             [
                 ValidationFailure(
                     row_number=1,
@@ -356,9 +373,9 @@ def test_validate_field_timestamp_type(self):
                 dataType="timestamp", dateTimeFormat="%Y-%m-%d"
             ),
         )
-        self.assertEqual(_validate_field(1, {"date": "2021-01-01"}, field, {}), [])
+        self.assertEqual(_validate_field(1, {"date": "2021-01-01"}, field, {}, {}), [])
         self.assertEqual(
-            _validate_field(1, {"date": "2021-01-01 00:00:00.000"}, field, {}),
+            _validate_field(1, {"date": "2021-01-01 00:00:00.000"}, field, {}, {}),
             [
                 ValidationFailure(
                     row_number=1,
@@ -406,6 +423,7 @@ def test_validate_fieldset_with_bad_data(self):
                 [{"name": "John", "age": "42", "city": "New York"}],
                 fieldset_schema,
                 {},
+                {},
             ),
             [],
         )
@@ -415,6 +433,7 @@ def test_validate_fieldset_with_bad_data(self):
                 [{"name": "John", "age": "42", "city": ""}],
                 fieldset_schema,
                 {},
+                {},
             ),
             [
                 ValidationFailure(
@@ -428,6 +447,7 @@ def test_validate_fieldset_with_bad_data(self):
                 [{"name": "John", "age": None, "city": "New York"}],
                 fieldset_schema,
                 {},
+                {},
             ),
             [
                 ValidationFailure(