netconverter-cli 0.7.1__tar.gz → 0.7.3__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.
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/CHANGELOG.md +12 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/PKG-INFO +2 -2
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/README.md +1 -1
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/COMMANDS.md +4 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/VERIFICATION.md +17 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/pyproject.toml +1 -1
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/__init__.py +1 -1
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/api.py +22 -1
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/backend.py +12 -1
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/clerk.py +63 -16
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/mcp_server.py +21 -2
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/remote_mcp.py +17 -2
- netconverter_cli-0.7.3/tests/test_clerk_recovery_issue_11.py +350 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_download_analysis.py +46 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_mcp.py +16 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/.gitignore +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/LICENSE +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/QUICK_START.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/SECURITY.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/PRIVACY.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/RELEASING.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/README.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/chatgpt.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/claude-ai.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/claude-code.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/claude-desktop.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/compatibility.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/getting-access.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/openclaw.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/connect/other-assistants.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/docs/guided-workflows.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/examples/README.md +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/activity.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/branding.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/catalog.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/cli.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/commands.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/connect.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/connect_openclaw.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/controller.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/credential_file.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/credentials.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/design_catalog.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/diagrams.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/draft_cli.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/draft_io.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/drafts.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/errors.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/exposure.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/guided.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/guided_operations.json +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/guided_projects.json +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/job_options.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/license.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/mcp_client_features.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/mcp_workflows.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/one_shot.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/palette.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/presentation.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/privacy.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/privacy_apply.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/privacy_cli.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/project_cli.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/projects.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/providers.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/setup.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/summary.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/tui.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/update.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/walkthrough.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/windows_draft_io.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/src/netconverter_cli/workspace.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/conftest.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/fixtures/jobs/opt_4056e02e5b66.json +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/fixtures/jobs/tra_4058ef406cd6.json +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/fixtures/jobs/tra_running.json +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/fixtures/jobs/val_9f9acb9b5a59.json +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/fixtures/jobs/val_9f9acb9b5a59.sarif +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_autodetect_v5.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_boundaries.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_bridge_polish_021.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_clerk.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_clerk_host_binding.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_cli_020.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_connect_030.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_connect_031.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_connect_compat_014.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_connect_direct_entry.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_connect_openclaw_014.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_credential_file_010.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_diagrams.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_draft_cli.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_draft_io.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_draft_jobs.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_drafts.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_errors_009.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_exposure_levels_013.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_folders_cd_ls.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_guided_full_api_019.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_guided_mapping_012.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_guided_prescan_037.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_help_008.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_inline.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_keyring_bus_017.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_keyring_timeout_010.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_license.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_mcp_auth_016.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_mcp_features_020.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_mcp_jobs.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_mcp_workflows.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_options_011_019.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_polish_028.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_presentation.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_privacy_apply_013.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_privacy_cli_013.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_projects.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_protocols.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_readonly_workspace.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_sessions.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_setup.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_signin_default.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_stage_029.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_strict_default_011.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_strict_view_015.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_summary_007.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_update.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_vendor_error_022.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_walkthrough.py +0 -0
- {netconverter_cli-0.7.1 → netconverter_cli-0.7.3}/tests/test_windows_draft_io.py +0 -0
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.7.3 — 2026-11-03
|
|
4
|
+
|
|
5
|
+
- Recover an expired Clerk sign-in in the running MCP bridge after a separate `netconverter login --clerk`, without restarting the assistant.
|
|
6
|
+
- Keep REST and remote MCP on the same credential, clear previous-login session/view/confirmation caches, and preserve a newer login when an older refresh or logout finishes.
|
|
7
|
+
- Refuse rejected credentials left behind by a failed store deletion; preserve bounded refresh and trusted-host restrictions.
|
|
8
|
+
|
|
9
|
+
## 0.7.2 — 2026-11-02
|
|
10
|
+
|
|
11
|
+
- Validation downloads include canonical NCIR, receipt JSON, TXT, PDF and XLSX from the governed export API, alongside the summary JSON.
|
|
12
|
+
- Verify server content hashes before atomic workspace writes. Authorization and integrity failures remain explicit; only missing artifacts use the historical fallback.
|
|
13
|
+
- Preserve the existing governed diagram discovery, downloads and native previews.
|
|
14
|
+
|
|
3
15
|
## 0.7.1 — 2026-11-02
|
|
4
16
|
|
|
5
17
|
- Proxy governed `get_diagram` discovery for selected jobs in full and strict views.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: netconverter-cli
|
|
3
|
-
Version: 0.7.
|
|
3
|
+
Version: 0.7.3
|
|
4
4
|
Summary: NetConverter CLI — any-vendor network configuration migration, validation and optimization, and a local MCP bridge for your AI assistant
|
|
5
5
|
Project-URL: Homepage, https://netconverter.ai
|
|
6
6
|
Project-URL: Repository, https://github.com/valeronlabs/netconverter_terminals
|
|
@@ -42,7 +42,7 @@ Description-Content-Type: text/markdown
|
|
|
42
42
|
NetConverter — by ValeronLabs LLC.
|
|
43
43
|
|
|
44
44
|
```text
|
|
45
|
-
◆ NetConverter v0.7.
|
|
45
|
+
◆ NetConverter v0.7.3 ● Server ◆ Bridge claude-code · 2m ago
|
|
46
46
|
▍ Start
|
|
47
47
|
▍ /convert Migrate a configuration to another vendor
|
|
48
48
|
▍ /validate Check a configuration before migrating
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
NetConverter — by ValeronLabs LLC.
|
|
8
8
|
|
|
9
9
|
```text
|
|
10
|
-
◆ NetConverter v0.7.
|
|
10
|
+
◆ NetConverter v0.7.3 ● Server ◆ Bridge claude-code · 2m ago
|
|
11
11
|
▍ Start
|
|
12
12
|
▍ /convert Migrate a configuration to another vendor
|
|
13
13
|
▍ /validate Check a configuration before migrating
|
|
@@ -352,3 +352,7 @@ file is reported as a missing file, never as "not signed in".
|
|
|
352
352
|
Use the server job ID and client version when asking for help. Do not attach
|
|
353
353
|
real configurations, credentials, object names, addresses, or unredacted reports
|
|
354
354
|
to public issues. Redacted reproductions with synthetic data are preferred.
|
|
355
|
+
|
|
356
|
+
### Re-login while the MCP bridge is running
|
|
357
|
+
|
|
358
|
+
From 0.7.3, after an expired Clerk login, run `netconverter login --clerk` in a terminal. The running bridge reads the replacement from the same credential store on its next call; REST and remote tools keep using Clerk. Cached session, view and confirmation state is discarded, so an earlier confirmation token must be requested again. If the store is locked, unlock it and retry. Older installed bridges need one reconnect after upgrading to load the new code.
|
|
@@ -2,6 +2,23 @@
|
|
|
2
2
|
|
|
3
3
|
Updated for client 0.1.5, October 1, 2026.
|
|
4
4
|
|
|
5
|
+
## 0.7.3 Clerk recovery candidate
|
|
6
|
+
|
|
7
|
+
The complete client suite passed: **875 passed, 24 skipped**. Seventeen synthetic
|
|
8
|
+
recovery cases include a persistent newline-delimited MCP server, external saved-login
|
|
9
|
+
replacement, remote session/view reset, stale confirmation refusal, failed deletion,
|
|
10
|
+
logout and locked-store recovery. The focused authentication suite passed 84 tests;
|
|
11
|
+
the frozen 0.7.2 implementation failed 14 of the 17 regression cases.
|
|
12
|
+
|
|
13
|
+
The built 0.7.3 wheel was installed in an isolated macOS environment. A genuine MCP
|
|
14
|
+
SDK client negotiated protocol 2025-11-25 and successfully read the authenticated
|
|
15
|
+
account and paginated evidence for an existing synthetic job. No configuration was
|
|
16
|
+
uploaded and no real credential was expired or revoked. This proves installed-wheel
|
|
17
|
+
read compatibility; expired-session recovery itself is tested with synthetic stores
|
|
18
|
+
and transports. Windows and other assistant UI acceptance are not newly claimed.
|
|
19
|
+
|
|
20
|
+
Release publication remains separate from this candidate verification.
|
|
21
|
+
|
|
5
22
|
## 0.3.0 status: pending
|
|
6
23
|
|
|
7
24
|
Not verified for 0.3.0. The client suite passes with mocked servers and a mocked
|
|
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "netconverter-cli"
|
|
7
|
-
version = "0.7.
|
|
7
|
+
version = "0.7.3"
|
|
8
8
|
description = "NetConverter CLI — any-vendor network configuration migration, validation and optimization, and a local MCP bridge for your AI assistant"
|
|
9
9
|
readme = "README.md"
|
|
10
10
|
license = "LicenseRef-NetConverter-Proprietary"
|
|
@@ -225,7 +225,7 @@ class ExternalClient(Client):
|
|
|
225
225
|
"""
|
|
226
226
|
|
|
227
227
|
_ALLOWED = re.compile(
|
|
228
|
-
r"(?:me|capabilities|jobs|jobs/[A-Za-z0-9_-]{1,80}(?:/translated|/report|/evidence\.xlsx|/findings\.sarif|/diagrams/render)?)\Z"
|
|
228
|
+
r"(?:me|capabilities|jobs|jobs/[A-Za-z0-9_-]{1,80}(?:/translated|/report|/evidence\.xlsx|/findings\.sarif|/diagrams/render|/validation/(?:ncir|receipt|txt|pdf|xlsx))?)\Z"
|
|
229
229
|
)
|
|
230
230
|
|
|
231
231
|
def me(self):
|
|
@@ -250,6 +250,27 @@ class ExternalClient(Client):
|
|
|
250
250
|
raise self._error(response, request_id)
|
|
251
251
|
return response.content
|
|
252
252
|
|
|
253
|
+
def validation_artifact(self, job_id: str, format: str) -> tuple[bytes, str] | None:
|
|
254
|
+
"""Recorded source artifacts; the server hash is verified before any write.
|
|
255
|
+
|
|
256
|
+
A 404 means an old server/job has no artifact. Integrity failures (409)
|
|
257
|
+
and authorization refusals propagate, rather than silently disappearing.
|
|
258
|
+
"""
|
|
259
|
+
import hashlib
|
|
260
|
+
if format not in {"ncir", "receipt", "txt", "pdf", "xlsx"}:
|
|
261
|
+
raise ValueError("Unsupported validation artifact format")
|
|
262
|
+
response, request_id = self._send(
|
|
263
|
+
"GET", f"jobs/{self.identifier(job_id)}/validation/{format}"
|
|
264
|
+
)
|
|
265
|
+
if response.status_code == 404:
|
|
266
|
+
return None
|
|
267
|
+
if response.is_error:
|
|
268
|
+
raise self._error(response, request_id)
|
|
269
|
+
expected = response.headers.get("X-Content-SHA256", "")
|
|
270
|
+
if not re.fullmatch(r"[0-9a-f]{64}", expected) or hashlib.sha256(response.content).hexdigest() != expected:
|
|
271
|
+
raise APIError(502, "artifact_checksum_mismatch", request_id)
|
|
272
|
+
return response.content, expected
|
|
273
|
+
|
|
253
274
|
def findings(self, job_id: str):
|
|
254
275
|
"""Every finding of a completed validate/optimize job (SARIF 2.1.0 JSON)."""
|
|
255
276
|
response, request_id = self._send("GET", f"jobs/{self.identifier(job_id)}/findings.sarif")
|
|
@@ -85,6 +85,7 @@ def download_external(client, job_id: str, output) -> list:
|
|
|
85
85
|
|
|
86
86
|
A validate or optimize job emits no translation: GET /jobs/{id} carries its
|
|
87
87
|
result, saved as ``<job>.validation.json`` / ``<job>.optimization.json``.
|
|
88
|
+
Validation also downloads available NCIR, receipt, TXT, PDF and XLSX exports.
|
|
88
89
|
"""
|
|
89
90
|
saved = []
|
|
90
91
|
job = client.job(job_id)
|
|
@@ -96,7 +97,17 @@ def download_external(client, job_id: str, output) -> list:
|
|
|
96
97
|
saved.append(_save_json(output, job_id, f"{key}.json", {
|
|
97
98
|
"job_id": job_id, "job_type": job["job_type"], "status": job.get("status"),
|
|
98
99
|
"source_vendor": job.get("source_vendor"), key: result}))
|
|
99
|
-
|
|
100
|
+
workbook_saved = False
|
|
101
|
+
if key == "validation":
|
|
102
|
+
for fmt, filename in (("ncir", "source.ncir"), ("receipt", "receipt.json"),
|
|
103
|
+
("txt", "validation.txt"), ("pdf", "validation.pdf"),
|
|
104
|
+
("xlsx", "validation.xlsx")):
|
|
105
|
+
artifact = client.validation_artifact(job_id, fmt)
|
|
106
|
+
if artifact is not None:
|
|
107
|
+
content, expected = artifact
|
|
108
|
+
saved.append(output.save_artifact(job_id, filename, content, expected))
|
|
109
|
+
workbook_saved |= fmt == "xlsx"
|
|
110
|
+
workbook = None if workbook_saved else client.evidence_workbook(job_id)
|
|
100
111
|
if workbook:
|
|
101
112
|
saved.append(output.save_artifact(job_id, "evidence.xlsx", workbook,
|
|
102
113
|
hashlib.sha256(workbook).hexdigest()))
|
|
@@ -25,7 +25,7 @@ from urllib.parse import parse_qs, urlencode, urlsplit
|
|
|
25
25
|
|
|
26
26
|
import httpx
|
|
27
27
|
|
|
28
|
-
from .credentials import CredentialStoreError, delete_secret, load_secret, prepare_store, save_secret
|
|
28
|
+
from .credentials import CredentialStoreError, KeyringLocked, delete_secret, load_secret, prepare_store, save_secret
|
|
29
29
|
from .errors import SIGNED_OUT
|
|
30
30
|
|
|
31
31
|
ISSUER = "https://clerk.netconverter.ai"
|
|
@@ -481,6 +481,8 @@ class ClerkSession:
|
|
|
481
481
|
self._transport = transport
|
|
482
482
|
self._clock = clock
|
|
483
483
|
self._tokens = self.store.load()
|
|
484
|
+
self._invalidated_fingerprint: str | None = None
|
|
485
|
+
self._session_generation = 0
|
|
484
486
|
self._discovery: Discovery | None = None
|
|
485
487
|
self._lock = threading.Lock()
|
|
486
488
|
|
|
@@ -493,8 +495,35 @@ class ClerkSession:
|
|
|
493
495
|
self._discovery = discover(http, self.issuer)
|
|
494
496
|
return self._discovery
|
|
495
497
|
|
|
498
|
+
@staticmethod
|
|
499
|
+
def _fingerprint(tokens: TokenSet) -> str:
|
|
500
|
+
# Keep only a digest of rejected credentials, not another token copy.
|
|
501
|
+
value = json.dumps([tokens.access_token, tokens.refresh_token])
|
|
502
|
+
return hashlib.sha256(value.encode()).hexdigest()
|
|
503
|
+
|
|
504
|
+
def _reload_locked(self) -> bool:
|
|
505
|
+
"""Recover a later login from this session's existing issuer-bound store."""
|
|
506
|
+
if self._tokens is not None:
|
|
507
|
+
return False
|
|
508
|
+
try:
|
|
509
|
+
saved = self.store.load()
|
|
510
|
+
except (CredentialStoreError, KeyringLocked):
|
|
511
|
+
raise ClerkError("Could not read your NetConverter sign-in; unlock the credential store and retry") from None
|
|
512
|
+
if saved is None or self._fingerprint(saved) == self._invalidated_fingerprint:
|
|
513
|
+
return False
|
|
514
|
+
self._tokens = saved
|
|
515
|
+
self._session_generation += 1
|
|
516
|
+
return True
|
|
517
|
+
|
|
518
|
+
def session_generation(self) -> int:
|
|
519
|
+
"""Reload a later login and identify caches belonging to an older login."""
|
|
520
|
+
with self._lock:
|
|
521
|
+
self._reload_locked()
|
|
522
|
+
return self._session_generation
|
|
523
|
+
|
|
496
524
|
def token(self) -> str:
|
|
497
525
|
with self._lock:
|
|
526
|
+
self._reload_locked()
|
|
498
527
|
if self._tokens is None:
|
|
499
528
|
raise ClerkError(SIGNED_OUT)
|
|
500
529
|
if self._tokens.expired(self._clock()) and self._tokens.refresh_token:
|
|
@@ -503,6 +532,10 @@ class ClerkSession:
|
|
|
503
532
|
|
|
504
533
|
def refresh(self) -> bool:
|
|
505
534
|
with self._lock:
|
|
535
|
+
# A new login already replaced the refused token; don't immediately
|
|
536
|
+
# exchange its refresh token in response to the old request's 401.
|
|
537
|
+
if self._reload_locked() and not self._tokens.expired(self._clock()):
|
|
538
|
+
return True
|
|
506
539
|
if self._tokens is None or not self._tokens.refresh_token:
|
|
507
540
|
return False
|
|
508
541
|
try:
|
|
@@ -517,8 +550,14 @@ class ClerkSession:
|
|
|
517
550
|
tokens = refresh_tokens(http, self._disc(http), self._tokens.refresh_token)
|
|
518
551
|
except OAuthError as exc:
|
|
519
552
|
if exc.error in {"invalid_grant", "invalid_token", "unauthorized_client"}:
|
|
520
|
-
self.
|
|
553
|
+
self._invalidated_fingerprint = self._fingerprint(self._tokens)
|
|
521
554
|
self._tokens = None
|
|
555
|
+
self._session_generation += 1
|
|
556
|
+
# A separate login may have finished while refresh was in
|
|
557
|
+
# flight. Its replacement must not be cleared by this failure.
|
|
558
|
+
saved = self.store.load()
|
|
559
|
+
if saved is not None and self._fingerprint(saved) == self._invalidated_fingerprint:
|
|
560
|
+
self.store.clear()
|
|
522
561
|
raise ClerkError(
|
|
523
562
|
"Your NetConverter sign-in expired; run `netconverter login --clerk`"
|
|
524
563
|
) from None
|
|
@@ -547,20 +586,28 @@ class ClerkSession:
|
|
|
547
586
|
return {}
|
|
548
587
|
|
|
549
588
|
def revoke_and_clear(self) -> bool:
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
589
|
+
with self._lock:
|
|
590
|
+
self._reload_locked()
|
|
591
|
+
tokens, self._tokens = self._tokens, None
|
|
592
|
+
if tokens:
|
|
593
|
+
self._invalidated_fingerprint = self._fingerprint(tokens)
|
|
594
|
+
self._session_generation += 1
|
|
595
|
+
if tokens:
|
|
596
|
+
try:
|
|
597
|
+
with _http(self._transport) as http:
|
|
598
|
+
disc = self._disc(http)
|
|
599
|
+
if disc.revocation_endpoint:
|
|
600
|
+
for value, hint in ((tokens.refresh_token, "refresh_token"),
|
|
601
|
+
(tokens.access_token, "access_token")):
|
|
602
|
+
if value:
|
|
603
|
+
http.post(disc.revocation_endpoint, data={
|
|
604
|
+
"token": value, "token_type_hint": hint, "client_id": CLIENT_ID})
|
|
605
|
+
except (httpx.HTTPError, ClerkError):
|
|
606
|
+
pass # local removal below is what logout guarantees
|
|
607
|
+
saved = self.store.load()
|
|
608
|
+
if tokens and saved and self._fingerprint(saved) != self._fingerprint(tokens):
|
|
609
|
+
return True # a later login is not the session being revoked
|
|
610
|
+
return self.store.clear()
|
|
564
611
|
|
|
565
612
|
|
|
566
613
|
UNNAMED_ORG = "(unnamed organization)"
|
|
@@ -27,7 +27,7 @@ from pathlib import Path
|
|
|
27
27
|
from . import __version__, activity, update
|
|
28
28
|
from .api import APIError, Client, ExternalClient
|
|
29
29
|
from .backend import EXTERNAL_MAX_BYTES, detect_profile, download_external, submit_external
|
|
30
|
-
from .clerk import ClerkError
|
|
30
|
+
from .clerk import ClerkError, ClerkSession
|
|
31
31
|
from .controller import fetch_artifacts
|
|
32
32
|
from .credentials import keyring_problem
|
|
33
33
|
from . import errors, job_options, mcp_workflows
|
|
@@ -465,6 +465,7 @@ class Bridge:
|
|
|
465
465
|
self._draft_service = draft_service
|
|
466
466
|
self.server = server
|
|
467
467
|
self.rest_credential = rest_credential
|
|
468
|
+
self._credential_generation = 0
|
|
468
469
|
self.remote = remote
|
|
469
470
|
self._server_view: str | None = None # the server's view mode for this session, once known
|
|
470
471
|
self._view_warned = False
|
|
@@ -489,6 +490,16 @@ class Bridge:
|
|
|
489
490
|
# -- REST clients ------------------------------------------------------
|
|
490
491
|
|
|
491
492
|
def _reload_credential(self) -> None:
|
|
493
|
+
if isinstance(self.rest_credential, ClerkSession):
|
|
494
|
+
generation = self.rest_credential.session_generation()
|
|
495
|
+
if generation != self._credential_generation:
|
|
496
|
+
self._credential_generation = generation
|
|
497
|
+
self._profile, self._server_view = None, None
|
|
498
|
+
self._view_warned = False
|
|
499
|
+
self._remote_names.clear()
|
|
500
|
+
self._confirm_tokens.clear()
|
|
501
|
+
if isinstance(self.remote, RemoteMCP):
|
|
502
|
+
self.remote.sync_login()
|
|
492
503
|
if self.rest_credential is not None or self._credential_loader is None:
|
|
493
504
|
return
|
|
494
505
|
try:
|
|
@@ -506,9 +517,9 @@ class Bridge:
|
|
|
506
517
|
|
|
507
518
|
def profile(self) -> tuple[str, frozenset]:
|
|
508
519
|
"""('external', job types) for full API credentials, ('quick', ...) for terminal keys."""
|
|
520
|
+
self._reload_credential()
|
|
509
521
|
if self._profile:
|
|
510
522
|
return self._profile
|
|
511
|
-
self._reload_credential()
|
|
512
523
|
if self.rest_credential is None:
|
|
513
524
|
self._client(ExternalClient) # raises not_signed_in
|
|
514
525
|
try:
|
|
@@ -1119,6 +1130,10 @@ class Bridge:
|
|
|
1119
1130
|
"text": json.dumps(payload, sort_keys=True)}]}
|
|
1120
1131
|
|
|
1121
1132
|
def list_tools(self) -> list[dict]:
|
|
1133
|
+
try:
|
|
1134
|
+
self._reload_credential()
|
|
1135
|
+
except (ClerkError, RemoteError):
|
|
1136
|
+
return [json.loads(json.dumps(tool)) for tool in LOCAL_TOOLS]
|
|
1122
1137
|
if self.guided:
|
|
1123
1138
|
return mcp_workflows.tools_for(self._guided_request("capabilities", {}))
|
|
1124
1139
|
tools = [json.loads(json.dumps(tool)) for tool in LOCAL_TOOLS]
|
|
@@ -1153,6 +1168,10 @@ class Bridge:
|
|
|
1153
1168
|
return tools
|
|
1154
1169
|
|
|
1155
1170
|
def call(self, name: str, arguments: dict) -> dict:
|
|
1171
|
+
try:
|
|
1172
|
+
self._reload_credential()
|
|
1173
|
+
except (ClerkError, RemoteError) as exc:
|
|
1174
|
+
return _error_result("not_signed_in", str(exc))
|
|
1156
1175
|
if self.guided:
|
|
1157
1176
|
return self._guided_call(name, arguments)
|
|
1158
1177
|
if name in LOCAL_NAMES:
|
|
@@ -12,7 +12,7 @@ import json
|
|
|
12
12
|
import httpx
|
|
13
13
|
|
|
14
14
|
from .api import BearerAuth, as_credential, check_url
|
|
15
|
-
from .clerk import ClerkError
|
|
15
|
+
from .clerk import ClerkError, ClerkSession
|
|
16
16
|
|
|
17
17
|
DEFAULT_MCP_URL = "https://api.netconverter.ai/mcp/v1/"
|
|
18
18
|
CLIENT_PROTOCOL = "2025-06-18"
|
|
@@ -45,9 +45,11 @@ class RemoteMCP:
|
|
|
45
45
|
self.view_mode = view_mode # requested on every request (#15, #13); the server decides
|
|
46
46
|
self._account_view: str | None = None
|
|
47
47
|
self.view_details: dict = {} # get_account's view fields, once known
|
|
48
|
+
self.credential = as_credential(credential)
|
|
49
|
+
self._credential_generation = 0
|
|
48
50
|
self.http = httpx.Client(
|
|
49
51
|
timeout=90,
|
|
50
|
-
auth=BearerAuth(
|
|
52
|
+
auth=BearerAuth(self.credential),
|
|
51
53
|
transport=transport,
|
|
52
54
|
follow_redirects=False,
|
|
53
55
|
trust_env=False,
|
|
@@ -61,6 +63,17 @@ class RemoteMCP:
|
|
|
61
63
|
def close(self):
|
|
62
64
|
self.http.close()
|
|
63
65
|
|
|
66
|
+
def sync_login(self):
|
|
67
|
+
if isinstance(self.credential, ClerkSession):
|
|
68
|
+
try:
|
|
69
|
+
generation = self.credential.session_generation()
|
|
70
|
+
except ClerkError as exc:
|
|
71
|
+
raise RemoteError("unauthorized", str(exc)) from None
|
|
72
|
+
if generation != self._credential_generation:
|
|
73
|
+
self._credential_generation = generation
|
|
74
|
+
self.session_id, self.protocol, self._initialized = None, None, False
|
|
75
|
+
self._account_view, self.view_details = None, {}
|
|
76
|
+
|
|
64
77
|
# -- transport ---------------------------------------------------------
|
|
65
78
|
|
|
66
79
|
def _headers(self) -> dict:
|
|
@@ -164,6 +177,7 @@ class RemoteMCP:
|
|
|
164
177
|
self._initialized = True
|
|
165
178
|
|
|
166
179
|
def rpc(self, method: str, params: dict | None = None) -> dict:
|
|
180
|
+
self.sync_login()
|
|
167
181
|
if not self._initialized:
|
|
168
182
|
self._initialize()
|
|
169
183
|
try:
|
|
@@ -194,6 +208,7 @@ class RemoteMCP:
|
|
|
194
208
|
|
|
195
209
|
None when the server does not say (an older server, a refused call).
|
|
196
210
|
"""
|
|
211
|
+
self.sync_login()
|
|
197
212
|
if self._account_view is None:
|
|
198
213
|
payload = self.call_tool("get_account", {})
|
|
199
214
|
self._account_view = _view_mode_of(payload) or ""
|