hito_tools 26.1rc2__tar.gz → 26.1rc3__tar.gz

{hito_tools-26.1rc2 → hito_tools-26.1rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hito_tools
-Version: 26.1rc2
+Version: 26.1rc3
 Summary: Modules for interacting with Hito and NSIP
 License-Expression: BSD-3-Clause
 License-File: LICENSE

{hito_tools-26.1rc2 → hito_tools-26.1rc3}/hito_tools/nsip.py

@@ -2,7 +2,7 @@
 import datetime
 import re
 from io import StringIO
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 import pandas as pd
 
@@ -30,6 +30,12 @@ HTTP_STATUS_FORBIDDEN = 403
 HTTP_STATUS_NOT_FOUND = 404
 HTTP_STATUS_CONFLICT = 409
 
+AGENT_HAS_MULTIPLE_CONTRACTS_PATTERN = re.compile(
+    (
+        r'"Agent has active multi-contracts in same laboratory - manual action needed\s+'
+        r"\|\s+idAgentContract\s+:\s+(?P<id1>\d+)\s+\|\s+idAgentContract\s+:\s+(?P<id2>\d+)"
+    )
+)
 AGENT_NOT_IN_PROJECT_PATTERN = re.compile(
     r'"Error : This project has not been affected to this agent, declaration forbidden"$'
 )
@@ -84,6 +90,26 @@ class NSIPConnection:
             f"{self.api_params[api_category][api_name]}"
         )
 
+    def _check_multiple_contracts(self, reason: str) -> Optional[str]:
+        """
+        One of the possible error during agent-related updates is that the user has
+        multiple contracts attached to the lab for the current period. In this case
+        the reason contains the different contract IDs: used the last one
+        the update is retried with the second contract (generally the current one)
+        mentioned in the error message.
+
+        :param reason: error message returned by API
+        :return: contract ID if it is the multiple contract error or None
+        """
+
+        m = AGENT_HAS_MULTIPLE_CONTRACTS_PATTERN.match(http_reason)
+        if m:
+            contract = m.group("id2")
+        else:
+            contract = None
+
+        return contract
+
     def get_agent_list(self, context: str = "NSIP"):
         """
         Retrieve NSIP agents from NSIP API and return a dict built from the retrieved JSON
@@ -117,27 +143,52 @@ class NSIPConnection:
                  http_status, http_reason
         """
 
+        contract = None
         url = self._get_api_url("agent_api", "project_assign")
         params = {
             "projectId": project_id,
-            "emailReseda": email,
             "startDate": start_date.date().isoformat(),
             "context": "NSIP",
         }
 
-        r = requests.post(url, headers={"Authorization": f"Bearer {self.token}"}, params=params)
-        if r.content:
-            reason = r.content.decode("utf-8")
-        else:
-            reason = ""
+        retry = True
+        retry_attempts = 0
+        while retry:
+            # adding agent is retried only for some specific errors
+            retry = False
+
+            if contract:
+                print(f"INFO: adding agent {email} to project {project_id} using contract {contract}")
+                params["idAgentContract"] = contract
+            else:
+                params["emailReseda"] = email
+
+            r = requests.post(url, headers={"Authorization": f"Bearer {self.token}"}, params=params)
+            if r.content:
+                reason = r.content.decode("utf-8")
+            else:
+                reason = ""
+
+            if r.status_code == HTTP_STATUS_OK:
+                status = 0
+            elif r.status_code == HTTP_STATUS_CREATED:
+                status = 0
+                print(f"INFO: agent {email} successfully added to project {project_id}")
+            elif r.status_code == HTTP_STATUS_NOT_FOUND:
+                contract = self._check_multiple_contracts(r.reason)
+                if retry_attempts == 0 and contract is not None:
+                    retry = True
+                    print(
+                        (
+                            f"Agent {row.email_reseda} has several contracts for the"
+                            f" current period: retrying update with contract {contract}"
+                        )
+                    )
+                else:
+                    status = 1
+            else:
+                status = 1
 
-        if r.status_code == HTTP_STATUS_OK:
-            status = 0
-        elif r.status_code == HTTP_STATUS_CREATED:
-            status = 0
-            print(f"INFO: agent {email} successfully added to project {project_id}")
-        else:
-            status = 1
         return status, r.status_code, reason
 
     def update_agent(
@@ -199,7 +250,6 @@ class NSIPConnection:
         time: int,
         period_start: str,
         validation_date: datetime.date = None,
-        contract: int = None,
     ) -> int:
         """
         Add or update a project declaration for a user specified by its RESEDA email
@@ -211,22 +261,17 @@ class NSIPConnection:
                      week)
         :param period_start: start date of the validation period
         :param validation_date: validation date
-        :param contract: contract ID in case the agent has multiple contracts for the period
         :return: status (0 for successful add, -1 for successful update, positive value if errors),
                  http_status if errors else declaration ID added/modified, http_reason
         """
 
+        contract = None
         url = self._get_api_url("agent_api", "declaration_add")
         if project_type:
             params = {"projectId": int(project_id), "referenceId": ""}
         else:
             params = {"projectId": "", "referenceId": int(project_id)}
         params["context"] = "NSIP"
-        if contract:
-            print(f"INFO: updating {email} declaration using contract {contract}")
-            params["idAgentContract"] = contract
-        else:
-            params["emailReseda"] = email
         params["time"] = time
         if validation_date:
             validation_date_str = validation_date.date().isoformat()
@@ -238,6 +283,12 @@ class NSIPConnection:
             # declaration update is retried only for some specific errors
             retry = False
 
+            if contract:
+                print(f"INFO: updating {email} declaration using contract {contract}")
+                params["idAgentContract"] = contract
+            else:
+                params["emailReseda"] = email
+
             r = requests.post(url, headers={"Authorization": f"Bearer {self.token}"}, params=params)
             reason = r.text
 
@@ -289,6 +340,16 @@ class NSIPConnection:
                             f" (error={http_status}, reason={http_reason})"
                         )
                         status = -2
+                else:
+                    contract = self._check_multiple_contracts(r.reason)
+                    if contract:
+                        retry = True
+                        print(
+                            (
+                                f"Agent {row.email_reseda} has several contracts for the"
+                                f" current period: retrying update with contract {contract}"
+                            )
+                        )
 
         if r.status_code == HTTP_STATUS_OK:
             return status, declaration_id, reason

{hito_tools-26.1rc2 → hito_tools-26.1rc3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "hito_tools"
-version = "26.1.rc2"
+version = "26.1.rc3"
 description = "Modules for interacting with Hito and NSIP"
 readme = "README.md"
 authors = [ { name = "Michel Jouvin", email = "michel.jouvin@ijclab.in2p3.fr" } ]