fix: merging changes from upstream PR

open-craft · Mar 19, 2024 · d426306 · d426306
1 parent 282cc05
commit d426306
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/openedx/core/djangoapps/content/search/api.py b/openedx/core/djangoapps/content/search/api.py
@@ -88,8 +88,8 @@ def _get_meilisearch_client():
         return _MEILI_CLIENT
 
     # Connect to Meilisearch
-    if not settings.MEILISEARCH_URL:
-        raise RuntimeError("MEILISEARCH_URL is not set - search functionality disabled.")
+    if not settings.MEILISEARCH_ENABLED:
+        raise RuntimeError("MEILISEARCH_ENABLED is not set - search functionality disabled.")
 
     _MEILI_CLIENT = meilisearch.Client(settings.MEILISEARCH_URL, settings.MEILISEARCH_API_KEY)
     try:
@@ -252,8 +252,9 @@ def nop(_message):
                 doc = searchable_doc_for_library_block(metadata)
                 docs.append(doc)
                 num_blocks_done += 1
-            # Add all the docs in this library at once (usually faster than adding one at a time):
-            _wait_for_meili_task(client.index(temp_index_name).add_documents(docs))
+            if docs:
+                # Add all the docs in this library at once (usually faster than adding one at a time):
+                _wait_for_meili_task(client.index(temp_index_name).add_documents(docs))
             num_contexts_done += 1
 
         ############## Courses ##############
@@ -272,8 +273,9 @@ def add_with_children(block):
 
             _recurse_children(course, add_with_children)
 
-            # Add all the docs in this course at once (usually faster than adding one at a time):
-            _wait_for_meili_task(client.index(temp_index_name).add_documents(docs))
+            if docs:
+                # Add all the docs in this course at once (usually faster than adding one at a time):
+                _wait_for_meili_task(client.index(temp_index_name).add_documents(docs))
             num_contexts_done += 1
             num_blocks_done += len(docs)
 

diff --git a/openedx/core/djangoapps/content/search/documents.py b/openedx/core/djangoapps/content/search/documents.py
@@ -81,7 +81,7 @@ class implementation returns only:
         {"content": {"display_name": "..."}, "content_type": "..."}
     """
     block_data = {
-        Fields.id: _meili_id_from_opaque_key(block.usage_key),
+        Fields.id: meili_id_from_opaque_key(block.usage_key),
         Fields.usage_key: str(block.usage_key),
         Fields.block_id: str(block.usage_key.block_id),
         Fields.display_name: xblock_api.get_block_display_name(block),