Schedule jobs as part of install.sh flow and create documentation (#…

…187)

Makefile

@@ -8,4 +8,4 @@ test:
 	hatch run unit:test
 
 test-cov:
-	hatch run unit:test-cov-report
+	hatch run unit:test-cov-report && open htmlcov/index.html

install.sh

@@ -59,6 +59,6 @@ $py -m pip install --quiet -e .
 
 # Invoke python module of the install app directly,
 # without console_scripts entrypoint
-$py -m databricks.labs.ucx.cli.app install
+$py -m databricks.labs.ucx.install
 
 rm -r "$tmp_dir"

pyproject.toml

@@ -14,8 +14,8 @@ readme = "README.md"
 requires-python = ">=3.10.6" # latest available in DBR 13.2
 keywords = []
 authors = [
-    { name = "Ivan Trusov", email = "[email protected]" },
     { name = "Serge Smertin", email = "[email protected]" },
+    { name = "Ivan Trusov", email = "[email protected]" },
 ]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -50,6 +50,9 @@ test = [
 [project.scripts]
 ucx = "databricks.labs.ucx.__main__:entrypoint"
 
+[project.entry-points.databricks]
+runtime = "databricks.labs.ucx.runtime:main"
+
 [project.urls]
 Issues = "https://github.com/databricks/UC-Upgrade/issues"
 Source = "https://github.com/databricks/UC-Upgrade"

src/databricks/labs/ucx/cli/app.py

@@ -4,10 +4,8 @@
 from typing import Annotated
 
 import typer
-from databricks.sdk import WorkspaceClient
 from typer import Typer
 
-from databricks.labs.ucx.__about__ import __version__
 from databricks.labs.ucx.logger import _install
 
 _install()
@@ -17,14 +15,6 @@
 app = Typer(name="UC Migration Toolkit", pretty_exceptions_show_locals=True)
 
 
-@app.command()
-def install():
-    from databricks.labs.ucx.install import main
-
-    ws = WorkspaceClient(product="ucx", product_version=__version__)
-    main(ws, verbose=False)
-
-
 @app.command()
 def migrate_groups(config_file: Annotated[Path, typer.Argument(help="Path to config file")] = "migration_config.yml"):
     from databricks.labs.ucx.config import MigrationConfig

src/databricks/labs/ucx/config.py

@@ -91,6 +91,7 @@ class MigrationConfig:
     inventory_database: str
     tacl: TaclConfig
     groups: GroupsConfig
+    instance_pool_id: str = None
     connect: ConnectConfig | None = None
     num_threads: int | None = 4
     log_level: str | None = "INFO"
@@ -134,16 +135,21 @@ def from_dict(cls, raw: dict) -> "MigrationConfig":
             tacl=TaclConfig.from_dict(raw.get("tacl", {})),
             groups=GroupsConfig.from_dict(raw.get("groups", {})),
             connect=ConnectConfig.from_dict(raw.get("connect", {})),
+            instance_pool_id=raw.get("instance_pool_id", None),
             num_threads=raw.get("num_threads", 4),
             log_level=raw.get("log_level", "INFO"),
         )
 
     @classmethod
-    def from_file(cls, config_file: Path) -> "MigrationConfig":
+    def from_bytes(cls, raw: str) -> "MigrationConfig":
         from yaml import safe_load
 
-        raw = safe_load(config_file.read_text())
-        return MigrationConfig.from_dict({} if not raw else raw)
+        raw = safe_load(raw)
+        return cls.from_dict({} if not raw else raw)
+
+    @classmethod
+    def from_file(cls, config_file: Path) -> "MigrationConfig":
+        return cls.from_bytes(config_file.read_text())
 
     def to_databricks_config(self) -> Config:
         connect = self.connect

src/databricks/labs/ucx/install.py

@@ -0,0 +1,286 @@
+import logging
+import os
+import re
+import subprocess
+import sys
+import tempfile
+import webbrowser
+from dataclasses import replace
+from pathlib import Path
+
+import yaml
+from databricks.sdk import WorkspaceClient
+from databricks.sdk.core import DatabricksError
+from databricks.sdk.service import compute, jobs
+from databricks.sdk.service.workspace import ImportFormat
+
+from databricks.labs.ucx.__about__ import __version__
+from databricks.labs.ucx.config import GroupsConfig, MigrationConfig, TaclConfig
+from databricks.labs.ucx.runtime import main
+from databricks.labs.ucx.tasks import _TASKS
+
+logger = logging.getLogger(__name__)
+
+
+class Installer:
+    def __init__(self, ws: WorkspaceClient):
+        if "DATABRICKS_RUNTIME_VERSION" in os.environ:
+            msg = "Installer is not supposed to be executed in Databricks Runtime"
+            raise SystemExit(msg)
+        self._ws = ws
+
+    def run(self):
+        self._configure()
+        self._create_jobs()
+
+    @property
+    def _my_username(self):
+        if not hasattr(self, "_me"):
+            self._me = self._ws.current_user.me()
+            is_workspace_admin = any(g.display == "admins" for g in self._me.groups)
+            if not is_workspace_admin:
+                msg = "Current user is not a workspace admin"
+                raise PermissionError(msg)
+        return self._me.user_name
+
+    @property
+    def _install_folder(self):
+        return f"/Users/{self._my_username}/.ucx"
+
+    @property
+    def _config_file(self):
+        return f"{self._install_folder}/config.yml"
+
+    @property
+    def _current_config(self):
+        if hasattr(self, "_config"):
+            return self._config
+        with self._ws.workspace.download(self._config_file) as f:
+            self._config = MigrationConfig.from_bytes(f.read())
+        return self._config
+
+    def _configure(self):
+        config_path = self._config_file
+        ws_file_url = f"{self._ws.config.host}/#workspace{config_path}"
+        try:
+            self._ws.workspace.get_status(config_path)
+            logger.info(f"UCX is already configured. See {ws_file_url}")
+            if self._question("Type 'yes' to open config file in the browser") == "yes":
+                webbrowser.open(ws_file_url)
+            return config_path
+        except DatabricksError as err:
+            if err.error_code != "RESOURCE_DOES_NOT_EXIST":
+                raise err
+
+        logger.info("Please answer a couple of questions to configure Unity Catalog migration")
+        self._config = MigrationConfig(
+            inventory_database=self._question("Inventory Database", default="ucx"),
+            groups=GroupsConfig(
+                selected=self._question("Comma-separated list of workspace group names to migrate").split(","),
+                backup_group_prefix=self._question("Backup prefix", default="db-temp-"),
+            ),
+            tacl=TaclConfig(auto=True),
+            log_level=self._question("Log level", default="INFO"),
+            num_threads=int(self._question("Number of threads", default="8")),
+        )
+
+        config_bytes = yaml.dump(self._config.as_dict()).encode("utf8")
+        self._ws.workspace.upload(config_path, config_bytes, format=ImportFormat.AUTO)
+        logger.info(f"Created configuration file: {config_path}")
+        if self._question("Open config file in the browser and continue installing?", default="yes") == "yes":
+            webbrowser.open(ws_file_url)
+
+    def _create_jobs(self):
+        logger.debug(f"Creating jobs from tasks in {main.__name__}")
+        dbfs_path = self._upload_wheel()
+        deployed_steps = self._deployed_steps()
+        desired_steps = {t.workflow for t in _TASKS.values()}
+        for step_name in desired_steps:
+            settings = self._job_settings(step_name, dbfs_path)
+            if step_name in deployed_steps:
+                job_id = deployed_steps[step_name]
+                logger.info(f"Updating configuration for step={step_name} job_id={job_id}")
+                self._ws.jobs.reset(job_id, jobs.JobSettings(**settings))
+            else:
+                logger.info(f"Creating new job configuration for step={step_name}")
+                deployed_steps[step_name] = self._ws.jobs.create(**settings).job_id
+
+        for step_name, job_id in deployed_steps.items():
+            if step_name not in desired_steps:
+                logger.info(f"Removing job_id={job_id}, as it is no longer needed")
+                self._ws.jobs.delete(job_id)
+
+        self._create_readme(deployed_steps)
+
+    def _create_readme(self, deployed_steps):
+        md = [
+            "# UCX - The Unity Catalog Migration Assistant",
+            "Here are the descriptions of jobs that trigger various stages of migration.",
+        ]
+        for step_name, job_id in deployed_steps.items():
+            md.append(f"## [[UCX] {step_name}]({self._ws.config.host}#job/{job_id})\n")
+            for t in _TASKS.values():
+                if t.workflow != step_name:
+                    continue
+                doc = re.sub(r"\s+", " ", t.doc)
+                md.append(f" - `{t.name}`:  {doc}")
+                md.append("")
+        preamble = ["# Databricks notebook source", "# MAGIC %md"]
+        intro = "\n".join(preamble + [f"# MAGIC {line}" for line in md])
+        path = f"{self._install_folder}/README.py"
+        self._ws.workspace.upload(path, intro.encode("utf8"), overwrite=True)
+        url = f"{self._ws.config.host}/#workspace{path}"
+        logger.info(f"Created notebook with job overview: {url}")
+        msg = "Type 'yes' to open job overview in README notebook in your home directory"
+        if self._question(msg) == "yes":
+            webbrowser.open(url)
+
+    @staticmethod
+    def _question(text: str, *, default: str | None = None) -> str:
+        default_help = "" if default is None else f"\033[36m (default: {default})\033[0m"
+        prompt = f"\033[1m{text}{default_help}: \033[0m"
+        res = None
+        while not res:
+            res = input(prompt)
+            if not res and default is not None:
+                return default
+        return res
+
+    def _upload_wheel(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            wheel = self._build_wheel(tmp_dir)
+            dbfs_path = f"{self._install_folder}/wheels/{wheel.name}"
+            with wheel.open("rb") as f:
+                logger.info(f"Uploading wheel to dbfs:{dbfs_path}")
+                self._ws.dbfs.upload(dbfs_path, f, overwrite=True)
+        return dbfs_path
+
+    def _job_settings(self, step_name, dbfs_path):
+        config_file = f"/Workspace/{self._install_folder}/config.yml"
+        email_notifications = None
+        if "@" in self._my_username:
+            email_notifications = jobs.JobEmailNotifications(
+                on_success=[self._my_username], on_failure=[self._my_username]
+            )
+        tasks = sorted([t for t in _TASKS.values() if t.workflow == step_name], key=lambda _: _.name)
+        return {
+            "name": f"[UCX] {step_name}",
+            "tags": {"App": "ucx", "step": step_name},
+            "job_clusters": self._job_clusters({t.job_cluster for t in tasks}),
+            "email_notifications": email_notifications,
+            "tasks": [
+                jobs.Task(
+                    task_key=task.name,
+                    job_cluster_key=task.job_cluster,
+                    depends_on=[jobs.TaskDependency(task_key=d) for d in _TASKS[task.name].depends_on],
+                    libraries=[compute.Library(whl=f"dbfs:{dbfs_path}")],
+                    python_wheel_task=jobs.PythonWheelTask(
+                        package_name="databricks_labs_ucx",
+                        entry_point="runtime",  # [project.entry-points.databricks] in pyproject.toml
+                        named_parameters={"task": task.name, "config": config_file},
+                    ),
+                )
+                for task in tasks
+            ],
+        }
+
+    def _job_clusters(self, names: set[str]):
+        clusters = []
+        spec = self._cluster_node_type(
+            compute.ClusterSpec(
+                spark_version=self._ws.clusters.select_spark_version(latest=True),
+                data_security_mode=compute.DataSecurityMode.NONE,
+                spark_conf={"spark.databricks.cluster.profile": "singleNode", "spark.master": "local[*]"},
+                custom_tags={"ResourceClass": "SingleNode"},
+                num_workers=0,
+            )
+        )
+        if "main" in names:
+            clusters.append(
+                jobs.JobCluster(
+                    job_cluster_key="main",
+                    new_cluster=spec,
+                )
+            )
+        if "tacl" in names:
+            clusters.append(
+                jobs.JobCluster(
+                    job_cluster_key="tacl",
+                    new_cluster=replace(
+                        spec,
+                        data_security_mode=compute.DataSecurityMode.LEGACY_TABLE_ACL,
+                        spark_conf={"spark.databricks.acl.sqlOnly": "true"},
+                        custom_tags={},
+                    ),
+                )
+            )
+        return clusters
+
+    @staticmethod
+    def _build_wheel(tmp_dir: str, *, verbose: bool = False):
+        """Helper to build the wheel package"""
+        streams = {}
+        if not verbose:
+            streams = {
+                "stdout": subprocess.DEVNULL,
+                "stderr": subprocess.DEVNULL,
+            }
+        project_root = Installer._find_project_root(Path(__file__))
+        if not project_root:
+            msg = "Cannot find project root"
+            raise NotADirectoryError(msg)
+        logger.debug(f"Building wheel for {project_root} in {tmp_dir}")
+        subprocess.run(
+            [sys.executable, "-m", "pip", "wheel", "--no-deps", "--wheel-dir", tmp_dir, project_root],
+            **streams,
+            check=True,
+        )
+        # get wheel name as first file in the temp directory
+        return next(Path(tmp_dir).glob("*.whl"))
+
+    @staticmethod
+    def _find_project_root(folder: Path) -> Path | None:
+        for leaf in ["pyproject.toml", "setup.py"]:
+            root = Installer._find_dir_with_leaf(folder, leaf)
+            if root is not None:
+                return root
+        return None
+
+    @staticmethod
+    def _find_dir_with_leaf(folder: Path, leaf: str) -> Path | None:
+        root = folder.root
+        while str(folder.absolute()) != root:
+            if (folder / leaf).exists():
+                return folder
+            folder = folder.parent
+        return None
+
+    def _cluster_node_type(self, spec: compute.ClusterSpec) -> compute.ClusterSpec:
+        cfg = self._current_config
+        if cfg.instance_pool_id is not None:
+            return replace(spec, instance_pool_id=cfg.instance_pool_id)
+        spec = replace(spec, node_type_id=self._ws.clusters.select_node_type(local_disk=True))
+        if self._ws.config.is_aws:
+            return replace(spec, aws_attributes=compute.AwsAttributes(availability=compute.AwsAvailability.ON_DEMAND))
+        if self._ws.config.is_azure:
+            return replace(
+                spec, azure_attributes=compute.AzureAttributes(availability=compute.AzureAvailability.ON_DEMAND_AZURE)
+            )
+        return replace(spec, gcp_attributes=compute.GcpAttributes(availability=compute.GcpAvailability.ON_DEMAND_GCP))
+
+    def _deployed_steps(self):
+        deployed_steps = {}
+        for j in self._ws.jobs.list():
+            tags = j.settings.tags
+            if tags is None:
+                continue
+            if tags.get("App", None) != "ucx":
+                continue
+            deployed_steps[tags.get("step", "_")] = j.job_id
+        return deployed_steps
+
+
+if __name__ == "__main__":
+    ws = WorkspaceClient(product="ucx", product_version=__version__)
+    installer = Installer(ws)
+    installer.run()