sirmordred 1.0.5rc1__py3-none-any.whl → 1.1.1__py3-none-any.whl

sirmordred/_version.py

@@ -1,2 +1,2 @@
-# File auto-generated by semverup on 2024-08-13 10:15:47.092016
-__version__ = "1.0.5-rc.1"
+# File auto-generated by semverup on 2024-09-23 08:30:12.401712
+__version__ = "1.1.1"

sirmordred/sirmordred.py

@@ -50,6 +50,7 @@ from sirmordred.task_identities import TaskIdentitiesMerge
 from sirmordred.task_manager import TasksManager
 from sirmordred.task_panels import TaskPanels, TaskPanelsMenu
 from sirmordred.task_projects import TaskProjects
+from sortinghat.cli.client import SortingHatClient
 
 logger = logging.getLogger(__name__)
 
@@ -198,7 +199,7 @@ class SirMordred:
             repos_backend = self._get_repos_by_backend()
             for backend in repos_backend:
                 # Start new Threads and add them to the threads list to complete
-                t = TasksManager(backend_tasks, backend, stopper, self.config, small_delay)
+                t = TasksManager(backend_tasks, backend, stopper, self.config, self.client, small_delay)
                 threads.append(t)
                 t.start()
 
@@ -206,7 +207,7 @@ class SirMordred:
         if len(global_tasks) > 0:
             # FIXME timer is applied to all global_tasks, does it make sense?
             # All tasks are executed in the same thread sequentially
-            gt = TasksManager(global_tasks, "Global tasks", stopper, self.config, big_delay)
+            gt = TasksManager(global_tasks, "Global tasks", stopper, self.config, self.client, big_delay)
             threads.append(gt)
             gt.start()
             if big_delay > 0:
@@ -248,14 +249,14 @@ class SirMordred:
         if self.conf['phases']['panels']:
             tasks = [TaskPanels, TaskPanelsMenu]
             stopper.set()
-            tm = TasksManager(tasks, "Global tasks", stopper, self.config)
+            tm = TasksManager(tasks, "Global tasks", stopper, self.config, self.client)
             tm.start()
             tm.join()
 
         logger.info("Loading projects")
         tasks = [TaskProjects]
         stopper.set()
-        tm = TasksManager(tasks, "Global tasks", stopper, self.config)
+        tm = TasksManager(tasks, "Global tasks", stopper, self.config, self.client)
         tm.start()
         tm.join()
         logger.info("Projects loaded")
@@ -280,7 +281,7 @@ class SirMordred:
 
         # check we have access to the needed ES
         if not self.check_es_access():
-            print('Can not access Elasticsearch service. Exiting sirmordred ...')
+            print('Can not access ElasticSearch/OpenSearch service. Exiting sirmordred ...')
             sys.exit(1)
 
         # If bestiary is configured check that it is working
@@ -289,6 +290,9 @@ class SirMordred:
                 print('Can not access bestiary service. Exiting sirmordred ...')
                 sys.exit(1)
 
+        # Create SortingHat Client
+        self.__create_sh_client(self.config)
+
         # Initial round: panels and projects loading
         self.__execute_initial_load()
 
@@ -336,3 +340,28 @@ class SirMordred:
                 logger.error(var)
 
         logger.info("Finished SirMordred engine ...")
+
+    def __create_sh_client(self, config):
+        self.config = config
+        self.conf = config.get_conf()
+
+        sortinghat = self.conf.get('sortinghat', None)
+        self.db_sh = sortinghat['database'] if sortinghat else None
+        self.db_user = sortinghat['user'] if sortinghat else None
+        self.db_password = sortinghat['password'] if sortinghat else None
+        self.db_host = sortinghat['host'] if sortinghat else '127.0.0.1'
+        self.db_path = sortinghat.get('path', None) if sortinghat else None
+        self.db_port = sortinghat.get('port', None) if sortinghat else None
+        self.db_ssl = sortinghat.get('ssl', False) if sortinghat else False
+        self.db_verify_ssl = sortinghat.get('verify_ssl', True) if sortinghat else True
+        self.db_tenant = sortinghat.get('tenant', True) if sortinghat else None
+        self.db_unaffiliate_group = sortinghat['unaffiliated_group'] if sortinghat else None
+        if sortinghat and not hasattr(self, 'client'):
+            self.client = SortingHatClient(host=self.db_host, port=self.db_port,
+                                           path=self.db_path, ssl=self.db_ssl,
+                                           user=self.db_user, password=self.db_password,
+                                           verify_ssl=self.db_verify_ssl,
+                                           tenant=self.db_tenant)
+            self.client.connect()
+        elif not sortinghat:
+            self.client = None

sirmordred/task.py

@@ -29,7 +29,6 @@ import re
 from grimoire_elk.elk import get_ocean_backend
 from grimoire_elk.utils import get_connector_from_name, get_elastic
 from grimoire_elk.enriched.utils import grimoire_con
-from sortinghat.cli.client import SortingHatClient
 
 logger = logging.getLogger(__name__)
 
@@ -42,10 +41,11 @@ class Task():
                          'studies', 'node_regex', 'anonymize']
     PARAMS_WITH_SPACES = ['blacklist-jobs']
 
-    def __init__(self, config):
+    def __init__(self, config, sortinghat_client=None):
         self.backend_section = None
         self.config = config
         self.conf = config.get_conf()
+        self.client = sortinghat_client
 
         sortinghat = self.conf.get('sortinghat', None)
         self.db_sh = sortinghat['database'] if sortinghat else None
@@ -58,15 +58,6 @@ class Task():
         self.db_verify_ssl = sortinghat.get('verify_ssl', True) if sortinghat else True
         self.db_tenant = sortinghat.get('tenant', True) if sortinghat else None
         self.db_unaffiliate_group = sortinghat['unaffiliated_group'] if sortinghat else None
-        if sortinghat:
-            self.client = SortingHatClient(host=self.db_host, port=self.db_port,
-                                           path=self.db_path, ssl=self.db_ssl,
-                                           user=self.db_user, password=self.db_password,
-                                           verify_ssl=self.db_verify_ssl,
-                                           tenant=self.db_tenant)
-            self.client.connect()
-        else:
-            self.client = None
 
         self.grimoire_con = grimoire_con(conn_retries=12)  # 30m retry
 
@@ -156,9 +147,9 @@ class Task():
                 continue
 
             # If param is boolean, no values must be added
-            if type(section_param) == bool:
+            if isinstance(section_param, bool):
                 params.append("--" + p) if section_param else None
-            elif type(section_param) == list:
+            elif isinstance(section_param, list):
                 # '--blacklist-jobs', 'a', 'b', 'c'
                 # 'a', 'b', 'c' must be added as items in the list
                 params.append("--" + p)

sirmordred/task_autorefresh.py

@@ -43,8 +43,8 @@ logger = logging.getLogger(__name__)
 class TaskAutorefresh(Task):
     """Refresh the last modified identities for all the backends."""
 
-    def __init__(self, config):
-        super().__init__(config)
+    def __init__(self, config, sortinghat_client):
+        super().__init__(config, sortinghat_client)
 
         self.last_autorefresh_backend = {}
 

sirmordred/task_enrich.py

@@ -53,8 +53,8 @@ logger = logging.getLogger(__name__)
 class TaskEnrich(Task):
     """ Basic class shared by all enriching tasks """
 
-    def __init__(self, config, backend_section=None, allowed_repos=None):
-        super().__init__(config)
+    def __init__(self, config, sortinghat_client, backend_section=None, allowed_repos=None):
+        super().__init__(config, sortinghat_client)
         self.backend_section = backend_section
         self.allowed_repos = set(allowed_repos) if allowed_repos else None
         # This will be options in next iteration

sirmordred/task_identities.py

@@ -38,8 +38,8 @@ logger = logging.getLogger(__name__)
 class TaskIdentitiesMerge(Task):
     """ Task for processing identities in SortingHat """
 
-    def __init__(self, conf):
-        super().__init__(conf)
+    def __init__(self, conf, soringhat_client):
+        super().__init__(conf, soringhat_client)
         self.last_autorefresh = datetime.utcnow()  # Last autorefresh date
 
     def is_backend_task(self):

sirmordred/task_manager.py

@@ -50,7 +50,7 @@ class TasksManager(threading.Thread):
     IDENTITIES_TASKS_ON_LOCK = threading.Lock()
     IDENTITIES_TASKS_ON = False
 
-    def __init__(self, tasks_cls, backend_section, stopper, config, timer=0):
+    def __init__(self, tasks_cls, backend_section, stopper, config, sortinghat_client, timer=0):
         """
         :tasks_cls : tasks classes to be executed using the backend
         :backend_section: perceval backend section name
@@ -64,6 +64,7 @@ class TasksManager(threading.Thread):
         self.stopper = stopper  # To stop the thread from parent
         self.timer = timer
         self.thread_id = None
+        self.client = sortinghat_client
 
     def add_task(self, task):
         self.tasks.append(task)
@@ -80,7 +81,7 @@ class TasksManager(threading.Thread):
         logger.debug(self.tasks_cls)
         for tc in self.tasks_cls:
             # create the real Task from the class
-            task = tc(self.config)
+            task = tc(self.config, self.client)
             task.set_backend_section(self.backend_section)
             self.tasks.append(task)
 

{sirmordred-1.0.5rc1.dist-info → sirmordred-1.1.1.dist-info}/METADATA

@@ -1,27 +1,26 @@
 Metadata-Version: 2.1
 Name: sirmordred
-Version: 1.0.5rc1
+Version: 1.1.1
 Summary: Drive GrimoireLab tools to produce a dashboard
 Home-page: https://chaoss.github.io/grimoirelab/
 License: GPL-3.0+
 Keywords: development,grimoirelab
 Author: GrimoireLab Developers
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development
 Requires-Dist: cereslib (>=0.3)
-Requires-Dist: colorlog (==4.1.0)
+Requires-Dist: colorlog (>=6.4.1,<7.0.0)
 Requires-Dist: elasticsearch (==6.3.1)
 Requires-Dist: elasticsearch-dsl (==6.3.1)
-Requires-Dist: file-read-backwards (==2.0.0)
+Requires-Dist: file-read-backwards (>=3.1.0,<4.0.0)
 Requires-Dist: graal (>=0.3)
 Requires-Dist: grimoire-elk (>=0.102)
 Requires-Dist: grimoirelab-panels (>=0.1)

{sirmordred-1.0.5rc1.dist-info → sirmordred-1.1.1.dist-info}/RECORD

@@ -1,16 +1,16 @@
 sirmordred/__init__.py,sha256=vQ9Reo3DRPBCcW0QhyeK2tBCTIumq3D1BkaWXTtY8VA,835
-sirmordred/_version.py,sha256=3-oGeEqw9bNhIItY-4BmBfMmDAFq3InMo3n0uNBJlnc,91
+sirmordred/_version.py,sha256=wueCwf1bk6rWOMTUfmuyQtC_zkz9XNPmzbewSCzbAAM,86
 sirmordred/bin/sirmordred.py,sha256=LmCiVYL7NBIord1Lz7RXJcRIPJtSvMT-b8QxNieRDzE,5022
 sirmordred/config.py,sha256=hxwCRQ-szIz8KXedLoJ5Tl1ktP07uZ6z2buwzkofggI,33508
 sirmordred/error.py,sha256=RD-POuigH-FEvmTu7a7qI5t78NnjkYKQ_ukfns9DozY,1836
 sirmordred/github.py,sha256=5RFYoTscKWACqMq_uJCYXv8KZD6qe7C2eBgfz0tyPpo,2306
-sirmordred/sirmordred.py,sha256=YRz7qhX2C2lr7IRgkt1iilDjjqv1xCZFNdw-4qcD3H0,12432
-sirmordred/task.py,sha256=04HFQnljFEM7x8WNZm5n5l2Z9S6Xs2BfhfyJy6NsyeE,10093
-sirmordred/task_autorefresh.py,sha256=vjxAudX-sQ760EDHbR5ZKPAwQKm9AiQc9FhcdesrYN0,7762
+sirmordred/sirmordred.py,sha256=E1uX-j12Wz_KIsL_-BDYmW-0fkeX6y9RvgkzUiX_swA,14101
+sirmordred/task.py,sha256=LuAdf9I3kk0tSqlJw1CLYst3Bt-EwhxiVsj5OSh1mkY,9623
+sirmordred/task_autorefresh.py,sha256=X2sGa9kBkBsoWz5SqjzHX2sdksFNHdu3Spe6-YCvSFw,7800
 sirmordred/task_collection.py,sha256=j6UGBUeGoO1kU7cLQ7lPtqbO1JHazbbGpy4wkAeoMN0,6524
-sirmordred/task_enrich.py,sha256=Ms6EfNJ0w8katIiuOp3g-qToB6eYc7b1NGJ29sXm90I,21236
-sirmordred/task_identities.py,sha256=W_7QypyzBYW1L_XtJ1W-f5AhdK4dOOEWeXySBWFunsM,3396
-sirmordred/task_manager.py,sha256=zfzx2u6JRARjOyeU05Uakeef-X7hBcJlFu8NBzjCxfU,4424
+sirmordred/task_enrich.py,sha256=t6PiI6s8hCxWhcPbc7qtL6rkendgrY9ycgI2PNIR8FM,21274
+sirmordred/task_identities.py,sha256=EeXLQ_pN7UYw7nWC27TK0m7v5Q8xE83t0N69lJE8DjQ,3432
+sirmordred/task_manager.py,sha256=xYhdmFvJpkLcJvIX50F2uvTtFevpXIckN3RrWDjej6g,4496
 sirmordred/task_panels.py,sha256=bU6s9YzpzhqX49XR7L6_IeT2dbnotEvxiLSVkuf9k1I,29060
 sirmordred/task_projects.py,sha256=gJTnGvAYbZ8HTSzXzUXw6BiJ6XaAUWY8QE9j3GgaRP0,6484
 sirmordred/utils/find_affiliation_conflicts.py,sha256=tmPk930o8MDycZcVH6T3TBtCTZia5bs1uuhI343sKfY,1981
@@ -22,8 +22,8 @@ sirmordred/utils/panels_config.py,sha256=G54oTtRppHDLRhdnaqYneUemUlWFxlX6h7GFl0L
 sirmordred/utils/projects.json,sha256=CxXpzYqvLx6FfDTPln9b5TIkfEb2cgfP20WLvwK_7GU,864
 sirmordred/utils/projects_json2yml.py,sha256=N9-orfrnfzASTYAIzR2Xo9IpW-CVdNAiVAmWT7Bt154,3141
 sirmordred/utils/setup.cfg,sha256=hKbO4euWOFYzzsGcTQk8jW6CkutOJw72TywBQdyekrA,3634
-sirmordred-1.0.5rc1.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-sirmordred-1.0.5rc1.dist-info/METADATA,sha256=HOUcjfOr5Dyn8DlawMsJ3sB_CpD8TN8SJoM4mnLFIhQ,42454
-sirmordred-1.0.5rc1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-sirmordred-1.0.5rc1.dist-info/entry_points.txt,sha256=HKwfuVFXnCzt8rsJBUFudGHm-KMxJ_3a1YLX-Q7WoRk,200
-sirmordred-1.0.5rc1.dist-info/RECORD,,
+sirmordred-1.1.1.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+sirmordred-1.1.1.dist-info/METADATA,sha256=WrG9nv3CZ7AlCFHLgC7ON6C5Qxar9DMtNs6kmkVt4c8,42415
+sirmordred-1.1.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+sirmordred-1.1.1.dist-info/entry_points.txt,sha256=HKwfuVFXnCzt8rsJBUFudGHm-KMxJ_3a1YLX-Q7WoRk,200
+sirmordred-1.1.1.dist-info/RECORD,,