Fix: "Source Run" field in Model Version UI page points to wrong run …

…model artifact in Run UI page (#8156) * init Signed-off-by: Weichen Xu <weichen.xu@databricks.com> * format Signed-off-by: Weichen Xu <weichen.xu@databricks.com> * update Signed-off-by: Weichen Xu <weichen.xu@databricks.com> * update test Signed-off-by: Weichen Xu <weichen.xu@databricks.com> * update Signed-off-by: Weichen Xu <weichen.xu@databricks.com> * update Signed-off-by: Weichen Xu <weichen.xu@databricks.com> * update Signed-off-by: Weichen Xu <weichen.xu@databricks.com> * update Signed-off-by: Weichen Xu <weichen.xu@databricks.com> * update Signed-off-by: Weichen Xu <weichen.xu@databricks.com> --------- Signed-off-by: Weichen Xu <weichen.xu@databricks.com>
mlflow · Apr 12, 2023 · 4728afe · 4728afe
1 parent 928a6ae
commit 4728afe
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 3 deletions.
diff --git a/mlflow/server/js/src/experiment-tracking/routes.js b/mlflow/server/js/src/experiment-tracking/routes.js
@@ -24,8 +24,12 @@ class Routes {
 
   static experimentPageSearchRoute = '/experiments/:experimentId/:searchString';
 
-  static getRunPageRoute(experimentId, runUuid) {
-    return `/experiments/${experimentId}/runs/${runUuid}`;
+  static getRunPageRoute(experimentId, runUuid, artifactPath = null) {
+    const path = `/experiments/${experimentId}/runs/${runUuid}`;
+    if (artifactPath) {
+      return `${path}/artifactPath/${artifactPath}`;
+    }
+    return path;
   }
 
   static runPageRoute = '/experiments/:experimentId/runs/:runUuid';

diff --git a/mlflow/server/js/src/model-registry/components/ModelVersionView.js b/mlflow/server/js/src/model-registry/components/ModelVersionView.js
@@ -24,6 +24,7 @@ import { setModelVersionTagApi, deleteModelVersionTagApi } from '../actions';
 import { connect } from 'react-redux';
 import { OverflowMenu, PageHeader } from '../../shared/building_blocks/PageHeader';
 import { FormattedMessage, injectIntl } from 'react-intl';
+import { extractArtifactPathFromModelSource } from '../utils/VersionUtils';
 
 export class ModelVersionViewImpl extends React.Component {
   static propTypes = {
@@ -316,8 +317,19 @@ export class ModelVersionViewImpl extends React.Component {
         </a>
       );
     } else if (runInfo) {
+      let artifactPath = null;
+      const modelSource = this.props.modelVersion?.source;
+      if (modelSource) {
+        artifactPath = extractArtifactPathFromModelSource(modelSource, runInfo.getRunUuid());
+      }
       return (
-        <Link to={Routers.getRunPageRoute(runInfo.getExperimentId(), runInfo.getRunUuid())}>
+        <Link
+          to={Routers.getRunPageRoute(
+            runInfo.getExperimentId(),
+            runInfo.getRunUuid(),
+            artifactPath,
+          )}
+        >
           {this.resolveRunName()}
         </Link>
       );

diff --git a/mlflow/server/js/src/model-registry/utils/VersionUtils.test.ts b/mlflow/server/js/src/model-registry/utils/VersionUtils.test.ts
@@ -0,0 +1,36 @@
+import { extractArtifactPathFromModelSource } from './VersionUtils';
+
+describe('extractArtifactPathFromModelSource', () => {
+  it('test extractArtifactPathFromModelSource', () => {
+    expect(
+      extractArtifactPathFromModelSource('mlflow-artifacts:/0/01bcd/artifacts/xx/yy', '01bcd'),
+    ).toBe('xx/yy');
+    expect(
+      extractArtifactPathFromModelSource(
+        'mlflow-artifacts:/0/01bcd/artifacts/artifacts/xx/yy',
+        '01bcd',
+      ),
+    ).toBe('artifacts/xx/yy');
+    expect(
+      extractArtifactPathFromModelSource('mlflow-artifacts:/0/01bcd/artifacts/xx/yy', '01bce'),
+    ).toBe(undefined);
+    expect(
+      extractArtifactPathFromModelSource('file///path/to/mlruns/0/01bcd/artifacts/xx/yy', '01bcd'),
+    ).toBe('xx/yy');
+    expect(
+      extractArtifactPathFromModelSource(
+        'file///path/to/artifacts/mlruns/0/01bcd/artifacts/xx/yy',
+        '01bcd',
+      ),
+    ).toBe('xx/yy');
+    expect(
+      extractArtifactPathFromModelSource(
+        'file///path/to/mlruns/0/01bcd/artifacts/artifacts/xx/yy',
+        '01bcd',
+      ),
+    ).toBe('artifacts/xx/yy');
+    expect(
+      extractArtifactPathFromModelSource('file///path/to/mlruns/0/01bcd/artifacts/xx/yy', '01bce'),
+    ).toBe(undefined);
+  });
+});
diff --git a/mlflow/server/js/src/model-registry/utils/VersionUtils.ts b/mlflow/server/js/src/model-registry/utils/VersionUtils.ts
@@ -0,0 +1,6 @@
+/**
+ * Extract artifact path from provided `modelSource` string
+ */
+export function extractArtifactPathFromModelSource(modelSource: string, runId: string) {
+  return modelSource.match(new RegExp(`/${runId}/artifacts/(.+)`))?.[1];
+}