Merge pull request #939 from Kenneth-T-Moore/lazy

jkirk5 · web-flow · commit b00f1db8117d · 2025-12-17T19:45:06.000Z
Speed up the aviary command line.
diff --git a/aviary/api.py b/aviary/api.py
@@ -96,7 +96,6 @@
     preprocess_propulsion,
 )
 from aviary.utils.process_input_decks import create_vehicle
-from aviary.utils.functions import create_opts2vals, add_opts2vals, Null
 
 # ODEs
 # TODO: check and see if this works with both sides, or just GASP
diff --git a/aviary/docs/getting_started/onboarding_level3.ipynb b/aviary/docs/getting_started/onboarding_level3.ipynb
@@ -821,7 +821,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "aviary",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -835,7 +835,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.9"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,
diff --git a/aviary/interface/cmd_entry_points.py b/aviary/interface/cmd_entry_points.py
@@ -7,11 +7,11 @@
 from aviary.interface.methods_for_level1 import _exec_level1, _setup_level1_parser
 from aviary.interface.plot_drag_polar import _exec_plot_drag_polar, _setup_plot_drag_polar_parser
 from aviary.interface.test_installation import _exec_installation_test, _setup_installation_test
-from aviary.utils.aero_table_conversion import _exec_ATC, _setup_ATC_parser
-from aviary.utils.engine_deck_conversion import _exec_EDC, _setup_EDC_parser
+from aviary.utils.aero_table_conversion_cmd import _exec_ATC, _setup_ATC_parser
+from aviary.utils.engine_deck_conversion_cmd import _exec_EDC, _setup_EDC_parser
 from aviary.utils.fortran_to_aviary import _exec_F2A, _setup_F2A_parser
 from aviary.utils.propeller_map_conversion import _exec_PMC, _setup_PMC_parser
-from aviary.visualization.dashboard import _dashboard_cmd, _dashboard_setup_parser
+from aviary.visualization.dashboard_cmd import _dashboard_cmd, _dashboard_setup_parser
 from aviary.visualization.realtime_plot import _rtplot_cmd, _rtplot_setup_parser
 
 
@@ -68,7 +68,7 @@ def _load_and_exec(script_name, user_args):
     'hangar': (
         _setup_hangar_parser,
         _exec_hangar,
-        'Copy aircraft and engine models included with Aviary to specified folder. Allows users'
+        'Copy aircraft and engine models included with Aviary to specified folder. Allows users '
         'who did not install Aviary locally to still access model files.',
     ),
     'convert_engine': (
@@ -148,7 +148,10 @@ def aviary_cmd():
 
         # Check if --version was passed
         if options.version:
-            print(f'Aviary version: {aviary.__version__}')
+            from importlib.metadata import version
+
+            aviary_version: str = version('aviary')
+            print(f'Aviary version: {aviary_version}')
             return
 
         if unknown:
diff --git a/aviary/interface/download_models.py b/aviary/interface/download_models.py
@@ -50,6 +50,7 @@ def _setup_hangar_parser(parser: argparse.ArgumentParser):
 
 def _exec_hangar(args, user_args):
     input_decks = []
+
     for input_deck in args.input_decks:
         input_decks.append(get_model(input_deck))
 
diff --git a/aviary/interface/methods_for_level1.py b/aviary/interface/methods_for_level1.py
@@ -4,7 +4,6 @@
 from pathlib import Path
 import sys
 
-from aviary.interface.methods_for_level2 import AviaryProblem
 from aviary.utils.functions import get_path
 from aviary.variable_info.enums import Verbosity
 
@@ -72,6 +71,8 @@ def run_aviary(
     else:
         name = None
 
+    from aviary.interface.methods_for_level2 import AviaryProblem
+
     # Build problem
     prob = AviaryProblem(name=name, verbosity=verbosity)
 
diff --git a/aviary/interface/plot_drag_polar.py b/aviary/interface/plot_drag_polar.py
@@ -7,7 +7,7 @@
 import numpy as np
 from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk
 
-import aviary.api as av
+from aviary.utils.csv_data_file import read_data_file
 from aviary.utils.functions import get_path
 
 
@@ -22,7 +22,7 @@ def plot_drag_polar(input_file=None):
 
     try:
         input_path = get_path(input_file)
-        polar_data, _, _ = av.read_data_file(
+        polar_data, _, _ = read_data_file(
             input_path,
             aliases={
                 'altitude': 'altitude',
@@ -32,6 +32,7 @@ def plot_drag_polar(input_file=None):
                 'CD': 'total_drag_coefficient',
             },
         )
+
     except Exception as e:
         messagebox.showerror('Error', f'Failed to read the file: {str(e)}')
         return
diff --git a/aviary/interface/test/test_download_models.py b/aviary/interface/test/test_download_models.py
@@ -4,8 +4,8 @@
 
 from openmdao.utils.testing_utils import use_tempdirs
 
-from aviary.interface.download_models import get_model, save_file
-from aviary.utils.functions import get_aviary_resource_path
+from aviary.interface.download_models import save_file
+from aviary.utils.functions import get_aviary_resource_path, get_model
 
 
 @use_tempdirs
diff --git a/aviary/mission/gasp_based/ode/taxi_ode.py b/aviary/mission/gasp_based/ode/taxi_ode.py
@@ -6,7 +6,7 @@
 from aviary.mission.gasp_based.ode.two_dof_ode import TwoDOFODE
 from aviary.subsystems.propulsion.propulsion_builder import PropulsionBuilderBase
 from aviary.utils.aviary_values import AviaryValues
-from aviary.utils.functions import add_opts2vals, create_opts2vals
+from aviary.utils.option_to_var import add_opts2vals, create_opts2vals
 from aviary.variable_info.enums import SpeedType
 from aviary.variable_info.variables import Aircraft, Dynamic, Mission
 
diff --git a/aviary/mission/two_dof_problem_configurator.py b/aviary/mission/two_dof_problem_configurator.py
@@ -14,7 +14,6 @@
 from aviary.mission.gasp_based.polynomial_fit import PolynomialFit
 from aviary.mission.problem_configurator import ProblemConfiguratorBase
 from aviary.subsystems.propulsion.utils import build_engine_deck
-from aviary.utils.functions import add_opts2vals, create_opts2vals
 from aviary.utils.process_input_decks import initialization_guessing, update_GASP_options
 from aviary.utils.utils import wrapped_convert_units
 from aviary.variable_info.enums import LegacyCode
diff --git a/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py b/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py
@@ -5,7 +5,7 @@
 
 from aviary.constants import GRAV_ENGLISH_LBM
 from aviary.subsystems.aerodynamics.gasp_based.common import AeroForces, CLFromLift, TanhRampComp
-from aviary.utils.functions import sigmoidX, smooth_min, d_smooth_min
+from aviary.utils.math import sigmoidX, smooth_min, d_smooth_min
 from aviary.variable_info.enums import AircraftTypes, Verbosity
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Dynamic, Mission, Settings
diff --git a/aviary/subsystems/geometry/flops_based/fuselage.py b/aviary/subsystems/geometry/flops_based/fuselage.py
@@ -3,7 +3,7 @@
 import numpy as np
 import openmdao.api as om
 
-from aviary.utils.functions import smooth_int_tanh, d_smooth_int_tanh
+from aviary.utils.math import smooth_int_tanh, d_smooth_int_tanh
 from aviary.variable_info.enums import Verbosity
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Mission, Settings
diff --git a/aviary/subsystems/geometry/gasp_based/fuselage.py b/aviary/subsystems/geometry/gasp_based/fuselage.py
@@ -1,7 +1,7 @@
 import numpy as np
 import openmdao.api as om
 
-from aviary.utils.functions import sigmoidX
+from aviary.utils.math import sigmoidX
 from aviary.variable_info.enums import Verbosity
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Settings
diff --git a/aviary/subsystems/geometry/gasp_based/wing.py b/aviary/subsystems/geometry/gasp_based/wing.py
@@ -7,7 +7,7 @@
 )
 from aviary.subsystems.geometry.gasp_based.strut import StrutGeom
 from aviary.utils.conflict_checks import check_fold_location_definition
-from aviary.utils.functions import sigmoidX, dSigmoidXdx
+from aviary.utils.math import sigmoidX, dSigmoidXdx
 from aviary.variable_info.enums import AircraftTypes, Verbosity
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Mission, Settings
diff --git a/aviary/subsystems/mass/flops_based/cargo_containers.py b/aviary/subsystems/mass/flops_based/cargo_containers.py
@@ -2,7 +2,7 @@
 import openmdao.api as om
 
 from aviary.constants import GRAV_ENGLISH_LBM
-from aviary.utils.functions import sin_int4, dydx_sin_int4
+from aviary.utils.math import sin_int4, dydx_sin_int4
 from aviary.variable_info.functions import add_aviary_input, add_aviary_output
 from aviary.variable_info.variables import Aircraft
 
diff --git a/aviary/subsystems/mass/gasp_based/design_load.py b/aviary/subsystems/mass/gasp_based/design_load.py
@@ -2,7 +2,7 @@
 import openmdao.api as om
 
 from aviary.constants import RHO_SEA_LEVEL_ENGLISH
-from aviary.utils.functions import sigmoidX, dSigmoidXdx
+from aviary.utils.math import sigmoidX, dSigmoidXdx
 from aviary.variable_info.enums import Verbosity
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Mission, Settings
diff --git a/aviary/subsystems/mass/gasp_based/equipment_and_useful_load.py b/aviary/subsystems/mass/gasp_based/equipment_and_useful_load.py
@@ -2,7 +2,7 @@
 import openmdao.api as om
 
 from aviary.constants import GRAV_ENGLISH_LBM
-from aviary.utils.functions import sigmoidX, dSigmoidXdx, smooth_max, d_smooth_max
+from aviary.utils.math import sigmoidX, dSigmoidXdx, smooth_max, d_smooth_max
 from aviary.variable_info.enums import AircraftTypes, GASPEngineType, Verbosity
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Mission, Settings
diff --git a/aviary/subsystems/mass/gasp_based/fixed.py b/aviary/subsystems/mass/gasp_based/fixed.py
@@ -3,7 +3,7 @@
 from openmdao.components.ks_comp import KSfunction
 
 from aviary.constants import GRAV_ENGLISH_LBM, RHO_SEA_LEVEL_ENGLISH
-from aviary.utils.functions import dSigmoidXdx, sigmoidX
+from aviary.utils.math import dSigmoidXdx, sigmoidX
 from aviary.variable_info.enums import FlapType
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Mission
diff --git a/aviary/subsystems/mass/gasp_based/fuel.py b/aviary/subsystems/mass/gasp_based/fuel.py
@@ -4,7 +4,7 @@
 from openmdao.utils.units import convert_units
 
 from aviary.constants import GRAV_ENGLISH_LBM
-from aviary.utils.functions import d_smooth_max, dSigmoidXdx, sigmoidX, smooth_max
+from aviary.utils.math import d_smooth_max, dSigmoidXdx, sigmoidX, smooth_max
 from aviary.variable_info.enums import AircraftTypes, Verbosity
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Mission, Settings
diff --git a/aviary/subsystems/propulsion/propeller/propeller_performance.py b/aviary/subsystems/propulsion/propeller/propeller_performance.py
@@ -11,7 +11,7 @@
 )
 from aviary.subsystems.propulsion.propeller.propeller_map import PropellerMap
 from aviary.utils.aviary_values import AviaryValues
-from aviary.utils.functions import d_smooth_min, smooth_min
+from aviary.utils.math import d_smooth_min, smooth_min
 from aviary.utils.named_values import NamedValues
 from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
 from aviary.variable_info.variables import Aircraft, Dynamic
diff --git a/aviary/utils/aero_table_conversion.py b/aviary/utils/aero_table_conversion.py
@@ -9,17 +9,12 @@
 import numpy as np
 from openmdao.components.interp_util.interp import InterpND
 
-from aviary.api import NamedValues
 from aviary.interface.utils import round_it
 from aviary.utils.conversion_utils import _parse, _read_map, _rep
 from aviary.utils.csv_data_file import write_data_file
 from aviary.utils.functions import get_path
-
-
-class CodeOrigin(Enum):
-    FLOPS = 'FLOPS'
-    GASP = 'GASP'
-    GASP_ALT = 'GASP_ALT'
+from aviary.utils.named_values import NamedValues
+from aviary.variable_info.enums import CodeOrigin
 
 
 _gasp_keys = ['Altitude', 'Mach', 'Angle of Attack']
@@ -486,30 +481,9 @@ def _make_structured_grid(data, method='lagrange3', fields=['CL', 'CD']):
     return structured_data
 
 
-def _setup_ATC_parser(parser):
-    parser.add_argument('input_file', type=str, help='path to aero data file to be converted')
-    parser.add_argument(
-        'output_file',
-        type=str,
-        nargs='?',
-        help='path to file where new converted data will be written',
-    )
-    parser.add_argument(
-        '-f',
-        '--data_format',
-        type=str,
-        choices=[origin.value for origin in CodeOrigin],
-        help='data format used by input_file',
-    )
-
-
-def _exec_ATC(args, user_args):
-    convert_aero_table(
-        input_file=args.input_file, output_file=args.output_file, data_format=args.data_format
-    )
-
-
 if __name__ == '__main__':
+    from aviary.utils.aero_table_conversion_cmd import _setup_ATC_parser, _exec_ATC
+
     parser = argparse.ArgumentParser(
         description='Converts FLOPS- or GASP-formatted aero data files into Aviary csv format.\n'
     )
diff --git a/aviary/utils/aero_table_conversion_cmd.py b/aviary/utils/aero_table_conversion_cmd.py
@@ -0,0 +1,31 @@
+"""
+Command line api for the aero table converter.
+Kept in a separate file to speed up the command line imports.
+"""
+
+from aviary.variable_info.enums import CodeOrigin
+
+
+def _setup_ATC_parser(parser):
+    parser.add_argument('input_file', type=str, help='path to aero data file to be converted')
+    parser.add_argument(
+        'output_file',
+        type=str,
+        nargs='?',
+        help='path to file where new converted data will be written',
+    )
+    parser.add_argument(
+        '-f',
+        '--data_format',
+        type=str,
+        choices=[origin.value for origin in CodeOrigin],
+        help='data format used by input_file',
+    )
+
+
+def _exec_ATC(args, user_args):
+    from aviary.utils.aero_table_conversion import convert_aero_table
+
+    convert_aero_table(
+        input_file=args.input_file, output_file=args.output_file, data_format=args.data_format
+    )
diff --git a/aviary/utils/engine_deck_conversion.py b/aviary/utils/engine_deck_conversion.py
@@ -1,9 +1,6 @@
 #!/usr/bin/python
 import argparse
-import getpass
 from copy import deepcopy
-from datetime import datetime
-from enum import Enum
 
 import numpy as np
 import openmdao.api as om
@@ -17,18 +14,10 @@
 from aviary.utils.csv_data_file import write_data_file
 from aviary.utils.functions import get_path
 from aviary.utils.named_values import NamedValues
+from aviary.variable_info.enums import EngineDeckType
 from aviary.variable_info.variables import Dynamic
 
 
-class EngineDeckType(Enum):
-    FLOPS = 'FLOPS'
-    GASP = 'GASP'
-    GASP_TS = 'GASP_TS'
-
-    def __str__(self):
-        return self.value
-
-
 MACH = EngineModelVariables.MACH
 ALTITUDE = EngineModelVariables.ALTITUDE
 THROTTLE = EngineModelVariables.THROTTLE
@@ -735,34 +724,9 @@ def compute(self, inputs, outputs):
         outputs['p2'] = p2
 
 
-def _setup_EDC_parser(parser):
-    parser.add_argument('input_file', type=str, help='path to engine deck file to be converted')
-    parser.add_argument(
-        'output_file',
-        type=str,
-        nargs='?',
-        help='path to file where new converted data will be written',
-    )
-    parser.add_argument(
-        '-f',
-        '--data_format',
-        type=EngineDeckType,
-        choices=list(EngineDeckType),
-        help='data format used by input_file',
-    )
-    parser.add_argument('--round', action='store_true', help='round data to improve readability')
-
-
-def _exec_EDC(args, user_args):
-    convert_engine_deck(
-        input_file=args.input_file,
-        output_file=args.output_file,
-        data_format=args.data_format,
-        round_data=args.round,
-    )
-
-
 if __name__ == '__main__':
+    from aviary.utils.engine_deck_conversion_cmd import setup_EDC, _setup_EDC_parser
+
     parser = argparse.ArgumentParser()
     _setup_EDC_parser(parser)
     args = parser.parse_args()
diff --git a/aviary/utils/engine_deck_conversion_cmd.py b/aviary/utils/engine_deck_conversion_cmd.py
diff --git a/aviary/utils/functions.py b/aviary/utils/functions.py
diff --git a/aviary/utils/math.py b/aviary/utils/math.py
diff --git a/aviary/utils/option_to_var.py b/aviary/utils/option_to_var.py
diff --git a/aviary/utils/propeller_map_conversion.py b/aviary/utils/propeller_map_conversion.py
diff --git a/aviary/utils/test/test_functions.py b/aviary/utils/test/test_functions.py
diff --git a/aviary/variable_info/enums.py b/aviary/variable_info/enums.py
diff --git a/aviary/visualization/dashboard.py b/aviary/visualization/dashboard.py
diff --git a/aviary/visualization/dashboard_cmd.py b/aviary/visualization/dashboard_cmd.py

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@`
`96`	`96`	`preprocess_propulsion,`
`97`	`97`	`)`
`98`	`98`	`from aviary.utils.process_input_decks import create_vehicle`
`99`		`-from aviary.utils.functions import create_opts2vals, add_opts2vals, Null`
`100`	`99`
`101`	`100`	`# ODEs`
`102`	`101`	`# TODO: check and see if this works with both sides, or just GASP`