Fix Pyre path find when init Pysa

client/commands/initialize_pysa.py

@@ -18,7 +18,7 @@
 from pathlib import Path
 
 from .. import log
-from ..find_directories import find_taint_models_directory
+from ..find_directories import find_pysa_filters_directory
 
 from . import commands
 from .initialize import (
@@ -73,9 +73,8 @@ def _setup_environment() -> None:
     run_infer = log.get_yes_no_input("Would you like to generate type annotations?")
     if run_infer:
         subprocess.run(["pyre", "infer", "-i"], check=True)
-    pyre_check_path = find_taint_models_directory()
-    if pyre_check_path and os.path.isdir(pyre_check_path / "pyre_check"):
-        pyre_check_path = pyre_check_path / "pyre_check"
+    pyre_check_path = find_pysa_filters_directory()
+    if pyre_check_path is not None:
         LOG.info("Importing filters to sapp")
         subprocess.run(["sapp", "filter", "import", pyre_check_path], check=True)
     else:

client/find_directories.py

@@ -301,9 +301,29 @@ def find_typeshed_search_paths(
     return search_path
 
 
-def find_taint_models_directory() -> Optional[Path]:
+def find_pyre_directory() -> Optional[Path]:
     install_root = Path(sys.prefix)
-    bundled_taint_models = install_root / "lib/pyre_check/taint/"
+    excepted_pyre_path = install_root / "lib/pyre_check/"
+    if excepted_pyre_path.is_dir():
+        return excepted_pyre_path
+    return None
+
+
+def find_taint_models_directory() -> Optional[Path]:
+    pyre_check_path = find_pyre_directory()
+    if pyre_check_path is None:
+        return None
+    bundled_taint_models = pyre_check_path / "taint/"
     if bundled_taint_models.is_dir():
         return bundled_taint_models
     return None
+
+
+def find_pysa_filters_directory() -> Optional[Path]:
+    pyre_check_path = find_pyre_directory()
+    if pyre_check_path is None:
+        return None
+    excepted_pysa_filter_path = pyre_check_path / "pysa_filters/"
+    if excepted_pysa_filter_path.is_dir():
+        return excepted_pysa_filter_path
+    return None