Merge branch 'main' of ssh://github.com/nadeemlab/SPT

nadeemlab · Aug 23, 2024 · 7e02e92 · 7e02e92
2 parents f420826 + 3c63b19
commit 7e02e92
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/spatialprofilingtoolbox/db/accessors/study.py b/spatialprofilingtoolbox/db/accessors/study.py
@@ -43,11 +43,13 @@ def get_study_summary(self, study: str) -> StudySummary:
         publication = self._get_publication(study)
         assay = self._get_assay(components.measurement)
         sample_cohorts = get_sample_cohorts(self.cursor, study)
+        findings = self.get_study_findings()
         return StudySummary(
             context=Context(institution=institution, assay=assay, contact=contact),
             products=Products(data_release=data_release, publication=publication),
             counts=counts_summary,
             cohorts=sample_cohorts,
+            findings=findings,
         )
 
     def get_study_components(self, study: str) -> StudyComponents:

diff --git a/spatialprofilingtoolbox/db/exchange_data_formats/study.py b/spatialprofilingtoolbox/db/exchange_data_formats/study.py
@@ -97,3 +97,4 @@ class StudySummary(BaseModel):
     products: Products
     counts: CountsSummary
     cohorts: SampleCohorts
+    findings: list[str]
diff --git a/test/apiserver/module_tests/expected_study_summary_structured.json b/test/apiserver/module_tests/expected_study_summary_structured.json
@@ -87,5 +87,10 @@
                 "result": "Extreme responder"
             }
         ]
-    }
+    },
+    "findings": [
+        "Finding 1.",
+        "Finding 2.",
+        "Finding 3."
+    ]
 }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.28.0
+0.29.0