-
Notifications
You must be signed in to change notification settings - Fork 7
Add README for the data and formatter layers.
#40
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
RafsanNeloy
wants to merge
6
commits into
aces:main
Choose a base branch
from
RafsanNeloy:readme
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+259
−0
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d9b53a8
Add README dfor the data and formatter layers.
RafsanNeloy 6fb4df7
Merge https://github.com/RafsanNeloy/cbrain-cli into readme
RafsanNeloy 18896ed
Merge branch 'aces:main' into readme
RafsanNeloy ca86732
Merge branch 'aces:main' into readme
RafsanNeloy e153820
Update README and formatter documentation & unit tests overview
RafsanNeloy 8596c0f
Refactor README files
RafsanNeloy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # Welcome to the CBRAIN CLI Package! | ||
|
|
||
| This directory is the heart of the `cbrain` command — parse input, check the session, talk to CBRAIN, and print a clean result. | ||
|
|
||
| ## How It Fits Together | ||
|
|
||
| **Parse → Auth → Handle → Fetch → Format.** | ||
|
|
||
| | Piece | Role | | ||
| | --- | --- | | ||
| | `main.py` | Build the parser, gate auth, dispatch | | ||
| | `sessions.py` / `config.py` | Login, logout, credential file | | ||
| | `handlers.py` | Call data, then formatter; set exit codes | | ||
| | [`data/`](data/README.md) | BrainPortal API calls (no printing) | | ||
| | [`formatter/`](formatter/README.md) | Tables, summaries, `--json`, `--jsonl` | | ||
| | `cli_utils.py` | `CbrainClient`, errors, pagination, output helpers | | ||
| | `users.py` | Current-user helpers for `whoami` | | ||
|
|
||
| ## A Quick Mental Model | ||
|
|
||
| ```mermaid | ||
| flowchart TD | ||
| CMD["cbrain file list"] --> MAIN["main.py"] | ||
| MAIN --> AUTH{"authenticated?"} | ||
| AUTH -->|no| STOP["ask login"] | ||
| AUTH -->|yes| H["handlers.py"] | ||
|
|
||
| H -->|"1. ask for data"| D["data/"] | ||
| D -->|"2. HTTP via CbrainClient<br/>token from config.py"| API["CBRAIN API"] | ||
| API -->|"3. raw JSON"| D | ||
| D -->|"4. Python objects"| H | ||
|
|
||
| H -->|"5. present"| F["formatter/"] | ||
| F --> OUT["terminal"] | ||
| ``` | ||
|
|
||
| Use `CbrainClient` for new API calls. Credentials load at command time via `from_credentials()` — never at import. | ||
|
|
||
| ## Golden Rules ✨ | ||
|
|
||
| * **Data never prints** — validate and return objects only. | ||
| * **Formatters own presentation** — including `--json` / `--jsonl`. | ||
| * **Handlers glue both** — exit codes and `--yes` for destructive actions. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # Welcome to the CBRAIN CLI Data Layer! 👋 | ||
|
|
||
| This directory is the core engine connecting our command-line tools to **CBRAIN**—a powerful web-enabled platform built to manage large, distributed research datasets and mediate high-performance computing (HPC) tasks. | ||
|
|
||
| Whenever the CLI needs to talk to CBRAIN's architecture (specifically the **BrainPortal** API), it happens right here. | ||
|
|
||
| ## How It Is Used 🛠️ | ||
|
|
||
| Think of these Python modules as your direct bridge to CBRAIN's resources. They handle BrainPortal API interactions — reads and writes — plus client-side validation. If a user command needs the CBRAIN API, these modules do the heavy lifting. | ||
|
|
||
| ### The Modules at a Glance (with Example Commands!): | ||
|
|
||
| * **`background_activities.py`**: Tracks backend jobs in progress (`cbrain background`). | ||
| * `cbrain background list` | ||
| * `cbrain background show 42` | ||
|
|
||
| * **`data_providers.py`**: Connects to the systems storing your research data (`cbrain data-provider`). | ||
| * `cbrain data-provider list` | ||
| * `cbrain data-provider show 15` | ||
| * `cbrain data-provider is-alive 15` | ||
| * `cbrain data-provider delete-unregistered-files 15` | ||
|
|
||
| * **`files.py`**: Manages data uploads, caching, and transfers across CBRAIN (`cbrain file`). | ||
| * `cbrain file list` | ||
| * `cbrain file show 99` | ||
| * `cbrain file upload /path/to/file.nii --data-provider-id 15 --group-id 3` | ||
| * `cbrain file copy --file-id 2 3 --data-provider-id 15` | ||
| * `cbrain file move --file-id 2 --data-provider-id 15` | ||
| * `cbrain file delete 99` | ||
|
|
||
| * **`projects.py`**: Keeps user research organized (`cbrain project`). | ||
| * `cbrain project list` | ||
| * `cbrain project show 10` | ||
| * `cbrain project switch 10` | ||
| * `cbrain project switch all` | ||
| * `cbrain project unswitch` | ||
|
|
||
| * **`remote_resources.py`**: Interfaces with bourreaux / execution servers (`cbrain remote-resource`). | ||
| * `cbrain remote-resource list` | ||
| * `cbrain remote-resource show 5` | ||
|
|
||
| * **`tags.py`**: Organizes and categorizes files and tasks (`cbrain tag`). | ||
| * `cbrain tag list` | ||
| * `cbrain tag show 7` | ||
| * `cbrain tag create --name NewTag1 --user-id 2 --group-id 3` | ||
| * `cbrain tag update 7 --name UpdatedTag --user-id 2 --group-id 3` | ||
| * `cbrain tag delete 7` | ||
|
|
||
| * **`tasks.py`**: Orchestrates intensive compute jobs on remote HPCs (`cbrain task`). | ||
| * `cbrain task list` | ||
| * `cbrain task list bourreau-id 4` | ||
| * `cbrain task show 2` | ||
| * `cbrain task operation hold --task-id 2` | ||
| * `cbrain task operation terminate --task-id 1 2` | ||
| * `cbrain --debug task list` | ||
|
|
||
| * **`tools.py` & `tool_configs.py`**: Manages the scientific tools available on CBRAIN (`cbrain tool` / `cbrain tool-config`). | ||
| * `cbrain tool list` | ||
| * `cbrain tool show 8` | ||
| * `cbrain tool-config list` | ||
| * `cbrain tool-config show 12` | ||
| * `cbrain tool-config boutiques-descriptor 12` | ||
|
|
||
| ## How It Fits Together 🧩 | ||
|
|
||
| **API here, Display there.** | ||
|
|
||
| **API interaction layer**: GET/list/show plus state-changing calls (upload, delete, move/copy, tag create/update/delete, project switch/unswitch, task operations, and similar). Modules talk to BrainPortal via `CbrainClient`, validate inputs, and return domain data (or raise typed errors). They do not print. Handlers pass results to `formatter/` for terminal output. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| # Welcome to the CBRAIN CLI Formatter Layer! | ||
|
|
||
| This directory is all about **presentation**. Once a handler has domain data from the `data/` API layer, it hands that data to these formatters for terminal output. | ||
|
|
||
| These formatters are responsible for creating the clean tables, organized summaries, and human-readable text you see when you run a command. | ||
|
|
||
| ## How It Fits Together 🧩 | ||
|
|
||
| **Data there, Display here.** | ||
|
|
||
| While the `data/` directory handles backend API interactions, the `formatter/` directory focuses exclusively on presenting that info. Every `_fmt.py` file here perfectly matches a corresponding data module. For example, `tasks.py` gets the data, and `tasks_fmt.py` decides how to draw it on your screen! | ||
|
|
||
| ## What the Formatter Actually Does 🪄 | ||
|
|
||
| Imagine you ask CBRAIN for a list of your files using `cbrain file list`. The raw data coming from the server is a dense machine-readable bundle filled with IDs, timestamps, and metadata. | ||
|
|
||
| Instead of throwing that raw JSON at you, the formatter layer catches the data and turns it into a beautiful, easy-to-read table right in your terminal. Here is exactly what these scripts do: | ||
|
|
||
| **The Raw Data (what `data/` returns):** | ||
| ```json | ||
| {"id": 1024, "type": "SingleFile", "name": "my_mri_scan.nii.gz"} | ||
| ``` | ||
|
|
||
| **The Formatted Output (what `formatter/` shows you for `cbrain file list`):** | ||
| ```text | ||
| ID Type File Name | ||
| ---- ---------- ------------------ | ||
| 1024 SingleFile my_mri_scan.nii.gz | ||
| ``` | ||
|
|
||
| *(Fun fact: We don't use heavy external libraries like `PrettyTable` or `Rich` for this! The CLI uses a custom-built, lightweight, dynamic table formatter powered completely by Python's built-in `textwrap` and `shutil` libraries. That means zero extra dependencies to slow you down!)* | ||
|
|
||
| ### Raw JSON Output | ||
|
|
||
| Every command also supports a `--json` flag that skips the formatter entirely and dumps the raw API response straight to your terminal. Useful for scripting or piping into other tools! | ||
|
|
||
| ## The Formatter Files 🗂️ | ||
|
|
||
| Each `_fmt.py` file knows exactly how to display its specific type of data: | ||
|
|
||
| * **`background_activities_fmt.py`**: Renders background job lists and individual activity details. | ||
| * **`data_providers_fmt.py`**: Renders data provider lists and full provider detail views. | ||
| * **`files_fmt.py`**: Renders file lists, file detail views, upload results, move/copy results, and delete confirmations. | ||
| * **`projects_fmt.py`**: Renders project lists, the current active project, full project details, the "no project" state, and unswitch results. | ||
| * **`remote_resources_fmt.py`**: Renders remote resource (bourreau) lists and individual resource details. | ||
| * **`tags_fmt.py`**: Renders tag lists, tag details, and create/update/delete operation results. | ||
| * **`tasks_fmt.py`**: Renders task lists, detailed task views, and bulk operation results. | ||
| * **`tool_configs_fmt.py`**: Renders tool configuration lists, config details, and Boutiques descriptors. | ||
| * **`tools_fmt.py`**: Renders tool lists and individual tool detail views. | ||
|
|
||
| Every formatter script is basically a tiny artist that knows exactly how to draw its specific type of data so it's perfectly readable for you! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| # CBRAIN CLI Unit Tests | ||
|
|
||
| This directory contains the unit test suite for the CBRAIN CLI. | ||
|
|
||
| Every test mocks the HTTP layer (`urllib.request.urlopen`), so **no real CBRAIN | ||
| server is required**. For live-server end-to-end output checks, see | ||
| [capture_tests/README.md](../capture_tests/README.md). Those capture tests | ||
| expect a seeded CBRAIN test instance; server setup follows the same pattern as | ||
| CBRAIN's own [API testing frameworks](https://github.com/aces/cbrain/blob/master/BrainPortal/test_api/README.md). | ||
|
|
||
| Alongside the test modules, __conftest.py__ provides shared helpers and pytest | ||
| fixtures used across the suite. | ||
|
|
||
| ## Running the tests | ||
|
|
||
| From the repository root (with the `dev` extra installed): | ||
|
|
||
| ```bash | ||
| pytest | ||
| ``` | ||
|
|
||
| With a coverage report: | ||
|
|
||
| ```bash | ||
| pytest --cov=cbrain_cli | ||
| ``` | ||
|
|
||
| Selecting a subset by path or by test name substring: | ||
|
|
||
| ```bash | ||
| pytest tests/test_files.py | ||
| pytest tests/test_sessions.py -k login | ||
| pytest tests -k "handler and not ops" | ||
| ``` | ||
|
|
||
| More options are available via `pytest --help`. | ||
|
|
||
| ## Shared helpers and fixtures | ||
|
|
||
| __conftest.py__ is the common entry point for test scaffolding. | ||
|
|
||
| Helper functions: | ||
|
|
||
| - `make_args(**kwargs)` — fake `argparse.Namespace` (defaults: `page=1`, `per_page=25`) | ||
| - `parse_json_output(capsys)` — parse captured stdout as JSON | ||
| - `run_main(monkeypatch, argv)` — run `main()` with a fake `sys.argv` | ||
| - `install_auth()` — write known credentials so `CbrainClient.from_credentials()` succeeds | ||
| - `write_auth_credentials(path, ...)` — write a credentials JSON file to a given path | ||
| - `sample_credentials(**overrides)` — credentials dict with sensible defaults | ||
|
|
||
| Fixtures: | ||
|
|
||
| - `_isolate_credentials` (autouse) — redirect the credentials file to a temp directory so the real `~/.config/cbrain` file is never touched | ||
| - `creds_file` / `sessions_creds_file` — path to the isolated credentials file | ||
| - `fake_credentials` — known credentials for `is_authenticated()` and `CbrainClient` | ||
| - `mock_urlopen` — patch `urlopen` with one configurable response: `mock_urlopen(response_json, status=200)` | ||
| - `capture_urlopen` — like `mock_urlopen`, but also records URL, headers, method, and body; returns `(configure, captured)` | ||
|
|
||
| **Note:** credential isolation is automatic. Unit tests must not depend on a real login session. | ||
|
|
||
| ## Test modules | ||
|
|
||
| ### Data layer | ||
|
|
||
| - `test_background_activities.py` — list, show, empty list, missing ID | ||
| - `test_data_providers.py` — list, show (ID fallback), `is-alive`, `delete-unregistered-files` | ||
| - `test_files.py` — list (filters), show, upload, copy, move, delete, missing-arg validation | ||
| - `test_projects.py` — list, show, switch, unswitch, stale group cleanup | ||
| - `test_remote_resources.py` — list, show, empty list, missing ID | ||
| - `test_tags.py` — list, show, create, update, delete, missing-arg validation | ||
| - `test_tasks.py` — list (`bourreau-id` filter), show, operation | ||
| - `test_tool_configs.py` — list, show, Boutiques descriptor, missing ID | ||
| - `test_tools.py` — list (pagination), show (multi-page search, not-found) | ||
|
|
||
| ### Formatter layer | ||
|
|
||
| - `test_formatters.py` — all `_fmt.py` outputs: normal, empty, `--json`, `--jsonl` | ||
|
|
||
| ### Handlers | ||
|
|
||
| - `test_handlers.py` — list/show/switch/unswitch/`whoami` handler contracts; task operation success/empty/validation/API | ||
| - `test_handlers_ops.py` — dataprovider ops, file upload/copy/delete (incl. abort without `--yes`), tags, Boutiques | ||
|
|
||
| ### Infrastructure | ||
|
|
||
| - `test_cbrain_client.py` — URL normalization, timeouts, GET/POST/DELETE, query params, multipart, HTTP errors | ||
| - `test_cli_utils_output.py` — tables, JSONL, `version_info`, `confirm_destructive` | ||
| - `test_config.py` — credential load/save, permissions, corrupt JSON | ||
| - `test_exit_codes.py` — mapped exit codes for HTTP, URL, validation, interrupt, unexpected errors | ||
| - `test_sessions.py` — login/logout edge cases and file cleanup | ||
| - `test_users.py` — `user_details` / `whoami`, including login-then-whoami flow | ||
|
|
||
| ### Parsing and dispatch | ||
|
|
||
| - `test_parser.py` — command registration, kebab→snake flags, `--json` / `--jsonl`, pagination flags | ||
| - `test_main_dispatch.py` — auth bypass for logout/version, help paths, `task list bourreau-id` | ||
| - `test_pagination.py` — page / per-page bounds and query-param injection |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to hyperlink of this file or this is okay?