richie 3.0.1.dev5__py2.py3-none-any.whl → 3.0.1.dev8__py2.py3-none-any.whl

richie/apps/search/__init__.py

@@ -1,17 +0,0 @@
-"""Define SearchConfig as the default app configuration."""
-
-from django.conf import settings
-
-from .elasticsearch import (
-    ElasticsearchClientCompat7to6,
-    ElasticsearchIndicesClientCompat7to6,
-)
-
-# pylint: disable=invalid-name
-default_app_config = "richie.apps.search.apps.SearchConfig"
-
-ES_CLIENT = ElasticsearchClientCompat7to6(
-    getattr(settings, "RICHIE_ES_HOST", ["elasticsearch"])
-)
-
-ES_INDICES_CLIENT = ElasticsearchIndicesClientCompat7to6(ES_CLIENT)

richie/apps/search/apps.py

@@ -1,6 +1,41 @@
 """Signals to update the Elasticsearch indices when page modifications are published."""
 
+# Define the global ES_CLIENT and ES_INDICES_CLIENT variables
+
 from django.apps import AppConfig
+from django.conf import settings
+
+from .elasticsearch import (
+    ElasticsearchClientCompat7to6,
+    ElasticsearchIndicesClientCompat7to6,
+)
+
+ES_CLIENT = None
+ES_INDICES_CLIENT = None
+
+
+def init_es():
+    """
+    Initialize the Elasticsearch client and indices client.
+    """
+    global ES_CLIENT  # pylint: disable=global-statement
+    ES_CLIENT = ElasticsearchClientCompat7to6(
+        getattr(settings, "RICHIE_ES_HOST", ["elasticsearch"]),
+        **getattr(settings, "RICHIE_ES_CLIENT_KWARGS", {}),
+    )
+    global ES_INDICES_CLIENT  # pylint: disable=global-statement
+    ES_INDICES_CLIENT = ElasticsearchIndicesClientCompat7to6(ES_CLIENT)
+
+
+# pylint: disable=import-outside-toplevel,cyclic-import
+def init_signals():
+    """Register signals to update the Elasticsearch indices."""
+    from cms.signals import post_publish, post_unpublish
+
+    from .signals import on_page_published, on_page_unpublished
+
+    post_publish.connect(on_page_published, dispatch_uid="search_post_publish")
+    post_unpublish.connect(on_page_unpublished, dispatch_uid="search_post_unpublish")
 
 
 class SearchConfig(AppConfig):
@@ -9,14 +44,9 @@ class SearchConfig(AppConfig):
     name = "richie.apps.search"
     verbose_name = "Richie search app"
 
-    # pylint: disable=import-outside-toplevel
     def ready(self):
-        """Register signals to update the Elasticsearch indices."""
-        from cms.signals import post_publish, post_unpublish
-
-        from .signals import on_page_published, on_page_unpublished
-
-        post_publish.connect(on_page_published, dispatch_uid="search_post_publish")
-        post_unpublish.connect(
-            on_page_unpublished, dispatch_uid="search_post_unpublish"
-        )
+        """
+        Initialize the Elasticsearch client and register signals.
+        """
+        init_es()
+        init_signals()

richie/apps/search/filter_definitions/courses.py

@@ -15,7 +15,7 @@ from cms.api import Page
 
 from richie.apps.core.defaults import ALL_LANGUAGES_DICT
 
-from .. import ES_CLIENT
+from ..apps import ES_CLIENT
 from ..fields.array import ArrayField
 from ..indexers import ES_INDICES
 from ..utils.i18n import get_best_field_language

richie/apps/search/index_manager.py

@@ -10,7 +10,7 @@ from django.utils import timezone
 
 from elasticsearch.exceptions import NotFoundError, RequestError
 
-from . import ES_CLIENT, ES_INDICES_CLIENT
+from .apps import ES_CLIENT, ES_INDICES_CLIENT
 from .defaults import ES_CHUNK_SIZE, ES_INDICES_PREFIX
 from .elasticsearch import bulk_compat
 from .indexers import ES_INDICES

richie/apps/search/utils/viewsets.py

@@ -7,7 +7,7 @@ from django.utils.translation import get_language_from_request
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
-from .. import ES_CLIENT
+from ..apps import ES_CLIENT
 
 
 class ViewSetMetadata:

richie/apps/search/viewsets/categories.py

@@ -11,7 +11,7 @@ from rest_framework.exceptions import NotFound
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSet
 
-from .. import ES_CLIENT
+from ..apps import ES_CLIENT
 from ..defaults import ES_PAGE_SIZE
 from ..indexers import ES_INDICES
 from ..utils.viewsets import ViewSetMetadata

richie/apps/search/viewsets/courses.py

@@ -8,7 +8,7 @@ from elasticsearch.exceptions import NotFoundError
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSet
 
-from .. import ES_CLIENT
+from ..apps import ES_CLIENT
 from ..defaults import ES_PAGE_SIZE, FILTERS_PRESENTATION
 from ..filter_definitions import FILTERS
 from ..indexers import ES_INDICES

richie/apps/search/viewsets/licences.py

@@ -9,7 +9,7 @@ from elasticsearch.exceptions import NotFoundError
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSet
 
-from .. import ES_CLIENT
+from ..apps import ES_CLIENT
 from ..defaults import ES_PAGE_SIZE
 from ..indexers import ES_INDICES
 from ..utils.viewsets import AutocompleteMixin, ViewSetMetadata

richie/apps/search/viewsets/organizations.py

@@ -9,7 +9,7 @@ from elasticsearch.exceptions import NotFoundError
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSet
 
-from .. import ES_CLIENT
+from ..apps import ES_CLIENT
 from ..defaults import ES_PAGE_SIZE
 from ..indexers import ES_INDICES
 from ..utils.viewsets import AutocompleteMixin, ViewSetMetadata

richie/apps/search/viewsets/persons.py

@@ -9,7 +9,7 @@ from elasticsearch.exceptions import NotFoundError
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSet
 
-from .. import ES_CLIENT
+from ..apps import ES_CLIENT
 from ..defaults import ES_PAGE_SIZE
 from ..indexers import ES_INDICES
 from ..utils.viewsets import AutocompleteMixin, ViewSetMetadata

{richie-3.0.1.dev5.dist-info → richie-3.0.1.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richie
-Version: 3.0.1.dev5
+Version: 3.0.1.dev8
 Summary: A CMS to build learning portals for open education
 Author-email: "Open FUN (France Université Numérique)" <fun.dev@fun-mooc.fr>
 License: MIT License

{richie-3.0.1.dev5.dist-info → richie-3.0.1.dev8.dist-info}/RECORD

@@ -1111,15 +1111,15 @@ richie/apps/demo/fixtures/portrait/portrait-8.png,sha256=BvA5je_9wioCgz56GxRIWX9
 richie/apps/demo/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/demo/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/demo/management/commands/create_demo_site.py,sha256=8GdmyHymtPVkN86zmvJ00Lx52F9P1wNNGOIQA_jEJY4,31642
-richie/apps/search/__init__.py,sha256=pSGulmcMEHgv84OVt3RpNAKmw4egImIssH2Q4qebn4A,469
-richie/apps/search/apps.py,sha256=HA1uuHRRtW0LxBIjkcu3iSKI98fHLZwZy_2R9fqtYGQ,742
+richie/apps/search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+richie/apps/search/apps.py,sha256=npt71JLONMn4-BY5pJm8IAlAKZhKqzYC8sCOaCV9phY,1575
 richie/apps/search/cms_toolbars.py,sha256=z7n3QDSPIQks2NvmGRBWd58cbJq0lqEsBJmhK9eTKns,1272
 richie/apps/search/defaults.py,sha256=AvYbKIBXd9z9KeUloEr3Y5DJ1lxch82DmxrG31ncNGo,6004
 richie/apps/search/description.apib,sha256=UPTZaDWUV_U29qLFjHRWumEFPwH97eUbYideboNnot4,9503
 richie/apps/search/elasticsearch.py,sha256=mE20jsQzLnp1VIQ2zntu_UYluECSkmjI2vAEgF60xCA,3811
 richie/apps/search/exceptions.py,sha256=Ld3tYIYJhigNvA_dymZRMQQTYvQmxRTIPbfu37s5K-4,479
 richie/apps/search/forms.py,sha256=4niV0PUZmhz6GwRdN6JT41nRNa4NsNKbgkhZTrT1Fho,15377
-richie/apps/search/index_manager.py,sha256=wMaYcqx34mTFJmN5KsuNHYY0WsTi50YdoT469Y3nDUQ,6324
+richie/apps/search/index_manager.py,sha256=lSggqzm9qZaujKMTqsWbAchmCkcAHsiZhrlRBMKSseM,6328
 richie/apps/search/models.py,sha256=xJZX2xiPjJlIRwy0eiBFMzBULWnUMgdPTTY3zOzQ0I0,371
 richie/apps/search/signals.py,sha256=waq5ju9F-sdc5_X1YqRpaa78Na7yJK8xt38qEweb9PM,7143
 richie/apps/search/text_indexing.py,sha256=0jFAb1fGJCnUKptW8SYTeS2AdPkEZOmi0Bud3lcHMLc,5647
@@ -1130,7 +1130,7 @@ richie/apps/search/fields/array.py,sha256=Ukfg-viKEZdk3NunS0lqCI2XDMs1lthsK78irS
 richie/apps/search/fields/datetimerange.py,sha256=Fj02Y4B0DVC4amHNaEa9cV7r5hhS0Qb5uQvOOU1NEEA,2500
 richie/apps/search/filter_definitions/__init__.py,sha256=HSRB17H9Y76Y7QpqBuxJZ5a06slxZz-J4h2_KHGY51k,627
 richie/apps/search/filter_definitions/base.py,sha256=YUk8nucv5Ceuvos5mepsyoKZaSrhHfgTwtnUI5x8evE,23513
-richie/apps/search/filter_definitions/courses.py,sha256=4MP_VclNLObRtJSb7s2svzLWJWLFD8VkqgL2tRAQYBY,20317
+richie/apps/search/filter_definitions/courses.py,sha256=RiQRChczwqROdk8CFVS6ENliUoWwpsuXSmBcpoq6pCc,20321
 richie/apps/search/filter_definitions/helpers.py,sha256=Buyf0EJzYnlM3S8QrPWPhgRhKVL1098g_2J7aHhMYB0,838
 richie/apps/search/filter_definitions/mixins.py,sha256=EEcYVu426reDfeCaeVzNEzj7z40KjPB_yz3FthAIN-c,5669
 richie/apps/search/indexers/__init__.py,sha256=RcrvJGdyUBxcuWY9OnZ2G-G0YEcDb55n3_otj2JqWWg,655
@@ -1146,13 +1146,13 @@ richie/apps/search/templates/search/search.html,sha256=9F8RlGnVGYJh9lIlhlCBMKs44
 richie/apps/search/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/search/utils/i18n.py,sha256=dHIQ362xGFZUOYP8QtjKhP8xIDYTHfDKUHlb8TmRBP8,695
 richie/apps/search/utils/indexers.py,sha256=WCuB1-9GfkRoVaubopKIZDpyH0rW2bpHEZB4eo1_fFU,3107
-richie/apps/search/utils/viewsets.py,sha256=u4OBcT5-nZuKpV0TDC92VWe5jTH0z_C2Au6Is_iAlbU,2907
+richie/apps/search/utils/viewsets.py,sha256=-khOPIXhjAXCODut31-SnVIsor0lNU5_Sg36dYbhE3Q,2911
 richie/apps/search/viewsets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-richie/apps/search/viewsets/categories.py,sha256=W518jn9DUvIUeOW-vbyE0BsR2iyrNOWUaX67jzkHqU0,5856
-richie/apps/search/viewsets/courses.py,sha256=NPWtfE9B2WmairyUZzbaHdHEfE8ZsFmT-8vQC0w3GcQ,4428
-richie/apps/search/viewsets/licences.py,sha256=qI0XdFbOTrP1OwXQzNAMK8sQTOffdC9XGar9qtB4D9E,3535
-richie/apps/search/viewsets/organizations.py,sha256=iQPAzhsRa5Fl-76cFCp09UcCcsVFPKlauTTGbDDZ_Jg,3636
-richie/apps/search/viewsets/persons.py,sha256=a1_hYkbiBNPuy7wUYzoSP1p963Y_22I3NhB9F9lavbY,3582
+richie/apps/search/viewsets/categories.py,sha256=zT8NOwmJB3MY33CrOBvvTrtf1LScLjBKmH_DGOQznpQ,5860
+richie/apps/search/viewsets/courses.py,sha256=1lXueD3jTCAh46JY8jyq9VbnfncuRdLud8Jk7Lz0Bmc,4432
+richie/apps/search/viewsets/licences.py,sha256=BFoESlgMrl0tR04t_hq1i0d-J0lsLbsplTDypz5EELc,3539
+richie/apps/search/viewsets/organizations.py,sha256=zfzY6GCFuRG0T7EiU5-Ie7Jl2PgMgo4IzWIURnnAV74,3640
+richie/apps/search/viewsets/persons.py,sha256=ryfRq4ij6RpfVHSWybyVji9pa7sRAhEbBEz9Y79oGWU,3586
 richie/locale/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/locale/ar_SA/LC_MESSAGES/django.mo,sha256=n0aFUigovI5AoGVyfs0b2flRA2b_thaZQa0ltKCGXJs,8630
 richie/locale/ar_SA/LC_MESSAGES/django.po,sha256=Equ47JtCDrwW2UVgyqERu8KJR4M2bhSJcFpeavNAIp4,57547
@@ -2483,9 +2483,9 @@ richie/static/richie/js/build/99870.aaea7dc8ccbfbbde731b.index.js,sha256=cpTLUxk
 richie/static/richie/js/build/99895.aaea7dc8ccbfbbde731b.index.js,sha256=ulau6gBdM9fUp02EkaqHqLq74-JKi17lbC5oxfJsgqc,2570
 richie/static/richie/js/build/99953.aaea7dc8ccbfbbde731b.index.js,sha256=OWoLPJnHrmvF3HBQPgXooAGo5E0yJpJ7QTFHFghJpI8,135
 richie/static/richie/js/build/index.js,sha256=4aDGpVam3g1Cluu5vY74Rtk2d6kftkP7CZgSiq8jmMw,1332827
-richie-3.0.1.dev5.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
-richie-3.0.1.dev5.dist-info/METADATA,sha256=EhrcOpQgiH5xyNgNQ0QNoD-BPwwroa34FP49WAq72T0,7030
-richie-3.0.1.dev5.dist-info/WHEEL,sha256=XAkygS4h1cf0JYWV13kJhTWht2y9NqKAsZuiTHc2920,109
-richie-3.0.1.dev5.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
-richie-3.0.1.dev5.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-richie-3.0.1.dev5.dist-info/RECORD,,
+richie-3.0.1.dev8.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
+richie-3.0.1.dev8.dist-info/METADATA,sha256=PAvMlQSvb4YpoW2cJuWP3f8pP0jmboYt0_FYWXZCSiI,7030
+richie-3.0.1.dev8.dist-info/WHEEL,sha256=7mLNlhqgufj7fxENZhtzRraBDfDi3AITas5GqZGp0zk,109
+richie-3.0.1.dev8.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
+richie-3.0.1.dev8.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+richie-3.0.1.dev8.dist-info/RECORD,,

{richie-3.0.1.dev5.dist-info → richie-3.0.1.dev8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.0.1)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any