rer.solrpush 1.3.7__tar.gz → 1.4.0__tar.gz

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/CHANGES.rst

@@ -2,33 +2,13 @@ Changelog
 =========
 
 
-1.3.7 (2024-12-09)
+1.4.0 (2024-05-05)
 ------------------
 
-- Fix handle attachements when indexing a new content.
+- Plone6 compatibility.
   [cekk]
 
 
-1.3.6 (2024-12-06)
-------------------
-
-- Fix handle attachements when indexing a new content.
-  [cekk]
-
-
-1.3.5 (2024-12-05)
-------------------
-
-- Reload schema from solr with upgrade-step.
-  [cekk]
-
-
-1.3.4 (2024-12-05)
-------------------
-
-- Handle also boolean indexes.
-  [cekk]
-
 1.3.3 (2023-11-08)
 ------------------
 

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/MANIFEST.in

@@ -1,6 +1,7 @@
 graft src/rer
 graft docs
 include *.rst
+include *.txt
 include LICENSE.GPL
 include *.yml
 global-exclude *.pyc

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rer.solrpush
-Version: 1.3.7
+Version: 1.4.0
 Summary: Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr
 Home-page: https://github.com/collective/rer.solrpush
 Author: RedTurtle
@@ -11,17 +11,20 @@ Project-URL: Source, https://github.com/collective/rer.solrpush
 Project-URL: Tracker, https://github.com/collective/rer.solrpush/issues
 Keywords: Python Plone
 Classifier: Environment :: Web Environment
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Plone
 Classifier: Framework :: Plone :: Addon
 Classifier: Framework :: Plone :: 5.1
 Classifier: Framework :: Plone :: 5.2
+Classifier: Framework :: Plone :: 6.0
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
-Requires-Python: ==2.7
+Requires-Python: >=3.7
 Provides-Extra: test
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
@@ -241,33 +244,13 @@ Changelog
 =========
 
 
-1.3.7 (2024-12-09)
+1.4.0 (2024-05-05)
 ------------------
 
-- Fix handle attachements when indexing a new content.
+- Plone6 compatibility.
   [cekk]
 
 
-1.3.6 (2024-12-06)
-------------------
-
-- Fix handle attachements when indexing a new content.
-  [cekk]
-
-
-1.3.5 (2024-12-05)
-------------------
-
-- Reload schema from solr with upgrade-step.
-  [cekk]
-
-
-1.3.4 (2024-12-05)
-------------------
-
-- Handle also boolean indexes.
-  [cekk]
-
 1.3.3 (2023-11-08)
 ------------------
 

rer.solrpush-1.4.0/constraints_plone60.txt

@@ -0,0 +1 @@
+-c https://dist.plone.org/release/6.0-latest/requirements.txt

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/docker-compose.yml

@@ -2,8 +2,8 @@ version: '3'
 services:
   solr:
     container_name: solrpush
-    image: solr:7.7.3
+    image: solr:8.11
     ports:
       - '8983:8983'
     volumes:
-      - ./config:/opt/solr/server/solr/plone
+      - ./config:/var/solr/data

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/setup.cfg

@@ -13,8 +13,18 @@ line_length = 200
 not_skip = __init__.py
 
 [flake8]
+ignore = 
+	W503,
+	C812,
+	E501
+	T001
+	C813
+	C901
 exclude = bootstrap.py,docs,*.egg.,omelette
-max-complexity = 15
+max-line-length = 88
+max-complexity = 18
+select = B,C,E,F,W,T4,B9
+builtins = unicode,basestring
 
 [egg_info]
 tag_build = 

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/setup.py

@@ -16,20 +16,23 @@ long_description = "\n\n".join(
 
 setup(
     name="rer.solrpush",
-    version="1.3.7",
+    version="1.4.0",
     description="Prodotto per Regione Emilia-Romagna relativo all'indicizzazione dei contenuti con solr",
     long_description=long_description,
     # Get more from https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
         "Environment :: Web Environment",
+        "Development Status :: 5 - Production/Stable",
         "Framework :: Plone",
         "Framework :: Plone :: Addon",
         "Framework :: Plone :: 5.1",
         "Framework :: Plone :: 5.2",
+        "Framework :: Plone :: 6.0",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],
@@ -49,7 +52,7 @@ setup(
     package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
-    python_requires="==2.7",
+    python_requires=">=3.7",
     install_requires=[
         "setuptools",
         "collective.z3cform.jsonwidget",
@@ -57,6 +60,7 @@ setup(
         "pysolr",
         'ftfy==4.4.3;python_version<="2.7"',
         "plone.restapi",
+        "z3c.jbot",
     ],
     extras_require={
         "test": [

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/src/rer/solrpush/adapters/configure.zcml

@@ -1,13 +1,15 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    i18n_domain="rer.solrpush">
+    i18n_domain="rer.solrpush"
+    >
 
-    <adapter
-      for="plone.app.contenttypes.interfaces.IFile"
-      provides="rer.solrpush.interfaces.adapter.IExtractFileFromTika"
+  <adapter
       factory=".file.FileExtractor"
+      provides="rer.solrpush.interfaces.adapter.IExtractFileFromTika"
+      for="plone.app.contenttypes.interfaces.IFile"
       />
 
   <!-- RSS feed -->
-  <adapter factory=".rss_feed.SOLRFeedItem"/>
+  <adapter factory=".rss_feed.SOLRFeedItem" />
+
 </configure>

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/src/rer/solrpush/adapters/file.py

@@ -2,8 +2,7 @@
 from plone import api
 from rer.solrpush.interfaces.adapter import IExtractFileFromTika
 from zope.interface import implementer
-from ZODB.POSException import POSKeyError
-from ZODB.POSException import ReadConflictError
+
 
 try:
     from collective.limitfilesizepanel.interfaces import ILimitFileSizePanel
@@ -14,6 +13,7 @@ except ImportError:
 
 import logging
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -50,9 +50,4 @@ class FileExtractor(object):
                 file_obj.filename,
             )
             return None
-        try:
-            return file_obj.data
-        except (POSKeyError, ReadConflictError):
-            # this is raised if we are creating a new object, because there isn't the blob yet.
-            # this is not a problem, because the file is in dictionary
-            return None
+        return file_obj.data

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/src/rer/solrpush/adapters/rss_feed.py

@@ -10,7 +10,6 @@ from zope.interface import implementer
 @implementer(IFeedItem)
 @adapter(ISolrBrain, IFeed)
 class SOLRFeedItem(BaseItem):
-
     @property
     def link(self):
         return self.context.getURL()

rer.solrpush-1.4.0/src/rer/solrpush/behaviors/configure.zcml

@@ -0,0 +1,20 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    i18n_domain="rer.solrpush"
+    >
+
+  <include
+      package="plone.behavior"
+      file="meta.zcml"
+      />
+
+  <plone:behavior
+      title="Solr additional fields"
+      description="Extra fields for Solr indexing"
+      provides=".solr_fields.ISolrFields"
+      for="plone.dexterity.interfaces.IDexterityContent"
+      />
+
+</configure>

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/src/rer/solrpush/behaviors/solr_fields.py

@@ -19,7 +19,7 @@ class ISolrFields(model.Schema):
         required=False,
         default=True,
         missing_value=True,
-        title=_("label_showinsearch", default=u"Show in search"),
+        title=_("label_showinsearch", default="Show in search"),
         description=_("help_showinsearch", default=""),
     )
 
@@ -27,13 +27,13 @@ class ISolrFields(model.Schema):
         required=False,
         default=[],
         missing_value=[],
-        title=_("label_searchwords", default=u"Search words"),
+        title=_("label_searchwords", default="Search words"),
         value_type=schema.TextLine(),
         description=_(
             "help_searchwords",
-            u"Specify words for which this item will show up "
-            u"as the first search result. Multiple words can be "
-            u"specified on new lines.",
+            "Specify words for which this item will show up "
+            "as the first search result. Multiple words can be "
+            "specified on new lines.",
         ),
     )
 

rer.solrpush-1.4.0/src/rer/solrpush/browser/configure.zcml

@@ -0,0 +1,122 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:plone="http://namespaces.plone.org/plone"
+    i18n_domain="rer.solrpush"
+    >
+
+  <!-- Set overrides folder for Just-a-Bunch-Of-Templates product -->
+  <include
+      package="z3c.jbot"
+      file="meta.zcml"
+      />
+  <browser:jbot
+      directory="overrides"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+
+  <plone:static
+      directory="static"
+      name="rer.solrpush"
+      type="plone"
+      />
+
+  <!-- controlpanel -->
+  <browser:page
+      name="solrpush-settings"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".controlpanel.RerSolrpushSettingsView"
+      permission="rer.solrpush.editSettings"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+  <browser:page
+      name="elevate-settings"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".elevate_settings.ElevateSettingsView"
+      permission="rer.solrpush.editElevate"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+
+  <browser:page
+      name="reindex-solr"
+      for="Products.CMFCore.interfaces.ISiteRoot"
+      class=".maintenance.ReindexSolrView"
+      template="templates/reindex_solr.pt"
+      permission="cmf.ManagePortal"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+  <browser:page
+      name="sync-solr"
+      for="Products.CMFCore.interfaces.ISiteRoot"
+      class=".maintenance.SyncSolrView"
+      template="templates/reindex_solr.pt"
+      permission="cmf.ManagePortal"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+
+  <browser:page
+      name="reindex-progress"
+      for="Products.CMFCore.interfaces.ISiteRoot"
+      class=".maintenance.ReindexProgressView"
+      permission="cmf.ManagePortal"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+  <browser:page
+      name="do-reindex"
+      for="Products.CMFCore.interfaces.ISiteRoot"
+      class=".maintenance.DoReindexView"
+      permission="cmf.ManagePortal"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+  <browser:page
+      name="do-sync"
+      for="Products.CMFCore.interfaces.ISiteRoot"
+      class=".maintenance.DoSyncView"
+      permission="cmf.ManagePortal"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+
+  <browser:page
+      name="reset-solr"
+      for="Products.CMFCore.interfaces.ISiteRoot"
+      class=".maintenance.ResetSolr"
+      permission="cmf.ManagePortal"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+
+  <!-- return scaled image -->
+  <!-- <browser:page
+        name="solr-images"
+        class=".scales.SolrImages"
+        permission="zope2.View"
+        for="*"
+        layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+        /> -->
+
+  <!-- CUSTOM COLLECTIONS -->
+  <browser:page
+      name="querybuilderresults"
+      for="*"
+      class=".querybuilder.QueryBuilder"
+      permission="zope2.View"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+  <browser:page
+      name="querybuilder_html_results"
+      for="*"
+      class=".querybuilder.QueryBuilder"
+      attribute="html_results"
+      permission="zope2.View"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+
+  <browser:viewlet
+      name="solrpush.querydebug"
+      manager="plone.app.layout.viewlets.interfaces.IBelowContent"
+      class=".query_debug.QueryDebug"
+      template="templates/query_debug.pt"
+      permission="cmf.ManagePortal"
+      layer="rer.solrpush.interfaces.IRerSolrpushLayer"
+      />
+
+</configure>

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/src/rer/solrpush/browser/controlpanel.py

@@ -15,19 +15,20 @@ from z3c.form.interfaces import HIDDEN_MODE
 
 import logging
 
+
 logger = logging.getLogger(__name__)
 
 
 class FormDefault(group.Group):
-    label = _("settings_default_label", default=u"Settings")
+    label = _("settings_default_label", default="Settings")
     fields = field.Fields(IRerSolrpushConf)
 
 
 class FormSearch(group.Group):
-    label = _("settings_search_label", default=u"Search")
+    label = _("settings_search_label", default="Search")
     description = _(
         "settings_search_help",
-        default=u"Use these settings to tweak search results.",
+        default="Use these settings to tweak search results.",
     )
     fields = field.Fields(IRerSolrpushSearchConf)
 
@@ -39,11 +40,11 @@ class RerSolrpushEditForm(RegistryEditForm):
 
     schema = IRerSolrpushSettings
     groups = (FormDefault, FormSearch)
-    label = _(u"Solr Push Configuration")
+    label = _("Solr Push Configuration")
 
     formErrorsMessage = _(
         "settings_form_error",
-        default=u"Sono presenti degli errori, si prega di ricontrollare i dati inseriti",
+        default="Sono presenti degli errori, si prega di ricontrollare i dati inseriti",
     )
 
     def updateFields(self):
@@ -59,7 +60,7 @@ class RerSolrpushEditForm(RegistryEditForm):
             self.status = self.formErrorsMessage
             return
         self.applyChanges(data)
-        api.portal.show_message(_(u"Changes saved."), request=self.request)
+        api.portal.show_message(_("Changes saved."), request=self.request)
         init_error = init_solr_push()
         if init_error:
             api.portal.show_message(
@@ -67,7 +68,7 @@ class RerSolrpushEditForm(RegistryEditForm):
             )
         else:
             api.portal.show_message(
-                _(u"Loaded schema.xml from SOLR"), request=self.request
+                _("Loaded schema.xml from SOLR"), request=self.request
             )
         self.request.response.redirect(self.request.getURL())
 
@@ -86,7 +87,7 @@ class RerSolrpushEditForm(RegistryEditForm):
             )
         else:
             api.portal.show_message(
-                _(u"Reloaded schema.xml from SOLR"), request=self.request
+                _("Reloaded schema.xml from SOLR"), request=self.request
             )
         self.request.response.redirect(self.request.getURL())
 

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/src/rer/solrpush/browser/elevate_settings.py

@@ -10,19 +10,17 @@ from z3c.form import field
 
 
 class ElevateSettingsEditForm(RegistryEditForm):
-
     schema = IElevateSettings
     label = _(
         "solr_elevate_configuration_label",
-        default=u"Solr Push Elevate Configuration",
+        default="Solr Push Elevate Configuration",
     )
 
     fields = field.Fields(IElevateSettings)
     fields["elevate_schema"].widgetFactory = JSONFieldWidget
 
     def updateWidgets(self):
-        """
-        """
+        """ """
         super(ElevateSettingsEditForm, self).updateWidgets()
         self.widgets["elevate_schema"].schema = IElevateRowSchema
 

{rer.solrpush-1.3.7 → rer.solrpush-1.4.0}/src/rer/solrpush/browser/maintenance.py

@@ -45,7 +45,7 @@ logger = logging.getLogger(__name__)
 
 
 def timer(func=time):
-    """ set up a generator returning the elapsed time since the last call """
+    """set up a generator returning the elapsed time since the last call"""
 
     def gen(last=func()):
         while True:
@@ -57,12 +57,11 @@ def timer(func=time):
 
 
 class SolrMaintenanceBaseForm(form.Form):
-
     # template = ViewPageTemplateFile('templates/reindex_solr.pt')
 
     ignoreContext = True
 
-    @button.buttonAndHandler(_("start_label", default=u"Start"))
+    @button.buttonAndHandler(_("start_label", default="Start"))
     def handleApply(self, action):
         data, errors = self.extractData()
         if errors:
@@ -70,7 +69,7 @@ class SolrMaintenanceBaseForm(form.Form):
             return
         self.do_action()
 
-    @button.buttonAndHandler(_("cancel_label", default=u"Cancel"))
+    @button.buttonAndHandler(_("cancel_label", default="Cancel"))
     def handleCancel(self, action):
         msg_label = _("maintenance_cancel_action", default="Action cancelled")
         api.portal.show_message(message=msg_label, request=self.request)
@@ -108,8 +107,8 @@ class ReindexBaseView(BrowserView):
         return translate(
             _(
                 "solr_error_connection",
-                default=u"There have been problems connecting to SOLR. "
-                u"Contact site administrator.",
+                default="There have been problems connecting to SOLR. "
+                "Contact site administrator.",
             ),
             context=self.request,
         )
@@ -315,7 +314,12 @@ class ReindexBaseView(BrowserView):
             status = self.setupAnnotations(
                 items_len=len(brains_to_sync), message="Sync contents to SOLR"
             )
+        i = 0
+        tot = len(brains_to_sync)
         for brain in brains_to_sync:
+            i += 1
+            if i % 10 == 0:
+                logger.info(f"Progress: {i}/{tot}")
             if not disable_progress:
                 status["counter"] = status["counter"] + 1
                 commit()
@@ -323,7 +327,9 @@ class ReindexBaseView(BrowserView):
             if brain.UID not in solr_items:
                 # missing from solr: try to index it
                 try:
+                    logger.info("send to solr")
                     res = push_to_solr(item)
+                    logger.info("received response from solr")
                     if res:
                         indexed.append(brain.getPath())
                 except SolrError as e:
@@ -365,7 +371,7 @@ class ReindexBaseView(BrowserView):
 class DoReindexView(ReindexBaseView):
     def __call__(self):
         authenticator = getMultiAdapter(
-            (self.context, self.request), name=u"authenticator"
+            (self.context, self.request), name="authenticator"
         )
         if not authenticator.verify():
             raise Unauthorized
@@ -387,7 +393,7 @@ class DoSyncView(ReindexBaseView):
     def __call__(self, cron_view=False):
         if not cron_view:
             authenticator = getMultiAdapter(
-                (self.context, self.request), name=u"authenticator"
+                (self.context, self.request), name="authenticator"
             )
             if not authenticator.verify():
                 raise Unauthorized
@@ -457,7 +463,6 @@ class ReactView(BrowserView):
 
 
 class ReindexSolrView(ReactView):
-
     label = _("maintenance_reindex_label", default="Reindex SOLR")
     description = _(
         "maintenance_reindex_help",
@@ -467,7 +472,6 @@ class ReindexSolrView(ReactView):
 
 
 class SyncSolrView(ReactView):
-
     label = _("maintenance_sync_label", default="Sync SOLR")
     description = _(
         "maintenance_sync_help",