dheraingoud Copilot App commited on
Commit
844b7df
·
1 Parent(s): a9e27c0

Normalize inline system turns from Claude Code 2.1.317

Browse files

Move supported Claude Code system turns into the top-level Anthropic system field while retaining rejection for older clients.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

src/free_claude_code/api/inline_system_turns.py CHANGED
@@ -3,6 +3,8 @@ from __future__ import annotations
3
 
4
  import re
5
  from collections.abc import Mapping
 
 
6
 
7
  from free_claude_code.application.errors import InvalidRequestError
8
 
@@ -11,6 +13,51 @@ _CLAUDE_CODE_VERSION = re.compile(r"\bclaude-cli/(\d+(?:\.\d+)+)")
11
  MID_CONVERSATION_SYSTEM_NOT_SUPPORTED = "mid_conversation_system_not_supported"
12
 
13
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
14
  def reject_inline_system_turns(
15
  body: Mapping[str, object], headers: Mapping[str, str] | None
16
  ) -> None:
 
3
 
4
  import re
5
  from collections.abc import Mapping
6
+ from copy import deepcopy
7
+ from typing import Any
8
 
9
  from free_claude_code.application.errors import InvalidRequestError
10
 
 
13
  MID_CONVERSATION_SYSTEM_NOT_SUPPORTED = "mid_conversation_system_not_supported"
14
 
15
 
16
+ def normalize_supported_inline_system_turns(
17
+ body: Mapping[str, object], headers: Mapping[str, str] | None
18
+ ) -> dict[str, Any] | None:
19
+ """Move inline system turns to ``system`` for newer Claude Code clients."""
20
+ messages = body.get("messages")
21
+ if not isinstance(messages, list):
22
+ return None
23
+ user_agent = headers.get("user-agent", "") if headers is not None else ""
24
+ match = _CLAUDE_CODE_VERSION.search(user_agent)
25
+ if match is None or _version_tuple(match.group(1)) < (2, 1, 317):
26
+ return None
27
+ inline = [
28
+ message
29
+ for message in messages
30
+ if isinstance(message, Mapping) and message.get("role") == "system"
31
+ ]
32
+ if not inline:
33
+ return None
34
+ normalized = deepcopy(dict(body))
35
+ normalized["messages"] = [
36
+ message
37
+ for message in messages
38
+ if not (isinstance(message, Mapping) and message.get("role") == "system")
39
+ ]
40
+ system_parts: list[dict[str, Any]] = []
41
+ existing = normalized.get("system")
42
+ if isinstance(existing, str):
43
+ system_parts.append({"type": "text", "text": existing})
44
+ elif isinstance(existing, list):
45
+ system_parts.extend(deepcopy(existing))
46
+ for message in inline:
47
+ content = message.get("content")
48
+ if isinstance(content, str):
49
+ system_parts.append({"type": "text", "text": content})
50
+ elif isinstance(content, list):
51
+ system_parts.extend(deepcopy(content))
52
+ if system_parts:
53
+ normalized["system"] = system_parts
54
+ return normalized
55
+
56
+
57
+ def _version_tuple(version: str) -> tuple[int, ...]:
58
+ return tuple(int(part) for part in version.split("."))
59
+
60
+
61
  def reject_inline_system_turns(
62
  body: Mapping[str, object], headers: Mapping[str, str] | None
63
  ) -> None:
src/free_claude_code/api/routes.py CHANGED
@@ -43,7 +43,10 @@ from .dependencies import (
43
  from .handlers import MessagesHandler, ResponsesHandler, TokenCountHandler
44
  from .handlers.chat import ChatHandler
45
  from .handlers.gemini import GeminiHandler
46
- from .inline_system_turns import reject_inline_system_turns
 
 
 
47
  from .model_catalog import (
48
  ModelCatalogView,
49
  ModelsListResponse,
@@ -205,6 +208,12 @@ async def _create_messages_response(
205
  raise InvalidRequestError(str(error)) from error
206
  else:
207
  if not isinstance(request_data, MessagesRequest):
 
 
 
 
 
 
208
  reject_inline_system_turns(raw, request_headers)
209
  try:
210
  request_data = MessagesRequest.model_validate(raw)
@@ -358,8 +367,14 @@ async def count_tokens(
358
  validate_messages_json(request_data)
359
  counted = NativeTokenCountRequest.model_validate(request_data)
360
  else:
361
- reject_inline_system_turns(request_data, request.headers)
362
- counted = TokenCountRequest.model_validate(request_data)
 
 
 
 
 
 
363
  except NativeMessagesError as error:
364
  raise InvalidRequestError(str(error)) from error
365
  except ValidationError as error:
 
43
  from .handlers import MessagesHandler, ResponsesHandler, TokenCountHandler
44
  from .handlers.chat import ChatHandler
45
  from .handlers.gemini import GeminiHandler
46
+ from .inline_system_turns import (
47
+ normalize_supported_inline_system_turns,
48
+ reject_inline_system_turns,
49
+ )
50
  from .model_catalog import (
51
  ModelCatalogView,
52
  ModelsListResponse,
 
208
  raise InvalidRequestError(str(error)) from error
209
  else:
210
  if not isinstance(request_data, MessagesRequest):
211
+ normalized = normalize_supported_inline_system_turns(
212
+ raw, request_headers
213
+ )
214
+ if normalized is not None:
215
+ raw = normalized
216
+ request_data = raw
217
  reject_inline_system_turns(raw, request_headers)
218
  try:
219
  request_data = MessagesRequest.model_validate(raw)
 
367
  validate_messages_json(request_data)
368
  counted = NativeTokenCountRequest.model_validate(request_data)
369
  else:
370
+ normalized = normalize_supported_inline_system_turns(
371
+ request_data, request.headers
372
+ )
373
+ if normalized is None:
374
+ reject_inline_system_turns(request_data, request.headers)
375
+ counted = TokenCountRequest.model_validate(
376
+ normalized if normalized is not None else request_data
377
+ )
378
  except NativeMessagesError as error:
379
  raise InvalidRequestError(str(error)) from error
380
  except ValidationError as error:
tests/api/test_api.py CHANGED
@@ -412,6 +412,30 @@ def test_system_role_rejection_names_the_claude_code_version(client: TestClient)
412
  assert _stream_messages_calls == []
413
 
414
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
415
  def test_count_tokens_rejects_system_role_messages_with_update_hint(
416
  client: TestClient,
417
  ):
 
412
  assert _stream_messages_calls == []
413
 
414
 
415
+ def test_new_claude_code_normalizes_inline_system_turns(client: TestClient):
416
+ _stream_messages_calls.clear()
417
+ response = client.post(
418
+ "/v1/messages",
419
+ headers={"User-Agent": "claude-cli/2.1.317 (external, cli)"},
420
+ json={
421
+ "model": "claude-3-sonnet",
422
+ "messages": [
423
+ {"role": "user", "content": "Hi"},
424
+ {"role": "system", "content": "reminder"},
425
+ {"role": "user", "content": "again"},
426
+ ],
427
+ "max_tokens": 100,
428
+ "stream": True,
429
+ },
430
+ )
431
+
432
+ assert response.status_code == 200
433
+ assert len(_stream_messages_calls) == 1
434
+ request = _stream_messages_calls[0][0][0]
435
+ assert request.system == [{"type": "text", "text": "reminder"}]
436
+ assert [message.role for message in request.messages] == ["user", "user"]
437
+
438
+
439
  def test_count_tokens_rejects_system_role_messages_with_update_hint(
440
  client: TestClient,
441
  ):