MRG: Merge pull request #680 from octue/check-for-service-revision-ex…

…istence Check for service revision existence
octue · Aug 27, 2024 · d948b8f · d948b8f
2 parents f1bce70 + acd16c2
commit d948b8f
Show file tree

Hide file tree

Showing 11 changed files with 273 additions and 149 deletions.
diff --git a/docs/source/inter_service_compatibility.rst b/docs/source/inter_service_compatibility.rst
diff --git a/octue/cloud/pub_sub/service.py b/octue/cloud/pub_sub/service.py
@@ -118,7 +118,9 @@ def services_topic(self):
         topic = Topic(name=OCTUE_SERVICES_PREFIX, project_name=self.backend.project_name)
 
         if not topic.exists():
-            raise octue.exceptions.ServiceNotFound(f"{topic!r} cannot be found.")
+            raise octue.exceptions.ServiceNotFound(
+                f"The {topic!r} topic cannot be found. Check that it's been created for this service network."
+            )
 
         return topic
 
@@ -147,7 +149,7 @@ def serve(self, timeout=None, delete_topic_and_subscription_on_exit=False, allow
         logger.info("Starting %r.", self)
 
         subscription = Subscription(
-            name=".".join((OCTUE_SERVICES_PREFIX, self._pub_sub_id)),
+            name=self._pub_sub_id,
             topic=self.services_topic,
             filter=f'attributes.recipient = "{self.id}" AND attributes.sender_type = "{PARENT_SENDER_TYPE}"',
             expiration_time=None,
@@ -328,6 +330,8 @@ def ask(
         """
         service_namespace, service_name, service_revision_tag = split_service_id(service_id)
 
+        # If using a service registry, check that the service revision is registered, or get the default service
+        # revision if no revision tag is provided.
         if self.service_registries:
             if service_revision_tag:
                 raise_if_revision_not_registered(sruid=service_id, service_registries=self.service_registries)
@@ -338,7 +342,17 @@ def ask(
                     service_registries=self.service_registries,
                 )
 
-        elif not service_revision_tag:
+        # If not using a service registry, check that the service revision exists by checking for its subscription.
+        elif service_revision_tag:
+            service_revision_subscription = Subscription(
+                name=convert_service_id_to_pub_sub_form(service_id),
+                topic=self.services_topic,
+            )
+
+            if not service_revision_subscription.exists():
+                raise octue.exceptions.ServiceNotFound(f"Service revision {service_id!r} not found.")
+
+        else:
             raise octue.exceptions.InvalidServiceID(
                 f"A service revision tag for {service_id!r} must be provided if service registries aren't being used."
             )
@@ -362,10 +376,8 @@ def ask(
         if asynchronous and not push_endpoint:
             answer_subscription = None
         else:
-            pub_sub_id = convert_service_id_to_pub_sub_form(self.id)
-
             answer_subscription = Subscription(
-                name=".".join((OCTUE_SERVICES_PREFIX, pub_sub_id, ANSWERS_NAMESPACE, question_uuid)),
+                name=".".join((self._pub_sub_id, ANSWERS_NAMESPACE, question_uuid)),
                 topic=self.services_topic,
                 filter=(
                     f'attributes.recipient = "{self.id}" '

diff --git a/octue/configuration.py b/octue/configuration.py
@@ -119,7 +119,7 @@ def __init__(
         configuration_manifest=None,
         children=None,
         output_location=None,
-        use_signed_urls_for_output_datasets=True,
+        use_signed_urls_for_output_datasets=False,
         **kwargs,
     ):
         self.configuration_values = configuration_values