clean ruff and yapf

Author: RomainBaville

geos-processing/src/geos/processing/generic_processing_tools/AttributeMapping.py

@@ -5,7 +5,7 @@
 import numpy as np
 import numpy.typing as npt
 import logging
-from typing_extensions import Self, Union
+from typing_extensions import ( Self, Union )
 from vtkmodules.vtkCommonDataModel import ( vtkDataSet, vtkMultiBlockDataSet )
 from geos.mesh.utils.arrayModifiers import transferAttributeWithElementMap
 from geos.mesh.utils.arrayHelpers import ( computeElementMapping, getAttributeSet, isAttributeGlobal )

geos-processing/src/geos/processing/generic_processing_tools/SplitMesh.py

@@ -8,7 +8,9 @@
 
 from vtkmodules.util.vtkAlgorithm import VTKPythonAlgorithmBase
 from vtkmodules.vtkCommonCore import ( vtkPoints, vtkIdTypeArray, vtkDataArray )
-from vtkmodules.vtkCommonDataModel import ( vtkUnstructuredGrid, vtkCellArray, vtkCellData, vtkCell, vtkCellTypes, VTK_TRIANGLE, VTK_QUAD, VTK_TETRA, VTK_HEXAHEDRON, VTK_PYRAMID, VTK_WEDGE, VTK_POLYHEDRON, VTK_POLYGON )
+from vtkmodules.vtkCommonDataModel import ( vtkUnstructuredGrid, vtkCellArray, vtkCellData, vtkCell, vtkCellTypes,
+                                            VTK_TRIANGLE, VTK_QUAD, VTK_TETRA, VTK_HEXAHEDRON, VTK_PYRAMID, VTK_WEDGE,
+                                            VTK_POLYHEDRON, VTK_POLYGON )
 from vtkmodules.util.numpy_support import ( numpy_to_vtk, vtk_to_numpy )
 
 from geos.utils.Logger import ( Logger, getLogger )
@@ -105,7 +107,7 @@ def applyFilter( self: Self ) -> None:
             nbPolyhedra: int = counts.getTypeCount( VTK_POLYHEDRON )
             assert counts.getTypeCount( VTK_WEDGE ) == 0, "Input mesh contains wedges that are not currently supported."
             assert nbPolyhedra * nbPolygon == 0, ( "Input mesh is composed of both polygons and polyhedra,"
-                                                " but it must contains only one of the two." )
+                                                   " but it must contains only one of the two." )
             nbNewPoints: int = 0
             nbNewPoints = nbHex * 19 + nbTet * 6 + nbPyr * 9 if nbPolyhedra > 0 else nbTriangles * 3 + nbQuad * 5
             nbNewCells: int = nbHex * 8 + nbTet * 8 + nbPyr * 10 * nbTriangles * 4 + nbQuad * 4
@@ -146,7 +148,7 @@ def applyFilter( self: Self ) -> None:
             self._transferCellArrays( self.outputMesh )
             self.logger.info( f"The filter { self.logger.name } succeeded." )
         except Exception as e:
-            self.logger.error( f"The filter {self.logger.name } failed.\n{ e }")
+            self.logger.error( f"The filter {self.logger.name } failed.\n{ e }" )
 
         return
 
@@ -160,7 +162,8 @@ def _getCellCounts( self: Self ) -> CellTypeCounts:
         Returns:
             CellTypeCounts: cell type counts
         """
-        cellTypeCounterEnhancedFilter: CellTypeCounterEnhanced = CellTypeCounterEnhanced( self.inputMesh, self.speHandler )
+        cellTypeCounterEnhancedFilter: CellTypeCounterEnhanced = CellTypeCounterEnhanced(
+            self.inputMesh, self.speHandler )
         if self.speHandler and len( cellTypeCounterEnhancedFilter.logger.handlers ) == 0:
             cellTypeCounterEnhancedFilter.setLoggerHandler( self.handler )
         cellTypeCounterEnhancedFilter.applyFilter()

geos-processing/src/geos/processing/pre_processing/CellTypeCounterEnhanced.py

@@ -46,7 +46,11 @@
 
 class CellTypeCounterEnhanced():
 
-    def __init__( self: Self, inputMesh: vtkUnstructuredGrid, speHandler: bool = False, ) -> None:
+    def __init__(
+        self: Self,
+        inputMesh: vtkUnstructuredGrid,
+        speHandler: bool = False,
+    ) -> None:
         """CellTypeCounterEnhanced filter computes mesh stats.
 
         Args:

geos-processing/src/geos/processing/pre_processing/MeshQualityEnhanced.py

@@ -101,12 +101,17 @@ def getQualityMetricArrayName( metric: int ) -> str:
     """
     return QUALITY_ARRAY_NAME + "_" + "".join( getQualityMeasureNameFromIndex( metric ).split( " " ) )
 
+
 loggerTitle: str = "Mesh Quality Enhanced"
 
 
 class MeshQualityEnhanced():
 
-    def __init__( self: Self, inputMesh: vtkUnstructuredGrid, speHandler: bool = False, ) -> None:
+    def __init__(
+        self: Self,
+        inputMesh: vtkUnstructuredGrid,
+        speHandler: bool = False,
+    ) -> None:
         """Enhanced vtkMeshQuality filter.
 
         Args:
@@ -323,7 +328,8 @@ def getOutput( self: Self ) -> vtkUnstructuredGrid:
 
     def _computeCellTypeCounts( self: Self ) -> None:
         """Compute cell type counts."""
-        cellTypeCounterEnhancedFilter: CellTypeCounterEnhanced = CellTypeCounterEnhanced( self._outputMesh, self.speHandler )
+        cellTypeCounterEnhancedFilter: CellTypeCounterEnhanced = CellTypeCounterEnhanced(
+            self._outputMesh, self.speHandler )
         if self.speHandler and len( cellTypeCounterEnhancedFilter.logger.handlers ) == 0:
             cellTypeCounterEnhancedFilter.setLoggerHandler( self.handler )
         cellTypeCounterEnhancedFilter.applyFilter()

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

@@ -10,7 +10,8 @@
 from paraview.util.vtkAlgorithm import (  # type: ignore[import-not-found]
     VTKPythonAlgorithmBase, smdomain, smhint, smproperty, smproxy )
 from paraview.detail.loghandler import (  # type: ignore[import-not-found]
-    VTKHandler )  # source: https://github.com/Kitware/ParaView/blob/master/Wrapping/Python/paraview/detail/loghandler.py
+    VTKHandler
+)  # source: https://github.com/Kitware/ParaView/blob/master/Wrapping/Python/paraview/detail/loghandler.py
 
 from vtkmodules.vtkCommonCore import (
     vtkInformation,

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

@@ -598,7 +598,7 @@ def RequestData(
                                                             array_type=VTK_DOUBLE )  # type: ignore[no-untyped-call]
                 newAttr.SetName( column )
                 output.AddColumn( newAttr )
-            self.logger.info( f"The plugin { self.logger.name } succeeded.")
+            self.logger.info( f"The plugin { self.logger.name } succeeded." )
         except Exception as e:
             self.logger.error( f"The plugin { self.logger.name } failed.\n{ e }" )
             return 0

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

@@ -10,7 +10,8 @@
     VTKPythonAlgorithmBase, smdomain, smproperty,
 )
 from paraview.detail.loghandler import (  # type: ignore[import-not-found]
-    VTKHandler )  # source: https://github.com/Kitware/ParaView/blob/master/Wrapping/Python/paraview/detail/loghandler.py
+    VTKHandler
+)  # source: https://github.com/Kitware/ParaView/blob/master/Wrapping/Python/paraview/detail/loghandler.py
 from vtkmodules.vtkCommonCore import (
     vtkDataArraySelection, )
 from vtkmodules.vtkCommonDataModel import (
@@ -244,11 +245,11 @@ def ApplyFilter( self, inputMesh: vtkUnstructuredGrid, outputMesh: vtkUnstructur
         if len( self.meshQualityEnhancedFilter.logger.handlers ) == 0:
             self.meshQualityEnhancedFilter.setLoggerHandler( VTKHandler() )
         self.meshQualityEnhancedFilter.SetCellQualityMetrics( triangleMetrics=triangleMetrics,
-                                                         quadMetrics=quadMetrics,
-                                                         tetraMetrics=tetraMetrics,
-                                                         pyramidMetrics=pyrMetrics,
-                                                         wedgeMetrics=wedgeMetrics,
-                                                         hexaMetrics=hexaMetrics )
+                                                              quadMetrics=quadMetrics,
+                                                              tetraMetrics=tetraMetrics,
+                                                              pyramidMetrics=pyrMetrics,
+                                                              wedgeMetrics=wedgeMetrics,
+                                                              hexaMetrics=hexaMetrics )
         self.meshQualityEnhancedFilter.SetOtherMeshQualityMetrics( otherMetrics )
         self.meshQualityEnhancedFilter.applyFilter()
 
@@ -261,7 +262,10 @@ def ApplyFilter( self, inputMesh: vtkUnstructuredGrid, outputMesh: vtkUnstructur
         self._blockIndex += 1
         return
 
-    def saveFile( self: Self, stats: QualityMetricSummary,  ) -> None:
+    def saveFile(
+        self: Self,
+        stats: QualityMetricSummary,
+    ) -> None:
         """Export mesh quality metric summary file."""
         try:
             assert self._filename is not None, "Mesh quality summary report file path is undefined."

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

@@ -9,7 +9,8 @@
 from paraview.util.vtkAlgorithm import (  # type: ignore[import-not-found]
     VTKPythonAlgorithmBase )
 from paraview.detail.loghandler import (  # type: ignore[import-not-found]
-    VTKHandler )  # source: https://github.com/Kitware/ParaView/blob/master/Wrapping/Python/paraview/detail/loghandler.py
+    VTKHandler
+)  # source: https://github.com/Kitware/ParaView/blob/master/Wrapping/Python/paraview/detail/loghandler.py
 
 from vtkmodules.vtkCommonDataModel import (
     vtkPointSet, )