Merge branch 'WS-651-catch-and-save-RH-CARTA-event' of...

Merge branch 'WS-651-catch-and-save-RH-CARTA-event' of https://gitlab.nrao.edu/ssa/workspaces into WS-651-catch-and-save-RH-CARTA-event

shared/workspaces/workspaces/capability/services/capability_info.py

@@ -5,6 +5,8 @@ import sys
 from datetime import datetime
 from typing import Dict, List
 
+# pylint: disable=C0103, C0301, C0303, E0401, R0205, R0903, R0904, R0913, W1203
+
 from sqlalchemy import desc, text
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import Session
@@ -26,8 +28,6 @@ from workspaces.capability.schema_interfaces import (
 from workspaces.capability.services.interfaces import CapabilityInfoIF, QueueReport
 from workspaces.products.schema_interfaces import FutureProductIF
 
-# pylint: disable=E0401, R0205, R0903
-
 
 Base = declarative_base()
 

shared/workspaces/workspaces/capability/services/capability_service.py

@@ -41,11 +41,15 @@ class CapabilityService(CapabilityServiceIF):
         self.messenger = MessageSender("capability")
         self.router = Router("capability")
         self.router.register(self)
-        self.execution_manager = ExecutionManager(capability_info, workflow_service, self.router, self.messenger)
+        self.execution_manager = ExecutionManager(
+            capability_info, workflow_service, self.router, self.messenger
+        )
         self.capability_info = capability_info
         self.notify = notification_service
 
-    def create_new_version(self, capability_request_id: int, parameters: List[Parameter] = None) -> CapabilityVersionIF:
+    def create_new_version(
+        self, capability_request_id: int, parameters: List[Parameter] = None
+    ) -> CapabilityVersionIF:
         logger.info(f"Creating new version of Capability Request #{capability_request_id}")
         return self.capability_info.create_capability_version(capability_request_id, parameters)
 
@@ -54,13 +58,15 @@ class CapabilityService(CapabilityServiceIF):
         logger.info(f"RECEIVED EXECUTION-COMPLETE: {message}")
 
         execution = message["subject"]
-        capability_request = self.capability_info.lookup_capability_request(execution["capability_request_id"])
+        capability_request = self.capability_info.lookup_capability_request(
+            execution["capability_request_id"]
+        )
         capability_request.state = CapabilityRequestState.Complete.name
         self.capability_info.save_entity(capability_request)
 
-        capability_complete_msg = CapabilityMessageArchitect(request=capability_request).compose_message(
-            "capability_complete"
-        )
+        capability_complete_msg = CapabilityMessageArchitect(
+            request=capability_request
+        ).compose_message("capability_complete")
         self.messenger.send_message(**capability_complete_msg)
 
     @on_message(type="execution-failed")
@@ -68,13 +74,15 @@ class CapabilityService(CapabilityServiceIF):
         logger.info(f"RECEIVED EXECUTION-FAILED: {message}")
 
         execution = message["subject"]
-        capability_request = self.capability_info.lookup_capability_request(execution["capability_request_id"])
+        capability_request = self.capability_info.lookup_capability_request(
+            execution["capability_request_id"]
+        )
         capability_request.state = CapabilityRequestState.Failed.name
         self.capability_info.save_entity(capability_request)
 
-        capability_failed_msg = CapabilityMessageArchitect(request=capability_request).compose_message(
-            "capability_failed"
-        )
+        capability_failed_msg = CapabilityMessageArchitect(
+            request=capability_request
+        ).compose_message("capability_failed")
         self.messenger.send_message(**capability_failed_msg)
 
     @on_message(service="workflow", type="delivery")
@@ -131,7 +139,9 @@ class CapabilityService(CapabilityServiceIF):
         logger.info(f"RECEIVED CAPABILITY MESSAGE: {message}")
 
         subject = message["subject"]
-        execution = self.capability_info.lookup_execution_by_workflow_request_id(subject["workflow_request_id"])
+        execution = self.capability_info.lookup_execution_by_workflow_request_id(
+            subject["workflow_request_id"]
+        )
         self.notify.notify_qa_ready(execution.capability_request)
 
     @on_message(service="workflow", type="ingestion-complete")

shared/workspaces/workspaces/capability/services/interfaces.py

@@ -13,6 +13,8 @@ from workspaces.capability.schema_interfaces import (
 from workspaces.products.schema_interfaces import FutureProductIF
 from workspaces.system.schema import AbstractFile
 
+# pylint: disable=C0116, R0903
+
 CapabilityName = str
 
 
@@ -84,13 +86,11 @@ class CapabilityQueueManagerIF(ABC):
         """
         Notifies the queue manager that something new is requesting execution.
         """
-        pass
 
     def execution_complete(self):
         """
         Notifies the queue manager that something has finished executing.
         """
-        pass
 
     def reconfigure(self):
         """
@@ -173,10 +173,6 @@ class CapabilityInfoIF(QueueReporterIF, metaclass=ABCMeta):
     def lookup_execution(self, execution_id: int) -> CapabilityExecutionIF:
         raise NotImplementedError
 
-    @abstractmethod
-    def lookup_execution_by_workflow_request_id(self, workflow_request_id: int) -> CapabilityExecutionIF:
-        raise NotImplementedError
-
     @abstractmethod
     def save_execution(self, execution: CapabilityExecutionIF):
         pass
@@ -210,7 +206,5 @@ class CapabilityQueueIF(ABC):
 
 class CapabilityServiceIF(ABC):
     """
-    The capability service: clients access this to request capability runs
+    The capability service: clients access this to request capability runs.
     """
-
-    pass