Implement DB Associations API and a little refactoring.

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - failed_node
 - Now possible to initialize a pyslurm.db.Jobs collection with existing job
   ids or pyslurm.db.Job objects
+- Added `as_dict` function to all Collections
 
 ### Fixed
 
@@ -26,6 +27,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - no start/end time was specified
     - the Job was older than a day
 
+### Changed
+
+- All Collections (like [pyslurm.Jobs](https://pyslurm.github.io/23.2/reference/job/#pyslurm.Jobs)) inherit from `list` now instead of `dict`
+- `JobSearchFilter` has been renamed to `JobFilter`
+
 ## [23.2.1](https://github.com/PySlurm/pyslurm/releases/tag/v23.2.1) - 2023-05-18
 
 ### Added
@@ -40,7 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - [pyslurm.db.Job](https://pyslurm.github.io/23.2/reference/db/job/#pyslurm.db.Job)
     - [pyslurm.db.Jobs](https://pyslurm.github.io/23.2/reference/db/job/#pyslurm.db.Jobs)
     - [pyslurm.db.JobStep](https://pyslurm.github.io/23.2/reference/db/jobstep/#pyslurm.db.JobStep)
-    - [pyslurm.db.JobSearchFilter](https://pyslurm.github.io/23.2/reference/db/jobsearchfilter/#pyslurm.db.JobSearchFilter)
+    - [pyslurm.db.JobFilter](https://pyslurm.github.io/23.2/reference/db/jobsearchfilter/#pyslurm.db.JobFilter)
 - Classes to interact with the Node API
     - [pyslurm.Node](https://pyslurm.github.io/23.2/reference/node/#pyslurm.Node)
     - [pyslurm.Nodes](https://pyslurm.github.io/23.2/reference/node/#pyslurm.Nodes)
@@ -49,7 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - [pyslurm.RPCError](https://pyslurm.github.io/23.2/reference/exceptions/#pyslurm.RPCError)
 - [Utility Functions](https://pyslurm.github.io/23.2/reference/utilities/#pyslurm.utils)
 
-### Changes
+### Changed
 
 - Completely overhaul the documentation, switch to mkdocs
 - Rework the tests: Split them into unit and integration tests

docs/reference/db/jobfilter.md

@@ -0,0 +1,6 @@
+---
+title: JobFilter
+---
+
+::: pyslurm.db.JobFilter
+    handler: python

docs/reference/index.md

@@ -37,7 +37,7 @@ The `pyslurm` package is a wrapper around the Slurm C-API
     * [pyslurm.db.Job][]
     * [pyslurm.db.JobStep][]
     * [pyslurm.db.Jobs][]
-    * [pyslurm.db.JobSearchFilter][]
+    * [pyslurm.db.JobFilter][]
 * Node API
     * [pyslurm.Node][]
     * [pyslurm.Nodes][]

pyslurm/__init__.py

@@ -9,11 +9,15 @@
 
 sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
 
+# Initialize slurm api
+from pyslurm.api import slurm_init, slurm_fini
+slurm_init()
+
 from .pyslurm import *
 from .__version__ import __version__
 
-from pyslurm import utils
 from pyslurm import db
+from pyslurm import utils
 from pyslurm import constants
 
 from pyslurm.core.job import (
@@ -32,10 +36,6 @@
 )
 from pyslurm.core import slurmctld
 
-# Initialize slurm api
-from pyslurm.api import slurm_init, slurm_fini
-slurm_init()
-
 
 def version():
     return __version__

pyslurm/core/job/job.pxd

@@ -67,7 +67,7 @@ from pyslurm.slurm cimport (
 )
 
 
-cdef class Jobs(dict):
+cdef class Jobs(list):
     """A collection of [pyslurm.Job][] objects.
 
     Args:

pyslurm/core/job/job.pyx

@@ -34,6 +34,7 @@ from typing import Union
 from pyslurm.utils import cstr, ctime
 from pyslurm.utils.uint import *
 from pyslurm.core.job.util import *
+from pyslurm.db.cluster import LOCAL_CLUSTER
 from pyslurm.core.error import (
     RPCError,
     verify_rpc,
@@ -47,12 +48,14 @@ from pyslurm.utils.helpers import (
     _getgrall_to_dict,
     _getpwall_to_dict,
     instance_to_dict,
+    collection_to_dict,
+    group_collection_by_cluster,
     _sum_prop,
     _get_exit_code,
 )
 
 
-cdef class Jobs(dict):
+cdef class Jobs(list):
 
     def __cinit__(self):
         self.info = NULL
@@ -63,14 +66,37 @@ cdef class Jobs(dict):
     def __init__(self, jobs=None, frozen=False):
         self.frozen = frozen
 
-        if isinstance(jobs, dict):
-            self.update(jobs)
-        elif jobs is not None:
+        if isinstance(jobs, list):
             for job in jobs:
                 if isinstance(job, int):
-                    self[job] = Job(job)
+                    self.append(Job(job))
                 else:
-                    self[job.id] = job
+                    self.append(job)
+        elif isinstance(jobs, str):
+            joblist = jobs.split(",")
+            self.extend([Job(int(job)) for job in joblist])
+        elif isinstance(jobs, dict):
+            self.extend([job for job in jobs.values()])
+        elif jobs is not None:
+            raise TypeError("Invalid Type: {type(jobs)}")
+
+    def as_dict(self, recursive=False):
+        """Convert the collection data to a dict.
+
+        Args:
+            recursive (bool, optional):
+                By default, the objects will not be converted to a dict. If
+                this is set to `True`, then additionally all objects are
+                converted to dicts.
+
+        Returns:
+            (dict): Collection as a dict.
+        """
+        col = collection_to_dict(self, identifier=Job.id, recursive=recursive)
+        return col.get(LOCAL_CLUSTER, {})
+
+    def group_by_cluster(self):
+        return group_collection_by_cluster(self)
 
     @staticmethod
     def load(preload_passwd_info=False, frozen=False):
@@ -124,7 +150,7 @@ cdef class Jobs(dict):
                 job.passwd = passwd
                 job.groups = groups
 
-            jobs[job.id] = job
+            jobs.append(job)
 
         # At this point we memcpy'd all the memory for the Jobs. Setting this
         # to 0 will prevent the slurm job free function to deallocate the
@@ -143,28 +169,34 @@ cdef class Jobs(dict):
         Raises:
             RPCError: When getting the Jobs from the slurmctld failed.
         """
-        cdef Jobs reloaded_jobs = Jobs.load()
+        cdef:
+            Jobs reloaded_jobs
+            Jobs new_jobs = Jobs()
+            dict self_dict
 
-        for jid in list(self.keys()):
+        if not self:
+            return self
+
+        reloaded_jobs = Jobs.load().as_dict()
+        for idx, jid in enumerate(self):
             if jid in reloaded_jobs:
                 # Put the new data in.
-                self[jid] = reloaded_jobs[jid]
-            elif not self.frozen:
-                # Remove this instance from the current collection, as the Job
-                # doesn't exist anymore.
-                del self[jid]
+                new_jobs.append(reloaded_jobs[jid])
 
         if not self.frozen:
+            self_dict = self.as_dict()
             for jid in reloaded_jobs:
-                if jid not in self:
-                    self[jid] = reloaded_jobs[jid]
+                if jid not in self_dict:
+                    new_jobs.append(reloaded_jobs[jid])
 
+        self.clear()
+        self.extend(new_jobs)
         return self
 
     def load_steps(self):
         """Load all Job steps for this collection of Jobs.
 
-        This function fills in the "steps" attribute for all Jobs in the
+        This function fills in the `steps` attribute for all Jobs in the
         collection.
 
         !!! note
@@ -175,21 +207,16 @@ cdef class Jobs(dict):
             RPCError: When retrieving the Job information for all the Steps
                 failed.
         """
-        cdef dict step_info = JobSteps.load_all()
+        cdef dict steps = JobSteps.load().as_dict()
 
-        for jid in self:
+        for idx, job in enumerate(self):
             # Ignore any Steps from Jobs which do not exist in this
             # collection.
-            if jid in step_info:
-                self[jid].steps = step_info[jid]
-
-    def as_list(self):
-        """Format the information as list of Job objects.
-
-        Returns:
-            (list[pyslurm.Job]): List of Job objects
-        """
-        return list(self.values())
+            jid = job.id
+            if jid in steps:
+                job_steps = self[idx].steps
+                job_steps.clear()
+                job_steps.extend(steps[jid].values())
 
     @property
     def memory(self):
@@ -218,6 +245,7 @@ cdef class Job:
         self.ptr.job_id = job_id
         self.passwd = {}
         self.groups = {}
+        cstr.fmalloc(&self.ptr.cluster, LOCAL_CLUSTER)
         self.steps = JobSteps.__new__(JobSteps)
 
     def _alloc_impl(self):
@@ -234,7 +262,9 @@ cdef class Job:
         self._dealloc_impl()
 
     def __eq__(self, other):
-        return isinstance(other, Job) and self.id == other.id
+        if isinstance(other, Job):
+            return self.id == other.id and self.cluster == other.cluster
+        return NotImplemented
 
     @staticmethod
     def load(job_id):
@@ -278,7 +308,7 @@ cdef class Job:
                 if not slurm.IS_JOB_PENDING(wrap.ptr):
                     # Just ignore if the steps couldn't be loaded here.
                     try:
-                        wrap.steps = JobSteps._load(wrap)
+                        wrap.steps = JobSteps._load_single(wrap)
                     except RPCError:
                         pass
             else:

pyslurm/core/job/step.pxd

@@ -49,7 +49,7 @@ from pyslurm.utils.ctime cimport time_t
 from pyslurm.core.job.task_dist cimport TaskDistribution
 
 
-cdef class JobSteps(dict):
+cdef class JobSteps(list):
     """A collection of [pyslurm.JobStep][] objects for a given Job.
 
     Args:
@@ -64,11 +64,12 @@ cdef class JobSteps(dict):
     cdef:
         job_step_info_response_msg_t *info
         job_step_info_t tmp_info
+        _job_id
 
     @staticmethod
-    cdef JobSteps _load(Job job)
+    cdef JobSteps _load_single(Job job)
 
-    cdef dict _get_info(self, uint32_t job_id, int flags)
+    cdef _load_data(self, uint32_t job_id, int flags)
 
 
 cdef class JobStep: