PyPI - c2cwsgiutils - Versions diffs - 5.1.7.dev20230901073305__py3-none-any.whl → 5.2.1.dev197__py3-none-any.whl - Mend

c2cwsgiutils 5.1.7.dev20230901073305py3-none-any.whl → 5.2.1.dev197py3-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 (69) hide show

c2cwsgiutils/__init__.py +13 -13
c2cwsgiutils/acceptance/connection.py +5 -2
c2cwsgiutils/acceptance/image.py +98 -4
c2cwsgiutils/acceptance/package-lock.json +1933 -0
c2cwsgiutils/acceptance/package.json +7 -0
c2cwsgiutils/acceptance/print.py +4 -4
c2cwsgiutils/acceptance/screenshot.js +62 -0
c2cwsgiutils/acceptance/utils.py +14 -22
c2cwsgiutils/auth.py +4 -4
c2cwsgiutils/broadcast/__init__.py +15 -7
c2cwsgiutils/broadcast/interface.py +3 -2
c2cwsgiutils/broadcast/local.py +3 -2
c2cwsgiutils/broadcast/redis.py +8 -7
c2cwsgiutils/client_info.py +5 -5
c2cwsgiutils/config_utils.py +2 -1
c2cwsgiutils/coverage_setup.py +2 -2
c2cwsgiutils/db.py +58 -37
c2cwsgiutils/db_maintenance_view.py +2 -1
c2cwsgiutils/debug/_listeners.py +10 -9
c2cwsgiutils/debug/_views.py +12 -11
c2cwsgiutils/debug/utils.py +5 -5
c2cwsgiutils/errors.py +7 -6
c2cwsgiutils/health_check.py +96 -85
c2cwsgiutils/index.py +90 -105
c2cwsgiutils/loader.py +3 -3
c2cwsgiutils/logging_view.py +3 -2
c2cwsgiutils/models_graph.py +8 -6
c2cwsgiutils/prometheus.py +175 -57
c2cwsgiutils/pyramid.py +4 -2
c2cwsgiutils/pyramid_logging.py +2 -1
c2cwsgiutils/redis_stats.py +13 -11
c2cwsgiutils/redis_utils.py +15 -14
c2cwsgiutils/request_tracking/__init__.py +36 -30
c2cwsgiutils/request_tracking/_sql.py +3 -1
c2cwsgiutils/scripts/genversion.py +4 -4
c2cwsgiutils/scripts/stats_db.py +130 -68
c2cwsgiutils/scripts/test_print.py +1 -1
c2cwsgiutils/sentry.py +2 -1
c2cwsgiutils/setup_process.py +13 -17
c2cwsgiutils/sql_profiler/_impl.py +12 -5
c2cwsgiutils/sqlalchemylogger/README.md +48 -0
c2cwsgiutils/sqlalchemylogger/_models.py +7 -4
c2cwsgiutils/sqlalchemylogger/examples/example.py +15 -0
c2cwsgiutils/sqlalchemylogger/handlers.py +11 -8
c2cwsgiutils/static/favicon-16x16.png +0 -0
c2cwsgiutils/static/favicon-32x32.png +0 -0
c2cwsgiutils/stats_pyramid/__init__.py +7 -11
c2cwsgiutils/stats_pyramid/_db_spy.py +14 -11
c2cwsgiutils/stats_pyramid/_pyramid_spy.py +29 -20
c2cwsgiutils/templates/index.html.mako +50 -0
c2cwsgiutils/version.py +49 -16
c2cwsgiutils-5.2.1.dev197.dist-info/LICENSE +22 -0
{c2cwsgiutils-5.1.7.dev20230901073305.dist-info → c2cwsgiutils-5.2.1.dev197.dist-info}/METADATA +187 -135
c2cwsgiutils-5.2.1.dev197.dist-info/RECORD +67 -0
{c2cwsgiutils-5.1.7.dev20230901073305.dist-info → c2cwsgiutils-5.2.1.dev197.dist-info}/WHEEL +1 -2
c2cwsgiutils-5.2.1.dev197.dist-info/entry_points.txt +21 -0
c2cwsgiutils/acceptance/composition.py +0 -129
c2cwsgiutils/metrics.py +0 -110
c2cwsgiutils/scripts/check_es.py +0 -130
c2cwsgiutils/scripts/coverage_report.py +0 -36
c2cwsgiutils/stats.py +0 -355
c2cwsgiutils/stats_pyramid/_views.py +0 -16
c2cwsgiutils-5.1.7.dev20230901073305.data/scripts/c2cwsgiutils-run +0 -32
c2cwsgiutils-5.1.7.dev20230901073305.dist-info/LICENSE.txt +0 -28
c2cwsgiutils-5.1.7.dev20230901073305.dist-info/RECORD +0 -69
c2cwsgiutils-5.1.7.dev20230901073305.dist-info/entry_points.txt +0 -25
c2cwsgiutils-5.1.7.dev20230901073305.dist-info/top_level.txt +0 -2
tests/acceptance/__init__.py +0 -0
tests/acceptance/test_utils.py +0 -13

c2cwsgiutils/index.py CHANGED Viewed

@@ -1,7 +1,7 @@
 import logging
 import urllib.parse
 import warnings
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Optional, Union, cast
 import jwt
 import pyramid.config
@@ -45,13 +45,13 @@ from c2cwsgiutils.config_utils import env_or_settings
 LOG = logging.getLogger(__name__)
 additional_title: Optional[str] = None
-additional_noauth: List[str] = []
-additional_auth: List[str] = []
+additional_noauth: list[str] = []
+additional_auth: list[str] = []
 ELEM_ID = 0
 def _url(
-    request: pyramid.request.Request, route: str, params: Optional[Dict[str, str]] = None
+    request: pyramid.request.Request, route: str, params: Optional[dict[str, str]] = None
 ) -> Optional[str]:
     try:
         return request.route_url(route, _query=params)  # type: ignore
@@ -64,10 +64,8 @@ def section(title: str, *content: str, sep: Optional[bool] = True) -> str:
     printable_content = "\n".join(content)
     result = f"""
     <div class="row">
-      <div class="col-sm-3"><h2>{title}</h2></div>
-      <div class="col-lg">
+      <h2>{title}</h2>
       {printable_content}
-      </div>
     </div>
     """
     if sep:
@@ -105,7 +103,7 @@ def form(url: Optional[str], *content: str, method: str = "get", target: str = "
         method_attrs = ' method="post" enctype="multipart/form-data"'
     printable_content = "\n".join(content)
     return f"""
-    <form class="form-inline" action="{url}" target="{target}"{method_attrs}>
+    <form action="{url}" target="{target}"{method_attrs}>
       {printable_content}
     </form>
     """
@@ -120,7 +118,7 @@ def input_(
     ELEM_ID += 1
     if label is None and type_ != "hidden":
-        label = name
+        label = name.replace("_", " ").capitalize()
     if type_ is None:
         if isinstance(value, int):
             type_ = "number"
@@ -128,8 +126,11 @@ def input_(
             type_ = "text"
     result = ""
     if label is not None:
-        result += f'<div class="form-group form-inline"><label for="{id_}">{label}:</label>'
-    result += f'<input class="form-control" type="{type_}" name="{name}" value="{value}" id="{id_}">'
+        result += f'<div class="row mb-3"><label class="col-sm-2 col-form-label" for="{id_}">{label}</label>'
+    result += (
+        '<div class="col-sm-10"><input class="form-control" '
+        f'type="{type_}" name="{name}" value="{value}" id="{id_}"></div>'
+    )
     if label is not None:
         result += "</div>"
     return result
@@ -137,72 +138,37 @@ def input_(
 def button(label: str) -> str:
     """Get en HTML button."""
     return f'<button class="btn btn-primary" type="submit">{label}</button>'
-def _index(request: pyramid.request.Request) -> pyramid.response.Response:
+def _index(request: pyramid.request.Request) -> dict[str, str]:
     response = request.response
     auth, user = is_auth_user(request)
     has_access = check_access(request)
     response.content_type = "text/html"
-    response.text = """
-    <!doctype html>
-    <html lang="en">
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <link rel="stylesheet"
-              href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
-              integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
-              crossorigin="anonymous">
-        <title>c2cwsgiutils tools</title>
-        <style>
-          form {
-            margin-bottom: 1rem;
-          }
-          label {
-            margin-right: 0.5rem;
-          }
-          input, button, a.btn {
-            margin-right: 1rem;
-          }
-          div.col-lg {
-            margin-top: 0.5rem;
-            margin-bottom: 0.5rem;
-          }
-          hr {
-            margin-top: 0.5rem;
-            margin-bottom: 0.5rem;
-          }
-          body {
-            margin-top: 0.5rem;
-          }
-        </style>
-      </head>
-      <body>
-        <div class="container-fluid">
-    """
-    response.text += _health_check(request)
-    response.text += _stats(request)
-    response.text += _versions(request)
+    body = ""
+    body += _health_check(request)
+    body += _stats(request)
+    body += _versions(request)
     if has_access:
-        response.text += _debug(request)
-        response.text += _db_maintenance(request)
-        response.text += _logging(request)
-        response.text += _profiler(request)
+        body += _debug(request)
+        body += _db_maintenance(request)
+        body += _logging(request)
+        body += _profiler(request)
     if additional_title is not None and (has_access or additional_noauth):
-        response.text += additional_title
-        response.text += "\n"
+        body += additional_title
+        body += "\n"
     if has_access:
-        response.text += "\n".join(additional_auth)
-        response.text += "\n"
+        body += "\n".join(additional_auth)
+        body += "\n"
-    response.text += "\n".join(additional_noauth)
+    body += "\n".join(additional_noauth)
     settings = request.registry.settings
     auth_type_ = auth_type(settings)
@@ -211,37 +177,32 @@ def _index(request: pyramid.request.Request) -> pyramid.response.Response:
             auth_fields = [input_("secret", type_="password"), button("Login")]
         else:
             auth_fields = [input_("secret", type_="hidden"), button("Logout")]
-        response.text += section(
+        body += section(
             "Authentication",
             form(_url(request, "c2c_index"), *auth_fields, method="post", target="_self"),
             sep=False,
         )
     elif not auth and auth_type_ == AuthenticationType.GITHUB:
-        response.text += section(
+        body += section(
             "Authentication",
-            link(_url(request, "c2c_github_login"), "Login with GitHub", target=""),
+            paragraph(link(_url(request, "c2c_github_login"), "Login with GitHub", target="")),
             sep=False,
         )
     elif auth_type_ == AuthenticationType.GITHUB:
-        response.text += section(
+        body += section(
             "Authentication",
-            f"Logged as: {link(user['url'], user['name'], cssclass='')}<br />"
-            f"{link(_url(request, 'c2c_github_logout'), 'Logout', target='')}",
+            f"<p>Logged as: {link(user['url'], user['name'], cssclass='')}<br />"
+            f"{link(_url(request, 'c2c_github_logout'), 'Logout', target='')}</p>",
             sep=False,
         )
-    response.text += """
-        </div>
-      </body>
-    </html>
-    """
-    return response
+    return {"body": body}
 def _versions(request: pyramid.request.Request) -> str:
     versions_url = _url(request, "c2c_versions")
     if versions_url:
-        return section("Versions", paragraph(link(versions_url, "Get")))
+        return section("Versions", paragraph(link(versions_url, "Get")), sep=False)
     else:
         return ""
@@ -249,7 +210,7 @@ def _versions(request: pyramid.request.Request) -> str:
 def _stats(request: pyramid.request.Request) -> str:
     stats_url = _url(request, "c2c_read_stats_json")
     if stats_url:
-        return section("Statistics", paragraph(link(stats_url, "Get")))
+        return section("Statistics", paragraph(link(stats_url, "Get")), sep=False)
     else:
         return ""
@@ -257,17 +218,17 @@ def _stats(request: pyramid.request.Request) -> str:
 def _profiler(request: pyramid.request.Request) -> str:
     sql_profiler_url = _url(request, "c2c_sql_profiler")
     if sql_profiler_url:
-        result = ""
-        if sql_profiler_url:
-            result += paragraph(
-                link(sql_profiler_url, "Status"),
-                link(sql_profiler_url + "?enable=1", "Enable"),
-                link(sql_profiler_url + "?enable=0", "Disable"),
-                title="SQL",
-            )
-        return section("Profiler", result)
+        return section(
+            " ".join(
+                [
+                    "SQL profiler",
+                    link(sql_profiler_url, "Status"),
+                    link(sql_profiler_url + "?enable=1", "Enable"),
+                    link(sql_profiler_url + "?enable=0", "Disable"),
+                ]
+            ),
+            sep=False,
+        )
     else:
         return ""
@@ -288,6 +249,7 @@ def _db_maintenance(request: pyramid.request.Request) -> str:
                 button("Set readonly=false"),
                 input_("readonly", value="false", type_="hidden"),
             ),
+            sep=False,
         )
     else:
         return ""
@@ -298,14 +260,19 @@ def _logging(request: pyramid.request.Request) -> str:
     if logging_url:
         return section(
             "Logging",
-            form(logging_url, button("Get"), input_("name", value="c2cwsgiutils")),
             form(
                 logging_url,
-                button("Set"),
+                input_("name", value="c2cwsgiutils"),
+                button("Get"),
+            ),
+            form(
+                logging_url,
                 input_("name", value="c2cwsgiutils"),
                 input_("level", value="INFO"),
+                button("Set"),
             ),
             paragraph(link(logging_url, "List overrides")),
+            sep=False,
         )
     else:
         return ""
@@ -315,39 +282,46 @@ def _debug(request: pyramid.request.Request) -> str:
     dump_memory_url = _url(request, "c2c_debug_memory")
     if dump_memory_url:
         return section(
-            "Debug",
-            paragraph(
-                link(_url(request, "c2c_debug_stacks"), "Stack traces"),
-                link(_url(request, "c2c_debug_headers"), "HTTP headers"),
-                link(_url(request, "c2c_debug_memory_maps"), "Mapped memory"),
+            " ".join(
+                [
+                    "Debug",
+                    link(_url(request, "c2c_debug_stacks"), "Stack traces"),
+                    link(_url(request, "c2c_debug_headers"), "HTTP headers"),
+                    link(_url(request, "c2c_debug_memory_maps"), "Mapped memory"),
+                ]
             ),
             form(
                 dump_memory_url,
-                button("Dump memory usage"),
                 input_("limit", value=30),
                 input_("analyze_type"),
+                button("Dump memory usage"),
             ),
             form(
                 _url(request, "c2c_debug_show_refs"),
-                button("Object refs"),
                 input_("analyze_type", value="gunicorn.app.wsgiapp.WSGIApplication"),
                 input_("max_depth", value=3),
                 input_("too_many", value=10),
                 input_("min_size_kb", type_="number"),
+                button("Object refs"),
             ),
             form(
                 _url(request, "c2c_debug_memory_diff"),
-                button("Memory diff"),
                 input_("path"),
                 input_("limit", value=30),
+                button("Memory diff"),
+            ),
+            form(
+                _url(request, "c2c_debug_sleep"),
+                input_("time", value=1),
+                button("Sleep"),
             ),
-            form(_url(request, "c2c_debug_sleep"), button("Sleep"), input_("time", value=1)),
             form(_url(request, "c2c_debug_time"), button("Time")),
             form(
                 _url(request, "c2c_debug_error"),
-                button("Generate an HTTP error"),
                 input_("status", value=500),
+                button("Generate an HTTP error"),
             ),
+            sep=False,
         )
     else:
         return ""
@@ -358,14 +332,21 @@ def _health_check(request: pyramid.request.Request) -> str:
     if health_check_url:
         return section(
             "Health checks",
-            form(health_check_url, button("Run"), input_("max_level", value=1), input_("checks")),
+            form(
+                health_check_url,
+                input_("max_level", value=1),
+                input_("checks"),
+                button("Run"),
+            ),
+            sep=False,
         )
     else:
         return ""
-def _github_login(request: pyramid.request.Request) -> Dict[str, Any]:
+def _github_login(request: pyramid.request.Request) -> dict[str, Any]:
     """Get the view that start the authentication on GitHub."""
     settings = request.registry.settings
     params = dict(request.params)
     callback_url = _url(
@@ -399,7 +380,7 @@ def _github_login(request: pyramid.request.Request) -> Dict[str, Any]:
     raise HTTPFound(location=authorization_url, headers=request.response.headers)
-def _github_login_callback(request: pyramid.request.Request) -> Dict[str, Any]:
+def _github_login_callback(request: pyramid.request.Request) -> dict[str, Any]:
     """
     Do the post login operation authentication on GitHub.
@@ -466,7 +447,7 @@ def _github_login_callback(request: pyramid.request.Request) -> Dict[str, Any]:
             "c2c-auth-jwt",
         ),
         jwt.encode(
-            cast(Dict[str, Any], user_information),
+            cast(dict[str, Any], user_information),
             env_or_settings(
                 settings,
                 GITHUB_AUTH_SECRET_ENV,
@@ -481,7 +462,7 @@ def _github_login_callback(request: pyramid.request.Request) -> Dict[str, Any]:
     )
-def _github_logout(request: pyramid.request.Request) -> Dict[str, Any]:
+def _github_logout(request: pyramid.request.Request) -> dict[str, Any]:
     """Logout the user."""
     request.response.delete_cookie(SECRET_ENV)
     request.response.delete_cookie(
@@ -507,10 +488,14 @@ def includeme(config: pyramid.config.Configurator) -> None:
     """Initialize the index page."""
     base_path = config_utils.get_base_path(config)
     if base_path != "":
+        config.add_static_view(name="static", path="c2cwsgiutils:static")
+        config.include("pyramid_mako")
         config.add_route("c2c_index", base_path, request_method=("GET", "POST"))
-        config.add_view(_index, route_name="c2c_index", http_cache=0)
+        config.add_view(_index, route_name="c2c_index", http_cache=0, renderer="./templates/index.html.mako")
         config.add_route("c2c_index_slash", base_path + "/", request_method=("GET", "POST"))
-        config.add_view(_index, route_name="c2c_index_slash", http_cache=0)
+        config.add_view(
+            _index, route_name="c2c_index_slash", http_cache=0, renderer="./templates/index.html.mako"
+        )
         settings = config.get_settings()
         auth_type_ = auth_type(settings)

c2cwsgiutils/loader.py CHANGED Viewed

@@ -1,5 +1,5 @@
 import logging
-from typing import Dict, Optional, cast
+from typing import Optional, cast
 from plaster_pastedeploy import Loader as BaseLoader
@@ -11,10 +11,10 @@ LOG = logging.getLogger(__name__)
 class Loader(BaseLoader):  # type: ignore
     """The application loader."""
-    def _get_defaults(self, defaults: Optional[Dict[str, str]] = None) -> Dict[str, str]:
+    def _get_defaults(self, defaults: Optional[dict[str, str]] = None) -> dict[str, str]:
         d = get_config_defaults()
         d.update(defaults or {})
-        return cast(Dict[str, str], super()._get_defaults(d))
+        return cast(dict[str, str], super()._get_defaults(d))
     def __repr__(self) -> str:
         """Get the object representation."""

c2cwsgiutils/logging_view.py CHANGED Viewed

@@ -1,6 +1,7 @@
 import logging
 import warnings
-from typing import Any, Generator, Mapping, Tuple
+from collections.abc import Generator, Mapping
+from typing import Any
 import pyramid.request
@@ -80,7 +81,7 @@ def _store_override(settings: Mapping[str, Any], name: str, level: str) -> None:
         pass
-def _list_overrides(settings: Mapping[str, Any]) -> Generator[Tuple[str, str], None, None]:
+def _list_overrides(settings: Mapping[str, Any]) -> Generator[tuple[str, str], None, None]:
     _, slave, _ = redis_utils.get(settings)
     if slave is not None:
         for key in slave.scan_iter(REDIS_PREFIX + "*"):

c2cwsgiutils/models_graph.py CHANGED Viewed

@@ -1,12 +1,14 @@
 import inspect
 import sys
-from typing import Any, List, Set
+from typing import Any
 import sqlalchemy as sa
 def generate_model_graph(module: Any) -> None:
-    """Generate a grophical model of the database classes."""
+    """Generate a graphical model of the database classes."""
+    base_name = None
     if len(sys.argv) == 1:
         base_name = "Base"
     elif len(sys.argv) == 2:
@@ -40,7 +42,7 @@ def _generate_model_graph(module: Any, base: Any) -> None:
     print("}")
-def _print_node(symbol: Any, interesting: Set[Any]) -> None:
+def _print_node(symbol: Any, interesting: set[Any]) -> None:
     print(f'{symbol.__name__} [label="{_get_table_desc(symbol)}", shape=box];')
     for parent in symbol.__bases__:
         if parent != object:
@@ -60,7 +62,7 @@ def _get_table_desc(symbol: Any) -> str:
     return "\\n".join(cols)
-def _get_all_cols(symbol: Any) -> List[str]:
+def _get_all_cols(symbol: Any) -> list[str]:
     cols = []
     for member_name in symbol.__dict__:
@@ -69,7 +71,7 @@ def _get_all_cols(symbol: Any) -> List[str]:
             # Those are not fields
             pass
         elif isinstance(member, sa.sql.schema.SchemaItem):
-            cols.append(member_name + ("[null]" if member.nullable else ""))
+            cols.append(member_name + ("[null]" if member.nullable else ""))  # type: ignore
         elif isinstance(member, sa.orm.attributes.InstrumentedAttribute):
             nullable = (
                 member.property.columns[0].nullable
@@ -82,7 +84,7 @@ def _get_all_cols(symbol: Any) -> List[str]:
     return cols
-def _get_local_cols(symbol: Any) -> List[str]:
+def _get_local_cols(symbol: Any) -> list[str]:
     result = set(_get_all_cols(symbol))
     for parent in symbol.__bases__:
         result -= set(_get_all_cols(parent))

c2cwsgiutils 5.1.7.dev20230901073305__py3-none-any.whl → 5.2.1.dev197__py3-none-any.whl

c2cwsgiutils 5.1.7.dev20230901073305py3-none-any.whl → 5.2.1.dev197py3-none-any.whl