From 0fcbcfefce54fb3c179b1405ac2e07ab3e87e4fb Mon Sep 17 00:00:00 2001 From: vincbeck Date: Wed, 18 Dec 2024 16:59:44 -0500 Subject: [PATCH] AIP-79 Generate assets for Flask application in FAB provider (#44744) This reverts commit 2f92f824c7f5a22f8dbe97feddba24dfc37ab16a. --- scripts/ci/pre_commit/compile_www_assets.py | 34 ++++++++++++++++----- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/scripts/ci/pre_commit/compile_www_assets.py b/scripts/ci/pre_commit/compile_www_assets.py index bf2664685ed6c..ba53ac2d96c98 100755 --- a/scripts/ci/pre_commit/compile_www_assets.py +++ b/scripts/ci/pre_commit/compile_www_assets.py @@ -18,11 +18,11 @@ from __future__ import annotations import hashlib +import importlib.util import os import re import shutil import subprocess -import sys from pathlib import Path # NOTE!. This script is executed from node environment created by pre-commit and this environment @@ -52,17 +52,18 @@ def get_directory_hash(directory: Path, skip_path_regexp: str | None = None) -> f"To run this script, run the ./{__file__} command" ) -if __name__ == "__main__": - www_directory = AIRFLOW_SOURCES_PATH / "airflow" / "www" + +def compile_assets(www_directory: Path, www_hash_file_name: str): node_modules_directory = www_directory / "node_modules" dist_directory = www_directory / "static" / "dist" - WWW_HASH_FILE.parent.mkdir(exist_ok=True, parents=True) + www_hash_file = AIRFLOW_SOURCES_PATH / ".build" / "www" / www_hash_file_name + www_hash_file.parent.mkdir(exist_ok=True, parents=True) if node_modules_directory.exists() and dist_directory.exists(): - old_hash = WWW_HASH_FILE.read_text() if WWW_HASH_FILE.exists() else "" + old_hash = www_hash_file.read_text() if www_hash_file.exists() else "" new_hash = get_directory_hash(www_directory, skip_path_regexp=r".*node_modules.*") if new_hash == old_hash: print("The WWW directory has not changed! Skip regeneration.") - sys.exit(0) + return else: shutil.rmtree(node_modules_directory, ignore_errors=True) shutil.rmtree(dist_directory, ignore_errors=True) @@ -71,4 +72,23 @@ def get_directory_hash(directory: Path, skip_path_regexp: str | None = None) -> subprocess.check_call(["yarn", "install", "--frozen-lockfile"], cwd=os.fspath(www_directory)) subprocess.check_call(["yarn", "run", "build"], cwd=os.fspath(www_directory), env=env) new_hash = get_directory_hash(www_directory, skip_path_regexp=r".*node_modules.*") - WWW_HASH_FILE.write_text(new_hash) + www_hash_file.write_text(new_hash) + + +def is_fab_provider_installed() -> bool: + return ( + importlib.util.find_spec("airflow") is not None + and importlib.util.find_spec("airflow.providers.fab") is not None + ) + + +if __name__ == "__main__": + # Compile assets for main + main_www_directory = AIRFLOW_SOURCES_PATH / "airflow" / "www" + compile_assets(main_www_directory, "hash.txt") + # Compile assets for fab provider + fab_provider_www_directory = ( + AIRFLOW_SOURCES_PATH / "providers" / "src" / "airflow" / "providers" / "fab" / "www" + ) + if fab_provider_www_directory.exists(): + compile_assets(fab_provider_www_directory, "hash_fab.txt")