From ee95bf4f2ade52ebc1525feb3fced7d3964a7c7e Mon Sep 17 00:00:00 2001
From: amesar <amesar>
Date: Mon, 3 Jul 2023 11:44:59 +0000
Subject: [PATCH] Isse #12: Sklearn_Wine + Common notebooks: adapted
 display_registered_model_version_uri() and display_registered_model_uri() to
 display links to UC model registry

---
 databricks/notebooks/basic/Common.py       | 18 ++++++++++++++++--
 databricks/notebooks/basic/Sklearn_Wine.py | 11 ++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/databricks/notebooks/basic/Common.py b/databricks/notebooks/basic/Common.py
index 2667c08..f968440 100644
--- a/databricks/notebooks/basic/Common.py
+++ b/databricks/notebooks/basic/Common.py
@@ -23,14 +23,28 @@ def display_run_uri(experiment_id, run_id):
 
 def display_registered_model_uri(model_name):
     if _host_name:
-        uri = f"https://{_host_name}/#mlflow/models/{model_name}"
+        if "." in model_name:
+            model_name = model_name.replace(".","/")
+            uri = f"https://{_host_name}/explore/data/models/{model_name}"
+        else:
+            uri = f"https://{_host_name}/#mlflow/models/{model_name}"
         displayHTML("""<b>Registered Model URI:</b> <a href="{}">{}</a>""".format(uri,uri))
 
 # COMMAND ----------
 
+# Test
+#display_registered_model_uri("Sklearn_Wine")
+display_registered_model_uri("andre_catalog.ml_models.Sklearn_Wine_ws")
+
+# COMMAND ----------
+
 def display_registered_model_version_uri(model_name, version):
     if _host_name:
-        uri = f"https://{_host_name}/#mlflow/models/{model_name}/versions/{version}"
+        if "." in model_name:
+            model_name = model_name.replace(".","/")
+            uri = f"https://{_host_name}/explore/data/models/{model_name}/version/{version}"
+        else:
+            uri = f"https://{_host_name}/#mlflow/models/{model_name}/versions/{version}"
         displayHTML("""<b>Registered Model Version URI:</b> <a href="{}">{}</a>""".format(uri,uri))
 
 # COMMAND ----------
diff --git a/databricks/notebooks/basic/Sklearn_Wine.py b/databricks/notebooks/basic/Sklearn_Wine.py
index 6aeed64..2318d10 100644
--- a/databricks/notebooks/basic/Sklearn_Wine.py
+++ b/databricks/notebooks/basic/Sklearn_Wine.py
@@ -222,7 +222,7 @@ def set_run_name_to_run_id(run):
 
 # COMMAND ----------
 
-# MAGIC %md ### Display UI links
+# MAGIC %md ### Display UI links - XX
 
 # COMMAND ----------
 
@@ -234,11 +234,12 @@ def set_run_name_to_run_id(run):
 
 # COMMAND ----------
 
+model_name
+
+# COMMAND ----------
+
 if model_name:
-    if use_uc:
-        print("TODO: UC model link coming soon")
-    else:
-        display_registered_model_version_uri(model_name, version.version)
+    display_registered_model_version_uri(model_name, version.version)
 
 # COMMAND ----------