feat: updating integration test data

bin/process_image.py

@@ -66,6 +66,7 @@
     "sicd_capella_chip_ntf": f"s3://{image_bucket}/sicd-capella-chip.ntf",
     "sicd_umbra_chip_ntf": f"s3://{image_bucket}/sicd-umbra-chip.ntf",
     "sicd_interferometric_hh_ntf": f"s3://{image_bucket}/sicd-interferometric-hh.nitf",
+    "wbid": f"s3://{image_bucket}/wbid.ntf",
 }
 
 # call into the root directory of this package so that we can run this script from anywhere.

src/aws/osml/integ/sm_aircraft/test_sm_aircraft_model.py

@@ -2,15 +2,7 @@
 
 import logging
 
-from aws.osml.utils import (
-    OSMLConfig,
-    count_features,
-    ddb_client,
-    kinesis_client,
-    run_model_on_image,
-    sqs_client,
-    validate_expected_feature_count,
-)
+from aws.osml.utils import OSMLConfig, kinesis_client, run_model_on_image, s3_client, sqs_client, validate_features_match
 
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -28,8 +20,11 @@ def test_model_runner_aircraft_model() -> None:
         sqs_client(), OSMLConfig.SM_AIRCRAFT_MODEL, "SM_ENDPOINT", kinesis_client()
     )
 
-    # Count the features created in the table for this image
-    feature_count = count_features(image_id=image_id, ddb_client=ddb_client())
-
-    # Validate the number of features we created match-expected values
-    validate_expected_feature_count(feature_count)
+    # Verify the results we created in the appropriate syncs
+    validate_features_match(
+        image_processing_request=image_processing_request,
+        job_id=job_id,
+        shard_iter=kinesis_shard,
+        s3_client=s3_client(),
+        kinesis_client=kinesis_client(),
+    )

src/aws/osml/utils/integ_utils.py

@@ -467,7 +467,7 @@ def get_expected_image_feature_count(image: str) -> int:
     """
     # Set the expected
     if "large" in image:
-        return 99200
+        return 112200
     elif "tile" in image:
         return 2
     elif "sicd-capella-chip" in image or "sicd-umbra-chip" in image:
@@ -560,7 +560,7 @@ def get_expected_region_request_count(image: str) -> int:
     """
     expected_count = 0
     if "small" in image:
-        expected_count = 4
+        expected_count = 1
     elif "meta" in image:
         expected_count = 1
     elif "large" in image:
@@ -571,6 +571,8 @@ def get_expected_region_request_count(image: str) -> int:
         expected_count = 1
     elif "sicd-interferometric" in image:
         expected_count = 8
+    elif "wbid" in image:
+        expected_count = 1
 
     # Check that we got a valid region request count
     if expected_count != 0:

src/aws/osml/utils/osml_config.py

@@ -48,9 +48,9 @@ class OSMLConfig:
     TARGET_IMAGE: str = os.environ.get("TARGET_IMAGE")
     TARGET_MODEL: str = os.environ.get("TARGET_MODEL")
     TILE_FORMAT: str = os.environ.get("TILE_FORMAT", "GTIFF")
-    TILE_COMPRESSION: str = os.environ.get("TILE_COMPRESSION", "LZW")
+    TILE_COMPRESSION: str = os.environ.get("TILE_COMPRESSION", "NONE")
     TILE_SIZE: int = int(os.environ.get("TILE_SIZE", "512"))
-    TILE_OVERLAP: int = int(os.environ.get("TILE_OVERLAP", "32"))
+    TILE_OVERLAP: int = int(os.environ.get("TILE_OVERLAP", "128"))
     FEATURE_SELECTION_OPTIONS: str = os.environ.get(
         "FEATURE_SELECTION_OPTIONS",
         '{"algorithm": "NMS", "iou_threshold":  0.75, "skip_box_threshold": 0.0001, "sigma": .1}',