Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ML] DF Analytics creation wizard: ensure job creation possible when model memory lower than estimate #79229

Merged
merged 2 commits into from
Oct 6, 2020
+11 −5
Merged

[ML] DF Analytics creation wizard: ensure job creation possible when model memory lower than estimate #79229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c14e344
allow user to create job when mml is lower than estimate
alvarezmelissa87 Oct 1, 2020
2c7099a
ensure mml validation works as expected
alvarezmelissa87 Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ..._frame_analytics/pages/analytics_creation/components/advanced_step/advanced_step_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ export const AdvancedStepForm: FC<CreateAnalyticsStepProps> = ({
const isRegOrClassJob =
jobType === ANALYSIS_CONFIG_TYPE.REGRESSION || jobType === ANALYSIS_CONFIG_TYPE.CLASSIFICATION;

const mmlInvalid = modelMemoryLimitValidationResult !== null;
const mmlInvalid =
modelMemoryLimitValidationResult !== null &&
(modelMemoryLimitValidationResult.invalidUnits !== undefined ||
modelMemoryLimitValidationResult.required === true);

const isStepInvalid =
mmlInvalid ||
Expand Down Expand Up @@ -340,7 +343,7 @@ export const AdvancedStepForm: FC<CreateAnalyticsStepProps> = ({
label={i18n.translate('xpack.ml.dataframe.analytics.create.modelMemoryLimitLabel', {
defaultMessage: 'Model memory limit',
})}
isInvalid={mmlInvalid}
isInvalid={modelMemoryLimitValidationResult !== null}
error={mmlErrors}
helpText={i18n.translate(
'xpack.ml.dataframe.analytics.create.modelMemoryLimitHelpText',
Expand All @@ -359,7 +362,7 @@ export const AdvancedStepForm: FC<CreateAnalyticsStepProps> = ({
disabled={isJobCreated}
value={modelMemoryLimit || ''}
onChange={(e) => setFormState({ modelMemoryLimit: e.target.value })}
isInvalid={mmlInvalid}
isInvalid={modelMemoryLimitValidationResult !== null}
data-test-subj="mlAnalyticsCreateJobWizardModelMemoryInput"
/>
</EuiFormRow>
Expand Down
7 changes: 5 additions & 2 deletions ...ata_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export function getModelMemoryLimitErrors(mmlValidationResult: any): string[] |
if (errorKey === 'min') {
acc.push(
i18n.translate('xpack.ml.dataframe.analytics.create.modelMemoryUnitsMinError', {
defaultMessage: 'Model memory limit cannot be lower than {mml}',
defaultMessage: 'Model memory limit is lower than estimated value {mml}',
peteharverson marked this conversation as resolved.
Show resolved Hide resolved
values: {
mml: mmlValidationResult.min.minValue,
},
Expand Down Expand Up @@ -425,12 +425,15 @@ const validateForm = (state: State): State => {
dependentVariable === '';

const mmlValidationResult = validateMml(estimatedModelMemoryLimit, modelMemoryLimit);
const mmlInvalid =
mmlValidationResult !== null &&
(mmlValidationResult.invalidUnits !== undefined || mmlValidationResult.required === true);

state.form.modelMemoryLimitValidationResult = mmlValidationResult;

state.isValid =
!jobTypeEmpty &&
!mmlValidationResult &&
!mmlInvalid &&
!jobIdEmpty &&
jobIdValid &&
!jobIdExists &&
Expand Down