PyPI - cherrypy-foundation - Versions diffs - 1.0.0a1__py3-none-any.whl → 1.0.0a3__py3-none-any.whl - Mend

cherrypy-foundation 1.0.0a1py3-none-any.whl → 1.0.0a3py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

cherrypy_foundation/components/Field.jinja CHANGED Viewed

@@ -29,16 +29,24 @@
   {% set input_class, label_class, floating_supported, label_always_last = bootstrap_class_table.get(field.widget.__class__.__name__) or ('', 'form-label', False, False) %}
   {% set label_last = (floating and floating_supported) or label_always_last %}
   {% do attrs.add_class(input_class) %}
-  {# Render label an widget #}
   {# Used for input-group #}
   {% set prepend = attrs.get('prepend', None) %}
   {% set append = attrs.get('append', None) %}
   {% set input_group = prepend or append %}
-  {% set container_class = attrs.get('container_class', 'col-12') %}
-  {% do attrs.__delitem__('container_class') %}
-  <div class="mb-2 form-field {{ container_class }}">
+  {# Build container & label specific attributes #}
+  {% set container_attrs = attrs.__class__({'class': 'mb-2 form-field'}) %}
+  {% 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}) %}
+    {% endif %}
+    {% if key.startswith('label-') or key.startswith('label_') %}
+      {% do label_attrs.set(**{key[6:]: value}) %}
+    {% endif %}
+  {% endfor %}
+  <div {{ container_attrs.as_dict | xmlattr }}>
     {% if floating and floating_supported %}<div class="form-floating">{% endif %}
-      {% if not label_last %}{{ field.label(class=label_class) }}{% endif %}
+      {% if not label_last %}{{ field.label(**label_attrs.as_dict) }}{% endif %}
       {% if input_group %}
         <div class="input-group">
           {% if prepend %}<span class="input-group-text">{{ prepend }}</span>{% endif %}
@@ -48,7 +56,7 @@
           {% if append %}<span class="input-group-text">{{ append }}</span>{% endif %}
         </div>
       {% endif %}
-      {% if label_last %}{{ field.label(class=label_class) }}{% endif %}
+      {% if label_last %}{{ field.label(**label_attrs.as_dict) }}{% endif %}
       {% for error in field.errors %}<div class="invalid-feedback">{{ error }}</div>{% endfor %}
       {% if field.description %}<div class="form-text small test-secondary">{{ field.description }}</div>{% endif %}
       {% if floating and floating_supported %}</div>{% endif %}

cherrypy_foundation/components/Typeahead.css CHANGED Viewed

@@ -10,6 +10,11 @@
     top: 0.5rem;
 }
+/* Fix lense position */
+.typeahead__button button {
+    height: 100%;
+}
 /* Fix color for DarkMode */
 .typeahead__container button,
 .typeahead__container button.disabled,
@@ -47,4 +52,4 @@
 .typeahead__list .typeahead__item:not([disabled])>a:hover {
     background-color: var(--bs-tertiary-bg);
     color: var(--bs-body-color);
-}
+}

cherrypy_foundation/components/Typeahead.jinja CHANGED Viewed

@@ -1,5 +1,5 @@
 {#def
-accent=True,
+accent=False,
 async_result=False,
 autofocus=False,
 backdrop=False,
@@ -27,7 +27,7 @@ href=None,
 loading_animation=True,
 matcher=None,
 max_item=8,
-max_item_per_group=10,
+max_item_per_group=None,
 max_length=None,
 min_length=2,
 multiselect=None,

cherrypy_foundation/components/__init__.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# udb, A web interface to manage IT network
+# Cherrypy Foundation
 # Copyright (C) 2025 IKUS Software inc.
 #
 # This program is free software: you can redistribute it and/or modify

cherrypy_foundation/error_page.py CHANGED Viewed

@@ -19,9 +19,6 @@ import logging
 import cherrypy
-# Define the logger
-logger = logging.getLogger(__name__)
 HTML_ERROR_TEMPLATE = '''<!DOCTYPE html>
 <html>
 <head>
@@ -53,39 +50,45 @@ HTML_ERROR_TEMPLATE = '''<!DOCTYPE html>
 '''
-def error_page(**kwargs):
+def error_page(status='', message='', traceback='', version=''):
     """
     Error page handler to handle Plain Text (text/plain), Json (application/json) or HTML (text/html) output.
     If available, uses Jina2 environment to generate error page using `error_page.html`.
     """
     # Log server error exception
-    if kwargs.get('status', '').startswith('500'):
-        logger.error(
-            'error page: %s %s\n%s' % (kwargs.get('status', ''), kwargs.get('message', ''), kwargs.get('traceback', ''))
+    if status.startswith('500'):
+        cherrypy.log(
+            f'error page status={status} message={message}\n{traceback}', context='ERROR-PAGE', severity=logging.WARNING
         )
     # Replace message by generic one for 404. Default implementation leak path info.
-    if kwargs.get('status', '') == '404 Not Found':
-        kwargs['message'] = 'Nothing matches the given URI'
+    if status == '404 Not Found':
+        message = 'Nothing matches the given URI'
     # Check expected response type.
     mtype = cherrypy.serving.response.headers.get('Content-Type') or cherrypy.tools.accept.callable(
         ['text/html', 'text/plain', 'application/json']
     )
     if mtype == 'text/plain':
-        return kwargs.get('message')
+        return message
     elif mtype == 'application/json':
-        return json.dumps({'message': kwargs.get('message', ''), 'status': kwargs.get('status', '')})
+        return json.dumps({'message': message, 'status': status})
     elif mtype == 'text/html':
+        context = {'status': status, 'message': message, 'traceback': traceback, 'version': version}
         if hasattr(cherrypy.tools, 'jinja2'):
             # Try to build a nice error page with Jinja2 env
             try:
-                return cherrypy.tools.jinja2.render_request(template='error_page.html', vars=kwargs)
+                return cherrypy.tools.jinja2.render_request(template='error_page.html', context=context)
             except Exception:
-                logger.exception('fail to render error page')
+                cherrypy.log(
+                    'fail to render error page with jinja2',
+                    context='ERROR-PAGE',
+                    severity=logging.ERROR,
+                    traceback=True,
+                )
         # Fallback to built-int HTML error page
-        return HTML_ERROR_TEMPLATE % kwargs
+        return HTML_ERROR_TEMPLATE % context
     # Fallback to raw error message.
-    return kwargs.get('message')
+    return message

cherrypy_foundation/plugins/db.py CHANGED Viewed

@@ -23,8 +23,6 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 from sqlalchemy.orm import declarative_base, scoped_session, sessionmaker
-logger = logging.getLogger(__name__)
 @event.listens_for(Engine, 'connect')
 def _set_sqlite_journal_mode_wal(connection, connection_record):
@@ -168,6 +166,10 @@ class SQLA(SimplePlugin):
     _session = None
     _engine = None
+    @property
+    def engine(self):
+        return self._engine
     def start(self):
         if self.uri is None:
             return
@@ -180,14 +182,22 @@ class SQLA(SimplePlugin):
         self.clear_sessions()
         # Associate our session to our engine
         self.get_session().configure(bind=self._engine)
-        self.bus.log("Database session plugin started.")
+        self.bus.log("database session plugin started")
+    # This is slightly lower priority to get database started first.
+    start.priority = 45
     def stop(self):
         if self._session:
             self.clear_sessions()
         if self._engine:
             self._engine.dispose()
-        self.bus.log("Database session plugin stopped.")
+        self.bus.log("database session plugin stopped")
+    def graceful(self):
+        """Reload of subscribers."""
+        self.stop()
+        self.start()
     def create_all(self):
         try:
@@ -242,11 +252,27 @@ class SQLA(SimplePlugin):
         try:
             # When terminating, raise an error if objects are not commit.
             if self._session.dirty or self._session.new or self._session.deleted:
-                changes = ', '.join([str(_get_model_changes(obj)) for obj in self._session.dirty])
-                logger.exception(
-                    'session is dirty, some database object(s) are not commited, this indicate a bug in the application '
-                    'dirty %s new %s deleted %s' % (changes, self._session.new, self._session.deleted)
+                cherrypy.log(
+                    'database session dirty; uncommitted objects detected — potential application bug',
+                    context='DB',
+                    severity=logging.ERROR,
                 )
+                if self._session.dirty:
+                    changes = ', '.join([str(_get_model_changes(obj)) for obj in self._session.dirty])
+                    cherrypy.log(
+                        f'database session dirty_objects={self._session.dirty}', context='DB', severity=logging.ERROR
+                    )
+                    cherrypy.log(f'database session pending_changes={changes}', context='DB', severity=logging.ERROR)
+                if self._session.new:
+                    cherrypy.log(
+                        f'database session new_objects={self._session.new}', context='DB', severity=logging.ERROR
+                    )
+                if self._session.deleted:
+                    cherrypy.log(
+                        f'database session deleted_objects={self._session.deleted}',
+                        context='DB',
+                        severity=logging.ERROR,
+                    )
                 raise SQLAlchemyError('session is dirty')
         finally:
             self._session.rollback()

cherrypy_foundation/plugins/ldap.py CHANGED Viewed

@@ -21,8 +21,6 @@ import ldap3
 from cherrypy.process.plugins import SimplePlugin
 from ldap3.core.exceptions import LDAPException, LDAPInvalidCredentialsResult
-logger = logging.getLogger(__name__)
 _safe = ldap3.utils.conv.escape_filter_chars
@@ -126,6 +124,11 @@ class LdapPlugin(SimplePlugin):
         if hasattr(self, '_pool'):
             self._pool.unbind()
+    def graceful(self):
+        """Reload of subscribers."""
+        self.stop()
+        self.start()
     def authenticate(self, username, password):
         """
         Check if the given credential as valid according to LDAP.
@@ -148,9 +151,9 @@ class LdapPlugin(SimplePlugin):
                 search_filter = f"(&{self.user_filter}(|{attr_filter}))"
                 response = self._search(conn, search_filter)
                 if not response:
-                    logger.info("user %s not found in LDAP", username)
+                    cherrypy.log(f"lookup failed username={username} reason=not_found", context='LDAP')
                     return False
-                logger.info("user %s found in LDAP", username)
+                cherrypy.log(f"lookup successful username={username}", context='LDAP')
                 user_dn = response[0]['dn']
                 # Use a separate connection to validate credentials
@@ -163,17 +166,21 @@ class LdapPlugin(SimplePlugin):
                     client_strategy=ldap3.ASYNC,
                 )
                 if not login_conn.bind():
-                    logger.warning("LDAP authentication failed for user %s", username)
+                    cherrypy.log(
+                        f'ldap authentication failed username={username} reason=wrong_password',
+                        context='LDAP',
+                        severity=logging.WARNING,
+                    )
                     return False
                 # Get username
                 attrs = response[0]['attributes']
                 new_username = first_attribute(attrs, self.username_attribute)
                 if not new_username:
-                    logger.info(
-                        "user object %s was found but the username attribute %s doesn't exists",
-                        user_dn,
-                        self.username_attribute,
+                    cherrypy.log(
+                        f"object missing username attribute user_dn={user_dn} attribute={self.username_attribute}",
+                        context='LDAP',
+                        severity=logging.WARNING,
                     )
                     return False
@@ -189,17 +196,15 @@ class LdapPlugin(SimplePlugin):
                         self.group_filter,
                     )
                     # Search LDAP Server for matching groups.
-                    logger.info(
-                        "check if user %s is member of any group %s",
-                        user_value,
-                        ' '.join(self.required_group),
+                    cherrypy.log(
+                        f"group check start username={user_value} required_groups={' '.join(self.required_group)}",
+                        context='LDAP',
                     )
                     response = self._search(conn, group_filter, attributes=['cn'])
                     if not response:
-                        logger.info(
-                            "user %s was found but is not member of any group(s) %s",
-                            user_value,
-                            ' '.join(self.required_group),
+                        cherrypy.log(
+                            f"group check failed username={user_value} required_groups={' '.join(self.required_group)}",
+                            context='LDAP',
                         )
                         return False
@@ -215,7 +220,9 @@ class LdapPlugin(SimplePlugin):
             except LDAPInvalidCredentialsResult:
                 return False
             except LDAPException:
-                logger.exception("can't validate user %s credentials", username)
+                cherrypy.log(
+                    f"unexpected error username={username}", context='LDAP', severity=logging.ERROR, traceback=True
+                )
             return None
     def search(self, filter, attributes=ldap3.ALL_ATTRIBUTES, search_base=None, paged_size=None):
@@ -228,11 +235,10 @@ class LdapPlugin(SimplePlugin):
         search_scope = {'base': ldap3.BASE, 'onelevel': ldap3.LEVEL, 'subtree': ldap3.SUBTREE}.get(
             self.scope, ldap3.SUBTREE
         )
-        logger.debug(
-            "search ldap server: {}/{}?{}?{}".format(self.uri, search_base or self.base_dn, search_scope, filter)
-        )
+        search_base = search_base or self.base_dn
+        cherrypy.log(f"search {self.uri}/{search_base}?{search_scope}?{filter}", context='LDAP')
         msg_id = conn.search(
-            search_base=search_base or self.base_dn,
+            search_base=search_base,
             search_filter=filter,
             search_scope=search_scope,
             time_limit=self.timeout,

cherrypy-foundation 1.0.0a1__py3-none-any.whl → 1.0.0a3__py3-none-any.whl

cherrypy-foundation 1.0.0a1py3-none-any.whl → 1.0.0a3py3-none-any.whl