pre-commit: apply black formatting

Author: MarinVillalobos

.pre-commit-config.yaml

@@ -1,46 +1,15 @@
 repos:
-  - repo: https://github.com/humitos/mirrors-autoflake
-    rev: v1.1
-    hooks:
-      - id: autoflake
-        args: ['-i', '--remove-all-unused-imports']
-  - repo: https://github.com/psf/black
-    rev: 23.3.0
-    hooks:
-      - id: black
-        args: ['-l', '120']
-        
-  - repo: https://github.com/asottile/blacken-docs
-    rev: 1.13.0
-    hooks:
-      - id: blacken-docs
-        additional_dependencies: [black]
-        
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: isort (python)
-        args: [
-            '--force-single-line-imports',
-            '--profile', 'black'
-        ]
-        
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        args: [
-            '--max-line-length', '120',
-            '--max-doc-length', '120',
-            '--ignore', 'F821,E402,W503',
-            '--extend-ignore', 'E203'
-        ]
-  - repo: https://github.com/Carreau/velin
-    rev: 0.0.11
-    hooks:
-      - id: velin
-        name: Velin
-        entry: velin
-        types: [ python ]
-        args: ["--write"]
+- repo: https://github.com/PyCQA/autoflake
+  rev: v2.3.1
+  hooks:
+  - id: autoflake
+    args:
+    - --in-place
+    - --remove-all-unused-imports
+    - --remove-unused-variables
+- repo: https://github.com/psf/black
+  rev: 25.11.0
+  hooks:
+  - id: black
+    args: ['-l','120']
+    language_version: python3.12

ansys_optical_automation/application/A_1_Create_stl_polynomial_surface.py

@@ -8,11 +8,11 @@
 This script works standalone or can be imported by another script.
 """
 
-import numpy as np
-import trimesh
 import json
 import os
-from typing import Optional
+
+import numpy as np
+import trimesh
 
 
 def build_design_matrix(x: np.ndarray, y: np.ndarray, order: int = 5) -> np.ndarray:
@@ -34,7 +34,7 @@ def build_design_matrix(x: np.ndarray, y: np.ndarray, order: int = 5) -> np.ndar
     terms = []
     for i in range(order + 1):
         for j in range(order + 1 - i):
-            terms.append((x ** i) * (y ** j))
+            terms.append((x**i) * (y**j))
     return np.vstack(terms).T
 
 
@@ -60,15 +60,12 @@ def evaluate_fitted_surface(coeffs: np.ndarray, x: np.ndarray, y: np.ndarray, or
     idx = 0
     for i in range(order + 1):
         for j in range(order + 1 - i):
-            z += coeffs[idx] * (x ** i) * (y ** j)
+            z += coeffs[idx] * (x**i) * (y**j)
             idx += 1
     return z
 
 
-def create_polynomial_surface(input_file: str,
-                              output_stl: str,
-                              output_json: str,
-                              order: int = 5) -> None:
+def create_polynomial_surface(input_file: str, output_stl: str, output_json: str, order: int = 5) -> None:
     """
     Fit the polynomial surface and export STL + JSON model.
 
@@ -138,15 +135,9 @@ def create_polynomial_surface(input_file: str,
 
 def main():
     """Standalone entry point."""
-    input_file = (
-        r"C:\Users\amarin\OneDrive - ANSYS, Inc\Articules and Trainings ACE\3D Texture - Light Guide\#2. Variable pitch\TL L.3D Texture.2.OPT3DMapping"
-    )
-    output_stl = (
-        r"C:\Users\amarin\OneDrive - ANSYS, Inc\Articules and Trainings ACE\3D Texture - Light Guide\#2. Variable pitch\FittedSurface_Global_HighQuality.stl"
-    )
-    output_json = (
-        r"C:\Users\amarin\OneDrive - ANSYS, Inc\Articules and Trainings ACE\3D Texture - Light Guide\#2. Variable pitch\FittedSurface_Model.json"
-    )
+    input_file = r"C:\Users\amarin\OneDrive - ANSYS, Inc\Articules and Trainings ACE\3D Texture - Light Guide\#2. Variable pitch\TL L.3D Texture.2.OPT3DMapping"
+    output_stl = r"C:\Users\amarin\OneDrive - ANSYS, Inc\Articules and Trainings ACE\3D Texture - Light Guide\#2. Variable pitch\FittedSurface_Global_HighQuality.stl"
+    output_json = r"C:\Users\amarin\OneDrive - ANSYS, Inc\Articules and Trainings ACE\3D Texture - Light Guide\#2. Variable pitch\FittedSurface_Model.json"
     create_polynomial_surface(input_file, output_stl, output_json)
 
 

ansys_optical_automation/application/A_2_Create_a_variable_pitch_from_the_polynomial_surface.py

@@ -10,14 +10,17 @@
 Everything can also be executed independently (standalone).
 """
 
-import os
 import json
+import os
+from typing import List
+from typing import Tuple
+
 import numpy as np
-from typing import List, Tuple
 
 # Try importing the fitting script
 try:
     from A_1_Create_stl_polynomial_surface import create_polynomial_surface
+
     print("[INFO] Successfully imported create_polynomial_surface from 1_1_create_stl_polynomial_surface.py")
 except ModuleNotFoundError as e:
     print(f"[ERROR] Could not import Script 1: {e}")
@@ -68,9 +71,9 @@ def linear_pitch_x(x: float, x_min: float, x_max: float, p_start: float, p_end:
     return p_start * (1.0 - t) + p_end * t
 
 
-def generate_points(domain: Tuple[float, float, float, float],
-                    p_start: float, p_end: float, p_y: float,
-                    include_edges: bool = True) -> Tuple[np.ndarray, np.ndarray]:
+def generate_points(
+    domain: Tuple[float, float, float, float], p_start: float, p_end: float, p_y: float, include_edges: bool = True
+) -> Tuple[np.ndarray, np.ndarray]:
     """
     Generate (X, Y) grid with variable X pitch and constant Y pitch.
 
@@ -121,15 +124,14 @@ def eval_poly2d(coeffs: np.ndarray, x_norm: np.ndarray, y_norm: np.ndarray, orde
     idx = 0
     for i in range(order + 1):
         for j in range(order + 1 - i):
-            z += coeffs[idx] * (x_norm ** i) * (y_norm ** j)
+            z += coeffs[idx] * (x_norm**i) * (y_norm**j)
             idx += 1
     return z
 
 
-def write_opt3d_mapping(path: str,
-                        X: np.ndarray, Y: np.ndarray, Z: np.ndarray,
-                        extra_constants: List[str],
-                        float_fmt: str = ".6f") -> None:
+def write_opt3d_mapping(
+    path: str, X: np.ndarray, Y: np.ndarray, Z: np.ndarray, extra_constants: List[str], float_fmt: str = ".6f"
+) -> None:
     """Write the .OPT3DMapping file."""
     if len(extra_constants) != 9:
         raise ValueError("Exactly 9 extra constants are required.")
@@ -139,8 +141,7 @@ def write_opt3d_mapping(path: str,
     with open(path, "w", encoding="utf-8") as f:
         f.write(f"{n}\n")
         for x, y, z in zip(X, Y, Z):
-            f.write(f"{ffmt.format(x)} {ffmt.format(y)} {ffmt.format(z)} "
-                    + " ".join(extra_constants) + "\n")
+            f.write(f"{ffmt.format(x)} {ffmt.format(y)} {ffmt.format(z)} " + " ".join(extra_constants) + "\n")
 
 
 def ensure_model_json():
@@ -170,8 +171,7 @@ def main():
     y_min = Y_MIN or float(model["y_min"])
     y_max = Y_MAX or float(model["y_max"])
 
-    X_pts, Y_pts = generate_points((x_min, x_max, y_min, y_max),
-                                   PITCH_X_START, PITCH_X_END, PITCH_Y, INCLUDE_EDGES)
+    X_pts, Y_pts = generate_points((x_min, x_max, y_min, y_max), PITCH_X_START, PITCH_X_END, PITCH_Y, INCLUDE_EDGES)
     x_norm = (X_pts - x_mean) / x_std
     y_norm = (Y_pts - y_mean) / y_std
     Z_pts = eval_poly2d(coeffs, x_norm, y_norm, order)

ansys_optical_automation/application/B_2 Update Kz variation in mapping file.py

@@ -1,15 +1,12 @@
 import os
 
 # ==== Parameters ====
-K_Z_1 = 0.5   # Value applied at the minimum X (start of the range)
-K_Z_2 = 0.1   # Value applied at the maximum X (end of the range)
+K_Z_1 = 0.5  # Value applied at the minimum X (start of the range)
+K_Z_2 = 0.1  # Value applied at the maximum X (end of the range)
 
 # File paths
 input_path = r"C:\Users\amarin\OneDrive - ANSYS, Inc\Articules and Trainings ACE\3D Texture - Light Guide\#3. Variable Kz\TL L.3D Texture.2.OPT3DMapping"
-output_path = os.path.join(
-    os.path.dirname(input_path),
-    "K-Z Variation.OPT3DMapping"
-)
+output_path = os.path.join(os.path.dirname(input_path), "K-Z Variation.OPT3DMapping")
 
 # ==== Read the file ====
 # Read all lines from the mapping file

ansys_optical_automation/application/scdm_script_tool/2.1 3DT Random.py

@@ -1,16 +1,25 @@
+import ctypes
 import os
 import random
-import ctypes
+
 import clr
+
 clr.AddReference("System.Windows.Forms")
 clr.AddReference("System.Drawing")
 
-import System
-from System.Windows.Forms import (
-    Form, Label, TextBox, Button, DialogResult, FormStartPosition, Panel,
-    ProgressBar, ProgressBarStyle, Application, Timer
-)
-from System.Drawing import Point, Size
+from System.Drawing import Point
+from System.Drawing import Size
+from System.Windows.Forms import Application
+from System.Windows.Forms import Button
+from System.Windows.Forms import DialogResult
+from System.Windows.Forms import Form
+from System.Windows.Forms import FormStartPosition
+from System.Windows.Forms import Label
+from System.Windows.Forms import Panel
+from System.Windows.Forms import ProgressBar
+from System.Windows.Forms import ProgressBarStyle
+from System.Windows.Forms import TextBox
+from System.Windows.Forms import Timer
 
 # -------------------------------------------------------------------------
 # Windows MessageBox flags (for reference)
@@ -22,6 +31,7 @@
 MB_ICONINFORMATION = 0x00000040
 MB_TOPMOST = 0x00040000
 
+
 def show_message(message, title="Message"):
     """
     Show a Windows message box anchored to the current foreground window.
@@ -44,6 +54,7 @@ def show_message(message, title="Message"):
     hwnd = ctypes.windll.user32.GetForegroundWindow()
     ctypes.windll.user32.MessageBoxW(hwnd, message, title, MB_OK | MB_ICONINFORMATION | MB_TOPMOST)
 
+
 # === Simple progress window with animated bounce ===
 class ProgressWindow(Form):
     """A minimal progress dialog with a continuously bouncing progress bar."""
@@ -119,6 +130,7 @@ def animate_bar(self, sender, event):
             # Silently ignore transient UI exceptions
             pass
 
+
 # === GUI with editable control points ===
 class DynamicProbabilityForm(Form):
     """
@@ -355,6 +367,7 @@ def on_run(self, sender, event):
         except:
             show_message("Invalid input. Please check values.", "Input Error")
 
+
 def process_mapping_file(input_file, control_points, master_name):
     """
     Filter an .OPT3DMapping file based on an x-dependent removal probability.
@@ -384,7 +397,7 @@ def process_mapping_file(input_file, control_points, master_name):
     with open(input_file, "r") as f:
         lines = f.readlines()
 
-    original_count = int(lines[0].strip())
+    int(lines[0].strip())
     data_lines = lines[1:]
 
     # Parse X from each line; keep original line for later writing
@@ -408,7 +421,7 @@ def process_mapping_file(input_file, control_points, master_name):
     new_count = len(filtered_lines)
 
     # Encode control points in filename for traceability
-    points_str = "_".join(["p{:.1f}-{:.1f}".format(p, x*100) for x, p in control_points])
+    points_str = "_".join(["p{:.1f}-{:.1f}".format(p, x * 100) for x, p in control_points])
     output_file = os.path.join(os.path.dirname(input_file), "{}_{}.OPT3DMapping".format(master_name, points_str))
 
     # Write new header (count) and kept lines
@@ -419,6 +432,7 @@ def process_mapping_file(input_file, control_points, master_name):
 
     return output_file
 
+
 def interpolate_probability(x_norm, control_points):
     """
     Linearly interpolate a probability value for a given normalized x.
@@ -439,13 +453,14 @@ def interpolate_probability(x_norm, control_points):
     float
         Interpolated probability in [0..1].
     """
-    for i in range(len(control_points)-1):
+    for i in range(len(control_points) - 1):
         x0, p0 = control_points[i]
-        x1, p1 = control_points[i+1]
+        x1, p1 = control_points[i + 1]
         if x0 <= x_norm <= x1:
             return p0 + (p1 - p0) * ((x_norm - x0) / (x1 - x0))
     return control_points[-1][1]
 
+
 # -----------------------------------------------------------------------------
 # Main execution block
 # Attempts to:

ansys_optical_automation/post_process/dpf_xmp_viewer.py

@@ -437,9 +437,9 @@ class of MapStruct
                             line = next(my_data)
                             for xmp_value_idx, xmp_value in enumerate(line):
                                 if xmp_value != "":
-                                    xmp_map_struct.data[
-                                        layer_idx, xmp_value_idx, xmp_value_idy, wavelength_idx
-                                    ] = xmp_value
+                                    xmp_map_struct.data[layer_idx, xmp_value_idx, xmp_value_idy, wavelength_idx] = (
+                                        xmp_value
+                                    )
             elif self.dpf_instance.Maptype == 3 and xmp_map_struct.wl_res is not None:
                 for i in range(8):
                     line = next(my_data)
@@ -455,9 +455,9 @@ class of MapStruct
                             line = next(my_data)
                             for xmp_value_idx, xmp_value in enumerate(line):
                                 if xmp_value != "":
-                                    xmp_map_struct.data[
-                                        layer_idx, xmp_value_idx, xmp_value_idy, wavelength_idx
-                                    ] = xmp_value
+                                    xmp_map_struct.data[layer_idx, xmp_value_idx, xmp_value_idy, wavelength_idx] = (
+                                        xmp_value
+                                    )
             elif self.dpf_instance.Maptype == 3 and xmp_map_struct.wl_res is None:
                 for i in range(7):
                     line = next(my_data)

tests/config.py

@@ -1,4 +1,5 @@
 """Define constants and settings for tests"""
+
 SCDM_VERSION = 222
 API_VERSION = 22
 LUMERICAL_VERSION = 222