python-picnic-api2 1.3.2__tar.gz → 1.3.3__tar.gz

python_picnic_api2-1.3.3/.envrc

@@ -0,0 +1 @@
+use flake

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/.github/workflows/ci.yaml

@@ -11,13 +11,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.11,3.12]
+        python-version: [3.13,3.14]
         uv-version: [0.6.6]
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/.github/workflows/it.yaml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
-    - name: Set up Python 3.12
+    - name: Set up Python 3.13
       uses: actions/setup-python@v6
       with:
-        python-version: 3.12
+        python-version: 3.13
 
     - name: Install uv 0.6.6
       run: |

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/.github/workflows/release.yml

@@ -4,12 +4,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
   
-    - name: Set up Python 3.11
+    - name: Set up Python 3.13
       uses: actions/setup-python@v6
       with:
-        python-version: 3.11
+        python-version: 3.13
   
     - name: Install uv 0.6.6
       run: |
@@ -26,7 +26,7 @@ jobs:
       run: uv build
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: release-dists
         path: dist/

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: python-picnic-api2
-Version: 1.3.2
+Version: 1.3.3
 Project-URL: homepage, https://github.com/codesalatdev/python-picnic-api
 Project-URL: repository, https://github.com/codesalatdev/python-picnic-api
 Author-email: Mike Brink <mjh.brink@icloud.com>, CodeSalat <pypi@codesalat.dev>
 Maintainer-email: CodeSalat <pypi@codesalat.dev>
 License: Apache-2.0
 License-File: LICENSE.md
-Requires-Python: >=3.11
+Requires-Python: >=3.13
 Requires-Dist: requests>=2.24.0
 Requires-Dist: typing-extensions>=4.12.2
 Description-Content-Type: text/x-rst

python_picnic_api2-1.3.3/flake.lock

@@ -0,0 +1,60 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1757194111,
+        "narHash": "sha256-4I5rftBv5fUuLkGJ5TZ+LWBz8c+tZ/ZEkUJ/uB0QCOM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "64028f19ae7ae87174d168286073ec0dc2b61395",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

python_picnic_api2-1.3.3/flake.nix

@@ -0,0 +1,19 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let pkgs = nixpkgs.legacyPackages.${system};
+      in {
+        devShell = pkgs.mkShell { buildInputs = with pkgs; [
+          python313Packages.requests
+          python313Packages.python-lsp-ruff
+          python313Packages.ruff
+          python313Packages.typing-extensions
+        ];
+      };
+    });
+}

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/integration_tests/test_client.py

@@ -147,15 +147,11 @@ def test_get_current_deliveries():
 
 
 def test_get_categories():
-    response = picnic.get_categories()
-    assert isinstance(response, list)
+    with pytest.raises(NotImplementedError):
+        picnic.get_categories()
 
 
 def test_print_categories(capsys):
-    picnic.print_categories()
-    captured = capsys.readouterr()
-
-    assert isinstance(captured.out, str)
-
+    with pytest.raises(NotImplementedError):
+        picnic.print_categories()
 
-# TODO: add test for re-logging

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-picnic-api2"
-version = "1.3.2"
+version = "1.3.3"
 description = ""
 readme = "README.rst"
 license = {text = "Apache-2.0"}
@@ -12,7 +12,7 @@ authors = [
   { name = "CodeSalat", email = "pypi@codesalat.dev"}
 ]
 urls = {homepage = "https://github.com/codesalatdev/python-picnic-api", repository = "https://github.com/codesalatdev/python-picnic-api"}
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 dependencies = [
   "requests>=2.24.0",
   "typing_extensions>=4.12.2"
@@ -21,7 +21,7 @@ dependencies = [
 [tool.ruff]
 line-length = 88
 indent-width = 4
-target-version = "py311"
+target-version = "py313"
 
 [tool.ruff.lint]
 select = [

python_picnic_api2-1.3.3/src/python_picnic_api2/__init__.py

@@ -0,0 +1,7 @@
+from .client import PicnicAPI
+from .session import Picnic2FAError, Picnic2FARequired
+
+__all__ = ["PicnicAPI", "Picnic2FAError", "Picnic2FARequired"]
+__title__ = "python-picnic-api"
+__version__ = "1.1.0"
+__author__ = "Mike Brink"

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/src/python_picnic_api2/client.py

@@ -10,7 +10,12 @@ from .helper import (
     _url_generator,
     find_nodes_by_content,
 )
-from .session import PicnicAPISession, PicnicAuthError
+from .session import (
+    Picnic2FAError,
+    Picnic2FARequired,
+    PicnicAPISession,
+    PicnicAuthError,
+)
 
 DEFAULT_URL = "https://storefront-prod.{}.picnicinternational.com/api/{}"
 GLOBAL_GATEWAY_URL = "https://gateway-prod.global.picnicinternational.com"
@@ -60,14 +65,18 @@ class PicnicAPI:
 
         return response
 
-    def _post(self, path: str, data=None, base_url_override=None):
+    def _post(
+        self, path: str, data=None, base_url_override=None, add_picnic_headers=False
+    ):
         url = (base_url_override if base_url_override else self._base_url) + path
-        response = self.session.post(url, json=data).json()
+        kwargs = {"json": data}
+        if add_picnic_headers:
+            kwargs["headers"] = _HEADERS
+        response = self.session.post(url, **kwargs).json()
 
         if self._contains_auth_error(response):
             raise PicnicAuthError(
-                f"Picnic authentication error: \
-                    {response['error'].get('message')}"
+                f"Picnic authentication error: {response['error'].get('message')}"
             )
 
         return response
@@ -80,12 +89,82 @@ class PicnicAPI:
         error_code = response.setdefault("error", {}).get("code")
         return error_code == "AUTH_ERROR" or error_code == "AUTH_INVALID_CRED"
 
+    @staticmethod
+    def _requires_2fa(response):
+        if not isinstance(response, dict):
+            return False
+
+        error_code = response.get("error", {}).get("code")
+        return error_code == "TWO_FACTOR_AUTHENTICATION_REQUIRED"
+
     def login(self, username: str, password: str):
         path = "/user/login"
         secret = md5(password.encode("utf-8")).hexdigest()
         data = {"key": username, "secret": secret, "client_id": 30100}
 
-        return self._post(path, data)
+        response = self._post(path, data, add_picnic_headers=True)
+
+        if self._requires_2fa(response):
+            raise Picnic2FARequired(
+                message=response.get("error", {}).get(
+                    "message", "Two-factor authentication required"
+                ),
+                response=response,
+            )
+
+        return response
+
+    def _post_2fa(self, path: str, data=None):
+        """POST for 2FA endpoints that may return empty (204) or JSON error bodies."""
+        url = self._base_url + path
+        response = self.session.post(url, json=data, headers=_HEADERS)
+
+        if response.status_code == 204 or not response.content:
+            return None
+
+        json_body = response.json()
+
+        # This should not happen because password auth is already done
+        # at this point, but just in case.
+        if self._contains_auth_error(json_body):
+            raise PicnicAuthError(
+                f"Picnic authentication error: {json_body['error'].get('message')}"
+            )
+
+        error = json_body.get("error", {})
+        if error.get("code"):
+            raise Picnic2FAError(
+                message=error.get("message", "Two-factor authentication failed"),
+                code=error["code"],
+            )
+
+        return json_body
+
+    def generate_2fa_code(self, channel: str = "SMS"):
+        """Request a 2FA code to be sent via the specified channel.
+
+        Args:
+            channel: The delivery channel ("SMS" or "EMAIL").
+
+        Raises:
+            Picnic2FAError: If the server returns an error (e.g. invalid channel).
+        """
+        path = "/user/2fa/generate"
+        data = {"channel": channel}
+        self._post_2fa(path, data)
+
+    def verify_2fa_code(self, code: str):
+        """Verify the 2FA code to complete authentication.
+
+        Args:
+            code: The OTP code received via SMS or email.
+
+        Raises:
+            Picnic2FAError: If the OTP code is invalid.
+        """
+        path = "/user/2fa/verify"
+        data = {"otp": code}
+        self._post_2fa(path, data)
 
     def logged_in(self):
         return self.session.authenticated
@@ -189,7 +268,8 @@ class PicnicAPI:
         return self.get_deliveries(data=["CURRENT"])
 
     def get_categories(self, depth: int = 0):
-        return self._get(f"/my_store?depth={depth}")["catalog"]
+        raise NotImplementedError("This endpoint has been removed by picnic\
+        and is no longer functional.")
 
     def get_category_by_ids(self, l2_id: int, l3_id: int):
         path = "/pages/L2-category-page-root" + \

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/src/python_picnic_api2/session.py

@@ -5,6 +5,30 @@ class PicnicAuthError(Exception):
     """Indicates an error when authenticating to the Picnic API."""
 
 
+class Picnic2FARequired(Exception):
+    """Indicates that two-factor authentication is required."""
+
+    def __init__(
+        self,
+        message: str = "Two-factor authentication required",
+        response: dict = None,
+    ):
+        super().__init__(message)
+        self.response = response or {}
+
+
+class Picnic2FAError(Exception):
+    """Indicates an error during two-factor authentication (e.g. invalid OTP)."""
+
+    def __init__(
+        self,
+        message: str = "Two-factor authentication failed",
+        code: str = None,
+    ):
+        super().__init__(message)
+        self.code = code
+
+
 class PicnicAPISession(Session):
     AUTH_HEADER = "x-picnic-auth"
 
@@ -52,4 +76,4 @@ class PicnicAPISession(Session):
         return response
 
 
-__all__ = ["PicnicAuthError", "PicnicAPISession"]
+__all__ = ["PicnicAuthError", "Picnic2FARequired", "Picnic2FAError", "PicnicAPISession"]

{python_picnic_api2-1.3.2 → python_picnic_api2-1.3.3}/tests/test_client.py

@@ -5,7 +5,11 @@ import pytest
 
 from python_picnic_api2 import PicnicAPI
 from python_picnic_api2.client import DEFAULT_URL
-from python_picnic_api2.session import PicnicAuthError
+from python_picnic_api2.session import (
+    Picnic2FAError,
+    Picnic2FARequired,
+    PicnicAuthError,
+)
 
 PICNIC_HEADERS = {
     "x-picnic-agent": "30100;1.206.1-#15408",
@@ -15,9 +19,10 @@ PICNIC_HEADERS = {
 
 class TestClient(unittest.TestCase):
     class MockResponse:
-        def __init__(self, json_data, status_code):
+        def __init__(self, json_data, status_code, content=b"data"):
             self.json_data = json_data
             self.status_code = status_code
+            self.content = content
 
         def json(self):
             return self.json_data
@@ -42,6 +47,7 @@ class TestClient(unittest.TestCase):
                 "secret": "098f6bcd4621d373cade4e832627b4f6",
                 "client_id": 30100,
             },
+            headers=PICNIC_HEADERS,
         )
 
     def test_login_auth_token(self):
@@ -292,27 +298,8 @@ class TestClient(unittest.TestCase):
         )
 
     def test_get_categories(self):
-        self.session_mock().get.return_value = self.MockResponse(
-            {
-                "type": "MY_STORE",
-                "catalog": [
-                    {"type": "CATEGORY", "id": "purchases", "name": "Besteld"},
-                    {"type": "CATEGORY", "id": "promotions", "name": "Acties"},
-                ],
-                "user": {},
-            },
-            200,
-        )
-
-        categories = self.client.get_categories()
-        self.session_mock().get.assert_called_with(
-            self.expected_base_url + "/my_store?depth=0", headers=None
-        )
-
-        self.assertDictEqual(
-            categories[0],
-            {"type": "CATEGORY", "id": "purchases", "name": "Besteld"},
-        )
+        with pytest.raises(NotImplementedError):
+            self.client.get_categories()
 
     def test_get_category_by_ids(self):
         self.session_mock().get.return_value = self.MockResponse(
@@ -353,3 +340,86 @@ class TestClient(unittest.TestCase):
 
         with self.assertRaises(PicnicAuthError):
             self.client.clear_cart()
+
+    def test_login_requires_2fa(self):
+        response = {
+            "error": {
+                "code": "TWO_FACTOR_AUTHENTICATION_REQUIRED",
+                "message": "User must verify their second factor",
+                "details": {},
+            }
+        }
+        self.session_mock().post.return_value = self.MockResponse(response, 200)
+
+        client = PicnicAPI()
+        with self.assertRaises(Picnic2FARequired) as ctx:
+            client.login("test-user", "test-password")
+        self.assertEqual(
+            str(ctx.exception), "User must verify their second factor"
+        )
+        self.assertEqual(ctx.exception.response, response)
+
+    def test_generate_2fa_code(self):
+        self.session_mock().post.return_value = self.MockResponse(
+            None, 204, content=b""
+        )
+
+        result = self.client.generate_2fa_code()
+        self.session_mock().post.assert_called_with(
+            self.expected_base_url + "/user/2fa/generate",
+            json={"channel": "SMS"},
+            headers=PICNIC_HEADERS,
+        )
+        self.assertIsNone(result)
+
+    def test_generate_2fa_code_email(self):
+        self.session_mock().post.return_value = self.MockResponse(
+            None, 204, content=b""
+        )
+
+        self.client.generate_2fa_code(channel="EMAIL")
+        self.session_mock().post.assert_called_with(
+            self.expected_base_url + "/user/2fa/generate",
+            json={"channel": "EMAIL"},
+            headers=PICNIC_HEADERS,
+        )
+
+    def test_verify_2fa_code_success(self):
+        self.session_mock().post.return_value = self.MockResponse(
+            None, 204, content=b""
+        )
+
+        result = self.client.verify_2fa_code("123456")
+        self.session_mock().post.assert_called_with(
+            self.expected_base_url + "/user/2fa/verify",
+            json={"otp": "123456"},
+            headers=PICNIC_HEADERS,
+        )
+        self.assertIsNone(result)
+
+    def test_verify_2fa_code_invalid(self):
+        response = {
+            "error": {
+                "code": "OTP_NOT_VALID",
+                "message": "Otp is not valid",
+                "details": {},
+            }
+        }
+        self.session_mock().post.return_value = self.MockResponse(response, 200)
+
+        with self.assertRaises(Picnic2FAError) as ctx:
+            self.client.verify_2fa_code("000000")
+        self.assertEqual(str(ctx.exception), "Otp is not valid")
+        self.assertEqual(ctx.exception.code, "OTP_NOT_VALID")
+
+    def test_2fa_auth_error(self):
+        response = {
+            "error": {
+                "code": "AUTH_ERROR",
+                "message": "Authentication failed.",
+            }
+        }
+        self.session_mock().post.return_value = self.MockResponse(response, 400)
+
+        with self.assertRaises(PicnicAuthError):
+            self.client.verify_2fa_code("123456")