VocabMaster 0.3.0__tar.gz → 0.3.2__tar.gz

{vocabmaster-0.3.0 → vocabmaster-0.3.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: VocabMaster
-Version: 0.3.0
+Version: 0.3.2
 Summary: Master new languages with this CLI tool, designed to help you record vocabulary and create Anki flashcards without the need to manually input translations or example sentences.
 Author: Sébastien De Revière
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/sderev/vocabmaster
 Project-URL: Repository, https://github.com/sderev/vocabmaster
 Project-URL: Issues, https://github.com/sderev/vocabmaster/issues
@@ -11,7 +11,6 @@ Keywords: vocabulary,language-learning,anki,flashcards,cli,openai,gpt
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: End Users/Desktop
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -24,9 +23,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click~=8.3
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: openai<2.0,>=1.66.0
+Requires-Dist: openai<3.0,>=1.66.0
 Requires-Dist: tiktoken~=0.12
-Requires-Dist: urllib3>=2.6.3
+Requires-Dist: urllib3>=2.7.0
 Dynamic: license-file
 
 # VocabMaster

{vocabmaster-0.3.0 → vocabmaster-0.3.2}/VocabMaster.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: VocabMaster
-Version: 0.3.0
+Version: 0.3.2
 Summary: Master new languages with this CLI tool, designed to help you record vocabulary and create Anki flashcards without the need to manually input translations or example sentences.
 Author: Sébastien De Revière
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/sderev/vocabmaster
 Project-URL: Repository, https://github.com/sderev/vocabmaster
 Project-URL: Issues, https://github.com/sderev/vocabmaster/issues
@@ -11,7 +11,6 @@ Keywords: vocabulary,language-learning,anki,flashcards,cli,openai,gpt
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: End Users/Desktop
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -24,9 +23,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click~=8.3
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: openai<2.0,>=1.66.0
+Requires-Dist: openai<3.0,>=1.66.0
 Requires-Dist: tiktoken~=0.12
-Requires-Dist: urllib3>=2.6.3
+Requires-Dist: urllib3>=2.7.0
 Dynamic: license-file
 
 # VocabMaster

{vocabmaster-0.3.0 → vocabmaster-0.3.2}/VocabMaster.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ tests/test_cli.py
 tests/test_config_handler.py
 tests/test_csv_handler.py
 tests/test_gpt_integration.py
+tests/test_gpt_integration_sdk_boundary.py
 tests/test_path_traversal_prevention.py
 tests/test_recovery.py
 tests/test_same_language_integration.py

{vocabmaster-0.3.0 → vocabmaster-0.3.2}/VocabMaster.egg-info/requires.txt

@@ -1,5 +1,5 @@
 click~=8.3
 httpx>=0.28.1
-openai<2.0,>=1.66.0
+openai<3.0,>=1.66.0
 tiktoken~=0.12
-urllib3>=2.6.3
+urllib3>=2.7.0

{vocabmaster-0.3.0 → vocabmaster-0.3.2}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "VocabMaster"
-version = "0.3.0"
+version = "0.3.2"
 description = "Master new languages with this CLI tool, designed to help you record vocabulary and create Anki flashcards without the need to manually input translations or example sentences."
 readme = "README.md"
 requires-python = ">=3.10"
-license = {text = "Apache-2.0"}
+license = "Apache-2.0"
 authors = [
     {name = "Sébastien De Revière"}
 ]
@@ -17,7 +17,6 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Education",
     "Intended Audience :: End Users/Desktop",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
@@ -30,9 +29,9 @@ classifiers = [
 dependencies = [
     "click ~= 8.3",
     "httpx>=0.28.1",
-    "openai >= 1.66.0, <2.0",
+    "openai >= 1.66.0, <3.0",
     "tiktoken ~= 0.12",
-    "urllib3 >= 2.6.3",
+    "urllib3 >= 2.7.0",
 ]
 
 [project.scripts]
@@ -40,9 +39,9 @@ vocabmaster = "vocabmaster.cli:vocabmaster"
 
 [dependency-groups]
 dev = [
-    "pytest ~= 8.4",
+    "pytest ~= 9.0.3",
     "scriv[toml]>=1.5.0",
-    "urllib3>=2.6.3",  # urllib3 is a transitive dependency of scriv (via requests). Pinned to fix CVE-2026-21441.
+    "urllib3>=2.7.0",  # urllib3 is a transitive dependency of scriv (via requests).
 ]
 
 [project.urls]

vocabmaster-0.3.2/tests/test_gpt_integration_sdk_boundary.py

@@ -0,0 +1,158 @@
+from types import SimpleNamespace
+
+import httpx
+import pytest
+from openai import RateLimitError
+
+from vocabmaster import gpt_integration
+
+
+class FakeStreamingResponse:
+    def __init__(self, events, final_response):
+        self._events = list(events)
+        self._final_response = final_response
+
+    def __iter__(self):
+        return iter(self._events)
+
+    def get_final_response(self):
+        return self._final_response
+
+
+class FakeStreamingContext:
+    def __init__(self, stream_response=None, enter_error=None):
+        self._stream_response = stream_response
+        self._enter_error = enter_error
+
+    def __enter__(self):
+        if self._enter_error is not None:
+            raise self._enter_error
+        return self._stream_response
+
+    def __exit__(self, exc_type, exc, exc_tb):
+        return False
+
+
+def test_chatgpt_request_non_streaming_uses_response_output_text():
+    create_calls = []
+    response = SimpleNamespace(output_text="bonjour\thello\texample")
+
+    class FakeResponses:
+        def create(self, **kwargs):
+            create_calls.append(kwargs)
+            return response
+
+    client = SimpleNamespace(responses=FakeResponses())
+
+    generated_text, response_time, raw_response = gpt_integration.chatgpt_request(
+        prompt=[{"role": "user", "content": "Translate bonjour"}],
+        stream=False,
+        client=client,
+    )
+
+    assert generated_text == response.output_text
+    assert response_time >= 0
+    assert raw_response is response
+    assert create_calls == [
+        {
+            "input": [{"role": "user", "content": "Translate bonjour"}],
+            "model": gpt_integration.DEFAULT_MODEL,
+            "temperature": 0.7,
+            "stream": False,
+        }
+    ]
+
+
+def test_chatgpt_request_streaming_uses_public_stream_api_and_filters_output(capsys):
+    stream_calls = []
+    final_response = SimpleNamespace(
+        output_text="bonjour\tbon jour\thello\texample\nsalut\tsalut\thi\texample two\n"
+    )
+    stream_response = FakeStreamingResponse(
+        events=[
+            SimpleNamespace(type="response.created"),
+            SimpleNamespace(type="response.output_text.delta", delta="bonjour\tbon jour\t"),
+            SimpleNamespace(type="response.output_text.delta", delta="hello\texample\n"),
+            SimpleNamespace(type="response.output_text.delta", delta="salut\tsalut\thi\t"),
+            SimpleNamespace(type="response.output_text.delta", delta="example two\n"),
+        ],
+        final_response=final_response,
+    )
+
+    class FakeResponses:
+        def stream(self, **kwargs):
+            stream_calls.append(kwargs)
+            return FakeStreamingContext(stream_response=stream_response)
+
+    client = SimpleNamespace(responses=FakeResponses())
+
+    generated_text, response_time, raw_response = gpt_integration.chatgpt_request(
+        prompt=[{"role": "user", "content": "Translate bonjour and salut"}],
+        stream=True,
+        client=client,
+    )
+
+    captured = capsys.readouterr()
+
+    assert generated_text == final_response.output_text
+    assert response_time >= 0
+    assert raw_response is final_response
+    assert captured.out == "bonjour\thello\texample\nsalut\thi\texample two\n\n"
+    assert stream_calls == [
+        {
+            "input": [{"role": "user", "content": "Translate bonjour and salut"}],
+            "model": gpt_integration.DEFAULT_MODEL,
+            "temperature": 0.7,
+        }
+    ]
+
+
+def test_chatgpt_request_streaming_falls_back_to_final_output_text(capsys):
+    final_response = SimpleNamespace(output_text="bonjour\tbon jour\thello\texample\n")
+    stream_response = FakeStreamingResponse(
+        events=[SimpleNamespace(type="response.completed")],
+        final_response=final_response,
+    )
+
+    class FakeResponses:
+        def stream(self, **kwargs):
+            return FakeStreamingContext(stream_response=stream_response)
+
+    client = SimpleNamespace(responses=FakeResponses())
+
+    generated_text, _response_time, raw_response = gpt_integration.chatgpt_request(
+        prompt=[{"role": "user", "content": "Translate bonjour"}],
+        stream=True,
+        client=client,
+    )
+
+    captured = capsys.readouterr()
+
+    assert generated_text == final_response.output_text
+    assert raw_response is final_response
+    assert captured.out == "bonjour\thello\texample\n\n"
+
+
+def test_chatgpt_request_streaming_propagates_public_status_errors():
+    request = httpx.Request("POST", "https://api.openai.com/v1/responses")
+    response = httpx.Response(429, request=request)
+    rate_limit_error = RateLimitError("Too many requests", response=response, body=None)
+
+    class FakeResponses:
+        def stream(self, **kwargs):
+            return FakeStreamingContext(enter_error=rate_limit_error)
+
+    def forbidden_private_helper(_response):
+        raise AssertionError("private OpenAI helper should not be used")
+
+    client = SimpleNamespace(
+        responses=FakeResponses(),
+        _make_status_error_from_response=forbidden_private_helper,
+    )
+
+    with pytest.raises(RateLimitError):
+        gpt_integration.chatgpt_request(
+            prompt=[{"role": "user", "content": "Translate bonjour"}],
+            stream=True,
+            client=client,
+        )

{vocabmaster-0.3.0 → vocabmaster-0.3.2}/vocabmaster/gpt_integration.py

@@ -3,7 +3,6 @@ import json
 import os
 import time
 
-import httpx
 import tiktoken
 from openai import OpenAI
 
@@ -167,51 +166,31 @@ def chatgpt_request(
     stream_enabled = bool(stream)
 
     if stream_enabled:
-        collected_chunks = []
         collected_messages = []
         streaming_state = {"line_buffer": ""}
+        final_response = None
 
-        with client.responses.with_streaming_response.create(
+        with client.responses.stream(
             input=prompt,
             model=model,
             # max_output_tokens=max_tokens,
             temperature=temperature,
-            stream=True,
-        ) as response:
-            try:
-                response.http_response.raise_for_status()
-            except httpx.HTTPStatusError as error:
-                if not error.response.is_closed:
-                    error.response.read()
-                raise client._make_status_error_from_response(error.response) from None
-            for line in response.iter_lines():
-                if not line:
-                    continue
-                if isinstance(line, bytes):
-                    line = line.decode("utf-8", errors="replace")
-                if not line.startswith("data:"):
-                    continue
-                payload = line[len("data:") :].strip()
-                if payload == "[DONE]":
-                    break
-                try:
-                    event = json.loads(payload)
-                except json.JSONDecodeError:
-                    continue
-                collected_chunks.append(event)
-                event_type = event.get("type")
-                if event_type == "response.output_text.delta":
-                    delta = event.get("delta", "")
+        ) as stream_response:
+            for event in stream_response:
+                if getattr(event, "type", None) == "response.output_text.delta":
+                    delta = getattr(event, "delta", "")
                     if delta:
                         collected_messages.append(delta)
                         filtered_content = filter_streaming_tsv(delta, streaming_state)
                         print(filtered_content, end="")
-                elif event_type == "response.output_text.done" and not collected_messages:
-                    text = event.get("text", "")
-                    if text:
-                        collected_messages.append(text)
-                        filtered_content = filter_streaming_tsv(text, streaming_state)
-                        print(filtered_content, end="")
+            final_response = stream_response.get_final_response()
+
+        generated_text = "".join(collected_messages)
+        if not generated_text:
+            generated_text = final_response.output_text
+            if generated_text:
+                filtered_content = filter_streaming_tsv(generated_text, streaming_state)
+                print(filtered_content, end="")
         tail = filter_streaming_tsv("", streaming_state, final=True)
         if tail:
             print(tail, end="")
@@ -219,8 +198,7 @@ def chatgpt_request(
 
         # Save the time delay and text received
         response_time = (time.monotonic_ns() - start_time) / 1e9
-        generated_text = "".join(collected_messages)
-        response = collected_chunks
+        response = final_response
 
     else:
         # Extract and save the generated response