plain.observer 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

plain/observer/views.py

@@ -1,23 +1,21 @@
-from functools import cached_property
-
 from plain.auth.views import AuthViewMixin
 from plain.htmx.views import HTMXViewMixin
-from plain.http import JsonResponse, Response, ResponseRedirect
+from plain.http import JsonResponse, Response
 from plain.runtime import settings
-from plain.views import TemplateView
+from plain.urls import reverse
+from plain.views import DetailView, ListView
 
 from .core import Observer
 from .models import Trace
 
 
-class ObserverTracesView(AuthViewMixin, HTMXViewMixin, TemplateView):
+class ObserverTracesView(AuthViewMixin, HTMXViewMixin, ListView):
     template_name = "observer/traces.html"
+    context_object_name = "traces"
     admin_required = True
 
-    @cached_property
-    def observer(self):
-        """Get the Observer instance for this request."""
-        return Observer(self.request)
+    def get_objects(self):
+        return Trace.objects.all()
 
     def check_auth(self):
         # Allow the view if we're in DEBUG
@@ -34,72 +32,108 @@ class ObserverTracesView(AuthViewMixin, HTMXViewMixin, TemplateView):
 
     def get_template_context(self):
         context = super().get_template_context()
-        context["observer"] = self.observer
-        context["traces"] = Trace.objects.all()
-        if trace_id := self.request.query_params.get("trace_id"):
-            context["trace"] = Trace.objects.filter(id=trace_id).first()
-        else:
-            context["trace"] = context["traces"].first()
+        context["observer"] = Observer(self.request)
         return context
 
-    def get(self):
-        # Check if JSON format is requested
-        if self.request.query_params.get("format") == "json":
-            if trace_id := self.request.query_params.get("trace_id"):
-                if trace := Trace.objects.filter(id=trace_id).first():
-                    return JsonResponse(trace.as_dict())
-            return JsonResponse({"error": "Trace not found"}, status=404)
-
-        return super().get()
+    def htmx_put_mode(self):
+        """Set observer mode via HTMX PUT."""
+        mode = self.request.data.get("mode")
+        observer = Observer(self.request)
 
-    def htmx_post_enable_summary(self):
-        """Enable summary mode via HTMX."""
         response = Response(status_code=204)
         response.headers["HX-Refresh"] = "true"
-        self.observer.enable_summary_mode(response)
-        return response
 
-    def htmx_post_enable_persist(self):
-        """Enable full persist mode via HTMX."""
-        response = Response(status_code=204)
-        response.headers["HX-Refresh"] = "true"
-        self.observer.enable_persist_mode(response)
-        return response
+        if mode == "summary":
+            observer.enable_summary_mode(response)
+        elif mode == "persist":
+            observer.enable_persist_mode(response)
+        elif mode == "disable":
+            observer.disable(response)
+        else:
+            return Response("Invalid mode", status_code=400)
 
-    def htmx_post_disable(self):
-        """Disable observer via HTMX."""
-        response = Response(status_code=204)
-        response.headers["HX-Refresh"] = "true"
-        self.observer.disable(response)
         return response
 
     def htmx_delete_traces(self):
         """Clear all traces via HTMX DELETE."""
-        Trace.objects.all().delete()
+        Trace.objects.filter(share_id="").delete()
         response = Response(status_code=204)
         response.headers["HX-Refresh"] = "true"
         return response
 
-    def htmx_delete_trace(self):
-        """Delete a specific trace via HTMX DELETE."""
-        trace_id = self.request.query_params.get("trace_id")
-        Trace.objects.get(id=trace_id).delete()
+
+class ObserverTraceDetailView(AuthViewMixin, HTMXViewMixin, DetailView):
+    """Detail view for a specific trace."""
+
+    template_name = "observer/trace_detail.html"
+    context_object_name = "trace"
+    admin_required = True
+
+    def get_object(self):
+        return Trace.objects.get_or_none(trace_id=self.url_kwargs.get("trace_id"))
+
+    def check_auth(self):
+        # Allow the view if we're in DEBUG
+        if settings.DEBUG:
+            return
+        super().check_auth()
+
+    def get(self):
+        """Return trace data as HTML or JSON based on content negotiation."""
+        if (
+            "application/json" in self.request.headers.get("Accept", "")
+            or self.request.query_params.get("format") == "json"
+        ):
+            return self.get_object().as_dict()
+
+        return super().get()
+
+    def get_template_names(self):
+        if self.is_htmx_request():
+            # Use a different template for HTMX requests
+            return ["observer/trace.html"]
+        return super().get_template_names()
+
+    def htmx_delete(self):
+        trace = self.get_object()
+        trace.delete()
+
+        # Redirect to traces list after deletion
         response = Response(status_code=204)
-        response.headers["HX-Refresh"] = "true"
+        response.headers["HX-Redirect"] = reverse("observer:traces")
         return response
 
-    def post(self):
-        """A standard, non-htmx post used by the button html (where htmx may not be available)."""
+    def htmx_post_share(self):
+        trace = self.get_object()
+        trace.generate_share_id()
+        return super().get()
 
-        observe_action = self.request.data["observe_action"]
+    def htmx_delete_share(self):
+        trace = self.get_object()
+        trace.remove_share_id()
+        return super().get()
 
-        response = ResponseRedirect(self.request.data.get("redirect_url", "."))
 
-        if observe_action == "summary":
-            self.observer.enable_summary_mode(response)  # Default to summary mode
-        elif observe_action == "persist":
-            self.observer.enable_persist_mode(response)
-        elif observe_action == "disable":
-            self.observer.disable(response)
+class ObserverTraceSharedView(DetailView):
+    """Public view for shared trace data."""
 
-        return response
+    template_name = "observer/trace_share.html"
+    context_object_name = "trace"
+
+    def get_object(self):
+        return Trace.objects.get_or_none(share_id=self.url_kwargs["share_id"])
+
+    def get_template_context(self):
+        context = super().get_template_context()
+        context["is_share_view"] = True
+        return context
+
+    def get(self):
+        """Return trace data as HTML or JSON based on content negotiation."""
+        if (
+            "application/json" in self.request.headers.get("Accept", "")
+            or self.request.query_params.get("format") == "json"
+        ):
+            return JsonResponse(self.get_object().as_dict())
+
+        return super().get()

{plain_observer-0.1.0.dist-info → plain_observer-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.observer
-Version: 0.1.0
+Version: 0.2.0
 Summary: On-page telemetry and observability tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

plain_observer-0.2.0.dist-info/RECORD

@@ -0,0 +1,25 @@
+plain/observer/CHANGELOG.md,sha256=hpdLGk-BRxA-2gHzygAp0XrFvvM43IhJg8TT4AjWoIo,2055
+plain/observer/README.md,sha256=5wM48-iE8i7xOjIK8KCgZ-Vmp2xpDtX73UnE5QeNnd4,31
+plain/observer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plain/observer/admin.py,sha256=sFg5YUAnw-zZJv3_xnMRtI9hFOLI6w77GEV4zhALhQo,2537
+plain/observer/cli.py,sha256=-huHPj4xkrq4xemDo8XzoNtmE53g0YWuVLW66Gr1d88,20935
+plain/observer/config.py,sha256=FuJi1jiDSvOTcmP-6Ea4OlGZt5cRf4iTp1e0dgpJ45E,1494
+plain/observer/core.py,sha256=D9vX0GP8JBB8-NFAKrOwPSHl_wdZo1h0A5C6xKsJVjA,2245
+plain/observer/default_settings.py,sha256=JN2jT2wfa6f80EqU0p4Ox_47xyxL-Ym5-_pftY7xj2U,197
+plain/observer/models.py,sha256=uVmytQHCYilMfULGJHk63l48APOHqEcbcRtYoE7L_RU,13072
+plain/observer/otel.py,sha256=nr4BYQb6rWF7uXsOVmBWV-8z5jLTPbDnYi6VSdVvUnE,14585
+plain/observer/urls.py,sha256=oLJoDjB7YMUx8z-MGql_xXSXkfacVKFp-aHNXaKzs38,376
+plain/observer/views.py,sha256=9TRvjfBk62nxlfZXXk-LsMXqnCxL_FIrQH4eUFIUN9A,4226
+plain/observer/migrations/0001_initial.py,sha256=I-4DNr_WK2Gx428Ql3pG3-W8C0xvk0FVTZnd5swIAQ4,3376
+plain/observer/migrations/0002_trace_share_created_at_trace_share_id_trace_summary_and_more.py,sha256=lgFqdn66zq7AoCvkC3MIvLXiE_Omup5EEMDSe1jpKOg,1765
+plain/observer/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plain/observer/templates/observer/trace.html,sha256=42yuvqAH7poRMFbueXT-MeSIClmUaLSHohG9LF0sepk,27098
+plain/observer/templates/observer/trace_detail.html,sha256=86-YGCpg9gy31Pd2vDHB3LYRkJile-DsGD1Enjx9s5Y,943
+plain/observer/templates/observer/trace_share.html,sha256=HrYLti5BpX96-6Bm_37OObFvAJSYbZ3GZD-MwCi9hgA,525
+plain/observer/templates/observer/traces.html,sha256=cFnlIuCf6XJEpHRD2_yfVmPDGZfiqMq6Cg-iMlT3CWY,22184
+plain/observer/templates/toolbar/observer.html,sha256=uaDKiWR7EYqC1kEXE-uHDlE7nfFEMR_zmOgvlKwQHJ4,1365
+plain/observer/templates/toolbar/observer_button.html,sha256=xsHJSuOjW6ddnxlPlPKek22WrWnuVYGIcBfFdkb76pk,1199
+plain_observer-0.2.0.dist-info/METADATA,sha256=8ZtRPghSC480Xb44R7nWlM3KWAfwWUH1vbt3v1CTWrg,429
+plain_observer-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_observer-0.2.0.dist-info/licenses/LICENSE,sha256=YZdq6Pz8ivjs97eSVLRmoGDI1hjEikX6N49DfM0DWio,1500
+plain_observer-0.2.0.dist-info/RECORD,,

plain/observer/templates/admin/observer/trace_detail.html

@@ -1,10 +0,0 @@
-{% extends "admin/detail.html" %}
-
-{% block content %}
-
-{{ super() }}
-
-<div class="mt-20">
-    {% include "observer/_trace_detail.html" %}
-</div>
-{% endblock %}

plain_observer-0.1.0.dist-info/RECORD

@@ -1,23 +0,0 @@
-plain/observer/CHANGELOG.md,sha256=W6argwh8IJ2-RswC9yw96AtyVwrGk93-hCpnu1IW_Ao,972
-plain/observer/README.md,sha256=5wM48-iE8i7xOjIK8KCgZ-Vmp2xpDtX73UnE5QeNnd4,31
-plain/observer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plain/observer/admin.py,sha256=d5ekU48GiiQ70K8ulSd0v_7P1v12U8rIQ8LbiNgKv0Y,2874
-plain/observer/cli.py,sha256=JBJzOYl3V973WQbtj8AEde6zxfWdEZx-u3g7c15-4lU,544
-plain/observer/config.py,sha256=FuJi1jiDSvOTcmP-6Ea4OlGZt5cRf4iTp1e0dgpJ45E,1494
-plain/observer/core.py,sha256=D9vX0GP8JBB8-NFAKrOwPSHl_wdZo1h0A5C6xKsJVjA,2245
-plain/observer/default_settings.py,sha256=JN2jT2wfa6f80EqU0p4Ox_47xyxL-Ym5-_pftY7xj2U,197
-plain/observer/models.py,sha256=cD72rht7Bb-8YARYvylBc9W0garebWgFsH_vfx1ubT8,11999
-plain/observer/otel.py,sha256=8hqSd_l_OIo9Ip4Vx6FNXOzGhCv7vlgdemZEnCR2IOg,14181
-plain/observer/urls.py,sha256=LcsKBWRqt8gs385tV9z-j6kSewzWsOWftadi59QqIIE,194
-plain/observer/views.py,sha256=TrwatLFf9M67ax4EhF_P1Q3X_o3hzsAEr4Po48peiQM,3673
-plain/observer/migrations/0001_initial.py,sha256=I-4DNr_WK2Gx428Ql3pG3-W8C0xvk0FVTZnd5swIAQ4,3376
-plain/observer/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plain/observer/templates/admin/observer/trace_detail.html,sha256=qW03sNNKGivPVQMI8rFtSCXGTOH_qw_nmXhpIZIu4zo,161
-plain/observer/templates/observer/_trace_detail.html,sha256=q98IdA28m7vlel2ND090MoFE5Kmw8_yLExJd57-MUus,21631
-plain/observer/templates/observer/traces.html,sha256=dJPp2pcFDJOLmHihH5-qnVAgAJEYGCBy6Fn1OreaWjw,20700
-plain/observer/templates/toolbar/observer.html,sha256=uaDKiWR7EYqC1kEXE-uHDlE7nfFEMR_zmOgvlKwQHJ4,1365
-plain/observer/templates/toolbar/observer_button.html,sha256=BXzka5LyvhQPBLFBY_QSNQOfdFtbIN3SUF3ZjSVGSjw,2565
-plain_observer-0.1.0.dist-info/METADATA,sha256=5ajnIee8v9s4MWHBXisSbWB-va_1zTiOf8DfmN_Rras,429
-plain_observer-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_observer-0.1.0.dist-info/licenses/LICENSE,sha256=YZdq6Pz8ivjs97eSVLRmoGDI1hjEikX6N49DfM0DWio,1500
-plain_observer-0.1.0.dist-info/RECORD,,