Skip to content

Commit a5f0fca

Browse files
pre-commit-ci[bot]danielhanchen
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent b86dfd6 commit a5f0fca

2 files changed

Lines changed: 40 additions & 13 deletions

File tree

studio/backend/core/inference/llama_cpp.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2045,6 +2045,8 @@ def _preempt_ram_disabled_in(args) -> bool:
20452045
elif tok.startswith("--preempt-ram="):
20462046
disabled = tok.split("=", 1)[1].strip() == "0"
20472047
return disabled
2048+
2049+
20482050
# Cap tool calls from a single TEXTUAL-fallback turn (mirrors the safetensors
20492051
# loop). Structured delta.tool_calls are grammar-bounded by llama-server; text
20502052
# parsed from content is not, so one runaway turn could fan out unbounded.
@@ -6741,7 +6743,6 @@ def _server_park_grace(self) -> bool:
67416743
"""
67426744
try:
67436745
from core.inference.llama_stats import scrape_llama_metrics
6744-
67456746
metrics = scrape_llama_metrics(self.base_url, timeout_s = 3.0)
67466747
except Exception:
67476748
return False
@@ -6763,9 +6764,7 @@ def _server_park_event(line: str, preempt_policy = None) -> Optional[dict]:
67636764
parked = line == _SERVER_PARKED_COMMENT
67646765
if not parked and line != _SERVER_RESUMED_COMMENT:
67656766
return None
6766-
hook = getattr(
6767-
preempt_policy, "on_server_parked" if parked else "on_server_resumed", None
6768-
)
6767+
hook = getattr(preempt_policy, "on_server_parked" if parked else "on_server_resumed", None)
67696768
if hook is not None:
67706769
try:
67716770
hook()

studio/backend/tests/test_server_side_preemption_handoff.py

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,11 @@ def test_an_upstream_build_reports_it_absent(self, monkeypatch, tmp_path):
142142
# ------------------------------------------------------------------------ the controller
143143

144144

145-
def _fill(controller, n = 4, tokens = 2000):
145+
def _fill(
146+
controller,
147+
n = 4,
148+
tokens = 2000,
149+
):
146150
"""Register `n` decoding chats. No sweep runs here: `register` never plans, so the
147151
caller sees the first decision itself."""
148152
signals = []
@@ -157,7 +161,11 @@ class TestController:
157161
def test_server_mode_chooses_nobody_and_holds_nothing_back(self):
158162
controller = get_preemption_controller("server")
159163
controller.configure(
160-
budget = 8192, kv_unified = True, draft_tokens = 2, slots = 4, batch_tokens = 2048,
164+
budget = 8192,
165+
kv_unified = True,
166+
draft_tokens = 2,
167+
slots = 4,
168+
batch_tokens = 2048,
161169
server_mode = True,
162170
)
163171
assert controller.server_mode is True
@@ -175,7 +183,11 @@ def test_server_mode_chooses_nobody_and_holds_nothing_back(self):
175183
def test_studio_mode_is_unchanged(self):
176184
controller = get_preemption_controller("studio")
177185
controller.configure(
178-
budget = 8192, kv_unified = True, draft_tokens = 2, slots = 4, batch_tokens = 2048,
186+
budget = 8192,
187+
kv_unified = True,
188+
draft_tokens = 2,
189+
slots = 4,
190+
batch_tokens = 2048,
179191
server_mode = False,
180192
)
181193
signals = _fill(controller, n = 4, tokens = 2400)
@@ -227,7 +239,9 @@ def test_the_policy_marks_a_server_park_and_resume(self):
227239

228240

229241
def _delta(content: str) -> str:
230-
return "data: " + json.dumps({"choices": [{"index": 0, "delta": {"content": content}}]}) + "\n\n"
242+
return (
243+
"data: " + json.dumps({"choices": [{"index": 0, "delta": {"content": content}}]}) + "\n\n"
244+
)
231245

232246

233247
def _finish(reason: str = "stop") -> str:
@@ -273,7 +287,14 @@ def __init__(self, monkeypatch, chunks, *, server_preempts):
273287
recorder = self
274288

275289
@contextlib.contextmanager
276-
def fake_stream_with_retry(_client, _url, payload, _cancel_event, headers = None, **_kw):
290+
def fake_stream_with_retry(
291+
_client,
292+
_url,
293+
payload,
294+
_cancel_event,
295+
headers = None,
296+
**_kw,
297+
):
277298
recorder.payloads.append(copy.deepcopy(payload))
278299
yield _FakeResponse(chunks)
279300

@@ -346,9 +367,10 @@ def test_the_pause_is_shown_and_the_text_is_untouched(self, monkeypatch):
346367
text, marks = _client_view(events)
347368
assert text == "Once upon a time"
348369
assert marks == [("paused", len("Once upon")), ("resumed", len("Once upon"))]
349-
assert policy.events == ["server-parked", "server-resumed"], (
350-
"the ledger is told, and the Studio-side pause handshake never runs"
351-
)
370+
assert policy.events == [
371+
"server-parked",
372+
"server-resumed",
373+
], "the ledger is told, and the Studio-side pause handshake never runs"
352374
assert len(recorder.payloads) == 1, "nothing was re-opened: the server resumed in place"
353375

354376
def test_a_policy_without_the_hooks_is_fine(self, monkeypatch):
@@ -379,7 +401,13 @@ def test_an_upstream_stream_without_comments_is_bytewise_todays(self, monkeypatc
379401
assert marks == []
380402

381403
def test_a_park_before_the_first_token_is_shown_too(self, monkeypatch):
382-
script = [": preempted\n\n", ": resumed\n\n", _delta("Hello"), _finish(), "data: [DONE]\n\n"]
404+
script = [
405+
": preempted\n\n",
406+
": resumed\n\n",
407+
_delta("Hello"),
408+
_finish(),
409+
"data: [DONE]\n\n",
410+
]
383411
recorder = _Recorder(monkeypatch, script, server_preempts = True)
384412
events = list(
385413
recorder.backend.generate_chat_completion(

0 commit comments

Comments
 (0)