some more constraints

Author: jafranc

geos-pv/src/geos/pv/plugins/PVCreateConstantAttributePerRegion.py

@@ -18,20 +18,16 @@
 
 import vtkmodules.util.numpy_support as vnp
 
-
 from vtkmodules.vtkCommonDataModel import (
-    vtkDataSet,
-)
+    vtkDataSet, )
 
 # update sys.path to load all GEOS Python Package dependencies
 geos_pv_path: Path = Path( __file__ ).parent.parent.parent.parent.parent
 sys.path.insert( 0, str( geos_pv_path / "src" ) )
-from geos.pv.utils.config import update_paths
 
 from geos.mesh.processing.CreateConstantAttributePerRegion import ( CreateConstantAttributePerRegion )
 
 from geos.pv.utils.details import SISOFilter, FilterCategory
-from geos.mesh.processing.CreateConstantAttributePerRegion import CreateConstantAttributePerRegion
 
 __doc__ = """
 PVCreateConstantAttributePerRegion is a Paraview plugin that allows to create an attribute
@@ -53,10 +49,12 @@
 * Apply.
 
 """
+
+
 @SISOFilter( category=FilterCategory.GEOS_PROP,
              decoratedLabel="Create Constant Attribute Per Region",
-             decoratedType=[ "vtkMultiBlockDataSet", "vtkDataSet" ])
-class PVCreateConstantAttributePerRegion(VTKPythonAlgorithmBase):
+             decoratedType=[ "vtkMultiBlockDataSet", "vtkDataSet" ] )
+class PVCreateConstantAttributePerRegion( VTKPythonAlgorithmBase ):
 
     def __init__( self: Self ) -> None:
         """Create an attribute with constant value per region."""
@@ -275,12 +273,12 @@ def groupNewAttributeSettingsWidgets( self: Self ) -> None:
         """Group the widgets to set the settings of the new attribute."""
         self.Modified()
 
-    def Filter(self, inputMesh: vtkDataSet , outputMesh: vtkDataSet) -> None:
+    def Filter( self, inputMesh: vtkDataSet, outputMesh: vtkDataSet ) -> None:
         """Is applying CreateConstantAttributePerRegion filter.
-            outputMesh : A mesh transformed.
+
         Args:
             inputMesh : A mesh to transform
-            outputMesh : A mesh transformed
+            outputMesh : A mesh transformed.
         """
         filter: CreateConstantAttributePerRegion = CreateConstantAttributePerRegion(
             outputMesh,

geos-pv/src/geos/pv/plugins/PVFillPartialArrays.py

@@ -46,7 +46,7 @@
 @SISOFilter( category=FilterCategory.GEOS_UTILS,
              decoratedLabel="Fill Partial Arrays",
              decoratedType="vtkMultiBlockDataSet" )
-class PVFillPartialArrays(VTKPythonAlgorithmBase):
+class PVFillPartialArrays( VTKPythonAlgorithmBase ):
 
     def __init__( self: Self, ) -> None:
         """Fill a partial attribute with constant value per component."""
@@ -90,7 +90,7 @@ def setDictAttributesValues( self: Self, attributeName: str, values: str ) -> No
             if values is not None:
                 self.dictAttributesValues[ attributeName ] = list( values.split( "," ) )
             else:
-                self.dictAttributesValues[ attributeName ] = None  # ignore : type[unreachable]
+                self.dictAttributesValues[ attributeName ] = None  #ignore : type[unreachable]
 
         self.Modified()
 

geos-pv/src/geos/pv/plugins/PVMeshQualityEnhanced.py

@@ -7,11 +7,10 @@
 from typing_extensions import Self, Optional
 
 from paraview.util.vtkAlgorithm import (  # type: ignore[import-not-found]
-     VTKPythonAlgorithmBase, smdomain, smproperty,
+    VTKPythonAlgorithmBase, smdomain, smproperty,
 )
 from vtkmodules.vtkCommonCore import (
-    vtkDataArraySelection,
-)
+    vtkDataArraySelection, )
 from vtkmodules.vtkCommonDataModel import (
     vtkUnstructuredGrid, )
 
@@ -65,10 +64,12 @@
 .. IMPORTANT::
     Please refer to the `Verdict Manual <https://visit-sphinx-github-user-manual.readthedocs.io/en/v3.4.0/_downloads/9d944264b44b411aeb4a867a1c9b1ed5/VerdictManual-revA.pdf>`_ for metrics and range definitions.
 """
+
+
 @SISOFilter( category=FilterCategory.GEOS_QC,
              decoratedLabel="Mesh Quality Enhanced",
-             decoratedType="vtkUnstructuredGrid")
-class PVMeshQualityEnhanced(VTKPythonAlgorithmBase):
+             decoratedType="vtkUnstructuredGrid" )
+class PVMeshQualityEnhanced( VTKPythonAlgorithmBase ):
 
     def __init__( self: Self ) -> None:
         """Merge collocated points."""
@@ -164,7 +165,7 @@ def b01SetSaveToFile( self: Self, saveToFile: bool ) -> None:
         """
         if self._saveToFile != saveToFile:
             self._saveToFile = saveToFile
-            PVMeshQualityEnhanced.Modified(self)
+            PVMeshQualityEnhanced.Modified( self )
 
     @smproperty.stringvector( name="FilePath", label="File Path" )
     @smdomain.xml( """
@@ -183,7 +184,7 @@ def b02SetFileName( self: Self, fname: str ) -> None:
         """
         if self._filename != fname:
             self._filename = fname
-            PVMeshQualityEnhanced.Modified(self)
+            PVMeshQualityEnhanced.Modified( self )
 
     @smproperty.xml( """
                     <PropertyGroup
@@ -199,12 +200,12 @@ def b02SetFileName( self: Self, fname: str ) -> None:
                     """ )
     def b03GroupAdvancedOutputParameters( self: Self ) -> None:
         """Organize groups."""
-        PVMeshQualityEnhanced.Modified(self)
+        PVMeshQualityEnhanced.Modified( self )
 
     def Modified( self: Self ) -> None:
         """Overload Modified method to reset _blockIndex."""
         self._blockIndex = 0
-        VTKPythonAlgorithmBase.Modified(self)
+        VTKPythonAlgorithmBase.Modified( self )
 
     def _getQualityMetricsToUse( self: Self, selection: vtkDataArraySelection ) -> set[ int ]:
         """Get mesh quality metric indexes from user selection.
@@ -215,7 +216,7 @@ def _getQualityMetricsToUse( self: Self, selection: vtkDataArraySelection ) -> s
         metricsNames: set[ str ] = getArrayChoices( selection )
         return { getQualityMeasureIndexFromName( name ) for name in metricsNames }
 
-    def Filter(self, inputMesh: vtkUnstructuredGrid, outputMesh:vtkUnstructuredGrid) -> None:
+    def Filter( self, inputMesh: vtkUnstructuredGrid, outputMesh: vtkUnstructuredGrid ) -> None:
         """Is applying MeshQualityEnhanced to the input Mesh.
 
         Args:

geos-pv/src/geos/pv/plugins/PVPythonViewConfigurator.py

@@ -41,6 +41,9 @@
     vtkInformation,
 )
 
+from paraview.util.vtkAlgorithm import (  # type: ignore[import-not-found]
+    VTKPythonAlgorithmBase )
+
 from vtkmodules.vtkCommonDataModel import vtkDataObject
 from geos.pv.utils.details import SISOFilter, FilterCategory
 
@@ -59,10 +62,12 @@
 * Search and Apply PVPythonViewConfigurator Filter.
 
 """
+
+
 @SISOFilter( category=FilterCategory.GEOS_UTILS,
              decoratedLabel="Python View Configurator",
-             decoratedType="vtkDataObject")
-class PVPythonViewConfigurator:
+             decoratedType="vtkDataObject" )
+class PVPythonViewConfigurator( VTKPythonAlgorithmBase ):
 
     def __init__( self: Self ) -> None:
         """Paraview plugin to create cross-plots in a Python View.
@@ -805,7 +810,7 @@ def FillInputPortInformation( self: Self, port: int, info: vtkInformation ) -> i
             info.Set( self.INPUT_REQUIRED_DATA_TYPE(), "vtkDataObject" )
         return 1
 
-    def Filter(self, inputMesh : vtkDataObject, outputMesh : vtkDataObject) -> None:
+    def Filter( self, inputMesh: vtkDataObject, outputMesh: vtkDataObject ) -> None:
         """Dummy interface for plugin to fit decorator reqs.
 
         Args:

geos-pv/src/geos/pv/plugins/PVSplitMesh.py

@@ -7,8 +7,7 @@
 from typing_extensions import Self
 
 from paraview.util.vtkAlgorithm import (  # type: ignore[import-not-found]
-     VTKPythonAlgorithmBase
-)
+    VTKPythonAlgorithmBase )
 
 from vtkmodules.vtkCommonDataModel import (
     vtkPointSet, )
@@ -22,6 +21,7 @@
 
 from geos.mesh.processing.SplitMesh import SplitMesh
 from geos.pv.utils.details import SISOFilter, FilterCategory
+
 __doc__ = """
 Split each cell of input mesh to smaller cells.
 
@@ -36,20 +36,14 @@
 """
 
 
-@SISOFilter( category=FilterCategory.GEOS_UTILS,
-             decoratedLabel="Split Mesh",
-             decoratedType="vtkPointSet")
-class PVSplitMesh(VTKPythonAlgorithmBase):
+@SISOFilter( category=FilterCategory.GEOS_UTILS, decoratedLabel="Split Mesh", decoratedType="vtkPointSet" )
+class PVSplitMesh( VTKPythonAlgorithmBase ):
 
     def __init__( self: Self ) -> None:
         """Split mesh cells."""
         pass
 
-    def Filter(
-        self: Self,
-        inputMesh: vtkPointSet,
-        outputMesh:vtkPointSet
-    ) -> None:
+    def Filter( self: Self, inputMesh: vtkPointSet, outputMesh: vtkPointSet ) -> None:
         """Apply vtk filter.
 
         Args:

geos-pv/src/geos/pv/utils/details.py

@@ -11,13 +11,14 @@
 from abc import abstractmethod
 from enum import Enum
 
-
 from paraview.util.vtkAlgorithm import (  # type: ignore[import-not-found]
     VTKPythonAlgorithmBase, smdomain, smhint, smproperty, smproxy,
 )  # source: https://github.com/Kitware/ParaView/blob/master/Wrapping/Python/paraview/util/vtkAlgorithm.py
 
 from vtkmodules.vtkCommonDataModel import (
-    vtkMultiBlockDataSet, )
+    vtkMultiBlockDataSet,
+    vtkDataObject,
+)
 
 from vtkmodules.vtkCommonCore import (
     vtkInformation,
@@ -43,6 +44,8 @@ class PVMyFilter:
         ...
 
 """
+
+
 # Enum for filter categories
 class FilterCategory( str, Enum ):
     """String Enum to sort into category in PV task bar under Plugins."""
@@ -55,15 +58,17 @@ class FilterCategory( str, Enum ):
     # Add more as needed
 
 
-U = TypeVar('U')
+U = TypeVar( 'U', bound='vtkDataObject' )
+
+
 @runtime_checkable
-class IsSISOFilter( Protocol[U] ):
+class IsSISOFilter( Protocol[ U ] ):
     """Protocol to ensure that the wrapped filter defines the correct Filter core function."""
 
     @abstractmethod
     def Filter(
         self,
-        inputMesh: U, 
+        inputMesh: U,
         outputMesh: U,
     ) -> None:
         """Define filter here.
@@ -75,12 +80,14 @@ def Filter(
         """
         raise NotImplementedError
 
+
 T = TypeVar( 'T', bound='IsSISOFilter' )
 
 
 def SISOFilter( category: FilterCategory, decoratedLabel: str,
-                decoratedType: Union[str,list] ) -> Callable[ [ Type[ T ] ], Type[ T ] ]:
+                decoratedType: Union[ str, list ] ) -> Callable[ [ Type[ T ] ], Type[ T ] ]:
     """Decorate Single Input Single Output (SISO) filter."""
+
     def decoratedClass( cls: Type[ T ] ) -> Type[ T ]:
         """Outer wrapper function. All is in the WrappingClass below."""
         originalInit = cls.__init__
@@ -94,11 +101,12 @@ def __init__( self, *ar: Any, **kw: Any ) -> None:
                     ar : Fowarded arguments
                     kw : Forwarded keywords args
                 """
-                VTKPythonAlgorithmBase.__init__( self,
-                                                 nInputPorts=1,
-                                                 nOutputPorts=1,
-                                                 inputType=decoratedType if isinstance(decoratedType,str) else "vtkDataObject",
-                                                 outputType=decoratedType if isinstance(decoratedType,str) else "vtkDataObject")
+                VTKPythonAlgorithmBase.__init__(
+                    self,
+                    nInputPorts=1,
+                    nOutputPorts=1,
+                    inputType=decoratedType if isinstance( decoratedType, str ) else "vtkDataObject",
+                    outputType=decoratedType if isinstance( decoratedType, str ) else "vtkDataObject" )
 
                 #If wrapped class has more to init there it is applied
                 #avoid the overwritten init by decorator taking place of the cls
@@ -155,16 +163,16 @@ def RequestData(
 
                 cls.Filter( self, inputMesh, outputMesh )
                 return 1
-        
+
         # Copy all methods and attributes from cls, including decorator metadata
-        for attrName in dir(cls):
-            if attrName.startswith('_'):
+        for attrName in dir( cls ):
+            if attrName.startswith( '_' ):
                 continue  # Skip private/magic methods (already handled or inherited)
-            
-            attr = getattr(cls, attrName)
+
+            attr = getattr( cls, attrName )
             # Copy methods with their decorators
-            if callable(attr) and attrName not in WrappingClass.__dict__:
-                setattr(WrappingClass,attrName,attr)
+            if callable( attr ) and attrName not in WrappingClass.__dict__:
+                setattr( WrappingClass, attrName, attr )
 
         # Copy metadata
         WrappingClass.__name__ = cls.__name__
@@ -175,7 +183,7 @@ def RequestData(
 
         #decorate it old fashion way
         WrappingClass = smdomain.datatype(
-            dataTypes=[ decoratedType ] if isinstance(decoratedType,str) else decoratedType,
+            dataTypes=[ decoratedType ] if isinstance( decoratedType, str ) else decoratedType,
             composite_data_supported=True,
         )( WrappingClass )
         WrappingClass = smproperty.input( name="Input", port_index=0 )( WrappingClass )