Merge pull request #210 from GSA/publisher-filter

Publisher filter

Author: FuhuXia

app/api_schemas.py

@@ -97,6 +97,7 @@ class SearchQuery(Schema):
     org_slug = String()
     org_type = Enum(ORGANIZATION_TYPE_ENUM)
     keyword = List(String())
+    publisher = String()
     after = String()
     spatial_filter = Enum(SPATIAL_FILTER_ENUM)
     spatial_feature = GeoJson()
@@ -134,6 +135,16 @@ class OrganizationsResults(Schema):
     total = Integer()
 
 
+class PublisherResponse(Schema):
+    name = String()
+    count = Integer()
+
+
+class PublishersResults(Schema):
+    publishers = List(Nested(PublisherResponse))
+    total = Integer()
+
+
 class OpensearchHealth(Schema):
     status = String()
 

app/database/interface.py

@@ -70,6 +70,7 @@ def search_datasets(
         per_page=DEFAULT_PER_PAGE,
         org_id=None,
         org_types=None,
+        publisher: str | None = None,
         spatial_filter=None,
         spatial_geometry=None,
         spatial_within=True,
@@ -78,6 +79,7 @@ def search_datasets(
         include_aggregations: bool = False,
         keyword_size: int = 100,
         org_size: int = 100,
+        publisher_size: int = 100,
         collection: str = None,
         *args,
         **kwargs,
@@ -109,6 +111,7 @@ def search_datasets(
             per_page=per_page,
             org_id=org_id,
             org_types=org_types,
+            publisher=publisher,
             search_after=search_after,
             spatial_filter=spatial_filter,
             spatial_geometry=spatial_geometry,
@@ -117,6 +120,7 @@ def search_datasets(
             include_aggregations=include_aggregations,
             keyword_size=keyword_size,
             org_size=org_size,
+            publisher_size=publisher_size,
             collection=collection,
         )
 
@@ -131,39 +135,6 @@ def get_unique_keywords(self, size=100, min_doc_count=1) -> list[dict]:
             size=size, min_doc_count=min_doc_count
         )
 
-    def get_contextual_aggregations(
-        self,
-        query: str = "",
-        org_id=None,
-        org_types=None,
-        keywords: list[str] = None,
-        spatial_filter=None,
-        spatial_geometry=None,
-        spatial_within=True,
-        keyword_size=100,
-        org_size=100,
-    ) -> dict:
-        """
-        Get keyword and organization aggregations based on current search context.
-
-        Returns aggregations that reflect the current search query and filters,
-        allowing for contextual filter counts.
-        """
-        result = self.search_datasets(
-            query,
-            keywords=keywords or [],
-            per_page=0,
-            org_id=org_id,
-            org_types=org_types,
-            spatial_filter=spatial_filter,
-            spatial_geometry=spatial_geometry,
-            spatial_within=spatial_within,
-            include_aggregations=True,
-            keyword_size=keyword_size,
-            org_size=org_size,
-        )
-        return result.aggregations or {"keywords": [], "organizations": []}
-
     def search_locations(self, query, size=100):
         """
         Get locations from the database. These are in type_order with first
@@ -298,9 +269,14 @@ def list_datasets_for_organization(
         dataset_search_query: str = "",
         num_results=DEFAULT_PER_PAGE,
         keywords: list[str] | None = None,
+        publisher: str | None = None,
         spatial_filter: str | None = None,
         spatial_geometry: dict | None = None,
         spatial_within: bool = True,
+        include_aggregations: bool = False,
+        keyword_size: int = 100,
+        org_size: int = 100,
+        publisher_size: int = 100,
     ) -> SearchResult:
         if not organization_id:
             return SearchResult.empty()
@@ -311,9 +287,14 @@ def list_datasets_for_organization(
             org_id=organization_id,
             sort_by=sort_by,
             per_page=num_results,
+            publisher=publisher,
             spatial_filter=spatial_filter,
             spatial_geometry=spatial_geometry,
             spatial_within=spatial_within,
+            include_aggregations=include_aggregations,
+            keyword_size=keyword_size,
+            org_size=org_size,
+            publisher_size=publisher_size,
         )
 
     def get_opensearch_org_dataset_counts(self, as_dict=False):
@@ -405,6 +386,18 @@ def _get_organizations_from_db(self) -> list[dict]:
             for row in rows
         ]
 
+    def get_top_publishers(self) -> list[dict]:
+        """Return the top 100 publishers ordered by dataset count."""
+        publishers = self.opensearch.get_publisher_counts(size=100)
+
+        return sorted(
+            publishers,
+            key=lambda item: (
+                -item["count"],
+                item["name"].lower(),
+            ),
+        )
+
     @staticmethod
     def to_dict(obj: Any) -> dict[str, Any] | None:
         if obj is None: