tradera-cli 0.1.0__tar.gz → 0.1.1__tar.gz

{tradera_cli-0.1.0/tradera_cli.egg-info → tradera_cli-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradera-cli
-Version: 0.1.0
+Version: 0.1.1
 Summary: CLI for Tradera web endpoints
 Author: Johnny W
 License-Expression: MIT
@@ -69,6 +69,11 @@ tradera search "iphone"
 tradera search "pokemon" --page 2 --page-size 20
 tradera search "kamera" --sort AddedOn --format json
 tradera search "klocka" --country SE --lang sv --format jsonl
+tradera search "lego" --item-status Sold --format json
+tradera search "lego" --condition "Oanvänt" --format json
+tradera search "lego" --item-type FixedPrice --from-price 100 --to-price 500
+tradera search "lego" --allowed-buyer-regions eu --counties Stockholm Uppsala
+tradera search "lego city" --search-type ExactSearch
 ```
 
 ### Get item details
@@ -105,6 +110,14 @@ Search command (`tradera search`) supports:
 | `--sort` | Sort mode (default: `Relevance`) |
 | `--lang` | Language code (default: `sv`) |
 | `--country` | Shipping country code (default: `SE`) |
+| `--item-status` | Filter by item status: `Active`, `Sold`, `Unsold` |
+| `--condition` | Filter by condition: `Oanvänt`, `Mycket gott skick`, `Gott skick`, `Okej skick`, `Defekt` |
+| `--item-type` | Filter by listing type: `All`, `Auction`, `FixedPrice`, `ContactOnly` |
+| `--from-price` | Minimum price |
+| `--to-price` | Maximum price |
+| `--allowed-buyer-regions` | Buyer region filter: `sweden`, `eu`, `international` |
+| `--counties` | Pickup counties, passed as one or more values, for example `Stockholm Uppsala` |
+| `--search-type` | Search mode. Current supported value: `ExactSearch` |
 | `--no-translate` | Disable automatic translation preference |
 | `--format` | Output format: `table`, `json`, `jsonl` |
 

{tradera_cli-0.1.0 → tradera_cli-0.1.1}/README.md

@@ -39,6 +39,11 @@ tradera search "iphone"
 tradera search "pokemon" --page 2 --page-size 20
 tradera search "kamera" --sort AddedOn --format json
 tradera search "klocka" --country SE --lang sv --format jsonl
+tradera search "lego" --item-status Sold --format json
+tradera search "lego" --condition "Oanvänt" --format json
+tradera search "lego" --item-type FixedPrice --from-price 100 --to-price 500
+tradera search "lego" --allowed-buyer-regions eu --counties Stockholm Uppsala
+tradera search "lego city" --search-type ExactSearch
 ```
 
 ### Get item details
@@ -75,6 +80,14 @@ Search command (`tradera search`) supports:
 | `--sort` | Sort mode (default: `Relevance`) |
 | `--lang` | Language code (default: `sv`) |
 | `--country` | Shipping country code (default: `SE`) |
+| `--item-status` | Filter by item status: `Active`, `Sold`, `Unsold` |
+| `--condition` | Filter by condition: `Oanvänt`, `Mycket gott skick`, `Gott skick`, `Okej skick`, `Defekt` |
+| `--item-type` | Filter by listing type: `All`, `Auction`, `FixedPrice`, `ContactOnly` |
+| `--from-price` | Minimum price |
+| `--to-price` | Maximum price |
+| `--allowed-buyer-regions` | Buyer region filter: `sweden`, `eu`, `international` |
+| `--counties` | Pickup counties, passed as one or more values, for example `Stockholm Uppsala` |
+| `--search-type` | Search mode. Current supported value: `ExactSearch` |
 | `--no-translate` | Disable automatic translation preference |
 | `--format` | Output format: `table`, `json`, `jsonl` |
 

{tradera_cli-0.1.0 → tradera_cli-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tradera-cli"
-version = "0.1.0"
+version = "0.1.1"
 description = "CLI for Tradera web endpoints"
 readme = "README.md"
 requires-python = ">=3.10"

{tradera_cli-0.1.0 → tradera_cli-0.1.1}/tests/test_api.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
 
+import json
+from urllib.parse import parse_qs, urlparse
+
 import requests
 import pytest
 
@@ -212,6 +215,201 @@ def test_search_builds_payload() -> None:
     assert payload["sortBy"] == "EndDate"
 
 
+def test_search_uses_search_page_for_sold_items() -> None:
+    client = TraderaClient()
+    captured: dict[str, object] = {}
+    next_data = {
+        "props": {
+            "pageProps": {
+                "initialState": {
+                    "discover": {
+                        "items": [{"itemId": 42, "isActive": False}],
+                        "filters": {"itemStatus": {"selectedValue": "Sold"}},
+                    }
+                }
+            }
+        }
+    }
+
+    def fake_request(method: str, path: str, **_kwargs: object) -> str:
+        captured["method"] = method
+        captured["path"] = path
+        return (
+            '<script id="__NEXT_DATA__" type="application/json">'
+            f"{json.dumps(next_data)}"
+            "</script>"
+        )
+
+    client._request = fake_request  # type: ignore[method-assign]
+
+    result = client.search("kamera", page=3, sort_by="EndDate", item_status="Sold")
+
+    assert result["items"][0]["itemId"] == 42
+    assert captured["method"] == "GET"
+    parsed = urlparse(str(captured["path"]))
+    assert parsed.path == "/search"
+    assert parse_qs(parsed.query) == {
+        "q": ["kamera"],
+        "paging": ["3"],
+        "sortBy": ["EndDate"],
+        "languageCodeIso2": ["sv"],
+        "itemStatus": ["Sold"],
+    }
+
+
+def test_search_uses_search_page_for_condition_filter() -> None:
+    client = TraderaClient()
+    captured: dict[str, object] = {}
+    next_data = {
+        "props": {
+            "pageProps": {
+                "initialState": {
+                    "discover": {
+                        "items": [{"itemId": 99}],
+                        "attributeFilters": [{"parameter": "af-condition", "selectedValues": ["Oanvänt"]}],
+                    }
+                }
+            }
+        }
+    }
+
+    def fake_request(method: str, path: str, **_kwargs: object) -> str:
+        captured["method"] = method
+        captured["path"] = path
+        return (
+            '<script id="__NEXT_DATA__" type="application/json">'
+            f"{json.dumps(next_data, ensure_ascii=False)}"
+            "</script>"
+        )
+
+    client._request = fake_request  # type: ignore[method-assign]
+
+    result = client.search("kamera", condition="Oanvänt")
+
+    assert result["items"][0]["itemId"] == 99
+    assert captured["method"] == "GET"
+    parsed = urlparse(str(captured["path"]))
+    assert parsed.path == "/search"
+    assert parse_qs(parsed.query) == {
+        "q": ["kamera"],
+        "paging": ["1"],
+        "sortBy": ["Relevance"],
+        "languageCodeIso2": ["sv"],
+        "af-condition": ["Oanvänt"],
+    }
+
+
+def test_search_uses_search_page_for_additional_page_filters() -> None:
+    client = TraderaClient()
+    captured: dict[str, object] = {}
+    next_data = {
+        "props": {
+            "pageProps": {
+                "initialState": {
+                    "discover": {
+                        "items": [{"itemId": 77}],
+                        "filters": {
+                            "itemType": {"selectedValue": "FixedPrice"},
+                            "allowedBuyerRegions": {"selectedValue": "eu;international"},
+                        },
+                        "filterPrice": {
+                            "fromPrice": {"parameter": "fromPrice", "value": 100},
+                            "toPrice": {"parameter": "toPrice", "value": 500},
+                        },
+                        "filterCounties": {"selectedValues": ["Stockholm", "Uppsala"]},
+                    }
+                }
+            }
+        }
+    }
+
+    def fake_request(method: str, path: str, **_kwargs: object) -> str:
+        captured["method"] = method
+        captured["path"] = path
+        return (
+            '<script id="__NEXT_DATA__" type="application/json">'
+            f"{json.dumps(next_data, ensure_ascii=False)}"
+            "</script>"
+        )
+
+    client._request = fake_request  # type: ignore[method-assign]
+
+    result = client.search(
+        "kamera",
+        item_type="FixedPrice",
+        from_price=100,
+        to_price=500,
+        allowed_buyer_regions="eu",
+        counties=["Stockholm", "Uppsala"],
+    )
+
+    assert result["items"][0]["itemId"] == 77
+    assert captured["method"] == "GET"
+    parsed = urlparse(str(captured["path"]))
+    assert parsed.path == "/search"
+    assert parse_qs(parsed.query) == {
+        "q": ["kamera"],
+        "paging": ["1"],
+        "sortBy": ["Relevance"],
+        "languageCodeIso2": ["sv"],
+        "itemType": ["FixedPrice"],
+        "fromPrice": ["100"],
+        "toPrice": ["500"],
+        "allowedBuyerRegions": ["eu;international"],
+        "counties": ["Stockholm;Uppsala"],
+    }
+
+
+def test_search_uses_search_page_for_search_type() -> None:
+    client = TraderaClient()
+    captured: dict[str, object] = {}
+    next_data = {
+        "props": {
+            "pageProps": {
+                "initialState": {
+                    "discover": {
+                        "items": [{"itemId": 88}],
+                        "queryParams": {"q": "kamera", "searchType": "ExactSearch"},
+                    }
+                }
+            }
+        }
+    }
+
+    def fake_request(method: str, path: str, **_kwargs: object) -> str:
+        captured["method"] = method
+        captured["path"] = path
+        return (
+            '<script id="__NEXT_DATA__" type="application/json">'
+            f"{json.dumps(next_data)}"
+            "</script>"
+        )
+
+    client._request = fake_request  # type: ignore[method-assign]
+
+    result = client.search("kamera", search_type="ExactSearch")
+
+    assert result["items"][0]["itemId"] == 88
+    assert captured["method"] == "GET"
+    parsed = urlparse(str(captured["path"]))
+    assert parsed.path == "/search"
+    assert parse_qs(parsed.query) == {
+        "q": ["kamera"],
+        "paging": ["1"],
+        "sortBy": ["Relevance"],
+        "languageCodeIso2": ["sv"],
+        "searchType": ["ExactSearch"],
+    }
+
+
+def test_search_page_raises_when_next_data_is_missing() -> None:
+    client = TraderaClient()
+    client._request = lambda *_args, **_kwargs: "<html></html>"  # type: ignore[method-assign]
+
+    with pytest.raises(TraderaApiError, match="Could not parse search page response"):
+        client.search("kamera", item_status="Unsold")
+
+
 def test_item_returns_dict_or_raises() -> None:
     client = TraderaClient()
     client._request = lambda *_args, **_kwargs: {"itemId": 123}  # type: ignore[method-assign]

{tradera_cli-0.1.0 → tradera_cli-0.1.1}/tests/test_cli.py

@@ -64,6 +64,14 @@ def test_cmd_search_and_no_translate(monkeypatch: pytest.MonkeyPatch, capsys: py
         sort="Relevance",
         lang="sv",
         country="SE",
+        item_status="Sold",
+        condition="Oanvänt",
+        item_type="FixedPrice",
+        from_price=100,
+        to_price=500,
+        allowed_buyer_regions="eu",
+        counties=["Stockholm", "Uppsala"],
+        search_type="ExactSearch",
         no_translate=True,
         format="table",
     )
@@ -72,6 +80,14 @@ def test_cmd_search_and_no_translate(monkeypatch: pytest.MonkeyPatch, capsys: py
 
     assert code == 0
     assert calls["automatic_translation_preferred"] is False
+    assert calls["item_status"] == "Sold"
+    assert calls["condition"] == "Oanvänt"
+    assert calls["item_type"] == "FixedPrice"
+    assert calls["from_price"] == 100
+    assert calls["to_price"] == 500
+    assert calls["allowed_buyer_regions"] == "eu"
+    assert calls["counties"] == ["Stockholm", "Uppsala"]
+    assert calls["search_type"] == "ExactSearch"
     out = capsys.readouterr().out
     assert "itemId" in out
 

{tradera_cli-0.1.0 → tradera_cli-0.1.1}/tradera_cli/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.1.0"
+__version__ = "0.1.1"

{tradera_cli-0.1.0 → tradera_cli-0.1.1}/tradera_cli/api.py

@@ -1,14 +1,21 @@
 from __future__ import annotations
 
+import json
 import re
 from dataclasses import dataclass
 from typing import Any
+from urllib.parse import urlencode
 
 import requests
 from requests import RequestException
 
 
 BASE_URL = "https://www.tradera.com"
+ALLOWED_BUYER_REGIONS = {
+    "sweden": "sweden;eu;international",
+    "eu": "eu;international",
+    "international": "international",
+}
 
 
 class TraderaApiError(RuntimeError):
@@ -25,7 +32,7 @@ class TraderaClient:
         self.session.headers.update(
             {
                 "accept": "application/json, text/plain, */*",
-                "user-agent": "tradera-cli/0.1.0",
+                "user-agent": "tradera-cli/0.1.1",
             }
         )
 
@@ -84,7 +91,43 @@ class TraderaClient:
         language_code_iso2: str = "sv",
         shipping_country_code_iso2: str = "SE",
         automatic_translation_preferred: bool = True,
+        item_status: str | None = None,
+        condition: str | None = None,
+        item_type: str | None = None,
+        from_price: int | None = None,
+        to_price: int | None = None,
+        allowed_buyer_regions: str | None = None,
+        counties: list[str] | None = None,
+        search_type: str | None = None,
     ) -> dict[str, Any]:
+        normalized_item_status = item_status or "Active"
+        page_filters: dict[str, str] = {}
+        if search_type:
+            page_filters["searchType"] = search_type
+        if normalized_item_status in {"Sold", "Unsold"}:
+            page_filters["itemStatus"] = normalized_item_status
+        if condition:
+            page_filters["af-condition"] = condition
+        if item_type and item_type != "All":
+            page_filters["itemType"] = item_type
+        if from_price is not None:
+            page_filters["fromPrice"] = str(from_price)
+        if to_price is not None:
+            page_filters["toPrice"] = str(to_price)
+        if allowed_buyer_regions:
+            page_filters["allowedBuyerRegions"] = ALLOWED_BUYER_REGIONS[allowed_buyer_regions]
+        if counties:
+            page_filters["counties"] = ";".join(counties)
+
+        if page_filters:
+            return self._search_page(
+                query=query,
+                page=page,
+                sort_by=sort_by,
+                language_code_iso2=language_code_iso2,
+                filters=page_filters,
+            )
+
         payload: dict[str, Any] = {
             "isCsaSearchQuery": False,
             "query": query,
@@ -118,6 +161,39 @@ class TraderaClient:
         }
         return self._request("POST", "/api/webapi/discover/web/independent-search", json=payload)
 
+    def _search_page(
+        self,
+        query: str,
+        page: int,
+        sort_by: str,
+        language_code_iso2: str,
+        filters: dict[str, str],
+    ) -> dict[str, Any]:
+        params = {
+            "q": query,
+            "paging": page,
+            "sortBy": sort_by,
+            "languageCodeIso2": language_code_iso2.lower(),
+        }
+        params.update(filters)
+        html = self._request("GET", f"/search?{urlencode(params)}")
+        if not isinstance(html, str):
+            raise TraderaApiError("Unexpected search page response")
+
+        match = re.search(r'<script id="__NEXT_DATA__" type="application/json">(.*?)</script>', html)
+        if not match:
+            raise TraderaApiError("Could not parse search page response")
+
+        try:
+            data = json.loads(match.group(1))
+        except ValueError as exc:
+            raise TraderaApiError("Invalid search page data") from exc
+
+        discover = data.get("props", {}).get("pageProps", {}).get("initialState", {}).get("discover")
+        if not isinstance(discover, dict):
+            raise TraderaApiError("Unexpected search page data")
+        return discover
+
     def item(self, item_id: int) -> dict[str, Any]:
         data = self._request("GET", f"/ajax/item/{item_id}")
         if not isinstance(data, dict):

{tradera_cli-0.1.0 → tradera_cli-0.1.1}/tradera_cli/cli.py

@@ -34,6 +34,14 @@ def cmd_search(args: argparse.Namespace) -> int:
         language_code_iso2=args.lang,
         shipping_country_code_iso2=args.country,
         automatic_translation_preferred=not args.no_translate,
+        item_status=args.item_status,
+        condition=args.condition,
+        item_type=args.item_type,
+        from_price=args.from_price,
+        to_price=args.to_price,
+        allowed_buyer_regions=args.allowed_buyer_regions,
+        counties=args.counties,
+        search_type=args.search_type,
     )
     rows = normalize_search_rows(data)
     _print_output(
@@ -82,6 +90,14 @@ def build_parser() -> argparse.ArgumentParser:
     search.add_argument("--sort", default="Relevance")
     search.add_argument("--lang", default="sv")
     search.add_argument("--country", default="SE")
+    search.add_argument("--item-status", choices=["Active", "Sold", "Unsold"])
+    search.add_argument("--condition", choices=["Oanvänt", "Mycket gott skick", "Gott skick", "Okej skick", "Defekt"])
+    search.add_argument("--item-type", choices=["All", "Auction", "FixedPrice", "ContactOnly"])
+    search.add_argument("--from-price", type=int)
+    search.add_argument("--to-price", type=int)
+    search.add_argument("--allowed-buyer-regions", choices=["sweden", "eu", "international"])
+    search.add_argument("--counties", nargs="+")
+    search.add_argument("--search-type", choices=["ExactSearch"])
     search.add_argument("--no-translate", action="store_true")
     search.add_argument("--format", choices=["table", "json", "jsonl"], default="table")
     search.set_defaults(func=cmd_search)

{tradera_cli-0.1.0 → tradera_cli-0.1.1/tradera_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradera-cli
-Version: 0.1.0
+Version: 0.1.1
 Summary: CLI for Tradera web endpoints
 Author: Johnny W
 License-Expression: MIT
@@ -69,6 +69,11 @@ tradera search "iphone"
 tradera search "pokemon" --page 2 --page-size 20
 tradera search "kamera" --sort AddedOn --format json
 tradera search "klocka" --country SE --lang sv --format jsonl
+tradera search "lego" --item-status Sold --format json
+tradera search "lego" --condition "Oanvänt" --format json
+tradera search "lego" --item-type FixedPrice --from-price 100 --to-price 500
+tradera search "lego" --allowed-buyer-regions eu --counties Stockholm Uppsala
+tradera search "lego city" --search-type ExactSearch
 ```
 
 ### Get item details
@@ -105,6 +110,14 @@ Search command (`tradera search`) supports:
 | `--sort` | Sort mode (default: `Relevance`) |
 | `--lang` | Language code (default: `sv`) |
 | `--country` | Shipping country code (default: `SE`) |
+| `--item-status` | Filter by item status: `Active`, `Sold`, `Unsold` |
+| `--condition` | Filter by condition: `Oanvänt`, `Mycket gott skick`, `Gott skick`, `Okej skick`, `Defekt` |
+| `--item-type` | Filter by listing type: `All`, `Auction`, `FixedPrice`, `ContactOnly` |
+| `--from-price` | Minimum price |
+| `--to-price` | Maximum price |
+| `--allowed-buyer-regions` | Buyer region filter: `sweden`, `eu`, `international` |
+| `--counties` | Pickup counties, passed as one or more values, for example `Stockholm Uppsala` |
+| `--search-type` | Search mode. Current supported value: `ExactSearch` |
 | `--no-translate` | Disable automatic translation preference |
 | `--format` | Output format: `table`, `json`, `jsonl` |