Merge pull request #44 from asfadmin/dev

fix: custom client id, aria gunw stacking output support

Author: SpicyGarlicAlbacoreRoll

CHANGELOG.md

@@ -25,6 +25,15 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -
 
 -->
+------
+## [1.0.5](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.4...v1.0.5)
+### Added
+- Create wrapper class around asf-search `ASFSession`, `SearchAPISession`. Modifies client ID.
+
+### Changed
+- Aria stack supports different output types
+- asf_search uses `SearchAPISession` by default for search queries
+
 ------
 ## [1.0.4](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.3...v1.0.4)
 ### Added

src/SearchAPI/application/SearchAPISession.py

@@ -0,0 +1,26 @@
+from typing import List
+from asf_search import ASFSession
+
+
+class SearchAPISession(ASFSession):
+    def __init__(
+        self,
+        edl_host: str = None,
+        edl_client_id: str = None,
+        asf_auth_host: str = None,
+        cmr_host: str = None,
+        cmr_collections: str = None,
+        auth_domains: List[str] = None,
+        auth_cookie_names: List[str] = None,
+    ):
+        super().__init__(
+            edl_host,
+            edl_client_id,
+            asf_auth_host,
+            cmr_host,
+            cmr_collections,
+            auth_domains,
+            auth_cookie_names,
+        )
+
+        self.headers.update({'Client-Id': f'SearchAPI_{self.headers.get("Client-Id")}'})

src/SearchAPI/application/__init__.py

@@ -3,4 +3,5 @@
 from .logger import *
 from .log_router import *
 from .search import *
+from .SearchAPISession import *
 from .application import *

src/SearchAPI/application/application.py

@@ -18,9 +18,12 @@
 from .output import as_output, get_asf_search_script, make_filename
 from .files_to_wkt import FilesToWKT
 from . import constants
-from .search import stack_aria_gunw
+from .SearchAPISession import SearchAPISession
+from .search import get_aria_groups_for_frame, stack_aria_gunw
 import time
+from asf_search.ASFSearchOptions.config import config as asf_config
 
+asf_config['session'] = SearchAPISession()
 
 asf.REPORT_ERRORS = False
 router = APIRouter(route_class=LoggingRoute)
@@ -97,14 +100,17 @@ async def query_baseline(searchOptions: BaselineSearchOptsModel = Depends(proces
 
     if searchOptions.opts.dataset is not None:
         if searchOptions.opts.dataset[0] == asf.DATASET.ARIA_S1_GUNW:
-            return JSONResponse(
-                content=stack_aria_gunw(reference),
-                status_code=200,
-                headers= {
-                        **constants.DEFAULT_HEADERS,
-                        'Content-Disposition': f"attachment; filename={make_filename('json')}",
-                    }
-            )
+            if output.lower() == 'count':
+                return Response(
+                    content=str(len(get_aria_groups_for_frame(reference)[1])),
+                    status_code=200,
+                    media_type='text/html; charset=utf-8',
+                    headers=constants.DEFAULT_HEADERS
+                )
+                return 
+            stack = stack_aria_gunw(reference)
+            response_info = as_output(stack, output=output)
+            return Response(**response_info)
     # Load the reference scene:
 
     if output.lower() == 'python':

src/SearchAPI/application/asf_opts.py

@@ -10,7 +10,7 @@
 from asf_search.ASFSearchOptions import validator_map
 
 from .asf_env import load_config_maturity
-
+from .SearchAPISession import SearchAPISession
 from .logger import api_logger
 
 non_search_param = ['output', 'maxresults', 'pagesize', 'maturity']
@@ -166,7 +166,7 @@ async def process_search_request(request: Request) -> SearchOptsModel:
     merged_args = {**query_params, **body}
 
     if (token := merged_args.get('cmr_token')):
-        session = asf.ASFSession()
+        session = SearchAPISession()
         session.headers.update({'Authorization': 'Bearer {0}'.format(token)})
         query_opts.session = session
 

src/SearchAPI/application/search.py

@@ -2,10 +2,41 @@
 
 import dateparser
 import asf_search as asf
+from asf_search import ASFSearchResults
 from shapely.wkt import dumps as dump_to_wkt
 from shapely import Polygon
 
 def stack_aria_gunw(frame: str):
+    reference, aria_groups = get_aria_groups_for_frame(frame)
+
+    # track group index on each product, naively choose first granule available
+    for idx, group in enumerate(aria_groups):
+        group_granule_idx = None
+        for idy, product in enumerate(group['products']):
+            product.properties['groupIDX'] = idx
+            if group_granule_idx is None:
+                if product.has_baseline():
+                    group_granule_idx = idy
+        
+        group['group_granule_idx'] = group_granule_idx
+
+    
+    
+    stack = ASFSearchResults([group['products'][group['group_granule_idx']] for group in aria_groups if group['group_granule_idx'] is not None])
+    target_stack, warnings = asf.baseline.get_baseline_from_stack(reference, stack)
+    # for product in target_stack:
+    #     group_idx = product.properties.pop('groupIDX')
+    #     aria_groups[group_idx]['perpendicularBaseline'] = product.properties['perpendicularBaseline']
+    #     aria_groups[group_idx]['temporalBaseline'] = product.properties['temporalBaseline']
+    
+    # for group in aria_groups:
+    #     for idx, product in enumerate(group['products']):
+    #         group['products'][idx] = product.properties['sceneName']
+    #     group['date'] = group['date'].strftime('%Y-%m-%dT%H:%M:%SZ')
+    
+    return target_stack
+
+def get_aria_groups_for_frame(frame: str):
     reference = asf.search(frame=int(frame), dataset=asf.DATASET.ARIA_S1_GUNW, maxResults=1)[0]
 
     opts = asf.ASFSearchOptions(
@@ -18,44 +49,17 @@ def stack_aria_gunw(frame: str):
         intersectsWith=dump_to_wkt(Polygon(reference.geometry['coordinates'][0]))
     )
 
-    slc_stack = asf.search(opts=opts)
+    slc_products = asf.search(opts=opts)
 
     groups = defaultdict(list)
-    for product in slc_stack:
+    for product in slc_products:
         group_id = product.properties['platform'] + '_' + str(product.properties['orbit'])
         groups[group_id].append(product)
     # dateparser.parse(str(value))
-    aria_groups = [
+    return reference, [
         {
             'date': min(dateparser.parse(product.properties['startTime']) for product in group),
             'products': [product for product in group],
         }
         for group in groups.values()
-    ]
-
-    # track group index on each product, naively choose first granule available
-    for idx, group in enumerate(aria_groups):
-        group_granule_idx = None
-        for idy, product in enumerate(group['products']):
-            product.properties['groupIDX'] = idx
-            if group_granule_idx is None:
-                if product.has_baseline():
-                    group_granule_idx = idy
-        
-        group['group_granule_idx'] = group_granule_idx
-
-
-
-    stack = asf.ASFSearchResults([group['products'][group['group_granule_idx']] for group in aria_groups if group['group_granule_idx'] is not None])
-    target_stack, warnings = asf.baseline.get_baseline_from_stack(reference, stack)
-    for product in target_stack:
-        group_idx = product.properties.pop('groupIDX')
-        aria_groups[group_idx]['perpendicularBaseline'] = product.properties['perpendicularBaseline']
-        aria_groups[group_idx]['temporalBaseline'] = product.properties['temporalBaseline']
-    
-    for group in aria_groups:
-        for idx, product in enumerate(group['products']):
-            group['products'][idx] = product.properties['sceneName']
-        group['date'] = group['date'].strftime('%Y-%m-%dT%H:%M:%SZ')
-    
-    return aria_groups
+    ]