varanus 0.1.0.dev0__tar.gz → 0.1.0.dev2__tar.gz

{varanus-0.1.0.dev0 → varanus-0.1.0.dev2}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.3
 Name: varanus
-Version: 0.1.0.dev0
+Version: 0.1.0.dev2
 Summary: Django application monitoring.
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: msgspec>=0.19.0
 Requires-Dist: cconf>=1.0.0 ; extra == 'server'
 Requires-Dist: django~=5.2.0 ; extra == 'server'
 Requires-Dist: django-passkey-auth>=0.2.0 ; extra == 'server'
+Requires-Dist: granian>=2.4.2 ; extra == 'server'
 Requires-Dist: psycopg[binary]>=3.2.1 ; extra == 'server'
-Requires-Dist: uvicorn>=0.30.6 ; extra == 'server'
 Requires-Dist: websockets>=13.0 ; extra == 'server'
 Requires-Dist: whitenoise>=6.7.0 ; extra == 'server'
 Requires-Python: >=3.11

{varanus-0.1.0.dev0 → varanus-0.1.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "varanus"
-version = "0.1.0.dev0"
+version = "0.1.0.dev2"
 description = "Django application monitoring."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -14,8 +14,8 @@ server = [
     "cconf>=1.0.0",
     "django~=5.2.0",
     "django-passkey-auth>=0.2.0",
+    "granian>=2.4.2",
     "psycopg[binary]>=3.2.1",
-    "uvicorn>=0.30.6",
     "websockets>=13.0",
     "whitenoise>=6.7.0",
 ]

{varanus-0.1.0.dev0 → varanus-0.1.0.dev2}/src/varanus/client/transport/http.py

@@ -1,3 +1,5 @@
+import platform
+from typing import Any
 from urllib.parse import SplitResult
 
 import httpx
@@ -17,11 +19,19 @@ class HttpTransport(BaseTransport):
             headers={
                 "X-Varanus-Key": url.username or "",
                 "X-Varanus-Environment": environment or "",
-            }
+                "X-Varanus-Node": platform.node(),
+            },
+            timeout=1.0,
         )
 
+    def request(self, url: str, obj: Any):
+        try:
+            self.client.post(url, content=msgspec.json.encode(obj))
+        except Exception as ex:
+            print(f"error sending to {url}: {ex}")
+
     def ping(self, info: events.NodeInfo):
-        self.client.post(self.ping_url, content=msgspec.json.encode(info))
+        self.request(self.ping_url, info)
 
     def send(self, event: events.Context):
-        self.client.post(self.event_url, content=msgspec.json.encode(event))
+        self.request(self.event_url, event)

{varanus-0.1.0.dev0 → varanus-0.1.0.dev2}/src/varanus/events.py

@@ -1,3 +1,4 @@
+import inspect
 import logging
 from datetime import datetime, timezone
 
@@ -25,6 +26,7 @@ class ErrorLine(Struct):
     lineno: int | None
     function: str | None
     module: str | None
+    linesrc: str | None
     locals: dict[str, str]
 
 
@@ -52,6 +54,13 @@ class Error(Event):
             abs_path = f_code.co_filename if f_code else None
             function = f_code.co_name if f_code else None
             lineno = getattr(tb, "tb_lineno", None)
+            linesrc = None
+            if f_code and lineno:
+                try:
+                    source, start = inspect.getsourcelines(f_code)
+                    linesrc = source[lineno - start].strip()
+                except (OSError, TypeError):
+                    pass
             module = f_globals.get("__name__", "")
             lines.append(
                 ErrorLine(
@@ -59,6 +68,7 @@ class Error(Event):
                     lineno=lineno,
                     function=function,
                     module=module,
+                    linesrc=linesrc,
                     locals={name: repr(val) for name, val in f_locals.items()},
                 )
             )

varanus-0.1.0.dev2/src/varanus/server/asgi.py

@@ -0,0 +1,7 @@
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "varanus.server.settings")
+
+application = get_asgi_application()

varanus-0.1.0.dev2/src/varanus/server/migrations/0002_context_node_error_node_log_node_metric_node_and_more.py

@@ -0,0 +1,79 @@
+# Generated by Django 5.2.8 on 2025-11-16 01:38
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("varanus", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="context",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="error",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="log",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="metric",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="query",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+        migrations.AddField(
+            model_name="request",
+            name="node",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="%(class)ss",
+                to="varanus.node",
+            ),
+        ),
+    ]

varanus-0.1.0.dev2/src/varanus/server/migrations/0003_alter_log_level.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.8 on 2025-11-17 19:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("varanus", "0002_context_node_error_node_log_node_metric_node_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="log",
+            name="level",
+            field=models.IntegerField(
+                blank=True,
+                choices=[
+                    (50, "CRITICAL"),
+                    (40, "ERROR"),
+                    (30, "WARNING"),
+                    (20, "INFO"),
+                    (10, "DEBUG"),
+                    (0, "NOTSET"),
+                ],
+                null=True,
+            ),
+        ),
+    ]

{varanus-0.1.0.dev0 → varanus-0.1.0.dev2}/src/varanus/server/models.py

@@ -1,12 +1,12 @@
 import hashlib
 import http
-import logging
 import secrets
 from typing import Self
 
 import msgspec
 import sqlparse
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.core.management import call_command
 from django.core.validators import RegexValidator
 from django.db import connections, models
@@ -160,7 +160,16 @@ class Node(EnvironmentModel):
         ]
 
     def __str__(self):
-        return self.name
+        return f"{self.environment}@{self.name}"
+
+    def get_absolute_url(self):
+        return reverse(
+            "node-details",
+            kwargs={
+                "slug": self.site.slug,
+                "pk": self.pk,
+            },
+        )
 
     @classmethod
     def update(cls, info: events.NodeInfo, site: Site, environment: str = ""):
@@ -256,6 +265,13 @@ class EventModel(EnvironmentModel):
     event_id = models.UUIDField(db_index=True)
     timestamp = models.DateTimeField(default=timezone.now)
     tags = models.JSONField(default=dict, blank=True)
+    node = models.ForeignKey(
+        Node,
+        on_delete=models.SET_NULL,
+        related_name="%(class)ss",
+        null=True,
+        blank=True,
+    )
 
     class Meta:
         abstract = True
@@ -265,6 +281,18 @@ class EventModel(EnvironmentModel):
     def from_event(cls, event: events.Event, **extra):
         raise NotImplementedError()
 
+    def get_absolute_url(self):
+        ct = ContentType.objects.get_for_model(self)
+        return reverse(
+            "event-details",
+            kwargs={
+                "slug": self.site.slug,
+                "event_id": self.event_id,
+                "model": ct.model,
+                "pk": self.pk,
+            },
+        )
+
 
 class FingerprintModel(models.Model):
     fingerprint = models.CharField(max_length=64, db_index=True)
@@ -430,9 +458,17 @@ class Error(ContextualModel, FingerprintModel):
 
 
 class Log(ContextualModel, FingerprintModel):
+    class Level(models.IntegerChoices):
+        CRITICAL = 50, "CRITICAL"
+        ERROR = 40, "ERROR"
+        WARNING = 30, "WARNING"
+        INFO = 20, "INFO"
+        DEBUG = 10, "DEBUG"
+        NOTSET = 0, "NOTSET"
+
     message = models.TextField()
     name = models.CharField(max_length=200, blank=True)
-    level = models.IntegerField(null=True, blank=True)
+    level = models.IntegerField(null=True, blank=True, choices=Level)
     file = models.TextField(blank=True)
     lineno = models.IntegerField(null=True, blank=True)
     error = models.ForeignKey(
@@ -461,10 +497,6 @@ class Log(ContextualModel, FingerprintModel):
             **extra,
         )
 
-    @property
-    def level_name(self):
-        return logging.getLevelName(self.level) if self.level is not None else "UNKNOWN"
-
     def fingerprint_parts(self):
         return (self.message, self.name, self.level, self.file, self.lineno)
 
@@ -529,6 +561,10 @@ class Query(ContextualModel, FingerprintModel):
             return stripped
         return stripped[:79] + "…"
 
+    @property
+    def sql_formatted(self):
+        return sqlparse.format(self.sql, reindent=True, keyword_case="upper")
+
     def fingerprint_parts(self):
         return self.sql.split()
 

varanus-0.1.0.dev2/src/varanus/server/search/__init__.py

@@ -0,0 +1,9 @@
+from .base import Search
+from .date import DateRange
+from .facet import MultiFacet
+
+__all__ = [
+    "Search",
+    "DateRange",
+    "MultiFacet",
+]

varanus-0.1.0.dev2/src/varanus/server/search/base.py

@@ -0,0 +1,118 @@
+from typing import Callable, ClassVar, Literal, Mapping, Self, TypeAlias
+
+from django.db.models import QuerySet
+from django.http import HttpRequest
+from django.template import loader
+from django.utils.datastructures import MultiValueDict
+from django.utils.functional import Promise
+
+StringValues: TypeAlias = dict[str, list[str]]
+
+
+def string_data(data) -> StringValues:
+    if isinstance(data, MultiValueDict):
+        return {str(key): [str(v) for v in values] for key, values in data.lists()}
+    elif isinstance(data, Mapping):
+        return {
+            str(key): (
+                [str(v) for v in values]
+                if isinstance(values, (list, tuple))
+                else ([] if values is None else [str(values)])
+            )
+            for key, values in data.items()
+        }
+    return {}
+
+
+class SearchField:
+    template_name: str
+
+    def __init__(
+        self,
+        label=None,
+        field_name=None,
+        empty_label="NULL",
+        # These belong on Facet
+        choice_label: Callable[..., str | Promise] | None = None,
+        order: Literal["value", "count"] = "value",
+    ):
+        self.name = ""
+        self.label = label or ""
+        self.field_name = field_name or ""
+        self.prefix = ""
+        self.id = ""
+        self.empty_label = empty_label
+        self.choice_label = choice_label
+        self.order = order
+
+    def __set_name__(self, owner, name: str):
+        # print("__set_name__", owner, name)
+        assert issubclass(owner, Search)
+        self.name = name
+        self.prefix = f"{name}_"
+        self.id = f"id_{name}"
+        if not self.label:
+            self.label = name.capitalize().replace("__", " ")
+        if not self.field_name:
+            self.field_name = name
+        if not hasattr(owner, "_fields"):
+            owner._fields = []
+        owner._fields.append(self)
+
+    def __get__(self, instance: "Search", owner=None) -> StringValues | Self:
+        # print("__get__", instance, owner)
+        if owner is None:
+            return self
+        return {
+            key[len(self.prefix) :]: values
+            for key, values in instance._data.items()
+            if key.startswith(self.prefix)
+        }
+
+    def __set__(self, instance, value):
+        print("__set__", instance, value)
+
+    def apply(self, queryset: QuerySet, field_data: StringValues) -> QuerySet:
+        raise NotImplementedError()
+
+    def get_context(self, queryset: QuerySet, field_data: StringValues) -> dict:
+        return {
+            "field": self,
+        }
+
+    def render(
+        self,
+        queryset: QuerySet,
+        field_data: StringValues,
+        request: HttpRequest | None = None,
+    ) -> str:
+        return loader.render_to_string(
+            self.template_name,
+            self.get_context(queryset, field_data),
+            request,
+        )
+
+
+class Search:
+    _fields: ClassVar[list[SearchField]]
+
+    def __init__(self, queryset: QuerySet, data=None):
+        self._queryset = queryset
+        self._data = string_data(data)
+
+    def queryset(self, for_field=None):
+        qs = self._queryset
+        for field in self._fields:
+            if field == for_field:
+                continue
+            field_data = getattr(self, field.name)
+            qs = field.apply(qs, field_data)
+        return qs
+
+    def render(self, request: HttpRequest | None = None) -> str:
+        fragments = []
+        for field in self._fields:
+            qs = self.queryset(for_field=field)
+            field_data = getattr(self, field.name)
+            fragments.append(field.render(qs, field_data, request))
+        return "".join(fragments)

varanus-0.1.0.dev2/src/varanus/server/search/date.py

@@ -0,0 +1,33 @@
+import datetime
+
+from django.db.models import QuerySet
+from django.utils.dateparse import parse_date
+
+from .base import SearchField, StringValues
+
+
+def date_value(field_data: StringValues, name: str) -> datetime.date | None:
+    if name not in field_data:
+        return None
+    if not field_data[name]:
+        return None
+    return parse_date(field_data[name][0])
+
+
+class DateRange(SearchField):
+    template_name = "search/daterange.html"
+
+    def apply(self, queryset: QuerySet, field_data: StringValues) -> QuerySet:
+        filters = {}
+        if start := date_value(field_data, "start"):
+            filters[f"{self.field_name}__date__gte"] = start
+        if end := date_value(field_data, "end"):
+            filters[f"{self.field_name}__date__lte"] = end
+        return queryset.filter(**filters)
+
+    def get_context(self, queryset: QuerySet, field_data: StringValues) -> dict:
+        return {
+            **super().get_context(queryset, field_data),
+            "start": date_value(field_data, "start"),
+            "end": date_value(field_data, "end"),
+        }

varanus-0.1.0.dev2/src/varanus/server/search/facet.py

@@ -0,0 +1,63 @@
+import functools
+import operator
+from typing import Any, ClassVar
+
+from django.db.models import Count, Q, QuerySet
+
+from .base import SearchField, StringValues
+
+
+class Choice:
+    id: str
+    value: str
+    label: str
+    count: int
+
+    def __init__(self, field: SearchField, value: Any, count: int):
+        self.value = self.stringify(value)
+        if callable(field.choice_label):
+            self.label = field.choice_label(value)
+        else:
+            self.label = self.value or field.empty_label
+        self.id = field.id + "_" + self.value.replace(" ", "")
+        self.count = count
+
+    @classmethod
+    def stringify(cls, value):
+        return str(value) if value is not None else ""
+
+
+class Facet(SearchField):
+    choice_class: ClassVar[type[Choice]] = Choice
+
+    def get_choices(self, queryset):
+        choice_qs = queryset.values_list(self.field_name).annotate(num=Count("*"))
+        match self.order:
+            case "value":
+                choice_qs = choice_qs.order_by(self.field_name)
+            case "count":
+                choice_qs = choice_qs.order_by("-num")
+        return [self.choice_class(self, c, num) for c, num in choice_qs]
+
+
+class MultiFacet(Facet):
+    template_name = "search/multifacet.html"
+
+    def apply(self, queryset: QuerySet, field_data: StringValues) -> QuerySet:
+        filters = []
+        if selected := set(field_data.get("s", [])):
+            if "" in selected:
+                selected.discard("")
+                filters.append(Q(**{f"{self.field_name}__isnull": True}))
+            if selected:
+                filters.append(Q(**{f"{self.field_name}__in": selected}))
+        if filters:
+            queryset = queryset.filter(functools.reduce(operator.or_, filters))
+        return queryset
+
+    def get_context(self, queryset: QuerySet, field_data: StringValues) -> dict:
+        return {
+            **super().get_context(queryset, field_data),
+            "choices": self.get_choices(queryset),
+            "selected": field_data.get("s", []),
+        }

{varanus-0.1.0.dev0 → varanus-0.1.0.dev2}/src/varanus/server/settings.py

@@ -48,9 +48,9 @@ INSTALLED_APPS = [
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
-    # Put this before staticfiles, so we use our runserver command.
-    "varanus.server.apps.VaranusServer",
+    "whitenoise.runserver_nostatic",
     "django.contrib.staticfiles",
+    "varanus.server.apps.VaranusServer",
     "cconf",
     "passkeys",
 ]

varanus-0.1.0.dev2/src/varanus/server/static/css/varanus.css

@@ -0,0 +1,4 @@
+.table-header th {
+    background-color: var(--bs-secondary-bg-subtle) !important;
+    border-color: var(--bs-secondary-border-subtle) !important;
+}

{varanus-0.1.0.dev0 → varanus-0.1.0.dev2}/src/varanus/server/templates/base.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <!doctype html>
-<html lang="en" data-bs-theme="light">
+<html lang="en" data-bs-theme="dark">
     <head>
         <meta charset="utf-8" />
         <meta http-equiv="x-ua-compatible" content="ie=edge" />
@@ -68,6 +68,8 @@
         </footer>
 
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/js/bootstrap.bundle.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/htmx.org@2/dist/htmx.min.js"></script>
+
         <script src="{% static 'js/varanus.js' %}"></script>
 
         {% block javascript %}{% endblock javascript %}

varanus-0.1.0.dev2/src/varanus/server/templates/search/daterange.html

@@ -0,0 +1,10 @@
+<div class="card mb-3">
+    <div class="card-header">{{ field.label }}</div>
+    <div class="card-body">
+        <div class="input-group">
+            <input type="date" class="form-control" placeholder="From" name="{{ field.prefix }}start" value="{{ start.isoformat|default:'' }}" />
+            <span class="input-group-text">-</span>
+            <input type="date" class="form-control" placeholder="To" name="{{ field.prefix }}end" value="{{ end.isoformat|default:'' }}" />
+        </div>
+    </div>
+</div>

varanus-0.1.0.dev2/src/varanus/server/templates/search/multifacet.html

@@ -0,0 +1,11 @@
+<div class="card mb-3">
+    <div class="card-header">{{ field.label }}</div>
+    <div class="card-body">
+        {% for c in choices %}
+            <div class="form-check">
+                <input type="checkbox" id="{{ c.id }}" class="form-check-input" name="{{ field.prefix }}s" value="{{ c.value }}"{% if c.value in selected %} checked{% endif %} />
+                <label for="{{ c.id }}">{{ c.label }} ({{ c.count }})</label>
+            </div>
+        {% endfor %}
+    </div>
+</div>

{varanus-0.1.0.dev0 → varanus-0.1.0.dev2}/src/varanus/server/templates/site/base.html

@@ -25,21 +25,24 @@
     </li>
 </ul>
 
-<!--
 <div class="container-fluid">
-    <form action="" method="GET">
-        {% for search_field, form_fields in filter_form.fieldsets.items %}
-            {% for field in form_fields %}
-                {{ field }}
-            {% endfor %}
-        {% endfor %}
-        <button>{% trans "Filter" %}</button>
-    </form>
+    <div class="row">
+        <div class="col-md-3">
+            {% block search %}
+                <form action="" method="get">
+                    {{ search.render|safe }}
+                    <button class="btn btn-primary">Filter</button>
+                    <a href="{{ request.path }}" class="btn btn-secondary">Clear</a>
+                </form>
+            {% endblock search %}
+        </div>
+        <div class="col-md-9">
+            {% block page %}{% endblock page %}
+        </div>
+    </div>
 </div>
--->
 
-<div class="container-fluid">
-    {% block page %}{% endblock page %}
+<div class="offcanvas offcanvas-end" style="width:33%" tabindex="-1" id="inspector">
 </div>
 {% endblock content %}
 

varanus-0.1.0.dev2/src/varanus/server/templates/site/details/environment_nodes.html

@@ -0,0 +1,6 @@
+<div class="offcanvas-header">
+    <h5 class="offcanvas-title">{{ environment }}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</div>
+<div class="offcanvas-body">
+</div>