Flow (v3-final corrected):
1. Model call succeeds.
2. Server passes the AI reply through unchanged as 'markdown' (the
system prompt allows ```language fences + a brief explanation, so
the response is real markdown that marked can render into code
blocks, headings, etc.).
3. Client OpenCodeCellActions._handleResponse calls prompt.setOutput(
resp.markdown); the inline prompt widget renders it with
marked.parse and shows it in a new output area (hidden until a
response arrives). The cell source is NOT replaced.
4. User can close the output or cancel the whole prompt.
Server:
- New unified system prompt: '你是代码助手 ... 按指令修改代码,可附简
短说明' (allows ```fences``` + explanation; no more 'no markdown
fences' restriction).
- EditHandler returns {ok, markdown, sessionId, notebookPath} (raw
text, fences intact). _strip_code_fence kept as a helper for any
future apply-to-cell path; no longer called.
- finalSource field dropped (the cell-apply path is gone).
Client:
- OpenCodeSuccess: markdown: string (finalSource removed).
- OpenCodeInlinePrompt: new output area, setOutput(md) renders via
marked.parse, hideOutput() closes it.
- OpenCodeCellActions._handleResponse: setOutput(markdown) instead of
sharedModel.setSource + auto-hide. The prompt stays open so the
user can read the output.
- Uses marked@17 (already in node_modules via JupyterLab; no new dep).
- CSS: output area styling (border, max-height 320px scroll, code/pre
styling, close button).
Tests: pytest 34/34, jest 29/29. marked is mocked in jest.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
200 lines
6.6 KiB
Python
200 lines
6.6 KiB
Python
import json
|
|
|
|
|
|
class FakeOpenCodeClient:
|
|
"""Drop-in replacement for OpenCodeClient with recording + canned responses."""
|
|
|
|
def __init__(self):
|
|
self.calls = []
|
|
self.session_id = "fake-session-123"
|
|
self.health_response = {"healthy": True, "version": "0.1.0"}
|
|
self.providers_response = {"providers": [{"id": "anthropic", "models": [{"id": "claude"}]}]}
|
|
self.message_response = {
|
|
"info": {"id": "msg-1"},
|
|
"parts": [{"type": "text", "text": "def foo():\n return 42\n"}],
|
|
}
|
|
|
|
@property
|
|
def endpoint(self):
|
|
return "http://fake-opencode"
|
|
|
|
async def health(self):
|
|
self.calls.append(("health",))
|
|
return self.health_response
|
|
|
|
async def list_providers(self):
|
|
self.calls.append(("list_providers",))
|
|
return self.providers_response
|
|
|
|
async def create_session(self, title):
|
|
self.calls.append(("create_session", title))
|
|
return {"id": self.session_id, "title": title}
|
|
|
|
async def send_message_sync(self, session_id, parts, provider_id=None, model_id=None, system=None):
|
|
self.calls.append(("send_message_sync", session_id, parts, system))
|
|
return self.message_response
|
|
|
|
async def delete_session(self, session_id):
|
|
self.calls.append(("delete_session", session_id))
|
|
return True
|
|
|
|
|
|
class FakeSessionManager:
|
|
"""Drop-in replacement for SessionManager with recording."""
|
|
|
|
def __init__(self, session_id: str = "fake-session-123") -> None:
|
|
self._session_id = session_id
|
|
self.calls: list = []
|
|
|
|
async def get_or_create(self, notebook_path: str) -> str:
|
|
self.calls.append(("get_or_create", notebook_path))
|
|
return self._session_id
|
|
|
|
async def release(self, notebook_path: str) -> bool:
|
|
self.calls.append(("release", notebook_path))
|
|
return True
|
|
|
|
def list_sessions(self) -> list:
|
|
return [
|
|
{"notebookPath": path, "sessionId": sid}
|
|
for path, sid in sorted(self._sessions.items())
|
|
]
|
|
|
|
def invalidate(self, notebook_path: str) -> bool:
|
|
self.calls.append(("invalidate", notebook_path))
|
|
return True
|
|
|
|
|
|
async def test_hello(jp_fetch):
|
|
# When
|
|
response = await jp_fetch("opencode-bridge", "hello")
|
|
|
|
# Then
|
|
assert response.code == 200
|
|
payload = json.loads(response.body)
|
|
assert payload == {
|
|
"data": (
|
|
"Hello, world!"
|
|
" This is the '/opencode-bridge/hello' endpoint."
|
|
" Try visiting me in your browser!"
|
|
),
|
|
}
|
|
|
|
|
|
async def test_health_handler(monkeypatch, jp_fetch):
|
|
fake = FakeOpenCodeClient()
|
|
monkeypatch.setattr("opencode_bridge.routes.make_client", lambda h: fake)
|
|
|
|
response = await jp_fetch("opencode-bridge", "health")
|
|
assert response.code == 200
|
|
payload = json.loads(response.body)
|
|
assert payload["ok"] is True
|
|
assert payload["version"] == "0.1.0"
|
|
assert ("health",) in fake.calls
|
|
|
|
|
|
async def test_providers_handler(monkeypatch, jp_fetch):
|
|
fake = FakeOpenCodeClient()
|
|
monkeypatch.setattr("opencode_bridge.routes.make_client", lambda h: fake)
|
|
|
|
response = await jp_fetch("opencode-bridge", "providers")
|
|
assert response.code == 200
|
|
payload = json.loads(response.body)
|
|
assert "providers" in payload
|
|
assert payload["providers"][0]["id"] == "anthropic"
|
|
assert ("list_providers",) in fake.calls
|
|
|
|
|
|
async def test_edit_handler(monkeypatch, jp_fetch):
|
|
fake = FakeOpenCodeClient()
|
|
monkeypatch.setattr("opencode_bridge.routes.make_client", lambda h: fake)
|
|
|
|
fake_sm = FakeSessionManager(session_id="fake-session-123")
|
|
monkeypatch.setattr(
|
|
"opencode_bridge.routes.get_session_manager", lambda h: fake_sm
|
|
)
|
|
|
|
body = json.dumps({
|
|
"prompt": "Add type hints",
|
|
"context": {
|
|
"notebookPath": "test.ipynb",
|
|
"cellId": "cell-1",
|
|
"language": "python",
|
|
"cellIndex": 0,
|
|
"totalCells": 1,
|
|
"source": "def foo(): return 42\n",
|
|
"previousCode": None,
|
|
"error": None,
|
|
},
|
|
})
|
|
response = await jp_fetch(
|
|
"opencode-bridge", "edit",
|
|
method="POST",
|
|
body=body,
|
|
)
|
|
assert response.code == 200
|
|
payload = json.loads(response.body)
|
|
assert payload["ok"] is True
|
|
# Server now returns the AI reply as raw markdown (```fences``` kept
|
|
# so the frontend marked.parse renders code blocks).
|
|
assert payload["markdown"] == "def foo():\n return 42"
|
|
assert payload["sessionId"] == "fake-session-123"
|
|
assert payload["notebookPath"] == "test.ipynb"
|
|
|
|
# Session manager was used, not direct create/delete on client
|
|
call_names = [c[0] for c in fake.calls]
|
|
assert "create_session" not in call_names
|
|
assert "delete_session" not in call_names
|
|
assert "send_message_sync" in call_names
|
|
|
|
# send_message_sync received the session ID from the manager
|
|
send_call = [c for c in fake.calls if c[0] == "send_message_sync"][0]
|
|
assert send_call[1] == "fake-session-123"
|
|
# system prompt was passed (v3+ allows markdown/fences in the reply)
|
|
assert "你是一个代码助手" in send_call[3]
|
|
|
|
# SessionManager.get_or_create was called with the notebook path
|
|
sm_call_names = [c[0] for c in fake_sm.calls]
|
|
assert sm_call_names == ["get_or_create"]
|
|
assert fake_sm.calls[0][1] == "test.ipynb"
|
|
|
|
|
|
async def test_session_list_handler(monkeypatch, jp_fetch):
|
|
fake_sm = FakeSessionManager()
|
|
fake_sm._sessions = {
|
|
"foo.ipynb": "sid-1",
|
|
"bar.ipynb": "sid-2",
|
|
} # direct injection
|
|
monkeypatch.setattr(
|
|
"opencode_bridge.routes.get_session_manager", lambda h: fake_sm
|
|
)
|
|
|
|
response = await jp_fetch("opencode-bridge", "sessions")
|
|
assert response.code == 200
|
|
payload = json.loads(response.body)
|
|
assert "sessions" in payload
|
|
paths = {s["notebookPath"] for s in payload["sessions"]}
|
|
assert paths == {"foo.ipynb", "bar.ipynb"}
|
|
|
|
|
|
async def test_session_release_handler(monkeypatch, jp_fetch):
|
|
fake = FakeOpenCodeClient()
|
|
monkeypatch.setattr("opencode_bridge.routes.make_client", lambda h: fake)
|
|
|
|
fake_sm = FakeSessionManager()
|
|
monkeypatch.setattr(
|
|
"opencode_bridge.routes.get_session_manager", lambda h: fake_sm
|
|
)
|
|
|
|
response = await jp_fetch(
|
|
"opencode-bridge", "session",
|
|
method="DELETE",
|
|
params={"notebook": "foo.ipynb"},
|
|
)
|
|
assert response.code == 200
|
|
payload = json.loads(response.body)
|
|
assert payload["ok"] is True
|
|
assert payload["notebookPath"] == "foo.ipynb"
|
|
assert payload["deleted"] is True
|
|
assert ("release", "foo.ipynb") in fake_sm.calls
|