brewsorted-cli 0.8.4__tar.gz → 0.8.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/INSTALL.md +55 -59
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/PKG-INFO +56 -60
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/brewsorted_cli.egg-info/PKG-INFO +56 -60
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/pyproject.toml +1 -1
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/skills/brewsorted/SKILL.md +4 -3
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/skills/brewsorted/references/cli.md +9 -3
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/__init__.py +1 -1
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/client.py +18 -2
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/main.py +26 -1
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/oauth_login.py +4 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_auth_state.py +7 -7
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_cli.py +116 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_oauth_login.py +5 -2
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/brewsorted_cli.egg-info/SOURCES.txt +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/brewsorted_cli.egg-info/dependency_links.txt +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/brewsorted_cli.egg-info/entry_points.txt +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/brewsorted_cli.egg-info/requires.txt +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/brewsorted_cli.egg-info/top_level.txt +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/setup.cfg +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/skills/brewsorted/__init__.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/skills/brewsorted/agents/openai.yaml +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/skills/brewsorted/tests/acceptance_scenarios.json +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/skills/brewsorted/tests/test_skill.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/auth_state.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/http.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/oauth_discovery.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/product_feedback.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/skills.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/src/brewsorted_cli/updates.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_anonymous_status.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_oauth_discovery.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_product_feedback.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_protocol.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_proxy.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_ratio_workflow.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_skills.py +0 -0
- {brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/tests/test_updates.py +0 -0
|
@@ -1,23 +1,35 @@
|
|
|
1
|
-
# BrewSorted
|
|
1
|
+
# BrewSorted CLI installation
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
3
|
+
The CLI and complete matching User skill are distributed together through
|
|
4
|
+
[PyPI](https://pypi.org/project/brewsorted-cli/). The public qualified target is
|
|
5
|
+
Linux x86-64 with Python 3.12 or 3.13; Python 3.11 remains internal compatibility
|
|
6
|
+
coverage. Source and coordinated service/client versions remain in the private
|
|
7
|
+
monorepo.
|
|
8
|
+
|
|
9
|
+
## Select the production version
|
|
10
|
+
|
|
11
|
+
Read `https://brewsorted.com/api/capabilities` as JSON, require schema version 1,
|
|
12
|
+
and select its explicit `recommended_client_bundle_version` (`X.Y.Z`). Never
|
|
13
|
+
infer compatibility from PyPI's newest version. Before installing, inspect
|
|
14
|
+
`https://pypi.org/pypi/brewsorted-cli/X.Y.Z/json` for that exact version. Both
|
|
15
|
+
`brewsorted_cli-X.Y.Z-py3-none-any.whl` and `brewsorted_cli-X.Y.Z.tar.gz` must be
|
|
16
|
+
present with `yanked: false`. Missing, malformed, withdrawn or unavailable
|
|
17
|
+
metadata/files mean installation unavailable. Exact pins can still install
|
|
18
|
+
yanked files, so this check is required before invoking the installer.
|
|
19
|
+
|
|
20
|
+
Website archives and catalogs are retired. Historical service versions without
|
|
21
|
+
PyPI packages are not backfilled; recovery to one may have no fresh public CLI
|
|
22
|
+
installation path. Retained private immutable release assets are unchanged.
|
|
10
23
|
|
|
11
24
|
## PyPI installation
|
|
12
25
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
are packaged together; no private repository access is required.
|
|
26
|
+
The example below names this bundle's version. Use it only when it is the live
|
|
27
|
+
production recommendation and its exact PyPI release passes the checks above.
|
|
28
|
+
Install uv or pipx first if necessary; Python and ordinary package dependencies
|
|
29
|
+
are required. No private repository access is needed.
|
|
18
30
|
|
|
19
31
|
```bash
|
|
20
|
-
client_version=0.8.
|
|
32
|
+
client_version=0.8.6
|
|
21
33
|
uv tool install --python python3.12 "brewsorted-cli==$client_version"
|
|
22
34
|
# Alternative: pipx install --python python3.12 "brewsorted-cli==$client_version"
|
|
23
35
|
brewsorted skills install --destination "$HOME/.codex/skills/brewsorted"
|
|
@@ -52,45 +64,30 @@ uv tool install --python python3.12 "verified/brewsorted_cli-$client_version-py3
|
|
|
52
64
|
|
|
53
65
|
This verifies the CLI artifact's repository provenance, not every dependency or
|
|
54
66
|
a security audit. Establish the expected repository identity independently of a
|
|
55
|
-
disputed website. The
|
|
67
|
+
disputed website. The production capability recommendation selects the version;
|
|
68
|
+
PyPI metadata establishes whether that exact release is available and not yanked.
|
|
56
69
|
|
|
57
|
-
##
|
|
70
|
+
## Private release archives
|
|
58
71
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
72
|
+
Private immutable releases still retain their original client archives for
|
|
73
|
+
qualification and operator recovery evidence. They are not a public fallback.
|
|
74
|
+
An operator reinstall from an already verified private archive can use the
|
|
75
|
+
original `SHA256SUMS` before extracting it:
|
|
63
76
|
|
|
64
77
|
```bash
|
|
65
|
-
client_version
|
|
66
|
-
client_archive="brewsorted-client-${client_version}.tar.gz"
|
|
67
|
-
client_release_root="$HOME/.local/share/brewsorted/releases"
|
|
68
|
-
client_root="$client_release_root/brewsorted-client-${client_version}"
|
|
69
|
-
agent_skill_root="$HOME/.codex/skills"
|
|
78
|
+
client_root="brewsorted-client-${client_version}"
|
|
70
79
|
sha256sum --check SHA256SUMS || exit 1
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
tar -xzf "$client_archive" -C "$client_release_root"
|
|
80
|
+
test ! -e "$client_root" && test ! -L "$client_root" || exit 1
|
|
81
|
+
tar -xzf "brewsorted-client-${client_version}.tar.gz"
|
|
74
82
|
python3.13 -m venv "$client_root/.venv"
|
|
75
83
|
"$client_root/.venv/bin/python" -m pip install "$client_root"
|
|
76
|
-
|
|
77
|
-
ln -s "$client_root/skills/brewsorted" "$agent_skill_root/brewsorted"
|
|
84
|
+
"$client_root/.venv/bin/brewsorted" skills install --destination "$HOME/.codex/skills/brewsorted"
|
|
78
85
|
```
|
|
79
86
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
`https://brewsorted.com` for production or `https://staging.brewsorted.com`
|
|
85
|
-
for synthetic staging. Use a separate credential file for each origin.
|
|
86
|
-
Do not copy an old `~/.local/state/coffeetrack/auth.json` or other OAuth state
|
|
87
|
-
into the BrewSorted state directory. The new realm has a different issuer and
|
|
88
|
-
requires fresh User setup, browser sign-in, and Connection authorization.
|
|
89
|
-
|
|
90
|
-
Do not copy only `SKILL.md`: the retained link keeps `references/cli.md` and the
|
|
91
|
-
acceptance scenarios paired with the installed executable source. If the target
|
|
92
|
-
link already exists, inspect and remove or rename it deliberately before linking
|
|
93
|
-
the new archive; do not overwrite an unknown directory.
|
|
87
|
+
Follow the exact historical release's retained instructions when reconstructing
|
|
88
|
+
an old private environment. Do not rebuild or republish historical release bytes.
|
|
89
|
+
|
|
90
|
+
## Authorize separately
|
|
94
91
|
|
|
95
92
|
Create the OAuth state directory explicitly and keep it user-owned mode `0700`.
|
|
96
93
|
The credential file becomes mode `0600` when login succeeds:
|
|
@@ -100,17 +97,15 @@ brewsorted_state_root="$HOME/.local/state/brewsorted"
|
|
|
100
97
|
install -d -m 0700 "$brewsorted_state_root"
|
|
101
98
|
export BREWSORTED_STATE_FILE="$brewsorted_state_root/auth.json"
|
|
102
99
|
export BREWSORTED_API_URL=https://brewsorted.com
|
|
103
|
-
|
|
104
|
-
"$client_root/.venv/bin/brewsorted" status
|
|
100
|
+
brewsorted status
|
|
105
101
|
```
|
|
106
102
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
configured transient agent session; it does not transfer an old Connection.
|
|
103
|
+
Use a separate credential file for each exact service origin.
|
|
104
|
+
`BREWSORTED_ACCESS_TOKEN` is only for an explicitly configured transient agent session.
|
|
110
105
|
Configure the exact HTTPS service origin outside chat as described in the skill.
|
|
111
106
|
|
|
112
107
|
For a headless agent session, run
|
|
113
|
-
`
|
|
108
|
+
`brewsorted login --device` and keep that process
|
|
114
109
|
alive. Relay its exact verification URL and short code to the intended User, who
|
|
115
110
|
authorizes it in their own browser. The agent never asks for SSH access, a
|
|
116
111
|
password, access or refresh tokens, or a recovery link.
|
|
@@ -122,7 +117,7 @@ and keep it available for subsequent commands:
|
|
|
122
117
|
|
|
123
118
|
```bash
|
|
124
119
|
export HTTPS_PROXY=http://proxy.example:8080
|
|
125
|
-
|
|
120
|
+
brewsorted login --device
|
|
126
121
|
```
|
|
127
122
|
|
|
128
123
|
`HTTPS_PROXY` routes HTTPS service requests through the HTTP proxy; use
|
|
@@ -149,11 +144,12 @@ Treat each check as different evidence:
|
|
|
149
144
|
complete returned Qualified ID, update and read it again, then delete that
|
|
150
145
|
exact ID. This proves write/read-back separately from authentication.
|
|
151
146
|
|
|
152
|
-
For
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
147
|
+
For updates, downgrades or reinstallations, re-read the production recommendation
|
|
148
|
+
and check the exact PyPI release again. Deliberately replace the executable with
|
|
149
|
+
`uv tool install --force --python python3.12 "brewsorted-cli==$client_version"`
|
|
150
|
+
(or the equivalent pipx command), inspect and move the old skill directory, then
|
|
151
|
+
install the complete matching skill again. Do not overwrite unknown paths or
|
|
152
|
+
use a withdrawn release. An unavailable recommendation is a publication incident,
|
|
153
|
+
not permission to infer compatibility. The CLI's optional version hint is
|
|
154
|
+
advisory and does not prove registry availability or update automatically.
|
|
155
|
+
See `https://brewsorted.com/downloads.html` for current installation guidance.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: brewsorted-cli
|
|
3
|
-
Version: 0.8.
|
|
3
|
+
Version: 0.8.6
|
|
4
4
|
Summary: Portable HTTP client for the BrewSorted API
|
|
5
5
|
Project-URL: Homepage, https://brewsorted.com
|
|
6
6
|
Project-URL: Documentation, https://brewsorted.com/downloads.html
|
|
@@ -11,26 +11,38 @@ Requires-Dist: PyJWT[crypto]<3,>=2.14
|
|
|
11
11
|
Provides-Extra: dev
|
|
12
12
|
Requires-Dist: pytest<10,>=8; extra == "dev"
|
|
13
13
|
|
|
14
|
-
# BrewSorted
|
|
14
|
+
# BrewSorted CLI installation
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
16
|
+
The CLI and complete matching User skill are distributed together through
|
|
17
|
+
[PyPI](https://pypi.org/project/brewsorted-cli/). The public qualified target is
|
|
18
|
+
Linux x86-64 with Python 3.12 or 3.13; Python 3.11 remains internal compatibility
|
|
19
|
+
coverage. Source and coordinated service/client versions remain in the private
|
|
20
|
+
monorepo.
|
|
21
|
+
|
|
22
|
+
## Select the production version
|
|
23
|
+
|
|
24
|
+
Read `https://brewsorted.com/api/capabilities` as JSON, require schema version 1,
|
|
25
|
+
and select its explicit `recommended_client_bundle_version` (`X.Y.Z`). Never
|
|
26
|
+
infer compatibility from PyPI's newest version. Before installing, inspect
|
|
27
|
+
`https://pypi.org/pypi/brewsorted-cli/X.Y.Z/json` for that exact version. Both
|
|
28
|
+
`brewsorted_cli-X.Y.Z-py3-none-any.whl` and `brewsorted_cli-X.Y.Z.tar.gz` must be
|
|
29
|
+
present with `yanked: false`. Missing, malformed, withdrawn or unavailable
|
|
30
|
+
metadata/files mean installation unavailable. Exact pins can still install
|
|
31
|
+
yanked files, so this check is required before invoking the installer.
|
|
32
|
+
|
|
33
|
+
Website archives and catalogs are retired. Historical service versions without
|
|
34
|
+
PyPI packages are not backfilled; recovery to one may have no fresh public CLI
|
|
35
|
+
installation path. Retained private immutable release assets are unchanged.
|
|
23
36
|
|
|
24
37
|
## PyPI installation
|
|
25
38
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
are packaged together; no private repository access is required.
|
|
39
|
+
The example below names this bundle's version. Use it only when it is the live
|
|
40
|
+
production recommendation and its exact PyPI release passes the checks above.
|
|
41
|
+
Install uv or pipx first if necessary; Python and ordinary package dependencies
|
|
42
|
+
are required. No private repository access is needed.
|
|
31
43
|
|
|
32
44
|
```bash
|
|
33
|
-
client_version=0.8.
|
|
45
|
+
client_version=0.8.6
|
|
34
46
|
uv tool install --python python3.12 "brewsorted-cli==$client_version"
|
|
35
47
|
# Alternative: pipx install --python python3.12 "brewsorted-cli==$client_version"
|
|
36
48
|
brewsorted skills install --destination "$HOME/.codex/skills/brewsorted"
|
|
@@ -65,45 +77,30 @@ uv tool install --python python3.12 "verified/brewsorted_cli-$client_version-py3
|
|
|
65
77
|
|
|
66
78
|
This verifies the CLI artifact's repository provenance, not every dependency or
|
|
67
79
|
a security audit. Establish the expected repository identity independently of a
|
|
68
|
-
disputed website. The
|
|
80
|
+
disputed website. The production capability recommendation selects the version;
|
|
81
|
+
PyPI metadata establishes whether that exact release is available and not yanked.
|
|
69
82
|
|
|
70
|
-
##
|
|
83
|
+
## Private release archives
|
|
71
84
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
85
|
+
Private immutable releases still retain their original client archives for
|
|
86
|
+
qualification and operator recovery evidence. They are not a public fallback.
|
|
87
|
+
An operator reinstall from an already verified private archive can use the
|
|
88
|
+
original `SHA256SUMS` before extracting it:
|
|
76
89
|
|
|
77
90
|
```bash
|
|
78
|
-
client_version
|
|
79
|
-
client_archive="brewsorted-client-${client_version}.tar.gz"
|
|
80
|
-
client_release_root="$HOME/.local/share/brewsorted/releases"
|
|
81
|
-
client_root="$client_release_root/brewsorted-client-${client_version}"
|
|
82
|
-
agent_skill_root="$HOME/.codex/skills"
|
|
91
|
+
client_root="brewsorted-client-${client_version}"
|
|
83
92
|
sha256sum --check SHA256SUMS || exit 1
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
tar -xzf "$client_archive" -C "$client_release_root"
|
|
93
|
+
test ! -e "$client_root" && test ! -L "$client_root" || exit 1
|
|
94
|
+
tar -xzf "brewsorted-client-${client_version}.tar.gz"
|
|
87
95
|
python3.13 -m venv "$client_root/.venv"
|
|
88
96
|
"$client_root/.venv/bin/python" -m pip install "$client_root"
|
|
89
|
-
|
|
90
|
-
ln -s "$client_root/skills/brewsorted" "$agent_skill_root/brewsorted"
|
|
97
|
+
"$client_root/.venv/bin/brewsorted" skills install --destination "$HOME/.codex/skills/brewsorted"
|
|
91
98
|
```
|
|
92
99
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
`https://brewsorted.com` for production or `https://staging.brewsorted.com`
|
|
98
|
-
for synthetic staging. Use a separate credential file for each origin.
|
|
99
|
-
Do not copy an old `~/.local/state/coffeetrack/auth.json` or other OAuth state
|
|
100
|
-
into the BrewSorted state directory. The new realm has a different issuer and
|
|
101
|
-
requires fresh User setup, browser sign-in, and Connection authorization.
|
|
102
|
-
|
|
103
|
-
Do not copy only `SKILL.md`: the retained link keeps `references/cli.md` and the
|
|
104
|
-
acceptance scenarios paired with the installed executable source. If the target
|
|
105
|
-
link already exists, inspect and remove or rename it deliberately before linking
|
|
106
|
-
the new archive; do not overwrite an unknown directory.
|
|
100
|
+
Follow the exact historical release's retained instructions when reconstructing
|
|
101
|
+
an old private environment. Do not rebuild or republish historical release bytes.
|
|
102
|
+
|
|
103
|
+
## Authorize separately
|
|
107
104
|
|
|
108
105
|
Create the OAuth state directory explicitly and keep it user-owned mode `0700`.
|
|
109
106
|
The credential file becomes mode `0600` when login succeeds:
|
|
@@ -113,17 +110,15 @@ brewsorted_state_root="$HOME/.local/state/brewsorted"
|
|
|
113
110
|
install -d -m 0700 "$brewsorted_state_root"
|
|
114
111
|
export BREWSORTED_STATE_FILE="$brewsorted_state_root/auth.json"
|
|
115
112
|
export BREWSORTED_API_URL=https://brewsorted.com
|
|
116
|
-
|
|
117
|
-
"$client_root/.venv/bin/brewsorted" status
|
|
113
|
+
brewsorted status
|
|
118
114
|
```
|
|
119
115
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
configured transient agent session; it does not transfer an old Connection.
|
|
116
|
+
Use a separate credential file for each exact service origin.
|
|
117
|
+
`BREWSORTED_ACCESS_TOKEN` is only for an explicitly configured transient agent session.
|
|
123
118
|
Configure the exact HTTPS service origin outside chat as described in the skill.
|
|
124
119
|
|
|
125
120
|
For a headless agent session, run
|
|
126
|
-
`
|
|
121
|
+
`brewsorted login --device` and keep that process
|
|
127
122
|
alive. Relay its exact verification URL and short code to the intended User, who
|
|
128
123
|
authorizes it in their own browser. The agent never asks for SSH access, a
|
|
129
124
|
password, access or refresh tokens, or a recovery link.
|
|
@@ -135,7 +130,7 @@ and keep it available for subsequent commands:
|
|
|
135
130
|
|
|
136
131
|
```bash
|
|
137
132
|
export HTTPS_PROXY=http://proxy.example:8080
|
|
138
|
-
|
|
133
|
+
brewsorted login --device
|
|
139
134
|
```
|
|
140
135
|
|
|
141
136
|
`HTTPS_PROXY` routes HTTPS service requests through the HTTP proxy; use
|
|
@@ -162,11 +157,12 @@ Treat each check as different evidence:
|
|
|
162
157
|
complete returned Qualified ID, update and read it again, then delete that
|
|
163
158
|
exact ID. This proves write/read-back separately from authentication.
|
|
164
159
|
|
|
165
|
-
For
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
160
|
+
For updates, downgrades or reinstallations, re-read the production recommendation
|
|
161
|
+
and check the exact PyPI release again. Deliberately replace the executable with
|
|
162
|
+
`uv tool install --force --python python3.12 "brewsorted-cli==$client_version"`
|
|
163
|
+
(or the equivalent pipx command), inspect and move the old skill directory, then
|
|
164
|
+
install the complete matching skill again. Do not overwrite unknown paths or
|
|
165
|
+
use a withdrawn release. An unavailable recommendation is a publication incident,
|
|
166
|
+
not permission to infer compatibility. The CLI's optional version hint is
|
|
167
|
+
advisory and does not prove registry availability or update automatically.
|
|
168
|
+
See `https://brewsorted.com/downloads.html` for current installation guidance.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: brewsorted-cli
|
|
3
|
-
Version: 0.8.
|
|
3
|
+
Version: 0.8.6
|
|
4
4
|
Summary: Portable HTTP client for the BrewSorted API
|
|
5
5
|
Project-URL: Homepage, https://brewsorted.com
|
|
6
6
|
Project-URL: Documentation, https://brewsorted.com/downloads.html
|
|
@@ -11,26 +11,38 @@ Requires-Dist: PyJWT[crypto]<3,>=2.14
|
|
|
11
11
|
Provides-Extra: dev
|
|
12
12
|
Requires-Dist: pytest<10,>=8; extra == "dev"
|
|
13
13
|
|
|
14
|
-
# BrewSorted
|
|
14
|
+
# BrewSorted CLI installation
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
16
|
+
The CLI and complete matching User skill are distributed together through
|
|
17
|
+
[PyPI](https://pypi.org/project/brewsorted-cli/). The public qualified target is
|
|
18
|
+
Linux x86-64 with Python 3.12 or 3.13; Python 3.11 remains internal compatibility
|
|
19
|
+
coverage. Source and coordinated service/client versions remain in the private
|
|
20
|
+
monorepo.
|
|
21
|
+
|
|
22
|
+
## Select the production version
|
|
23
|
+
|
|
24
|
+
Read `https://brewsorted.com/api/capabilities` as JSON, require schema version 1,
|
|
25
|
+
and select its explicit `recommended_client_bundle_version` (`X.Y.Z`). Never
|
|
26
|
+
infer compatibility from PyPI's newest version. Before installing, inspect
|
|
27
|
+
`https://pypi.org/pypi/brewsorted-cli/X.Y.Z/json` for that exact version. Both
|
|
28
|
+
`brewsorted_cli-X.Y.Z-py3-none-any.whl` and `brewsorted_cli-X.Y.Z.tar.gz` must be
|
|
29
|
+
present with `yanked: false`. Missing, malformed, withdrawn or unavailable
|
|
30
|
+
metadata/files mean installation unavailable. Exact pins can still install
|
|
31
|
+
yanked files, so this check is required before invoking the installer.
|
|
32
|
+
|
|
33
|
+
Website archives and catalogs are retired. Historical service versions without
|
|
34
|
+
PyPI packages are not backfilled; recovery to one may have no fresh public CLI
|
|
35
|
+
installation path. Retained private immutable release assets are unchanged.
|
|
23
36
|
|
|
24
37
|
## PyPI installation
|
|
25
38
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
are packaged together; no private repository access is required.
|
|
39
|
+
The example below names this bundle's version. Use it only when it is the live
|
|
40
|
+
production recommendation and its exact PyPI release passes the checks above.
|
|
41
|
+
Install uv or pipx first if necessary; Python and ordinary package dependencies
|
|
42
|
+
are required. No private repository access is needed.
|
|
31
43
|
|
|
32
44
|
```bash
|
|
33
|
-
client_version=0.8.
|
|
45
|
+
client_version=0.8.6
|
|
34
46
|
uv tool install --python python3.12 "brewsorted-cli==$client_version"
|
|
35
47
|
# Alternative: pipx install --python python3.12 "brewsorted-cli==$client_version"
|
|
36
48
|
brewsorted skills install --destination "$HOME/.codex/skills/brewsorted"
|
|
@@ -65,45 +77,30 @@ uv tool install --python python3.12 "verified/brewsorted_cli-$client_version-py3
|
|
|
65
77
|
|
|
66
78
|
This verifies the CLI artifact's repository provenance, not every dependency or
|
|
67
79
|
a security audit. Establish the expected repository identity independently of a
|
|
68
|
-
disputed website. The
|
|
80
|
+
disputed website. The production capability recommendation selects the version;
|
|
81
|
+
PyPI metadata establishes whether that exact release is available and not yanked.
|
|
69
82
|
|
|
70
|
-
##
|
|
83
|
+
## Private release archives
|
|
71
84
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
85
|
+
Private immutable releases still retain their original client archives for
|
|
86
|
+
qualification and operator recovery evidence. They are not a public fallback.
|
|
87
|
+
An operator reinstall from an already verified private archive can use the
|
|
88
|
+
original `SHA256SUMS` before extracting it:
|
|
76
89
|
|
|
77
90
|
```bash
|
|
78
|
-
client_version
|
|
79
|
-
client_archive="brewsorted-client-${client_version}.tar.gz"
|
|
80
|
-
client_release_root="$HOME/.local/share/brewsorted/releases"
|
|
81
|
-
client_root="$client_release_root/brewsorted-client-${client_version}"
|
|
82
|
-
agent_skill_root="$HOME/.codex/skills"
|
|
91
|
+
client_root="brewsorted-client-${client_version}"
|
|
83
92
|
sha256sum --check SHA256SUMS || exit 1
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
tar -xzf "$client_archive" -C "$client_release_root"
|
|
93
|
+
test ! -e "$client_root" && test ! -L "$client_root" || exit 1
|
|
94
|
+
tar -xzf "brewsorted-client-${client_version}.tar.gz"
|
|
87
95
|
python3.13 -m venv "$client_root/.venv"
|
|
88
96
|
"$client_root/.venv/bin/python" -m pip install "$client_root"
|
|
89
|
-
|
|
90
|
-
ln -s "$client_root/skills/brewsorted" "$agent_skill_root/brewsorted"
|
|
97
|
+
"$client_root/.venv/bin/brewsorted" skills install --destination "$HOME/.codex/skills/brewsorted"
|
|
91
98
|
```
|
|
92
99
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
`https://brewsorted.com` for production or `https://staging.brewsorted.com`
|
|
98
|
-
for synthetic staging. Use a separate credential file for each origin.
|
|
99
|
-
Do not copy an old `~/.local/state/coffeetrack/auth.json` or other OAuth state
|
|
100
|
-
into the BrewSorted state directory. The new realm has a different issuer and
|
|
101
|
-
requires fresh User setup, browser sign-in, and Connection authorization.
|
|
102
|
-
|
|
103
|
-
Do not copy only `SKILL.md`: the retained link keeps `references/cli.md` and the
|
|
104
|
-
acceptance scenarios paired with the installed executable source. If the target
|
|
105
|
-
link already exists, inspect and remove or rename it deliberately before linking
|
|
106
|
-
the new archive; do not overwrite an unknown directory.
|
|
100
|
+
Follow the exact historical release's retained instructions when reconstructing
|
|
101
|
+
an old private environment. Do not rebuild or republish historical release bytes.
|
|
102
|
+
|
|
103
|
+
## Authorize separately
|
|
107
104
|
|
|
108
105
|
Create the OAuth state directory explicitly and keep it user-owned mode `0700`.
|
|
109
106
|
The credential file becomes mode `0600` when login succeeds:
|
|
@@ -113,17 +110,15 @@ brewsorted_state_root="$HOME/.local/state/brewsorted"
|
|
|
113
110
|
install -d -m 0700 "$brewsorted_state_root"
|
|
114
111
|
export BREWSORTED_STATE_FILE="$brewsorted_state_root/auth.json"
|
|
115
112
|
export BREWSORTED_API_URL=https://brewsorted.com
|
|
116
|
-
|
|
117
|
-
"$client_root/.venv/bin/brewsorted" status
|
|
113
|
+
brewsorted status
|
|
118
114
|
```
|
|
119
115
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
configured transient agent session; it does not transfer an old Connection.
|
|
116
|
+
Use a separate credential file for each exact service origin.
|
|
117
|
+
`BREWSORTED_ACCESS_TOKEN` is only for an explicitly configured transient agent session.
|
|
123
118
|
Configure the exact HTTPS service origin outside chat as described in the skill.
|
|
124
119
|
|
|
125
120
|
For a headless agent session, run
|
|
126
|
-
`
|
|
121
|
+
`brewsorted login --device` and keep that process
|
|
127
122
|
alive. Relay its exact verification URL and short code to the intended User, who
|
|
128
123
|
authorizes it in their own browser. The agent never asks for SSH access, a
|
|
129
124
|
password, access or refresh tokens, or a recovery link.
|
|
@@ -135,7 +130,7 @@ and keep it available for subsequent commands:
|
|
|
135
130
|
|
|
136
131
|
```bash
|
|
137
132
|
export HTTPS_PROXY=http://proxy.example:8080
|
|
138
|
-
|
|
133
|
+
brewsorted login --device
|
|
139
134
|
```
|
|
140
135
|
|
|
141
136
|
`HTTPS_PROXY` routes HTTPS service requests through the HTTP proxy; use
|
|
@@ -162,11 +157,12 @@ Treat each check as different evidence:
|
|
|
162
157
|
complete returned Qualified ID, update and read it again, then delete that
|
|
163
158
|
exact ID. This proves write/read-back separately from authentication.
|
|
164
159
|
|
|
165
|
-
For
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
160
|
+
For updates, downgrades or reinstallations, re-read the production recommendation
|
|
161
|
+
and check the exact PyPI release again. Deliberately replace the executable with
|
|
162
|
+
`uv tool install --force --python python3.12 "brewsorted-cli==$client_version"`
|
|
163
|
+
(or the equivalent pipx command), inspect and move the old skill directory, then
|
|
164
|
+
install the complete matching skill again. Do not overwrite unknown paths or
|
|
165
|
+
use a withdrawn release. An unavailable recommendation is a publication incident,
|
|
166
|
+
not permission to infer compatibility. The CLI's optional version hint is
|
|
167
|
+
advisory and does not prove registry availability or update automatically.
|
|
168
|
+
See `https://brewsorted.com/downloads.html` for current installation guidance.
|
|
@@ -101,9 +101,10 @@ echoing or probing a foreign identity.
|
|
|
101
101
|
confirms them. For an image the user supplies or confirms for a Roastery,
|
|
102
102
|
Coffee, Equipment item, Water profile, Drink type, or Brew method, convert it to
|
|
103
103
|
JPEG, PNG, or WebP when needed, run `brewsorted images upload PATH`, then
|
|
104
|
-
attach the returned `id` with the record's `--image-id`. For metadata
|
|
105
|
-
deletion, use the returned `user/id` image handle.
|
|
106
|
-
|
|
104
|
+
attach the returned `id` with the record's `--image-id`. For metadata,
|
|
105
|
+
download, or deletion, use the returned `user/id` image handle. Use
|
|
106
|
+
`brewsorted images download USERNAME/UUID PATH` to inspect a stored Coffee bag
|
|
107
|
+
photo for label details. Never invent or search for an image.
|
|
107
108
|
4. Run the smallest command that satisfies the request once and use its JSON
|
|
108
109
|
result. For coffee records, after a successful non-delete mutation, read the exact returned ID
|
|
109
110
|
with the documented `get` operation, or the documented retrieval command when
|
|
@@ -297,9 +297,15 @@ in an update. Brew methods support create, list, get, update, and delete; create
|
|
|
297
297
|
requires a unique nonblank name, while description and image are optional.
|
|
298
298
|
Resolve a requested method with `brew-methods list --q` and use its ID. Equipment
|
|
299
299
|
never selects a method, and a custom method does not imply Suggestion support.
|
|
300
|
-
`images get USERNAME/UUID`
|
|
301
|
-
|
|
302
|
-
|
|
300
|
+
`images get USERNAME/UUID` inspects metadata. `images delete USERNAME/UUID`
|
|
301
|
+
soft-deletes an image when no catalog record references it.
|
|
302
|
+
|
|
303
|
+
To inspect a stored Coffee bag photo, combine the Coffee's Username and
|
|
304
|
+
`image_id` as `USERNAME/UUID`, then run
|
|
305
|
+
`brewsorted images download USERNAME/UUID /path/to/bag.webp`. Open the path in
|
|
306
|
+
the JSON `path` field. The file contains the retained display WebP. Choose an
|
|
307
|
+
unused path in an existing directory to preserve existing files, since a
|
|
308
|
+
successful download replaces a file at that path.
|
|
303
309
|
|
|
304
310
|
Equipment types are fixed: `brewer`, `grinder`, `kettle`, `scale`, `server`,
|
|
305
311
|
`filter`, and `other`. Names are not unique. When a lookup has multiple plausible
|
|
@@ -15,7 +15,7 @@ from .http import http_client
|
|
|
15
15
|
ResponseKind = Literal[
|
|
16
16
|
"item", "image", "list", "system_list", "health", "comparison", "context", "preview",
|
|
17
17
|
"strategy_list", "suggestion", "suggestion_list", "attempt", "feedback",
|
|
18
|
-
"feedback_list", "capabilities",
|
|
18
|
+
"feedback_list", "capabilities", "webp",
|
|
19
19
|
]
|
|
20
20
|
|
|
21
21
|
QUALIFIED_ID = re.compile(r"^[a-z0-9][a-z0-9-]{1,30}[a-z0-9]/[1-9][0-9]*$")
|
|
@@ -460,9 +460,25 @@ class ApiClient:
|
|
|
460
460
|
raise InvalidServerResponse(status, "expected an empty body for HTTP 204")
|
|
461
461
|
return None
|
|
462
462
|
media_type = response.headers.get("content-type", "").split(";", 1)[0].strip().lower()
|
|
463
|
-
|
|
463
|
+
if response.is_error:
|
|
464
|
+
expected_media_type = "application/problem+json"
|
|
465
|
+
elif response_kind == "webp":
|
|
466
|
+
expected_media_type = "image/webp"
|
|
467
|
+
else:
|
|
468
|
+
expected_media_type = "application/json"
|
|
464
469
|
if media_type != expected_media_type:
|
|
465
470
|
raise InvalidServerResponse(status, f"expected Content-Type {expected_media_type}")
|
|
471
|
+
if expected_media_type == "image/webp":
|
|
472
|
+
content = response.content
|
|
473
|
+
# The RIFF size describes all bytes after the first eight.
|
|
474
|
+
if (
|
|
475
|
+
len(content) < 20
|
|
476
|
+
or content[:4] != b"RIFF"
|
|
477
|
+
or content[8:12] != b"WEBP"
|
|
478
|
+
or int.from_bytes(content[4:8], "little") != len(content) - 8
|
|
479
|
+
):
|
|
480
|
+
raise InvalidServerResponse(status, "expected a complete WebP response body")
|
|
481
|
+
return content
|
|
466
482
|
try:
|
|
467
483
|
payload = response.json(parse_constant=_reject_json_constant)
|
|
468
484
|
except ValueError as exc:
|
|
@@ -7,6 +7,7 @@ import os
|
|
|
7
7
|
import re
|
|
8
8
|
import sys
|
|
9
9
|
from pathlib import Path
|
|
10
|
+
from tempfile import NamedTemporaryFile
|
|
10
11
|
from typing import Any, Callable
|
|
11
12
|
from urllib.parse import urlsplit, urlunsplit
|
|
12
13
|
from uuid import UUID
|
|
@@ -83,6 +84,20 @@ def _image_handle(value: str) -> str:
|
|
|
83
84
|
return value
|
|
84
85
|
|
|
85
86
|
|
|
87
|
+
def _save_image(path: str, content: bytes) -> dict[str, str]:
|
|
88
|
+
temporary_path = None
|
|
89
|
+
try:
|
|
90
|
+
# Keep the temporary file on the destination filesystem for atomic replacement.
|
|
91
|
+
with NamedTemporaryFile(dir=Path(path).parent, prefix=".brewsorted-", delete=False) as output:
|
|
92
|
+
temporary_path = Path(output.name)
|
|
93
|
+
output.write(content)
|
|
94
|
+
os.replace(temporary_path, path)
|
|
95
|
+
finally:
|
|
96
|
+
if temporary_path is not None:
|
|
97
|
+
temporary_path.unlink(missing_ok=True)
|
|
98
|
+
return {"path": path}
|
|
99
|
+
|
|
100
|
+
|
|
86
101
|
def _web_origin(value: str | None) -> str | None:
|
|
87
102
|
if value is None:
|
|
88
103
|
return None
|
|
@@ -355,6 +370,9 @@ def build_parser() -> argparse.ArgumentParser:
|
|
|
355
370
|
upload.add_argument("path")
|
|
356
371
|
image_get = image_operations.add_parser("get")
|
|
357
372
|
image_get.add_argument("id", type=_image_handle)
|
|
373
|
+
download = image_operations.add_parser("download", help="save the retained display WebP")
|
|
374
|
+
download.add_argument("id", type=_image_handle, metavar="USERNAME/UUID")
|
|
375
|
+
download.add_argument("path", metavar="PATH", help="local destination, replaced on success")
|
|
358
376
|
image_delete = image_operations.add_parser("delete")
|
|
359
377
|
image_delete.add_argument("id", type=_image_handle)
|
|
360
378
|
|
|
@@ -597,6 +615,9 @@ def _dispatch(args: argparse.Namespace, client: ApiClient) -> Any:
|
|
|
597
615
|
return client.request(
|
|
598
616
|
"GET", f"/v1/images/{args.id}", response_kind="image"
|
|
599
617
|
)
|
|
618
|
+
if operation == "download":
|
|
619
|
+
content = client.request("GET", f"/v1/images/{args.id}/display", response_kind="webp")
|
|
620
|
+
return _save_image(args.path, content)
|
|
600
621
|
return client.request("DELETE", f"/v1/images/{args.id}")
|
|
601
622
|
if resource == "bag-adjustments":
|
|
602
623
|
if operation in {"create", "list"}:
|
|
@@ -715,7 +736,11 @@ def _dispatch(args: argparse.Namespace, client: ApiClient) -> Any:
|
|
|
715
736
|
|
|
716
737
|
|
|
717
738
|
def _write(value: Any, *, stream=None) -> None:
|
|
718
|
-
|
|
739
|
+
stream = stream or sys.stdout
|
|
740
|
+
try:
|
|
741
|
+
print(json.dumps(value, indent=2, ensure_ascii=False), file=stream)
|
|
742
|
+
except UnicodeEncodeError:
|
|
743
|
+
print(json.dumps(value, indent=2), file=stream)
|
|
719
744
|
|
|
720
745
|
|
|
721
746
|
def main(argv: list[str] | None = None, *, client: ApiClient | None = None) -> int:
|
|
@@ -183,6 +183,10 @@ class OAuthLogin:
|
|
|
183
183
|
self.progress(f"Visit {complete_url} and confirm code {code}")
|
|
184
184
|
else:
|
|
185
185
|
self.progress(f"Visit {verification_url} and enter code {code}")
|
|
186
|
+
self.progress(
|
|
187
|
+
f"On another device, open {verification_url} and enter code {code}. "
|
|
188
|
+
"Use the original verification link, not a URL copied after opening it."
|
|
189
|
+
)
|
|
186
190
|
deadline = time.monotonic() + lifetime
|
|
187
191
|
while time.monotonic() < deadline:
|
|
188
192
|
time.sleep(interval)
|
|
@@ -60,15 +60,15 @@ def test_state_file_modes_ownership_and_binding_are_checked(tmp_path):
|
|
|
60
60
|
selected.read()
|
|
61
61
|
|
|
62
62
|
|
|
63
|
-
def
|
|
64
|
-
|
|
63
|
+
def test_connection_from_another_realm_cannot_be_loaded_into_brewsorted_state():
|
|
64
|
+
other_issuer = f"{ORIGIN}/id/realms/other-service"
|
|
65
65
|
with pytest.raises(AuthStateError, match="issuer does not match"):
|
|
66
66
|
AuthBinding(
|
|
67
|
-
format_version=1, service_origin=ORIGIN, issuer=
|
|
68
|
-
subject="immutable-subject", username="person", audience="
|
|
69
|
-
client_id="
|
|
70
|
-
token_endpoint=f"{
|
|
71
|
-
revocation_endpoint=f"{
|
|
67
|
+
format_version=1, service_origin=ORIGIN, issuer=other_issuer,
|
|
68
|
+
subject="immutable-subject", username="person", audience="other-service-api",
|
|
69
|
+
client_id="other-service-cli",
|
|
70
|
+
token_endpoint=f"{other_issuer}/protocol/openid-connect/token",
|
|
71
|
+
revocation_endpoint=f"{other_issuer}/protocol/openid-connect/revoke",
|
|
72
72
|
access_token="old-access", refresh_token="old-refresh", expires_at=1,
|
|
73
73
|
)
|
|
74
74
|
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import json
|
|
2
|
+
from io import BytesIO, TextIOWrapper
|
|
2
3
|
from pathlib import Path
|
|
3
4
|
|
|
4
5
|
import httpx
|
|
6
|
+
import pytest
|
|
5
7
|
|
|
6
8
|
from brewsorted_cli import __version__
|
|
7
9
|
from brewsorted_cli.client import ApiClient
|
|
@@ -133,6 +135,120 @@ def test_image_upload_get_and_delete_use_multipart_and_uuid_responses(tmp_path,
|
|
|
133
135
|
]
|
|
134
136
|
|
|
135
137
|
|
|
138
|
+
IMAGE_HANDLE = "test-user/d9428888-122b-41e1-b85c-61cd3cbb3210"
|
|
139
|
+
# A lossless, 1×1 WebP.
|
|
140
|
+
DISPLAY_WEBP = (
|
|
141
|
+
b"RIFF\x1e\x00\x00\x00WEBPVP8L\x11\x00\x00\x00/\x00\x00\x00\x00"
|
|
142
|
+
b"\x07\xd0\xa0\n\x97\xa1\xff\x81\x88\xe8\x7f\x00\x00"
|
|
143
|
+
)
|
|
144
|
+
|
|
145
|
+
|
|
146
|
+
@pytest.mark.parametrize("existing", [False, True])
|
|
147
|
+
def test_image_download_saves_display_webp_and_reports_destination(tmp_path, capsys, existing):
|
|
148
|
+
destination = tmp_path / "coffee bag.webp"
|
|
149
|
+
if existing:
|
|
150
|
+
destination.write_bytes(b"previous file")
|
|
151
|
+
|
|
152
|
+
def handler(request):
|
|
153
|
+
assert request.method == "GET"
|
|
154
|
+
assert str(request.url) == f"https://coffee.example/api/v1/images/{IMAGE_HANDLE}/display"
|
|
155
|
+
assert request.headers["authorization"] == "Bearer header.payload.signature"
|
|
156
|
+
return httpx.Response(200, content=DISPLAY_WEBP, headers={"Content-Type": "image/webp"})
|
|
157
|
+
|
|
158
|
+
assert main(["images", "download", IMAGE_HANDLE, str(destination)], client=mock_client(handler)) == 0
|
|
159
|
+
output = capsys.readouterr()
|
|
160
|
+
assert json.loads(output.out) == {"path": str(destination)}
|
|
161
|
+
assert output.err == ""
|
|
162
|
+
assert destination.read_bytes() == DISPLAY_WEBP
|
|
163
|
+
assert list(tmp_path.iterdir()) == [destination]
|
|
164
|
+
|
|
165
|
+
|
|
166
|
+
def test_image_download_reports_unicode_path_on_ascii_stdout(tmp_path, monkeypatch):
|
|
167
|
+
destination = tmp_path / "café.webp"
|
|
168
|
+
|
|
169
|
+
def handler(request):
|
|
170
|
+
return httpx.Response(200, content=DISPLAY_WEBP, headers={"Content-Type": "image/webp"})
|
|
171
|
+
|
|
172
|
+
with TextIOWrapper(BytesIO(), encoding="ascii") as stdout, monkeypatch.context() as patch:
|
|
173
|
+
patch.setattr("sys.stdout", stdout)
|
|
174
|
+
assert main([
|
|
175
|
+
"images", "download", IMAGE_HANDLE, str(destination),
|
|
176
|
+
], client=mock_client(handler)) == 0
|
|
177
|
+
stdout.seek(0)
|
|
178
|
+
assert json.load(stdout) == {"path": str(destination)}
|
|
179
|
+
assert destination.read_bytes() == DISPLAY_WEBP
|
|
180
|
+
|
|
181
|
+
|
|
182
|
+
@pytest.mark.parametrize(("status", "code"), [(403, "capability_denied"), (404, "not_found")])
|
|
183
|
+
def test_image_download_preserves_json_api_errors(tmp_path, capsys, status, code):
|
|
184
|
+
destination = tmp_path / "bag.webp"
|
|
185
|
+
|
|
186
|
+
def handler(request):
|
|
187
|
+
return httpx.Response(status, json={
|
|
188
|
+
"type": "about:blank", "title": "Denied", "detail": "Private image details",
|
|
189
|
+
"status": status, "code": code,
|
|
190
|
+
}, headers={"Content-Type": "application/problem+json"})
|
|
191
|
+
|
|
192
|
+
assert main(["images", "download", IMAGE_HANDLE, str(destination)], client=mock_client(handler)) == 4
|
|
193
|
+
output = capsys.readouterr()
|
|
194
|
+
assert output.out == ""
|
|
195
|
+
problem = json.loads(output.err)
|
|
196
|
+
assert (problem["status"], problem["code"]) == (status, code)
|
|
197
|
+
assert "Private image details" not in output.err
|
|
198
|
+
assert list(tmp_path.iterdir()) == []
|
|
199
|
+
|
|
200
|
+
|
|
201
|
+
def test_image_download_cleans_up_when_destination_cannot_be_replaced(tmp_path, capsys):
|
|
202
|
+
destination = tmp_path / "bag.webp"
|
|
203
|
+
destination.mkdir()
|
|
204
|
+
|
|
205
|
+
def handler(request):
|
|
206
|
+
return httpx.Response(200, content=DISPLAY_WEBP, headers={"Content-Type": "image/webp"})
|
|
207
|
+
|
|
208
|
+
assert main(["images", "download", IMAGE_HANDLE, str(destination)], client=mock_client(handler)) == 2
|
|
209
|
+
output = capsys.readouterr()
|
|
210
|
+
assert output.out == ""
|
|
211
|
+
assert json.loads(output.err)["code"] == "cli_input_error"
|
|
212
|
+
assert destination.is_dir()
|
|
213
|
+
assert list(tmp_path.iterdir()) == [destination]
|
|
214
|
+
|
|
215
|
+
|
|
216
|
+
@pytest.mark.parametrize(("media_type", "content"), [
|
|
217
|
+
("application/json", b'{}'),
|
|
218
|
+
("image/webp", DISPLAY_WEBP[:-1]),
|
|
219
|
+
])
|
|
220
|
+
def test_image_download_rejects_invalid_rendition(tmp_path, capsys, media_type, content):
|
|
221
|
+
destination = tmp_path / "bag.webp"
|
|
222
|
+
destination.write_bytes(b"previous file")
|
|
223
|
+
|
|
224
|
+
def handler(request):
|
|
225
|
+
return httpx.Response(200, content=content, headers={"Content-Type": media_type})
|
|
226
|
+
|
|
227
|
+
assert main(["images", "download", IMAGE_HANDLE, str(destination)], client=mock_client(handler)) == 6
|
|
228
|
+
output = capsys.readouterr()
|
|
229
|
+
assert output.out == ""
|
|
230
|
+
assert json.loads(output.err)["code"] == "invalid_server_response"
|
|
231
|
+
assert destination.read_bytes() == b"previous file"
|
|
232
|
+
|
|
233
|
+
|
|
234
|
+
def test_image_download_leaves_no_file_if_connection_drops(tmp_path, capsys):
|
|
235
|
+
destination = tmp_path / "bag.webp"
|
|
236
|
+
|
|
237
|
+
class InterruptedResponse(httpx.SyncByteStream):
|
|
238
|
+
def __iter__(self):
|
|
239
|
+
yield DISPLAY_WEBP[:20]
|
|
240
|
+
raise httpx.ReadError("connection dropped")
|
|
241
|
+
|
|
242
|
+
def handler(request):
|
|
243
|
+
return httpx.Response(200, stream=InterruptedResponse(), headers={"Content-Type": "image/webp"})
|
|
244
|
+
|
|
245
|
+
assert main(["images", "download", IMAGE_HANDLE, str(destination)], client=mock_client(handler)) == 3
|
|
246
|
+
output = capsys.readouterr()
|
|
247
|
+
assert output.out == ""
|
|
248
|
+
assert json.loads(output.err)["code"] == "backend_unavailable"
|
|
249
|
+
assert list(tmp_path.iterdir()) == []
|
|
250
|
+
|
|
251
|
+
|
|
136
252
|
def test_setup_catalogs_attach_images_and_brew_methods_can_clear_them(capsys, tmp_path):
|
|
137
253
|
image_id = "11111111-1111-4111-8111-111111111111"
|
|
138
254
|
requests = []
|
|
@@ -104,8 +104,11 @@ def test_device_login_requires_api_user_verification_before_saving(tmp_path, mon
|
|
|
104
104
|
assert result == {"service_origin": ORIGIN, "username": "person", "connected": "yes"}
|
|
105
105
|
assert state.read().subject == "subject-one"
|
|
106
106
|
assert state.read().refresh_token == "rotating-secret"
|
|
107
|
-
assert len(progress) ==
|
|
108
|
-
assert "private-device-code" not in progress
|
|
107
|
+
assert len(progress) == 2 and "ABCD-EFGH" in progress[0]
|
|
108
|
+
assert all("private-device-code" not in message for message in progress)
|
|
109
|
+
assert f"{ISSUER}/device" in progress[1]
|
|
110
|
+
assert "enter code ABCD-EFGH" in progress[1]
|
|
111
|
+
assert "URL copied after opening" in progress[1]
|
|
109
112
|
if complete:
|
|
110
113
|
assert f"{ISSUER}/device?user_code=ABCD-EFGH" in progress[0]
|
|
111
114
|
assert calls[-1] == ("GET", f"{ORIGIN}/api/v1/auth/me")
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{brewsorted_cli-0.8.4 → brewsorted_cli-0.8.6}/skills/brewsorted/tests/acceptance_scenarios.json
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|