codex-chat-bot 0.1.2__tar.gz → 0.1.3__tar.gz

{codex_chat_bot-0.1.2 → codex_chat_bot-0.1.3}/.gitignore

@@ -7,6 +7,8 @@ __pycache__/
 .ruff_cache/
 .tox/
 .nox/
+*.json
+tmp/
 
 # Virtual environments
 .venv/

{codex_chat_bot-0.1.2 → codex_chat_bot-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-chat-bot
-Version: 0.1.2
+Version: 0.1.3
 Summary: A small single-session chat client for OpenAI-compatible Responses API endpoints.
 Author-email: GGN_2015 <neko@jlulug.org>
 Requires-Python: >=3.10

{codex_chat_bot-0.1.2 → codex_chat_bot-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "codex-chat-bot"
-version = "0.1.2"
+version = "0.1.3"
 description = "A small single-session chat client for OpenAI-compatible Responses API endpoints."
 readme = "README.md"
 authors = [

{codex_chat_bot-0.1.2 → codex_chat_bot-0.1.3}/src/codex_chat_bot/session.py

@@ -15,6 +15,8 @@ SYSTEM_USERNAME = "system"
 DEVELOPER_USERNAME = "developer"
 DEFAULT_USERNAME = "user"
 ASSISTANT_USERNAME = "assistant"
+MAX_EMPTY_RESPONSE_ATTEMPTS = 5
+MAX_REQUEST_HISTORY_MESSAGES = 30
 
 
 @dataclass(frozen=True)
@@ -136,22 +138,33 @@ class ChatSession:
 
         self._messages.append(Message(role="user", content=message, username=username))
         try:
-            response = self._client.responses.create(**self._request_payload(extra_request_args))
+            response, text = self._create_response_until_text(extra_request_args)
         except Exception:
             self._messages.pop()
             self._save_bound_history()
             raise
 
-        text = _extract_response_text(response)
         self._messages.append(Message(role="assistant", content=text, username=ASSISTANT_USERNAME))
         self._trim_history()
         self._save_bound_history()
         return ChatResponse(text=text, raw=response, messages=self.messages)
 
+    def _create_response_until_text(self, extra_request_args: Mapping[str, Any]) -> tuple[Any, str]:
+        response: Any = None
+        text = ""
+
+        for _ in range(MAX_EMPTY_RESPONSE_ATTEMPTS):
+            response = self._client.responses.create(**self._request_payload(extra_request_args))
+            text = _extract_response_text(response)
+            if text.strip():
+                break
+
+        return response, text if text.strip() else ""
+
     def _request_payload(self, extra_request_args: Mapping[str, Any]) -> dict[str, Any]:
         payload: dict[str, Any] = {
             "model": self.config.model,
-            "input": [message.to_api() for message in self._messages],
+            "input": [message.to_api() for message in _latest_messages(self._messages, MAX_REQUEST_HISTORY_MESSAGES)],
         }
         if self.config.temperature is not None:
             payload["temperature"] = self.config.temperature
@@ -256,6 +269,21 @@ def _messages_from_history_payload(payload: Any) -> tuple[Message, ...]:
     return tuple(messages)
 
 
+def _latest_messages(messages: Sequence[Message], max_messages: int) -> tuple[Message, ...]:
+    if max_messages <= 0:
+        return tuple(messages)
+
+    prefix: list[Message] = []
+    rest = list(messages)
+    while rest and rest[0].role in {"system", "developer"}:
+        prefix.append(rest[0])
+        rest = rest[1:]
+
+    if len(rest) > max_messages:
+        rest = rest[-max_messages:]
+    return tuple(prefix + rest)
+
+
 def normalize_username(username: str) -> str:
     username = str(username).strip()
     if not username:

{codex_chat_bot-0.1.2 → codex_chat_bot-0.1.3}/tests/test_session.py

@@ -24,12 +24,33 @@ class FakeClient:
         self.responses = FakeResponses()
 
 
+class ScriptedResponses:
+    def __init__(self, output_texts):
+        self.output_texts = list(output_texts)
+        self.calls = []
+
+    def create(self, **kwargs):
+        self.calls.append(kwargs)
+        return SimpleNamespace(output_text=self.output_texts.pop(0))
+
+
+class ScriptedClient:
+    def __init__(self, output_texts):
+        self.responses = ScriptedResponses(output_texts)
+
+
 def make_session(**config_overrides):
     config = ChatConfig(api_key="test-key", base_url="https://api.example/v1", model="test-model", **config_overrides)
     client = FakeClient()
     return ChatSession(config=config, client=client), client
 
 
+def make_scripted_session(output_texts, **config_overrides):
+    config = ChatConfig(api_key="test-key", base_url="https://api.example/v1", model="test-model", **config_overrides)
+    client = ScriptedClient(output_texts)
+    return ChatSession(config=config, client=client), client
+
+
 def test_session_sends_full_single_session_history():
     session, client = make_session(system_rules=("Follow the test.",))
 
@@ -67,6 +88,50 @@ def test_session_sends_usernames_as_model_visible_user_context():
     )
 
 
+def test_session_retries_empty_model_text_until_non_empty():
+    session, client = make_scripted_session(["", " \n\t ", "answer: hello"], system_rules=("Follow the test.",))
+
+    response = session.send("hello")
+
+    assert response.text == "answer: hello"
+    assert response.raw.output_text == "answer: hello"
+    assert len(client.responses.calls) == 3
+    assert [call["input"] for call in client.responses.calls] == [
+        [
+            {"role": "system", "content": "Follow the test."},
+            {"role": "user", "content": "Message from user:\nhello"},
+        ],
+        [
+            {"role": "system", "content": "Follow the test."},
+            {"role": "user", "content": "Message from user:\nhello"},
+        ],
+        [
+            {"role": "system", "content": "Follow the test."},
+            {"role": "user", "content": "Message from user:\nhello"},
+        ],
+    ]
+    assert session.messages == (
+        Message(role="system", content="Follow the test.", username="system"),
+        Message(role="user", content="hello", username="user"),
+        Message(role="assistant", content="answer: hello", username="assistant"),
+    )
+
+
+def test_session_returns_empty_string_after_five_empty_model_texts():
+    session, client = make_scripted_session(["", " ", "\n", "\t", "\r\n"], system_rules=("Follow the test.",))
+
+    response = session.send("hello")
+
+    assert response.text == ""
+    assert response.raw.output_text == "\r\n"
+    assert len(client.responses.calls) == 5
+    assert session.messages == (
+        Message(role="system", content="Follow the test.", username="system"),
+        Message(role="user", content="hello", username="user"),
+        Message(role="assistant", content="", username="assistant"),
+    )
+
+
 def test_session_adds_system_rules_to_system_message():
     session, client = make_session(
         system_rules=("Follow the test.", "Answer in English.", "Keep answers short."),
@@ -112,6 +177,26 @@ def test_history_limit_keeps_latest_non_system_messages():
     )
 
 
+def test_request_payload_keeps_only_latest_thirty_history_messages():
+    session, client = make_session(system_rules=("ignored",))
+    history_messages = [{"role": "system", "content": "Persisted system."}]
+    history_messages.extend(
+        {"role": "user" if index % 2 == 0 else "assistant", "content": f"message {index}"}
+        for index in range(40)
+    )
+    session.load_history_json(json.dumps({"messages": history_messages}))
+
+    session.ask("new")
+
+    request_input = client.responses.calls[0]["input"]
+    assert len(request_input) == 31
+    assert request_input[0] == {"role": "system", "content": "Persisted system."}
+    assert request_input[1] == {"role": "assistant", "content": "message 11"}
+    assert request_input[-2] == {"role": "assistant", "content": "message 39"}
+    assert request_input[-1] == {"role": "user", "content": "Message from user:\nnew"}
+    assert session.messages[1] == Message(role="user", content="message 0", username="user")
+
+
 def test_session_exports_and_imports_history_json():
     session, _ = make_session(system_rules=("Follow the test.",))