water-column-sonar-processing 25.1.2__tar.gz → 25.1.3__tar.gz

{water_column_sonar_processing-25.1.2 → water_column_sonar_processing-25.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: water_column_sonar_processing
-Version: 25.1.2
+Version: 25.1.3
 Summary: A processing tool for water column sonar data.
 Author-email: Rudy Klucik <rudy.klucik@noaa.gov>
 Project-URL: Homepage, https://github.com/CI-CMG/water-column-sonar-processing

{water_column_sonar_processing-25.1.2 → water_column_sonar_processing-25.1.3}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "water_column_sonar_processing"
-version = "25.1.2"
+version = "25.1.3"
 authors = [
   { name="Rudy Klucik", email="rudy.klucik@noaa.gov" },
 ]

{water_column_sonar_processing-25.1.2 → water_column_sonar_processing-25.1.3}/water_column_sonar_processing/aws/dynamodb_manager.py

@@ -140,15 +140,7 @@ class DynamoDBManager:
         To be used to initialize a cruise, deletes all entries associated with that cruise
         in the database.
         """
-        expression_attribute_values = {
-            ":cr": {"S": cruise_name},
-            ":se": {"S": sensor_name},
-            ":sh": {"S": ship_name},
-        }
-        filter_expression = (
-            "CRUISE_NAME = :cr and SENSOR_NAME = :se and SHIP_NAME = :sh"
-        )
-        # filter_expression = "CRUISE_NAME = :cr"
+        filter_expression = "CRUISE_NAME = :cr"
         response = self.dynamodb_client.scan(
             TableName=table_name,
             # Limit=1000,
@@ -156,7 +148,7 @@ class DynamoDBManager:
             # ExclusiveStartKey=where to pick up
             #ReturnConsumedCapacity='INDEXES' | 'TOTAL' | 'NONE', ...not sure
             # ProjectionExpression='#SH, #CR, #FN', # what to specifically return — from expression_attribute_names
-            FilterExpression='CRUISE_NAME = :cr',#
+            FilterExpression=filter_expression,
             # ExpressionAttributeNames={
             #     '#SH': 'SHIP_NAME',
             #     '#CR': 'CRUISE_NAME',
@@ -170,7 +162,6 @@ class DynamoDBManager:
             ConsistentRead=True
             # ExclusiveStartKey=response["LastEvaluatedKey"],
         )
-        print(response)
         # Note: table.scan() has 1 MB limit on results so pagination is used
 
         if len(response["Items"]) == 0 and "LastEvaluatedKey" not in response:
@@ -183,7 +174,7 @@ class DynamoDBManager:
                 TableName=table_name,
                 ### Either 'Select' or 'ExpressionAttributeNames'/'ProjectionExpression'
                 Select='ALL_ATTRIBUTES', # or 'SPECIFIC_ATTRIBUTES',
-                FilterExpression='CRUISE_NAME = :cr',  #
+                FilterExpression=filter_expression,
                 #ProjectionExpression='#SH, #CR, #FN',  # what to specifically return — from expression_attribute_names
                 # ExpressionAttributeNames={ # would need to specify all cols in df
                 #     '#SH': 'SHIP_NAME',
@@ -205,6 +196,66 @@ class DynamoDBManager:
 
         return df.sort_values(by="START_TIME", ignore_index=True)
 
+    #####################################################################
+    # def get_cruise_list(
+    #     self,
+    #     table_name,
+    # ) -> list:
+    #     """
+    #     Experimental, gets all cruise names as list
+    #     """
+    #     filter_expression = "CRUISE_NAME = :cr"
+    #     response = self.dynamodb_client.scan(
+    #         TableName=table_name,
+    #         Select='SPECIFIC_ATTRIBUTES',
+    #         #ReturnConsumedCapacity='INDEXES' | 'TOTAL' | 'NONE', ...not sure
+    #         # ProjectionExpression='#SH, #CR, #FN', # what to specifically return — from expression_attribute_names
+    #         FilterExpression=filter_expression,
+    #         # ExpressionAttributeNames={
+    #         #     '#SH': 'SHIP_NAME',
+    #         #     '#CR': 'CRUISE_NAME',
+    #         #     '#FN': 'FILE_NAME',
+    #         # },
+    #         # ExpressionAttributeValues={ # criteria
+    #         #     ':cr': {
+    #         #         'S': cruise_name,
+    #         #     },
+    #         # },
+    #     )
+    #     # Note: table.scan() has 1 MB limit on results so pagination is used
+    #
+    #     if len(response["Items"]) == 0 and "LastEvaluatedKey" not in response:
+    #         return pd.DataFrame() # If no results, return empty dataframe
+    #
+    #     data = response["Items"]
+    #
+    #     while response.get('LastEvaluatedKey'): #"LastEvaluatedKey" in response:
+    #         response = self.dynamodb_client.scan(
+    #             TableName=table_name,
+    #             ### Either 'Select' or 'ExpressionAttributeNames'/'ProjectionExpression'
+    #             Select='ALL_ATTRIBUTES', # or 'SPECIFIC_ATTRIBUTES',
+    #             FilterExpression=filter_expression,
+    #             #ProjectionExpression='#SH, #CR, #FN',  # what to specifically return — from expression_attribute_names
+    #             # ExpressionAttributeNames={ # would need to specify all cols in df
+    #             #     '#SH': 'SHIP_NAME',
+    #             #     '#CR': 'CRUISE_NAME',
+    #             #     '#FN': 'FILE_NAME',
+    #             # },
+    #             ExpressionAttributeValues={  # criteria
+    #                 ':cr': {
+    #                     'S': cruise_name,
+    #                 },
+    #             },
+    #             ConsistentRead=True,
+    #             ExclusiveStartKey=response["LastEvaluatedKey"],
+    #         )
+    #         data.extend(response["Items"])
+    #
+    #     deserializer = self.type_deserializer
+    #     df = pd.DataFrame([deserializer.deserialize({"M": i}) for i in data])
+    #
+    #     return df.sort_values(by="START_TIME", ignore_index=True)
+
     #####################################################################
     # TODO: WIP
     def delete_item(

{water_column_sonar_processing-25.1.2 → water_column_sonar_processing-25.1.3}/water_column_sonar_processing/cruise/resample_regrid.py

@@ -1,5 +1,4 @@
 import gc
-import os
 from pathlib import Path
 
 import numcodecs
@@ -311,6 +310,12 @@ class ResampleRegrid:
                     output_zarr_store.bottom[
                         start_ping_time_index:end_ping_time_index
                     ] = detected_seafloor_depths
+                #
+                #
+                #
+                # TODO: write the time variable last so that I can parse that as check
+                #
+                #
                 #########################################################################
                 #########################################################################
         except Exception as err:

{water_column_sonar_processing-25.1.2 → water_column_sonar_processing-25.1.3}/water_column_sonar_processing/model/zarr_manager.py

@@ -250,7 +250,7 @@ class ZarrManager:
         #
         root.attrs["processing_software_name"] = Coordinates.PROJECT_NAME.value
         root.attrs["processing_software_version"] = (
-            "25.1.2"  # TODO: get programmatically, echopype>utils>prov.py
+            "25.1.3"  # TODO: get programmatically, echopype>utils>prov.py
         )
         root.attrs["processing_software_time"] = Timestamp.get_timestamp()
         #

{water_column_sonar_processing-25.1.2 → water_column_sonar_processing-25.1.3}/water_column_sonar_processing/utility/constants.py

@@ -3,7 +3,7 @@ from enum import Enum, Flag, unique
 
 @unique
 class Constants(Flag):
-    TILE_SIZE = 256 # TODO: add tile size to metadata?
+    TILE_SIZE = 1024 # TODO: add tile size to metadata?
 
     # Average https://noaa-wcsd-zarr-pds.s3.us-east-1.amazonaws.com/level_2/Henry_B._Bigelow/HB0902/EK60/HB0902.zarr/time/927
     # chunk size is ~1.3 kB, HB0902 cruise takes ~30 seconds to load all time/lat/lon data

{water_column_sonar_processing-25.1.2 → water_column_sonar_processing-25.1.3}/water_column_sonar_processing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: water_column_sonar_processing
-Version: 25.1.2
+Version: 25.1.3
 Summary: A processing tool for water column sonar data.
 Author-email: Rudy Klucik <rudy.klucik@noaa.gov>
 Project-URL: Homepage, https://github.com/CI-CMG/water-column-sonar-processing