c2cwsgiutils 6.2.0.dev27__py3-none-any.whl → 6.2.0.dev29__py3-none-any.whl

c2cwsgiutils/debug/_listeners.py

@@ -68,12 +68,7 @@ def _dump_memory_impl(
                         and not (FILES_FIELDS - set(obj["globals"].keys()))
                     ):
                         python_internal = True
-                    if (
-                        python_internal
-                        and not python_internals_map
-                        or not python_internal
-                        and python_internals_map
-                    ):
+                    if python_internal != python_internals_map:
                         continue
                 size = get_size(obj) / 1024
                 if len(biggest_objects) < limit or size > biggest_objects[0][0]:

c2cwsgiutils/debug/_views.py

@@ -49,7 +49,7 @@ def _dump_memory(request: pyramid.request.Request) -> list[Mapping[str, Any]]:
     auth.auth_view(request)
     limit = int(request.params.get("limit", "30"))
     analyze_type = request.params.get("analyze_type")
-    python_internals_map = request.params.get("python_internals_map", "0").lower() in ("", "1", "true", "on")
+    python_internals_map = request.params.get("python_internals_map", "0").lower() in ("1", "true", "on")
     result = broadcast.broadcast(
         "c2c_dump_memory",
         params={"limit": limit, "analyze_type": analyze_type, "python_internals_map": python_internals_map},
@@ -77,7 +77,7 @@ def _dump_memory_diff(request: pyramid.request.Request) -> list[Any]:
 
     # warm-up run
     try:
-        if "no_warmup" not in request.params:
+        if request.params.get("no_warmup", "0").lower() in ("1", "true", "on"):
             request.invoke_subrequest(sub_request)
     except Exception:  # nosec  # pylint: disable=broad-except
         pass

c2cwsgiutils/index.py

@@ -122,8 +122,20 @@ def input_(
     if type_ is None:
         if isinstance(value, int):
             type_ = "number"
+        elif isinstance(value, bool):
+            type_ = "checkbox"
         else:
             type_ = "text"
+    if type_ == "checkbox":
+        checked = " checked" if value else ""
+        return f"""
+<div class="form-check">
+  <input class="form-check-input" type="checkbox" name="{name}" value="true" id="{id_}"{checked}>
+  <label class="form-check-label" for="{id_}">
+    {label}
+  </label>
+</div>"""
+
     result = ""
     if label is not None:
         result += f'<div class="row mb-3"><label class="col-sm-2 col-form-label" for="{id_}">{label}</label>'
@@ -201,7 +213,7 @@ def _index(request: pyramid.request.Request) -> dict[str, str]:
 def _versions(request: pyramid.request.Request) -> str:
     versions_url = _url(request, "c2c_versions")
     if versions_url:
-        return section("Versions", paragraph(link(versions_url, "Get")), sep=False)
+        return section("Versions " + link(versions_url, "Get"), sep=False)
     else:
         return ""
 
@@ -280,6 +292,7 @@ def _logging(request: pyramid.request.Request) -> str:
 def _debug(request: pyramid.request.Request) -> str:
     dump_memory_url = _url(request, "c2c_debug_memory")
     if dump_memory_url:
+        as_dot = 'as <a href="https://graphviz.org/">dot diagram</a>, can be open with <a href="https://pypi.org/project/xdot/">xdot</a>'
         return section(
             " ".join(
                 [
@@ -289,32 +302,42 @@ def _debug(request: pyramid.request.Request) -> str:
                     link(_url(request, "c2c_debug_memory_maps"), "Mapped memory"),
                 ]
             ),
+            '<h2>Memory usage<span style="font-size: 0.5em;">, with <a href="https://mg.pov.lt/objgraph/">objgraph</a></span></h2>',
+            "<p>Runs the garbage collector and dumps the memory usage as JSON.</p>",
             form(
                 dump_memory_url,
                 input_("limit", value=30),
                 input_("analyze_type"),
+                input_("python_internals_map", type_="checkbox"),
                 button("Dump memory usage"),
             ),
+            f"<p>Runs the garbage collector and dumps the memory refs {as_dot}.</p>",
             form(
                 _url(request, "c2c_debug_show_refs"),
                 input_("analyze_type", value="gunicorn.app.wsgiapp.WSGIApplication"),
-                input_("max_depth", value=3),
-                input_("too_many", value=10),
+                input_("analyze_id", type_="number"),
+                input_("max_depth", type_="number", value=3),
+                input_("too_many", type_="number", value=10),
                 input_("min_size_kb", type_="number"),
                 button("Object refs"),
             ),
+            "<p>Runs the garbage collector, query the path, runs the garbage collector again, get the memory diff as JSON.</p>",
             form(
                 _url(request, "c2c_debug_memory_diff"),
                 input_("path"),
                 input_("limit", value=30),
+                input_("no_warmup", type_="checkbox"),
                 button("Memory diff"),
             ),
+            "<h2>Sleep</h2>",
             form(
                 _url(request, "c2c_debug_sleep"),
                 input_("time", value=1),
                 button("Sleep"),
             ),
-            form(_url(request, "c2c_debug_time"), button("Time")),
+            "<h2>Server times</h2>",
+            form(_url(request, "c2c_debug_time"), button("Get")),
+            "<h2>HTTP error</h2>",
             form(
                 _url(request, "c2c_debug_error"),
                 input_("status", value=500),

c2cwsgiutils/templates/index.html.mako

@@ -24,7 +24,7 @@
         crossorigin="anonymous"
         referrerpolicy="no-referrer"
     />
-    <title>c2cwsgiutils tools</title>
+    <title>C2C WSGI Utils tools</title>
     <style>
       body {
         margin-top: 0.5rem;
@@ -32,6 +32,9 @@
       button, p  {
         margin-bottom: 0.5rem;
       }
+      .row > h2 {
+        margin-top: 1rem;
+      }
     </style>
   </head>
   <body>

{c2cwsgiutils-6.2.0.dev27.dist-info → c2cwsgiutils-6.2.0.dev29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 6.2.0.dev27
+Version: 6.2.0.dev29
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause

{c2cwsgiutils-6.2.0.dev27.dist-info → c2cwsgiutils-6.2.0.dev29.dist-info}/RECORD

@@ -19,12 +19,12 @@ c2cwsgiutils/coverage_setup.py,sha256=BrdjYUmqYl1C-gHuKA7EI5gbQs8Dtdeb2eZKtzr-5L
 c2cwsgiutils/db.py,sha256=JT5F9Dqm2r0Jsh3w3CX79ngAUtakMLpf1secfN1nQnk,16106
 c2cwsgiutils/db_maintenance_view.py,sha256=58F-p9drkhCI99GoLRPIqT5U-Pm8ckSSUEl-tNxMmjU,3088
 c2cwsgiutils/debug/__init__.py,sha256=GkYNt2fU5PFykw9HmqPEwZrF2mTJumjSu54pp38EhOM,1325
-c2cwsgiutils/debug/_listeners.py,sha256=RZYwQRh86rU-Vtjxc3xOZL2A8D_5LHIBd-xWAMQCrj0,4421
-c2cwsgiutils/debug/_views.py,sha256=rxvxxzSIiwfdRieGkR6BG4zGa3hd1e17r-GMoQOSzgM,8511
+c2cwsgiutils/debug/_listeners.py,sha256=-fk3KFeB_E4m_YFXJ5MfxuqfA1sWCje9p3FH_93WfXM,4248
+c2cwsgiutils/debug/_views.py,sha256=s4SmrfCRhbfyVtLd7CPFQROQJjtf4PrfSkBH-cEtEPQ,8541
 c2cwsgiutils/debug/utils.py,sha256=sIKZHQ8empzxE2OI3h7Uce8cvv4O7AD1y_VYeZfLVCA,2320
 c2cwsgiutils/errors.py,sha256=-hWLQ1qDlh9kn06-33U2c39BbOxuCvJIkBkdxriE5mo,6644
 c2cwsgiutils/health_check.py,sha256=OhfPcApBht1qtBOX8e8pdeq3QwF4FbgGkofjqpl8GvQ,20068
-c2cwsgiutils/index.py,sha256=km_iP4w3oMqlI04e2RIetknAVxooO5p2ThZ8LcjBaU0,16751
+c2cwsgiutils/index.py,sha256=zQTp2dlb50DZy0TZOPYDxJv84kivcYirswz7rFMbSDA,17988
 c2cwsgiutils/loader.py,sha256=vU7yEobl9TlSFZwdLI2eF1ceUJ6xgiu2re31HA5sw1g,623
 c2cwsgiutils/logging_view.py,sha256=d0UkvYRGkVUMY9_vbjEzXmm8-6CCec2B43a3mJAqWyw,3370
 c2cwsgiutils/models_graph.py,sha256=q5dW_gZ5iUZCzBya5Kpy57y9oqsG-rGi9AvrXCDgYqs,2679
@@ -58,10 +58,10 @@ c2cwsgiutils/static/favicon-32x32.png,sha256=i4ucx08zAZARd8e7JTMGK-gb5WcOmyuDN6I
 c2cwsgiutils/stats_pyramid/__init__.py,sha256=alSRhpCa5Kh9JnMnR5XqcMqr5wyL8ogROprrfsIl_qU,786
 c2cwsgiutils/stats_pyramid/_db_spy.py,sha256=A61t6VKIrRRIjbyZTldmAUl_Q3ZDVFYqyxjuntzmllc,2919
 c2cwsgiutils/stats_pyramid/_pyramid_spy.py,sha256=mRiOmQXV9x8JjkGV4MsaC7sD3qO6dWUTog0bharLLD0,3517
-c2cwsgiutils/templates/index.html.mako,sha256=Ey9ppHLe-eFGYXYPV5Z2WbMBSif86sYPiTviksnG7TI,1362
+c2cwsgiutils/templates/index.html.mako,sha256=cK8qGBDeQG5SiJJCfvL0oKpgacr7dPKx634AAQivmjA,1416
 c2cwsgiutils/version.py,sha256=1ghPu-aKMJdfCSUrxgBENNqNQ-7JMKJr6tS14dDmW4Q,3110
-c2cwsgiutils-6.2.0.dev27.dist-info/LICENSE,sha256=r7ueGz9Fl2Bv3rmeQy0DEtohLmAiufRaCuv6Y5fyNhE,1304
-c2cwsgiutils-6.2.0.dev27.dist-info/METADATA,sha256=FzdiFUvSshMPqfGefTnWFHwB6Gdd6OjOvRJHxOwGUjg,34461
-c2cwsgiutils-6.2.0.dev27.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-c2cwsgiutils-6.2.0.dev27.dist-info/entry_points.txt,sha256=ujgqMTL1awN9qDg8WXmrF7m0fgR-hslUM6zKH86pvy0,703
-c2cwsgiutils-6.2.0.dev27.dist-info/RECORD,,
+c2cwsgiutils-6.2.0.dev29.dist-info/LICENSE,sha256=r7ueGz9Fl2Bv3rmeQy0DEtohLmAiufRaCuv6Y5fyNhE,1304
+c2cwsgiutils-6.2.0.dev29.dist-info/METADATA,sha256=VGE_wRigebpoupW5REBis2XB5fZ9T0izFkLJOIsZVBs,34461
+c2cwsgiutils-6.2.0.dev29.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+c2cwsgiutils-6.2.0.dev29.dist-info/entry_points.txt,sha256=ujgqMTL1awN9qDg8WXmrF7m0fgR-hslUM6zKH86pvy0,703
+c2cwsgiutils-6.2.0.dev29.dist-info/RECORD,,