diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 45a55d2..f3202a8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,17 +20,27 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.4.3 + rev: v0.6.8 hooks: # ruff lint #- id: ruff - # args: [ --fix ] + #args: [ --fix ] # ruff fmt - id: ruff-format - repo: https://github.com/commitizen-tools/commitizen - rev: master + rev: v3.29.1 hooks: - id: commitizen - id: commitizen-branch stages: [push] + + - repo: local + hooks: + - id: pytest + name: pytest + entry: ./.venv/bin/pytest tests + language: system + types: [python] + pass_filenames: false + always_run: true diff --git a/oscillode/managed_objs/managed_bl_modifier.py b/oscillode/managed_objs/managed_bl_modifier.py index fd0a1cc..c7ccac7 100644 --- a/oscillode/managed_objs/managed_bl_modifier.py +++ b/oscillode/managed_objs/managed_bl_modifier.py @@ -126,7 +126,7 @@ def write_modifier_geonodes( modifier_altered = True ## TODO: More fine-grained alterations? - return modifier_altered # noqa: RET504 + return modifier_altered #################### diff --git a/oscillode/node_trees/maxwell_sim_nodes/bl_socket_map.py b/oscillode/node_trees/maxwell_sim_nodes/bl_socket_map.py index 21c599c..a37bb65 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/bl_socket_map.py +++ b/oscillode/node_trees/maxwell_sim_nodes/bl_socket_map.py @@ -38,7 +38,6 @@ Attributes: """ import bpy - from blender_maxwell.utils import logger as _logger from . import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/extract_data.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/extract_data.py index 9b2037b..0b97f6e 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/extract_data.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/extract_data.py @@ -41,7 +41,6 @@ import jax.numpy as jnp import sympy.physics.units as spu import tidy3d as td import xarray - from blender_maxwell.utils import bl_cache, logger, sim_symbols from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/filter_math.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/filter_math.py index 21beeb1..5330b07 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/filter_math.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/filter_math.py @@ -37,7 +37,6 @@ import typing as typ import bpy import sympy as sp - from blender_maxwell.utils import bl_cache, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/map_math.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/map_math.py index 1298bac..b8b4392 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/map_math.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/map_math.py @@ -35,7 +35,6 @@ import typing as typ import bpy - from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/operate_math.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/operate_math.py index ed52d66..d51a4b5 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/operate_math.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/operate_math.py @@ -38,7 +38,6 @@ See `blender_maxwell.maxwell_sim_nodes.math_system` for the actual mathematics i import typing as typ import bpy - from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/reduce_math.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/reduce_math.py index 7576da0..fa89525 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/reduce_math.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/reduce_math.py @@ -39,7 +39,6 @@ import bpy import jax import jax.numpy as jnp import numpy as np - from blender_maxwell.utils import bl_cache, logger, sim_symbols from .... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/transform_math.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/transform_math.py index 75157c2..eebf0e4 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/transform_math.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/math/transform_math.py @@ -37,7 +37,6 @@ import typing as typ import bpy import sympy as sp - from blender_maxwell.utils import bl_cache, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/viz.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/viz.py index 8219b6a..5da7b7f 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/viz.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/analysis/viz.py @@ -38,10 +38,9 @@ import jaxtyping as jtyp import matplotlib.axis as mpl_ax import sympy as sp import sympy.physics.units as spu -from frozendict import frozendict - from blender_maxwell.utils import bl_cache, image_ops, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux +from frozendict import frozendict from ... import contracts as ct from ... import managed_objs, sockets diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/base.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/base.py index fc62197..6d959fb 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/base.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/base.py @@ -43,7 +43,6 @@ from collections import defaultdict from types import MappingProxyType import bpy - from blender_maxwell.utils import bl_cache, bl_instance, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/events.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/events.py index 4b07df6..e27cf4e 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/events.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/events.py @@ -36,14 +36,11 @@ import typing as typ import uuid from collections import defaultdict from fractions import Fraction -from types import MappingProxyType import bpy import jax import numpy as np import pydantic as pyd -import sympy as sp - from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux from blender_maxwell.utils.frozendict import FrozenDict, frozendict diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/constants/scientific_constant.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/constants/scientific_constant.py index 3ce6b4e..1bd5578 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/constants/scientific_constant.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/constants/scientific_constant.py @@ -36,10 +36,9 @@ import typing as typ import bpy import sympy as sp -from frozendict import frozendict - from blender_maxwell.utils import bl_cache, sci_constants, sim_symbols from blender_maxwell.utils import sympy_extra as spux +from frozendict import frozendict from .... import contracts as ct from .... import sockets diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/constants/symbol_constant.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/constants/symbol_constant.py index b23445a..77f0074 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/constants/symbol_constant.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/constants/symbol_constant.py @@ -38,7 +38,6 @@ from fractions import Fraction import bpy import sympy as sp - from blender_maxwell.utils import bl_cache, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/data_file_importer.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/data_file_importer.py index b099cfb..9fe9e4d 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/data_file_importer.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/data_file_importer.py @@ -39,7 +39,6 @@ from pathlib import Path import bpy import sympy as sp import tidy3d as td - from blender_maxwell.utils import bl_cache, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/tidy_3d_file_importer.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/tidy_3d_file_importer.py index 2dc5a32..ea70d37 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/tidy_3d_file_importer.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/file_importers/tidy_3d_file_importer.py @@ -37,7 +37,6 @@ from pathlib import Path import bpy import tidy3d as td - from blender_maxwell.utils import bl_cache, logger from .... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/scene.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/scene.py index 184141d..5d7353a 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/scene.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/scene.py @@ -37,7 +37,6 @@ import typing as typ import bpy import sympy as sp import sympy.physics.units as spu - from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy3d_web_importer.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy3d_web_importer.py index 291e952..5a53d68 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy3d_web_importer.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy3d_web_importer.py @@ -36,7 +36,6 @@ import typing as typ import bpy import tidy3d as td - from blender_maxwell.services import tdcloud from blender_maxwell.utils import bl_cache, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/library_medium.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/library_medium.py index 4d44732..58ae46e 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/library_medium.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/library_medium.py @@ -40,11 +40,10 @@ import bpy import sympy as sp import sympy.physics.units as spu import tidy3d as td -from tidy3d.material_library.material_library import MaterialItem as Tidy3DMediumItem -from tidy3d.material_library.material_library import VariantItem as Tidy3DMediumVariant - from blender_maxwell.utils import bl_cache, logger, sci_constants from blender_maxwell.utils import sympy_extra as spux +from tidy3d.material_library.material_library import MaterialItem as Tidy3DMediumItem +from tidy3d.material_library.material_library import VariantItem as Tidy3DMediumVariant from ... import contracts as ct from ... import managed_objs, sockets diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/add_non_linearity.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/add_non_linearity.py index b436d83..0d3d723 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/add_non_linearity.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/add_non_linearity.py @@ -36,7 +36,6 @@ import functools import typing as typ import tidy3d as td - from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/chi_3_susceptibility_non_linearity.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/chi_3_susceptibility_non_linearity.py index e9e2ada..6a847aa 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/chi_3_susceptibility_non_linearity.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/chi_3_susceptibility_non_linearity.py @@ -36,7 +36,6 @@ import typing as typ import bpy import tidy3d as td - from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/kerr_non_linearity.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/kerr_non_linearity.py index 827fb48..f490c07 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/kerr_non_linearity.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/non_linearities/kerr_non_linearity.py @@ -36,7 +36,6 @@ import typing as typ import bpy import tidy3d as td - from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/pole_residue_medium.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/pole_residue_medium.py index 0798b17..cbd9570 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/pole_residue_medium.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/mediums/pole_residue_medium.py @@ -36,7 +36,6 @@ import bpy import sympy.physics.units as spu import tidy3d as td import tidy3d.plugins.dispersion as td_dispersion - from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/eh_field_monitor.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/eh_field_monitor.py index b675e9e..b07e81f 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/eh_field_monitor.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/eh_field_monitor.py @@ -36,7 +36,6 @@ import bpy import sympy as sp import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/field_power_flux_monitor.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/field_power_flux_monitor.py index 88bbc48..a7fc9cb 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/field_power_flux_monitor.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/field_power_flux_monitor.py @@ -39,7 +39,6 @@ import bpy import sympy as sp import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/permittivity_monitor.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/permittivity_monitor.py index 3621da4..d7df87b 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/permittivity_monitor.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/monitors/permittivity_monitor.py @@ -34,7 +34,6 @@ import typing as typ import sympy as sp import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/file_exporters/data_file_exporter.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/file_exporters/data_file_exporter.py index 687c58a..3f218f3 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/file_exporters/data_file_exporter.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/file_exporters/data_file_exporter.py @@ -34,7 +34,6 @@ import typing as typ from pathlib import Path import bpy - from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/file_exporters/json_file_exporter.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/file_exporters/json_file_exporter.py index 455d62a..47209ac 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/file_exporters/json_file_exporter.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/file_exporters/json_file_exporter.py @@ -115,11 +115,10 @@ class JSONFileExporterNode(base.MaxwellSimNode): return data.json() # Pydantic Models: Call .model_dump_json() - elif isinstance(data, pyd.BaseModel): + if isinstance(data, pyd.BaseModel): return data.model_dump_json() - else: - json.dumps(data) + json.dumps(data) #################### diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/viewer.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/viewer.py index 52987f5..100dddc 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/viewer.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/viewer.py @@ -35,7 +35,6 @@ import typing as typ import bpy import sympy as sp import tidy3d as td - from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/web_exporters/tidy3d_web_exporter.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/web_exporters/tidy3d_web_exporter.py index 7ae1744..debd273 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/web_exporters/tidy3d_web_exporter.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/outputs/web_exporters/tidy3d_web_exporter.py @@ -36,7 +36,6 @@ import typing as typ import bpy import tidy3d as td - from blender_maxwell.services import tdcloud from blender_maxwell.utils import bl_cache, logger, sim_symbols diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/absorbing_bound_cond.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/absorbing_bound_cond.py index 7140b8c..334f949 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/absorbing_bound_cond.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/absorbing_bound_cond.py @@ -37,7 +37,6 @@ import typing as typ import bpy import sympy as sp import tidy3d as td - from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/bloch_bound_cond.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/bloch_bound_cond.py index d0f7fa9..506f9a3 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/bloch_bound_cond.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/bloch_bound_cond.py @@ -36,7 +36,6 @@ import typing as typ import bpy import tidy3d as td - from blender_maxwell.utils import bl_cache, logger from .... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/pml_bound_cond.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/pml_bound_cond.py index 17a60d3..059fca3 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/pml_bound_cond.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_cond_faces/pml_bound_cond.py @@ -37,7 +37,6 @@ import typing as typ import bpy import sympy as sp import tidy3d as td - from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_conds.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_conds.py index 41ade55..856311e 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_conds.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/bound_conds.py @@ -35,7 +35,6 @@ import typing as typ import tidy3d as td - from blender_maxwell.utils import logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/fdtd_sim.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/fdtd_sim.py index a9ab1cc..e00e657 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/fdtd_sim.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/fdtd_sim.py @@ -36,12 +36,9 @@ import itertools import typing as typ import bpy -import jax -import numpy as np import sympy as sp import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.utils import bl_cache, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux from blender_maxwell.utils.frozendict import frozendict diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_domain.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_domain.py index f492681..e208a6b 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_domain.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_domain.py @@ -36,7 +36,6 @@ import typing as typ import sympy as sp import sympy.physics.units as spu - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid.py index 35cd314..0830043 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid.py @@ -36,7 +36,6 @@ import typing as typ import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.utils import logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid_axes/automatic_sim_grid_axis.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid_axes/automatic_sim_grid_axis.py index d453456..72aa1fc 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid_axes/automatic_sim_grid_axis.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid_axes/automatic_sim_grid_axis.py @@ -36,7 +36,6 @@ import typing as typ import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.utils import logger from .... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid_axes/uniform_sim_grid_axis.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid_axes/uniform_sim_grid_axis.py index 324b64c..e58074c 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid_axes/uniform_sim_grid_axis.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/simulations/sim_grid_axes/uniform_sim_grid_axis.py @@ -36,7 +36,6 @@ import typing as typ import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.utils import logger from .... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/solvers/fdtd_solver.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/solvers/fdtd_solver.py index 6e1035b..b887fcb 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/solvers/fdtd_solver.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/solvers/fdtd_solver.py @@ -35,7 +35,6 @@ import typing as typ import bpy - from blender_maxwell.services import tdcloud from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/solvers/mode_solver.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/solvers/mode_solver.py index 1d8077f..da41371 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/solvers/mode_solver.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/solvers/mode_solver.py @@ -38,7 +38,6 @@ import typing as typ import bpy import sympy as sp import tidy3d as td - from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux from blender_maxwell.utils.frozendict import frozendict diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/gaussian_beam_source.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/gaussian_beam_source.py index a6914d8..71e3965 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/gaussian_beam_source.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/gaussian_beam_source.py @@ -37,7 +37,6 @@ import typing as typ import bpy import sympy as sp import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/mode_source.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/mode_source.py index 208cbba..885d672 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/mode_source.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/mode_source.py @@ -35,7 +35,6 @@ import typing as typ import tidy3d as td - from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux from blender_maxwell.utils.frozendict import frozendict diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/plane_wave_source.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/plane_wave_source.py index ef2120b..166f29c 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/plane_wave_source.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/plane_wave_source.py @@ -37,7 +37,6 @@ import typing as typ import bpy import sympy as sp import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/point_dipole_source.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/point_dipole_source.py index c9db0a1..e829b64 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/point_dipole_source.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/point_dipole_source.py @@ -37,7 +37,6 @@ import typing as typ import bpy import sympy as sp import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import bl_cache, logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/temporal_shape.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/temporal_shape.py index c3786b0..097f918 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/temporal_shape.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/sources/temporal_shape.py @@ -40,14 +40,13 @@ import numpy as np import sympy as sp import sympy.physics.units as spu import tidy3d as td +from blender_maxwell.utils import bl_cache, logger, sim_symbols +from blender_maxwell.utils import sympy_extra as spux from tidy3d.components.data.data_array import TimeDataArray as td_TimeDataArray from tidy3d.components.data.dataset import TimeDataset as td_TimeDataset -from blender_maxwell.utils import bl_cache, logger, sim_symbols -from blender_maxwell.utils import sympy_extra as spux - from ... import contracts as ct -from ... import managed_objs, sockets +from ... import sockets from .. import base, events log = logger.get(__name__) diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/geonodes_structure.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/geonodes_structure.py index f1f2aea..7d05af2 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/geonodes_structure.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/geonodes_structure.py @@ -38,7 +38,6 @@ import typing as typ import sympy as sp import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/box_structure.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/box_structure.py index ae06947..16314ed 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/box_structure.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/box_structure.py @@ -37,7 +37,6 @@ import typing as typ import sympy as sp import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/cylinder_structure.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/cylinder_structure.py index 861c3a8..bf8ec21 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/cylinder_structure.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/cylinder_structure.py @@ -37,7 +37,6 @@ import typing as typ import sympy as sp import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/sphere_structure.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/sphere_structure.py index 228bed7..d2bd015 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/sphere_structure.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/structures/primitives/sphere_structure.py @@ -37,7 +37,6 @@ import typing as typ import sympy as sp import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.assets.geonodes import GeoNodes, import_geonodes from blender_maxwell.utils import logger from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/combine.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/combine.py index 7a4e2e2..33aa675 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/combine.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/combine.py @@ -35,7 +35,6 @@ import typing as typ import bpy import sympy as sp - from blender_maxwell.utils import bl_cache, logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/view_text.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/view_text.py index 3864d1e..3f99e59 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/view_text.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/view_text.py @@ -33,11 +33,7 @@ import typing as typ import bpy -import sympy as sp -import tidy3d as td - from blender_maxwell.utils import bl_cache, logger -from blender_maxwell.utils import sympy_extra as spux from ... import contracts as ct from ... import sockets diff --git a/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/wave_constant.py b/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/wave_constant.py index 9b19a00..7c7c8e1 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/wave_constant.py +++ b/oscillode/node_trees/maxwell_sim_nodes/nodes/utilities/wave_constant.py @@ -38,7 +38,6 @@ import bpy import jax.numpy as jnp import sympy as sp import sympy.physics.units as spu - from blender_maxwell.utils import bl_cache, logger, sci_constants, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/base.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/base.py index 0e6dc14..9ebcdb6 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/base.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/base.py @@ -35,7 +35,6 @@ import typing as typ import bpy import pydantic as pyd - from blender_maxwell.utils import bl_cache, bl_instance, logger, serialize from .. import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/bool.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/bool.py index 78617f1..24554ab 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/bool.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/bool.py @@ -31,7 +31,6 @@ # along with this program. If not, see . import bpy - from blender_maxwell.utils import bl_cache from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/file_path.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/file_path.py index e971662..f26caf4 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/file_path.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/file_path.py @@ -33,7 +33,6 @@ from pathlib import Path import bpy - from blender_maxwell.utils import bl_cache, logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/string.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/string.py index 298e3de..b8853dc 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/string.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/basic/string.py @@ -31,7 +31,6 @@ # along with this program. If not, see . import bpy - from blender_maxwell.utils import bl_cache from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py index d1e1e9b..988d4eb 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py @@ -31,7 +31,6 @@ # along with this program. If not, see . import bpy - from blender_maxwell.utils import bl_cache, logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/image.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/image.py index 71376e3..3b90384 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/image.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/image.py @@ -31,8 +31,7 @@ # along with this program. If not, see . import bpy - -from blender_maxwell.utils import bl_cache, logger +from blender_maxwell.utils import bl_cache from ... import contracts as ct from .. import base diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/material.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/material.py index 233f4e4..a4dbfa7 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/material.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/material.py @@ -31,8 +31,7 @@ # along with this program. If not, see . import bpy - -from blender_maxwell.utils import bl_cache, logger +from blender_maxwell.utils import bl_cache from ... import contracts as ct from .. import base diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/object.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/object.py index 3ec0e22..ea6f096 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/object.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/object.py @@ -31,7 +31,6 @@ # along with this program. If not, see . import bpy - from blender_maxwell.utils import bl_cache, logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/text.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/text.py index 5ffcf29..f24ae50 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/text.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/blender/text.py @@ -31,7 +31,6 @@ # along with this program. If not, see . import bpy - from blender_maxwell.utils import bl_cache, logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/expr.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/expr.py index c5a2dea..8c2fc61 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/expr.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/expr.py @@ -38,7 +38,6 @@ import typing as typ import bpy import pydantic as pyd import sympy as sp - from blender_maxwell.utils import bl_cache, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux from blender_maxwell.utils.frozendict import frozendict diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py index 45804a8..2c179cd 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py @@ -33,7 +33,6 @@ import bpy import pydantic as pyd import tidy3d as td - from blender_maxwell.utils import bl_cache, logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py index 91fc5bf..d86642e 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py @@ -34,7 +34,6 @@ import bpy import tidy3d as td - from blender_maxwell.utils import bl_cache, logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py index 3c685da..7d4b3c2 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py @@ -30,7 +30,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import typing as typ from ... import contracts as ct from .. import base diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py index 8d0d4ae..cd5419c 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py @@ -35,7 +35,6 @@ import scipy as sc import sympy as sp import sympy.physics.units as spu import tidy3d as td - from blender_maxwell.utils import bl_cache, logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/mode.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/mode.py index bef1e0b..81d780e 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/mode.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/mode.py @@ -30,7 +30,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import typing as typ from ... import contracts as ct from .. import base diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py index 8e3198e..681f441 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py @@ -32,7 +32,6 @@ import bpy import tidy3d as td - from blender_maxwell.utils import bl_cache, logger from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/physical/pol.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/physical/pol.py index 610301c..d60bc70 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/physical/pol.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/physical/pol.py @@ -34,7 +34,6 @@ import bpy import sympy as sp import sympy.physics.optics.polarization as spo_pol import sympy.physics.units as spu - from blender_maxwell.utils import sympy_extra as spux from ... import contracts as ct diff --git a/oscillode/node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py b/oscillode/node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py index 65d1f57..c0a1f86 100644 --- a/oscillode/node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py +++ b/oscillode/node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py @@ -35,7 +35,6 @@ import enum import bpy - from blender_maxwell.services import tdcloud from blender_maxwell.utils import bl_cache diff --git a/oscillode/utils/flow_kinds/capabilities.py b/oscillode/utils/flow_kinds/capabilities.py index cffa475..1338d88 100644 --- a/oscillode/utils/flow_kinds/capabilities.py +++ b/oscillode/utils/flow_kinds/capabilities.py @@ -16,7 +16,6 @@ import dataclasses import typing as typ -from types import MappingProxyType from ..socket_types import SocketType from .flow_kinds import FlowKind diff --git a/oscillode/utils/math_system/filter.py b/oscillode/utils/math_system/filter.py index 2d902bb..7c6d459 100644 --- a/oscillode/utils/math_system/filter.py +++ b/oscillode/utils/math_system/filter.py @@ -36,7 +36,6 @@ import typing as typ import jax.lax as jlax import jax.numpy as jnp - from blender_maxwell.utils import logger, sim_symbols from .. import contracts as ct @@ -158,7 +157,7 @@ class FilterOperation(enum.StrEnum): ## -> Mathematically valid (I suppose) for 2. But not so useful. # if any( # (dim.has_idx_discrete(dim) or dim.has_idx_labels(dim)) - # and len(dim_idx) > 5 # noqa: PLR2004 + # and len(dim_idx) > 5 # for dim, dim_idx in info.dims.items() # ): # ops += [FO.ZScore15, FO.ZScore30] diff --git a/oscillode/utils/math_system/map.py b/oscillode/utils/math_system/map.py index b5ae56a..607cde6 100644 --- a/oscillode/utils/math_system/map.py +++ b/oscillode/utils/math_system/map.py @@ -39,7 +39,6 @@ import jax.numpy as jnp import jaxtyping as jtyp import sympy as sp import sympy.physics.units as spu - from blender_maxwell.utils import logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/utils/math_system/operate.py b/oscillode/utils/math_system/operate.py index 55d9a82..e0cce8d 100644 --- a/oscillode/utils/math_system/operate.py +++ b/oscillode/utils/math_system/operate.py @@ -39,7 +39,6 @@ import typing as typ import jax.numpy as jnp import sympy as sp import sympy.physics.units as spu - from blender_maxwell.utils import logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux @@ -76,7 +75,7 @@ PT = spux.PhysicalType # for ax_l, ax_r in itertools.zip_longest( # expanded_shape_l, expanded_shape_r, fillvalue=1 # ): -# if ax_l == 1 or ax_r == 1 or ax_l == ax_r: # noqa: PLR1714 +# if ax_l == 1 or ax_r == 1 or ax_l == ax_r: # new_shape.append(max([ax_l, ax_r])) # else: # return None diff --git a/oscillode/utils/math_system/reduce.py b/oscillode/utils/math_system/reduce.py index 97954a8..f3a76c4 100644 --- a/oscillode/utils/math_system/reduce.py +++ b/oscillode/utils/math_system/reduce.py @@ -36,7 +36,6 @@ import typing as typ import jax.numpy as jnp import jaxtyping as jtyp import sympy as sp - from blender_maxwell.utils import logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/utils/math_system/transform.py b/oscillode/utils/math_system/transform.py index 05c21d7..ad684c1 100644 --- a/oscillode/utils/math_system/transform.py +++ b/oscillode/utils/math_system/transform.py @@ -36,7 +36,6 @@ import typing as typ import jax.numpy as jnp import jaxtyping as jtyp import sympy as sp - from blender_maxwell.utils import logger, sci_constants, sim_symbols from blender_maxwell.utils import sympy_extra as spux diff --git a/oscillode/utils/sim_types/sim_types.py b/oscillode/utils/sim_types/sim_types.py index 537d942..9c10856 100644 --- a/oscillode/utils/sim_types/sim_types.py +++ b/oscillode/utils/sim_types/sim_types.py @@ -50,6 +50,7 @@ from blender_maxwell.utils import logger, sim_symbols from blender_maxwell.utils import sympy_extra as spux from .flow_kinds.info import InfoFlow + ## TODO: Use a Protocol interface from data_pipelines/ log = logger.get(__name__) diff --git a/oscillode/utils/sympy_extra/math_type.py b/oscillode/utils/sympy_extra/math_type.py index 46e850a..1a35cac 100644 --- a/oscillode/utils/sympy_extra/math_type.py +++ b/oscillode/utils/sympy_extra/math_type.py @@ -40,7 +40,6 @@ from fractions import Fraction import jax import jaxtyping as jtyp import sympy as sp - from blender_maxwell import contracts as ct from .. import logger diff --git a/oscillode/utils/sympy_extra/number_size.py b/oscillode/utils/sympy_extra/number_size.py index 73d8fc0..c49d396 100644 --- a/oscillode/utils/sympy_extra/number_size.py +++ b/oscillode/utils/sympy_extra/number_size.py @@ -34,7 +34,6 @@ import enum import typing as typ import sympy as sp - from blender_maxwell import contracts as ct diff --git a/oscillode/utils/sympy_extra/physical_type.py b/oscillode/utils/sympy_extra/physical_type.py index 33b5f3d..98960ac 100644 --- a/oscillode/utils/sympy_extra/physical_type.py +++ b/oscillode/utils/sympy_extra/physical_type.py @@ -37,7 +37,6 @@ import functools import typing as typ import sympy.physics.units as spu - from blender_maxwell import contracts as ct from ..staticproperty import staticproperty diff --git a/oscillode/utils/sympy_extra/units.py b/oscillode/utils/sympy_extra/units.py index 734fc9d..131b736 100644 --- a/oscillode/utils/sympy_extra/units.py +++ b/oscillode/utils/sympy_extra/units.py @@ -30,7 +30,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import typing as typ import sympy as sp import sympy.physics.units as spu