fix: fix pre-commit errors

gillardoLapp · gillardoLapp · commit a3bedd1a764e · 2025-02-25T11:26:42.000+01:00
diff --git a/src/DIRAC/Resources/Catalog/RucioFileCatalogClient.py b/src/DIRAC/Resources/Catalog/RucioFileCatalogClient.py
@@ -62,7 +62,6 @@ class RucioFileCatalogClient(FileCatalogClientBase):
         "getUserDirectory",
         "getFileUserMetadata",
         "findFilesByMetadata",
-
     ]
 
     WRITE_METHODS = FileCatalogClientBase.WRITE_METHODS + [
@@ -708,7 +707,7 @@ def getFileUserMetadata(self, path):
         """Get the meta data attached to a file, but also to
         all its parents
         """
-        path=next(iter(path))
+        path = next(iter(path))
         resDict = {"Successful": {}, "Failed": {}}
         try:
             did = self.__getDidsFromLfn(path)
@@ -769,7 +768,7 @@ def setMetadataBulk(self, pathMetadataDict):
     def setMetadata(self, path, metadataDict):
         """Add metadata to the given path"""
         pathMetadataDict = {}
-        path=next(iter(path))
+        path = next(iter(path))
         pathMetadataDict[path] = metadataDict
         return self.setMetadataBulk(pathMetadataDict)
 
@@ -796,37 +795,29 @@ def removeMetadata(self, path, metadata):
         except Exception as err:
             return S_ERROR(str(err))
         return S_OK()
-    
+
     def findFilesByMetadata(self, metadataFilterDict, path="/", timeout=120):
         """find the dids for the given metadataFilterDict"""
-        ruciometadataFilterDict=self.__transform_DIRAC_filter_dict_to_Rucio_filter_dict([metadataFilterDict])
-        dids=[]
+        ruciometadataFilterDict = self.__transform_DIRAC_filter_dict_to_Rucio_filter_dict([metadataFilterDict])
+        dids = []
         for scope in self.scopes:
             try:
-                dids.extend(self.client.list_dids(scope=scope, filters=ruciometadataFilterDict,did_type="all" ))
+                dids.extend(self.client.list_dids(scope=scope, filters=ruciometadataFilterDict, did_type="all"))
             except Exception as err:
                 return S_ERROR(str(err))
-        return S_OK(dids)   
-          
+        return S_OK(dids)
+
     def __transform_DIRAC_operator_to_Rucio(self, DIRAC_dict):
         """
         Transforms a DIRAC's metadata Query dictionary to a Rucio-compatible dictionary.
-        This method takes a dictionary with DIRAC operators and converts it to a 
+        This method takes a dictionary with DIRAC operators and converts it to a
         dictionary with Rucio-compatible operators based on predefined mappings.
         for example :
             input_dict={'key1': 'value1', 'key2': {'>': 10}, 'key3': {'=': 10}}
             return = {'key1': 'value1', 'key2.gt': 10, 'key3': 10}
         """
         rucio_dict = {}
-        operator_mapping = {
-            '>': '.gt',
-            '<': '.lt',
-            '>=': '.gte',
-            '<=': '.lte',
-            '=<': '.lte', 
-            '!=': '.ne',
-            '=' : ''
-        }
+        operator_mapping = {">": ".gt", "<": ".lt", ">=": ".gte", "<=": ".lte", "=<": ".lte", "!=": ".ne", "=": ""}
 
         for key, value in DIRAC_dict.items():
             if isinstance(value, dict):
@@ -838,7 +829,7 @@ def __transform_DIRAC_operator_to_Rucio(self, DIRAC_dict):
                 rucio_dict[key] = value
 
         return rucio_dict
-     
+
     def __transform_dict_with_in_operateur(self, DIRAC_dict_with_in_operator_list):
         """
         Transforms a list of DIRAC dictionaries containing 'in' operators into a combined list of dictionaries,
@@ -851,7 +842,7 @@ def __transform_dict_with_in_operateur(self, DIRAC_dict_with_in_operator_list):
             raise TypeError("DIRAC_dict_with_in_operator_list must be a list of dictionaries")
 
         combined_dict_list = []  # Final list of transformed dictionaries
-        break_reached = False    # Boolean to track if 'in' was found and processed in any dictionary
+        break_reached = False  # Boolean to track if 'in' was found and processed in any dictionary
 
         # Process each dictionary in the input list
         for DIRAC_dict_with_in_operator in DIRAC_dict_with_in_operator_list:
@@ -863,9 +854,9 @@ def __transform_dict_with_in_operateur(self, DIRAC_dict_with_in_operator_list):
 
             # Extract the key with 'in' operator and the list of values
             for key, value in DIRAC_dict_with_in_operator.items():
-                if isinstance(value, dict) and 'in' in value:
+                if isinstance(value, dict) and "in" in value:
                     in_key = key
-                    in_values = value['in']
+                    in_values = value["in"]
                     break_reached = True  # 'in' operator found
                     break
 
@@ -892,11 +883,11 @@ def __transform_DIRAC_filter_dict_to_Rucio_filter_dict(self, DIRAC_filter_dict_l
             input_dict_list = [{'particle': {'in': ['proton','electron']},'site': {'in': [ "LaPalma", 'paranal']},'configuration_id': {'=': 14} }    ]
             return = [{'particle': 'proton', 'site': 'LaPalma', 'configuration_id': 14}, {'particle': 'proton', 'site': 'paranal', 'configuration_id': 14}, {'particle': 'electron', 'site': 'LaPalma', 'configuration_id': 14}, {'particle': 'electron', 'site': 'paranal', 'configuration_id': 14}]
         """
-        break_detected=True
-        DIRAC_expanded_filters=DIRAC_filter_dict_list
+        break_detected = True
+        DIRAC_expanded_filters = DIRAC_filter_dict_list
         while break_detected:
             DIRAC_expanded_filters, break_detected = self.__transform_dict_with_in_operateur(DIRAC_expanded_filters)
-        Rucio_filters=[]
+        Rucio_filters = []
         for filter in DIRAC_expanded_filters:
             Rucio_filters.append(self.__transform_DIRAC_operator_to_Rucio(filter))
-        return Rucio_filters
+        return Rucio_filters
diff --git a/src/DIRAC/Resources/Catalog/test/Test_RucioFileCatalogClient.py b/src/DIRAC/Resources/Catalog/test/Test_RucioFileCatalogClient.py
@@ -2,128 +2,180 @@
 from unittest.mock import MagicMock, patch
 from DIRAC.Resources.Catalog.RucioFileCatalogClient import RucioFileCatalogClient
 
-class TestRucioFileCatalogClient(unittest.TestCase):
 
+class TestRucioFileCatalogClient(unittest.TestCase):
     def setUp(self):
-        self.patcher = patch.object(RucioFileCatalogClient, 'client', new_callable=MagicMock)
+        self.patcher = patch.object(RucioFileCatalogClient, "client", new_callable=MagicMock)
         self.client = RucioFileCatalogClient()
-        self.client.scopes = ['test_scope']
+        self.client.scopes = ["test_scope"]
         self.patcher.start()
 
     def tearDown(self):
         self.patcher.stop()
 
     def test_transform_DIRAC_operator_to_Rucio(self):
-        DIRAC_dict = {
-            'key1': 'value1',
-            'key2': {'>': 10},
-            'key3': {'=': 10}
-        }
-        expected_output = {
-            'key1': 'value1',
-            'key2.gt': 10,
-            'key3': 10
-        }
+        DIRAC_dict = {"key1": "value1", "key2": {">": 10}, "key3": {"=": 10}}
+        expected_output = {"key1": "value1", "key2.gt": 10, "key3": 10}
         result = self.client._RucioFileCatalogClient__transform_DIRAC_operator_to_Rucio(DIRAC_dict)
         self.assertEqual(result, expected_output)
 
     def test_transform_dict_with_in_operateur_2steps(self):
         DIRAC_dict_with_in_operator_list = [
-            {'particle': {'in': ['proton', 'electron']}, 'site': {'in': ['LaPalma', 'paranal']}, 'configuration_id': {'=': 14}}
+            {
+                "particle": {"in": ["proton", "electron"]},
+                "site": {"in": ["LaPalma", "paranal"]},
+                "configuration_id": {"=": 14},
+            }
         ]
         expected_intermediate_output = [
-            {'particle': 'proton', 'site': {'in': ['LaPalma', 'paranal']}, 'configuration_id': {'=': 14}}, 
-            {'particle': 'electron', 'site': {'in': ['LaPalma', 'paranal']}, 'configuration_id': {'=': 14}}
+            {"particle": "proton", "site": {"in": ["LaPalma", "paranal"]}, "configuration_id": {"=": 14}},
+            {"particle": "electron", "site": {"in": ["LaPalma", "paranal"]}, "configuration_id": {"=": 14}},
         ]
         expected_final_output = [
-            {'particle': 'proton', 'site': 'LaPalma', 'configuration_id': {'=': 14}},
-            {'particle': 'proton', 'site': 'paranal', 'configuration_id': {'=': 14}},
-            {'particle': 'electron', 'site': 'LaPalma', 'configuration_id': {'=': 14}},
-            {'particle': 'electron', 'site': 'paranal', 'configuration_id': {'=': 14}}
+            {"particle": "proton", "site": "LaPalma", "configuration_id": {"=": 14}},
+            {"particle": "proton", "site": "paranal", "configuration_id": {"=": 14}},
+            {"particle": "electron", "site": "LaPalma", "configuration_id": {"=": 14}},
+            {"particle": "electron", "site": "paranal", "configuration_id": {"=": 14}},
         ]
-        result_intermediate, _ = self.client._RucioFileCatalogClient__transform_dict_with_in_operateur(DIRAC_dict_with_in_operator_list)
+        result_intermediate, _ = self.client._RucioFileCatalogClient__transform_dict_with_in_operateur(
+            DIRAC_dict_with_in_operator_list
+        )
         self.assertEqual(result_intermediate, expected_intermediate_output)
-        result_final, _ = self.client._RucioFileCatalogClient__transform_dict_with_in_operateur( result_intermediate)
+        result_final, _ = self.client._RucioFileCatalogClient__transform_dict_with_in_operateur(result_intermediate)
         self.assertEqual(result_final, expected_final_output)
-    
+
     def test_transform_DIRAC_operator_to_Rucio_simple_key_value(self):
-        input_dict = {'key1': 'value1', 'key2': 'value2'}
-        expected_output = {'key1': 'value1', 'key2': 'value2'}
+        input_dict = {"key1": "value1", "key2": "value2"}
+        expected_output = {"key1": "value1", "key2": "value2"}
         result = self.client._RucioFileCatalogClient__transform_DIRAC_operator_to_Rucio(input_dict)
-        self.assertEqual(result,expected_output)
+        self.assertEqual(result, expected_output)
 
     def test_transform_DIRAC_operator_to_Rucio_nested_dict_with_operators_gl(self):
-        input_dict ={'start' : {'>=': 10},  'end' : {'>': 5}, 'pointingZ' : {'>=': 0.1} , 'organization' : 'ViaCorp' , 'data_levels' : 'DL3'}
-        expected_output = {'start.gte': 10,  'end.gt': 5, 'pointingZ.gte' : 0.1 ,'organization': 'ViaCorp', 'data_levels' :'DL3'}
+        input_dict = {
+            "start": {">=": 10},
+            "end": {">": 5},
+            "pointingZ": {">=": 0.1},
+            "organization": "ViaCorp",
+            "data_levels": "DL3",
+        }
+        expected_output = {
+            "start.gte": 10,
+            "end.gt": 5,
+            "pointingZ.gte": 0.1,
+            "organization": "ViaCorp",
+            "data_levels": "DL3",
+        }
         result = self.client._RucioFileCatalogClient__transform_DIRAC_operator_to_Rucio(input_dict)
-        self.assertEqual(result,expected_output)
+        self.assertEqual(result, expected_output)
 
     def test_transform_DIRAC_operator_to_Rucio_nested_dict_with_operators_equals(self):
-        input_dict = {'start' : {'=': 10},  'pointingZ' : {'=': 0.1} , 'organization' : 'ViaCorp' , 'data_levels' : 'DL3'}
-        expected_output = {'start': 10,  'pointingZ' : 0.1 ,'organization': 'ViaCorp', 'data_levels' :'DL3'}
+        input_dict = {"start": {"=": 10}, "pointingZ": {"=": 0.1}, "organization": "ViaCorp", "data_levels": "DL3"}
+        expected_output = {"start": 10, "pointingZ": 0.1, "organization": "ViaCorp", "data_levels": "DL3"}
         result = self.client._RucioFileCatalogClient__transform_DIRAC_operator_to_Rucio(input_dict)
-        assert result ==  expected_output
+        assert result == expected_output
 
     def test_transform_DIRAC_operator_to_Rucio_mixed_dict(self):
-        input_dict = {'key1': 'value1', 'key2': {'>': 10}, 'key3': {'=': 10}}
-        expected_output = {'key1': 'value1', 'key2.gt': 10, 'key3': 10}
+        input_dict = {"key1": "value1", "key2": {">": 10}, "key3": {"=": 10}}
+        expected_output = {"key1": "value1", "key2.gt": 10, "key3": 10}
         result = self.client._RucioFileCatalogClient__transform_DIRAC_operator_to_Rucio(input_dict)
-        assert result ==  expected_output
+        assert result == expected_output
 
     def test_transform_DIRAC_operator_to_Rucio_in_operator(self):
-        input_dict = [{'analysis_prog': {'in': ['ctapipe-merge', 'ctapipe-process', 'ctapipe-apply-models']}, 'key1': 'value1','key3': {'=': 10},'key4': {'<': 5} }]
-        expected_intermediate = [{'key1': 'value1', 'key3': 10, 'key4.lt': 5, 'analysis_prog': 'ctapipe-merge'}, {'key1': 'value1', 'key3': 10, 'key4.lt': 5, 'analysis_prog': 'ctapipe-process'}, {'key1': 'value1', 'key3': 10, 'key4.lt': 5, 'analysis_prog': 'ctapipe-apply-models'}]
-        result_interm = self.client._RucioFileCatalogClient__transform_DIRAC_filter_dict_to_Rucio_filter_dict(input_dict)
-        assert result_interm == expected_intermediate 
-        
-        
+        input_dict = [
+            {
+                "analysis_prog": {"in": ["ctapipe-merge", "ctapipe-process", "ctapipe-apply-models"]},
+                "key1": "value1",
+                "key3": {"=": 10},
+                "key4": {"<": 5},
+            }
+        ]
+        expected_intermediate = [
+            {"key1": "value1", "key3": 10, "key4.lt": 5, "analysis_prog": "ctapipe-merge"},
+            {"key1": "value1", "key3": 10, "key4.lt": 5, "analysis_prog": "ctapipe-process"},
+            {"key1": "value1", "key3": 10, "key4.lt": 5, "analysis_prog": "ctapipe-apply-models"},
+        ]
+        result_interm = self.client._RucioFileCatalogClient__transform_DIRAC_filter_dict_to_Rucio_filter_dict(
+            input_dict
+        )
+        assert result_interm == expected_intermediate
+
     def test_transform_DIRAC_operator_to_Rucio_2timesin_operator(self):
-        input_dict = [{ 'particle': {'in': ['proton','electron']},'site': {'in': [ "LaPalma", 'paranal'] }  }]
-        expected = [{'particle': 'proton', 'site': 'LaPalma'}, {'particle': 'proton', 'site': 'paranal'}, {'particle': 'electron', 'site': 'LaPalma'}, {'particle': 'electron', 'site': 'paranal'}]
+        input_dict = [{"particle": {"in": ["proton", "electron"]}, "site": {"in": ["LaPalma", "paranal"]}}]
+        expected = [
+            {"particle": "proton", "site": "LaPalma"},
+            {"particle": "proton", "site": "paranal"},
+            {"particle": "electron", "site": "LaPalma"},
+            {"particle": "electron", "site": "paranal"},
+        ]
         result = self.client._RucioFileCatalogClient__transform_DIRAC_filter_dict_to_Rucio_filter_dict(input_dict)
-        assert result == expected 
+        assert result == expected
 
     def test_2timesin_mix_operator(self):
-        input_dict = [{ 
-                'particle': {'in': ['proton','electron']},'site': {'in': [ "LaPalma", 'paranal']},'configuration_id': {'=': 14} }    ]
-        expected = [{'particle': 'proton', 'site': 'LaPalma', 'configuration_id': 14}, {'particle': 'proton', 'site': 'paranal', 'configuration_id': 14}, {'particle': 'electron', 'site': 'LaPalma', 'configuration_id': 14}, {'particle': 'electron', 'site': 'paranal', 'configuration_id': 14}]
+        input_dict = [
+            {
+                "particle": {"in": ["proton", "electron"]},
+                "site": {"in": ["LaPalma", "paranal"]},
+                "configuration_id": {"=": 14},
+            }
+        ]
+        expected = [
+            {"particle": "proton", "site": "LaPalma", "configuration_id": 14},
+            {"particle": "proton", "site": "paranal", "configuration_id": 14},
+            {"particle": "electron", "site": "LaPalma", "configuration_id": 14},
+            {"particle": "electron", "site": "paranal", "configuration_id": 14},
+        ]
         result = self.client._RucioFileCatalogClient__transform_DIRAC_filter_dict_to_Rucio_filter_dict(input_dict)
-        assert result == expected 
-
-        input_dict = [{ 
-                'particle': {'in': ['proton','electron']},'configuration_id': {'=': 14},'site': {'in': [ "LaPalma", 'paranal']} }    ]
-        expected = [{'particle': 'proton', 'configuration_id': 14, 'site': 'LaPalma'}, {'particle': 'proton', 'configuration_id': 14, 'site': 'paranal'}, {'particle': 'electron', 'configuration_id': 14, 'site': 'LaPalma'}, {'particle': 'electron', 'configuration_id': 14, 'site': 'paranal'}]
+        assert result == expected
+
+        input_dict = [
+            {
+                "particle": {"in": ["proton", "electron"]},
+                "configuration_id": {"=": 14},
+                "site": {"in": ["LaPalma", "paranal"]},
+            }
+        ]
+        expected = [
+            {"particle": "proton", "configuration_id": 14, "site": "LaPalma"},
+            {"particle": "proton", "configuration_id": 14, "site": "paranal"},
+            {"particle": "electron", "configuration_id": 14, "site": "LaPalma"},
+            {"particle": "electron", "configuration_id": 14, "site": "paranal"},
+        ]
         result = self.client._RucioFileCatalogClient__transform_DIRAC_filter_dict_to_Rucio_filter_dict(input_dict)
-        assert result == expected 
-
-
+        assert result == expected
 
     def test_transform_DIRAC_filter_dict_to_Rucio_filter_dict(self):
         DIRAC_filter_dict_list = [
-            {'particle': {'in': ['proton', 'electron']}, 'configuration_id': {'=': 14}, 'site': {'in': ['LaPalma', 'paranal']}}
+            {
+                "particle": {"in": ["proton", "electron"]},
+                "configuration_id": {"=": 14},
+                "site": {"in": ["LaPalma", "paranal"]},
+            }
         ]
         expected_output = [
-            {'particle': 'proton', 'configuration_id': 14, 'site': 'LaPalma'},
-            {'particle': 'proton', 'configuration_id': 14, 'site': 'paranal'},
-            {'particle': 'electron', 'configuration_id': 14, 'site': 'LaPalma'},
-            {'particle': 'electron', 'configuration_id': 14, 'site': 'paranal'}
+            {"particle": "proton", "configuration_id": 14, "site": "LaPalma"},
+            {"particle": "proton", "configuration_id": 14, "site": "paranal"},
+            {"particle": "electron", "configuration_id": 14, "site": "LaPalma"},
+            {"particle": "electron", "configuration_id": 14, "site": "paranal"},
         ]
-        result = self.client._RucioFileCatalogClient__transform_DIRAC_filter_dict_to_Rucio_filter_dict(DIRAC_filter_dict_list)
+        result = self.client._RucioFileCatalogClient__transform_DIRAC_filter_dict_to_Rucio_filter_dict(
+            DIRAC_filter_dict_list
+        )
         self.assertEqual(result, expected_output)
 
     def test_findFilesByMetadata(self):
-        self.client.client.list_dids.return_value = ['did1', 'did2']
-        metadataFilterDict = {'key1': 'value1'}
+        self.client.client.list_dids.return_value = ["did1", "did2"]
+        metadataFilterDict = {"key1": "value1"}
         result = self.client.findFilesByMetadata(metadataFilterDict)
-        self.assertTrue(result['OK'])
-        self.assertEqual(result['Value'], ['did1', 'did2'])
+        self.assertTrue(result["OK"])
+        self.assertEqual(result["Value"], ["did1", "did2"])
 
     def test_findFilesByMetadata_with_error(self):
-        self.client.client.list_dids.side_effect = Exception('Test error')
-        metadataFilterDict = {'key1': 'value1'}
+        self.client.client.list_dids.side_effect = Exception("Test error")
+        metadataFilterDict = {"key1": "value1"}
         result = self.client.findFilesByMetadata(metadataFilterDict)
-        self.assertFalse(result['OK'])
-        self.assertIn('Test error', result['Message'])
+        self.assertFalse(result["OK"])
+        self.assertIn("Test error", result["Message"])
+
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
