Merge pull request #32 from ebastos/main

Use `uv` and general clean-up

Author: gboudreau

README.md

@@ -7,13 +7,13 @@ Installation
 ------------
 
 ```bash
-pip install ws-api
+uv add ws-api
 ```
 
 Usage
 -----
 
-Note: You'll need the keyring package to run the code below. Install with: `pip install keyring`
+Note: You'll need the keyring package to run the code below. Install with: `uv add keyring`
 
 ```python
 from datetime import datetime

pyproject.toml

@@ -0,0 +1,50 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "ws-api"
+version = "0.28.1"
+description = "Access your Wealthsimple account using their (GraphQL) API."
+readme = "README.md"
+license = {file = "LICENSE"}
+authors = [
+  {name = "Guillaume Boudreau", email = "guillaume@pommepause.com"},
+]
+maintainers = [
+  {name = "Guillaume Boudreau", email = "guillaume@pommepause.com"},
+]
+classifiers = [
+  "Development Status :: 3 - Alpha",
+  "Intended Audience :: Developers",
+  "Operating System :: OS Independent",
+  "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.13",
+]
+requires-python = ">=3.10"
+dependencies = [
+  "requests",
+]
+keywords = ["wealthsimple"]
+
+[project.optional-dependencies]
+dev = [
+  "pytest",
+  "ruff",
+]
+
+[project.urls]
+Homepage = "https://github.com/gboudreau/ws-api-python"
+Repository = "https://github.com/gboudreau/ws-api-python"
+
+[tool.hatch.build.targets.wheel]
+packages = ["ws_api"]
+
+[dependency-groups]
+dev = [
+  "pytest",
+  "pytest-cov>=7.0.0",
+  "ruff",
+]

setup.cfg

@@ -0,0 +1,21 @@
+from ws_api.exceptions import LoginFailedException, WSApiException
+
+
+def test_wsapi_exception_init_and_str():
+    response = {"error": "test_error"}
+    exc = WSApiException("Test message", response=response)
+    assert str(exc) == "Test message; Response: {'error': 'test_error'}"
+    assert exc.response == response
+
+
+def test_wsapi_exception_no_response():
+    exc = WSApiException("Test message")
+    assert str(exc) == "Test message; Response: None"
+    assert exc.response is None
+
+
+def test_login_failed_exception():
+    response = {"error": "invalid_grant"}
+    exc = LoginFailedException("Login failed", response=response)
+    assert isinstance(exc, WSApiException)
+    assert str(exc) == "Login failed; Response: {'error': 'invalid_grant'}"

setup.py

@@ -0,0 +1,61 @@
+import json
+
+from ws_api.session import OAuthSession, WSAPISession
+
+
+def test_oauth_session_init():
+    session = OAuthSession()
+    assert session.client_id is None
+    assert session.access_token is None
+    assert session.refresh_token is None
+
+
+def test_wsapi_session_init():
+    session = WSAPISession()
+    assert session.client_id is None
+    assert session.access_token is None
+    assert session.refresh_token is None
+    assert session.session_id is None
+    assert session.wssdi is None
+    assert session.token_info is None
+
+
+def test_wsapi_session_to_json():
+    session = WSAPISession()
+    session.client_id = "test_client_id"
+    session.access_token = "test_access_token"
+    session.refresh_token = "test_refresh_token"
+    session.session_id = "test_session_id"
+    session.wssdi = "test_wssdi"
+    session.token_info = {"key": "value"}
+
+    json_str = session.to_json()
+    data = json.loads(json_str)
+
+    assert data["client_id"] == "test_client_id"
+    assert data["access_token"] == "test_access_token"
+    assert data["refresh_token"] == "test_refresh_token"
+    assert data["session_id"] == "test_session_id"
+    assert data["wssdi"] == "test_wssdi"
+    assert data["token_info"] == {"key": "value"}
+
+
+def test_wsapi_session_from_json():
+    data = {
+        "client_id": "test_client_id",
+        "access_token": "test_access_token",
+        "refresh_token": "test_refresh_token",
+        "session_id": "test_session_id",
+        "wssdi": "test_wssdi",
+        "token_info": {"key": "value"},
+    }
+    json_str = json.dumps(data)
+
+    session = WSAPISession.from_json(json_str)
+
+    assert session.client_id == "test_client_id"
+    assert session.access_token == "test_access_token"
+    assert session.refresh_token == "test_refresh_token"
+    assert session.session_id == "test_session_id"
+    assert session.wssdi == "test_wssdi"
+    assert session.token_info == {"key": "value"}

tests/test_exceptions.py

@@ -0,0 +1,92 @@
+import uuid
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from ws_api.session import WSAPISession
+from ws_api.wealthsimple_api import WealthsimpleAPI, WealthsimpleAPIBase
+
+
+def test_wealthsimple_api_set_user_agent():
+    WealthsimpleAPI.set_user_agent("Test User Agent")
+    assert WealthsimpleAPI.user_agent == "Test User Agent"
+
+
+def test_wealthsimple_api_uuidv4():
+    uuid_str = WealthsimpleAPI.uuidv4()
+    assert isinstance(uuid_str, str)
+    assert len(uuid_str) == 36
+    uuid.UUID(uuid_str, version=4)
+
+
+@pytest.fixture
+def mock_session():
+    sess = WSAPISession()
+    sess.client_id = "test_client_id"
+    sess.access_token = "test_access_token"
+    sess.refresh_token = "test_refresh_token"
+    sess.session_id = "test_session_id"
+    sess.wssdi = "test_wssdi"
+    return sess
+
+
+def test_wealthsimple_api_init_with_session(mock_session):
+    api = WealthsimpleAPI(mock_session)
+    assert api.session.client_id == "test_client_id"
+    assert api.session.access_token == "test_access_token"
+    assert api.session.refresh_token == "test_refresh_token"
+    assert api.session.session_id == "test_session_id"
+    assert api.session.wssdi == "test_wssdi"
+
+
+@patch("requests.request")
+def test_send_http_request_post(mock_request, mock_session):
+    mock_resp = MagicMock()
+    mock_resp.json.return_value = {"status": "ok"}
+    mock_request.return_value = mock_resp
+
+    api = WealthsimpleAPIBase(mock_session)
+
+    result = api.send_http_request(
+        "https://test.example.com/api",
+        "POST",
+        {"grant_type": "password", "username": "test", "password": "test"},
+    )
+
+    assert result == {"status": "ok"}
+
+    mock_request.assert_called_once()
+    args, kwargs = mock_request.call_args
+    assert args[0] == "POST"
+    assert args[1] == "https://test.example.com/api"
+    assert kwargs["json"] == {
+        "grant_type": "password",
+        "username": "test",
+        "password": "test",
+    }
+    headers = kwargs["headers"]
+    assert headers["Content-Type"] == "application/json"
+    assert headers["x-ws-session-id"] == "test_session_id"
+    assert headers["Authorization"] == "Bearer test_access_token"
+    assert headers["x-ws-device-id"] == "test_wssdi"
+
+
+@patch("requests.request")
+def test_send_get_request(mock_request, mock_session):
+    mock_resp = MagicMock()
+    mock_resp.json.return_value = {"status": "ok"}
+    mock_request.return_value = mock_resp
+
+    api = WealthsimpleAPIBase(mock_session)
+
+    result = api.send_get("https://test.example.com/get")
+
+    assert result == {"status": "ok"}
+
+    mock_request.assert_called_once()
+    args, kwargs = mock_request.call_args
+    assert args[0] == "GET"
+    assert args[1] == "https://test.example.com/get"
+    headers = kwargs["headers"]
+    assert "x-ws-session-id" in headers
+    assert headers["x-ws-session-id"] == "test_session_id"