Repository navigation
Consolidate unmerged branches: F-34 Qiskit worker, IDE API 1.5.0; fix CI - #25
Merged
Merged
Conversation
qiskit 2.6.2 / qiskit-aer 0.18.2 / Python 3.14: a second simulation started from a new thread segfaults the process in qiskit._accelerate (ThreadingHTTPServer opens one thread per request). compile, slice/run, organism/run, files/run and dnalang/info, plus the compile step of assist, now run on osiris_cli.qiskit_worker: one thread, at most OSIRIS_QISKIT_MAX_PENDING (default 4) admitted calls, 503 SIMULATOR_BUSY beyond that, admitted runs never cancelled (their receipts are written), shutdown waits for them. tests/test_qiskit_worker.py: unit tests plus live runs through the real server and Aer: sequential, concurrent with per-request result/receipt association, overload, failure then success, client timeout then next request, subprocess restart with one valid chain. The restart test fails on fe35c91 (service drops the connection) and passes here. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # osiris_cli/ide_api.py
- POST /api/v1/files/rename: revision-guarded path change (same owner policy and trigger as
save; id, project and content unchanged, so receipts still resolve). Stale base revision is
CONFLICT, a taken path is EDITOR_PATH_EXISTS, another account gets 404. No migration change.
- tests/fixtures/aura_ghz_proposal_2026-11-16.json: the GHZ change AURA (gemma3:4b) proposed in
the notebook acceptance run, recovered verbatim from the stored revision 3, with its receipt.
It compiles and runs and is not GHZ (H on all three qubits -> uniform). tests/test_ghz_fixtures.py
checks an ideal GHZ fixture against the {000,111} support with an explicit 5-sigma binomial
bound and checks that the recorded proposal fails it. Fixture-specific; not a product check.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Replaces the unbounded _QISKIT_THREAD executor that came in with 618aa0a. notebook_run stays on the worker; test_qiskit_operations_share_one_worker_thread now uses ide_api.qiskit_worker(). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Brings the last two commits on feat/agent-council that were not on main: the long-lived Qiskit/Aer worker thread with a bounded backlog, and its merge into the agent-council line, which replaced the unbounded _QISKIT_THREAD executor from 618aa0a. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
osiris_cli/edge_ipc_client.py (a74cf58) imports cryptography at module level, so tests/test_edge_bridge_ipc.py fails to collect and every test job on main has failed since the 04:28Z push. cryptography is not declared in pyproject.toml; this only makes CI install it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ide_api.default_backend imports github_gateway, which needs osiris_governance. CI does not install it, so this test failed on every Python version once the cryptography fix let the suite collect. The guard is inside this one test, so the file's other two tests still run on CI. This matches tests/test_ide_api.py and the other modules that importorskip the governance package. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This brings the last work that existed only on local branches onto
main, so those branches can be deleted without losing anything. It also fixes the two CI failures onmain.503 SIMULATOR_BUSYinstead of waiting without limit. This replaces the unbounded_QISKIT_THREADexecutor.feat/agent-council36f7d838, merged inf9c36e38POST /api/v1/files/renameand the GHZ correctness fixturesclaude/notebook66e0643fcryptography.osiris_cli/edge_ipc_client.py(a74cf58f) imports it, sotests/test_edge_bridge_ipc.pycould not be collected. Every test job onmainhas failed since the 04:28Z push.38c6f6bftest_ide_api_accepts_x_osiris_token_x_session_token_and_bearer_authwhenosiris_governanceis not installed. This failure was already onmain, hidden behind the collection error, and appeared once the suite could collect. The guard is inside this one test, so the file's other two tests still run on CI. It matches theimportorskippattern used intests/test_ide_api.py.0a2186f4The net change against
mainis 12 files. Every line this removes is replaced by new code: the API version bump, and the executor swapped for the worker. No feature onmainis dropped.Branches already on
main(no merge needed)sprint1.1/operator-key-authority:git cherryshows its two commits,92ba55baand61144e1e, are already onmainas92bf5945and6164b231. The branch's three files are identical tomain's.Verification
pytest tests/ phase2/on this branch gave 2,259 passed, 26 skipped, 0 failed. This ran locally on Python 3.14, with no IBM credentials in the environment./metareports 1.5.0.dnalang/compileandslice/runwork on the GHZ fixture, on local Aer.503 SIMULATOR_BUSYfrom the bounded backlog.files/renameanswers with a structured error when no user session is configured.test_contracts_and_s26_cartographer.py: 3 passed locally. Withosiris_governanceblocked, as on CI, 2 passed and 1 skipped.Not changed
Follow-up
cryptographyis still not declared inpyproject.toml. A clean install of the package fails when anything importsosiris_cli.edge_ipc_client.🤖 Generated with Claude Code