remove elasticsearch api and dependencies

gip-inclusion · Dec 5, 2024 · 51bcff5 · 51bcff5
1 parent 53868ab
commit 51bcff5
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 1,209 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -955,14 +955,3 @@
 OPENAI_API_BASE = env.str("OPENAI_API_BASE", "")
 OPENAI_API_KEY = env.str("OPENAI_API_KEY", "")
 OPENAI_MODEL = env.str("OPENAI_MODEL", "")
-
-
-# ELASTICSEARCH
-# ------------------------------------------------------------------------------
-ELASTICSEARCH_SCHEME = env.str("ELASTICSEARCH_SCHEME", "https")
-ELASTICSEARCH_HOST = env.str("ELASTICSEARCH_HOST", "")
-ELASTICSEARCH_PORT = env.str("ELASTICSEARCH_PORT", "443")
-ELASTICSEARCH_USERNAME = env.str("ELASTICSEARCH_USERNAME", "")
-ELASTICSEARCH_PASSWORD = env.str("ELASTICSEARCH_PASSWORD", "")
-ELASTICSEARCH_INDEX_SIAES = env.str("ELASTICSEARCH_INDEX_SIAES", "")
-ELASTICSEARCH_MIN_SCORE = env.float("ELASTICSEARCH_MIN_SCORE", 0.9)
diff --git a/env.default.sh b/env.default.sh
@@ -29,10 +29,3 @@ export OPENAI_API_BASE=""
 export OPENAI_API_KEY=""
 export OPENAI_MODEL=""
 
-# ELASTICSEARCH
-# ########################
-export ELASTICSEARCH_HOST=
-export ELASTICSEARCH_USERNAME=
-export ELASTICSEARCH_PASSWORD=
-export ELASTICSEARCH_INDEX_SIAES=
-export ELASTICSEARCH_MIN_SCORE=
diff --git a/lemarche/siaes/management/commands/put_siaes_in_elasticsearch_index.py b/lemarche/siaes/management/commands/put_siaes_in_elasticsearch_index.py
diff --git a/lemarche/siaes/models.py b/lemarche/siaes/models.py
@@ -1192,41 +1192,6 @@ def latest_activity_at(self):
             latest_activity_at = self.updated_at
         return latest_activity_at
 
-    @property
-    def elasticsearch_index_text(self):
-        text = self.description
-        if self.offers.count() > 0:
-            offers = "\n\nPrestations:\n"
-            for offer in self.offers.all():
-                offers += f"- {offer.name}:\n{offer.description}\n\n"
-            text += offers
-        return text
-
-    @property
-    def elasticsearch_index_metadata(self):
-        metadata = {
-            "id": self.id,
-            "name": self.name,
-            "website": self.website if self.website else "",
-            "kind": self.kind,
-        }
-        if self.latitude and self.longitude:
-            metadata["geo_location"] = {
-                "lat": self.latitude,
-                "lon": self.longitude,
-            }
-
-        if self.geo_range == siae_constants.GEO_RANGE_COUNTRY:
-            metadata["geo_country"] = True
-        elif self.geo_range == siae_constants.GEO_RANGE_REGION:
-            metadata["geo_reg"] = self.region
-        elif self.geo_range == siae_constants.GEO_RANGE_DEPARTMENT:
-            metadata["geo_dep"] = self.department
-        elif self.geo_range == siae_constants.GEO_RANGE_CUSTOM:
-            metadata["geo_dist"] = self.geo_range_custom_distance
-
-        return metadata
-
     def sector_groups_list_string(self, display_max=3):
         # Retrieve sectors from activities instead of directly from the sectors field
         sectors_name_list = set(self.activities.values_list("sector_group__name", flat=True))

diff --git a/lemarche/static/js/utils.js b/lemarche/static/js/utils.js
@@ -22,10 +22,6 @@ window.addEventListener('DOMContentLoaded', function () {
 
     initModalMessages();
 
-    // reload click events and tooltip after htmx content loading as in semantic search
-    document.addEventListener('htmx:afterSwap', function (event) {
-        initSuperBadges();
-    });
     initSuperBadges();
 
     // some elements have their url in data-url attribute

diff --git a/lemarche/tenders/tests/test_models.py b/lemarche/tenders/tests/test_models.py
@@ -1,8 +1,6 @@
-# import datetime
 from datetime import timedelta
 from importlib import import_module
 from random import randint
-from unittest import mock
 
 from django.apps import apps
 from django.contrib.gis.geos import Point
@@ -218,22 +216,17 @@ def setUpTestData(cls):
         cls.siae_five = SiaeFactory()
 
     def test_set_siae_found_list(self):
-        with mock.patch(
-            "lemarche.tenders.models.api_elasticsearch.siaes_similarity_search"
-        ) as mock_siaes_similarity_search:
-            tender = TenderFactory(
-                presta_type=[siae_constants.PRESTA_BUILD],
-                sectors=[self.sector],
-                is_country_area=True,
-                validated_at=None,
-            )
-
-            siaes_found = Siae.objects.filter_with_tender_through_activities(tender)
-            tender.set_siae_found_list()
-            tender.refresh_from_db()
-            self.assertEqual(list(siaes_found), list(tender.siaes.all()))
-
-        mock_siaes_similarity_search.assert_not_called()
+        tender = TenderFactory(
+            presta_type=[siae_constants.PRESTA_BUILD],
+            sectors=[self.sector],
+            is_country_area=True,
+            validated_at=None,
+        )
+
+        siaes_found = Siae.objects.filter_with_tender_through_activities(tender)
+        tender.set_siae_found_list()
+        tender.refresh_from_db()
+        self.assertEqual(list(siaes_found), list(tender.siaes.all()))
 
 
 class TenderModelQuerysetTest(TestCase):

diff --git a/lemarche/utils/apis/api_elasticsearch.py b/lemarche/utils/apis/api_elasticsearch.py