Alwats force a new connection with each request

src/utils/operandi_utils/hpc/nhr_connector.py

@@ -39,9 +39,13 @@ def __init__(
 
     @property
     def ssh_client(self):
-        if not self._ssh_client:
-            self._ssh_client = self.connect_to_hpc_nhr_frontend_server(host=HPC_NHR_CLUSTERS["EmmyPhase2"]["host"])
-            self._ssh_client.get_transport().set_keepalive(30)
+        if self._ssh_client:
+            self._ssh_client.close()
+            self._ssh_client = None
+        self._ssh_client = self.connect_to_hpc_nhr_frontend_server(host=HPC_NHR_CLUSTERS["EmmyPhase2"]["host"])
+        # self._ssh_client.get_transport().set_keepalive(30)
+
+        """
         try:
             # Note: This extra check is required against aggressive
             # Firewalls that ignore the keepalive option!
@@ -58,6 +62,11 @@ def ssh_client(self):
             self._ssh_reconnect_tries_remaining -= 1
             return self.ssh_client  # recursive call to itself to try again
         return self._ssh_client
+        """
+
+        return self._ssh_client
+
+
 
     @staticmethod
     def check_keyfile_existence(key_path: Path):

src/utils/operandi_utils/hpc/nhr_transfer.py

@@ -21,9 +21,13 @@ def __init__(self) -> None:
 
     @property
     def sftp_client(self):
-        if not self._sftp_client:
-            self._sftp_client = self.ssh_client.open_sftp()
-            self._sftp_client.get_channel().get_transport().set_keepalive(30)
+        if self._sftp_client:
+            self._sftp_client.close()
+            self._ssh_client = None
+        self._sftp_client = self.ssh_client.open_sftp()
+        # self._sftp_client.get_channel().get_transport().set_keepalive(30)
+
+        """
         try:
             # Note: This extra check is required against aggressive
             # Firewalls that ignore the keepalive option!
@@ -40,6 +44,9 @@ def sftp_client(self):
             self._sftp_reconnect_tries_remaining -= 1
             return self.sftp_client  # recursive call to itself to try again
         return self._sftp_client
+        """
+
+        return self._ssh_client
 
     def create_slurm_workspace_zip(
         self, ocrd_workspace_dir: str, workflow_job_id: str, nextflow_script_path: str,