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

Jump to bottom

[ML] DF Analytics Classification: ensure confusion matrix can be fetched #53629

Merged
merged 4 commits into from
Jan 8, 2020
Merged

[ML] DF Analytics Classification: ensure confusion matrix can be fetched #53629

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c95fcb2
check depVar field type before adding keyword suffix for evaluate end…
alvarezmelissa87 Dec 19, 2019
4b52718
update indexPattern type and use FIELD types
alvarezmelissa87 Dec 20, 2019
c22a2ab
add keyword suffix if field type is keyword
alvarezmelissa87 Jan 7, 2020
d1cc510
keyword suffix added if depVar is of type keyword AND text
alvarezmelissa87 Jan 8, 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
4 changes: 3 additions & 1 deletion x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ interface LoadEvalDataConfig {
searchQuery?: ResultsSearchQuery;
ignoreDefaultQuery?: boolean;
jobType: ANALYSIS_CONFIG_TYPE;
requiresKeyword?: boolean;
}

export const loadEvalData = async ({
Expand All @@ -385,14 +386,15 @@ export const loadEvalData = async ({
searchQuery,
ignoreDefaultQuery,
jobType,
requiresKeyword,
}: LoadEvalDataConfig) => {
const results: LoadEvaluateResult = { success: false, eval: null, error: null };
const defaultPredictionField = `${dependentVariable}_prediction`;
let predictedField = `${resultsField}.${
predictionFieldName ? predictionFieldName : defaultPredictionField
}`;

if (jobType === ANALYSIS_CONFIG_TYPE.CLASSIFICATION) {
if (jobType === ANALYSIS_CONFIG_TYPE.CLASSIFICATION && requiresKeyword === true) {
predictedField = `${predictedField}.keyword`;
}

Expand Down
29 changes: 28 additions & 1 deletion ...tics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ import {
ResultsSearchQuery,
ANALYSIS_CONFIG_TYPE,
} from '../../../../common/analytics';
import { IIndexPattern } from '../../../../../../../../../../../src/plugins/data/common/index_patterns';
import { ES_FIELD_TYPES } from '../../../../../../../../../../../src/plugins/data/public';
import { LoadingPanel } from '../loading_panel';
import { getColumnData } from './column_data';
import { useKibanaContext } from '../../../../../contexts/kibana';
import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
import { getIndexPatternIdFromName } from '../../../../../util/index_utils';

const defaultPanelWidth = 500;

Expand All @@ -55,17 +60,19 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
const [docsCount, setDocsCount] = useState<null | number>(null);
const [error, setError] = useState<null | string>(null);
const [panelWidth, setPanelWidth] = useState<number>(defaultPanelWidth);

// Column visibility
const [visibleColumns, setVisibleColumns] = useState(() =>
columns.map(({ id }: { id: string }) => id)
);
const kibanaContext = useKibanaContext();

const index = jobConfig.dest.index;
const sourceIndex = jobConfig.source.index[0];
const dependentVariable = getDependentVar(jobConfig.analysis);
const predictionFieldName = getPredictionFieldName(jobConfig.analysis);
// default is 'ml'
const resultsField = jobConfig.dest.results_field;
let requiresKeyword = false;

const loadData = async ({
isTrainingClause,
Expand All @@ -76,6 +83,25 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
}) => {
setIsLoading(true);

try {
const indexPatternId = getIndexPatternIdFromName(sourceIndex) || sourceIndex;
const indexPattern: IIndexPattern = await kibanaContext.indexPatterns.get(indexPatternId);

if (indexPattern !== undefined) {
await newJobCapsService.initializeFromIndexPattern(indexPattern);
// Check dependent_variable field type to see if .keyword suffix is required for evaluate endpoint
const { fields } = newJobCapsService;
const depVarFieldType = fields.find(field => field.name === dependentVariable)?.type;

if (depVarFieldType !== undefined) {
requiresKeyword = depVarFieldType === ES_FIELD_TYPES.KEYWORD;
}
}
} catch (e) {
// Additional error handling due to missing field type is handled by loadEvalData
console.error('Unable to load new field types', error); // eslint-disable-line no-console
}

const evalData = await loadEvalData({
isTraining: false,
index,
Expand All @@ -85,6 +111,7 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
searchQuery,
ignoreDefaultQuery,
jobType: ANALYSIS_CONFIG_TYPE.CLASSIFICATION,
requiresKeyword,
});

const docsCountResp = await loadDocsCount({
Expand Down
3 changes: 2 additions & 1 deletion x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
} from '../../../common/types/fields';
import {
ES_FIELD_TYPES,
IIndexPattern,
IndexPattern,
IndexPatternsContract,
} from '../../../../../../../src/plugins/data/public';
Expand Down Expand Up @@ -89,7 +90,7 @@ class NewJobCapsService {
}

public async initializeFromIndexPattern(
indexPattern: IndexPattern,
indexPattern: IIndexPattern,
includeEventRateField = true,
removeTextFields = true
) {
Expand Down