Merge pull request #60 from asfadmin/dev

feat: aria stacking derived from asf-search v10.0.0

Author: SpicyGarlicAlbacoreRoll

CHANGELOG.md

@@ -28,7 +28,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ------
 ## [1.0.8](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.7...v1.0.8)
 ### Changed
-- bump asf-search to v9.0.9 for NISAR `GUNW` and `GSLC` `processingLevel` search keyword collection aliases
+- bump asf-search to v10.0.0 for NISAR `GUNW` and `GSLC` `processingLevel` search keyword collection aliases, and ARIA-S1 GUNW Stacking support
 
 ------
 ## [1.0.7](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.6...v1.0.7)

requirements.txt

@@ -17,14 +17,13 @@ python-multipart>=0.0.7
 PyYAML==6.0.2
 rfc3986==1.5.0
 sniffio==1.3.0
-typing_extensions==4.10.0
+typing_extensions>=4.10.0
 ujson==5.7.0
 uvicorn==0.21.1
 watchfiles==0.19.0
 
-asf_search==9.0.9
+asf-search[asf-enumeration]==10.0.0
 python-json-logger==2.0.7
-asf_enumeration
 
 pyshp==2.1.3
 geopandas

src/SearchAPI/application/__init__.py

@@ -2,6 +2,5 @@
 from .output import *
 from .logger import *
 from .log_router import *
-from .search import *
 from .SearchAPISession import *
 from .application import *

src/SearchAPI/application/application.py

@@ -15,12 +15,10 @@
 from .asf_opts import process_baseline_request, process_search_request, process_wkt_request
 from .health import get_cmr_health
 from .models import BaselineSearchOptsModel, SearchOptsModel
-from .output import as_output, get_asf_search_script, make_filename
+from .output import as_output, get_asf_search_script
 from .files_to_wkt import FilesToWKT
 from . import constants
 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()
@@ -98,19 +96,8 @@ async def query_baseline(searchOptions: BaselineSearchOptsModel = Depends(proces
     reference = searchOptions.reference
     request_method = searchOptions.request_method
 
-    if searchOptions.opts.dataset is not None:
-        if searchOptions.opts.dataset[0] == asf.DATASET.ARIA_S1_GUNW:
-            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
-                )
-
-            stack = stack_aria_gunw(reference)
-            response_info = as_output(stack, output=output)
-            return Response(**response_info)
+    is_frame_based = searchOptions.opts.dataset is not None
+
     # Load the reference scene:
 
     if output.lower() == 'python':
@@ -125,15 +112,24 @@ async def query_baseline(searchOptions: BaselineSearchOptsModel = Depends(proces
                     'Content-Disposition': f"attachment; filename={file_name}",
                 }
         )
-    try:
-        reference_product = asf.granule_search(granule_list=[reference], opts=opts)[0]
-    except (KeyError, IndexError, ValueError) as exc:
-        raise HTTPException(detail=f"Reference scene not found: {reference}", status_code=400) from exc
+
+    # reference_product = None
+    if is_frame_based and opts.dataset[0] == asf.DATASET.ARIA_S1_GUNW:
+        try:
+            reference_product = asf.search(frame=int(reference), opts=opts, maxResults=1)[0]
+        except (KeyError, IndexError, ValueError) as exc:
+            raise HTTPException(detail=f"Reference scene not found with frame: {reference}", status_code=400) from exc
+
+    else:
+        try:
+            reference_product = asf.granule_search(granule_list=[reference], opts=opts)[0]
+        except (KeyError, IndexError, ValueError) as exc:
+            raise HTTPException(detail=f"Reference scene not found: {reference}", status_code=400) from exc
 
     try:
         if reference_product.get_stack_opts() is None:
             reference_product = asf.ASFStackableProduct(args={'umm': reference_product.umm, 'meta': reference_product.meta}, session=reference_product.session)
-        if not reference_product.has_baseline() or not reference_product.is_valid_reference():
+        if (not reference_product.has_baseline() or not reference_product.is_valid_reference() or not reference_product.has_baseline()) and not is_frame_based:
             raise asf.exceptions.ASFBaselineError(f"Requested reference scene has no baseline")
     except (asf.exceptions.ASFBaselineError, ValueError) as exc:
         raise HTTPException(detail=f"Search failed to find results: {exc}", status_code=400)

src/SearchAPI/application/models.py

@@ -14,7 +14,7 @@ class SearchOptsModel(BaseModel):
     """
     opts: InstanceOf[ASFSearchOptions]
     request_method: str # ["GET", "POST", "HEAD"]
-    output: Optional[str] = 'metalink'
+    output: str = 'metalink'
     merged_args: dict = {}
 
     output_types: ClassVar[list[str]] = ['metalink', 'csv', 'geojson', 'json', 'jsonlite', 'jsonlite2', 'kml', 'count', 'download', 'python']