Merge branch 'hotfix/26.6.2'

Author: adlius

admin/preprints/views.py

@@ -50,7 +50,7 @@
 )
 from osf.utils.workflows import DefaultStates
 from osf.utils.permissions import API_CONTRIBUTOR_PERMISSIONS
-from website import search
+from website.search import search
 from website.files.utils import copy_files
 from website.preprints.tasks import on_preprint_updated
 
@@ -256,7 +256,7 @@ class PreprintReindexElastic(PreprintMixin, View):
 
     def post(self, request, *args, **kwargs):
         preprint = self.get_object()
-        search.search.update_preprint(preprint, bulk=False, async_update=False)
+        search.update_preprint(preprint, bulk=False, async_update=False)
         update_admin_log(
             user_id=self.request.user.id,
             object_id=preprint._id,

admin/users/views.py

@@ -25,7 +25,7 @@
 from framework.auth.core import generate_verification_key
 from osf.models.institution import Institution
 
-from website import search
+from website.search import search
 from website.settings import EXTERNAL_IDENTITY_PROFILE
 
 from osf.models.admin_log_entry import (
@@ -563,7 +563,7 @@ class UserReindexElastic(UserMixin, View):
 
     def post(self, request, *args, **kwargs):
         user = self.get_object()
-        search.search.update_user(user, async_update=False)
+        search.update_user(user, async_update=False)
         update_admin_log(
             user_id=self.request.user.id,
             object_id=user._id,

osf/models/collection.py

@@ -122,10 +122,10 @@ def linked_registrations_related_url(self):
 
     @classmethod
     def bulk_update_search(cls, collection_submissions, op='update', index=None):
-        from website import search
+        from website.search import search, exceptions
         try:
-            search.search.bulk_update_collection_submissions(collection_submissions, op=op, index=index)
-        except search.exceptions.SearchUnavailableError as e:
+            search.bulk_update_collection_submissions(collection_submissions, op=op, index=index)
+        except exceptions.SearchUnavailableError as e:
             logger.exception(e)
 
     def save(self, *args, **kwargs):

osf/models/node.py

@@ -725,31 +725,31 @@ def bulk_update_search(cls, nodes, index=None):
         from api.share.utils import update_share
         for _node in nodes:
             update_share(_node)
-        from website import search
+        from website.search import search, exceptions
         try:
-            serialize = functools.partial(search.search.update_node, index=index, bulk=True, async_update=False)
-            search.search.bulk_update_nodes(serialize, nodes, index=index)
-        except search.exceptions.SearchUnavailableError as e:
+            serialize = functools.partial(search.update_node, index=index, bulk=True, async_update=False)
+            search.bulk_update_nodes(serialize, nodes, index=index)
+        except exceptions.SearchUnavailableError as e:
             logger.exception(e)
             log_exception(e)
 
     def update_search(self):
         from api.share.utils import update_share
         update_share(self)
-        from website import search
+        from website.search import search, exceptions
         try:
-            search.search.update_node(self, bulk=False, async_update=True)
+            search.update_node(self, bulk=False, async_update=True)
             if self.collection_submissions.exists() and self.is_public:
-                search.search.update_collected_metadata(self._id)
-        except search.exceptions.SearchUnavailableError as e:
+                search.update_collected_metadata(self._id)
+        except exceptions.SearchUnavailableError as e:
             logger.exception(e)
             log_exception(e)
 
     def delete_search_entry(self):
-        from website import search
+        from website.search import search, exceptions
         try:
-            search.search.delete_node(self)
-        except search.exceptions.SearchUnavailableError as e:
+            search.delete_node(self)
+        except exceptions.SearchUnavailableError as e:
             logger.exception(e)
             log_exception(e)
 

osf/models/preprint.py

@@ -1297,22 +1297,22 @@ def bulk_update_search(cls, preprints, index=None):
         for _preprint in preprints:
             if _preprint.is_latest_version:
                 update_share(_preprint)
-        from website import search
+        from website.search import search, exceptions
         try:
-            serialize = functools.partial(search.search.update_preprint, index=index, bulk=True, async_update=False)
-            search.search.bulk_update_nodes(serialize, preprints, index=index)
-        except search.exceptions.SearchUnavailableError as e:
+            serialize = functools.partial(search.update_preprint, index=index, bulk=True, async_update=False)
+            search.bulk_update_nodes(serialize, preprints, index=index)
+        except exceptions.SearchUnavailableError as e:
             logger.exception(e)
             log_exception(e)
 
     def update_search(self):
         # Only update share if the preprint is the latest version (i.e. has `guids`)
         if self.is_latest_version:
             update_share(self)
-        from website import search
+        from website.search import search, exceptions
         try:
-            search.search.update_preprint(self, bulk=False, async_update=True)
-        except search.exceptions.SearchUnavailableError as e:
+            search.update_preprint(self, bulk=False, async_update=True)
+        except exceptions.SearchUnavailableError as e:
             logger.exception(e)
             log_exception(e)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OSF",
-  "version": "26.6.0",
+  "version": "26.6.2",
   "description": "Facilitating Open Science",
   "repository": "https://github.com/CenterForOpenScience/osf.io",
   "author": "Center for Open Science",

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "osf-io"
-version = "26.6.0"
+version = "26.6.2"
 description = "The code for [https://osf.io](https://osf.io)."
 authors = ["Your Name <you@example.com>"]
 license = "Apache License 2.0"