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.

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

RHOAIENG-11049 Add tracking for model serving #3111

Merged
merged 2 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import { isModelMesh } from '~/pages/modelServing/utils';
import ManageKServeModal from '~/pages/modelServing/screens/projects/kServeModal/ManageKServeModal';
import ResourceTr from '~/components/ResourceTr';
import { fireFormTrackingEvent } from '~/concepts/analyticsTracking/segmentIOUtils';
import { TrackingOutcome } from '~/concepts/analyticsTracking/trackingProperties';
import InferenceServiceTableRow from './InferenceServiceTableRow';
import { getGlobalInferenceServiceColumns, getProjectInferenceServiceColumns } from './data';
import DeleteInferenceServiceModal from './DeleteInferenceServiceModal';
Expand Down Expand Up @@ -91,6 +93,10 @@
: undefined
}
onClose={(deleted) => {
fireFormTrackingEvent('Model Deleted', {
outcome: deleted ? TrackingOutcome.submit : TrackingOutcome.cancel,

Check warning on line 97 in frontend/src/pages/modelServing/screens/global/InferenceServiceTable.tsx

View check run for this annotation

Codecov / codecov/patch

frontend/src/pages/modelServing/screens/global/InferenceServiceTable.tsx#L96-L97

Added lines #L96 - L97 were not covered by tests
type: 'multi',
});
if (deleted) {
refresh?.();
}
Expand All @@ -101,6 +107,10 @@
isOpen={!!editInferenceService && isModelMesh(editInferenceService)}
editInfo={editInferenceService}
onClose={(edited) => {
fireFormTrackingEvent('Model Updated', {
outcome: edited ? TrackingOutcome.submit : TrackingOutcome.cancel,

Check warning on line 111 in frontend/src/pages/modelServing/screens/global/InferenceServiceTable.tsx

View check run for this annotation

Codecov / codecov/patch

frontend/src/pages/modelServing/screens/global/InferenceServiceTable.tsx#L110-L111

Added lines #L110 - L111 were not covered by tests
type: 'multi',
});
if (edited) {
refresh?.();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import { ProjectDetailsContext } from '~/pages/projects/ProjectDetailsContext';
import ManageKServeModal from '~/pages/modelServing/screens/projects/kServeModal/ManageKServeModal';
import DeleteInferenceServiceModal from '~/pages/modelServing/screens/global/DeleteInferenceServiceModal';
import { fireFormTrackingEvent } from '~/concepts/analyticsTracking/segmentIOUtils';
import { TrackingOutcome } from '~/concepts/analyticsTracking/trackingProperties';

const KServeInferenceServiceTable: React.FC = () => {
const [editKserveResources, setEditKServeResources] = React.useState<
Expand Down Expand Up @@ -56,6 +58,10 @@
inferenceService={deleteKserveResources?.inferenceService}
servingRuntime={deleteKserveResources?.servingRuntime}
onClose={(deleted) => {
fireFormTrackingEvent('Model Deleted', {
outcome: deleted ? TrackingOutcome.submit : TrackingOutcome.cancel,

Check warning on line 62 in frontend/src/pages/modelServing/screens/projects/KServeSection/KServeInferenceServiceTable.tsx

View check run for this annotation

Codecov / codecov/patch

frontend/src/pages/modelServing/screens/projects/KServeSection/KServeInferenceServiceTable.tsx#L61-L62

Added lines #L61 - L62 were not covered by tests
type: 'single',
});
if (deleted) {
refreshServingRuntime();
refreshInferenceServices();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import ServingRuntimeTableRow from '~/pages/modelServing/screens/projects/ModelM
import DeleteServingRuntimeModal from '~/pages/modelServing/screens/projects/ServingRuntimeModal/DeleteServingRuntimeModal';
import ManageServingRuntimeModal from '~/pages/modelServing/screens/projects/ServingRuntimeModal/ManageServingRuntimeModal';
import ManageInferenceServiceModal from '~/pages/modelServing/screens/projects/InferenceServiceModal/ManageInferenceServiceModal';
import { fireFormTrackingEvent } from '~/concepts/analyticsTracking/segmentIOUtils';
import { TrackingOutcome } from '~/concepts/analyticsTracking/trackingProperties';

const accessReviewResource: AccessReviewResourceAttributes = {
group: 'rbac.authorization.k8s.io',
Expand Down Expand Up @@ -62,6 +64,9 @@ const ServingRuntimeTable: React.FC = () => {
servingRuntime={deleteServingRuntime}
inferenceServices={inferenceServices}
onClose={(deleted) => {
fireFormTrackingEvent('Model Server Deleted', {
outcome: deleted ? TrackingOutcome.submit : TrackingOutcome.cancel,
});
if (deleted) {
refreshServingRuntime();
}
Expand Down Expand Up @@ -95,6 +100,10 @@ const ServingRuntimeTable: React.FC = () => {
refreshDataConnections();
setExpandedServingRuntimeName(deployServingRuntime.metadata.name);
}
fireFormTrackingEvent('Model Deployed', {
outcome: submit ? TrackingOutcome.submit : TrackingOutcome.cancel,
type: 'multi',
});
}}
projectContext={{
currentProject,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
import { useAccessReview } from '~/api';
import { AcceleratorProfileSelectFieldState } from '~/pages/notebookController/screens/server/AcceleratorProfileSelectField';
import useGenericObjectState from '~/utilities/useGenericObjectState';
import { fireFormTrackingEvent } from '~/concepts/analyticsTracking/segmentIOUtils';
import {
FormTrackingEventProperties,
TrackingOutcome,
} from '~/concepts/analyticsTracking/trackingProperties';
import ServingRuntimeReplicaSection from './ServingRuntimeReplicaSection';
import ServingRuntimeSizeSection from './ServingRuntimeSizeSection';
import ServingRuntimeTemplateSection from './ServingRuntimeTemplateSection';
Expand All @@ -43,6 +48,8 @@
verb: 'create',
};

const modelServerAddedName = 'Model Server Added';
const modelServerEditName = 'Model Server Modified';
const ManageServingRuntimeModal: React.FC<ManageServingRuntimeModalProps> = ({
isOpen,
onClose,
Expand Down Expand Up @@ -101,6 +108,12 @@
);

const onBeforeClose = (submitted: boolean) => {
if (!submitted) {
fireFormTrackingEvent(editInfo ? modelServerEditName : modelServerAddedName, {

Check warning on line 112 in frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ManageServingRuntimeModal.tsx

View check run for this annotation

Codecov / codecov/patch

frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ManageServingRuntimeModal.tsx#L112

Added line #L112 was not covered by tests
outcome: TrackingOutcome.cancel,
});
}

onClose(submitted);
setError(undefined);
setActionInProgress(false);
Expand All @@ -120,6 +133,12 @@
setError(undefined);
setActionInProgress(true);

const props: FormTrackingEventProperties = {
outcome: TrackingOutcome.submit,
type: createData.servingRuntimeTemplateName,
size: createData.modelSize.name,
};

submitServingRuntimeResourcesWithDryRun(
servingRuntimeSelected,
createData,
Expand All @@ -134,8 +153,15 @@
undefined,
true,
)
.then(() => onSuccess())
.then(() => {
props.success = true;
fireFormTrackingEvent(editInfo ? modelServerEditName : modelServerAddedName, props);
onSuccess();
})
.catch((e) => {
props.success = false;
props.errorMessage = e;
fireFormTrackingEvent(editInfo ? modelServerEditName : modelServerAddedName, props);
setErrorModal(e);
});
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ import { RegisteredModelDeployInfo } from '~/pages/modelRegistry/screens/Registe
import usePrefillDeployModalFromModelRegistry from '~/pages/modelRegistry/screens/RegisteredModels/usePrefillDeployModalFromModelRegistry';
import { AcceleratorProfileSelectFieldState } from '~/pages/notebookController/screens/server/AcceleratorProfileSelectField';
import useGenericObjectState from '~/utilities/useGenericObjectState';
import { fireFormTrackingEvent } from '~/concepts/analyticsTracking/segmentIOUtils';
import {
FormTrackingEventProperties,
TrackingOutcome,
} from '~/concepts/analyticsTracking/trackingProperties';
import KServeAutoscalerReplicaSection from './KServeAutoscalerReplicaSection';

const accessReviewResource: AccessReviewResourceAttributes = {
Expand Down Expand Up @@ -193,6 +198,9 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
);

const onBeforeClose = (submitted: boolean) => {
fireFormTrackingEvent(editInfo ? 'Model Updated' : 'Model Deployed', {
outcome: TrackingOutcome.cancel,
});
onClose(submitted);
setError(undefined);
setActionInProgress(false);
Expand All @@ -207,9 +215,10 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
setActionInProgress(false);
};

const onSuccess = () => {
const onSuccess = (tProps: FormTrackingEventProperties) => {
setActionInProgress(false);
onBeforeClose(true);
fireFormTrackingEvent(editInfo ? 'Model Updated' : 'Model Deployed', tProps);
};

const submit = () => {
Expand Down Expand Up @@ -249,6 +258,15 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
editInfo?.secrets,
);

const props: FormTrackingEventProperties = {
outcome: TrackingOutcome.submit,
type: 'single',
runtime: servingRuntimeName,
isCustomRuntime: customServingRuntimesEnabled,
servingRuntimeName: createDataServingRuntime.servingRuntimeTemplateName,
servingRuntimeFormat: createDataInferenceService.format.name,
numReplicas: createDataServingRuntime.servingRuntimeTemplateName,
};
Promise.all([
submitServingRuntimeResources({ dryRun: true }),
submitInferenceServiceResource({ dryRun: true }),
Expand All @@ -259,9 +277,16 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
submitInferenceServiceResource({ dryRun: false }),
]),
)
.then(onSuccess)
.then(() => {
props.success = true;
jeff-phillips-18 marked this conversation as resolved.
Show resolved Hide resolved
fireFormTrackingEvent(editInfo ? 'Model Updated' : 'Model Deployed', props);
onSuccess(props);
})
.catch((e) => {
props.success = false;
props.errorMessage = e;
setErrorModal(e);
fireFormTrackingEvent(editInfo ? 'Model Updated' : 'Model Deployed', props);
});
};

Expand Down
Loading