TypeDAL 4.9.2__tar.gz → 4.9.4__tar.gz

typedal-4.9.4/.crush/.gitignore

@@ -0,0 +1 @@
+*

typedal-4.9.4/.crush/logs/crush.log

@@ -0,0 +1,37 @@
+{"time":"2026-01-20T14:19:21.359487106+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/config.(*catwalkSync).Get.func1","file":"github.com/charmbracelet/crush/internal/config/catwalk.go","line":55},"msg":"Fetching providers from Catwalk"}
+{"time":"2026-01-20T14:19:21.518115889+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/config.(*catwalkSync).Get.func1","file":"github.com/charmbracelet/crush/internal/config/catwalk.go","line":63},"msg":"Catwalk providers not modified"}
+{"time":"2026-01-20T14:19:21.52626179+01:00","level":"INFO","msg":"OK   20250424200609_initial.sql (1.52ms)"}
+{"time":"2026-01-20T14:19:21.526651475+01:00","level":"INFO","msg":"OK   20250515105448_add_summary_message_id.sql (330.71µs)"}
+{"time":"2026-01-20T14:19:21.526995425+01:00","level":"INFO","msg":"OK   20250624000000_add_created_at_indexes.sql (325.29µs)"}
+{"time":"2026-01-20T14:19:21.527303588+01:00","level":"INFO","msg":"OK   20250627000000_add_provider_to_messages.sql (293.15µs)"}
+{"time":"2026-01-20T14:19:21.52790648+01:00","level":"INFO","msg":"OK   20250810000000_add_is_summary_message.sql (495.71µs)"}
+{"time":"2026-01-20T14:19:21.528316924+01:00","level":"INFO","msg":"OK   20250812000000_add_todos_to_sessions.sql (389.38µs)"}
+{"time":"2026-01-20T14:19:21.528324939+01:00","level":"INFO","msg":"goose: successfully migrated database to version: 20250812000000"}
+{"time":"2026-01-20T14:19:21.528356959+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.(*App).initLSPClients","file":"github.com/charmbracelet/crush/internal/app/lsp.go","line":21},"msg":"LSP clients initialization started in background"}
+{"time":"2026-01-20T14:19:21.52843831+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.New.func1","file":"github.com/charmbracelet/crush/internal/app/app.go","line":102},"msg":"Initializing MCP clients"}
+{"time":"2026-01-20T14:21:06.413595152+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T14:21:14.539289381+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T14:21:15.710688424+01:00","level":"WARN","source":{"function":"github.com/charmbracelet/crush/internal/agent/tools.init.func1","file":"github.com/charmbracelet/crush/internal/agent/tools/rg.go","line":18},"msg":"Ripgrep (rg) not found in $PATH. Some grep features might be limited or slower."}
+{"time":"2026-01-20T14:21:17.08089755+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T14:21:17.151106375+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T14:22:05.503761296+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T14:26:05.030425805+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T14:36:26.778665189+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T14:38:51.314473736+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T15:02:22.602405814+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.(*App).Shutdown.func1","file":"github.com/charmbracelet/crush/internal/app/app.go","line":403},"msg":"Shutdown took 6.62949ms"}
+{"time":"2026-01-20T15:02:23.719585648+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/config.(*catwalkSync).Get.func1","file":"github.com/charmbracelet/crush/internal/config/catwalk.go","line":55},"msg":"Fetching providers from Catwalk"}
+{"time":"2026-01-20T15:02:23.881789126+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/config.(*catwalkSync).Get.func1","file":"github.com/charmbracelet/crush/internal/config/catwalk.go","line":63},"msg":"Catwalk providers not modified"}
+{"time":"2026-01-20T15:02:23.884044691+01:00","level":"INFO","msg":"goose: no migrations to run. current version: 20250812000000"}
+{"time":"2026-01-20T15:02:23.884082792+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.(*App).initLSPClients","file":"github.com/charmbracelet/crush/internal/app/lsp.go","line":21},"msg":"LSP clients initialization started in background"}
+{"time":"2026-01-20T15:02:23.884273487+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.New.func1","file":"github.com/charmbracelet/crush/internal/app/app.go","line":102},"msg":"Initializing MCP clients"}
+{"time":"2026-01-20T15:04:13.024457515+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T15:04:14.232072885+01:00","level":"WARN","source":{"function":"github.com/charmbracelet/crush/internal/agent/tools.init.func1","file":"github.com/charmbracelet/crush/internal/agent/tools/rg.go","line":18},"msg":"Ripgrep (rg) not found in $PATH. Some grep features might be limited or slower."}
+{"time":"2026-01-20T15:11:24.612161916+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.(*App).Shutdown.func1","file":"github.com/charmbracelet/crush/internal/app/app.go","line":403},"msg":"Shutdown took 9.537141ms"}
+{"time":"2026-01-20T15:11:25.263960575+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/config.(*catwalkSync).Get.func1","file":"github.com/charmbracelet/crush/internal/config/catwalk.go","line":55},"msg":"Fetching providers from Catwalk"}
+{"time":"2026-01-20T15:11:25.431990051+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/config.(*catwalkSync).Get.func1","file":"github.com/charmbracelet/crush/internal/config/catwalk.go","line":63},"msg":"Catwalk providers not modified"}
+{"time":"2026-01-20T15:11:25.434282035+01:00","level":"INFO","msg":"goose: no migrations to run. current version: 20250812000000"}
+{"time":"2026-01-20T15:11:25.434366662+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.(*App).initLSPClients","file":"github.com/charmbracelet/crush/internal/app/lsp.go","line":21},"msg":"LSP clients initialization started in background"}
+{"time":"2026-01-20T15:11:25.434579879+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.New.func1","file":"github.com/charmbracelet/crush/internal/app/app.go","line":102},"msg":"Initializing MCP clients"}
+{"time":"2026-01-20T15:24:40.456010578+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-20T15:24:51.673808433+01:00","level":"WARN","source":{"function":"github.com/charmbracelet/crush/internal/agent/tools.init.func1","file":"github.com/charmbracelet/crush/internal/agent/tools/rg.go","line":18},"msg":"Ripgrep (rg) not found in $PATH. Some grep features might be limited or slower."}
+{"time":"2026-01-20T15:26:03.868420566+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).Cancel","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":907},"msg":"Request cancellation initiated","session_id":"4c2d1684-8db2-4ffd-83bb-9c08fe850f29"}

{typedal-4.9.2 → typedal-4.9.4}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v4.9.4 (2026-07-03)
+
+### Fix
+
+* **query_builder:** Include orderby fields in distinct-id subquery for paginated joins ([`d343a43`](https://github.com/trialandsuccess/TypeDAL/commit/d343a4326fdbf93fb5fd8b5db061ea5b3355e3de))
+
+## v4.9.3 (2026-07-03)
+
+### Fix
+
+* Pagination count with joined relationships ([`2eaefc0`](https://github.com/trialandsuccess/TypeDAL/commit/2eaefc051a94d4a4204164e0773a8d7691aae63e))
+
 ## v4.9.2 (2026-07-02)
 
 ### Fix

{typedal-4.9.2 → typedal-4.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TypeDAL
-Version: 4.9.2
+Version: 4.9.4
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues

{typedal-4.9.2 → typedal-4.9.4}/src/typedal/__about__.py

@@ -5,4 +5,4 @@ This file contains the Version info for this package.
 # SPDX-FileCopyrightText: 2023-present Robin van der Noord <robinvandernoord@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "4.9.2"
+__version__ = "4.9.4"

{typedal-4.9.2 → typedal-4.9.4}/src/typedal/query_builder.py

@@ -818,6 +818,46 @@ class QueryBuilder[T_MetaInstance: _TypedTable]:
 
         return joins
 
+    def _selectable_orderby_fields(self, orderby: OrderBy | t.Iterable[OrderBy] | None) -> list[OrderBy]:
+        """Extract field values from pydal orderby expressions."""
+        if not orderby:
+            return []
+
+        if isinstance(orderby, (list, tuple, set)):
+            return [field for item in orderby for field in self._selectable_orderby_fields(item)]
+
+        if isinstance(orderby, pydal.objects.Field):
+            return [orderby]
+
+        fields = []
+        first = getattr(orderby, "first", None)
+        second = getattr(orderby, "second", None)
+
+        if first is not None:
+            fields.extend(self._selectable_orderby_fields(first))
+        if second is not None:
+            fields.extend(self._selectable_orderby_fields(second))
+
+        return fields
+
+    def _select_distinct_ids_with_orderby_fields(self, query: Query, select_kwargs: SelectKwargs) -> str:
+        db = self._get_db()
+        model = self.model
+        select_args: list[OrderBy] = [model.id]
+        seen = {str(model.id)}
+
+        for field in self._selectable_orderby_fields(select_kwargs.get("orderby")):
+            key = str(field)
+            if key not in seen:
+                select_args.append(field)
+                seen.add(key)
+
+        ids = db(query)._select(*select_args, **select_kwargs).rstrip(";")
+        id_column = getattr(model.id, "_raw_rname", model.id.name)
+        return f'SELECT "{id_column}" FROM ({ids}) AS typedal_paginate_ids'  # nosec:
+        # id_column originates from code
+        # ids is a safe subquery, originating from code
+
     def _apply_limitby_optimization(
         self,
         query: Query,
@@ -837,8 +877,13 @@ class QueryBuilder[T_MetaInstance: _TypedTable]:
 
         if joins:
             kwargs["join"] = joins
+            kwargs["distinct"] = True
+
+        if joins and kwargs.get("orderby"):
+            ids = self._select_distinct_ids_with_orderby_fields(query, kwargs)
+        else:
+            ids = db(query)._select(model.id, **kwargs)
 
-        ids = db(query)._select(model.id, **kwargs)
         query = model.id.belongs(ids)
         metadata["ids"] = ids
 
@@ -1128,19 +1173,31 @@ class QueryBuilder[T_MetaInstance: _TypedTable]:
         """
         yield from self.collect()
 
-    def __count(self, db: TypeDAL, distinct: t.Optional[bool] = None) -> Query:
+    def __count(
+        self,
+        db: TypeDAL,
+        distinct: t.Optional[bool] = None,
+        *,
+        include_left_for_distinct: bool = True,
+    ) -> Query:
         # internal, shared logic between .count and ._count
         model = self.model
         query = self.query
         for key, relation in self.relationships.items():
-            if (not relation.condition or relation.join != "inner") and not distinct:
+            if not relation.condition:
+                continue
+
+            include_left_join = distinct and include_left_for_distinct
+            if relation.join != "inner" and not include_left_join:
                 continue
 
             other = relation.get_table(db)
             if not distinct:
                 # todo: can this lead to other issues?
                 other = other.with_alias(f"{key}_{hash(relation)}")
-            query &= relation.condition(model, other)
+
+            if relation.condition is not None:
+                query &= relation.condition(model, other)
 
         return query
 
@@ -1175,12 +1232,20 @@ class QueryBuilder[T_MetaInstance: _TypedTable]:
         require_permission(self._permissions, "read")
         return bool(self.count())
 
+    def __pagination_count(self) -> int:
+        if not self.relationships:
+            return self.count()
+
+        db = self._get_db()
+        query = self.__count(db, distinct=self.model.id, include_left_for_distinct=False)
+        return db(query).count(self.model.id)
+
     def __paginate(
         self,
         limit: int,
         page: int = 1,
     ) -> "QueryBuilder[T_MetaInstance]":
-        available = self.count()
+        available = self.__pagination_count()
 
         _from = limit * (page - 1)
         _to = (limit * page) if limit else available

{typedal-4.9.2 → typedal-4.9.4}/tests/test_query_builder.py

@@ -519,6 +519,10 @@ def test_orderby():
     base_qt = TestQueryTable.select(TestQueryTable.id, TestQueryTable.number)
 
     assert base_qt.count() == 5
+    assert base_qt._selectable_orderby_fields(None) == []
+
+    composite_fields = base_qt._selectable_orderby_fields(TestQueryTable.number | TestQueryTable.other)
+    assert composite_fields == [TestQueryTable.number, TestQueryTable.other]
 
     rows1 = base_qt.orderby(TestQueryTable.id).paginate(limit=3, page=1)
     rows2 = base_qt.select(orderby=TestQueryTable.id, limitby=(0, 3)).collect()
@@ -602,6 +606,45 @@ def test_select_kwargs_use_rname_psql(dal_psql: TypeDAL):
         assert "some_table.some_name" in sql
 
 
+def test_paginate_inner_joins_with_related_orderby_psql(dal_psql: TypeDAL):
+    db = dal_psql
+
+    @db.define()
+    class Method(TypedTable):
+        gid = TypedField(str)
+        name = TypedField(str)
+
+    @db.define()
+    class Supplier(TypedTable):
+        gid = TypedField(str)
+        name = TypedField(str)
+
+    @db.define()
+    class Product(TypedTable):
+        name = TypedField(str)
+        method: Method
+        supplier: Supplier
+
+    supplier = Supplier.insert(gid="supplier", name="Supplier")
+    slow = Method.insert(gid="slow", name="Slow")
+    fast = Method.insert(gid="fast", name="Fast")
+    Product.insert(name="Product slow", method=slow, supplier=supplier)
+    Product.insert(name="Product fast", method=fast, supplier=supplier)
+    db.commit()
+
+    builder = Product.join("method", method="inner").join("supplier", method="inner")
+    method_relation = builder.relationships["method"]
+    method_alias = method_relation.get_table(db).with_alias(f"method_{hash(method_relation)}")
+    builder = builder.orderby(method_alias.name)
+    builder = builder.select(Method.gid, Method.name)
+    builder = builder.select(Supplier.gid, Supplier.name)
+
+    page = builder.paginate(page=1, limit=1)
+
+    assert len(page) == 1
+    assert page.first().method.name == "Fast"
+
+
 def test_execute():
     _setup_data()
 

{typedal-4.9.2 → typedal-4.9.4}/tests/test_relationships.py

@@ -888,6 +888,33 @@ def test_join_with_select():
         assert not hasattr(user.articles[0], "title")
 
 
+def test_paginate_with_inner_join_uses_root_entities():
+    _setup_data()
+
+    page1 = User.join("articles", method="inner").orderby(~User.id).paginate(limit=2, page=1)
+    page2 = page1.next()
+    page1_again = page2.previous()
+
+    assert [user.id for user in page1] == [4, 3]
+    assert [user.id for user in page2] == [2]
+    assert [user.id for user in page1_again] == [4, 3]
+
+    assert sorted(article.title for article in page1.first().articles) == [
+        "Untagged Article 1",
+        "Untagged Article 2",
+    ]
+    assert [article.title for article in page2.first().articles] == ["Article 1"]
+
+    assert page1.pagination["total_items"] == 3
+    assert page1.pagination["total_pages"] == 2
+    assert page1.pagination["has_next_page"] is True
+    assert page2.pagination["has_next_page"] is False
+    assert page2.pagination["has_prev_page"] is True
+
+    with pytest.raises(StopIteration):
+        page2.next()
+
+
 def test_count_with_join():
     _setup_data()