unintended refactor undoing

Author: amyfromandi

map-integration/macrostrat/map_integration/pipeline.py

@@ -549,7 +549,7 @@ def upload_file(
     ] = False,
     s3_prefix: Annotated[
         str,
-        Option(help="The filename_prefix to use for the file's S3 key"),
+        Option(help="The filename to use for the file's S3 key"),
     ] = "",
     s3_bucket: Annotated[
         str,
@@ -874,7 +874,7 @@ def ingest_csv(
     s3_prefix: Annotated[
         str,
         Option(
-            help="The filename_prefix, sans trailing slash, to use for the files' S3 keys"
+            help="The filename, sans trailing slash, to use for the files' S3 keys"
         ),
     ] = None,
     tag: Annotated[

map-integration/macrostrat/map_integration/utils/s3_file_management.py

@@ -123,7 +123,7 @@ def staging_upload_dir(slug: str, data_path: pathlib.Path, ext: str) -> dict:
 
     return {
         "bucket_name": bucket_name,
-        "filename_prefix": f"{slug}/",
+        "filename": f"{slug}/",
         "endpoint": endpoint,
         "destination": f"s3://{bucket_name}/{slug}/",
     }
@@ -263,7 +263,7 @@ def staging_download_dir(slug: str, dest_path: pathlib.Path) -> dict:
     """
     Download a directory from the staging bucket to a local path.
     Args:
-        slug: Remote key filename_prefix (folder) in the bucket, e.g. "myprefix_region"
+        slug: Remote key filename (folder) in the bucket, e.g. "myprefix_region"
         dest_path: Local directory to download into (created if missing)
     Returns:
         dict with details about the download source/destination.