clean up inconsistent singleton stuff

Author: monneyboi

poliloom/poliloom/enrichment.py

@@ -345,7 +345,6 @@ async def extract_two_stage_generic(
     content: str,
     politician: Politician,
     config: TwoStageExtractionConfig,
-    search_service: Optional[SearchService] = None,
 ) -> Optional[List[Any]]:
     """Generic two-stage extraction (free-form -> mapping).
 
@@ -355,11 +354,8 @@ async def extract_two_stage_generic(
         content: Text content to extract from
         politician: Politician being enriched
         config: Extraction configuration
-        search_service: SearchService for entity lookup (creates new instance if not provided)
     """
-    # Use provided search service or create new instance
-    if search_service is None:
-        search_service = SearchService()
+    search_service = SearchService()
 
     try:
         # Stage 1: Free-form extraction

poliloom/poliloom/importer/politician.py

@@ -212,7 +212,8 @@ def _insert_politicians_batch(
     session.commit()
 
     # Index to Meilisearch after successful DB commit
-    search_service.index_documents(search_documents)
+    if search_documents:
+        search_service.index_documents(search_documents)
 
     logger.debug(f"Processed {len(politicians)} politicians (upserted)")
 

poliloom/tests/test_enrichment.py

@@ -237,16 +237,12 @@ async def mock_parse(*args, **kwargs):
 
         mock_openai_client.responses.parse = mock_parse
 
-        # Search service is passed but find_similar is mocked globally
-        mock_search_service = Mock()
-
         birthplaces = await extract_two_stage_generic(
             mock_openai_client,
             db_session,
             "test content",
             sample_politician,
             BIRTHPLACES_CONFIG,
-            search_service=mock_search_service,
         )
 
         assert birthplaces is not None

poliloom/tests/test_entity_importer.py

@@ -534,10 +534,10 @@ def test_insert_empty_batch_does_not_call_index(
         # index_documents should not be called for empty batch
         mock_search_service.index_documents.assert_not_called()
 
-    def test_insert_entities_without_labels_indexes_empty_labels(
+    def test_insert_entities_without_labels_does_not_index(
         self, db_session, mock_search_service
     ):
-        """Test that entities without labels are indexed with empty labels list."""
+        """Test that entities without labels are not indexed."""
         locations = [
             {
                 "wikidata_id": "Q1",
@@ -553,10 +553,8 @@ def test_insert_entities_without_labels_indexes_empty_labels(
 
         collection.insert(db_session, mock_search_service)
 
-        # Should still call index_documents
-        mock_search_service.index_documents.assert_called_once()
-        call_args = mock_search_service.index_documents.call_args[0][0]
-        assert call_args[0]["labels"] == []
+        # index_documents should not be called when no entities have labels
+        mock_search_service.index_documents.assert_not_called()
 
 
 class TestWikipediaProjectFiltering:

poliloom/tests/test_politician_importer.py

@@ -482,10 +482,10 @@ def test_insert_politicians_empty_batch_does_not_call_index(
         # index_documents should not be called for empty batch
         mock_search_service.index_documents.assert_not_called()
 
-    def test_insert_politicians_without_labels_indexes_empty_labels(
+    def test_insert_politicians_without_labels_does_not_index(
         self, db_session, mock_search_service
     ):
-        """Test that politicians without labels are indexed with empty labels list."""
+        """Test that politicians without labels are not indexed."""
         politicians = [
             {
                 "wikidata_id": "Q1",
@@ -498,12 +498,8 @@ def test_insert_politicians_without_labels_indexes_empty_labels(
 
         _insert_politicians_batch(politicians, db_session, mock_search_service)
 
-        # Should still call index_documents
-        mock_search_service.index_documents.assert_called_once()
-        call_args = mock_search_service.index_documents.call_args[0][0]
-        assert call_args[0]["id"] == "Q1"
-        assert call_args[0]["type"] == "politicians"
-        assert call_args[0]["labels"] == []
+        # index_documents should not be called when no entities have labels
+        mock_search_service.index_documents.assert_not_called()
 
 
 class TestIsPolitician: