plain.observer 0.6.2__tar.gz → 0.7.0__tar.gz

{plain_observer-0.6.2 → plain_observer-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.observer
-Version: 0.6.2
+Version: 0.7.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.6.2 → plain_observer-0.7.0}/plain/observer/CHANGELOG.md

@@ -1,5 +1,19 @@
 # plain-observer changelog
 
+## [0.7.0](https://github.com/dropseed/plain/releases/plain-observer@0.7.0) (2025-09-12)
+
+### What's changed
+
+- Model manager renamed from `objects` to `query` throughout the codebase for consistency with Plain framework conventions ([037a239](https://github.com/dropseed/plain/commit/037a239ef4))
+- Updated internal QuerySet configuration to use `queryset_class` instead of `manager_class` in model Meta ([bbaee93](https://github.com/dropseed/plain/commit/bbaee93839))
+- Simplified manager initialization by removing explicit `objects` assignment in favor of Meta configuration ([6b60a00](https://github.com/dropseed/plain/commit/6b60a00731))
+
+### Upgrade instructions
+
+- Replace any direct usage of `Trace.objects` with `Trace.query` in your code
+- Replace any direct usage of `Span.objects` with `Span.query` in your code
+- Replace any direct usage of `Log.objects` with `Log.query` in your code
+
 ## [0.6.2](https://github.com/dropseed/plain/releases/plain-observer@0.6.2) (2025-09-09)
 
 ### What's changed

{plain_observer-0.6.2 → plain_observer-0.7.0}/plain/observer/admin.py

@@ -26,7 +26,7 @@ class TraceViewset(AdminViewset):
 
         def perform_action(self, action: str, target_ids: list):
             if action == "Delete":
-                Trace.objects.filter(id__in=target_ids).delete()
+                Trace.query.filter(id__in=target_ids).delete()
 
     class DetailView(AdminModelDetailView):
         model = Trace
@@ -54,7 +54,7 @@ class SpanViewset(AdminViewset):
 
         def perform_action(self, action: str, target_ids: list):
             if action == "Delete":
-                Span.objects.filter(id__in=target_ids).delete()
+                Span.query.filter(id__in=target_ids).delete()
 
         def get_objects(self):
             return (
@@ -101,9 +101,9 @@ class LogViewset(AdminViewset):
 
         def perform_action(self, action: str, target_ids: list):
             if action == "Delete selected":
-                Log.objects.filter(id__in=target_ids).delete()
+                Log.query.filter(id__in=target_ids).delete()
             elif action == "Delete all":
-                Log.objects.all().delete()
+                Log.query.all().delete()
 
         def get_objects(self):
             return (

{plain_observer-0.6.2 → plain_observer-0.7.0}/plain/observer/cli.py

@@ -19,7 +19,7 @@ def observer_cli():
 @click.option("--force", is_flag=True, help="Skip confirmation prompt.")
 def clear(force: bool):
     """Clear all observer data."""
-    query = Trace.objects.all()
+    query = Trace.query.all()
     trace_count = query.count()
 
     if trace_count == 0:
@@ -43,7 +43,7 @@ def clear(force: bool):
 def trace_list(limit, user_id, request_id, session_id, output_json):
     """List recent traces."""
     # Build query
-    query = Trace.objects.all()
+    query = Trace.query.all()
 
     if user_id:
         query = query.filter(user_id=user_id)
@@ -139,7 +139,7 @@ def trace_list(limit, user_id, request_id, session_id, output_json):
 def trace_detail(trace_id, output_json):
     """Display detailed information about a specific trace."""
     try:
-        trace = Trace.objects.get(trace_id=trace_id)
+        trace = Trace.query.get(trace_id=trace_id)
     except Trace.DoesNotExist:
         click.secho(f"Error: Trace with ID '{trace_id}' not found", fg="red", err=True)
         raise click.Abort()
@@ -157,7 +157,7 @@ def trace_detail(trace_id, output_json):
 def span_list(trace_id, limit, output_json):
     """List recent spans."""
     # Build query
-    query = Span.objects.all()
+    query = Span.query.all()
 
     if trace_id:
         query = query.filter(trace__trace_id=trace_id)
@@ -259,7 +259,7 @@ def span_list(trace_id, limit, output_json):
 def span_detail(span_id, output_json):
     """Display detailed information about a specific span."""
     try:
-        span = Span.objects.select_related("trace").get(span_id=span_id)
+        span = Span.query.select_related("trace").get(span_id=span_id)
     except Span.DoesNotExist:
         click.secho(f"Error: Span with ID '{span_id}' not found", fg="red", err=True)
         raise click.Abort()
@@ -387,7 +387,7 @@ def format_trace_output(trace):
     output_lines.append(click.style("Spans:", fg="bright_blue", bold=True))
 
     # Get annotated spans with nesting levels
-    spans = trace.spans.all().annotate_spans()
+    spans = trace.spans.query.all().annotate_spans()
 
     # Build parent-child relationships
     span_dict = {span.span_id: span for span in spans}
@@ -540,7 +540,7 @@ def diagnose(trace_id, url, json_input, agent_command, print_only):
             raise click.ClickException(f"Error fetching trace from URL: {e}")
     else:
         try:
-            trace = Trace.objects.get(trace_id=trace_id)
+            trace = Trace.query.get(trace_id=trace_id)
             trace_data = trace.as_dict()
         except Trace.DoesNotExist:
             raise click.ClickException(f"Trace with ID '{trace_id}' not found")

{plain_observer-0.6.2 → plain_observer-0.7.0}/plain/observer/models.py

@@ -188,7 +188,9 @@ class Trace(models.Model):
         )
 
     def as_dict(self):
-        spans = [span.span_data for span in self.spans.all().order_by("start_time")]
+        spans = [
+            span.span_data for span in self.spans.query.all().order_by("start_time")
+        ]
         logs = [
             {
                 "timestamp": log.timestamp.isoformat(),
@@ -196,7 +198,7 @@ class Trace(models.Model):
                 "message": log.message,
                 "span_id": log.span_id,
             }
-            for log in self.logs.all().order_by("timestamp")
+            for log in self.logs.query.all().order_by("timestamp")
         ]
 
         return {
@@ -219,7 +221,7 @@ class Trace(models.Model):
         """Get chronological list of spans and logs for unified timeline display."""
         events = []
 
-        for span in self.spans.all().annotate_spans():
+        for span in self.spans.query.all().annotate_spans():
             events.append(
                 {
                     "type": "span",
@@ -230,7 +232,7 @@ class Trace(models.Model):
             )
 
             # Add logs for this span
-            for log in self.logs.filter(span=span):
+            for log in self.logs.query.filter(span=span):
                 events.append(
                     {
                         "type": "log",
@@ -241,7 +243,7 @@ class Trace(models.Model):
                 )
 
         # Add unlinked logs (logs without span)
-        for log in self.logs.filter(span__isnull=True):
+        for log in self.logs.query.filter(span__isnull=True):
             events.append(
                 {
                     "type": "log",
@@ -316,9 +318,8 @@ class Span(models.Model):
     status = models.CharField(max_length=50, default="", required=False)
     span_data = models.JSONField(default=dict, required=False)
 
-    objects = SpanQuerySet.as_manager()
-
     class Meta:
+        queryset_class = SpanQuerySet
         ordering = ["-start_time"]
         constraints = [
             models.UniqueConstraint(

{plain_observer-0.6.2 → plain_observer-0.7.0}/plain/observer/otel.py

@@ -342,7 +342,7 @@ class ObserverSpanProcessor(SpanProcessor):
                     span.trace = trace
 
                 # Bulk create spans
-                Span.objects.bulk_create(spans)
+                Span.query.bulk_create(spans)
 
                 # Create log models if we have logs
                 if logs:
@@ -362,7 +362,7 @@ class ObserverSpanProcessor(SpanProcessor):
                         )
                         log_models.append(log_model)
 
-                    Log.objects.bulk_create(log_models)
+                    Log.query.bulk_create(log_models)
 
             except Exception as e:
                 logger.warning(
@@ -374,14 +374,14 @@ class ObserverSpanProcessor(SpanProcessor):
             # Delete oldest traces if we exceed the limit
             if settings.OBSERVER_TRACE_LIMIT > 0:
                 try:
-                    if Trace.objects.count() > settings.OBSERVER_TRACE_LIMIT:
+                    if Trace.query.count() > settings.OBSERVER_TRACE_LIMIT:
                         excess_count = (
-                            Trace.objects.count() - settings.OBSERVER_TRACE_LIMIT
+                            Trace.query.count() - settings.OBSERVER_TRACE_LIMIT
                         )
-                        delete_ids = Trace.objects.order_by("start_time")[
+                        delete_ids = Trace.query.order_by("start_time")[
                             :excess_count
                         ].values_list("id", flat=True)
-                        Trace.objects.filter(id__in=delete_ids).delete()
+                        Trace.query.filter(id__in=delete_ids).delete()
                 except Exception as e:
                     logger.warning(
                         "Failed to clean up old observer traces: %s", e, exc_info=True
@@ -401,7 +401,7 @@ class ObserverSpanProcessor(SpanProcessor):
                 from .models import Span
 
                 with suppress_db_tracing():
-                    if Span.objects.filter(
+                    if Span.query.filter(
                         span_id=f"0x{format_span_id(link.context.span_id)}"
                     ).exists():
                         return ObserverMode.PERSIST.value

{plain_observer-0.6.2 → plain_observer-0.7.0}/plain/observer/templates/observer/trace.html

@@ -126,7 +126,7 @@
 
 <div class="mt-6">
     <div class="flex items-center justify-between mb-3">
-        <h3 class="text-sm font-medium text-white/80">Spans ({{ trace.spans.count() }}) + Logs ({{ trace.logs.count() }})</h3>
+        <h3 class="text-sm font-medium text-white/80">Spans ({{ trace.spans.query.count() }}) + Logs ({{ trace.logs.query.count() }})</h3>
         <div class="text-xs text-white/60">
             <span class="text-white/50">Started:</span> {{ trace.start_time|localtime|strftime("%b %-d, %-I:%M %p") }}
         </div>

{plain_observer-0.6.2 → plain_observer-0.7.0}/plain/observer/views.py

@@ -15,7 +15,7 @@ class ObserverTracesView(AuthViewMixin, HTMXViewMixin, ListView):
     admin_required = True
 
     def get_objects(self):
-        return Trace.objects.all()
+        return Trace.query.all()
 
     def check_auth(self):
         # Allow the view if we're in DEBUG
@@ -56,7 +56,7 @@ class ObserverTracesView(AuthViewMixin, HTMXViewMixin, ListView):
 
     def htmx_delete_traces(self):
         """Clear all traces via HTMX DELETE."""
-        Trace.objects.filter(share_id="").delete()
+        Trace.query.filter(share_id="").delete()
         response = Response(status_code=204)
         response.headers["HX-Refresh"] = "true"
         return response
@@ -80,7 +80,7 @@ class ObserverTraceDetailView(AuthViewMixin, HTMXViewMixin, DetailView):
     admin_required = True
 
     def get_object(self):
-        return Trace.objects.get_or_none(trace_id=self.url_kwargs.get("trace_id"))
+        return Trace.query.get_or_none(trace_id=self.url_kwargs.get("trace_id"))
 
     def check_auth(self):
         # Allow the view if we're in DEBUG
@@ -97,7 +97,7 @@ class ObserverTraceDetailView(AuthViewMixin, HTMXViewMixin, DetailView):
             return self.object.as_dict()
 
         if self.request.query_params.get("logs") == "true":
-            logs = self.object.logs.all().order_by("timestamp")
+            logs = self.object.logs.query.all().order_by("timestamp")
             log_lines = []
             for log in logs:
                 timestamp = log.timestamp.strftime("%Y-%m-%d %H:%M:%S.%f")
@@ -137,7 +137,7 @@ class ObserverTraceSharedView(DetailView):
     context_object_name = "trace"
 
     def get_object(self):
-        return Trace.objects.get_or_none(share_id=self.url_kwargs["share_id"])
+        return Trace.query.get_or_none(share_id=self.url_kwargs["share_id"])
 
     def get_template_context(self):
         context = super().get_template_context()

{plain_observer-0.6.2 → plain_observer-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.observer"
-version = "0.6.2"
+version = "0.7.0"
 description = "On-page telemetry and observability tools for Plain."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 license = "BSD-3-Clause"