python-picnic-api2 1.2.3__tar.gz → 1.3.0__tar.gz

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/.github/dependabot.yml

@@ -10,3 +10,11 @@ updates:
    directory: "/"
    schedule:
      interval: weekly
+ - package-ecosystem: "github-actions"
+   directory: "/"
+   schedule:
+     interval: "weekly"
+ - package-ecosystem: "pip"
+   directory: "/"
+   schedule:
+     interval: "weekly"

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/.github/workflows/ci.yaml

@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/.github/workflows/it.yaml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Python 3.12
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.12
 

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/.github/workflows/release.yml

@@ -4,10 +4,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
   
     - name: Set up Python 3.11
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
   

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-picnic-api2
-Version: 1.2.3
+Version: 1.3.0
 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>

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/integration_tests/test_client.py

@@ -56,6 +56,17 @@ def test_get_article_with_category_name():
         picnic.get_article("s1018620", add_category_name=True)
 
 
+def test_get_article_by_gtin():
+    response = picnic.get_article_by_gtin("4311501044209")
+    assert response["id"] == "s1018620"
+    assert response["name"] == "Gut&Günstig H-Milch 3,5%"
+
+
+def test_get_article_by_gtin_unknown():
+    response = picnic.get_article_by_gtin("4311501040000")
+    assert response is None
+
+
 def test_get_cart():
     response = picnic.get_cart()
     assert isinstance(response, dict)

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-picnic-api2"
-version = "1.2.3"
+version = "1.3.0"
 description = ""
 readme = "README.rst"
 license = {text = "Apache-2.0"}

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/src/python_picnic_api2/client.py

@@ -15,6 +15,10 @@ DEFAULT_URL = "https://storefront-prod.{}.picnicinternational.com/api/{}"
 GLOBAL_GATEWAY_URL = "https://gateway-prod.global.picnicinternational.com"
 DEFAULT_COUNTRY_CODE = "NL"
 DEFAULT_API_VERSION = "15"
+_HEADERS = {
+    "x-picnic-agent": "30100;1.15.272-15295;",
+    "x-picnic-did": "3C417201548B2E3B",
+}
 
 
 class PicnicAPI:
@@ -47,14 +51,7 @@ class PicnicAPI:
         url = self._base_url + path
 
         # Make the request, add special picnic headers if needed
-        headers = (
-            {
-                "x-picnic-agent": "30100;1.15.272-15295;",
-                "x-picnic-did": "3C417201548B2E3B",
-            }
-            if add_picnic_headers
-            else None
-        )
+        headers = _HEADERS if add_picnic_headers else None
         response = self.session.get(url, headers=headers).json()
 
         if self._contains_auth_error(response):
@@ -177,5 +174,24 @@ class PicnicAPI:
         tree = "\n".join(_tree_generator(self.get_categories(depth=depth)))
         print(tree)
 
+    def get_article_by_gtin(self, etan: str, maxRedirects: int = 5):
+        # Finds the article ID for a gtin/ean (barcode).
+
+        url = "https://picnic.app/" + self._country_code.lower() + "/qr/gtin/" + etan
+        while maxRedirects > 0:
+            if url == "http://picnic.app/nl/link/store/storefront":
+                # gtin unknown
+                return None
+            r = self.session.get(url, headers=_HEADERS, allow_redirects=False)
+            maxRedirects -= 1
+            if ";id=" in r.url:
+                # found the article id
+                return self.get_article(r.url.split(";id=", 1)[1])
+            if "Location" not in r.headers:
+                # article id not found but also no futher redirect
+                return None
+            url = r.headers["Location"]
+        return None
+
 
 __all__ = ["PicnicAPI"]

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/src/python_picnic_api2/helper.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import re
 
 # prefix components:
@@ -8,6 +9,8 @@ branch = "│   "
 tee = "├── "
 last = "└── "
 
+LOGGER = logging.getLogger(__name__)
+
 IMAGE_SIZES = ["small", "medium", "regular", "large", "extra-large"]
 IMAGE_BASE_URL = "https://storefront-prod.nl.picnicinternational.com/static/images"
 
@@ -88,6 +91,8 @@ def _extract_search_results(raw_results, max_items: int = 10):
     search"""
     search_results = []
 
+    LOGGER.debug(f"Extracting search results from {raw_results}")
+
     def find_articles(node):
         if len(search_results) >= max_items:
             return
@@ -101,6 +106,7 @@ def _extract_search_results(raw_results, max_items: int = 10):
                 **selling_unit,
                 "sole_article_id": sole_article_id,
             }
+            LOGGER.debug(f"Found article {result_entry}")
             search_results.append(result_entry)
 
         for child in node.get("children", []):
@@ -112,4 +118,6 @@ def _extract_search_results(raw_results, max_items: int = 10):
     body = raw_results.get("body", {})
     find_articles(body.get("child", {}))
 
+    LOGGER.debug(f"Found {len(search_results)}/{max_items} products after extraction")
+
     return [{"items": search_results}]

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/tests/test_client.py

@@ -106,6 +106,14 @@ class TestClient(unittest.TestCase):
             headers=PICNIC_HEADERS,
         )
 
+    def test_get_article_by_gtin(self):
+        self.client.get_article_by_gtin("123456789")
+        self.session_mock().get.assert_called_with(
+            "https://picnic.app/nl/qr/gtin/123456789",
+            headers=PICNIC_HEADERS,
+            allow_redirects=False,
+        )
+
     def test_get_cart(self):
         self.client.get_cart()
         self.session_mock().get.assert_called_with(

{python_picnic_api2-1.2.3 → python_picnic_api2-1.3.0}/uv.lock

@@ -197,7 +197,7 @@ wheels = [
 
 [[package]]
 name = "python-picnic-api2"
-version = "1.2.3"
+version = "1.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "requests" },