plain.observer 0.5.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

plain/observer/templates/observer/traces.html

@@ -23,7 +23,7 @@
                 <div class="flex-shrink-0 p-3 border-b border-white/10 z-10">
                     <div class="flex items-center justify-between">
                         <h3 class="text-sm text-white/90">Traces ({{ traces|length }})</h3>
-                        <div class="flex items-center space-x-2">
+                        <div class="flex items-center gap-2">
                             {% if observer.is_persisting() %}
                             <div class="w-2 h-2 bg-red-500 rounded-full animate-pulse" title="Recording"></div>
                             {% endif %}
@@ -40,29 +40,42 @@
                                 <option disabled>───────</option>
                                 <option value="disable" {% if observer.is_disabled() %}selected{% endif %} class="text-white/50">Disabled</option>
                             </select>
-                            <button
-                                hx-get="."
-                                hx-swap="morph:innerHTML"
-                                hx-target="#main-content"
-                                class="h-8 w-8 flex items-center justify-center rounded-sm bg-white/10 text-white/70 hover:bg-white/20 cursor-pointer transition-colors"
-                                title="Refresh traces">
-                                <svg class="htmx-request:animate-spin w-4 h-4" fill="currentColor" viewBox="0 0 16 16">
-                                    <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
-                                    <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z"/>
-                                </svg>
-                            </button>
-                            <button
-                                hx-delete="."
-                                plain-hx-action="traces"
-                                hx-swap="morph:innerHTML"
-                                hx-target="#main-content"
-                                class="h-8 w-8 flex items-center justify-center rounded-sm bg-white/10 text-white/70 hover:bg-red-600 hover:text-white cursor-pointer transition-colors"
-                                title="Clear all traces">
-                                <svg class="w-4 h-4" fill="currentColor" viewBox="0 0 16 16">
-                                    <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"/>
-                                    <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"/>
-                                </svg>
-                            </button>
+                            <div class="relative group">
+                                <div class="flex items-center gap-2 hover:bg-white/10 rounded-lg p-1 transition-colors cursor-pointer">
+                                    <svg class="w-4 h-4 text-white/70" fill="currentColor" viewBox="0 0 16 16">
+                                        <path d="M3 9.5a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/>
+                                    </svg>
+                                </div>
+                                <div class="absolute right-0 mt-3 w-48 bg-black rounded-lg shadow-lg border border-white/10 py-2 z-50 opacity-0 invisible group-hover:opacity-100 group-hover:visible transition-all duration-200">
+                                    <div class="py-1">
+                                        <button
+                                            hx-get="."
+                                            hx-swap="morph:innerHTML"
+                                            hx-target="#main-content"
+                                            class="cursor-pointer w-full text-left px-4 py-3 text-sm text-white/70 hover:bg-white/5 transition-colors flex items-center gap-3">
+                                            <svg class="htmx-request:animate-spin w-4 h-4 text-white/50" fill="currentColor" viewBox="0 0 16 16">
+                                                <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
+                                                <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z"/>
+                                            </svg>
+                                            <span class="htmx-request:hidden">Refresh Traces</span>
+                                            <span class="hidden htmx-request:inline">Refreshing...</span>
+                                        </button>
+                                        <button
+                                            hx-delete="."
+                                            plain-hx-action="traces"
+                                            hx-swap="morph:innerHTML"
+                                            hx-target="#main-content"
+                                            hx-confirm="Clear all traces?"
+                                            class="cursor-pointer w-full text-left px-4 py-3 text-sm text-red-200 hover:bg-red-900/20 transition-colors flex items-center gap-3">
+                                            <svg class="w-4 h-4 text-red-400" fill="currentColor" viewBox="0 0 16 16">
+                                                <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"/>
+                                                <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"/>
+                                            </svg>
+                                            Clear All Traces
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -89,7 +102,7 @@
                                         {% endif %}
                                     </div>
                                     <div class="flex items-center gap-1.5 flex-shrink-0">
-                                        <span class="text-white/40 text-xs">{{ trace_item.start_time|localtime|strftime("%-I:%M %p") }}</span>
+                                        <span class="text-white/40 text-xs" title="{{ trace_item.start_time|localtime }}">{{ trace_item.start_time|timesince }} ago</span>
                                     </div>
                                 </div>
                                 <div class="mt-1 space-y-1">
@@ -105,10 +118,10 @@
                                         <div class="text-xs text-white/30 font-mono truncate">{{ trace_item.trace_id }}</div>
                                     </div>
                                     {% endif %}
-                                    {% if trace_item.user_id or trace_item.session_id %}
+                                    {% if trace_item.user_id or trace_item.session_id or trace_item.app_version %}
                                     <div class="flex items-center gap-3 text-xs text-white/50">
                                         {% if trace_item.user_id %}
-                                        <span class="flex items-center gap-1">
+                                        <span class="flex items-center gap-1 flex-shrink-0">
                                             <svg class="w-3 h-3 text-white/70" fill="currentColor" viewBox="0 0 16 16">
                                                 <path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6"/>
                                             </svg>
@@ -116,13 +129,22 @@
                                         </span>
                                         {% endif %}
                                         {% if trace_item.session_id %}
-                                        <span class="flex items-center gap-1 min-w-0">
+                                        <span class="flex items-center gap-1 min-w-0 flex-shrink">
                                             <svg class="w-3 h-3 text-white/70 flex-shrink-0" fill="currentColor" viewBox="0 0 16 16">
                                                 <path d="M13.5 3a.5.5 0 0 1 .5.5V11H2V3.5a.5.5 0 0 1 .5-.5zm-11-1A1.5 1.5 0 0 0 1 3.5V12h14V3.5A1.5 1.5 0 0 0 13.5 2zM0 12.5h16a1.5 1.5 0 0 1-1.5 1.5h-13A1.5 1.5 0 0 1 0 12.5"/>
                                             </svg>
                                             <span class="truncate" title="{{ trace_item.session_id }}">{{ trace_item.session_id }}</span>
                                         </span>
                                         {% endif %}
+                                        {% if trace_item.app_version %}
+                                        <span class="flex items-center gap-1 flex-shrink-0">
+                                            <svg class="w-3 h-3 text-white/70" fill="currentColor" viewBox="0 0 16 16">
+                                                <path d="M6 4.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm-1 0a.5.5 0 1 0-1 0 .5.5 0 0 0 1 0z"/>
+                                                <path d="M2 1h4.586a1 1 0 0 1 .707.293l7 7a1 1 0 0 1 0 1.414l-4.586 4.586a1 1 0 0 1-1.414 0l-7-7A1 1 0 0 1 1 6.586V2a1 1 0 0 1 1-1zm0 5.586 7 7L13.586 9l-7-7H2v4.586z"/>
+                                            </svg>
+                                            {{ trace_item.app_version }}
+                                        </span>
+                                        {% endif %}
                                     </div>
                                     {% endif %}
                                 </div>

plain/observer/views.py

@@ -89,12 +89,21 @@ class ObserverTraceDetailView(AuthViewMixin, HTMXViewMixin, DetailView):
         super().check_auth()
 
     def get(self):
-        """Return trace data as HTML or JSON based on content negotiation."""
+        """Return trace data as HTML, JSON, or logs 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 self.object.as_dict()
+
+        if self.request.query_params.get("logs") == "true":
+            logs = self.object.logs.all().order_by("timestamp")
+            log_lines = []
+            for log in logs:
+                timestamp = log.timestamp.strftime("%Y-%m-%d %H:%M:%S.%f")
+                log_lines.append(f"{timestamp} [{log.level}]: {log.message}")
+
+            return Response("\n".join(log_lines), content_type="text/plain")
 
         return super().get()
 
@@ -105,8 +114,7 @@ class ObserverTraceDetailView(AuthViewMixin, HTMXViewMixin, DetailView):
         return super().get_template_names()
 
     def htmx_delete(self):
-        trace = self.get_object()
-        trace.delete()
+        self.object.delete()
 
         # Redirect to traces list after deletion
         response = Response(status_code=204)
@@ -114,13 +122,11 @@ class ObserverTraceDetailView(AuthViewMixin, HTMXViewMixin, DetailView):
         return response
 
     def htmx_post_share(self):
-        trace = self.get_object()
-        trace.generate_share_id()
+        self.object.generate_share_id()
         return super().get()
 
     def htmx_delete_share(self):
-        trace = self.get_object()
-        trace.remove_share_id()
+        self.object.remove_share_id()
         return super().get()
 
 
@@ -144,6 +150,6 @@ class ObserverTraceSharedView(DetailView):
             "application/json" in self.request.headers.get("Accept", "")
             or self.request.query_params.get("format") == "json"
         ):
-            return JsonResponse(self.get_object().as_dict())
+            return JsonResponse(self.object.as_dict())
 
         return super().get()

{plain_observer-0.5.0.dist-info → plain_observer-0.6.1.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: plain.observer
-Version: 0.5.0
+Version: 0.6.1
 Summary: On-page telemetry and observability tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause
 License-File: LICENSE
-Requires-Python: >=3.11
+Requires-Python: >=3.13
 Requires-Dist: opentelemetry-sdk>=1.34.1
 Requires-Dist: plain-admin<1.0.0
 Requires-Dist: plain<1.0.0

plain_observer-0.6.1.dist-info/RECORD

@@ -0,0 +1,33 @@
+plain/observer/CHANGELOG.md,sha256=pZEAYcaGjPvV3paHKXoM7Nw_vIYyEi4R3vd1yocEn8o,8968
+plain/observer/README.md,sha256=39RA17fgcyOkqeIWBOAg4Be6YZjoiDzK5PVOG-nseuY,988
+plain/observer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plain/observer/admin.py,sha256=yvfkXD4kIosodEqkvJkqACIb6WOdNaHFRX_LGca5Aks,3391
+plain/observer/cli.py,sha256=Jh5OwTtKmV6TTymfS9xv1R_tQL1tgfKKUS__19Wcnbk,20647
+plain/observer/config.py,sha256=8c5aX2_rzVL4SSFO4Q0nMyUSqgpu3Zv3aJkeFZONOpM,2434
+plain/observer/core.py,sha256=ZHwQAXlqKa1BvHh3Xr6R0iOgkSNTEJ_Wg2lUlgMzWsE,2420
+plain/observer/default_settings.py,sha256=JN2jT2wfa6f80EqU0p4Ox_47xyxL-Ym5-_pftY7xj2U,197
+plain/observer/logging.py,sha256=5_fcmUE0x2lg7968V4lhduaTbRLCr8w-ooRFo9BC1ms,2795
+plain/observer/models.py,sha256=EJTUCDeJkG55XgTT1AUpYvEDU8KDgCVr1nexKKt4GQQ,17045
+plain/observer/otel.py,sha256=h7LI7Nur8Y6XheriuNWPmeSFpf2Vsl94Sgxv02W8ZXY,16170
+plain/observer/toolbar.py,sha256=He7SqjED-7smLDWoomZ9df35qN4WcslNXi5eaO7X4lY,617
+plain/observer/urls.py,sha256=oLJoDjB7YMUx8z-MGql_xXSXkfacVKFp-aHNXaKzs38,376
+plain/observer/views.py,sha256=8KoBwXBj2q-mbuscA80h7nlglsOraTz-ScTzTQwLWP0,4949
+plain/observer/migrations/0001_initial.py,sha256=HVoSrd5V-IOqD1adADIAzqMH8xMlPwyLOFH6JcGFniI,3312
+plain/observer/migrations/0002_trace_share_created_at_trace_share_id_trace_summary_and_more.py,sha256=lgFqdn66zq7AoCvkC3MIvLXiE_Omup5EEMDSe1jpKOg,1765
+plain/observer/migrations/0003_span_plainobserv_span_id_e7ade3_idx.py,sha256=54G8GXi-PiFbcTU-HrXO14UN9PxhjDCY05TA9HHkkmk,527
+plain/observer/migrations/0004_trace_app_name_trace_app_version.py,sha256=Qfp62tlv0UfKKPIM1NcbqVfA9TXhsNSoq9qzbnjgCPk,640
+plain/observer/migrations/0005_log_log_plainobserv_trace_i_fcfb7d_idx_and_more.py,sha256=ubUAPgN_jKK_o9J3G38MihGgsP_LvBwAzgvc1N-Td9M,2167
+plain/observer/migrations/0006_remove_log_logger.py,sha256=ruuwsDEcilSFTimU52JMiHz9ENxRCmLyheX_71ZXxfo,362
+plain/observer/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plain/observer/templates/observer/trace.html,sha256=Hd92O1lX0xjvDR7cb79NFVeJhxaVEA1mmyzvsRVKuwU,11362
+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=auU9tYUan4P0En48VwfOKgKr7wRNSF7Jc7X-V--7fUE,24575
+plain/observer/templates/observer/partials/log.html,sha256=Vpp0j-GLBfwTBFyZp_cv0jkOLpgxfd-8-RMBe6V4HbU,964
+plain/observer/templates/observer/partials/span.html,sha256=PaWZONsABwlS7mdKsJlYbhMSOzidq_WyOp6ifvFUgmM,18672
+plain/observer/templates/toolbar/observer.html,sha256=uaDKiWR7EYqC1kEXE-uHDlE7nfFEMR_zmOgvlKwQHJ4,1365
+plain/observer/templates/toolbar/observer_button.html,sha256=FMBJHKMGqpHWs-3Ei2PBCdVYZ_6vFw6-eKH_i4jQu-Q,1215
+plain_observer-0.6.1.dist-info/METADATA,sha256=WMOZIw-IltBu-VI2VdgU_HbdtqAyy_PSJwB4pT7KPto,1386
+plain_observer-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_observer-0.6.1.dist-info/licenses/LICENSE,sha256=YZdq6Pz8ivjs97eSVLRmoGDI1hjEikX6N49DfM0DWio,1500
+plain_observer-0.6.1.dist-info/RECORD,,

plain_observer-0.5.0.dist-info/RECORD

@@ -1,27 +0,0 @@
-plain/observer/CHANGELOG.md,sha256=dY_jT_IisTqQOzhirekm0fNhsJQcx6MrGML5OhCuHYo,6735
-plain/observer/README.md,sha256=39RA17fgcyOkqeIWBOAg4Be6YZjoiDzK5PVOG-nseuY,988
-plain/observer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plain/observer/admin.py,sha256=AsX6uGjIHN7EWu1Ez4VY8yYHiCydZ6bv7HCig9W9SI4,2096
-plain/observer/cli.py,sha256=Jh5OwTtKmV6TTymfS9xv1R_tQL1tgfKKUS__19Wcnbk,20647
-plain/observer/config.py,sha256=FuJi1jiDSvOTcmP-6Ea4OlGZt5cRf4iTp1e0dgpJ45E,1494
-plain/observer/core.py,sha256=ZHwQAXlqKa1BvHh3Xr6R0iOgkSNTEJ_Wg2lUlgMzWsE,2420
-plain/observer/default_settings.py,sha256=JN2jT2wfa6f80EqU0p4Ox_47xyxL-Ym5-_pftY7xj2U,197
-plain/observer/models.py,sha256=ZHu5SLWEpb4wOqQelGqAFmwSORCLH2H7T9GUYAoeLN0,13118
-plain/observer/otel.py,sha256=9OUvAJfEXBVuFIIs3CZZ8IYHu-QxRFklbPBtEVHHz54,14645
-plain/observer/toolbar.py,sha256=He7SqjED-7smLDWoomZ9df35qN4WcslNXi5eaO7X4lY,617
-plain/observer/urls.py,sha256=oLJoDjB7YMUx8z-MGql_xXSXkfacVKFp-aHNXaKzs38,376
-plain/observer/views.py,sha256=bPBByjs1ZlsN-9wgiO4OqQYR9uPXBYnasqV2ZZLJU0Q,4626
-plain/observer/migrations/0001_initial.py,sha256=HVoSrd5V-IOqD1adADIAzqMH8xMlPwyLOFH6JcGFniI,3312
-plain/observer/migrations/0002_trace_share_created_at_trace_share_id_trace_summary_and_more.py,sha256=lgFqdn66zq7AoCvkC3MIvLXiE_Omup5EEMDSe1jpKOg,1765
-plain/observer/migrations/0003_span_plainobserv_span_id_e7ade3_idx.py,sha256=54G8GXi-PiFbcTU-HrXO14UN9PxhjDCY05TA9HHkkmk,527
-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=FMBJHKMGqpHWs-3Ei2PBCdVYZ_6vFw6-eKH_i4jQu-Q,1215
-plain_observer-0.5.0.dist-info/METADATA,sha256=wpz5Pi6iYS5jpWgbusejdnoPrQir1nZ2VQiRZt4BOnE,1386
-plain_observer-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_observer-0.5.0.dist-info/licenses/LICENSE,sha256=YZdq6Pz8ivjs97eSVLRmoGDI1hjEikX6N49DfM0DWio,1500
-plain_observer-0.5.0.dist-info/RECORD,,