Merge pull request #2 from jhiemstrawisc/v2-bindings-upgrade

Upgrade to the V2 bindings to resolve credentials error

Author: jhiemstrawisc

pyproject.toml

@@ -15,7 +15,7 @@ documentation = "https://snakemake.github.io/snakemake-plugin-catalog/plugins/ex
 python = "^3.11"
 snakemake-interface-common = "^1.17.1"
 snakemake-interface-executor-plugins = "^9.0.0"
-htcondor = "^23.4.0"
+htcondor = "^24.5.1"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.2.0"

snakemake_executor_plugin_htcondor/__init__.py

@@ -11,7 +11,7 @@
 )
 from snakemake_interface_common.exceptions import WorkflowError  # noqa
 
-import htcondor
+import htcondor2 as htcondor
 import traceback
 from os.path import join, basename, abspath, dirname
 from os import makedirs, sep
@@ -65,23 +65,6 @@ class ExecutorSettings(ExecutorSettingsBase):
     can_transfer_local_files=True,
 )
 
-def get_creds() -> bool:
-    """
-    Get credentials to avoid job going on hold due to lack of credentials
-    """
-    # thanks @tlmiller
-    local_provider_name = htcondor.param.get("LOCAL_CREDMON_PROVIDER_NAME")
-    if local_provider_name is None:
-        return False
-    magic = ("LOCAL:%s" % local_provider_name).encode()
-    credd = htcondor.Credd()
-    credd.add_user_cred(htcondor.CredTypes.Kerberos, magic)
-    return True
-
-
-class CredsError(Exception):
-    pass
-
 # Required:
 # Implementation of your executor
 class Executor(RemoteExecutor):
@@ -244,13 +227,8 @@ def run_job(self, job: JobExecutorInterface):
 
         # Submitting job to HTCondor
         try:
-            have_creds = get_creds()
-            if not have_creds:
-                raise CredsError("Credentials not found for this workflow")
+            submit_description.issue_credentials()
             submit_result = schedd.submit(submit_description)
-        except CredsError as ce:
-            traceback.print_exc()
-            print(f"CredsError occurred: {ce}")
         except Exception as e:
             traceback.print_exc()
             raise WorkflowError(f"Failed to submit HTCondor job: {e}")
@@ -296,8 +274,11 @@ async def check_active_jobs(
                                 "JobStatus",
                             ],
                         )
-                        #  Storing the one event from HistoryIterator to list
-                        job_status = [next(job_status)]
+                        #  Storing the one event from history list
+                        if job_status and len(job_status) >= 1:
+                            job_status = [job_status[0]]
+                        else:
+                            raise ValueError(f"No job status found in history for HTCondor job with Cluster ID {current_job.external_jobid}.")
                 except Exception as e:
                     self.logger.warning(f"Failed to retrieve HTCondor job status: {e}")
                     # Assuming the job is still running and retry next time