plain.models 0.40.1__tar.gz → 0.41.1__tar.gz

{plain_models-0.40.1 → plain_models-0.41.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: plain.models
-Version: 0.40.1
+Version: 0.41.1
 Summary: Model your data and store it in a database.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE
-Requires-Python: >=3.11
+Requires-Python: >=3.13
 Requires-Dist: plain<1.0.0
 Requires-Dist: sqlparse>=0.3.1
 Description-Content-Type: text/markdown

{plain_models-0.40.1 → plain_models-0.41.1}/plain/models/CHANGELOG.md

@@ -1,5 +1,29 @@
 # plain-models changelog
 
+## [0.41.1](https://github.com/dropseed/plain/releases/plain-models@0.41.1) (2025-09-09)
+
+### What's changed
+
+- Improved stack trace filtering in OpenTelemetry spans to exclude internal plain/models frames, making debugging traces cleaner and more focused on user code ([5771dd5](https://github.com/dropseed/plain/commit/5771dd5))
+
+### Upgrade instructions
+
+- No changes required
+
+## [0.41.0](https://github.com/dropseed/plain/releases/plain-models@0.41.0) (2025-09-09)
+
+### What's changed
+
+- Python 3.13 is now the minimum required version ([d86e307](https://github.com/dropseed/plain/commit/d86e307))
+- Removed the `earliest()`, `latest()`, and `get_latest_by` model meta option - use `order_by().first()` and `order_by().last()` instead ([b6093a8](https://github.com/dropseed/plain/commit/b6093a8))
+- Removed automatic ordering in `first()` and `last()` queryset methods - they now respect the existing queryset ordering without adding default ordering ([adc19a6](https://github.com/dropseed/plain/commit/adc19a6))
+- Added code location attributes to database operation tracing, showing the source file, line number, and function where the query originated ([da36a17](https://github.com/dropseed/plain/commit/da36a17))
+
+### Upgrade instructions
+
+- Replace usage of `earliest()`, `latest()`, and model `Meta` `get_latest_by` queryset methods with equivalent `order_by().first()` or `order_by().last()` calls
+- The `first()` and `last()` methods no longer automatically add ordering by `id` - explicitly add `.order_by()` to your querysets or `ordering` to your models `Meta` class if needed
+
 ## [0.40.1](https://github.com/dropseed/plain/releases/plain-models@0.40.1) (2025-09-03)
 
 ### What's changed

{plain_models-0.40.1 → plain_models-0.41.1}/plain/models/migrations/operations/models.py

@@ -450,7 +450,6 @@ class AlterModelOptions(ModelOptionOperation):
         "base_manager_name",
         "default_manager_name",
         "default_related_name",
-        "get_latest_by",
         "ordering",
     ]
 

{plain_models-0.40.1 → plain_models-0.41.1}/plain/models/options.py

@@ -25,7 +25,6 @@ DEFAULT_NAMES = (
     "db_table",
     "db_table_comment",
     "ordering",
-    "get_latest_by",
     "package_label",
     "models_registry",
     "default_related_name",
@@ -74,7 +73,6 @@ class Options:
         self.constraints = []
         self.object_name = None
         self.package_label = package_label
-        self.get_latest_by = None
         self.required_db_features = []
         self.required_db_vendor = None
         self.meta = meta

{plain_models-0.40.1 → plain_models-0.41.1}/plain/models/otel.py

@@ -1,4 +1,5 @@
 import re
+import traceback
 from contextlib import contextmanager
 from typing import Any
 
@@ -8,6 +9,13 @@ from opentelemetry.semconv._incubating.attributes.db_attributes import (
     DB_QUERY_PARAMETER_TEMPLATE,
     DB_USER,
 )
+from opentelemetry.semconv.attributes.code_attributes import (
+    CODE_COLUMN_NUMBER,
+    CODE_FILE_PATH,
+    CODE_FUNCTION_NAME,
+    CODE_LINE_NUMBER,
+    CODE_STACKTRACE,
+)
 from opentelemetry.semconv.attributes.db_attributes import (
     DB_COLLECTION_NAME,
     DB_NAMESPACE,
@@ -126,6 +134,8 @@ def db_span(db, sql: Any, *, many: bool = False, params=None):
         DB_OPERATION_NAME: operation,
     }
 
+    attrs.update(_get_code_attributes())
+
     # Add collection name if detected
     if collection_name:
         attrs[DB_COLLECTION_NAME] = collection_name
@@ -173,3 +183,55 @@ def suppress_db_tracing():
         yield
     finally:
         otel_context.detach(token)
+
+
+def _get_code_attributes():
+    """Extract code context attributes for the current database query.
+
+    Returns a dict of OpenTelemetry code attributes.
+    """
+    stack = traceback.extract_stack()
+
+    # Find the user code frame
+    for frame in reversed(stack):
+        filepath = frame.filename
+        if not filepath:
+            continue
+
+        if "/plain/models/" in filepath:
+            continue
+
+        if filepath.endswith("contextlib.py"):
+            continue
+
+        # Found user code - build attributes dict
+        attrs = {}
+
+        if filepath:
+            attrs[CODE_FILE_PATH] = filepath
+        if frame.lineno:
+            attrs[CODE_LINE_NUMBER] = frame.lineno
+        if frame.name:
+            attrs[CODE_FUNCTION_NAME] = frame.name
+        if frame.colno:
+            attrs[CODE_COLUMN_NUMBER] = frame.colno
+
+        # Add full stack trace only in DEBUG mode (expensive)
+        if settings.DEBUG:
+            # Filter out internal frames from the stack trace
+            filtered_stack = []
+            for frame in stack:
+                filepath = frame.filename
+                if not filepath:
+                    continue
+                if "/plain/models/" in filepath:
+                    continue
+                if filepath.endswith("contextlib.py"):
+                    continue
+                filtered_stack.append(frame)
+
+            attrs[CODE_STACKTRACE] = "".join(traceback.format_list(filtered_stack))
+
+        return attrs
+
+    return {}

{plain_models-0.40.1 → plain_models-0.41.1}/plain/models/query.py

@@ -873,59 +873,14 @@ class QuerySet:
             )
         return params
 
-    def _earliest(self, *fields):
-        """
-        Return the earliest object according to fields (if given) or by the
-        model's Meta.get_latest_by.
-        """
-        if fields:
-            order_by = fields
-        else:
-            order_by = getattr(self.model._meta, "get_latest_by")
-            if order_by and not isinstance(order_by, tuple | list):
-                order_by = (order_by,)
-        if order_by is None:
-            raise ValueError(
-                "earliest() and latest() require either fields as positional "
-                "arguments or 'get_latest_by' in the model's Meta."
-            )
-        obj = self._chain()
-        obj.query.set_limits(high=1)
-        obj.query.clear_ordering(force=True)
-        obj.query.add_ordering(*order_by)
-        return obj.get()
-
-    def earliest(self, *fields):
-        if self.query.is_sliced:
-            raise TypeError("Cannot change a query once a slice has been taken.")
-        return self._earliest(*fields)
-
-    def latest(self, *fields):
-        """
-        Return the latest object according to fields (if given) or by the
-        model's Meta.get_latest_by.
-        """
-        if self.query.is_sliced:
-            raise TypeError("Cannot change a query once a slice has been taken.")
-        return self.reverse()._earliest(*fields)
-
     def first(self):
         """Return the first object of a query or None if no match is found."""
-        if self.ordered:
-            queryset = self
-        else:
-            self._check_ordering_first_last_queryset_aggregation(method="first")
-            queryset = self.order_by("id")
-        for obj in queryset[:1]:
+        for obj in self[:1]:
             return obj
 
     def last(self):
         """Return the last object of a query or None if no match is found."""
-        if self.ordered:
-            queryset = self.reverse()
-        else:
-            self._check_ordering_first_last_queryset_aggregation(method="last")
-            queryset = self.order_by("-id")
+        queryset = self.reverse()
         for obj in queryset[:1]:
             return obj
 
@@ -1763,16 +1718,6 @@ class QuerySet:
         if self.query.combinator or other.query.combinator:
             raise TypeError(f"Cannot use {operator_} operator with combined queryset.")
 
-    def _check_ordering_first_last_queryset_aggregation(self, method):
-        if isinstance(self.query.group_by, tuple) and not any(
-            col.output_field is self.model._meta.get_field("id")
-            for col in self.query.group_by
-        ):
-            raise TypeError(
-                f"Cannot use QuerySet.{method}() on an unordered queryset performing "
-                f"aggregation. Add an ordering with order_by()."
-            )
-
 
 class InstanceCheckMeta(type):
     def __instancecheck__(self, instance):

{plain_models-0.40.1 → plain_models-0.41.1}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "plain.models"
-version = "0.40.1"
+version = "0.41.1"
 description = "Model your data and store it in a database."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 dependencies = [
     "plain<1.0.0",
     "sqlparse>=0.3.1",