Skip to content

fix(sinan): fix group on ducklake query #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luabida merged 1 commit into from
May 13, 2026
+15 −8
Merged

fix(sinan): fix group on ducklake query #263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions pysus/api/ducklake/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from pysus import CACHEPATH
from pysus.api.models import BaseRemoteClient, BaseRemoteFile
from sqlalchemy import create_engine
from sqlalchemy.orm import joinedload, sessionmaker
from sqlalchemy.orm import contains_eager, joinedload, sessionmaker
from sqlalchemy.pool import StaticPool

from .catalog import CatalogDataset, CatalogFile, DatasetGroup
Expand Down Expand Up @@ -307,18 +307,25 @@ async def query(

def _query():
with self._Session() as session:
q = session.query(CatalogFile).options(
joinedload(CatalogFile.dataset),
joinedload(CatalogFile.group),
)
q = session.query(CatalogFile)

if dataset:
q = q.join(CatalogDataset).filter(
CatalogDataset.name == dataset.lower()
q = (
q.join(CatalogFile.dataset)
.options(contains_eager(CatalogFile.dataset))
.filter(CatalogDataset.name == dataset.lower())
)
else:
q = q.options(joinedload(CatalogFile.dataset))

if group:
q = q.join(DatasetGroup).filter(DatasetGroup.name == group)
q = (
q.join(CatalogFile.group)
.options(contains_eager(CatalogFile.group))
.filter(DatasetGroup.name.ilike(group))
)
else:
q = q.options(joinedload(CatalogFile.group))

if state:
q = q.filter(CatalogFile.state == state.upper())
Expand Down
Loading