From 66fb0a6645c4c98c0bc3bebef8a20e75e04c34fe Mon Sep 17 00:00:00 2001
From: "Janet L. Goldstein" <jgoldste@nrao.edu>
Date: Thu, 16 Sep 2021 08:17:24 -0600
Subject: [PATCH] WS-651: lose unneeded methods; fix variable names; clarify
pydoc comments
---
.../workspaces/test/test_capability_service.py | 7 +++----
.../capability/services/capability_info.py | 10 ----------
.../capability/services/capability_service.py | 7 +++----
.../capability/services/interfaces.py | 17 +----------------
4 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/shared/workspaces/test/test_capability_service.py b/shared/workspaces/test/test_capability_service.py
index 041932fb8..4a76bb63c 100644
--- a/shared/workspaces/test/test_capability_service.py
+++ b/shared/workspaces/test/test_capability_service.py
@@ -6,10 +6,9 @@ from unittest.mock import patch
import pytest
-from workspaces.capability.schema import CapabilityExecution, CapabilityVersion
+from workspaces.capability.schema import CapabilityExecution
from workspaces.capability.services.capability_info import CapabilityInfo
from workspaces.capability.services.capability_service import CapabilityService
-from workspaces.workflow.schema import WorkflowRequest
pytest_plugins = ["testing.utils.conftest"]
@@ -18,7 +17,7 @@ pytest_plugins = ["testing.utils.conftest"]
class TestCapabilityService:
"""Tests for CapabilityService methods"""
- @pytest.mark.skip("Broken due to queue/messenger rework")
+ @pytest.mark.skip("Broken due to queue/messenger rework. Does work in local `make test`")
def test_on_ingestion_complete(
self,
mock_capability_service: CapabilityService,
@@ -43,7 +42,7 @@ class TestCapabilityService:
(request,) = mock_capability_info.save_entity.call_args.args
assert request.ingested is True
- @pytest.mark.skip("As above, broken due to queue/messenger rework?")
+ @pytest.mark.skip("As above, broken due to queue/messenger rework? Succeeds locally; fails on CI")
def test_on_carta_ready(
self,
mock_capability_service: CapabilityService,
diff --git a/shared/workspaces/workspaces/capability/services/capability_info.py b/shared/workspaces/workspaces/capability/services/capability_info.py
index 8d60da941..fb7fef6fc 100644
--- a/shared/workspaces/workspaces/capability/services/capability_info.py
+++ b/shared/workspaces/workspaces/capability/services/capability_info.py
@@ -196,16 +196,6 @@ class CapabilityInfo(CapabilityInfoIF):
"""
return self.session.query(CapabilityRequest).filter_by(id=request_id).first()
- def lookup_capability_request_version(self, request_id: int) -> CapabilityVersion:
- """
- Finds the capability request version with the provided request ID
-
- :param request_id: capability request ID of interest
-
- :return:
- """
- return self.session.query(CapabilityVersion).filter_by(capability_request_id=request_id).first()
-
def lookup_capability_execution(self, execution_id: int) -> CapabilityExecution:
"""
Finds the capability execution with the provided request ID
diff --git a/shared/workspaces/workspaces/capability/services/capability_service.py b/shared/workspaces/workspaces/capability/services/capability_service.py
index ff498e449..a7b492d76 100644
--- a/shared/workspaces/workspaces/capability/services/capability_service.py
+++ b/shared/workspaces/workspaces/capability/services/capability_service.py
@@ -152,7 +152,7 @@ class CapabilityService(CapabilityServiceIF):
self.capability_info.save_entity(request)
@on_message(type="carta-ready")
- def on_carta_ready(self, wf_request_id: int, **message: Dict[str, str]):
+ def on_carta_ready(self, cp_request_id: int, **message: Dict[str, str]):
"""
Catch the RH-flavored event and save it to the capability request version metadata
@@ -161,9 +161,8 @@ class CapabilityService(CapabilityServiceIF):
"""
logger.info(f"RECEIVED CARTA READY MESSAGE: {message}")
- execution = self.capability_info.lookup_execution_by_workflow_request_id(wf_request_id)
- request = execution.capability_request
- request_version = request.current_version
+ execution = self.capability_info.lookup_execution_by_workflow_request_id(cp_request_id)
+ request_version = execution.version
request_version.workflow_metadata = {"carta_url": message["carta_url"]}
self.capability_info.save_entity(request_version)
diff --git a/shared/workspaces/workspaces/capability/services/interfaces.py b/shared/workspaces/workspaces/capability/services/interfaces.py
index 57ad8c650..a83815b40 100644
--- a/shared/workspaces/workspaces/capability/services/interfaces.py
+++ b/shared/workspaces/workspaces/capability/services/interfaces.py
@@ -165,25 +165,10 @@ class CapabilityInfoIF(QueueReporterIF, metaclass=ABCMeta):
def lookup_capability(self, capability_name: str) -> CapabilityIF:
raise NotImplementedError
- @abstractmethod
- def lookup_capability_request(self, request_id) -> CapabilityRequestIF:
- raise NotImplementedError
-
-
- @abstractmethod
- def lookup_capability_request_version(self, request_id) -> CapabilityRequestIF:
- raise NotImplementedError
-
@abstractmethod
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
@@ -217,5 +202,5 @@ class CapabilityQueueIF(ABC):
class CapabilityServiceIF(ABC):
"""
- The capability service: clients access this to request capability runs. Just a phantom.
+ The capability service: clients access this to request capability runs.
"""
--
GitLab