fixup! [a] Add mirror URI to service /index/file response (#7624)

Author: nadove-ucsc

src/azul/service/__init__.py

@@ -36,7 +36,6 @@
 )
 from azul.plugins import (
     FieldName,
-    File,
     MetadataPlugin,
 )
 from azul.types import (
@@ -434,8 +433,3 @@ def __call__(self,
                  fetch: bool = True,
                  **params: str
                  ) -> mutable_furl: ...
-
-
-class FileMirrorUriFunc(Protocol):
-
-    def __call__(self, file: File) -> str: ...

src/azul/service/repository_controller.py

@@ -105,7 +105,6 @@ def search(self,
             response = self.service.search(catalog=catalog,
                                            entity_type=entity_type,
                                            file_url_func=self.file_url_func,
-                                           file_mirror_uri_func=self.mirror_service(catalog).mirror_uri,
                                            item_id=item_id,
                                            filters=filters,
                                            pagination=pagination)

src/azul/service/repository_service.py

@@ -46,7 +46,6 @@
 )
 from azul.service import (
     BadArgumentException,
-    FileMirrorUriFunc,
     FileUrlFunc,
     Filters,
 )
@@ -80,8 +79,8 @@ def __init__(self, entity_type: str, entity_id: str):
 @attrs.frozen(auto_attribs=True, kw_only=True)
 class SearchResponseStage(_ElasticsearchStage[ResponseTriple, MutableJSON],
                           metaclass=ABCMeta):
+    service: 'RepositoryService'
     file_url_func: FileUrlFunc
-    file_mirror_uri_func: FileMirrorUriFunc
 
     def prepare_request(self, request: Search) -> Search:
         return request
@@ -105,7 +104,7 @@ def _file_url(self, *, uuid: str, version: str, drs_uri: str | None) -> str | No
     def _file_mirror_uri(self, file: JSON) -> str | None:
         file = self.plugin.file_class.from_index(file)
         if BaseMirrorService.may_mirror(self.catalog, file.size):
-            return self.file_mirror_uri_func(file)
+            return self.service.mirror_service(self.catalog).mirror_uri(file)
         else:
             return None
 
@@ -133,7 +132,6 @@ def search(self,
                catalog: CatalogName,
                entity_type: str,
                file_url_func: FileUrlFunc,
-               file_mirror_uri_func: FileMirrorUriFunc,
                item_id: str | None,
                filters: Filters,
                pagination: Pagination
@@ -148,8 +146,6 @@ def search(self,
         :param file_url_func: A function that is used only when getting a *list* of files data.
         It creates the files URL based on info from the request. It should have the type
         signature `(uuid: str, **params) -> str`
-        :param file_mirror_uri_func: Like `file_url_func`, but creates URIs to
-        where the files are mirrored. It should have the type signature `(File) -> str`.
         :return: The Elasticsearch JSON response
         """
         if item_id is not None:
@@ -161,8 +157,7 @@ def search(self,
                                 pagination=pagination,
                                 aggregate=item_id is None,
                                 entity_type=entity_type,
-                                file_url_func=file_url_func,
-                                file_mirror_uri_func=file_mirror_uri_func)
+                                file_url_func=file_url_func)
 
         special_fields = self.metadata_plugin(catalog).special_fields
         for hit in response['hits']:
@@ -182,8 +177,7 @@ def _search(self,
                 aggregate: bool,
                 filters: Filters,
                 pagination: Pagination,
-                file_url_func: FileUrlFunc,
-                file_mirror_uri_func: FileMirrorUriFunc,
+                file_url_func: FileUrlFunc
                 ) -> MutableJSON:
         """
         This function does the whole transformation process. It takes the path
@@ -242,8 +236,7 @@ def _search(self,
         chain = response_stage_cls(service=self,
                                    catalog=catalog,
                                    entity_type=entity_type,
-                                   file_url_func=file_url_func,
-                                   file_mirror_uri_func=file_mirror_uri_func).wrap(chain)
+                                   file_url_func=file_url_func).wrap(chain)
 
         request = self.create_request(catalog, entity_type)
         request = chain.prepare_request(request)

test/service/test_response.py

@@ -142,11 +142,6 @@ def tearDownClass(cls):
     def file_url_func(self):
         return self._app.file_url
 
-    @property
-    def file_mirror_uri_func(self):
-        mirror_service = self._app.repository_controller.mirror_service(self.catalog)
-        return mirror_service.mirror_uri
-
     def _get_hits(self, entity_type: str, entity_id: str):
         """
         Fetches hits from ES instance searching for a particular entity ID
@@ -171,12 +166,15 @@ def _get_hits(self, entity_type: str, entity_id: str):
     def _index_service(self):
         return IndexService()
 
+    @property
+    def _repository_service(self):
+        return self._app.repository_controller.service
+
     def _response_stage(self, entity_type: str) -> HCASearchResponseStage:
-        return HCASearchResponseStage(service=self.index_service,
+        return HCASearchResponseStage(service=self._repository_service,
                                       entity_type=entity_type,
                                       catalog=self.catalog,
-                                      file_url_func=self.file_url_func,
-                                      file_mirror_uri_func=self.file_mirror_uri_func)
+                                      file_url_func=self.file_url_func)
 
     @property
     def paginations(self):