From b5a4b6b0a17910909b07b7084873e9407acade96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sofus=20Albert=20H=C3=B8gsbro=20Rose?= Date: Mon, 15 Apr 2024 17:48:29 +0200 Subject: [PATCH] refactor: Common SocketDef owner in `sockets.base` --- .../node_trees/maxwell_sim_nodes/sockets/basic/any.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/basic/bool.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/basic/file_path.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/basic/string.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/blender/collection.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/blender/image.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/blender/material.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/blender/object.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/blender/text.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py | 2 +- .../maxwell_sim_nodes/sockets/maxwell/fdtd_sim_data.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py | 2 +- .../maxwell_sim_nodes/sockets/maxwell/medium_non_linearity.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/monitor.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/sim_domain.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py | 2 +- .../maxwell_sim_nodes/sockets/maxwell/sim_grid_axis.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/source.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/maxwell/structure.py | 2 +- .../maxwell_sim_nodes/sockets/maxwell/temporal_shape.py | 2 +- .../maxwell_sim_nodes/sockets/number/complex_number.py | 2 +- .../maxwell_sim_nodes/sockets/number/integer_number.py | 2 +- .../maxwell_sim_nodes/sockets/number/rational_number.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/number/real_number.py | 2 +- .../maxwell_sim_nodes/sockets/physical/accel_scalar.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/angle.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/area.py | 2 +- .../maxwell_sim_nodes/sockets/physical/force_scalar.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/freq.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/length.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/mass.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/point_3d.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/pol.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/size_3d.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/speed.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/time.py | 2 +- .../maxwell_sim_nodes/sockets/physical/unit_system.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/physical/volume.py | 2 +- .../node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py | 2 +- .../maxwell_sim_nodes/sockets/vector/complex_2d_vector.py | 2 +- .../maxwell_sim_nodes/sockets/vector/complex_3d_vector.py | 2 +- .../maxwell_sim_nodes/sockets/vector/integer_3d_vector.py | 2 +- .../maxwell_sim_nodes/sockets/vector/real_2d_vector.py | 2 +- .../maxwell_sim_nodes/sockets/vector/real_3d_vector.py | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/any.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/any.py index 6f9618a..1eed46a 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/any.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/any.py @@ -23,7 +23,7 @@ class AnyBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class AnySocketDef(pyd.BaseModel): +class AnySocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.Any def init(self, bl_socket: AnyBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/bool.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/bool.py index 43c7cab..9124ecc 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/bool.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/bool.py @@ -44,7 +44,7 @@ class BoolBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class BoolSocketDef(pyd.BaseModel): +class BoolSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.Bool default_value: bool = False diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/file_path.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/file_path.py index b07c119..3219739 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/file_path.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/file_path.py @@ -46,7 +46,7 @@ class FilePathBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class FilePathSocketDef(pyd.BaseModel): +class FilePathSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.FilePath default_path: Path = Path() diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/string.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/string.py index e5bd86a..a723fd6 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/string.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/basic/string.py @@ -43,7 +43,7 @@ class StringBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class StringSocketDef(pyd.BaseModel): +class StringSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.String default_text: str = '' diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/collection.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/collection.py index fcee83b..d03ed4d 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/collection.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/collection.py @@ -43,7 +43,7 @@ class BlenderCollectionBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class BlenderCollectionSocketDef(pyd.BaseModel): +class BlenderCollectionSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.BlenderCollection def init(self, bl_socket: BlenderCollectionBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py index 9c3b01d..7bd085f 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/geonodes.py @@ -82,7 +82,7 @@ class BlenderGeoNodesBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class BlenderGeoNodesSocketDef(pyd.BaseModel): +class BlenderGeoNodesSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.BlenderGeoNodes def init(self, bl_socket: BlenderGeoNodesBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/image.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/image.py index 577ca60..b836103 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/image.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/image.py @@ -43,7 +43,7 @@ class BlenderImageBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class BlenderImageSocketDef(pyd.BaseModel): +class BlenderImageSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.BlenderImage def init(self, bl_socket: BlenderImageBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/material.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/material.py index 8473683..f786577 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/material.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/material.py @@ -40,7 +40,7 @@ class BlenderMaterialBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class BlenderMaterialSocketDef(pyd.BaseModel): +class BlenderMaterialSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.BlenderMaterial def init(self, bl_socket: BlenderMaterialBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/object.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/object.py index 556331c..95e8033 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/object.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/object.py @@ -88,7 +88,7 @@ class BlenderObjectBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class BlenderObjectSocketDef(pyd.BaseModel): +class BlenderObjectSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.BlenderObject def init(self, bl_socket: BlenderObjectBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/text.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/text.py index 34a6451..759651b 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/text.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/blender/text.py @@ -43,7 +43,7 @@ class BlenderTextBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class BlenderTextSocketDef(pyd.BaseModel): +class BlenderTextSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.BlenderText def init(self, bl_socket: BlenderTextBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py index d64ea14..73a0778 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_cond.py @@ -53,7 +53,7 @@ class MaxwellBoundCondBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellBoundCondSocketDef(pyd.BaseModel): +class MaxwellBoundCondSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellBoundCond default_choice: typx.Literal['PML', 'PEC', 'PMC', 'PERIODIC'] = 'PML' diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py index 00dcd26..7e7a50f 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/bound_conds.py @@ -124,7 +124,7 @@ class MaxwellBoundCondsBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellBoundCondsSocketDef(pyd.BaseModel): +class MaxwellBoundCondsSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellBoundConds def init(self, bl_socket: MaxwellBoundCondsBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py index 61cbdb1..35235dc 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim.py @@ -16,7 +16,7 @@ class MaxwellFDTDSimBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellFDTDSimSocketDef(pyd.BaseModel): +class MaxwellFDTDSimSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellFDTDSim def init(self, bl_socket: MaxwellFDTDSimBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim_data.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim_data.py index d853211..883d603 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim_data.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/fdtd_sim_data.py @@ -16,7 +16,7 @@ class MaxwellFDTDSimDataBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellFDTDSimDataSocketDef(pyd.BaseModel): +class MaxwellFDTDSimDataSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellFDTDSimData def init(self, bl_socket: MaxwellFDTDSimDataBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py index deb573b..ae6767f 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium.py @@ -98,7 +98,7 @@ class MaxwellMediumBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellMediumSocketDef(pyd.BaseModel): +class MaxwellMediumSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellMedium default_permittivity_real: float = 1.0 diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium_non_linearity.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium_non_linearity.py index 575c32a..85b9f68 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium_non_linearity.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/medium_non_linearity.py @@ -12,7 +12,7 @@ class MaxwellMediumNonLinearityBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellMediumNonLinearitySocketDef(pyd.BaseModel): +class MaxwellMediumNonLinearitySocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellMediumNonLinearity def init(self, bl_socket: MaxwellMediumNonLinearityBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/monitor.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/monitor.py index 408b2d7..c44e474 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/monitor.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/monitor.py @@ -12,7 +12,7 @@ class MaxwellMonitorBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellMonitorSocketDef(pyd.BaseModel): +class MaxwellMonitorSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellMonitor is_list: bool = False diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_domain.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_domain.py index f66c112..94062c1 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_domain.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_domain.py @@ -12,7 +12,7 @@ class MaxwellSimDomainBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellSimDomainSocketDef(pyd.BaseModel): +class MaxwellSimDomainSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellSimDomain def init(self, bl_socket: MaxwellSimDomainBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py index 76c26d4..4a2bff5 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid.py @@ -48,7 +48,7 @@ class MaxwellSimGridBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellSimGridSocketDef(pyd.BaseModel): +class MaxwellSimGridSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellSimGrid min_steps_per_wl: float = 10.0 diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid_axis.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid_axis.py index a2ffa47..c879876 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid_axis.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/sim_grid_axis.py @@ -12,7 +12,7 @@ class MaxwellSimGridAxisBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellSimGridAxisSocketDef(pyd.BaseModel): +class MaxwellSimGridAxisSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellSimGridAxis def init(self, bl_socket: MaxwellSimGridAxisBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/source.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/source.py index 7418d9a..5abccd1 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/source.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/source.py @@ -12,7 +12,7 @@ class MaxwellSourceBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellSourceSocketDef(pyd.BaseModel): +class MaxwellSourceSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellSource is_list: bool = False diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/structure.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/structure.py index 456c7ec..ccc0412 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/structure.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/structure.py @@ -12,7 +12,7 @@ class MaxwellStructureBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellStructureSocketDef(pyd.BaseModel): +class MaxwellStructureSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellStructure is_list: bool = False diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/temporal_shape.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/temporal_shape.py index 08cccaf..9f9897f 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/temporal_shape.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/maxwell/temporal_shape.py @@ -12,7 +12,7 @@ class MaxwellTemporalShapeBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class MaxwellTemporalShapeSocketDef(pyd.BaseModel): +class MaxwellTemporalShapeSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.MaxwellTemporalShape def init(self, bl_socket: MaxwellTemporalShapeBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/complex_number.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/complex_number.py index ca07b0d..234ad37 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/complex_number.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/complex_number.py @@ -119,7 +119,7 @@ class ComplexNumberBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class ComplexNumberSocketDef(pyd.BaseModel): +class ComplexNumberSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.ComplexNumber default_value: SympyExpr = sp.S(0 + 0j) diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/integer_number.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/integer_number.py index 9ac0df0..1083912 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/integer_number.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/integer_number.py @@ -44,7 +44,7 @@ class IntegerNumberBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class IntegerNumberSocketDef(pyd.BaseModel): +class IntegerNumberSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.IntegerNumber default_value: int = 0 diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/rational_number.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/rational_number.py index a787534..ff5a068 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/rational_number.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/rational_number.py @@ -55,7 +55,7 @@ class RationalNumberBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class RationalNumberSocketDef(pyd.BaseModel): +class RationalNumberSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.RationalNumber default_value: SympyExpr = sp.Rational(0, 1) diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/real_number.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/real_number.py index 14c222f..82a31ab 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/real_number.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/number/real_number.py @@ -49,7 +49,7 @@ class RealNumberBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class RealNumberSocketDef(pyd.BaseModel): +class RealNumberSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.RealNumber default_value: float = 0.0 diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/accel_scalar.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/accel_scalar.py index f8564fe..4e8246c 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/accel_scalar.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/accel_scalar.py @@ -47,7 +47,7 @@ class PhysicalAccelScalarBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalAccelScalarSocketDef(pyd.BaseModel): +class PhysicalAccelScalarSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalAccelScalar default_unit: SympyExpr | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/angle.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/angle.py index acec0a1..8351ea9 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/angle.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/angle.py @@ -47,7 +47,7 @@ class PhysicalAngleBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalAngleSocketDef(pyd.BaseModel): +class PhysicalAngleSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalAngle default_unit: SympyExpr | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/area.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/area.py index 2fcf12a..0498fa2 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/area.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/area.py @@ -55,7 +55,7 @@ class PhysicalAreaBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalAreaSocketDef(pyd.BaseModel): +class PhysicalAreaSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalArea default_unit: typ.Any | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/force_scalar.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/force_scalar.py index 26e0773..211a170 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/force_scalar.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/force_scalar.py @@ -47,7 +47,7 @@ class PhysicalForceScalarBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalForceScalarSocketDef(pyd.BaseModel): +class PhysicalForceScalarSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalForceScalar default_unit: SympyExpr | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/freq.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/freq.py index 8297830..9defa5c 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/freq.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/freq.py @@ -97,7 +97,7 @@ class PhysicalFreqBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalFreqSocketDef(pyd.BaseModel): +class PhysicalFreqSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalFreq is_array: bool = False diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/length.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/length.py index fd23a2b..587df71 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/length.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/length.py @@ -96,7 +96,7 @@ class PhysicalLengthBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalLengthSocketDef(pyd.BaseModel): +class PhysicalLengthSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalLength is_array: bool = False diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/mass.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/mass.py index bfc3f81..532ed9e 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/mass.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/mass.py @@ -47,7 +47,7 @@ class PhysicalMassBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalMassSocketDef(pyd.BaseModel): +class PhysicalMassSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalMass default_unit: SympyExpr | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/point_3d.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/point_3d.py index 5deffe9..f97615b 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/point_3d.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/point_3d.py @@ -48,7 +48,7 @@ class PhysicalPoint3DBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalPoint3DSocketDef(pyd.BaseModel): +class PhysicalPoint3DSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalPoint3D default_unit: typ.Any | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/pol.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/pol.py index 980c219..db227be 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/pol.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/pol.py @@ -237,7 +237,7 @@ class PhysicalPolBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalPolSocketDef(pyd.BaseModel): +class PhysicalPolSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalPol def init(self, bl_socket: PhysicalPolBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/size_3d.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/size_3d.py index da40d61..5b1edb8 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/size_3d.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/size_3d.py @@ -46,7 +46,7 @@ class PhysicalSize3DBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalSize3DSocketDef(pyd.BaseModel): +class PhysicalSize3DSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalSize3D default_value: SympyExpr = sp.Matrix([1, 1, 1]) * spu.um diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/speed.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/speed.py index a392792..aad1a7e 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/speed.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/speed.py @@ -47,7 +47,7 @@ class PhysicalSpeedBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalSpeedSocketDef(pyd.BaseModel): +class PhysicalSpeedSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalSpeed default_unit: SympyExpr | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/time.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/time.py index fa14526..a43ed62 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/time.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/time.py @@ -49,7 +49,7 @@ class PhysicalTimeBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalTimeSocketDef(pyd.BaseModel): +class PhysicalTimeSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalTime default_value: SympyExpr | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/unit_system.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/unit_system.py index c1a095d..63c7a9d 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/unit_system.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/unit_system.py @@ -273,7 +273,7 @@ class PhysicalUnitSystemBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalUnitSystemSocketDef(pyd.BaseModel): +class PhysicalUnitSystemSocketDef(base.SocketDef): socket_type: ST = ST.PhysicalUnitSystem show_by_default: bool = False diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/volume.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/volume.py index ad55147..dda30bd 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/volume.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/physical/volume.py @@ -44,7 +44,7 @@ class PhysicalVolumeBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class PhysicalVolumeSocketDef(pyd.BaseModel): +class PhysicalVolumeSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.PhysicalVolume default_unit: SympyExpr | None = None diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py index 1affa97..6b0a21c 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/tidy3d/cloud_task.py @@ -319,7 +319,7 @@ class Tidy3DCloudTaskBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class Tidy3DCloudTaskSocketDef(pyd.BaseModel): +class Tidy3DCloudTaskSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.Tidy3DCloudTask should_exist: bool diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/complex_2d_vector.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/complex_2d_vector.py index 4aa7dc1..71512ca 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/complex_2d_vector.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/complex_2d_vector.py @@ -15,7 +15,7 @@ class Complex2DVectorBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class Complex2DVectorSocketDef(pyd.BaseModel): +class Complex2DVectorSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.Complex2DVector def init(self, bl_socket: Complex2DVectorBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/complex_3d_vector.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/complex_3d_vector.py index e48a3a8..fb9fabd 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/complex_3d_vector.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/complex_3d_vector.py @@ -15,7 +15,7 @@ class Complex3DVectorBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class Complex3DVectorSocketDef(pyd.BaseModel): +class Complex3DVectorSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.Complex3DVector def init(self, bl_socket: Complex3DVectorBLSocket) -> None: diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/integer_3d_vector.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/integer_3d_vector.py index 55c634d..0a7dc2e 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/integer_3d_vector.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/integer_3d_vector.py @@ -54,7 +54,7 @@ class Integer3DVectorBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class Integer3DVectorSocketDef(pyd.BaseModel): +class Integer3DVectorSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.Integer3DVector default_value: Integer3DVector = sp.Matrix([0, 0, 0]) diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_2d_vector.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_2d_vector.py index b58c51b..679adf4 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_2d_vector.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_2d_vector.py @@ -55,7 +55,7 @@ class Real2DVectorBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class Real2DVectorSocketDef(pyd.BaseModel): +class Real2DVectorSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.Real2DVector default_value: Real2DVector = sp.Matrix([0.0, 0.0]) diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_3d_vector.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_3d_vector.py index 86f7b24..4a2785f 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_3d_vector.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/sockets/vector/real_3d_vector.py @@ -55,7 +55,7 @@ class Real3DVectorBLSocket(base.MaxwellSimSocket): #################### # - Socket Configuration #################### -class Real3DVectorSocketDef(pyd.BaseModel): +class Real3DVectorSocketDef(base.SocketDef): socket_type: ct.SocketType = ct.SocketType.Real3DVector default_value: Real3DVector = sp.Matrix([0.0, 0.0, 0.0])