beanhub-cli 2.1.0b2__tar.gz → 2.1.1__tar.gz

{beanhub_cli-2.1.0b2 → beanhub_cli-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: beanhub-cli
-Version: 2.1.0b2
+Version: 2.1.1
 Summary: Command line tools for BeanHub
 License: MIT
 Author: Fang-Pen Lin

{beanhub_cli-2.1.0b2 → beanhub_cli-2.1.1}/beanhub_cli/connect/main.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import pathlib
 import sys
 import tarfile
 import tempfile
@@ -146,8 +147,8 @@ def run_sync(env: Environment, config: ConnectConfig):
     help='Which repository to run sync on, in "<username>/<repo_name>" format',
 )
 @pass_env
-@handle_api_exception(logger)
 @check_imports(ExtraDepsSet.LOGIN, logger)
+@handle_api_exception(logger)
 def sync(env: Environment, repo: str | None):
     config = ensure_config(api_base_url=env.api_base_url, repo=repo)
     run_sync(env, config)
@@ -170,6 +171,11 @@ def sync(env: Environment, repo: str | None):
     is_flag=True,
     help="Run sync first before running dump",
 )
+@click.option(
+    "--output-accounts",
+    type=click.Path(writable=True),
+    help="File path of Bank accounts CSV file to write to, if a folder is provided, default filename accounts.csv will be used",
+)
 @click.option(
     "--unsafe-tar-extract",
     type=bool,
@@ -177,9 +183,15 @@ def sync(env: Environment, repo: str | None):
     help="Allow unsafe tar extraction, mostly for Python < 3.11",
 )
 @pass_env
-@handle_api_exception(logger)
 @check_imports(ExtraDepsSet.CONNECT, logger)
-def dump(env: Environment, repo: str | None, sync: bool, unsafe_tar_extract: bool):
+@handle_api_exception(logger)
+def dump(
+    env: Environment,
+    repo: str | None,
+    sync: bool,
+    output_accounts: str | None,
+    unsafe_tar_extract: bool,
+):
     import httpx
     from ..internal_api.api.connect import create_dump_request
     from ..internal_api.api.connect import get_dump_request
@@ -207,7 +219,9 @@ def dump(env: Environment, repo: str | None, sync: bool, unsafe_tar_extract: boo
     with make_auth_client(base_url=env.api_base_url, token=config.token) as client:
         client.raise_on_unexpected_status = True
         resp: CreateDumpRequestResponse = create_dump_request.sync(
-            body=CreateDumpRequestRequest(public_key=public_key),
+            body=CreateDumpRequestRequest(
+                public_key=public_key, output_accounts=output_accounts is not None
+            ),
             username=config.username,
             repo_name=config.repo,
             client=client,
@@ -264,4 +278,31 @@ def dump(env: Environment, repo: str | None, sync: bool, unsafe_tar_extract: boo
         )
         extract_tar(input_file=decrypted_file, logger=env.logger)
 
+    if output_accounts is not None and resp.accounts_download_url is not None:
+        output_accounts = pathlib.Path(output_accounts)
+        if output_accounts.is_dir():
+            output_accounts_path = output_accounts / "accounts.csv"
+        else:
+            output_accounts_path = output_accounts
+        with (
+            tempfile.SpooledTemporaryFile(SPOOLED_FILE_MAX_SIZE) as encrypted_file,
+            output_accounts_path.open("wb") as decrypted_file,
+        ):
+            with httpx.stream("GET", resp.accounts_download_url) as req:
+                for chunk in req.iter_bytes():
+                    encrypted_file.write(chunk)
+            encrypted_file.flush()
+            encrypted_file.seek(0)
+            logger.info(
+                "Decrypting downloaded accounts file to %s ...", output_accounts_path
+            )
+
+            # delay import for testing purpose
+            from .encryption import decrypt_file
+            from .file_io import extract_tar
+
+            decrypt_file(
+                input_file=encrypted_file, output_file=decrypted_file, key=key, iv=iv
+            )
+
     logger.info("done")

{beanhub_cli-2.1.0b2 → beanhub_cli-2.1.1}/beanhub_cli/internal_api/models/create_dump_request_request.py

@@ -1,9 +1,13 @@
 from typing import Any
 from typing import TypeVar
+from typing import Union
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
+from ..types import UNSET
+from ..types import Unset
+
 T = TypeVar("T", bound="CreateDumpRequestRequest")
 
 
@@ -12,14 +16,18 @@ class CreateDumpRequestRequest:
     """
     Attributes:
         public_key (str):
+        output_accounts (Union[Unset, bool]):  Default: False.
     """
 
     public_key: str
+    output_accounts: Union[Unset, bool] = False
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         public_key = self.public_key
 
+        output_accounts = self.output_accounts
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
@@ -27,6 +35,8 @@ class CreateDumpRequestRequest:
                 "public_key": public_key,
             }
         )
+        if output_accounts is not UNSET:
+            field_dict["output_accounts"] = output_accounts
 
         return field_dict
 
@@ -35,8 +45,11 @@ class CreateDumpRequestRequest:
         d = src_dict.copy()
         public_key = d.pop("public_key")
 
+        output_accounts = d.pop("output_accounts", UNSET)
+
         create_dump_request_request = cls(
             public_key=public_key,
+            output_accounts=output_accounts,
         )
 
         create_dump_request_request.additional_properties = d

{beanhub_cli-2.1.0b2 → beanhub_cli-2.1.1}/beanhub_cli/internal_api/models/get_dump_request_response.py

@@ -22,6 +22,7 @@ class GetDumpRequestResponse:
         state (DumpRequestState):
         encryption_key (Union[None, Unset, str]):
         download_url (Union[None, Unset, str]):
+        accounts_download_url (Union[None, Unset, str]):
         error_message (Union[None, Unset, str]):
     """
 
@@ -29,6 +30,7 @@ class GetDumpRequestResponse:
     state: DumpRequestState
     encryption_key: Union[None, Unset, str] = UNSET
     download_url: Union[None, Unset, str] = UNSET
+    accounts_download_url: Union[None, Unset, str] = UNSET
     error_message: Union[None, Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
@@ -49,6 +51,12 @@ class GetDumpRequestResponse:
         else:
             download_url = self.download_url
 
+        accounts_download_url: Union[None, Unset, str]
+        if isinstance(self.accounts_download_url, Unset):
+            accounts_download_url = UNSET
+        else:
+            accounts_download_url = self.accounts_download_url
+
         error_message: Union[None, Unset, str]
         if isinstance(self.error_message, Unset):
             error_message = UNSET
@@ -67,6 +75,8 @@ class GetDumpRequestResponse:
             field_dict["encryption_key"] = encryption_key
         if download_url is not UNSET:
             field_dict["download_url"] = download_url
+        if accounts_download_url is not UNSET:
+            field_dict["accounts_download_url"] = accounts_download_url
         if error_message is not UNSET:
             field_dict["error_message"] = error_message
 
@@ -97,6 +107,17 @@ class GetDumpRequestResponse:
 
         download_url = _parse_download_url(d.pop("download_url", UNSET))
 
+        def _parse_accounts_download_url(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        accounts_download_url = _parse_accounts_download_url(
+            d.pop("accounts_download_url", UNSET)
+        )
+
         def _parse_error_message(data: object) -> Union[None, Unset, str]:
             if data is None:
                 return data
@@ -111,6 +132,7 @@ class GetDumpRequestResponse:
             state=state,
             encryption_key=encryption_key,
             download_url=download_url,
+            accounts_download_url=accounts_download_url,
             error_message=error_message,
         )
 

{beanhub_cli-2.1.0b2 → beanhub_cli-2.1.1}/beanhub_cli/utils.py

@@ -57,7 +57,7 @@ def check_imports(extra_deps_set: ExtraDepsSet, logger: logging.Logger | None =
             run_check_imports(
                 logger=logger,
                 module_names=EXTRA_DEPS[extra_deps_set],
-                required_extras=extra_deps_set.value.lower(),
+                required_extras=[extra_deps_set.value.lower()],
             )
             return func(*args, **kwargs)
 

{beanhub_cli-2.1.0b2 → beanhub_cli-2.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beanhub-cli"
-version = "2.1.0b2"
+version = "2.1.1"
 description = "Command line tools for BeanHub"
 authors = ["Fang-Pen Lin <fangpen@launchplatform.com>"]
 license = "MIT"