Only use selected params for modify and commands (#4095)

Author: mattseddon

extension/src/experiments/model/modify/quickPick.test.ts

@@ -109,57 +109,7 @@ describe('pickAndModifyParams', () => {
       '-S',
       `params.yaml:code_names=${thirdInput}`,
       '-S',
-      `params.yaml:transforms='${fourthInput}'`,
-      '-S',
-      [unchanged.path, unchanged.value].join('=')
-    ])
-  })
-
-  it('should convert any unselected params into the required format', async () => {
-    const numericValue = {
-      isString: false,
-      path: 'params.yaml:learning_rate',
-      value: 2e-12
-    }
-    const stringArrayValue = {
-      isString: true,
-      path: 'params.yaml:transforms',
-      value: '[Pipeline: PILBase.create, Pipeline: partial -> PILBase.create]'
-    }
-
-    const actualArrayValue = {
-      isString: false,
-      path: 'params.yaml:code_names',
-      value: [0, 1, 2]
-    }
-
-    const unchanged = [numericValue, stringArrayValue, actualArrayValue]
-    const initialUserResponse = {
-      isString: false,
-      path: 'params.yaml:dropout',
-      value: 0.15
-    }
-
-    mockedQuickPickManyValues.mockResolvedValueOnce([initialUserResponse])
-    const firstInput = '0.16'
-    mockedGetInput.mockResolvedValueOnce(firstInput)
-
-    const paramsToQueue = await pickAndModifyParams([
-      ...unchanged,
-      initialUserResponse
-    ])
-
-    expect(mockedGetInput).toHaveBeenCalledTimes(1)
-
-    expect(paramsToQueue).toStrictEqual([
-      '-S',
-      `params.yaml:dropout=${firstInput}`,
-      '-S',
-      [numericValue.path, numericValue.value].join('='),
-      '-S',
-      [stringArrayValue.path, `'${stringArrayValue.value}'`].join('='),
-      '-S',
-      [actualArrayValue.path, JSON.stringify(actualArrayValue.value)].join('=')
+      `params.yaml:transforms='${fourthInput}'`
     ])
   })
 })

extension/src/experiments/model/modify/quickPick.ts

@@ -6,8 +6,11 @@ import { definedAndNonEmpty } from '../../../util/array'
 import { getEnterValueTitle, Title } from '../../../vscode/title'
 import { Value } from '../../../cli/dvc/contract'
 
-const standardizeValue = (value: Value, isString: boolean): string => {
-  if (isString && typeof value === 'string') {
+const standardizeValue = (
+  value: Value,
+  wrapStringParamForCli = false
+): string => {
+  if (wrapStringParamForCli && typeof value === 'string') {
     return `'${value}'`
   }
   return typeof value === 'object' ? JSON.stringify(value) : String(value)
@@ -18,7 +21,7 @@ const pickParamsToModify = (
 ): Thenable<ParamWithIsString[] | undefined> =>
   quickPickManyValues<ParamWithIsString>(
     params.map(param => ({
-      description: standardizeValue(param.value, false),
+      description: standardizeValue(param.value),
       label: param.path,
       picked: false,
       value: param
@@ -33,7 +36,7 @@ const pickNewParamValues = async (
   for (const { path, value, isString } of paramsToModify) {
     const input = await getInput(
       getEnterValueTitle(path),
-      standardizeValue(value, false)
+      standardizeValue(value)
     )
     if (input === undefined) {
       return
@@ -46,17 +49,6 @@ const pickNewParamValues = async (
   return args
 }
 
-const addUnchanged = (args: string[], unchanged: ParamWithIsString[]) => {
-  for (const { path, value, isString } of unchanged) {
-    args.push(
-      Flag.SET_PARAM,
-      [path, standardizeValue(value, isString)].join('=')
-    )
-  }
-
-  return args
-}
-
 export const pickAndModifyParams = async (
   params: ParamWithIsString[]
 ): Promise<string[] | undefined> => {
@@ -66,14 +58,5 @@ export const pickAndModifyParams = async (
     return
   }
 
-  const args = await pickNewParamValues(paramsToModify)
-
-  if (!args) {
-    return
-  }
-
-  const paramPathsToModify = new Set(paramsToModify.map(param => param.path))
-  const unchanged = params.filter(param => !paramPathsToModify.has(param.path))
-
-  return addUnchanged(args, unchanged)
+  return pickNewParamValues(paramsToModify)
 }