PoC

Author: jafranc

geos-mesh/src/geos/mesh/processing/FillPartialArrays.py

@@ -9,6 +9,7 @@
 from geos.mesh.utils.arrayModifiers import fillPartialAttributes
 from geos.mesh.utils.arrayHelpers import getAttributePieceInfo
 
+from geos.utils.details import addLogSupport
 from vtkmodules.vtkCommonDataModel import vtkMultiBlockDataSet
 
 __doc__ = """
@@ -51,13 +52,13 @@
 loggerTitle: str = "Fill Partial Attribute"
 
 
+@addLogSupport(loggerTitle= loggerTitle)
 class FillPartialArrays:
 
     def __init__(
         self: Self,
         multiBlockDataSet: vtkMultiBlockDataSet,
         dictAttributesValues: dict[ str, Union[ list[ Any ], None ] ],
-        speHandler: bool = False,
     ) -> None:
         """Fill partial attributes with constant value per component.
 
@@ -75,30 +76,8 @@ def __init__(
         self.multiBlockDataSet: vtkMultiBlockDataSet = multiBlockDataSet
         self.dictAttributesValues: dict[ str, Union[ list[ Any ], None ] ] = dictAttributesValues
 
-        # Logger.
-        self.logger: Logger
-        if not speHandler:
-            self.logger = getLogger( loggerTitle, True )
-        else:
-            self.logger = logging.getLogger( loggerTitle )
-            self.logger.setLevel( logging.INFO )
 
-    def setLoggerHandler( self: Self, handler: logging.Handler ) -> None:
-        """Set a specific handler for the filter logger.
-
-        In this filter 4 log levels are use, .info, .error, .warning and .critical, be sure to have at least the same 4 levels.
-
-        Args:
-            handler (logging.Handler): The handler to add.
-        """
-        if not self.logger.hasHandlers():
-            self.logger.addHandler( handler )
-        else:
-            self.logger.warning(
-                "The logger already has an handler, to use yours set the argument 'speHandler' to True during the filter initialization."
-            )
-
-    def applyFilter( self: Self ) -> bool:
+    def applyFilter( self : Self ) -> bool:
         """Create a constant attribute per region in the mesh.
 
         Returns:

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

@@ -30,7 +30,7 @@
 update_paths()
 
 from geos.mesh.processing.FillPartialArrays import FillPartialArrays
-import geos.pv.utils.details
+# import geos.pv.utils.details
 __doc__ = """
 Fill partial arrays of input mesh.
 
@@ -47,22 +47,22 @@
 """
 
 
-# @smproxy.filter( name="PVFillPartialArrays", label="Fill Partial Arrays" )
-# @smhint.xml( '<ShowInMenu category="4- Geos Utils"/>' )
-# @smproperty.input( name="Input", port_index=0 )
-# @smdomain.datatype(
-#     dataTypes=[ "vtkMultiBlockDataSet" ],
-#     composite_data_supported=True,
-# )
-@geos.pv.utils.details.SISOFilter(decorated_name="PVFillPartialArrays", decorated_label="Fill Partial Arrays",decorated_type="vtkMultiBlockDataSet")
-class PVFillPartialArrays:
+@smproxy.filter( name="PVFillPartialArrays", label="Fill Partial Arrays" )
+@smhint.xml( '<ShowInMenu category="4- Geos Utils"/>' )
+@smproperty.input( name="Input", port_index=0 )
+@smdomain.datatype(
+    dataTypes=[ "vtkMultiBlockDataSet" ],
+    composite_data_supported=True,
+)
+# @geos.pv.utils.details.SISOFilter(decorated_name="PVFillPartialArrays", decorated_label="Fill Partial Arrays",decorated_type="vtkMultiBlockDataSet")
+class PVFillPartialArrays(VTKPythonAlgorithmBase):
 
     def __init__( self: Self, ) -> None:
         """Fill a partial attribute with constant value per component."""
-        # super().__init__( nInputPorts=1,
-        #                   nOutputPorts=1,
-        #                   inputType="vtkMultiBlockDataSet",
-        #                   outputType="vtkMultiBlockDataSet" )
+        super().__init__( nInputPorts=1,
+                          nOutputPorts=1,
+                          inputType="vtkMultiBlockDataSet",
+                          outputType="vtkMultiBlockDataSet" )
 
         self.clearDictAttributesValues: bool = True
         self.dictAttributesValues: dict[ str, Union[ list[ Any ], None ] ] = {}
@@ -158,7 +158,7 @@ def RequestData(
 
         filter: FillPartialArrays = FillPartialArrays( outputMesh,
                                                        self.dictAttributesValues,
-                                                       True,
+                                                       speHandler=True,
         )
 
         if not filter.logger.hasHandlers():

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

@@ -0,0 +1,55 @@
+import logging
+from geos.utils.Logger import Logger, getLogger
+from functools import wraps
+from typing import Type, TypeVar
+
+
+__doc__ = """
+  Decorators
+
+"""
+
+def addLogSupport(loggerTitle : str):
+    T = TypeVar('T')
+    def decorator(cls:Type[T]) -> Type[T]:
+        original_init = cls.__init__
+
+        @wraps(cls)
+        def new_init(self : T, *args, **kwargs):
+
+            self.logger : Logger
+
+            if kwargs.get('speHandler'):
+                kwargs.pop('speHandler')
+                self.logger = logging.getLogger( loggerTitle )
+                self.logger.setLevel( logging.INFO )
+            else:
+                self.logger = getLogger( loggerTitle, True)
+
+            original_init(self,*args,*kwargs)
+
+        @property
+        def logger(self : T)->Logger:
+            return self.logger
+        
+        def setLoggerHandler(self, handler : logging.Handler):
+            """Set a specific handler for the filter logger.
+
+            In this filter 4 log levels are use, .info, .error, .warning and .critical, be sure to have at least the same 4 levels.
+
+            Args:
+                handler (logging.Handler): The handler to add.
+            """
+            if not self.logger.hasHandlers():
+                self.logger.addHandler( handler )
+            else:
+                self.logger.warning(
+                    "The logger already has an handler, to use yours set the argument 'speHandler' to True during the filter initialization."
+                )
+
+        cls.__init__ = new_init
+        cls.setLoggerHandler = setLoggerHandler     
+
+        return cls
+
+    return decorator