Skip to content

Commit dfa3828

Browse files
remove default value for generate_embeddings in pluggy plugin (#2821)
* removing default for generate_embeddings pluggy argument * fixing test * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * None to False * Revert "None to False" This reverts commit c60a432. * None to False * Revert "None to False" This reverts commit 3d7fdea. * None to False --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent adbfb5f commit dfa3828

File tree

10 files changed

+22
-11
lines changed

10 files changed

+22
-11
lines changed

channels/plugins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def offeror_delete(self, offeror):
165165
offeror.delete()
166166

167167
@hookimpl
168-
def resource_upserted(self, resource, percolate, *, generate_embeddings=True): # noqa: ARG002
168+
def resource_upserted(self, resource, percolate, generate_embeddings): # noqa: ARG002
169169
"""
170170
Publish channels for the resource's topics
171171
"""

channels/plugins_test.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,9 @@ def test_resource_upserted():
216216
resource = LearningResourceFactory.create(
217217
topics=[channel1.topic_detail.topic, channel2.topic_detail.topic]
218218
)
219-
ChannelPlugin().resource_upserted(resource, None)
220-
219+
ChannelPlugin().resource_upserted(
220+
resource, percolate=False, generate_embeddings=False
221+
)
221222
channel1.refresh_from_db()
222223
channel2.refresh_from_db()
223224
channel3.refresh_from_db()

learning_resources/etl/loaders.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ def update_index(learning_resource, newly_created):
8080
):
8181
resource_unpublished_actions(learning_resource)
8282
elif learning_resource.published:
83-
resource_upserted_actions(learning_resource, percolate=False)
83+
resource_upserted_actions(
84+
learning_resource, percolate=False, generate_embeddings=True
85+
)
8486

8587

8688
def load_topics(resource, topics_data):

learning_resources/hooks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def percolate_query_delete(self, percolate_query):
2929
"""Trigger actions after a percolate query is deleted"""
3030

3131
@hookspec
32-
def resource_upserted(self, resource, percolate, *, generate_embeddings=True):
32+
def resource_upserted(self, resource, percolate, generate_embeddings):
3333
"""Trigger actions after a learning resource is created or updated"""
3434

3535
@hookspec

learning_resources/tasks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ def update_next_start_date_and_prices():
8181
for resource in resources:
8282
load_run_dependent_values(resource)
8383
if resource.published:
84-
resource_upserted_actions(resource, percolate=False)
84+
resource_upserted_actions(
85+
resource, percolate=False, generate_embeddings=True
86+
)
8587
clear_views_cache()
8688
return len(resources)
8789

learning_resources/tasks_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,9 @@ def test_update_next_start_date(mocker, published):
492492
update_next_start_date_and_prices()
493493
mock_load_next_start_date.assert_called_once_with(learning_resource)
494494
if published:
495-
mock_upsert_index.assert_called_once_with(learning_resource, percolate=False)
495+
mock_upsert_index.assert_called_once_with(
496+
learning_resource, percolate=False, generate_embeddings=True
497+
)
496498
else:
497499
mock_upsert_index.assert_not_called()
498500

learning_resources/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def get_ocw_topics(topics_collection):
273273

274274

275275
def resource_upserted_actions(
276-
resource: LearningResource, percolate, *, generate_embeddings=True
276+
resource: LearningResource, percolate, generate_embeddings
277277
):
278278
"""
279279
Trigger plugins when a LearningResource is created or updated

learning_resources/utils_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,9 @@ def test_resource_upserted_actions(mock_plugin_manager, fixture_resource):
243243
"""
244244
resource_upserted_actions function should trigger plugin hook's resource_upserted function
245245
"""
246-
utils.resource_upserted_actions(fixture_resource, percolate=False)
246+
utils.resource_upserted_actions(
247+
fixture_resource, percolate=False, generate_embeddings=True
248+
)
247249
mock_plugin_manager.hook.resource_upserted.assert_called_once_with(
248250
resource=fixture_resource, percolate=False, generate_embeddings=True
249251
)

learning_resources_search/plugins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def document_percolated(self, resource, percolated_queries):
6363
log.debug("document %i percolated - %s", resource.id, list(percolated_queries))
6464

6565
@hookimpl
66-
def resource_upserted(self, resource, percolate, *, generate_embeddings=True):
66+
def resource_upserted(self, resource, percolate, generate_embeddings):
6767
"""
6868
Upsert a created/modified resource to the search index
6969

learning_resources_search/plugins_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ def test_search_index_plugin_resource_upserted(
6060
):
6161
"""The plugin function should upsert a resource to the search index"""
6262
resource = LearningResourceFactory.create(resource_type=resource_type)
63-
SearchIndexPlugin().resource_upserted(resource, percolate=False)
63+
SearchIndexPlugin().resource_upserted(
64+
resource, percolate=False, generate_embeddings=False
65+
)
6466

6567
mock_search_index_helpers.mock_upsert_learning_resource_immutable_signature.assert_called_once_with(
6668
resource.id

0 commit comments

Comments
 (0)