Naming

trailblazer/clients/slurm_cli_client/slurm_cli_client.py

@@ -1,14 +1,14 @@
 from trailblazer.apps.slurm.api import get_slurm_queue
 from trailblazer.apps.slurm.models import SqueueResult, SqueueJob
 from trailblazer.clients.slurm_cli_client.utils import create_job_info_dto
-from trailblazer.services.slurm.dtos import JobInfoDto
+from trailblazer.services.slurm.dtos import SlurmJobInfo
 
 
 class SlurmCLIClient:
     def __init__(self, host: str):
         self.host = host
 
-    def get_job(self, job_id: str) -> JobInfoDto:
+    def get_job_info(self, job_id: str) -> SlurmJobInfo:
         queue: SqueueResult = get_slurm_queue(job_ids=[job_id], analysis_host=self.host)
         job: SqueueJob = queue.jobs[0]
         return create_job_info_dto(job)

trailblazer/clients/slurm_cli_client/utils.py

@@ -1,9 +1,9 @@
 from trailblazer.apps.slurm.models import SqueueJob
-from trailblazer.services.slurm.dtos import JobInfoDto
+from trailblazer.services.slurm.dtos import SlurmJobInfo
 
 
-def create_job_info_dto(job: SqueueJob) -> JobInfoDto:
-    return JobInfoDto(
+def create_job_info_dto(job: SqueueJob) -> SlurmJobInfo:
+    return SlurmJobInfo(
         job_name=job.step,
         slurm_id=job.id,
         status=job.status,

trailblazer/services/job_service.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
 from trailblazer.dto import CreateJobRequest, FailedJobsRequest, FailedJobsResponse, JobResponse
-from trailblazer.services.slurm.dtos import JobInfoDto
+from trailblazer.services.slurm.dtos import SlurmJobInfo
 from trailblazer.services.slurm.slurm_service import SlurmService
 from trailblazer.services.utils import create_job_response, create_failed_jobs_response
 from trailblazer.store.models import Job
@@ -26,5 +26,5 @@ def add_job(self, analysis_id: int, data: CreateJobRequest) -> JobResponse:
     def update_upload_jobs(self) -> None:
         jobs: list[Job] = self.store.get_ongoing_upload_jobs()
         for job in jobs:
-            updated_job: JobInfoDto = self.slurm_service.get_job_info(job.slurm_id)
+            updated_job: SlurmJobInfo = self.slurm_service.get_job_info(job.slurm_id)
             self.store.update_job(job_id=job.id, job_data=updated_job)

trailblazer/services/slurm/dtos.py

@@ -1,7 +1,7 @@
 from pydantic import BaseModel
 
 
-class JobInfoDto(BaseModel):
+class SlurmJobInfo(BaseModel):
     slurm_id: int
     name: str
     status: str

trailblazer/services/slurm/slurm_cli_service/slurm_cli_service.py

@@ -1,11 +1,11 @@
 from trailblazer.clients.slurm_cli_client.slurm_cli_client import SlurmCLIClient
-from trailblazer.services.slurm.dtos import JobInfoDto
+from trailblazer.services.slurm.dtos import SlurmJobInfo
 from trailblazer.services.slurm.slurm_service import SlurmService
 
 
 class SlurmCLIService(SlurmService):
     def __init__(self, client: SlurmCLIClient):
         self.client = client
 
-    def get_job_info(self, job_id: str) -> JobInfoDto:
-        return self.client.get_job(job_id)
+    def get_job_info(self, job_id: str) -> SlurmJobInfo:
+        return self.client.get_job_info(job_id)

trailblazer/services/slurm/slurm_service.py

@@ -1,9 +1,9 @@
 from abc import ABC, abstractmethod
 
-from trailblazer.services.slurm.dtos import JobInfoDto
+from trailblazer.services.slurm.dtos import SlurmJobInfo
 
 
 class SlurmService(ABC):
     @abstractmethod
-    def get_job_info(self, job_id: str) -> JobInfoDto:
+    def get_job_info(self, job_id: str) -> SlurmJobInfo:
         pass

trailblazer/store/crud/update.py

@@ -18,7 +18,7 @@
 from trailblazer.store.base import BaseHandler
 from trailblazer.store.database import get_session
 from trailblazer.store.models import Analysis, Job, User
-from trailblazer.services.slurm.dtos import JobInfoDto
+from trailblazer.services.slurm.dtos import SlurmJobInfo
 
 LOG = logging.getLogger(__name__)
 
@@ -262,7 +262,7 @@ def update_analysis(
 
         return analysis
 
-    def update_job(self, job_id: int, job_data: JobInfoDto) -> Job:
+    def update_job(self, job_id: int, job_data: SlurmJobInfo) -> Job:
         job: Job | None = self.get_job_by_id(job_id)
         job.name = job_data.name
         job.status = job_data.status