chore: run ruff

Author: adpare

mitreattack/attackToExcel/attackToExcel.py

@@ -146,32 +146,25 @@ def build_dataframes(src: MemoryStore, domain: str) -> Dict:
     }
     return df
 
+
 def build_ds_an_lg_relationships(dataframes: Dict) -> Dict[str, pd.DataFrame]:
     """Build sheets for ds-an-lg.xlsx using existing relationship tables."""
     # Use existing DetectionStrategy -> Analytics relationship table
-    ds_an = dataframes["detectionstrategies"].get(
-        "detectionstrategies-analytic",
-        pd.DataFrame()
-    )
+    ds_an = dataframes["detectionstrategies"].get("detectionstrategies-analytic", pd.DataFrame())
 
     # Use existing Analytics -> LogSource relationship table
-    an_lg = dataframes["analytics"].get(
-        "analytic-logsource",
-        pd.DataFrame()
-    )
+    an_lg = dataframes["analytics"].get("analytic-logsource", pd.DataFrame())
 
     # Use existing Analytics -> Detection Strategy relationship table
-    an_ds = dataframes["analytics"].get(
-        "analytic-detectionstrategy",
-        pd.DataFrame()
-    )
+    an_ds = dataframes["analytics"].get("analytic-detectionstrategy", pd.DataFrame())
 
     return {
         "detectionstrategy_to_analytics": ds_an,
         "analytics_to_logsources": an_lg,
-        "analytics_to_detectionstrategy": an_ds
+        "analytics_to_detectionstrategy": an_ds,
     }
 
+
 def write_excel(dataframes: Dict, domain: str, version: Optional[str] = None, output_dir: str = ".") -> List:
     """Given a set of dataframes from build_dataframes, write the ATT&CK dataset to output directory.
 

mitreattack/attackToExcel/stixToDf.py

@@ -381,10 +381,9 @@ def analyticsToDf(src):
         analytic_to_ds_map = {}
         for ds in detection_strategies:
             for analytic_id in ds.get("x_mitre_analytic_refs", []):
-                analytic_to_ds_map.setdefault(analytic_id, []).append({
-                    "detection_strategy_id": ds["id"],
-                    "detection_strategy_name": ds.get("name", "")
-                })
+                analytic_to_ds_map.setdefault(analytic_id, []).append(
+                    {"detection_strategy_id": ds["id"], "detection_strategy_name": ds.get("name", "")}
+                )
 
         for analytic in tqdm(analytics, desc="parsing analytics"):
             analytic_rows.append(parseBaseStix(analytic))
@@ -395,33 +394,31 @@ def analyticsToDf(src):
                 data_comp = src.get(data_comp_id)
                 data_comp_name = data_comp.get("name", "") if data_comp else ""
 
-                logsource_rows.append({
-                    "analytic_id": analytic["id"],
-                    "analytic_name": analytic["external_references"][0]["external_id"],
-                    "data_component_id": data_comp_id,
-                    "data_component_name": data_comp_name,
-                    "log_source_name": logsrc.get("name", ""),
-                    "channel": logsrc.get("channel", "")
-                })
+                logsource_rows.append(
+                    {
+                        "analytic_id": analytic["id"],
+                        "analytic_name": analytic["external_references"][0]["external_id"],
+                        "data_component_id": data_comp_id,
+                        "data_component_name": data_comp_name,
+                        "log_source_name": logsrc.get("name", ""),
+                        "channel": logsrc.get("channel", ""),
+                    }
+                )
 
             # detection strategies relationship table rows
             for ds_info in analytic_to_ds_map.get(analytic["id"], []):
-                analytic_to_ds_rows.append({
-                    "analytic_id": analytic["id"],
-                    "analytic_name": analytic["external_references"][0]["external_id"],
-                    "detection_strategy_id": ds_info["detection_strategy_id"],
-                    "detection_strategy_name": ds_info["detection_strategy_name"]
-                })
-
-        dataframes["analytics"] = (
-            pd.DataFrame(analytic_rows).sort_values("name")
-        )
-        dataframes["analytic-logsource"] = (
-            pd.DataFrame(logsource_rows)
-        )
-        dataframes["analytic-detectionstrategy"] = (
-            pd.DataFrame(analytic_to_ds_rows)
-        )
+                analytic_to_ds_rows.append(
+                    {
+                        "analytic_id": analytic["id"],
+                        "analytic_name": analytic["external_references"][0]["external_id"],
+                        "detection_strategy_id": ds_info["detection_strategy_id"],
+                        "detection_strategy_name": ds_info["detection_strategy_name"],
+                    }
+                )
+
+        dataframes["analytics"] = pd.DataFrame(analytic_rows).sort_values("name")
+        dataframes["analytic-logsource"] = pd.DataFrame(logsource_rows)
+        dataframes["analytic-detectionstrategy"] = pd.DataFrame(analytic_to_ds_rows)
 
         citations = get_citations(analytics)
         if not citations.empty:
@@ -448,30 +445,26 @@ def detectionstrategiesToDf(src):
         rel_rows = []
         for detection_strategy in tqdm(detection_strategies, desc="parsing detection strategies"):
             row = parseBaseStix(detection_strategy)
-            row["analytic_refs"] = (
-                "; ".join(detection_strategy.get("x_mitre_analytic_refs", []))
-            )
+            row["analytic_refs"] = "; ".join(detection_strategy.get("x_mitre_analytic_refs", []))
             detection_strategy_rows.append(row)
 
             # analytics relationship table rows
             for analytic_id in detection_strategy.get("x_mitre_analytic_refs", []):
                 analytic_obj = src.get(analytic_id)
 
-                rel_rows.append({
-                    "detection_strategy_id": detection_strategy["id"],
-                    "detection_strategy_name": detection_strategy.get("name", ""),
-                    "analytic_id": analytic_id,
-                    "analytic_name": analytic_obj["external_references"][0]["external_id"],
-                })
+                rel_rows.append(
+                    {
+                        "detection_strategy_id": detection_strategy["id"],
+                        "detection_strategy_name": detection_strategy.get("name", ""),
+                        "analytic_id": analytic_id,
+                        "analytic_name": analytic_obj["external_references"][0]["external_id"],
+                    }
+                )
 
         # Build main dataframes
-        dataframes["detectionstrategies"] = (
-            pd.DataFrame(detection_strategy_rows).sort_values("name")
-        )
+        dataframes["detectionstrategies"] = pd.DataFrame(detection_strategy_rows).sort_values("name")
 
-        dataframes["detectionstrategies-analytic"] = (
-            pd.DataFrame(rel_rows)
-        )
+        dataframes["detectionstrategies-analytic"] = pd.DataFrame(rel_rows)
 
         citations = get_citations(detection_strategies)
         if not citations.empty:
@@ -1023,6 +1016,7 @@ def matricesToDf(src, domain):
     # end adding of matrices
     return matrices_parsed, sub_matrices_parsed
 
+
 def relationshipsToDf(src, relatedType=None):
     """Parse STIX relationships from the given data and return corresponding pandas dataframes.