wip

ohmayr · ohmayr · commit 34efb392a6d0 · 2025-12-09T12:56:57.000Z
diff --git a/.generator/cli.py b/.generator/cli.py
@@ -357,7 +357,7 @@ def _get_library_id(request_data: Dict) -> str:
 
 @track_time
 def _run_post_processor(output: str, library_id: str, is_mono_repo: bool):
-    """Runs the synthtool post-processor on the output directory.
+    """Runs the synthtool post-processor (templates) and Ruff formatter (lint/format).
 
     Args:
         output(str): Path to the directory in the container where code
@@ -367,25 +367,58 @@ def _run_post_processor(output: str, library_id: str, is_mono_repo: bool):
     """
     os.chdir(output)
     path_to_library = f"packages/{library_id}" if is_mono_repo else "."
-    logger.info("Running Python post-processor...")
+    
+    # 1. Run Synthtool (Templates & Fixers only)
+    # Note: This relies on 'nox' being disabled in your environment (via run_fast.sh shim)
+    # to avoid the slow formatting step inside owlbot.
+    logger.info("Running Python post-processor (Templates & Fixers)...")
     if SYNTHTOOL_INSTALLED:
-        if is_mono_repo:
-            python_mono_repo.owlbot_main(path_to_library)
-        else:
-            # Some repositories have customizations in `librarian.py`.
-            # If this file exists, run those customizations instead of `owlbot_main`
-            if Path(f"{output}/librarian.py").exists():
-                subprocess.run(["python3.14", f"{output}/librarian.py"])
+        try:
+            if is_mono_repo:
+                python_mono_repo.owlbot_main(path_to_library)
             else:
-                python.owlbot_main()
-    else:
-        raise SYNTHTOOL_IMPORT_ERROR  # pragma: NO COVER
-
-    # If there is no noxfile, run `isort`` and `black` on the output.
-    # This is required for proto-only libraries which are not GAPIC.
-    if not Path(f"{output}/{path_to_library}/noxfile.py").exists():
-        subprocess.run(["isort", output])
-        subprocess.run(["black", output])
+                # Handle custom librarian scripts if present
+                if Path(f"{output}/librarian.py").exists():
+                    subprocess.run(["python3.14", f"{output}/librarian.py"])
+                else:
+                    python.owlbot_main()
+        except Exception as e:
+            logger.warning(f"Synthtool warning (non-fatal): {e}")
+
+    # 2. Run RUFF (Fast Formatter & Import Sorter)
+    # This replaces both 'isort' and 'black' and runs in < 1 second.
+    # We hardcode flags here to match Black defaults so you don't need config files.
+    # logger.info("🚀 Running Ruff (Fast Formatter)...")
+    # try:
+    #     # STEP A: Fix Imports (like isort)
+    #     subprocess.run(
+    #         [
+    #             "ruff", "check", 
+    #             "--select", "I",               # Only run Import sorting rules
+    #             "--fix",                       # Auto-fix them
+    #             "--line-length=88",            # Match Black default
+    #             "--known-first-party=google",  # Prevent 'google' moving to 3rd party block
+    #             output
+    #         ],
+    #         check=False, 
+    #         stdout=subprocess.DEVNULL, 
+    #         stderr=subprocess.DEVNULL
+    #     )
+        
+    #     # STEP B: Format Code (like black)
+    #     subprocess.run(
+    #         [
+    #             "ruff", "format", 
+    #             "--line-length=88",            # Match Black default
+    #             output
+    #         ],
+    #         check=False, 
+    #         stdout=subprocess.DEVNULL, 
+    #         stderr=subprocess.DEVNULL
+    #     )
+    # except FileNotFoundError:
+    #     logger.warning("⚠️ Ruff binary not found. Code will be unformatted.")
+    #     logger.warning("   Please run: pip install ruff")
 
     logger.info("Python post-processor ran successfully.")
 
diff --git a/.generator/requirements.in b/.generator/requirements.in
@@ -5,3 +5,4 @@ starlark-pyo3>=2025.1
 build
 black==23.7.0
 isort==5.11.0
+ruff
