Merge pull request #21799 from github/jacknojo/fix_python_formatting

Fix issue with Python formatting and expand scope of python-tooling

.github/workflows/mad_modelDiff.yml

@@ -70,7 +70,7 @@ jobs:
             SHORTNAME=`basename $DATABASE`
             python misc/scripts/models-as-data/generate_mad.py --language java --with-summaries --with-sinks $DATABASE $SHORTNAME/$QL_VARIANT
             mkdir -p $MODELS/$SHORTNAME
-            mv java/ql/lib/ext/generated/$SHORTNAME/$QL_VARIANT $MODELS/$SHORTNAME
+            mv java/ql/lib/ext/generated/modelgenerator/$SHORTNAME/$QL_VARIANT $MODELS/$SHORTNAME
             cd ..
           }
 

.github/workflows/python-tooling.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - "misc/bazel/**"
       - "misc/codegen/**"
-      - "misc/scripts/models-as-data/bulk_generate_mad.py"
+      - "misc/scripts/models-as-data/*.py"
       - "*.bazel*"
       - .github/workflows/codegen.yml
       - .pre-commit-config.yaml

misc/scripts/models-as-data/generate_mad.py

@@ -67,7 +67,8 @@ class Generator:
         self.database = database or self.database
         self.folder = folder or self.folder
         self.generated_frameworks = os.path.join(
-            self.codeql_root, f"{self.language}/ql/lib/ext/generated/modelgenerator/{self.folder}"
+            self.codeql_root,
+            f"{self.language}/ql/lib/ext/generated/modelgenerator/{self.folder}",
         )
         self.workDir = tempfile.mkdtemp()
         if self.ram is None: