richie 3.1.0__py2.py3-none-any.whl → 3.1.1.dev2__py2.py3-none-any.whl

richie/apps/search/index_manager.py

@@ -2,6 +2,7 @@
 ElasticSearch indices utilities.
 """
 
+import logging
 import re
 from functools import reduce
 
@@ -16,6 +17,8 @@ from .elasticsearch import bulk_compat
 from .indexers import ES_INDICES
 from .text_indexing import ANALYSIS_SETTINGS
 
+logger = logging.getLogger(__name__)
+
 
 def richie_bulk(actions):
     """Wrap bulk helper to set default parameters."""
@@ -37,16 +40,16 @@ def get_indices_by_alias(existing_indices, alias):
             yield index, alias
 
 
-def perform_create_index(indexable, logger=None):
+def perform_create_index(indexable):
     """
     Create a new index in ElasticSearch from an indexable instance
     """
+    logger.info("Creating the index %s...", indexable.index_name)
     # Create a new index name, suffixing its name with a timestamp
     new_index = f"{indexable.index_name:s}_{timezone.now():%Y-%m-%d-%Hh%Mm%S.%fs}"
 
     # Create the new index
-    if logger:
-        logger.info(f'Creating a new Elasticsearch index "{new_index:s}"...')
+    logger.info("Creating a new Elasticsearch index %s...", new_index)
     ES_INDICES_CLIENT.create(index=new_index)
 
     # The index needs to be closed before we set an analyzer
@@ -63,11 +66,12 @@ def perform_create_index(indexable, logger=None):
     return new_index
 
 
-def regenerate_indices(logger):
+def regenerate_indices():
     """
     Create new indices for our indexables and replace possible existing indices with
     a new one only once it has successfully built it.
     """
+    logger.info("Regenerating ES indices...")
     # Get all existing indices once; we'll look up into this list many times
     try:
         existing_indices = ES_INDICES_CLIENT.get_alias("*")
@@ -75,11 +79,10 @@ def regenerate_indices(logger):
         # Provide a fallback empty list so we don't have to check for its existence later on
         existing_indices = []
 
+    logger.info("Creating new ES indices...")
     # Create a new index for each of those modules
     # NB: we're mapping perform_create_index which produces side-effects
-    indices_to_create = zip(
-        list(map(lambda ix: perform_create_index(ix, logger), ES_INDICES)), ES_INDICES
-    )
+    indices_to_create = [(perform_create_index(ix), ix) for ix in ES_INDICES]
 
     # Prepare to alias them so they can be swapped-in for the previous versions
     actions_to_create_aliases = [
@@ -152,13 +155,16 @@ def regenerate_indices(logger):
         ES_INDICES_CLIENT.delete(index=useless_index, ignore=[400, 404])
 
 
-def store_es_scripts(logger=None):
+def store_es_scripts():
     """
     Iterate over the indexers listed in the settings, import them, and store the scripts
     they define on their "scripts" key in ElasticSearch
     """
     for indexer in ES_INDICES:
         for script_id, script_body in indexer.scripts.items():
-            if logger:
-                logger.info(f'Storing script "{script_id:s}"...')
+            logger.info(
+                "Storing script %s for indexer %s...",
+                script_id,
+                indexer.__name__,
+            )
             ES_CLIENT.put_script(id=script_id, body=script_body)

richie/apps/search/indexers/persons.py

@@ -2,6 +2,7 @@
 ElasticSearch person document management utilities
 """
 
+import logging
 from collections import defaultdict
 
 from django.conf import settings
@@ -20,6 +21,8 @@ from ..text_indexing import MULTILINGUAL_TEXT
 from ..utils.i18n import get_best_field_language
 from ..utils.indexers import slice_string_for_completion
 
+logger = logging.getLogger(__name__)
+
 
 class PersonsIndexer:
     """
@@ -78,6 +81,11 @@ class PersonsIndexer:
         ):
             language = portrait.cmsplugin_ptr.language
             with translation.override(language):
+                logger.debug(
+                    "Indexing %s portrait for language %s",
+                    person.extended_object.get_absolute_url(language),
+                    language,
+                )
                 portrait_images[language] = get_picture_info(portrait, "portrait")
 
         # Get bio texts

richie/apps/search/management/commands/bootstrap_elasticsearch.py

@@ -27,7 +27,7 @@ class Command(BaseCommand):
 
         # Creates new indices each time, populates them, and atomically replaces
         # the old indices once the new ones are ready.
-        regenerate_indices(logger)
+        regenerate_indices()
 
         # Confirm operation success through a console log
         logger.info("ES indices regenerated.")
@@ -35,6 +35,6 @@ class Command(BaseCommand):
         logger.info("Starting to store ES scripts...")
 
         # Iterates over indexables to find all the necessary scripts and store them
-        store_es_scripts(logger)
+        store_es_scripts()
 
         logger.info("ES scripts stored.")

richie/plugins/simple_picture/helpers.py

@@ -1,7 +1,11 @@
 """SimplePicture plugin for DjangoCMS."""
 
+import logging
+
 from .defaults import SIMPLEPICTURE_PRESETS
 
+logger = logging.getLogger(__name__)
+
 
 def get_picture_info(instance, preset_name):
     """
@@ -43,15 +47,29 @@ def get_picture_info(instance, preset_name):
     # - src
     options = preset["src"].copy()
     options.update(location_dict)
-    picture_info["src"] = thumbnailer.get_thumbnail(options).url
+    try:
+        picture_info["src"] = thumbnailer.get_thumbnail(options).url
+    except ValueError as exc:
+        logger.error(
+            "Error while generating thumbnail for %s: %s",
+            options,
+            exc,
+        )
 
     # - srcset
     srcset = []
     for info in preset.get("srcset", []):
         options = info["options"].copy()
         options.update(location_dict)
-        url = thumbnailer.get_thumbnail(options).url
-        srcset.append(f"{url:s} {info['descriptor']:s}")
+        try:
+            url = thumbnailer.get_thumbnail(options).url
+            srcset.append(f"{url:s} {info['descriptor']:s}")
+        except ValueError as exc:
+            logger.error(
+                "Error while generating thumbnail for %s: %s",
+                options,
+                exc,
+            )
     picture_info["srcset"] = ", ".join(srcset) if srcset else None
 
     # - sizes

{richie-3.1.0.dist-info → richie-3.1.1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richie
-Version: 3.1.0
+Version: 3.1.1.dev2
 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.1.0.dist-info → richie-3.1.1.dev2.dist-info}/RECORD

@@ -1119,7 +1119,7 @@ richie/apps/search/description.apib,sha256=UPTZaDWUV_U29qLFjHRWumEFPwH97eUbYideb
 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=lSggqzm9qZaujKMTqsWbAchmCkcAHsiZhrlRBMKSseM,6328
+richie/apps/search/index_manager.py,sha256=zeAZRLjy6_UULBkySakSBSkfWrVmzaxsIfs9jklinus,6509
 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
@@ -1138,10 +1138,10 @@ richie/apps/search/indexers/categories.py,sha256=AqLVVgbiOagmS9DkWmxvbB-QtFzFrVv
 richie/apps/search/indexers/courses.py,sha256=4exoJxm-bHBEUxZj9bXPyID_KcJjzY36ABDTp3hFWgA,34948
 richie/apps/search/indexers/licences.py,sha256=kZ0vT1jIOqCXSQUsQEKVmTiMIhCFpdiPQeDxAiMgInQ,3691
 richie/apps/search/indexers/organizations.py,sha256=uBTNBHiott4SMcxd4UdAliDdsUSDlWUK4gcoL-TJzCo,5774
-richie/apps/search/indexers/persons.py,sha256=jgSxoJBtaxS5Kchza6Ov0FvYy-baXzV-qNhNDxKvAws,5479
+richie/apps/search/indexers/persons.py,sha256=4yD7wiuvXRX8G4UxyjO_MFF5j4NtCmeORscmZFDHTm8,5741
 richie/apps/search/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/search/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-richie/apps/search/management/commands/bootstrap_elasticsearch.py,sha256=4PalSxcMWC9nWOKnF8OhzWL8isuvGGboivZzoClENrE,1176
+richie/apps/search/management/commands/bootstrap_elasticsearch.py,sha256=ZCzXV_uUIe0xroAgOOGhvS3o49L-XepUtrFJ54m194s,1164
 richie/apps/search/templates/search/search.html,sha256=9F8RlGnVGYJh9lIlhlCBMKs44ZNYRu6wXjUXHz6l0bs,1110
 richie/apps/search/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/search/utils/i18n.py,sha256=dHIQ362xGFZUOYP8QtjKhP8xIDYTHfDKUHlb8TmRBP8,695
@@ -1270,7 +1270,7 @@ richie/plugins/simple_picture/cms_plugins.py,sha256=lOOCeT3i-c09csJef0aDjcjxgmdI
 richie/plugins/simple_picture/defaults.py,sha256=kuRx6XesGMbLoO9I9X1k96o1BfaLW9nH3op8ozuVpnA,567
 richie/plugins/simple_picture/factories.py,sha256=J3g2e8TpSqTQAvAov1LaNTPythQ85V9eG6PcJiI0QUw,396
 richie/plugins/simple_picture/forms.py,sha256=QgzrpWW6M-Tz7eO_Sw57PeOfLSY5-fyvW6AfL1pQBSo,325
-richie/plugins/simple_picture/helpers.py,sha256=Xil2gwLvQSktu1lPo7ygHIALCrgOUi9nHuCH6W0HKxE,1895
+richie/plugins/simple_picture/helpers.py,sha256=L4XGZVcVZuuaKHyVngvMtWIVW3iJbTGTsqeUCuOeULI,2325
 richie/plugins/simple_picture/templates/richie/simple_picture/picture.html,sha256=93nk3QA4sKZDj0F0a7kTnS9lbMluUfm02tsBz6NUd5g,417
 richie/plugins/simple_text_ckeditor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/plugins/simple_text_ckeditor/cms_plugins.py,sha256=eVFJGafPoa7TpY6Dfztcz_xw6iBuBAMV9MzkhqndXgE,2501
@@ -2483,9 +2483,9 @@ richie/static/richie/js/build/99870.3d03ecf7f738aadec697.index.js,sha256=EaUT_FS
 richie/static/richie/js/build/99895.3d03ecf7f738aadec697.index.js,sha256=qRHNNUPr0-zKKVYjzx2QkSOBuxGzN5pyB6nTvyITQqs,2570
 richie/static/richie/js/build/99953.3d03ecf7f738aadec697.index.js,sha256=OWoLPJnHrmvF3HBQPgXooAGo5E0yJpJ7QTFHFghJpI8,135
 richie/static/richie/js/build/index.js,sha256=uUvBbc-sZ5PQa9zVpzcK1GzBcpxyfxZEEq9PSAUBAgY,1332827
-richie-3.1.0.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
-richie-3.1.0.dist-info/METADATA,sha256=256HVegh56RkOsxX8Ht2zkjBfR2dzrxOfee7rLdqBvk,7025
-richie-3.1.0.dist-info/WHEEL,sha256=_z0Kb-VmhLeNt2nZ-PsoQBjD25rP0tBwgAyRYD7oTKI,109
-richie-3.1.0.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
-richie-3.1.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-richie-3.1.0.dist-info/RECORD,,
+richie-3.1.1.dev2.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
+richie-3.1.1.dev2.dist-info/METADATA,sha256=XR0Ettyg7cNpZJqEmAbc5fon7lNG8wrE7Ny_Hy3rZDc,7030
+richie-3.1.1.dev2.dist-info/WHEEL,sha256=egKm5cKfE6OqlHwodY8Jjp4yqZDBXgsj09UsV5ojd_U,109
+richie-3.1.1.dev2.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
+richie-3.1.1.dev2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+richie-3.1.1.dev2.dist-info/RECORD,,

{richie-3.1.0.dist-info → richie-3.1.1.dev2.dist-info}/WHEEL

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