cosmotech-acceleration-library 1.1.0__py3-none-any.whl → 2.1.0rc1__py3-none-any.whl

cosmotech/coal/store/pandas.py

@@ -5,10 +5,10 @@
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
 
+import pandas as pd
 import pyarrow
 
 from cosmotech.coal.store.store import Store
-import pandas as pd
 
 
 def store_dataframe(

cosmotech/coal/store/pyarrow.py

@@ -5,10 +5,10 @@
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
 
-from cosmotech.coal.store.store import Store
-
 import pyarrow as pa
 
+from cosmotech.coal.store.store import Store
+
 
 def store_table(
     table_name: str,

cosmotech/coal/store/store.py

@@ -5,14 +5,14 @@
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
 
-import os
 import pathlib
 
 import pyarrow
 from adbc_driver_sqlite import dbapi
+from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.coal.utils.configuration import Configuration
 from cosmotech.coal.utils.logger import LOGGER
-from cosmotech.orchestrator.utils.translate import T
 
 
 class Store:
@@ -20,11 +20,8 @@ class Store:
     def sanitize_column(column_name: str) -> str:
         return column_name.replace(" ", "_")
 
-    def __init__(
-        self,
-        reset=False,
-        store_location: pathlib.Path = pathlib.Path(os.environ.get("CSM_PARAMETERS_ABSOLUTE_PATH", ".")),
-    ):
+    def __init__(self, reset=False, configuration: Configuration = Configuration()):
+        store_location = configuration.safe_get("coal.store", ".")
         self.store_location = pathlib.Path(store_location) / ".coal/store"
         self.store_location.mkdir(parents=True, exist_ok=True)
         self._tables = dict()

cosmotech/coal/utils/configuration.py

@@ -0,0 +1,197 @@
+import os
+import tomllib
+
+from cosmotech.orchestrator.utils.translate import T
+
+from cosmotech.coal.utils.logger import LOGGER
+
+
+class ReferenceKeyError(KeyError):
+    pass
+
+
+class Dotdict(dict):
+    """dot.notation access to dictionary attributes"""
+
+    def __setattr__(self, key, val):
+        dd = Dotdict(val, root=self.root) if isinstance(val, dict) else val
+        self.__setitem__(key, dd)
+
+    def __getattr__(self, key):
+        _v = self.__getitem__(key)
+        if isinstance(_v, str) and _v.startswith("$"):
+            _r = self.root
+            try:
+                for _p in _v[1:].split("."):
+                    _r = _r.__getattr__(_p)
+                return _r
+            except (KeyError, AttributeError):
+                LOGGER.warning(f"dotdict Ref {_v} doesn't exist")
+                raise ReferenceKeyError(_v)
+        return _v
+
+    __delattr__ = dict.__delitem__
+
+    def __init__(self, dct=dict(), root=None):
+        object.__setattr__(self, "root", self if root is None else root)
+
+        def update(data):
+            if isinstance(data, dict):
+                return Dotdict(data, root=self.root)
+            elif isinstance(data, list):
+                return [update(d) for d in data]
+            return data
+
+        for k, v in dct.items():
+            self.__setattr__(k, update(v))
+
+    def merge(self, d):
+        for k, v in d.items():
+            if isinstance(v, Dotdict) and k in self:
+                self[k].merge(v)
+            else:
+                # this trigger dict to dotdict conversion at merge
+                self.__setattr__(k, v)
+
+
+class Configuration(Dotdict):
+    # Env var set by the cosmotech api at runtime
+    API_ENV_DICT = {
+        "secrets": {
+            "cosmotech": {
+                "twin_cache": {
+                    "host": "TWIN_CACHE_HOST",
+                    "port": "TWIN_CACHE_PORT",
+                    "password": "TWIN_CACHE_PASSWORD",
+                    "username": "TWIN_CACHE_USERNAME",
+                },
+                "idp": {
+                    "base_url": "IDP_BASE_URL",
+                    "tenant_id": "IDP_TENANT_ID",
+                    "client_id": "IDP_CLIENT_ID",
+                    "client_secret": "IDP_CLIENT_SECRET",
+                },
+                "api": {"url": "CSM_API_URL", "scope": "CSM_API_SCOPE"},
+                "dataset_absolute_path": "CSM_DATASET_ABSOLUTE_PATH",
+                "parameters_absolute_path": "CSM_PARAMETERS_ABSOLUTE_PATH",
+                "organization_id": "CSM_ORGANIZATION_ID",
+                "workspace_id": "CSM_WORKSPACE_ID",
+                "runner_id": "CSM_RUNNER_ID",
+                "run_id": "CSM_RUN_ID",
+                "run_template_id": "CSM_RUN_TEMPLATE_ID",
+            }
+        }
+    }
+    # HARD CODED ENVVAR CONVERSION
+    CONVERSION_DICT = {
+        "secrets": {
+            "log_level": "LOG_LEVEL",
+            "s3": {
+                "access_key_id": "AWS_ACCESS_KEY_ID",
+                "endpoint_url": "AWS_ENDPOINT_URL",
+                "secret_access_key": "AWS_SECRET_ACCESS_KEY",
+                "bucket_name": "CSM_DATA_BUCKET_NAME",
+                "bucket_prefix": "CSM_DATA_BUCKET_PREFIX",
+                "ca_bundle": "CSM_S3_CA_BUNDLE",
+            },
+            "azure": {
+                "account_name": "AZURE_ACCOUNT_NAME",
+                "client_id": "AZURE_CLIENT_ID",
+                "client_secret": "AZURE_CLIENT_SECRET",
+                "container_name": "AZURE_CONTAINER_NAME",
+                "data_explorer_database_name": "AZURE_DATA_EXPLORER_DATABASE_NAME",
+                "data_explorer_resource_ingest_uri": "AZURE_DATA_EXPLORER_RESOURCE_INGEST_URI",
+                "data_explorer_resource_uri": "AZURE_DATA_EXPLORER_RESOURCE_URI",
+                "storage_blob_name": "AZURE_STORAGE_BLOB_NAME",
+                "data_blob_prefix": "CSM_DATA_BLOB_PREFIX",
+                "data_prefix": "CSM_DATA_PREFIX",
+                "storage_sas_url": "AZURE_STORAGE_SAS_URL",
+                "tenant_id": "AZURE_TENANT_ID",
+            },
+            "cosmotech": {
+                "data_adx_tag": "CSM_DATA_ADX_TAG",
+                "data_adx_wait_ingestion": "CSM_DATA_ADX_WAIT_INGESTION",
+                "send_datawarehouse_datasets": "CSM_SEND_DATAWAREHOUSE_DATASETS",
+                "send_datawarehouse_parameters": "CSM_SEND_DATAWAREHOUSE_PARAMETERS",
+            },
+            "postgres": {
+                "db_name": "POSTGRES_DB_NAME",
+                "db_schema": "POSTGRES_DB_SCHEMA",
+                "port": "POSTGRES_HOST_PORT",
+                "host": "POSTGRES_HOST_URI",
+                "user_name": "POSTGRES_USER_NAME",
+                "user_password": "POSTGRES_USER_PASSWORD",
+                "password_encoding": "CSM_PSQL_FORCE_PASSWORD_ENCODING",
+            },
+            "single_store": {
+                "db": "SINGLE_STORE_DB",
+                "host": "SINGLE_STORE_HOST",
+                "password": "SINGLE_STORE_PASSWORD",
+                "port": "SINGLE_STORE_PORT",
+                "tables": "SINGLE_STORE_TABLES",
+                "username": "SINGLE_STORE_USERNAME",
+            },
+        },
+    }
+
+    # HARD CODED configmap mount path set in K8s simulation pod by API run function
+    K8S_CONFIG = "/mnt/coal/coal-config.toml"
+
+    def __init__(self, dct: dict = None):
+        if isinstance(dct, Dotdict):
+            super().__init__(dct, root=dct.root)
+        elif isinstance(dct, dict):
+            super().__init__(dct)
+        elif config_path := os.environ.get("CONFIG_FILE_PATH", default=None):
+            with open(config_path, "rb") as config:
+                super().__init__(tomllib.load(config))
+        elif os.path.isfile(self.K8S_CONFIG):
+            with open(self.K8S_CONFIG, "rb") as config:
+                super().__init__(tomllib.load(config))
+        else:
+            LOGGER.info(T("coal.utils.configuration.no_config_file"))
+            super().__init__(self.CONVERSION_DICT)
+
+        # add envvar set by the API
+        self.merge(Dotdict(self.API_ENV_DICT))
+
+        if "secrets" in self:
+            self.secrets = self._env_swap_recusion(self.secrets)
+            # set secret section back to respective section
+            self.merge(self.secrets)
+            del self.secrets
+
+        # add coal.store default value if ont define
+        if self.safe_get("coal.store") is None:
+            self.merge({"coal": {"store": "$cosmotech.parameters_absolute_path"}})
+
+    # convert value to env
+    def _env_swap_recusion(self, dic):
+        for k, v in dic.items():
+            if isinstance(v, Dotdict):
+                dic[k] = self._env_swap_recusion(v)
+                dic[k] = {k: v for k, v in dic[k].items() if v is not None}
+            elif isinstance(v, list):
+                dic[k] = list(self._env_swap_recusion(_v) for _v in v)
+            elif isinstance(v, str):
+                dic[k] = os.environ.get(v)
+        # remove value not found
+        dic = {k: v for k, v in dic.items() if v}
+        return dic
+
+    def merge_in(self, dic):
+        trans_dic = self._env_swap_recusion(dic)
+        self.merge(trans_dic)
+
+    def safe_get(self, key, default=None):
+        try:
+            _r = self
+            for _k in key.split("."):
+                _r = _r.__getattr__(_k)
+            return _r
+        except (KeyError, AttributeError) as err:
+            LOGGER.debug(f"{err} not found; returning {default}")
+            return default
+
+
+ENVIRONMENT_CONFIGURATION = Configuration()

cosmotech/coal/utils/decorator.py

@@ -1,10 +1,10 @@
 import time
-
 from functools import wraps
 
-from cosmotech.coal.utils.logger import LOGGER
 from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.coal.utils.logger import LOGGER
+
 
 def timed(operation, debug=False):
     def decorator(func):
@@ -13,11 +13,8 @@ def timed(operation, debug=False):
             process_start = time.time()
             r = func(*args, **kwargs)
             process_time = time.time() - process_start
-            msg = T("coal.common.timing.operation_completed").format(operation=operation, time=process_time)
-            if debug:
-                LOGGER.debug(msg)
-            else:
-                LOGGER.info(msg)
+            log_function = LOGGER.debug if debug else LOGGER.info
+            log_function(T("coal.common.timing.operation_completed").format(operation=operation, time=process_time))
             return r
 
         return wrapper

cosmotech/csm_data/commands/adx_send_data.py

@@ -7,7 +7,7 @@
 from cosmotech.orchestrator.utils.translate import T
 
 from cosmotech.csm_data.utils.click import click
-from cosmotech.csm_data.utils.decorators import web_help, translate_help
+from cosmotech.csm_data.utils.decorators import translate_help, web_help
 
 
 @click.command()

cosmotech/csm_data/commands/adx_send_runnerdata.py

@@ -5,10 +5,11 @@
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
 
-from cosmotech.csm_data.utils.click import click
-from cosmotech.csm_data.utils.decorators import web_help, translate_help
 from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.csm_data.utils.click import click
+from cosmotech.csm_data.utils.decorators import translate_help, web_help
+
 
 @click.command()
 @web_help("csm-data/adx-send-runner-data")

cosmotech/csm_data/commands/api/api.py

@@ -4,25 +4,18 @@
 # Any use, reproduction, translation, broadcasting, transmission, distribution,
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
+from cosmotech.orchestrator.utils.translate import T
+
+from cosmotech.coal.cosmotech_api.objects.connection import Connection
+from cosmotech.coal.utils.logger import LOGGER
 from cosmotech.csm_data.commands.api.postgres_send_runner_metadata import (
     postgres_send_runner_metadata,
 )
-from cosmotech.csm_data.commands.api.rds_load_csv import rds_load_csv
-from cosmotech.csm_data.commands.api.rds_send_csv import rds_send_csv
-from cosmotech.csm_data.commands.api.rds_send_store import rds_send_store
 from cosmotech.csm_data.commands.api.run_load_data import run_load_data
-from cosmotech.csm_data.commands.api.runtemplate_load_handler import (
-    runtemplate_load_handler,
-)
-from cosmotech.csm_data.commands.api.tdl_load_files import tdl_load_files
-from cosmotech.csm_data.commands.api.tdl_send_files import tdl_send_files
 from cosmotech.csm_data.commands.api.wsf_load_file import wsf_load_file
 from cosmotech.csm_data.commands.api.wsf_send_file import wsf_send_file
 from cosmotech.csm_data.utils.click import click
 from cosmotech.csm_data.utils.decorators import translate_help, web_help
-from cosmotech.coal.cosmotech_api.connection import get_api_client
-from cosmotech.coal.utils.logger import LOGGER
-from cosmotech.orchestrator.utils.translate import T
 
 
 @click.group(invoke_without_command=True)
@@ -32,19 +25,13 @@ from cosmotech.orchestrator.utils.translate import T
 def api(ctx: click.Context):
     if ctx.invoked_subcommand is None:
         try:
-            api_client, description = get_api_client()
-            LOGGER.info(T("coal.cosmotech_api.connection.found_valid").format(type=description))
+            connection = Connection()
+            LOGGER.info(T("coal.cosmotech_api.connection.found_valid").format(type=connection.api_type))
         except EnvironmentError:
             raise click.Abort()
 
 
-api.add_command(rds_send_csv, "rds-send-csv")
-api.add_command(rds_send_store, "rds-send-store")
-api.add_command(rds_load_csv, "rds-load-csv")
 api.add_command(wsf_send_file, "wsf-send-file")
 api.add_command(wsf_load_file, "wsf-load-file")
-api.add_command(tdl_send_files, "tdl-send-files")
-api.add_command(tdl_load_files, "tdl-load-files")
-api.add_command(runtemplate_load_handler, "runtemplate-load-handler")
 api.add_command(run_load_data, "run-load-data")
 api.add_command(postgres_send_runner_metadata, "postgres-send-runner-metadata")

cosmotech/csm_data/commands/api/postgres_send_runner_metadata.py

@@ -5,10 +5,11 @@
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
 
-from cosmotech.csm_data.utils.click import click
-from cosmotech.csm_data.utils.decorators import web_help, translate_help
 from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.csm_data.utils.click import click
+from cosmotech.csm_data.utils.decorators import translate_help, web_help
+
 
 @click.command()
 @web_help("csm-data/api/postgres-send-runner-metadata")
@@ -93,7 +94,7 @@ from cosmotech.orchestrator.utils.translate import T
 @click.option(
     "--encode-password/--no-encode-password",
     "force_encode",
-    help=T("csm_data.commands.store.postgres_send_runner_metadata.parameters.encode_password"),
+    help=T("csm_data.commands.api.postgres_send_runner_metadata.parameters.encode_password"),
     envvar="CSM_PSQL_FORCE_PASSWORD_ENCODING",
     show_envvar=True,
     default=True,
@@ -115,17 +116,20 @@ def postgres_send_runner_metadata(
 ):
     # Import the function at the start of the command
     from cosmotech.coal.postgresql import send_runner_metadata_to_postgresql
+    from cosmotech.coal.utils.configuration import Configuration
+
+    _c = Configuration()
+    _c.postgres.host = postgres_host
+    _c.postgres.port = postgres_port
+    _c.postgres.db_name = postgres_db
+    _c.postgres.db_schema = postgres_schema
+    _c.postgres.user_name = postgres_user
+    _c.postgres.user_password = postgres_password
+    _c.postgres.password_encoding = force_encode
+    _c.postgres.table_prefix = table_prefix
+
+    _c.cosmotech.organization_id = organization_id
+    _c.cosmotech.workspace_id = workspace_id
+    _c.cosmotech.runner_id = runner_id
 
-    send_runner_metadata_to_postgresql(
-        organization_id=organization_id,
-        workspace_id=workspace_id,
-        runner_id=runner_id,
-        table_prefix=table_prefix,
-        postgres_host=postgres_host,
-        postgres_port=postgres_port,
-        postgres_db=postgres_db,
-        postgres_schema=postgres_schema,
-        postgres_user=postgres_user,
-        postgres_password=postgres_password,
-        force_encode=force_encode,
-    )
+    send_runner_metadata_to_postgresql(_c)

cosmotech/csm_data/commands/api/run_load_data.py

@@ -5,11 +5,12 @@
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
 
-from cosmotech.csm_data.utils.click import click
-from cosmotech.csm_data.utils.decorators import require_env
-from cosmotech.csm_data.utils.decorators import web_help, translate_help
 from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.coal.utils.configuration import Configuration
+from cosmotech.csm_data.utils.click import click
+from cosmotech.csm_data.utils.decorators import require_env, translate_help, web_help
+
 
 @click.command()
 @click.option(
@@ -52,38 +53,6 @@ from cosmotech.orchestrator.utils.translate import T
     help=T("csm_data.commands.api.run_load_data.parameters.parameters_absolute_path"),
     required=True,
 )
-@click.option(
-    "--write-json/--no-write-json",
-    envvar="WRITE_JSON",
-    show_envvar=True,
-    default=True,
-    show_default=True,
-    help=T("csm_data.commands.api.run_load_data.parameters.write_json"),
-)
-@click.option(
-    "--write-csv/--no-write-csv",
-    envvar="WRITE_CSV",
-    show_envvar=True,
-    default=False,
-    show_default=True,
-    help=T("csm_data.commands.api.run_load_data.parameters.write_csv"),
-)
-@click.option(
-    "--fetch-dataset/--no-fetch-dataset",
-    envvar="FETCH_DATASET",
-    show_envvar=True,
-    default=True,
-    show_default=True,
-    help=T("csm_data.commands.api.run_load_data.parameters.fetch_dataset"),
-)
-@click.option(
-    "--parallel/--no-parallel",
-    envvar="FETCH_DATASETS_IN_PARALLEL",
-    show_envvar=True,
-    default=True,
-    show_default=True,
-    help=T("csm_data.commands.api.run_load_data.parameters.parallel"),
-)
 @require_env("CSM_API_SCOPE", "The identification scope of a Cosmotech API")
 @require_env("CSM_API_URL", "The URL to a Cosmotech API")
 @web_help("csm-data/api/run-load-data")
@@ -94,26 +63,20 @@ def run_load_data(
     organization_id: str,
     dataset_absolute_path: str,
     parameters_absolute_path: str,
-    write_json: bool,
-    write_csv: bool,
-    fetch_dataset: bool,
-    parallel: bool,
 ):
     # Import the function at the start of the command
-    from cosmotech.coal.cosmotech_api.runner.download import download_runner_data
+    from cosmotech.coal.cosmotech_api.apis.runner import RunnerApi
+
+    _configuration = Configuration()
+    _configuration.cosmotech.organization_id = organization_id
+    _configuration.cosmotech.workspace_id = workspace_id
+    _configuration.cosmotech.runner_id = runner_id
+    _configuration.cosmotech.parameters_absolute_path = parameters_absolute_path
+    _configuration.cosmotech.dataset_absolute_path = dataset_absolute_path
+
+    _r = RunnerApi(_configuration)
 
-    return download_runner_data(
-        organization_id=organization_id,
-        workspace_id=workspace_id,
-        runner_id=runner_id,
-        parameter_folder=parameters_absolute_path,
-        dataset_folder=dataset_absolute_path,
-        read_files=False,
-        parallel=parallel,
-        write_json=write_json,
-        write_csv=write_csv,
-        fetch_dataset=fetch_dataset,
-    )
+    return _r.download_runner_data(download_datasets=True)
 
 
 if __name__ == "__main__":

cosmotech/csm_data/commands/api/wsf_load_file.py

@@ -6,10 +6,11 @@
 # specifically authorized by written means by Cosmo Tech.
 import pathlib
 
-from cosmotech.csm_data.utils.click import click
-from cosmotech.csm_data.utils.decorators import web_help, translate_help
 from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.csm_data.utils.click import click
+from cosmotech.csm_data.utils.decorators import translate_help, web_help
+
 
 @click.command()
 @click.option(
@@ -50,19 +51,15 @@ from cosmotech.orchestrator.utils.translate import T
 @web_help("csm-data/api/wsf-load-file")
 @translate_help("csm_data.commands.api.wsf_load_file.description")
 def wsf_load_file(organization_id, workspace_id, workspace_path: str, target_folder: str):
+    from cosmotech.coal.cosmotech_api.apis.workspace import WorkspaceApi
 
-    from cosmotech.coal.cosmotech_api.connection import get_api_client
-    from cosmotech.coal.cosmotech_api.workspace import download_workspace_file
-    from cosmotech.coal.cosmotech_api.workspace import list_workspace_files
-
-    with get_api_client()[0] as api_client:
-        target_list = list_workspace_files(api_client, organization_id, workspace_id, workspace_path)
+    ws_api = WorkspaceApi()
+    target_list = ws_api.list_filtered_workspace_files(organization_id, workspace_id, workspace_path)
 
-        for target in target_list:
-            download_workspace_file(
-                api_client,
-                organization_id,
-                workspace_id,
-                target,
-                pathlib.Path(target_folder),
-            )
+    for target in target_list:
+        ws_api.download_workspace_file(
+            organization_id,
+            workspace_id,
+            target,
+            pathlib.Path(target_folder),
+        )

cosmotech/csm_data/commands/api/wsf_send_file.py

@@ -5,10 +5,11 @@
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
 
-from cosmotech.csm_data.utils.click import click
-from cosmotech.csm_data.utils.decorators import web_help, translate_help
 from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.csm_data.utils.click import click
+from cosmotech.csm_data.utils.decorators import translate_help, web_help
+
 
 @click.command()
 @click.option(
@@ -55,16 +56,12 @@ from cosmotech.orchestrator.utils.translate import T
 @web_help("csm-data/api/wsf-send-file")
 @translate_help("csm_data.commands.api.wsf_send_file.description")
 def wsf_send_file(organization_id, workspace_id, file_path, workspace_path: str, overwrite: bool):
+    from cosmotech.coal.cosmotech_api.apis.workspace import WorkspaceApi
 
-    from cosmotech.coal.cosmotech_api.connection import get_api_client
-    from cosmotech.coal.cosmotech_api.workspace import upload_workspace_file
-
-    with get_api_client()[0] as api_client:
-        upload_workspace_file(
-            api_client,
-            organization_id,
-            workspace_id,
-            file_path,
-            workspace_path,
-            overwrite,
-        )
+    WorkspaceApi().upload_workspace_file(
+        organization_id,
+        workspace_id,
+        file_path,
+        workspace_path,
+        overwrite,
+    )

cosmotech/csm_data/commands/az_storage_upload.py

@@ -5,10 +5,11 @@
 # etc., to any person is prohibited unless it has been previously and
 # specifically authorized by written means by Cosmo Tech.
 
-from cosmotech.csm_data.utils.click import click
-from cosmotech.csm_data.utils.decorators import web_help, translate_help
 from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.csm_data.utils.click import click
+from cosmotech.csm_data.utils.decorators import translate_help, web_help
+
 
 @click.command()
 @click.option(

cosmotech/csm_data/commands/s3_bucket_delete.py

@@ -7,10 +7,11 @@
 
 from typing import Optional
 
-from cosmotech.csm_data.utils.click import click
-from cosmotech.csm_data.utils.decorators import web_help, translate_help
 from cosmotech.orchestrator.utils.translate import T
 
+from cosmotech.csm_data.utils.click import click
+from cosmotech.csm_data.utils.decorators import translate_help, web_help
+
 
 @click.command()
 @click.option(
@@ -88,20 +89,20 @@ def s3_bucket_delete(
     ssl_cert_bundle: Optional[str] = None,
 ):
     # Import the functions at the start of the command
-    from cosmotech.coal.aws.s3 import create_s3_resource, delete_objects
+    from cosmotech.coal.aws import S3
+    from cosmotech.coal.utils.configuration import Configuration
 
     # Create S3 resource
-    s3_resource = create_s3_resource(
-        endpoint_url=endpoint_url,
-        access_id=access_id,
-        secret_key=secret_key,
-        use_ssl=use_ssl,
-        ssl_cert_bundle=ssl_cert_bundle,
-    )
+    _c = Configuration()
+    _c.s3.bucket_name = bucket_name
+    _c.s3.endpoint_url = endpoint_url
+    _c.s3.access_key_id = access_id
+    _c.s3.secret_access_key = secret_key
+    _c.s3.bucket_prefix = file_prefix
+    _c.s3.use_ssl = use_ssl
+    _c.s3.ssl_cert_bundle = ssl_cert_bundle
+
+    _s3 = S3(_c)
 
     # Delete objects
-    delete_objects(
-        bucket_name=bucket_name,
-        s3_resource=s3_resource,
-        file_prefix=file_prefix,
-    )
+    _s3.delete_objects()