enable fields extension in core logic

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py

@@ -1,9 +1,10 @@
 """Item crud client."""
 import json
 import logging
+import stac_pydantic
 from datetime import datetime as datetime_type
 from datetime import timezone
-from typing import Any, Dict, List, Optional, Type, Union
+from typing import Any, Dict, List, Optional, Type, Union, Set
 from urllib.parse import urljoin
 
 import attr
@@ -13,6 +14,7 @@
 from stac_pydantic.links import Relations
 from stac_pydantic.shared import MimeTypes
 from starlette.requests import Request
+from stac_fastapi.types.config import Settings
 
 from stac_fastapi.elasticsearch import serializers
 from stac_fastapi.elasticsearch.config import ElasticsearchSettings
@@ -242,17 +244,17 @@ async def get_search(
         #         base_args["filter"] = orjson.loads(to_cql2(parse_cql2_text(filter)))
         #         print(f'>>> {base_args["filter"]}')
 
-        # if fields:
-        #     includes = set()
-        #     excludes = set()
-        #     for field in fields:
-        #         if field[0] == "-":
-        #             excludes.add(field[1:])
-        #         elif field[0] == "+":
-        #             includes.add(field[1:])
-        #         else:
-        #             includes.add(field)
-        #     base_args["fields"] = {"include": includes, "exclude": excludes}
+        if fields:
+            includes = set()
+            excludes = set()
+            for field in fields:
+                if field[0] == "-":
+                    excludes.add(field[1:])
+                elif field[0] == "+":
+                    includes.add(field[1:])
+                else:
+                    includes.add(field)
+            base_args["fields"] = {"include": includes, "exclude": excludes}
 
         # Do the request
         try:
@@ -338,25 +340,25 @@ async def post_search(
             self.item_serializer.db_to_stac(item, base_url=base_url) for item in items
         ]
 
-        # if self.extension_is_enabled("FieldsExtension"):
-        #     if search_request.query is not None:
-        #         query_include: Set[str] = set(
-        #             [
-        #                 k if k in Settings.get().indexed_fields else f"properties.{k}"
-        #                 for k in search_request.query.keys()
-        #             ]
-        #         )
-        #         if not search_request.fields.include:
-        #             search_request.fields.include = query_include
-        #         else:
-        #             search_request.fields.include.union(query_include)
-
-        #     filter_kwargs = search_request.fields.filter_fields
-
-        #     response_features = [
-        #         json.loads(stac_pydantic.Item(**feat).json(**filter_kwargs))
-        #         for feat in response_features
-        #     ]
+        if self.extension_is_enabled("FieldsExtension"):
+            if search_request.query is not None:
+                query_include: Set[str] = set(
+                    [
+                        k if k in Settings.get().indexed_fields else f"properties.{k}"
+                        for k in search_request.query.keys()
+                    ]
+                )
+                if not search_request.fields.include:
+                    search_request.fields.include = query_include
+                else:
+                    search_request.fields.include.union(query_include)
+
+            filter_kwargs = search_request.fields.filter_fields
+
+            items = [
+                json.loads(stac_pydantic.Item(**feat).json(**filter_kwargs))
+                for feat in items
+            ]
 
         context_obj = None
         if self.extension_is_enabled("ContextExtension"):