apply Black 25.11.0 style in fbcode (73/92)

bowiechen · meta-codesync[bot] · commit 6962c316ef7e · 2026-01-12T02:58:36.000-08:00
Summary:
Formats the covered files with pyfmt.

paintitblack

Reviewed By: itamaro

Differential Revision: D90476332

fbshipit-source-id: 5d374665e0f665030f4491998aa2c6ed78d19e3e
diff --git a/annotation_gui_gcp/lib/GUI.py b/annotation_gui_gcp/lib/GUI.py
@@ -73,7 +73,7 @@ def create_ui(self, cad_paths):
             v = ImageView(
                 self,
                 self.app,
-                f"/sequence_view_{ix+1}",
+                f"/sequence_view_{ix + 1}",
                 image_keys,
                 has_views_that_need_tracking,
             )
@@ -84,7 +84,7 @@ def create_ui(self, cad_paths):
 
         self.cad_views = []
         for ix, cad_path in enumerate(cad_paths):
-            v = CADView(self, self.app, f"/cad_view_{ix+1}", cad_path)
+            v = CADView(self, self.app, f"/cad_view_{ix + 1}", cad_path)
             self.cad_views.append(v)
 
         subpane_routes = [
diff --git a/annotation_gui_gcp/lib/gcp_manager.py b/annotation_gui_gcp/lib/gcp_manager.py
@@ -218,9 +218,9 @@ def add_point_observation(
         assert self.get_observation(point_id, shot_id) is None
         if geo:
             mtime = geo["measured_at"]
-            assert isinstance(
-                mtime, int
-            ), "Measurement time should be integer (unix time)"
+            assert isinstance(mtime, int), (
+                "Measurement time should be integer (unix time)"
+            )
             point.geodetic_measurement = GeodeticMeasurement(
                 longitude=geo["longitude"],
                 latitude=geo["latitude"],
diff --git a/annotation_gui_gcp/main.py b/annotation_gui_gcp/main.py
@@ -68,7 +68,9 @@ def file_sanity_check(root, seq_dict, fname) -> t.Set[str]:
 
     n_missing = len(keys_in_seq_dict - available_images)
     if n_missing > 0:
-        print(f"There are {n_missing} images from {fname} missing in {(root/'images')}")
+        print(
+            f"There are {n_missing} images from {fname} missing in {(root / 'images')}"
+        )
 
     return available_images
 
diff --git a/annotation_gui_gcp/run_ba.py b/annotation_gui_gcp/run_ba.py
@@ -248,7 +248,7 @@ def add_gcp_to_bundle(
                 coordinates = np.array(enu)
             else:
                 logger.warning(
-                    "Cannot initialize GCP '{}'." "  Ignoring it".format(point.id)
+                    "Cannot initialize GCP '{}'.  Ignoring it".format(point.id)
                 )
                 continue
 
@@ -751,7 +751,7 @@ def align(
         data.config["triangulation_min_ray_angle"] = backup
         logger.info(
             f"Re-triangulated. Removed {n_points - len(merged.points)}."
-            f" Kept {int(100*len(merged.points)/n_points)}%"
+            f" Kept {int(100 * len(merged.points) / n_points)}%"
         )
         data.save_reconstruction(
             [merged],
@@ -878,7 +878,7 @@ def align(
             for ix, gcp_id in enumerate(gcps_sorted[:5]):
                 n = stats_bad_reprojections[gcp_id]
                 if n > 0:
-                    logger.info(f"#{ix+1} - {gcp_id}: {n} bad annotations")
+                    logger.info(f"#{ix + 1} - {gcp_id}: {n} bad annotations")
         else:
             logger.info("No annotations with large reprojection errors")
 
diff --git a/bin/plot_gcp.py b/bin/plot_gcp.py
@@ -5,9 +5,7 @@
 from typing import List
 
 import matplotlib.pyplot as plt
-
 import numpy as np
-
 import opensfm.reconstruction as orec
 from opensfm import dataset, features, io, pymap, types
 
diff --git a/opensfm/actions/export_openmvs.py b/opensfm/actions/export_openmvs.py
@@ -1,6 +1,5 @@
 # pyre-strict
 import os
-
 from typing import Dict, Optional
 
 import numpy as np
diff --git a/opensfm/dataset.py b/opensfm/dataset.py
@@ -128,7 +128,7 @@ def load_mask(self, image: str) -> Optional[NDArray]:
             mask = self.io_handler.imread(mask_path, grayscale=True)
             if mask is None:
                 raise IOError(
-                    "Unable to load mask for image {} " "from file {}".format(
+                    "Unable to load mask for image {} from file {}".format(
                         image, mask_path
                     )
                 )
diff --git a/opensfm/exif.py b/opensfm/exif.py
@@ -9,7 +9,6 @@
 import numpy as np
 import xmltodict as x2d
 from opensfm import pygeometry
-
 from opensfm.dataset_base import DataSetBase
 from opensfm.geo import ecef_from_lla
 from opensfm.sensors import camera_calibration, sensor_data
diff --git a/opensfm/feature_loading.py b/opensfm/feature_loading.py
@@ -4,7 +4,6 @@
 from typing import Optional, Tuple
 
 import cv2
-
 import numpy as np
 from numpy.typing import NDArray
 from opensfm import features as ft, masking, pygeometry
diff --git a/opensfm/features.py b/opensfm/features.py
@@ -648,7 +648,7 @@ def build_flann_index(descriptors: NDArray, config: Dict[str, Any]) -> cv2.flann
         elif algorithm_type == "KDTREE":
             FLANN_INDEX_METHOD = FLANN_INDEX_KDTREE
         else:
-            raise ValueError("Unknown flann algorithm type " "must be KMEANS, KDTREE")
+            raise ValueError("Unknown flann algorithm type must be KMEANS, KDTREE")
         flann_params = {
             "algorithm": FLANN_INDEX_METHOD,
             "branching": config["flann_branching"],
diff --git a/opensfm/matching.py b/opensfm/matching.py
@@ -242,7 +242,7 @@ def match_descriptors(
 
     symmetric = "symmetric" if overriden_config["symmetric_matching"] else "one-way"
     logger.debug(
-        "Matching {} and {}.  Matcher: {} ({}) " "T-desc: {:1.3f} Matches: {}".format(
+        "Matching {} and {}.  Matcher: {} ({}) T-desc: {:1.3f} Matches: {}".format(
             im1,
             im2,
             matcher_type,
diff --git a/opensfm/pairs_selection.py b/opensfm/pairs_selection.py
@@ -611,7 +611,7 @@ def match_candidates_from_metadata(
     if not all(map(has_gps_info, exifs.values())):
         if gps_neighbors != 0:
             logger.warning(
-                "Not all images have GPS info. " "Disabling matching_gps_neighbors."
+                "Not all images have GPS info. Disabling matching_gps_neighbors."
             )
         gps_neighbors = 0
         max_distance = 0
diff --git a/opensfm/reconstruction.py b/opensfm/reconstruction.py
@@ -60,7 +60,7 @@ def log_bundle_stats(bundle_type: str, bundle_report: Dict[str, Any]) -> None:
 
     msg = f"Ran {bundle_type} bundle in {time_secs:.2f} secs."
     if num_points > 0:
-        msg += f"with {num_images}/{num_points}/{num_reprojections} ({num_reprojections/num_points:.2f}) "
+        msg += f"with {num_images}/{num_points}/{num_reprojections} ({num_reprojections / num_points:.2f}) "
         msg += "shots/points/proj. (avg. length)"
 
     logger.info(msg)
@@ -1587,7 +1587,7 @@ def triangulation_reconstruction(
             if config_override["save_partial_reconstructions"]:
                 paint_reconstruction(data, tracks_manager, reconstruction)
                 data.save_reconstruction(
-                    [reconstruction], f"reconstruction.{i*inner_iterations+j}.json"
+                    [reconstruction], f"reconstruction.{i * inner_iterations + j}.json"
                 )
 
             step = {}
diff --git a/opensfm/report.py b/opensfm/report.py
@@ -173,7 +173,7 @@ def make_dataset_summary(self) -> None:
             ["Date", self.stats["processing_statistics"]["date"]],
             [
                 "Area Covered",
-                f"{self.stats['processing_statistics']['area']/1e6:.6f} km²",
+                f"{self.stats['processing_statistics']['area'] / 1e6:.6f} km²",
             ],
             [
                 "Processing Time",
@@ -215,7 +215,7 @@ def make_processing_summary(self) -> None:
             ],
             [
                 "Reconstructed Points",
-                f"{rec_points} over {init_points} points ({rec_points/init_points*100:.1f}%)",
+                f"{rec_points} over {init_points} points ({rec_points / init_points * 100:.1f}%)",
             ],
             [
                 "Reconstructed Components",
@@ -277,16 +277,16 @@ def make_gps_details(self) -> None:
             for comp in ["x", "y", "z"]:
                 row = [comp.upper() + " Error (meters)"]
                 row.append(f"{self.stats[error_type + '_errors']['mean'][comp]:.3f}")
-                row.append(f"{self.stats[error_type +'_errors']['std'][comp]:.3f}")
-                row.append(f"{self.stats[error_type +'_errors']['error'][comp]:.3f}")
+                row.append(f"{self.stats[error_type + '_errors']['std'][comp]:.3f}")
+                row.append(f"{self.stats[error_type + '_errors']['error'][comp]:.3f}")
                 rows.append(row)
 
             rows.append(
                 [
                     "Total",
                     "",
                     "",
-                    f"{self.stats[error_type +'_errors']['average_error']:.3f}",
+                    f"{self.stats[error_type + '_errors']['average_error']:.3f}",
                 ]
             )
             self._make_table(columns_names, rows)
diff --git a/opensfm/synthetic_data/synthetic_generator.py b/opensfm/synthetic_data/synthetic_generator.py
@@ -452,7 +452,7 @@ def generate_track_data(
 
         if index % 100 == 0:
             logger.info(
-                f"Flushing images # {index} ({(time.time() - start)/(index+1)} sec. per image"
+                f"Flushing images # {index} ({(time.time() - start) / (index + 1)} sec. per image"
             )
             features.sync()
 
diff --git a/opensfm/synthetic_data/synthetic_scene.py b/opensfm/synthetic_data/synthetic_scene.py
@@ -200,7 +200,7 @@ def combine(self, other_scene: "SyntheticStreetScene") -> "SyntheticStreetScene"
         shift = 0
         for subshots in combined_scene.shot_ids:
             for i in range(len(subshots)):
-                subshots[i] = f"Shot {i+shift:04d}"
+                subshots[i] = f"Shot {i + shift:04d}"
             shift += len(subshots)
         return combined_scene
 
@@ -300,7 +300,7 @@ def add_camera_sequence(
             positions += np.array(positions_shift)
 
         shift = 0 if len(self.shot_ids) == 0 else sum(len(s) for s in self.shot_ids)
-        new_shot_ids = [f"Shot {shift+i:04d}" for i in range(len(positions))]
+        new_shot_ids = [f"Shot {shift + i:04d}" for i in range(len(positions))]
         self.shot_ids.append(new_shot_ids)
         self.cameras.append([camera])
 
@@ -364,7 +364,7 @@ def add_rig_camera_sequence(
             camera_shot_ids = []
             for i in range(len(positions)):
                 shot_index = i * len(relative_positions) + j
-                camera_shot_ids.append(f"Shot {shift+shot_index:04d}")
+                camera_shot_ids.append(f"Shot {shift + shot_index:04d}")
             shots_ids_per_camera.append(camera_shot_ids)
         self.cameras.append(cameras)
         self.shot_ids += shots_ids_per_camera
diff --git a/opensfm/test/conftest.py b/opensfm/test/conftest.py
@@ -128,16 +128,14 @@ def scene_synthetic_triangulation() -> synthetic_scene.SyntheticInputData:
 
 
 @pytest.fixture(scope="module")
-def pairs_and_poses() -> (
-    Tuple[
-        Dict[Tuple[str, str], List[Tuple[List[NDArray]]]],
-        Dict[Tuple[str, str], List[Tuple[List[NDArray]]]],
-        pygeometry.Camera,
-        sd.SyntheticFeatures,
-        pymap.TracksManager,
-        types.Reconstruction,
-    ]
-):
+def pairs_and_poses() -> Tuple[
+    Dict[Tuple[str, str], List[Tuple[List[NDArray]]]],
+    Dict[Tuple[str, str], List[Tuple[List[NDArray]]]],
+    pygeometry.Camera,
+    sd.SyntheticFeatures,
+    pymap.TracksManager,
+    types.Reconstruction,
+]:
     np.random.seed(42)
     data = synthetic_examples.synthetic_cube_scene()
 
diff --git a/opensfm/test/test_dataset.py b/opensfm/test/test_dataset.py
@@ -2,7 +2,6 @@
 from typing import Any
 
 import numpy as np
-
 from opensfm import features
 from opensfm.test import data_generation
 
diff --git a/opensfm/test/test_datastructures.py b/opensfm/test/test_datastructures.py
@@ -1,6 +1,5 @@
 # pyre-strict
 import copy
-
 import random
 from typing import Dict, Optional, Tuple, Union
 
diff --git a/opensfm/test/test_io.py b/opensfm/test/test_io.py
@@ -5,7 +5,6 @@
 from typing import List
 
 import numpy as np
-
 from opensfm import io, pygeometry, pymap, types
 from opensfm.test import data_generation, utils
 
diff --git a/opensfm/test/test_pairs_selection.py b/opensfm/test/test_pairs_selection.py
@@ -5,7 +5,6 @@
 
 import numpy as np
 import pytest
-
 from opensfm import commands, dataset, feature_loader, geo, pairs_selection
 from opensfm.dataset_base import DataSetBase
 from opensfm.test import data_generation
diff --git a/opensfm/video.py b/opensfm/video.py
@@ -12,9 +12,9 @@
 def video_orientation(video_file: str) -> int:
     # Rotation
     process = Popen(["exiftool", "-Rotation", "-b", video_file], stdout=PIPE)
-    assert (
-        process.stdout is not None
-    ), "stdout should not be None when stdout=PIPE is specified"
+    assert process.stdout is not None, (
+        "stdout should not be None when stdout=PIPE is specified"
+    )
     rotation = process.stdout.read().decode("utf-8").strip()
     if rotation:
         rotation = float(rotation)
@@ -51,9 +51,9 @@ def import_video_with_gpx(
     else:
         try:
             process = Popen(["exiftool", "-CreateDate", "-b", video_file], stdout=PIPE)
-            assert (
-                process.stdout is not None
-            ), "stdout should not be None when stdout=PIPE is specified"
+            assert process.stdout is not None, (
+                "stdout should not be None when stdout=PIPE is specified"
+            )
             exifdate = process.stdout.read().decode("utf-8").strip()
             video_start_time = datetime.datetime.strptime(exifdate, "%Y:%m:%d %H:%M:%S")
         except Exception:

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ def load_mask(self, image: str) -> Optional[NDArray]:`
`128`	`128`	`mask = self.io_handler.imread(mask_path, grayscale=True)`
`129`	`129`	`if mask is None:`
`130`	`130`	`raise IOError(`
`131`		`- "Unable to load mask for image {} " "from file {}".format(`
	`131`	`+ "Unable to load mask for image {} from file {}".format(`
`132`	`132`	`image, mask_path`
`133`	`133`	`)`
`134`	`134`	`)`