cherrypy-foundation 1.0.0a9__tar.gz → 1.0.0a11__tar.gz

{cherrypy_foundation-1.0.0a9 → cherrypy_foundation-1.0.0a11}/.gitlab-ci.yml

@@ -111,3 +111,29 @@ publish:wheel:
     if [ ! -z "$CI_COMMIT_TAG" ]; then
       twine upload dist/*.whl dist/*.tar.gz -u $PYPI_USR -p $PYPI_PWD
     fi
+
+publish:deb:
+  needs:
+    - package:deb
+  only:
+    variables:
+      - $NEXUS_USR
+      - $NEXUS_PWD
+  parallel:
+    matrix:
+      - DIST: trixie
+  script: |
+    set -e
+    set -x
+    if [[ "$CI_COMMIT_TAG" == *.+([0-9]) ]]; then
+      APT_URL="$NEXUS_URL/repository/apt-release-${DIST}/"
+      APT_COMPONENT=${DIST}
+    else
+      APT_URL="$NEXUS_URL/repository/apt-dev-${DIST}/"
+      APT_COMPONENT=${DIST}-dev
+    fi
+    export FILE=$(ls -1 ./dist/$DIST/python3-cherrypy-foundation*.deb)
+    curl --fail -u "$NEXUS_USR:$NEXUS_PWD" -H "Content-Type: multipart/form-data" --data-binary "@$FILE" "$APT_URL"
+    sleep 2
+    curl --fail ${APT_URL}dists/$APT_COMPONENT/main/binary-all/Packages | grep "$(basename $FILE)"
+  stage: publish

{cherrypy_foundation-1.0.0a9/src/cherrypy_foundation.egg-info → cherrypy_foundation-1.0.0a11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cherrypy-foundation
-Version: 1.0.0a9
+Version: 1.0.0a11
 Summary: CherryPy Foundation
 Author-email: Patrik Dufresne <patrik@ikus-soft.com>
 License: GPLv3

{cherrypy_foundation-1.0.0a9 → cherrypy_foundation-1.0.0a11}/src/cherrypy_foundation/components/Field.jinja

@@ -40,10 +40,10 @@
   {% set label_attrs = attrs.__class__({'class': label_class}) %}
   {% for key, value in attrs.as_dict.items() %}
     {% if key.startswith('container-') or key.startswith('container_') %}
-      {% do container_attrs.set(**{key[10:]: value}) %}
+      {% do container_attrs.set(**{key[10:]: value|string}) %}
     {% endif %}
     {% if key.startswith('label-') or key.startswith('label_') %}
-      {% do label_attrs.set(**{key[6:]: value}) %}
+      {% do label_attrs.set(**{key[6:]: value|string}) %}
     {% endif %}
   {% endfor %}
   <div {{ container_attrs.as_dict | xmlattr }}>

{cherrypy_foundation-1.0.0a9 → cherrypy_foundation-1.0.0a11}/src/cherrypy_foundation/plugins/ldap.py

@@ -26,7 +26,7 @@ _safe = ldap3.utils.conv.escape_filter_chars
 
 def all_attribute(attributes, keys, default=None):
     """
-    Extract the all value from LDAP attributes.
+    Extract all values from LDAP attributes.
     """
     # Skip loopkup if key is not defined.
     if not keys:
@@ -61,7 +61,9 @@ def first_attribute(attributes, keys, default=None):
     for attr in keys:
         try:
             value = attributes[attr]
-            if isinstance(value, list) and len(value) > 0:
+            if isinstance(value, list):
+                if len(value) == 0:
+                    pass
                 return value[0]
             else:
                 return value

{cherrypy_foundation-1.0.0a9 → cherrypy_foundation-1.0.0a11}/src/cherrypy_foundation/plugins/scheduler.py

@@ -35,7 +35,6 @@ def clear_db_sessions(func):
 
     @wraps(func)
     def func_wrapper(*args, **kwargs):
-        cherrypy.db.clear_sessions()
         try:
             result = func(*args, **kwargs)
         finally:
@@ -206,6 +205,7 @@ class Scheduler(SimplePlugin):
         """
         hour, minute = execution_time.split(':', 2)
         return self.add_job(
+            id=getattr(func, '__name__', str(func)),
             func=func,
             name=getattr(func, '__name__', str(func)),
             args=args,
@@ -214,6 +214,8 @@ class Scheduler(SimplePlugin):
             hour=hour,
             minute=minute,
             misfire_grace_time=None,
+            coalesce=True,
+            replace_existing=True,
         )
 
     def add_job_now(self, func, *args, **kwargs):
@@ -243,20 +245,29 @@ class Scheduler(SimplePlugin):
         Remove the given job from scheduler.
         """
         # Search for a matching job
+        return_value = False
+        if self._scheduler is None:
+            return return_value
         for j in self._scheduler.get_jobs(jobstore=jobstore):
-            if j.func == job:
+            if j.func == job or j.name == job:
                 self._scheduler.remove_job(job_id=j.id, jobstore=jobstore)
+                return_value = True
+        return return_value
 
     def remove_all_jobs(self, jobstore=None):
         """
         Remove all jobs from scheduler.
         """
+        if self._scheduler is None:
+            return
         self._scheduler.remove_all_jobs(jobstore=jobstore)
 
     def wait_for_jobs(self, jobstore=None):
         """
         Used to wait for all running jobs to complete.
         """
+        if self._scheduler is None:
+            return
         # Wait until the queue is empty.
         while any(
             job for job in self._scheduler.get_jobs(jobstore=jobstore) if job.next_run_time < datetime.now(timezone.utc)

cherrypy_foundation-1.0.0a11/src/cherrypy_foundation/plugins/tests/test_scheduler_db.py

@@ -0,0 +1,107 @@
+# Scheduler plugins for Cherrypy
+# Copyright (C) 2025 IKUS Software
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+import importlib
+import tempfile
+from threading import Event
+
+import cherrypy
+from cherrypy.test import helper
+
+from .. import scheduler  # noqa
+
+done = Event()
+
+HAS_SQLALCHEMY = importlib.util.find_spec("sqlalchemy") is not None
+if not HAS_SQLALCHEMY:
+    pass
+else:
+    from sqlalchemy import Column, Integer, String
+    from sqlalchemy.exc import IntegrityError
+
+    from .. import db  # noqa
+
+    Base = cherrypy.db.get_base()
+
+    class User2(Base):
+        __tablename__ = 'users2'
+        id = Column(Integer, primary_key=True)
+        username = Column(String)
+
+        def __repr__(self):
+            return f"User2(id={self.id}, username='{self.username}')"
+
+    class Root:
+
+        @cherrypy.expose
+        def index(self):
+            return str(User2.query.all())
+
+        @cherrypy.expose
+        def add(self, username):
+            try:
+                User2(username=username).add().commit()
+                return "OK"
+            except IntegrityError as e:
+                return str(e)
+
+    def create_user(*args, **kwargs):
+        user = User2(*args, **kwargs).add()
+        user.commit()
+        done.set()
+
+
+class DbSchedulerPluginTest(helper.CPWebCase):
+    interactive = False
+
+    @classmethod
+    def setup_class(cls):
+        cls.tempdir = tempfile.TemporaryDirectory(prefix='cherrypy-foundation-', suffix='-db-test')
+        super().setup_class()
+
+    @classmethod
+    def teardown_class(cls):
+        cls.tempdir.cleanup()
+        super().teardown_class()
+
+    @classmethod
+    def setup_server(cls):
+        cherrypy.config.update(
+            {
+                'db.uri': f"sqlite:///{cls.tempdir.name}/data.db",
+            }
+        )
+        cherrypy.tree.mount(Root(), '/')
+
+    def setUp(self) -> None:
+        done.clear()
+        cherrypy.db.create_all()
+        return super().setUp()
+
+    def tearDown(self):
+        cherrypy.db.drop_all()
+        return super().tearDown()
+
+    def test_add_job_now(self):
+        # Given a task
+        # When scheduling that task
+        scheduled = cherrypy.engine.publish('scheduler:add_job_now', create_user, username='myuser')
+        self.assertTrue(scheduled)
+        # When waiting for all tasks
+        cherrypy.scheduler.wait_for_jobs()
+        # Then the task get called
+        self.assertTrue(done.is_set())
+        # Then database was updated
+        User2.query.filter(User2.username == 'myuser').one()

{cherrypy_foundation-1.0.0a9 → cherrypy_foundation-1.0.0a11}/src/cherrypy_foundation/tools/i18n.py

@@ -186,10 +186,13 @@ def _search_translation(dirname, domain, *locales):
     # Assign prefered local to this translation to know the current locale.
     trans_locale = Locale.parse(t.files[0].split('/')[-3])
     for locale in locales:
-        locale = Locale.parse(locale)
-        if trans_locale == locale or trans_locale.language == locale.language:
-            t.locale = locale
-            break
+        try:
+            locale = Locale.parse(locale)
+            if trans_locale == locale or trans_locale.language == locale.language:
+                t.locale = locale
+                break
+        except ValueError:
+            continue  # Invalid locale identifier
     return t
 
 

{cherrypy_foundation-1.0.0a9 → cherrypy_foundation-1.0.0a11}/src/cherrypy_foundation/tools/tests/test_i18n.py

@@ -150,7 +150,7 @@ class TestI18nWebCase(AbstractI18nTest):
             with i18n.preferred_lang('de_CH'):
                 self.assertEqual('29. März 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
 
-        with i18n.preferred_timezone('CET'):
+        with i18n.preferred_timezone('Europe/Paris'):
             with i18n.preferred_lang('fr'):
                 self.assertEqual('29 mars 2023, 19:40:11 +0200', i18n.format_datetime(date, format='long'))
             with i18n.preferred_lang('fr_CH'):

{cherrypy_foundation-1.0.0a9 → cherrypy_foundation-1.0.0a11/src/cherrypy_foundation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cherrypy-foundation
-Version: 1.0.0a9
+Version: 1.0.0a11
 Summary: CherryPy Foundation
 Author-email: Patrik Dufresne <patrik@ikus-soft.com>
 License: GPLv3

{cherrypy_foundation-1.0.0a9 → cherrypy_foundation-1.0.0a11}/src/cherrypy_foundation.egg-info/SOURCES.txt

@@ -111,6 +111,7 @@ src/cherrypy_foundation/plugins/tests/__init__.py
 src/cherrypy_foundation/plugins/tests/test_db.py
 src/cherrypy_foundation/plugins/tests/test_ldap.py
 src/cherrypy_foundation/plugins/tests/test_scheduler.py
+src/cherrypy_foundation/plugins/tests/test_scheduler_db.py
 src/cherrypy_foundation/plugins/tests/test_smtp.py
 src/cherrypy_foundation/tests/__init__.py
 src/cherrypy_foundation/tests/test_error_page.py