refactor: Moved contracts + fixes

src/blender_maxwell/assets/import_geonodes.py

@@ -1,21 +1,16 @@
 """Provides for the linking and/or appending of geometry nodes trees from vendored libraries included in Blender maxwell."""
 
 import enum
-import typing as typ
 from pathlib import Path
 
 import bpy
-import typing_extensions as typx
 
-from .. import info
+from blender_maxwell import contracts as ct
 from blender_maxwell.utils import logger
 
-log = logger.get(__name__)
+from .. import info
 
-ImportMethod: typ.TypeAlias = typx.Literal['append', 'link']
-BLOperatorStatus: typ.TypeAlias = set[
-	typx.Literal['RUNNING_MODAL', 'CANCELLED', 'FINISHED', 'PASS_THROUGH', 'INTERFACE']
-]
+log = logger.get(__name__)
 
 
 ####################
@@ -26,6 +21,7 @@ class GeoNodes(enum.StrEnum):
 
 	The value of this StrEnum is both the name of the .blend file containing the GeoNodes group, and of the GeoNodes group itself.
 	"""
+
 	# Node Previews
 	## Input
 	InputConstantPhysicalPol = '_input_constant_physical_pol'
@@ -134,7 +130,6 @@ GN_PARENT_PATHS: dict[GeoNodes, Path] = {
 	GeoNodes.SimulationSimGridAxisManual: GN_INTERNAL_SIMULATIONS_PATH,
 	GeoNodes.SimulationSimGridAxisUniform: GN_INTERNAL_SIMULATIONS_PATH,
 	GeoNodes.SimulationSimGridAxisArray: GN_INTERNAL_SIMULATIONS_PATH,
-
 	# Structures
 	GeoNodes.PrimitiveBox: GN_STRUCTURES_PRIMITIVES_PATH,
 	GeoNodes.PrimitiveRing: GN_STRUCTURES_PRIMITIVES_PATH,
@@ -147,7 +142,7 @@ GN_PARENT_PATHS: dict[GeoNodes, Path] = {
 ####################
 def import_geonodes(
 	geonodes: GeoNodes,
-	import_method: ImportMethod,
+	import_method: ct.BLImportMethod,
 ) -> bpy.types.GeometryNodeGroup:
 	"""Given a (name of a) GeoNodes group packaged with Blender Maxwell, link/append it to the current file, and return the node group.
 
@@ -159,10 +154,7 @@ def import_geonodes(
 	Returns:
 		A GeoNodes group available in the current .blend file, which can ex. be attached to a 'GeoNodes Structure' node.
 	"""
-	if (
-		import_method == 'link'
-		and geonodes in bpy.data.node_groups
-	):
+	if import_method == 'link' and geonodes in bpy.data.node_groups:
 		return bpy.data.node_groups[geonodes]
 
 	filename = geonodes
@@ -273,7 +265,7 @@ class AppendGeoNodes(bpy.types.Operator):
 	def invoke(self, context: bpy.types.Context, _):
 		return self.execute(context)
 
-	def execute(self, context: bpy.types.Context) -> BLOperatorStatus:
+	def execute(self, context: bpy.types.Context) -> ct.BLOperatorStatus:
 		"""Initializes the while-dragging modal handler, which executes custom logic when the mouse button is released.
 
 		Runs in response to drag_handler of a `UILayout.template_asset_view`.
@@ -296,7 +288,7 @@ class AppendGeoNodes(bpy.types.Operator):
 
 	def modal(
 		self, context: bpy.types.Context, event: bpy.types.Event
-	) -> BLOperatorStatus:
+	) -> ct.BLOperatorStatus:
 		"""When LMB is released, creates a GeoNodes Structure node.
 
 		Runs in response to events in the node editor while dragging an asset from the side panel.

src/blender_maxwell/contracts/__init__.py

@@ -0,0 +1,33 @@
+from . import addon
+from .bl import (
+	BLClass,
+	BLColorRGBA,
+	BLEnumID,
+	BLIconSet,
+	BLImportMethod,
+	BLKeymapItem,
+	BLModifierType,
+	BLNodeTreeInterfaceID,
+	BLOperatorStatus,
+	KeymapItemDef,
+	ManagedObjName,
+	PresetName,
+	SocketName,
+)
+
+__all__ = [
+	'addon',
+	'BLClass',
+	'BLColorRGBA',
+	'BLEnumID',
+	'BLIconSet',
+	'BLImportMethod',
+	'BLKeymapItem',
+	'BLModifierType',
+	'BLNodeTreeInterfaceID',
+	'BLOperatorStatus',
+	'KeymapItemDef',
+	'ManagedObjName',
+	'PresetName',
+	'SocketName',
+]

src/blender_maxwell/contracts/addon.py

@@ -3,20 +3,16 @@ from pathlib import Path
 
 import bpy
 
-PATH_ADDON_ROOT = Path(__file__).resolve().parent
-
-####################
-# - Addon Info
-####################
+PATH_ADDON_ROOT = Path(__file__).resolve().parent.parent
 with (PATH_ADDON_ROOT / 'pyproject.toml').open('rb') as f:
 	PROJ_SPEC = tomllib.load(f)
 	## bl_info is filled with PROJ_SPEC when packing the .zip.
 
-ADDON_NAME = PROJ_SPEC['project']['name']
-ADDON_VERSION = PROJ_SPEC['project']['version']
+NAME = PROJ_SPEC['project']['name']
+VERSION = PROJ_SPEC['project']['version']
 
 ####################
-# - Asset Info
+# - Assets
 ####################
 PATH_ASSETS = PATH_ADDON_ROOT / 'assets'
 
@@ -33,7 +29,17 @@ DEFAULT_PATH_DEPS = PATH_ADDON_ROOT / '.addon_dependencies'
 ####################
 ADDON_CACHE = PATH_ADDON_ROOT / '.addon_cache'
 ADDON_CACHE.mkdir(exist_ok=True)
-## TODO: Addon preferences?
+
+
+####################
+# - Addon Prefs Info
+####################
+def prefs() -> bpy.types.AddonPreferences | None:
+	if (addon := bpy.context.preferences.addons.get(NAME)) is None:
+		return None
+
+	return addon.preferences
+
 
 ####################
 # - Logging Info
@@ -47,13 +53,3 @@ DEFAULT_LOG_PATH.touch(exist_ok=True)
 PATH_BOOTSTRAP_LOG_LEVEL = PATH_ADDON_ROOT / '.bootstrap_log_level'
 with PATH_BOOTSTRAP_LOG_LEVEL.open('r') as f:
 	BOOTSTRAP_LOG_LEVEL = int(f.read().strip())
-
-
-####################
-# - Addon Prefs Info
-####################
-def addon_prefs() -> bpy.types.AddonPreferences | None:
-	if (addon := bpy.context.preferences.addons.get(ADDON_NAME)) is None:
-		return None
-
-	return addon.preferences

src/blender_maxwell/contracts/bl.py

@@ -23,6 +23,7 @@ SocketName = typx.Annotated[
 ####################
 # - Blender Enums
 ####################
+BLImportMethod: typ.TypeAlias = typx.Literal['append', 'link']
 BLModifierType: typ.TypeAlias = typx.Literal['NODES', 'ARRAY']
 BLNodeTreeInterfaceID: typ.TypeAlias = str
 
@@ -58,13 +59,13 @@ BLOperatorStatus: typ.TypeAlias = set[
 ####################
 # - Addon Types
 ####################
+KeymapItemDef: typ.TypeAlias = typ.Any  ## TODO: Better Type
 ManagedObjName = typx.Annotated[
 	str,
 	pyd.StringConstraints(
 		pattern=r'^[a-z_]+$',
 	),
 ]
-KeymapItemDef: typ.TypeAlias = typ.Any  ## TODO: Better Type
 
 ####################
 # - Blender Strings

src/blender_maxwell/node_trees/maxwell_sim_nodes/bl_socket_map.py

@@ -13,6 +13,7 @@ import sympy as sp
 
 from blender_maxwell.utils import extra_sympy_units as spux
 from blender_maxwell.utils import logger as _logger
+
 from . import contracts as ct
 from . import sockets
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/__init__.py

@@ -1,12 +1,17 @@
 from blender_maxwell.contracts import (
+	BLClass,
 	BLColorRGBA,
 	BLEnumID,
 	BLIconSet,
+	BLKeymapItem,
 	BLModifierType,
 	BLNodeTreeInterfaceID,
+	BLOperatorStatus,
+	KeymapItemDef,
 	ManagedObjName,
 	PresetName,
 	SocketName,
+	addon,
 )
 
 from .bl_socket_desc_map import BL_SOCKET_DESCR_TYPE_MAP
@@ -35,14 +40,19 @@ from .tree_types import TreeType
 from .unit_systems import UNITS_BLENDER, UNITS_TIDY3D
 
 __all__ = [
+	'BLClass',
 	'BLColorRGBA',
 	'BLEnumID',
 	'BLIconSet',
+	'BLKeymapItem',
 	'BLModifierType',
 	'BLNodeTreeInterfaceID',
+	'BLOperatorStatus',
+	'KeymapItemDef',
 	'ManagedObjName',
 	'PresetName',
 	'SocketName',
+	'addon',
 	'Icon',
 	'TreeType',
 	'SocketType',
@@ -58,13 +68,13 @@ __all__ = [
 	'NodeCategory',
 	'NODE_CAT_LABELS',
 	'ManagedObjType',
-	'FlowKind',
-	'CapabilitiesFlow',
-	'ValueFlow',
-	'ArrayFlow',
-	'LazyValueFlow',
-	'LazyArrayRangeFlow',
-	'ParamsFlow',
-	'InfoFlow',
 	'FlowEvent',
+	'ArrayFlow',
+	'CapabilitiesFlow',
+	'FlowKind',
+	'InfoFlow',
+	'LazyArrayRangeFlow',
+	'LazyValueFlow',
+	'ParamsFlow',
+	'ValueFlow',
 ]

src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/flow_events.py

@@ -1,5 +1,4 @@
 import enum
-import typing as typ
 
 import typing_extensions as typx
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/flow_kinds.py

@@ -12,6 +12,7 @@ import sympy.physics.units as spu
 import typing_extensions as typx
 
 from blender_maxwell.utils import extra_sympy_units as spux
+
 from .socket_types import SocketType
 
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/socket_units.py

@@ -1,6 +1,7 @@
 import sympy.physics.units as spu
 
 from blender_maxwell.utils import extra_sympy_units as spux
+
 from .socket_types import SocketType as ST  # noqa: N817
 
 SOCKET_UNITS = {

src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/unit_systems.py

@@ -4,6 +4,7 @@ import sympy.physics.units as spu
 
 from blender_maxwell.utils import extra_sympy_units as spux
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from .socket_types import SocketType as ST  # noqa: N817
 from .socket_units import SOCKET_UNITS
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/managed_objs/managed_bl_image.py

@@ -10,6 +10,7 @@ import numpy as np
 import typing_extensions as typx
 
 from blender_maxwell.utils import logger
+
 from .. import contracts as ct
 from . import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/managed_objs/managed_bl_mesh.py

@@ -5,6 +5,7 @@ import bpy
 import numpy as np
 
 from blender_maxwell.utils import logger
+
 from .. import contracts as ct
 from . import base
 from .managed_bl_collection import managed_collection, preview_collection

src/blender_maxwell/node_trees/maxwell_sim_nodes/managed_objs/managed_bl_modifier.py

@@ -3,9 +3,9 @@
 import typing as typ
 
 import bpy
-import typing_extensions as typx
 
 from blender_maxwell.utils import analyze_geonodes, logger
+
 from .. import bl_socket_map
 from .. import contracts as ct
 from . import base

src/blender_maxwell/node_trees/maxwell_sim_nodes/node_tree.py

@@ -4,6 +4,7 @@ import typing as typ
 import bpy
 
 from blender_maxwell.utils import logger
+
 from . import contracts as ct
 
 log = logger.get(__name__)

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/analysis/__init__.py

@@ -1,4 +1,4 @@
-from . import extract_data, viz, math
+from . import extract_data, math, viz
 
 BL_REGISTER = [
 	*extract_data.BL_REGISTER,

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/analysis/extract_data.py

@@ -2,9 +2,8 @@ import typing as typ
 
 import bpy
 import jax.numpy as jnp
-import sympy.physics.units as spu
 
-from blender_maxwell.utils import jarray, logger
+from blender_maxwell.utils import logger
 
 from ... import contracts as ct
 from ... import sockets
@@ -249,15 +248,15 @@ class ExtractDataNode(base.MaxwellSimNode):
 		elif self.active_socket_set == 'Field Data':  # noqa: RET505
 			xarr = getattr(input_sockets['Field Data'], props['field_data__component'])
 
-			return jarray.JArray.from_xarray(
-				xarr,
-				dim_units={
-					'x': spu.um,
-					'y': spu.um,
-					'z': spu.um,
-					'f': spu.hertz,
-				},
-			)
+			#return jarray.JArray.from_xarray(
+			#	xarr,
+			#	dim_units={
+			#		'x': spu.um,
+			#		'y': spu.um,
+			#		'z': spu.um,
+			#		'f': spu.hertz,
+			#	},
+			#)
 
 		elif self.active_socket_set == 'Flux Data':
 			flux_data = self._compute_input('Flux Data')

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/analysis/math/__init__.py

@@ -1,4 +1,4 @@
-from . import map_math, filter_math, reduce_math, operate_math
+from . import filter_math, map_math, operate_math, reduce_math
 
 BL_REGISTER = [
 	*map_math.BL_REGISTER,

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/analysis/math/filter_math.py

@@ -1,8 +1,6 @@
-import functools
 import typing as typ
 
 import bpy
-import jax
 import jax.numpy as jnp
 
 from blender_maxwell.utils import logger

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/analysis/viz.py

@@ -1,9 +1,9 @@
 import typing as typ
 
 import bpy
-import jax.numpy as jnp
 
 from blender_maxwell.utils import logger
+
 from ... import contracts as ct
 from ... import managed_objs, sockets
 from .. import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/events.py

@@ -4,6 +4,7 @@ import typing as typ
 from types import MappingProxyType
 
 from blender_maxwell.utils import logger
+
 from .. import contracts as ct
 
 log = logger.get(__name__)

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/constants/scientific_constant.py

@@ -3,6 +3,7 @@ import typing as typ
 import bpy
 
 from blender_maxwell.utils import sci_constants as constants
+
 from .... import contracts as ct
 from .... import sockets
 from ... import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/tidy_3d_file_importer.py

@@ -6,6 +6,7 @@ import tidy3d as td
 import tidy3d.plugins.dispersion as td_dispersion
 
 from blender_maxwell.utils import logger
+
 from .... import contracts as ct
 from .... import managed_objs, sockets
 from ... import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/wave_constant.py

@@ -7,6 +7,7 @@ import sympy.physics.units as spu
 from blender_maxwell.utils import extra_sympy_units as spux
 from blender_maxwell.utils import logger
 from blender_maxwell.utils import sci_constants as constants
+
 from ... import contracts as ct
 from ... import sockets
 from .. import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy_3d_web_importer.py

@@ -1,9 +1,10 @@
 import typing as typ
 from pathlib import Path
 
+from blender_maxwell.utils import logger
+
 from ...... import info
 from ......services import tdcloud
-from blender_maxwell.utils import logger
 from .... import contracts as ct
 from .... import sockets
 from ... import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/mediums/library_medium.py

@@ -1,4 +1,3 @@
-import typing as typ
 
 import bpy
 import scipy as sc
@@ -7,6 +6,7 @@ import sympy.physics.units as spu
 import tidy3d as td
 
 from blender_maxwell.utils import extra_sympy_units as spuex
+
 from ... import contracts as ct
 from ... import managed_objs, sockets
 from .. import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/monitors/eh_field_monitor.py

@@ -3,9 +3,10 @@ import typing as typ
 import sympy as sp
 import tidy3d as td
 
-from .....assets.import_geonodes import GeoNodes, import_geonodes
 from blender_maxwell.utils import extra_sympy_units as spux
 from blender_maxwell.utils import logger
+
+from .....assets.import_geonodes import GeoNodes, import_geonodes
 from ... import contracts as ct
 from ... import managed_objs, sockets
 from .. import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/monitors/field_power_flux_monitor.py

@@ -3,9 +3,10 @@ import typing as typ
 import sympy as sp
 import tidy3d as td
 
-from .....assets.import_geonodes import GeoNodes, import_geonodes
 from blender_maxwell.utils import extra_sympy_units as spux
 from blender_maxwell.utils import logger
+
+from .....assets.import_geonodes import GeoNodes, import_geonodes
 from ... import contracts as ct
 from ... import managed_objs, sockets
 from .. import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/outputs/viewer.py

@@ -4,6 +4,7 @@ import bpy
 import sympy as sp
 
 from blender_maxwell.utils import logger
+
 from ... import contracts as ct
 from ... import sockets
 from .. import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/sources/temporal_shapes/gaussian_pulse_temporal_shape.py

@@ -1,4 +1,3 @@
-import typing as typ
 
 import bpy
 import numpy as np
@@ -6,6 +5,7 @@ import sympy.physics.units as spu
 import tidy3d as td
 
 from blender_maxwell.utils import extra_sympy_units as spuex
+
 from .... import contracts as ct
 from .... import managed_objs, sockets
 from ... import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/structures/geonodes_structure.py

@@ -3,6 +3,7 @@ import typing as typ
 import tidy3d as td
 
 from blender_maxwell.utils import analyze_geonodes, logger
+
 from ... import bl_socket_map, managed_objs, sockets
 from ... import contracts as ct
 from .. import base, events

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/__init__.py

@@ -1,4 +1,5 @@
 from blender_maxwell.utils import logger
+
 from .. import contracts as ct
 from . import basic, blender, maxwell, number, physical, tidy3d, vector
 from .scan_socket_defs import scan_for_socket_defs

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/base.py

@@ -8,6 +8,7 @@ import sympy as sp
 import typing_extensions as typx
 
 from blender_maxwell.utils import logger, serialize
+
 from .. import contracts as ct
 
 log = logger.get(__name__)

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py

@@ -4,6 +4,7 @@ import sympy.physics.units as spu
 import tidy3d as td
 
 from blender_maxwell.utils.pydantic_sympy import ConstrSympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/complex_number.py

@@ -4,6 +4,7 @@ import bpy
 import sympy as sp
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/rational_number.py

@@ -2,6 +2,7 @@ import bpy
 import sympy as sp
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/real_number.py

@@ -1,6 +1,7 @@
 import bpy
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/accel_scalar.py

@@ -2,6 +2,7 @@ import bpy
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/angle.py

@@ -2,6 +2,7 @@ import bpy
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/force_scalar.py

@@ -2,6 +2,7 @@ import bpy
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/freq.py

@@ -4,6 +4,7 @@ import sympy as sp
 from blender_maxwell.utils import extra_sympy_units as spux
 from blender_maxwell.utils import logger
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/length.py

@@ -5,6 +5,7 @@ import sympy.physics.units as spu
 from blender_maxwell.utils import extra_sympy_units as spux
 from blender_maxwell.utils import logger
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/mass.py

@@ -2,6 +2,7 @@ import bpy
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/point_3d.py

@@ -5,6 +5,7 @@ import sympy as sp
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/pol.py

@@ -4,6 +4,7 @@ import sympy.physics.optics.polarization as spo_pol
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/size_3d.py

@@ -3,6 +3,7 @@ import sympy as sp
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/speed.py

@@ -2,6 +2,7 @@ import bpy
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/time.py

@@ -4,6 +4,7 @@ import bpy
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/unit_system.py

@@ -1,6 +1,7 @@
 import bpy
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/volume.py

@@ -2,6 +2,7 @@ import bpy
 import sympy.physics.units as spu
 
 from blender_maxwell.utils.pydantic_sympy import SympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/integer_3d_vector.py

@@ -2,6 +2,7 @@ import bpy
 import sympy as sp
 
 from blender_maxwell.utils.pydantic_sympy import ConstrSympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_2d_vector.py

@@ -2,6 +2,7 @@ import bpy
 import sympy as sp
 
 from blender_maxwell.utils.pydantic_sympy import ConstrSympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_3d_vector.py

@@ -2,6 +2,7 @@ import bpy
 import sympy as sp
 
 from blender_maxwell.utils.pydantic_sympy import ConstrSympyExpr
+
 from ... import contracts as ct
 from .. import base
 

src/blender_maxwell/nodeps/operators/install_deps.py

@@ -4,9 +4,10 @@ from pathlib import Path
 
 import bpy
 
-from ... import registration
 from blender_maxwell.utils import pydeps, simple_logger
 
+from ... import registration
+
 log = simple_logger.get(__name__)
 
 

src/blender_maxwell/nodeps/operators/popup_install_deps.py

@@ -4,9 +4,10 @@ from pathlib import Path
 
 import bpy
 
-from .. import registration
 from blender_maxwell.utils import logger as _logger
 
+from .. import registration
+
 log = _logger.get(__name__)
 
 

src/blender_maxwell/registration.py

@@ -12,33 +12,20 @@ from pathlib import Path
 
 import bpy
 
+from . import contracts as ct
 from .nodeps.utils import simple_logger
 
 log = simple_logger.get(__name__)
 
-# TODO: More types for these things!
 DelayedRegKey: typ.TypeAlias = str
-BLClass: typ.TypeAlias = (
-	bpy.types.Panel
-	| bpy.types.UIList
-	| bpy.types.Menu
-	| bpy.types.Header
-	| bpy.types.Operator
-	| bpy.types.KeyingSetInfo
-	| bpy.types.RenderEngine
-	| bpy.types.AssetShelf
-	| bpy.types.FileHandler
-)
-BLKeymapItem: typ.TypeAlias = typ.Any  ## TODO: Better Type
-KeymapItemDef: typ.TypeAlias = typ.Any  ## TODO: Better Type
 
 ####################
 # - Globals
 ####################
 BL_KEYMAP: bpy.types.KeyMap | None = None
 
-REG__CLASSES: list[BLClass] = []
-REG__KEYMAP_ITEMS: list[BLKeymapItem] = []
+REG__CLASSES: list[ct.BLClass] = []
+REG__KEYMAP_ITEMS: list[ct.BLKeymapItem] = []
 
 DELAYED_REGISTRATIONS: dict[DelayedRegKey, typ.Callable[[Path], None]] = {}
 
@@ -51,7 +38,7 @@ EVENT__DEPS_SATISFIED: DelayedRegKey = 'on_deps_satisfied'
 ####################
 # - Class Registration
 ####################
-def register_classes(bl_register: list[BLClass]) -> None:
+def register_classes(bl_register: list[ct.BLClass]) -> None:
 	"""Registers a Blender class, allowing it to hook into relevant Blender features.
 
 	Caches registered classes in the module global `REG__CLASSES`.
@@ -150,8 +137,8 @@ def unregister_keymap_items():
 ####################
 def delay_registration(
 	delayed_reg_key: DelayedRegKey,
-	classes_cb: typ.Callable[[Path], list[BLClass]],
-	keymap_item_defs_cb: typ.Callable[[Path], list[KeymapItemDef]],
+	classes_cb: typ.Callable[[Path], list[ct.BLClass]],
+	keymap_item_defs_cb: typ.Callable[[Path], list[ct.KeymapItemDef]],
 ) -> None:
 	"""Delays the registration of Blender classes that depend on certain Python dependencies, for which neither the location nor validity is yet known.
 

src/blender_maxwell/utils/jarray.py

@@ -4,13 +4,11 @@ from types import MappingProxyType
 
 import jax
 import jax.numpy as jnp
-import pandas as pd
 
 # import jaxtyping as jtyp
 import sympy.physics.units as spu
 import xarray
 
-from . import extra_sympy_units as spux
 from . import logger
 
 log = logger.get(__name__)