Skip to content

Use new association tables for facet counting #1712

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
merged 1 commit into from
Jul 24, 2025
Merged

Use new association tables for facet counting #1712

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
16 changes: 16 additions & 0 deletions nmdc_server/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,22 @@ def facet(self, db: Session, attribute: str) -> Dict[schemas.AnnotationValue, in
annotations_column["omics_type"].astext,
).group_by(annotations_column["omics_type"].astext)
return {value: count for count, value in aggregated_query if value is not None}
if attribute == "metaproteomics_analysis_category":
association_table = models.metaproteomic_analysis_data_generation_association
query = self.query(db)
query = query.join(
association_table,
models.OmicsProcessing.id == association_table.c.data_generation_id,
)
query = query.join(
models.MetaproteomicAnalysis,
models.MetaproteomicAnalysis.id == association_table.c.metaproteomic_analysis_id,
)
aggregated_query = query.with_entities(
func.count(func.distinct(models.OmicsProcessing.id)).label("id_count"),
models.MetaproteomicAnalysis.metaproteomics_analysis_category,
).group_by(models.MetaproteomicAnalysis.metaproteomics_analysis_category)
return {value: count for count, value in aggregated_query if value is not None}
return super().facet(db, attribute)

def omics_processing_for_biosample_ids(self, db: Session, biosample_ids):
Expand Down