PyPI - tradera-cli - Versions diffs - 0.1.1__tar.gz → 0.1.2__tar.gz - Mend

tradera-cli 0.1.1tar.gz → 0.1.2tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

{tradera_cli-0.1.1 → tradera_cli-0.1.2}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradera-cli
-Version: 0.1.1
+Version: 0.1.2
 Summary: CLI for Tradera web endpoints
 Author: Johnny W
 License-Expression: MIT

{tradera_cli-0.1.1 → tradera_cli-0.1.2}/pyproject.toml RENAMED Viewed

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

{tradera_cli-0.1.1 → tradera_cli-0.1.2}/tests/test_api.py RENAMED Viewed

@@ -420,6 +420,45 @@ def test_item_returns_dict_or_raises() -> None:
         client.item(123)
+def test_item_payment_calculations_returns_dict() -> None:
+    client = TraderaClient()
+    next_data = {
+        "props": {
+            "pageProps": {
+                "initialState": {
+                    "views": {
+                        "viewItem": {
+                            "itemDetails": {
+                                "paymentCalculations": {
+                                    "paymentAmountForBid": 4927,
+                                    "buyerProtectionCostForFixedPrice": 242,
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    client._request = lambda *_args, **_kwargs: (  # type: ignore[method-assign]
+        '<script id="__NEXT_DATA__" type="application/json">'
+        f"{json.dumps(next_data)}"
+        "</script>"
+    )
+    result = client.item_payment_calculations(123)
+    assert result["paymentAmountForBid"] == 4927
+    assert result["buyerProtectionCostForFixedPrice"] == 242
+def test_item_payment_calculations_raises_on_missing_next_data() -> None:
+    client = TraderaClient()
+    client._request = lambda *_args, **_kwargs: "<html></html>"  # type: ignore[method-assign]
+    with pytest.raises(TraderaApiError, match="Could not parse item page response"):
+        client.item_payment_calculations(123)
 def test_categories_calls_expected_path() -> None:
     client = TraderaClient()
     captured: dict[str, str] = {}
@@ -440,5 +479,11 @@ def test_categories_calls_expected_path() -> None:
 def test_parse_item_id_from_digits_and_url_and_invalid() -> None:
     assert parse_item_id("123456") == 123456
     assert parse_item_id("https://www.tradera.com/item/123456789/test") == 123456789
+    assert (
+        parse_item_id(
+            "https://www.tradera.com/item/1000006/707858418/playstation-5-disc-edition-the-last-of-us-dualsense"
+        )
+        == 707858418
+    )
     with pytest.raises(ValueError, match="Could not parse item id"):
         parse_item_id("https://www.tradera.com/item/no-id")

{tradera_cli-0.1.1 → tradera_cli-0.1.2}/tests/test_cli.py RENAMED Viewed

@@ -23,6 +23,11 @@ class DummyClient:
             raise self.error
         return self.payload or {}
+    def item_payment_calculations(self, _item_id: int) -> dict:
+        if self.error:
+            raise self.error
+        return {}
     def categories(self, **_kwargs: object) -> list:
         if self.error:
             raise self.error
@@ -92,7 +97,7 @@ def test_cmd_search_and_no_translate(monkeypatch: pytest.MonkeyPatch, capsys: py
     assert "itemId" in out
-def test_cmd_item_table_and_json(monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]) -> None:
+def test_cmd_item_table_json_and_jsonl(monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]) -> None:
     class ItemClient(DummyClient):
         def item(self, _item_id: int) -> dict:
             return {
@@ -100,9 +105,13 @@ def test_cmd_item_table_and_json(monkeypatch: pytest.MonkeyPatch, capsys: pytest
                 "shortDescription": "Demo",
                 "buyNowPrice": 99,
                 "currency": "SEK",
+                "buyerProtectionInfo": {"totalPrice": 109, "fee": 10},
                 "seller": {"alias": "john"},
             }
+        def item_payment_calculations(self, _item_id: int) -> dict:
+            return {}
     monkeypatch.setattr(cli, "TraderaClient", ItemClient)
     table_args = argparse.Namespace(item="12", format="table")
@@ -110,11 +119,24 @@ def test_cmd_item_table_and_json(monkeypatch: pytest.MonkeyPatch, capsys: pytest
     table_out = capsys.readouterr().out
     assert "seller" in table_out
     assert "john" in table_out
+    assert "buyerProtectionTotal" in table_out
+    assert "109" in table_out
+    assert "10" in table_out
     json_args = argparse.Namespace(item="12", format="json")
     assert cli.cmd_item(json_args) == 0
     json_out = capsys.readouterr().out
     assert '"itemId": 12' in json_out
+    assert '"buyerProtectionTotal": 109' in json_out
+    assert '"buyerProtectionFee": 10' in json_out
+    jsonl_args = argparse.Namespace(item="12", format="jsonl")
+    assert cli.cmd_item(jsonl_args) == 0
+    jsonl_out = capsys.readouterr().out.strip()
+    assert '"itemId": 12' in jsonl_out
+    assert '"buyerProtectionTotal": 109' in jsonl_out
+    assert '"buyerProtectionFee": 10' in jsonl_out
+    assert "\n" not in jsonl_out
 def test_cmd_item_table_handles_non_dict_seller(monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]) -> None:
@@ -122,6 +144,9 @@ def test_cmd_item_table_handles_non_dict_seller(monkeypatch: pytest.MonkeyPatch,
         def item(self, _item_id: int) -> dict:
             return {"id": 33, "title": "No seller dict", "seller": "none"}
+        def item_payment_calculations(self, _item_id: int) -> dict:
+            return {}
     monkeypatch.setattr(cli, "TraderaClient", ItemClient)
     args = argparse.Namespace(item="33", format="table")
@@ -130,6 +155,58 @@ def test_cmd_item_table_handles_non_dict_seller(monkeypatch: pytest.MonkeyPatch,
     assert "No seller dict" in out
+def test_cmd_item_table_supports_hyphenated_buyer_protection_key(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    class ItemClient(DummyClient):
+        def item(self, _item_id: int) -> dict:
+            return {
+                "id": 44,
+                "title": "With fee",
+                "buyer-protection-info": {"priceTotal": 220, "serviceFee": 20},
+            }
+        def item_payment_calculations(self, _item_id: int) -> dict:
+            return {}
+    monkeypatch.setattr(cli, "TraderaClient", ItemClient)
+    args = argparse.Namespace(item="44", format="table")
+    assert cli.cmd_item(args) == 0
+    out = capsys.readouterr().out
+    assert "buyerProtectionTotal" in out
+    assert "220" in out
+    assert "20" in out
+def test_cmd_item_table_uses_payment_calculations_for_bid_total(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    class ItemClient(DummyClient):
+        def item(self, _item_id: int) -> dict:
+            return {
+                "itemId": 55,
+                "shortDescription": "Auction item",
+                "leadingBid": 4690,
+                "bidCount": 1,
+                "currency": "SEK",
+                "seller": {"alias": "john"},
+            }
+        def item_payment_calculations(self, _item_id: int) -> dict:
+            return {"paymentAmountForBid": 4927}
+    monkeypatch.setattr(cli, "TraderaClient", ItemClient)
+    args = argparse.Namespace(item="55", format="table")
+    assert cli.cmd_item(args) == 0
+    out = capsys.readouterr().out
+    assert "buyerProtectionTotal" in out
+    assert "4927" in out
+    assert "237" in out
+    assert "4690" in out
 def test_cmd_categories_jsonl(monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]) -> None:
     class CategoriesClient(DummyClient):
         def categories(self, **_kwargs: object) -> list:

{tradera_cli-0.1.1 → tradera_cli-0.1.2}/tradera_cli/api.py RENAMED Viewed

@@ -4,7 +4,7 @@ import json
 import re
 from dataclasses import dataclass
 from typing import Any
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urlparse
 import requests
 from requests import RequestException
@@ -200,6 +200,33 @@ class TraderaClient:
             raise TraderaApiError(f"Unexpected item response for item {item_id}")
         return data
+    def item_payment_calculations(self, item_id: int) -> dict[str, Any]:
+        html = self._request("GET", f"/item/{item_id}")
+        if not isinstance(html, str):
+            raise TraderaApiError(f"Unexpected item page response for item {item_id}")
+        match = re.search(r'<script id="__NEXT_DATA__" type="application/json">(.*?)</script>', html)
+        if not match:
+            raise TraderaApiError(f"Could not parse item page response for item {item_id}")
+        try:
+            data = json.loads(match.group(1))
+        except ValueError as exc:
+            raise TraderaApiError(f"Invalid item page data for item {item_id}") from exc
+        payment_calculations = (
+            data.get("props", {})
+            .get("pageProps", {})
+            .get("initialState", {})
+            .get("views", {})
+            .get("viewItem", {})
+            .get("itemDetails", {})
+            .get("paymentCalculations", {})
+        )
+        if not isinstance(payment_calculations, dict):
+            raise TraderaApiError(f"Unexpected payment calculations for item {item_id}")
+        return payment_calculations
     def categories(self, level: int = 1, lang: str = "sv") -> Any:
         return self._request("GET", f"/api/categories/{level}?languageCodeIso2={lang}&next=1")
@@ -207,7 +234,19 @@ class TraderaClient:
 def parse_item_id(value: str) -> int:
     if value.isdigit():
         return int(value)
-    match = re.search(r"/(\d{6,})", value)
-    if not match:
+    parsed = urlparse(value)
+    path = parsed.path or value
+    segments = [segment for segment in path.split("/") if segment]
+    if "item" in segments:
+        item_index = segments.index("item")
+        numeric_after_item = [segment for segment in segments[item_index + 1 :] if segment.isdigit()]
+        if len(numeric_after_item) >= 2:
+            return int(numeric_after_item[1])
+        if numeric_after_item:
+            return int(numeric_after_item[0])
+    matches = re.findall(r"(\d{6,})", value)
+    if not matches:
         raise ValueError(f"Could not parse item id from: {value}")
-    return int(match.group(1))
+    return int(matches[-1])

{tradera_cli-0.1.1 → tradera_cli-0.1.2}/tradera_cli/cli.py RENAMED Viewed

@@ -14,6 +14,32 @@ from .formatters import (
 )
+def _extract_buyer_protection(data: dict[str, Any], payment_calculations: dict[str, Any] | None = None) -> tuple[Any, Any]:
+    info = data.get("buyerProtectionInfo")
+    if not isinstance(info, dict):
+        info = data.get("buyer-protection-info")
+    if not isinstance(info, dict):
+        info = {}
+    total = info.get("total") or info.get("totalPrice") or info.get("totalAmount") or info.get("priceTotal") or ""
+    fee = info.get("fee") or info.get("buyerProtectionFee") or info.get("serviceFee") or ""
+    if isinstance(payment_calculations, dict):
+        if data.get("bidCount") and payment_calculations.get("paymentAmountForBid") is not None:
+            total = payment_calculations.get("paymentAmountForBid")
+            leading_bid = data.get("leadingBid")
+            if isinstance(leading_bid, (int, float)) and isinstance(total, (int, float)):
+                fee = total - leading_bid
+        elif payment_calculations.get("paymentAmountForFixedPrice") is not None:
+            total = payment_calculations.get("paymentAmountForFixedPrice")
+            fixed_price = data.get("fixedPrice")
+            if payment_calculations.get("buyerProtectionCostForFixedPrice") is not None:
+                fee = payment_calculations.get("buyerProtectionCostForFixedPrice")
+            elif isinstance(fixed_price, (int, float)) and isinstance(total, (int, float)):
+                fee = total - fixed_price
+    return total, fee
 def _print_output(raw: Any, rows: list[dict[str, Any]], fmt: str, columns: list[str]) -> None:
     if fmt == "json":
         print(to_json(raw))
@@ -57,17 +83,54 @@ def cmd_item(args: argparse.Namespace) -> int:
     client = TraderaClient()
     item_id = parse_item_id(args.item)
     data = client.item(item_id)
+    payment_calculations: dict[str, Any] = {}
+    try:
+        payment_calculations = client.item_payment_calculations(item_id)
+    except TraderaApiError:
+        payment_calculations = {}
+    buyer_protection_total, buyer_protection_fee = _extract_buyer_protection(data, payment_calculations)
     if args.format == "table":
         row = {
             "itemId": data.get("itemId") or data.get("id") or item_id,
             "title": data.get("shortDescription") or data.get("title") or "",
-            "price": data.get("buyNowPrice") or data.get("nextBid") or data.get("price") or "",
+            "price": (
+                data.get("buyNowPrice")
+                or data.get("nextBid")
+                or data.get("price")
+                or data.get("leadingBid")
+                or data.get("fixedPrice")
+                or data.get("openingBid")
+                or ""
+            ),
             "currency": data.get("currency") or "SEK",
+            "buyerProtectionTotal": buyer_protection_total,
+            "buyerProtectionFee": buyer_protection_fee,
             "seller": (data.get("seller") or {}).get("alias") if isinstance(data.get("seller"), dict) else "",
         }
-        print(to_table([row], ["itemId", "title", "price", "currency", "seller"]))
+        print(
+            to_table(
+                [row],
+                ["itemId", "title", "price", "currency", "buyerProtectionTotal", "buyerProtectionFee", "seller"],
+            )
+        )
     else:
-        print(to_json(data))
+        enriched: dict[str, Any] = {}
+        inserted = False
+        for key, value in data.items():
+            enriched[key] = value
+            if key == "leadingBid":
+                enriched["buyerProtectionTotal"] = buyer_protection_total
+                enriched["buyerProtectionFee"] = buyer_protection_fee
+                inserted = True
+        if not inserted:
+            enriched["buyerProtectionTotal"] = buyer_protection_total
+            enriched["buyerProtectionFee"] = buyer_protection_fee
+        if args.format == "jsonl":
+            print(to_jsonl([enriched]))
+        else:
+            print(to_json(enriched))
     return 0
@@ -104,7 +167,7 @@ def build_parser() -> argparse.ArgumentParser:
     item = subparsers.add_parser("item", help="Get item details")
     item.add_argument("item", help="Item id or item URL")
-    item.add_argument("--format", choices=["table", "json"], default="json")
+    item.add_argument("--format", choices=["table", "json", "jsonl"], default="json")
     item.set_defaults(func=cmd_item)
     categories = subparsers.add_parser("categories", help="List categories by level")

{tradera_cli-0.1.1 → tradera_cli-0.1.2}/tradera_cli.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradera-cli
-Version: 0.1.1
+Version: 0.1.2
 Summary: CLI for Tradera web endpoints
 Author: Johnny W
 License-Expression: MIT