HelpersTask659_Improve_dependency_checking_for_helpers

.gitignore

@@ -0,0 +1,22 @@
+.coverage
+dependency_graph.dot
+dependency_graph.svg
+dev_scripts_helpers/thin_client/build.py.log
+dev_scripts_helpers/thin_client/thin_client_utils.py.log
+dev_scripts_helpers/thin_client/tmp.requirements.txt
+helpers.egg-info/
+helpers/__pycache__/
+i
+import_check/__pycache__/
+import_check/test/__pycache__/
+report.txt
+report_cycles.txt
+report_max_level.txt
+__pycache__/
+dependency_report.txt
+devops/compose/local.docker-compose.yml
+tmp.precommit_output.txt
+tmp.pytest.log
+tmp.amp_normalize_import.txt
+source
+devops/compose/tmp.docker-compose.yml

dev_scripts_helpers/thin_client/requirements.txt

@@ -8,6 +8,8 @@ docker < 7
 docker-compose >= 1.29.0
 invoke >= 1.5.0
 poetry
+networkx >= 2.6.3
+pydot >= 1.4.1
 pytest >= 6.0.0
 s3fs  # For tools like `publish_notebook.py`.
 tqdm

dev_scripts_helpers/thin_client/thin_client_utils.sh

@@ -198,13 +198,32 @@ set_csfy_env_vars() {
 
 
 set_path() {
-    echo "# set_path()"
+    # Process interface.
+    dassert_eq_num_args $# 1 "set_path"
     local dev_script_dir=$1
+    #
     dassert_dir_exists $dev_script_dir
+    dtrace "dev_script_dir=$dev_script_dir"
+    # TODO(gp): Unify this as part of CmTask12257.
+    if [[ -n "$GIT_ROOT_DIR" ]]; then
+        # `GIT_ROOT_DIR` is available outside the container.
+        GIT_ROOT=$GIT_ROOT_DIR
+    elif [[ -n "$CSFY_GIT_ROOT_PATH" ]]; then
+        # `CSFY_GIT_ROOT_PATH` is available inside the container.
+        GIT_ROOT=$CSFY_GIT_ROOT_PATH
+    fi
     export PATH=$(pwd):$PATH
+    dtrace "GIT_ROOT=$GIT_ROOT"
+    dassert_var_defined "GIT_ROOT"
     export PATH=$GIT_ROOT_DIR:$PATH
+    # Avoid ./.mypy_cache/3.12/app/dev_scripts_helpers
+    DEV_SCRIPT_HELPER_DIR=$(find ${GIT_ROOT} -name dev_scripts_helpers -type d -not -path "*.mypy_cache*")
+    echo "DEV_SCRIPT_HELPER_DIR=$DEV_SCRIPT_HELPER_DIR"
+    dassert_dir_exists $DEV_SCRIPT_HELPER_DIR
+    dtrace "DEV_SCRIPT_HELPER_DIR=$DEV_SCRIPT_HELPER_DIR"
     # Add to the PATH all the first level directory under `dev_scripts`.
-    export PATH_TMP="$(find $dev_script_dir -maxdepth 1 -type d -not -path "$(pwd)" | tr '\n' ':' | sed 's/:$//')"
+    export PATH_TMP="$(find $DEV_SCRIPT_HELPER_DIR -maxdepth 1 -type d -not -path "$(pwd)" | tr '\n' ':' | sed 's/:$//')"
+    dtrace "PATH_TMP=$PATH_TMP"
     export PATH=$PATH_TMP:$PATH
     # Remove duplicates.
     export PATH=$(remove_dups $PATH)
@@ -213,6 +232,7 @@ set_path() {
 }
 
 
+
 set_pythonpath() {
     local helpers_root_dir="$1"
     echo "# set_pythonpath()"