some cleanup

Author: deeleeramone

pywry/pyproject.toml

@@ -7,8 +7,6 @@ license = { text = "Apache 2.0" }
 readme = "README.md"
 requires-python = ">=3.10"
 classifiers = [
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
@@ -28,15 +26,12 @@ dependencies = [
     "pytauri>=0.8.0",
     "anyio>=4.0.0",
     "httpx>=0.27.0",
-    "pandas>=1.5.3",
     "pydantic>=2.0.0",
     "pydantic-settings>=2.0.0",
     "redis>=7.1.0",
-    "requests>=2.32.5",
     "fastapi>=0.128.0",
     "uvicorn>=0.40.0",
     "watchdog>=3.0.0",
-    "websockets>=16.0.0",
     "setproctitle>=1.3.0",
 ]
 
@@ -79,6 +74,8 @@ dev = [
     "magentic>=0.39.0",
     "openai>=1.0.0",
     "pyinstaller>=6.0",
+    "websockets>=16.0.0",
+    "pandas>=1.5.3",
 ]
 openai = [
     "openai>=1.0.0",

pywry/pywry/chat_providers.py

@@ -188,7 +188,7 @@ async def generate(
 
         resp: Any = await self._client.chat.completions.create(
             model=config.model,
-            messages=cast(Any, self._build_messages(messages, config)),
+            messages=cast("Any", self._build_messages(messages, config)),
             temperature=config.temperature,
             max_tokens=config.max_tokens,
             stream=False,
@@ -240,7 +240,7 @@ async def stream(
 
         stream_resp: Any = await self._client.chat.completions.create(
             model=config.model,
-            messages=cast(Any, self._build_messages(messages, config)),
+            messages=cast("Any", self._build_messages(messages, config)),
             temperature=config.temperature,
             max_tokens=config.max_tokens,
             stream=True,
@@ -341,7 +341,7 @@ async def generate(
 
         resp: Any = await self._client.messages.create(
             model=config.model,
-            messages=cast(Any, self._build_messages(messages)),
+            messages=cast("Any", self._build_messages(messages)),
             system=config.system_prompt or "",
             temperature=config.temperature,
             max_tokens=config.max_tokens,
@@ -395,7 +395,7 @@ async def stream(
 
         async with self._client.messages.stream(
             model=config.model,
-            messages=cast(Any, self._build_messages(messages)),
+            messages=cast("Any", self._build_messages(messages)),
             system=config.system_prompt or "",
             temperature=config.temperature,
             max_tokens=config.max_tokens,

pywry/pywry/inline.py

@@ -1661,7 +1661,7 @@ def _make_server_request(
     **kwargs: Any,
 ) -> Any:
     """Make an internal request to the PyWry server with authentication."""
-    import requests
+    import httpx
 
     settings = get_settings().server
     target_host = host or settings.host
@@ -1682,7 +1682,7 @@ def _make_server_request(
     if _state.internal_api_token:
         headers[settings.internal_api_header] = _state.internal_api_token
 
-    return requests.request(
+    return httpx.request(
         method=method,
         url=url,
         json=json_data,

pywry/tests/test_inline_ssl.py

@@ -12,8 +12,8 @@
 from unittest.mock import MagicMock, patch
 
 import anyio
+import httpx
 import pytest
-import requests
 import websockets
 
 from cryptography import x509
@@ -359,7 +359,7 @@ def test_content_generation_https(ssl_certs):
         )
 
         try:
-            resp = requests.get(widget.url, verify=cert_path, timeout=5.0)
+            resp = httpx.get(widget.url, verify=cert_path, timeout=5.0)
             assert resp.status_code == 200
             content = resp.text
             assert "h1>Content Test</h1>" in content
@@ -443,7 +443,7 @@ def test_secret_never_in_https_response(ssl_certs):
 
         try:
             # Fetch via HTTPS
-            resp = requests.get(widget.url, verify=cert_path, timeout=5.0)
+            resp = httpx.get(widget.url, verify=cert_path, timeout=5.0)
             assert resp.status_code == 200
 
             # Secret must NOT appear in response

pywry/tests/test_tauri_plugins.py

@@ -22,17 +22,19 @@
 import pytest
 
 import pywry
+
 from pywry import runtime
 from pywry.app import PyWry
 from pywry.config import AVAILABLE_TAURI_PLUGINS, TAURI_PLUGIN_REGISTRY
 from pywry.models import ThemeMode, WindowMode
 
+
 # Resolve package directory via the installed module so paths work even
 # when tests are copied to a temp directory for wheel validation CI.
 PYWRY_PKG_DIR = Path(pywry.__file__).parent
 
 # Import shared test utilities from tests.conftest
-from tests.conftest import ReadyWaiter, show_and_wait_ready, wait_for_result
+from tests.conftest import ReadyWaiter, show_and_wait_ready, wait_for_result  # noqa: E402
 
 
 F = TypeVar("F", bound=Callable[..., Any])

pywry/tests/test_window_proxy.py

@@ -384,6 +384,7 @@ def on_result(data: Any) -> None:
         assert result["data"] == "Modified"
         app.close()
 
+    @retry_on_subprocess_failure(max_attempts=3, delay=1.0)
     def test_navigate(self) -> None:
         """navigate changes the window URL."""
         app = PyWry(theme=ThemeMode.DARK)