Adjust import order

arhowe00 · arhowe00 · commit f694d6a9ce01 · 2025-07-27T23:50:51.000-04:00
diff --git a/src/openlifu/bf/apod_methods/apodmethod.py b/src/openlifu/bf/apod_methods/apodmethod.py
@@ -5,6 +5,7 @@
 from typing import Any
 
 import numpy as np
+import pandas as pd
 import xarray as xa
 
 from openlifu.bf import apod_methods
@@ -32,7 +33,7 @@ def from_dict(d):
         return class_constructor(**d)
 
     @abstractmethod
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the apodization method parameters
 
diff --git a/src/openlifu/bf/apod_methods/maxangle.py b/src/openlifu/bf/apod_methods/maxangle.py
@@ -4,6 +4,7 @@
 from typing import Annotated
 
 import numpy as np
+import pandas as pd
 import xarray as xa
 
 from openlifu.bf.apod_methods import ApodizationMethod
@@ -37,13 +38,12 @@ def calc_apodization(self, arr: Transducer, target: Point, params: xa.Dataset, t
         apod[angles <= self.max_angle] = 1
         return apod
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the apodization method parameters
 
         :returns: Pandas DataFrame of the apodization method parameters
         """
-        import pandas as pd
         records = [{"Name": "Type", "Value": "Max Angle", "Unit": ""},
                    {"Name": "Max Angle", "Value": self.max_angle, "Unit": self.units}]
         return pd.DataFrame.from_records(records)
diff --git a/src/openlifu/bf/apod_methods/piecewiselinear.py b/src/openlifu/bf/apod_methods/piecewiselinear.py
@@ -4,6 +4,7 @@
 from typing import Annotated
 
 import numpy as np
+import pandas as pd
 import xarray as xa
 
 from openlifu.bf.apod_methods import ApodizationMethod
@@ -47,13 +48,12 @@ def calc_apodization(self, arr: Transducer, target: Point, params: xa.Dataset, t
         apod = np.maximum(0, np.minimum(1, f))
         return apod
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the apodization method parameters
 
         :returns: Pandas DataFrame of the apodization method parameters
         """
-        import pandas as pd
         records = [
             {"Name": "Type", "Value": "Piecewise-Linear", "Unit": ""},
             {"Name": "Zero Angle", "Value": self.zero_angle, "Unit": self.units},
diff --git a/src/openlifu/bf/apod_methods/uniform.py b/src/openlifu/bf/apod_methods/uniform.py
@@ -4,6 +4,7 @@
 from typing import Annotated
 
 import numpy as np
+import pandas as pd
 import xarray as xa
 
 from openlifu.bf.apod_methods import ApodizationMethod
@@ -26,7 +27,6 @@ def to_table(self):
 
         :returns: Pandas DataFrame of the apodization method parameters
         """
-        import pandas as pd
         records = [{"Name": "Type", "Value": "Uniform", "Unit": ""},
                    {"Name": "Value", "Value": self.value, "Unit": ""}]
         return pd.DataFrame.from_records(records)
diff --git a/src/openlifu/bf/delay_methods/delaymethod.py b/src/openlifu/bf/delay_methods/delaymethod.py
@@ -4,6 +4,7 @@
 from dataclasses import dataclass
 
 import numpy as np
+import pandas as pd
 import xarray as xa
 
 from openlifu.bf import delay_methods
@@ -31,7 +32,7 @@ def from_dict(d):
         return class_constructor(**d)
 
     @abstractmethod
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the delay method parameters
 
diff --git a/src/openlifu/bf/delay_methods/direct.py b/src/openlifu/bf/delay_methods/direct.py
@@ -4,6 +4,7 @@
 from typing import Annotated
 
 import numpy as np
+import pandas as pd
 import xarray as xa
 
 from openlifu.bf.delay_methods import DelayMethod
@@ -36,13 +37,12 @@ def calc_delays(self, arr: Transducer, target: Point, params: xa.Dataset | None=
         delays = max(tof) - tof
         return delays
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the delay method parameters
 
         :returns: Pandas DataFrame of the delay method parameters
         """
-        import pandas as pd
         records = [{"Name": "Type", "Value": "Direct", "Unit": ""},
                    {"Name": "Default Sound Speed", "Value": self.c0, "Unit": "m/s"}]
         return pd.DataFrame.from_records(records)
diff --git a/src/openlifu/bf/focal_patterns/focal_pattern.py b/src/openlifu/bf/focal_patterns/focal_pattern.py
@@ -4,6 +4,8 @@
 from dataclasses import dataclass
 from typing import Annotated
 
+import pandas as pd
+
 from openlifu.bf import focal_patterns
 from openlifu.geo import Point
 from openlifu.util.annotations import OpenLIFUFieldData
@@ -74,7 +76,7 @@ def from_dict(d):
         return class_constructor(**d)
 
     @abstractmethod
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the focal pattern parameters
 
diff --git a/src/openlifu/bf/focal_patterns/single.py b/src/openlifu/bf/focal_patterns/single.py
@@ -2,6 +2,8 @@
 
 from dataclasses import dataclass
 
+import pandas as pd
+
 from openlifu.bf.focal_patterns import FocalPattern
 from openlifu.geo import Point
 
@@ -30,13 +32,12 @@ def num_foci(self):
         """
         return 1
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the focal pattern parameters
 
         :returns: Pandas DataFrame of the focal pattern parameters
         """
-        import pandas as pd
         records = [{"Name": "Type", "Value": "Single Point", "Unit": ""},
                    {"Name": "Target Pressure", "Value": self.target_pressure, "Unit": self.units}]
         return pd.DataFrame.from_records(records)
diff --git a/src/openlifu/bf/focal_patterns/wheel.py b/src/openlifu/bf/focal_patterns/wheel.py
@@ -4,6 +4,7 @@
 from typing import Annotated
 
 import numpy as np
+import pandas as pd
 
 from openlifu.bf.focal_patterns import FocalPattern
 from openlifu.geo import Point
@@ -71,13 +72,12 @@ def num_foci(self) -> int:
         """
         return int(self.center) + self.num_spokes
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the focal pattern parameters
 
         :returns: Pandas DataFrame of the focal pattern parameters
         """
-        import pandas as pd
         records = [
             {"Name": "Type", "Value": "Wheel", "Unit": ""},
             {"Name": "Target Pressure", "Value": self.target_pressure, "Unit": self.units},
diff --git a/src/openlifu/bf/pulse.py b/src/openlifu/bf/pulse.py
@@ -51,7 +51,7 @@ def calc_time(self, dt: float):
         """
         return np.arange(0, self.duration, dt)
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the pulse parameters
 
diff --git a/src/openlifu/plan/param_constraint.py b/src/openlifu/plan/param_constraint.py
@@ -3,6 +3,8 @@
 from dataclasses import dataclass
 from typing import Annotated, Literal, Tuple
 
+import pandas as pd
+
 from openlifu.util.annotations import OpenLIFUFieldData
 from openlifu.util.dict_conversion import DictMixin
 
@@ -79,9 +81,8 @@ def get_status(self, value: float) -> str:
     def get_status_symbol(self, value: float) -> str:
         return PARAM_STATUS_SYMBOLS[self.get_status(value)]
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """Convert the parameter constraint to a table format."""
-        import pandas as pd
         records = []
         if self.operator in ['<', '<=', '>', '>='] or self.operator in ['within', 'inside', 'outside', 'outside_inclusive']:
             value_template = f"value {self.operator} {{value}}"
diff --git a/src/openlifu/plan/target_constraints.py b/src/openlifu/plan/target_constraints.py
@@ -4,6 +4,8 @@
 from dataclasses import dataclass
 from typing import Annotated
 
+import pandas as pd
+
 from openlifu.util.annotations import OpenLIFUFieldData
 from openlifu.util.dict_conversion import DictMixin
 from openlifu.util.units import getunittype
@@ -57,12 +59,12 @@ def check_bounds(self, pos: float):
             logging.error(msg=f"The position {pos} at dimension {self.name} is not within bounds [{self.min}, {self.max}]!")
             raise ValueError(f"The position {pos} at dimension {self.name} is not within bounds [{self.min}, {self.max}]!")
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the target constraints parameters.
+
         :returns: Pandas DataFrame of the target constraints parameters
         """
-        import pandas as pd
         records = [
             {"Name": self.name, "Value": f"({self.min},{self.max})", "Unit": self.units},
         ]
diff --git a/src/openlifu/seg/seg_method.py b/src/openlifu/seg/seg_method.py
@@ -6,6 +6,7 @@
 from typing import Annotated, Any
 
 import numpy as np
+import pandas as pd
 import xarray as xa
 
 from openlifu.seg.material import MATERIALS, PARAM_INFO, Material
@@ -101,7 +102,7 @@ def _ref_segment(self, coords: xa.Coordinates):
         return seg
 
     @abstractmethod
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the segmentation method parameters
 
diff --git a/src/openlifu/seg/seg_methods/uniform.py b/src/openlifu/seg/seg_methods/uniform.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import pandas as pd
 import xarray as xa
 
 from openlifu.seg.material import MATERIALS, Material
@@ -10,13 +11,12 @@ class UniformSegmentation(SegmentationMethod):
     def _segment(self, volume: xa.DataArray):
         return self._ref_segment(volume.coords)
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the segmentation method parameters
 
         :returns: Pandas DataFrame of the segmentation method parameters
         """
-        import pandas as pd
         records = [{"Name": "Type", "Value": "Uniform Tissue", "Unit": ""},
                    {"Name": "Reference Material", "Value": self._ref_material, "Unit": ""}]
         return pd.DataFrame.from_records(records)
@@ -28,13 +28,12 @@ def __init__(self, materials: dict[str, Material] | None = None):
             materials = MATERIALS.copy()
         super().__init__(materials=materials, ref_material="tissue")
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the segmentation method parameters
 
         :returns: Pandas DataFrame of the segmentation method parameters
         """
-        import pandas as pd
         records = [{"Name": "Type", "Value": "Uniform Tissue", "Unit": ""}]
         return pd.DataFrame.from_records(records)
 
@@ -45,12 +44,11 @@ def __init__(self, materials: dict[str, Material] | None = None):
             materials = MATERIALS.copy()
         super().__init__(materials=materials, ref_material="water")
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the segmentation method parameters
 
         :returns: Pandas DataFrame of the segmentation method parameters
         """
-        import pandas as pd
         records = [{"Name": "Type", "Value": "Uniform Water", "Unit": ""}]
         return pd.DataFrame.from_records(records)
diff --git a/src/openlifu/sim/sim_setup.py b/src/openlifu/sim/sim_setup.py
@@ -5,6 +5,7 @@
 from typing import Annotated, Tuple
 
 import numpy as np
+import pandas as pd
 import xarray as xa
 
 from openlifu.geo import Point
@@ -194,13 +195,12 @@ def setup_sim_scene(
 
         return params
 
-    def to_table(self):
+    def to_table(self) -> pd.DataFrame:
         """
         Get a table of the simulation setup parameters
 
         :returns: Pandas DataFrame of the simulation setup parameters
         """
-        import pandas as pd
         records = [
             {"Name": "Spacing", "Value": self.spacing, "Unit": self.units},
             {"Name": "X Extent", "Value": f"{self.x_extent[0]} to {self.x_extent[1]}", "Unit": self.units},
