blocket-api 0.3.92__tar.gz → 0.3.94__tar.gz

{blocket_api-0.3.92 → blocket_api-0.3.94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blocket_api
-Version: 0.3.92
+Version: 0.3.94
 Summary: A python API wrapper for blocket.se
 Author-email: dunderrrrrr <emil.bjorkroth@gmail.com>
 Requires-Python: >=3.10
@@ -17,7 +17,7 @@ Requires-Dist: mkdocs-material>=9.6.21
 Requires-Dist: mkdocs-swagger-ui-tag>=0.7.2
 Requires-Dist: websockets>=15.0.1
 Requires-Dist: beautifulsoup4>=4.14.2
-Requires-Dist: ruff>=0.14.5
+Requires-Dist: ruff>=0.14.7
 Dynamic: license-file
 
 <p align="center">
@@ -32,9 +32,6 @@ BlocketAPI allows users to search [blocket.se](https://blocket.se/) for ads.
 
 > Blocket is one of Sweden's largest online marketplaces. It was founded in 1996 and allows users to buy and sell a wide range of items, including cars, real estate, jobs, services, and second-hand goods. The platform is known for its extensive reach and user-friendly interface, making it a popular choice for Swedes looking to purchase or sell items quickly and efficiently.
 
-> [!NOTE]  
-> Blocket recently released a new version of their site which caused this package to break. But do not fear, we are actively working to try and restore all functionality. More info in [issue #43](https://github.com/dunderrrrrr/blocket_api/issues/41).
-
 ## 🧑‍💻️ Install
 
 Install BlocketAPI via PyPI...
@@ -62,13 +59,13 @@ api = BlocketAPI()
 
 # search all of blocket
 api.search(
-    "Vinterdäck Audi",
+    "Tamagotchi",
     sort_order=SortOrder.PRICE_ASC,
     locations=[Location.STOCKHOLM, Location.UPPSALA],
-    category=Category.FORDONSTILLBEHOR,
+    category=Category.FRITID_HOBBY_OCH_UNDERHALLNING,
 )
 
-# search for cars only
+# search for cars
 api.search_car(
     "Audi", # query is optional
     sort_order=CarSortOrder.MILEAGE_ASC,
@@ -80,11 +77,41 @@ api.search_car(
     locations=[Location.STOCKHOLM],
 )
 
-# Get a recommerce or car ad
-from blocket_api import CarAd, RecommerceAd
+# search for boats
+from blocket_api import BoatType
+
+api.search_boat(
+    "Mercury", # query is optional
+    types=[BoatType.DAYCRUISER],
+    locations=[Location.STOCKHOLM],
+    length_from=10,
+    length_to=15,    
+    price_from=20000,
+    price_to=90000,
+)
+
+# search for motorcycles
+from blocket_api import McType, McModel
+
+api.search_mc(
+    "TC 150", # query is optional
+    types=[McType.SPORT],
+    locations=[Location.STOCKHOLM],
+    models=[McModel.DUCATI],
+    price_from=20000,
+    price_to=90000,
+    engine_volume_from=100,
+    engine_volume_to=200,
+)
+
+
+# get ad details
+from blocket_api import CarAd, RecommerceAd, BoatAd, McAd
 
 api.get_ad(RecommerceAd(12345678))
 api.get_ad(CarAd(12345678))
+api.get_ad(BoatAd(12345678))
+api.get_ad(McAd(12345678))
 ```
 
 ## 📝 Notes

{blocket_api-0.3.92 → blocket_api-0.3.94}/README.md

@@ -10,9 +10,6 @@ BlocketAPI allows users to search [blocket.se](https://blocket.se/) for ads.
 
 > Blocket is one of Sweden's largest online marketplaces. It was founded in 1996 and allows users to buy and sell a wide range of items, including cars, real estate, jobs, services, and second-hand goods. The platform is known for its extensive reach and user-friendly interface, making it a popular choice for Swedes looking to purchase or sell items quickly and efficiently.
 
-> [!NOTE]  
-> Blocket recently released a new version of their site which caused this package to break. But do not fear, we are actively working to try and restore all functionality. More info in [issue #43](https://github.com/dunderrrrrr/blocket_api/issues/41).
-
 ## 🧑‍💻️ Install
 
 Install BlocketAPI via PyPI...
@@ -40,13 +37,13 @@ api = BlocketAPI()
 
 # search all of blocket
 api.search(
-    "Vinterdäck Audi",
+    "Tamagotchi",
     sort_order=SortOrder.PRICE_ASC,
     locations=[Location.STOCKHOLM, Location.UPPSALA],
-    category=Category.FORDONSTILLBEHOR,
+    category=Category.FRITID_HOBBY_OCH_UNDERHALLNING,
 )
 
-# search for cars only
+# search for cars
 api.search_car(
     "Audi", # query is optional
     sort_order=CarSortOrder.MILEAGE_ASC,
@@ -58,11 +55,41 @@ api.search_car(
     locations=[Location.STOCKHOLM],
 )
 
-# Get a recommerce or car ad
-from blocket_api import CarAd, RecommerceAd
+# search for boats
+from blocket_api import BoatType
+
+api.search_boat(
+    "Mercury", # query is optional
+    types=[BoatType.DAYCRUISER],
+    locations=[Location.STOCKHOLM],
+    length_from=10,
+    length_to=15,    
+    price_from=20000,
+    price_to=90000,
+)
+
+# search for motorcycles
+from blocket_api import McType, McModel
+
+api.search_mc(
+    "TC 150", # query is optional
+    types=[McType.SPORT],
+    locations=[Location.STOCKHOLM],
+    models=[McModel.DUCATI],
+    price_from=20000,
+    price_to=90000,
+    engine_volume_from=100,
+    engine_volume_to=200,
+)
+
+
+# get ad details
+from blocket_api import CarAd, RecommerceAd, BoatAd, McAd
 
 api.get_ad(RecommerceAd(12345678))
 api.get_ad(CarAd(12345678))
+api.get_ad(BoatAd(12345678))
+api.get_ad(McAd(12345678))
 ```
 
 ## 📝 Notes

blocket_api-0.3.94/blocket_api/__init__.py

@@ -0,0 +1,37 @@
+from .ad_parser import BoatAd, CarAd, McAd, RecommerceAd
+from .blocket import BlocketAPI, Location
+from .constants import (
+    BoatSortOrder,
+    BoatType,
+    CarColor,
+    CarModel,
+    CarSortOrder,
+    CarTransmission,
+    Category,
+    McModel,
+    McSortOrder,
+    McType,
+    SortOrder,
+    SubCategory,
+)
+
+__all__ = [
+    "BlocketAPI",
+    "Location",
+    "BoatAd",
+    "CarAd",
+    "BoatSortOrder",
+    "BoatType",
+    "CarColor",
+    "CarModel",
+    "CarSortOrder",
+    "CarTransmission",
+    "Category",
+    "SortOrder",
+    "SubCategory",
+    "RecommerceAd",
+    "McModel",
+    "McSortOrder",
+    "McType",
+    "McAd",
+]

blocket_api-0.3.94/blocket_api/ad_parser.py

@@ -0,0 +1,199 @@
+import json
+import re
+from dataclasses import dataclass
+from typing import Any
+
+from bs4 import BeautifulSoup, NavigableString, Tag
+from httpx import Response
+
+from .constants import SITE_URL
+
+
+@dataclass(frozen=True)
+class RecommerceAd:
+    id: int
+
+    @property
+    def url(self) -> str:
+        return f"{SITE_URL}/recommerce/forsale/item/{self.id}"
+
+    def parse(self, response: Response) -> Any:
+        soup = BeautifulSoup(response.content, "html.parser")
+        json_script_tag = soup.select_one(
+            'script:-soup-contains("window.__staticRouterHydrationData")'
+        )
+        if not json_script_tag:
+            return {}
+
+        if match := re.search(r'JSON\.parse\("(.+)"\)', json_script_tag.text):
+            raw_json = match.group(1)
+            escaped = raw_json.encode("utf-8").decode("unicode_escape")
+            return json.loads(escaped.encode("latin1").decode("utf-8"))
+        else:
+            return {}
+
+
+@dataclass(frozen=True)
+class MobilityAd:
+    id: int
+
+    @property
+    def url(self) -> str:
+        return f"{SITE_URL}/mobility/item/{self.id}"
+
+    def parse(self, response: Response) -> dict:
+        soup = BeautifulSoup(response.content, "html.parser")
+        grid = soup.find("div", class_="grid grid-cols-1 md:grid-cols-3 md:gap-x-32")
+
+        if not grid:
+            return {}
+
+        data: dict[str, Any] = {"url": self.url}
+
+        self._extract_title_and_subtitle(grid, data)
+        self._extract_quick_specs(grid, data)
+        self._extract_price(grid, data)
+        self._extract_description(grid, data)
+        self._extract_specifications(grid, data)
+        self._extract_seller_type(soup, data)
+        self._extract_ad_id(soup, data)
+
+        self.extend(data, soup, grid)
+
+        return data
+
+    def _extract_title_and_subtitle(self, grid: Tag, data: dict) -> None:
+        if title := grid.find("h1", class_=lambda x: x and "t1" in x):
+            data["title"] = title.get_text(strip=True)
+
+        if subtitle := grid.find("p", class_=lambda x: x and "s-text-subtle" in x):
+            data["subtitle"] = subtitle.get_text(strip=True)
+
+    def _extract_quick_specs(self, grid: Tag, data: dict) -> None:
+        if specs_grid := grid.find(
+            "div", class_=lambda x: x and "grid" in x and "gap-24" in x
+        ):
+            for item in specs_grid.find_all("div", class_="flex gap-16 hyphens-auto"):
+                label = item.find("span", class_="s-text-subtle")
+                value = item.find("p", class_="m-0 font-bold")
+                if label and value:
+                    label_text = label.get_text(strip=True)
+                    value_text = value.get_text(strip=True)
+                    key = getattr(self, "quick_spec_mapping", {}).get(
+                        label_text, label_text.lower().replace(" ", "_")
+                    )
+                    data[key] = value_text
+
+    def _extract_price(self, grid: Tag, data: dict) -> None:
+        if price_section := grid.find("div", class_="border-t pt-40 mt-40"):
+            price_elem = price_section.find("span", class_="t2")
+            if price_elem:
+                data["price"] = price_elem.get_text(strip=True)
+
+    def _extract_description(self, grid: Tag, data: dict) -> None:
+        for section in grid.find_all("section", class_="border-t mt-40 pt-40"):
+            h2 = section.find("h2", class_="t3 mb-0")
+            if h2 and "beskrivning" in h2.get_text(strip=True).lower():
+                desc_div = section.find("div", class_="whitespace-pre-wrap")
+                if desc_div:
+                    data["description"] = desc_div.get_text(strip=True)
+                return
+
+    def _extract_specifications(self, grid: Tag, data: dict) -> None:
+        specs_section = grid.find("section", class_="key-info-section")
+        if not specs_section:
+            return
+        dl = specs_section.find("dl")
+        if not dl:
+            return
+
+        specifications = {}
+        for div in dl.find_all("div", style="break-inside:avoid-column"):
+            dt = div.find("dt")
+            dd = div.find("dd")
+            if dt and dd:
+                specifications[dt.get_text(strip=True)] = dd.get_text(strip=True)
+
+        if specifications:
+            data["specifications"] = specifications
+
+    def _extract_seller_type(self, soup: BeautifulSoup, data: dict) -> None:
+        # Look for a div whose class contains "dealer"
+        data["seller_type"] = (
+            "dealer"
+            if soup.find("div", class_=lambda x: x and "dealer" in x.lower())
+            else "private"
+        )
+
+    def _extract_ad_id(self, soup: BeautifulSoup, data: dict) -> None:
+        label = next(
+            (
+                p
+                for p in soup.find_all("p")
+                if isinstance(p.string, NavigableString) and "Annons-ID" in p.string
+            ),
+            None,
+        )
+        if label:
+            elem = label.find_next("p")
+            if elem:
+                data["ad_id"] = elem.get_text(strip=True)
+
+    def extend(self, data: dict, soup: BeautifulSoup, grid: Tag) -> None:
+        pass
+
+
+class CarAd(MobilityAd):
+    quick_spec_mapping = {
+        "Modellår": "model_year",
+        "Miltal": "mileage",
+        "Växellåda": "transmission",
+        "Drivmedel": "fuel",
+    }
+
+    def extend(self, data: dict, soup: BeautifulSoup, grid: Tag) -> None:
+        equip_section = next(
+            (
+                h2
+                for h2 in grid.find_all("h2")
+                if isinstance(h2.string, NavigableString) and "Utrustning" in h2.string
+            ),
+            None,
+        )
+        if equip_section:
+            parent = equip_section.find_parent("section")
+            if parent:
+                items = [li.get_text(strip=True) for li in parent.find_all("li")]
+                if items:
+                    data["equipment"] = items
+
+
+class BoatAd(MobilityAd):
+    quick_spec_mapping = {
+        "Modellår": "model_year",
+        "Längd": "length",
+        "Motortyp": "engine_type",
+        "Säten": "seats",
+    }
+
+    def extend(self, data: dict, soup: BeautifulSoup, grid: Tag) -> None:
+        if place_h2 := soup.find(
+            "h2", text=lambda t: isinstance(t, NavigableString) and "Plats" in t
+        ):
+            if link := place_h2.find_parent():
+                data["location"] = link.get_text(strip=True)
+
+
+class McAd(MobilityAd):
+    quick_spec_mapping = {
+        "Modellår": "model_year",
+        "Motorvolym": "engine_volume",
+        "Typ": "type",
+    }
+
+    def extend(self, data: dict, soup: BeautifulSoup, grid: Tag) -> None:
+        if place_h2 := soup.find(
+            "h2", text=lambda t: isinstance(t, NavigableString) and "Plats" in t
+        ):
+            if link := place_h2.find_parent():
+                data["location"] = link.get_text(strip=True)

blocket_api-0.3.94/blocket_api/blocket.py

@@ -0,0 +1,184 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any
+
+import httpx
+from httpx import Response
+
+from .ad_parser import BoatAd, CarAd, McAd, RecommerceAd
+from .constants import (
+    HEADERS,
+    SITE_URL,
+    BoatType,
+    CarColor,
+    CarModel,
+    CarSortOrder,
+    CarTransmission,
+    Category,
+    Location,
+    McModel,
+    McSortOrder,
+    McType,
+    SortOrder,
+    SubCategory,
+)
+
+
+@dataclass(frozen=True)
+class QueryParam:
+    name: str
+    value: str | int
+
+
+def _request(*, url: str, params: list[QueryParam]) -> Response:
+    response = httpx.get(
+        url,
+        headers=HEADERS,
+        params=[(param.name, param.value) for param in params],
+    )
+    response.raise_for_status()
+    return response
+
+
+@dataclass(frozen=True)
+class BlocketAPI:
+    def search(
+        self,
+        query: str,
+        *,
+        page: int = 1,
+        sort_order: SortOrder = SortOrder.RELEVANCE,
+        locations: list[Location] = [],
+        category: Category | None = None,
+        sub_category: SubCategory | None = None,
+    ) -> Any:
+        if category and sub_category:
+            raise AssertionError("Cannot specify both category and sub_categories")
+
+        url = f"{SITE_URL}/recommerce-search-page/api/search/SEARCH_ID_BAP_COMMON"
+
+        param_dict: dict[str, str | int | None] = {
+            "q": query,
+            "page": page,
+            "sort": sort_order.value,
+            "category": category.value if category else None,
+            "sub_category": sub_category.value if sub_category else None,
+        }
+
+        params = [QueryParam(k, v) for k, v in param_dict.items() if v is not None]
+
+        params.extend(QueryParam("location", loc.value) for loc in locations)
+
+        return _request(url=url, params=params).json()
+
+    def search_car(
+        self,
+        query: str | None = None,
+        *,
+        page: int = 1,
+        sort_order: CarSortOrder = CarSortOrder.RELEVANCE,
+        locations: list[Location] = [],
+        models: list[CarModel] = [],
+        price_from: int | None = None,
+        price_to: int | None = None,
+        year_from: int | None = None,
+        year_to: int | None = None,
+        milage_from: int | None = None,
+        milage_to: int | None = None,
+        colors: list[CarColor] = [],
+        transmissions: list[CarTransmission] = [],
+    ) -> Any:
+        url = f"{SITE_URL}/mobility/search/api/search/SEARCH_ID_CAR_USED"
+
+        param_dict: dict[str, str | int | None] = {
+            "q": query,
+            "page": page,
+            "sort": sort_order.value,
+            "price_from": price_from,
+            "price_to": price_to,
+            "year_from": year_from,
+            "year_to": year_to,
+            "milage_from": milage_from,
+            "milage_to": milage_to,
+        }
+
+        params = [QueryParam(k, v) for k, v in param_dict.items() if v is not None]
+
+        # Multi-value params
+        params.extend(QueryParam("location", loc.value) for loc in locations)
+        params.extend(QueryParam("make", model.value) for model in models)
+        params.extend(QueryParam("exterior_colour", color.value) for color in colors)
+        params.extend(QueryParam("transmission", t.value) for t in transmissions)
+
+        return _request(url=url, params=params).json()
+
+    def search_boat(
+        self,
+        query: str | None = None,
+        *,
+        page: int = 1,
+        sort_order: CarSortOrder = CarSortOrder.RELEVANCE,
+        types: list[BoatType] = [],
+        locations: list[Location] = [],
+        price_from: int | None = None,
+        price_to: int | None = None,
+        length_from: int | None = None,
+        length_to: int | None = None,
+    ) -> Any:
+        url = f"{SITE_URL}/mobility/search/api/search/SEARCH_ID_BOAT_USED"
+
+        param_dict: dict[str, str | int | None] = {
+            "q": query,
+            "page": page,
+            "sort": sort_order.value,
+            "price_from": price_from,
+            "price_to": price_to,
+            "length_feet_from": length_from,
+            "length_feet_to": length_to,
+        }
+
+        params = [QueryParam(k, v) for k, v in param_dict.items() if v is not None]
+
+        params.extend(QueryParam("class", t.value) for t in types)
+        params.extend(QueryParam("location", loc.value) for loc in locations)
+
+        return _request(url=url, params=params).json()
+
+    def search_mc(
+        self,
+        query: str | None = None,
+        *,
+        page: int = 1,
+        sort_order: McSortOrder = McSortOrder.RELEVANCE,
+        models: list[McModel] = [],
+        types: list[McType] = [],
+        locations: list[Location] = [],
+        price_from: int | None = None,
+        price_to: int | None = None,
+        engine_volume_from: int | None = None,
+        engine_volume_to: int | None = None,
+    ) -> Any:
+        url = f"{SITE_URL}/mobility/search/api/search/SEARCH_ID_MC_USED"
+
+        param_dict: dict[str, str | int | None] = {
+            "q": query,
+            "page": page,
+            "sort": sort_order.value,
+            "price_from": price_from,
+            "price_to": price_to,
+            "engine_volume_from": engine_volume_from,
+            "engine_volume_to": engine_volume_to,
+        }
+
+        params = [QueryParam(k, v) for k, v in param_dict.items() if v is not None]
+
+        params.extend(QueryParam("make", m.value) for m in models)
+        params.extend(QueryParam("location", loc.value) for loc in locations)
+        params.extend(QueryParam("type", t.value) for t in types)
+
+        return _request(url=url, params=params).json()
+
+    def get_ad(self, ad: RecommerceAd | CarAd | BoatAd | McAd) -> dict:
+        response = _request(url=ad.url, params=[])
+        return ad.parse(response)

{blocket_api-0.3.92 → blocket_api-0.3.94}/blocket_api/constants.py

@@ -21,7 +21,7 @@ class CarSortOrder(StrEnum):
     PUBLISHED_DESC = "PUBLISHED_DESC"
     PUBLISHED_ASC = "PUBLISHED_ASC"
 
-    # Car specific
+    # car specific
     MILEAGE_DESC = "MILEAGE_DESC"
     MILEAGE_ASC = "MILEAGE_ASC"
     MODEL = "MODEL"
@@ -29,6 +29,37 @@ class CarSortOrder(StrEnum):
     YEAR_ASC = "YEAR_ASC"
 
 
+class McSortOrder(StrEnum):
+    RELEVANCE = "RELEVANCE"
+    PRICE_DESC = "PRICE_DESC"
+    PRICE_ASC = "PRICE_ASC"
+    PUBLISHED_DESC = "PUBLISHED_DESC"
+    PUBLISHED_ASC = "PUBLISHED_ASC"
+
+    # mc specific
+    MILAGE_DESC = "MILAGE_DESC"
+    MILAGE_ASC = "MILAGE_ASC"
+    MODEL = "MODEL"
+    YEAR_DESC = "YEAR_DESC"
+    YEAR_ASC = "YEAR_ASC"
+
+
+class BoatSortOrder(StrEnum):
+    RELEVANCE = "RELEVANCE"
+    PRICE_DESC = "PRICE_DESC"
+    PRICE_ASC = "PRICE_ASC"
+    PUBLISHED_DESC = "PUBLISHED_DESC"
+    PUBLISHED_ASC = "PUBLISHED_ASC"
+
+    # boat specific
+    LENGTH_DESC = "LENGTH_DESC"
+    LENGTH_ASC = "LENGTH_ASC"
+    SPEED_DESC = "SPEED_DESC"
+    SPEED_ASC = "SPEED_ASC"
+    YEAR_DESC = "YEAR_DESC"
+    YEAR_ASC = "YEAR_ASC"
+
+
 class Location(StrEnum):
     BLEKINGE = "0.300010"
     DALARNA = "0.300020"
@@ -348,3 +379,139 @@ class CarColor(IntEnum):
 class CarTransmission(IntEnum):
     AUTOMATIC = 2
     MANUAL = 1
+
+
+class BoatType(IntEnum):
+    BOWRIDER = 7961
+    DAYCRUISER = 2184
+    FISKEBAT_ARBETSBAT = 6921
+    HYTTBAT = 7962
+    KABINBAT = 6923
+    POWERBOAT = 7960
+    RIB = 7343
+    SEGELBAT_MOTORSEGLARE = 2188
+    SMABAT_GUMMIBAT = 2186
+    SNIPA = 6922
+    STYRPULPETBAT = 3827
+    VATTENSKOTER = 2190
+    YACHT = 7959
+    ANNAT = 2258
+
+
+class McModel(IntEnum):
+    ADLY = 7902
+    AGIRRA = 8306
+    AIXAM = 8257
+    AJP = 8411
+    AJS = 1528
+    AMERICAN_IRON_HORSE = 8337
+    APRILIA = 2998
+    BAJAJ = 6722
+    BAOTIAN = 1546
+    BAROSSA = 1534
+    BENDA = 482
+    BENGHE = 7904
+    BETA = 8254
+    BIG_DOG = 8335
+    BIMOTA = 2997
+    BMW = 1481
+    BOSS_HOSS = 8008
+    BSA = 8114
+    BUELL = 7333
+    BULTACO = 7907
+    CAGIVA = 4328
+    CAKE = 8500
+    CAN_AM = 8245
+    CFMOTO = 8251
+    COBRA = 8004
+    DUCATI = 1484
+    ENDURO = 7918
+    ENERGICA = 8368
+    EUROSCOOTER = 7927
+    FANTIC = 1522
+    GASGAS = 8256
+    GILERA = 7354
+    GOES = 8310
+    HARLEY_DAVIDSON = 1486
+    HERO = 7903
+    HONDA = 1487
+    HUSABERG = 7356
+    HUSQVARNA = 7357
+    HYOSUNG = 6725
+    INDIAN = 8313
+    ITALJET = 8369
+    JAWA_CZ = 1488
+    KAWASAKI = 1489
+    KTM = 7771
+    KYMCO = 7363
+    LAMBRETTA = 8360
+    LIFAN = 8357
+    LIGIER = 8331
+    LYNX = 7920
+    MOTO_GUZZI = 1492
+    MV_AGUSTA = 7365
+    MZ = 8085
+    NIU = 8385
+    NORTON = 7367
+    OSET = 8401
+    PEUGEOT = 1494
+    PIAGGIO = 1495
+    POLARIS = 7922
+    QINGQI = 8236
+    QUADRO = 8378
+    REGAL_RAPTOR = 8210
+    RENAULT = 481
+    RIEJU = 7912
+    ROMET = 8362
+    ROYAL_ENFIELD = 8336
+    SEGWAY = 8407
+    SHERCO = 8255
+    SILENCE = 8508
+    SKI_DOO = 7926
+    SMC = 8242
+    STARK = 1192
+    SUPER_SOCO = 8388
+    SUR_RON = 8379
+    SUZUKI = 1497
+    SWM = 8394
+    SYM = 7915
+    TALARIA = 8519
+    TEN7 = 8502
+    TGB = 8205
+    THUNDER_BY_CITY_WHEELS = 8400
+    TM = 1516
+    TOMOS = 8235
+    TRIUMPH = 1500
+    URAL = 8512
+    V8_CHOPPERS = 8397
+    VERTIGO = 8408
+    VESPA = 7901
+    VIARELLI = 8366
+    VICTORY = 8317
+    VOGE = 8390
+    X_PRO = 8404
+    YADEA = 8503
+    YAMAHA = 1502
+    ZERO = 8351
+    ZONTES = 8516
+    ZUNDAPP = 7911
+    OVRIGA = 2045
+
+
+class McType(IntEnum):
+    ADVENTURE = 20
+    CHOPPER = 17
+    CROSS_ENDURO_TRIAL = 3
+    CRUISER = 16
+    CUSTOM = 4
+    KLASSISK_NAKEN = 2
+    LATT_MC = 5
+    MC_SCOOTER = 18
+    OFFROAD_MOTARD = 7
+    SPORT = 11
+    SUPERMOTO = 1547
+    TOURING = 12
+    TREHJULIG = 1549
+    TRIKE = 13
+    VETERAN = 14
+    ANNAT = 15

{blocket_api-0.3.92 → blocket_api-0.3.94}/blocket_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blocket_api
-Version: 0.3.92
+Version: 0.3.94
 Summary: A python API wrapper for blocket.se
 Author-email: dunderrrrrr <emil.bjorkroth@gmail.com>
 Requires-Python: >=3.10
@@ -17,7 +17,7 @@ Requires-Dist: mkdocs-material>=9.6.21
 Requires-Dist: mkdocs-swagger-ui-tag>=0.7.2
 Requires-Dist: websockets>=15.0.1
 Requires-Dist: beautifulsoup4>=4.14.2
-Requires-Dist: ruff>=0.14.5
+Requires-Dist: ruff>=0.14.7
 Dynamic: license-file
 
 <p align="center">
@@ -32,9 +32,6 @@ BlocketAPI allows users to search [blocket.se](https://blocket.se/) for ads.
 
 > Blocket is one of Sweden's largest online marketplaces. It was founded in 1996 and allows users to buy and sell a wide range of items, including cars, real estate, jobs, services, and second-hand goods. The platform is known for its extensive reach and user-friendly interface, making it a popular choice for Swedes looking to purchase or sell items quickly and efficiently.
 
-> [!NOTE]  
-> Blocket recently released a new version of their site which caused this package to break. But do not fear, we are actively working to try and restore all functionality. More info in [issue #43](https://github.com/dunderrrrrr/blocket_api/issues/41).
-
 ## 🧑‍💻️ Install
 
 Install BlocketAPI via PyPI...
@@ -62,13 +59,13 @@ api = BlocketAPI()
 
 # search all of blocket
 api.search(
-    "Vinterdäck Audi",
+    "Tamagotchi",
     sort_order=SortOrder.PRICE_ASC,
     locations=[Location.STOCKHOLM, Location.UPPSALA],
-    category=Category.FORDONSTILLBEHOR,
+    category=Category.FRITID_HOBBY_OCH_UNDERHALLNING,
 )
 
-# search for cars only
+# search for cars
 api.search_car(
     "Audi", # query is optional
     sort_order=CarSortOrder.MILEAGE_ASC,
@@ -80,11 +77,41 @@ api.search_car(
     locations=[Location.STOCKHOLM],
 )
 
-# Get a recommerce or car ad
-from blocket_api import CarAd, RecommerceAd
+# search for boats
+from blocket_api import BoatType
+
+api.search_boat(
+    "Mercury", # query is optional
+    types=[BoatType.DAYCRUISER],
+    locations=[Location.STOCKHOLM],
+    length_from=10,
+    length_to=15,    
+    price_from=20000,
+    price_to=90000,
+)
+
+# search for motorcycles
+from blocket_api import McType, McModel
+
+api.search_mc(
+    "TC 150", # query is optional
+    types=[McType.SPORT],
+    locations=[Location.STOCKHOLM],
+    models=[McModel.DUCATI],
+    price_from=20000,
+    price_to=90000,
+    engine_volume_from=100,
+    engine_volume_to=200,
+)
+
+
+# get ad details
+from blocket_api import CarAd, RecommerceAd, BoatAd, McAd
 
 api.get_ad(RecommerceAd(12345678))
 api.get_ad(CarAd(12345678))
+api.get_ad(BoatAd(12345678))
+api.get_ad(McAd(12345678))
 ```
 
 ## 📝 Notes

{blocket_api-0.3.92 → blocket_api-0.3.94}/blocket_api.egg-info/requires.txt

@@ -9,4 +9,4 @@ mkdocs-material>=9.6.21
 mkdocs-swagger-ui-tag>=0.7.2
 websockets>=15.0.1
 beautifulsoup4>=4.14.2
-ruff>=0.14.5
+ruff>=0.14.7

{blocket_api-0.3.92 → blocket_api-0.3.94}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blocket_api"
-version = "0.3.92"
+version = "0.3.94"
 description = "A python API wrapper for blocket.se"
 authors = [{name = "dunderrrrrr", email = "emil.bjorkroth@gmail.com"}]
 readme = "README.md"
@@ -17,7 +17,7 @@ dependencies = [
     "mkdocs-swagger-ui-tag>=0.7.2",
     "websockets>=15.0.1",
     "beautifulsoup4>=4.14.2",
-    "ruff>=0.14.5",
+    "ruff>=0.14.7",
 ]
 
 

blocket_api-0.3.92/blocket_api/__init__.py

@@ -1,11 +0,0 @@
-from .ad_parser import CarAd as CarAd
-from .ad_parser import RecommerceAd as RecommerceAd
-from .blocket import BlocketAPI as BlocketAPI
-from .blocket import Location as Location
-from .constants import CarColor as CarColor
-from .constants import CarModel as CarModel
-from .constants import CarSortOrder as CarSortOrder
-from .constants import CarTransmission as CarTransmission
-from .constants import Category as Category
-from .constants import SortOrder as SortOrder
-from .constants import SubCategory as SubCategory

blocket_api-0.3.92/blocket_api/ad_parser.py

@@ -1,182 +0,0 @@
-import json
-import re
-from dataclasses import dataclass
-from typing import Any
-
-from bs4 import BeautifulSoup, Tag
-from httpx import Response
-
-from .constants import SITE_URL
-
-
-@dataclass(frozen=True)
-class RecommerceAd:
-    id: int
-
-    @property
-    def url(self) -> str:
-        return f"{SITE_URL}/recommerce/forsale/item/{self.id}"
-
-    def parse(self, response: Response) -> Any:
-        soup = BeautifulSoup(response.content, "html.parser")
-        json_script_tag = soup.select_one(
-            'script:-soup-contains("window.__staticRouterHydrationData")'
-        )
-        if not json_script_tag:
-            return {}
-
-        if match := re.search(r'JSON\.parse\("(.+)"\)', json_script_tag.text):
-            raw_json = match.group(1)
-            escaped = raw_json.encode("utf-8").decode("unicode_escape")
-            return json.loads(escaped.encode("latin1").decode("utf-8"))
-        else:
-            return {}
-
-
-@dataclass(frozen=True)
-class CarAd:
-    id: int
-
-    @property
-    def url(self) -> str:
-        return f"{SITE_URL}/mobility/item/{self.id}"
-
-    def parse(self, response: Response) -> dict:
-        soup = BeautifulSoup(response.content, "html.parser")
-        grid = soup.find("div", class_="grid grid-cols-1 md:grid-cols-3 md:gap-x-32")
-
-        if not grid:
-            return {}
-
-        data: dict[str, Any] = {"url": self.url}
-
-        self._extract_title_and_subtitle(grid, data)
-        self._extract_quick_specs(grid, data)
-        self._extract_price(grid, data)
-        self._extract_description(grid, data)
-        self._extract_specifications(grid, data)
-        self._extract_equipment(grid, data)
-        self._extract_seller_type(soup, data)
-        self._extract_ad_id(soup, data)
-
-        return data
-
-    def _extract_title_and_subtitle(self, grid: Tag, data: dict[str, Any]) -> None:
-        if title := grid.find("h1", class_=lambda x: x and "t1" in x):
-            data["title"] = title.get_text(strip=True)
-
-        if subtitle := grid.find(
-            "p", class_=lambda x: x and "s-text-subtle" in x and "mt-8" in x
-        ):
-            data["subtitle"] = subtitle.get_text(strip=True)
-
-    def _extract_quick_specs(self, grid: Tag, data: dict[str, Any]) -> None:
-        if specs_grid := grid.find(
-            "div", class_=lambda x: x and "grid" in x and "gap-24" in x
-        ):
-            spec_items = specs_grid.find_all("div", class_="flex gap-16 hyphens-auto")
-            for item in spec_items:
-                label = item.find("span", class_="s-text-subtle")
-                value = item.find("p", class_="m-0 font-bold")
-                if label and value:
-                    label_text = label.get_text(strip=True)
-                    value_text = value.get_text(strip=True)
-
-                    key_mapping = {
-                        "Modellår": "model_year",
-                        "Miltal": "mileage",
-                        "Växellåda": "transmission",
-                        "Drivmedel": "fuel",
-                    }
-                    key = key_mapping.get(
-                        label_text, label_text.lower().replace(" ", "_")
-                    )
-                    data[key] = value_text
-
-    def _extract_price(self, grid: Tag, data: dict[str, Any]) -> None:
-        if price_section := grid.find("div", class_="border-t pt-40 mt-40"):
-            price_labels = price_section.find_all("p", class_="s-text-subtle mb-0")
-            for price_label in price_labels:
-                label_text = price_label.get_text(strip=True).lower()
-                if "pris" in label_text:
-                    price_elem = price_section.find("span", class_="t2")
-                    if price_elem:
-                        data["price"] = price_elem.get_text(strip=True)
-                    break
-                elif "månadskostnad" in label_text:
-                    monthly_elem = price_section.find("h2", class_="t2")
-                    if monthly_elem:
-                        data["monthly_cost"] = monthly_elem.get_text(strip=True)
-                    break
-
-    def _extract_description(self, grid: Tag, data: dict[str, Any]) -> None:
-        desc_sections = grid.find_all("section", class_="border-t mt-40 pt-40")
-        for section in desc_sections:
-            h2 = section.find("h2", class_="t3 mb-0")
-            if h2 and "beskrivning" in h2.get_text(strip=True).lower():
-                desc_div = section.find("div", class_="whitespace-pre-wrap")
-                if desc_div:
-                    data["description"] = desc_div.get_text(strip=True)
-                break
-
-    def _extract_specifications(self, grid: Tag, data: dict[str, Any]) -> None:
-        specs_section = grid.find("section", class_="key-info-section")
-        if not specs_section:
-            return
-
-        dl = specs_section.find("dl")
-        if not dl:
-            return
-
-        specifications: dict[str, str] = {}
-        divs = dl.find_all("div", style="break-inside:avoid-column")
-        for div in divs:
-            dt = div.find("dt")
-            dd = div.find("dd")
-            if dt and dd:
-                key_text = dt.get_text(strip=True)
-                value_text = dd.get_text(strip=True)
-                specifications[key_text] = value_text
-
-        if specifications:
-            data["specifications"] = specifications
-
-    def _extract_equipment(self, grid: Tag, data: dict[str, Any]) -> None:
-        equipment_section: Tag | None = None
-        for section in grid.find_all("section", class_="border-t pt-40 mt-40"):
-            h2 = section.find("h2", class_="t3 mb-0")
-            if h2 and "utrustning" in h2.get_text(strip=True).lower():
-                equipment_section = section
-                break
-
-        if not equipment_section:
-            return
-
-        equipment_list = equipment_section.find("ul")
-        if equipment_list:
-            equipment_items: list[str] = [
-                li.get_text(strip=True) for li in equipment_list.find_all("li")
-            ]
-            if equipment_items:
-                data["equipment"] = equipment_items
-
-    def _extract_seller_type(self, soup: BeautifulSoup, data: dict[str, Any]) -> None:
-        seller_type = (
-            "dealer"
-            if soup.find("div", class_=lambda x: x and "dealer" in str(x).lower())
-            else "private"
-        )
-        data["seller_type"] = seller_type
-
-    def _extract_ad_id(self, soup: BeautifulSoup, data: dict[str, Any]) -> None:
-        ad_info_divs = soup.find_all(
-            "div", class_="text-m flex md:flex-row flex-col md:gap-x-56 gap-y-16"
-        )
-        for div in ad_info_divs:
-            ad_id_labels = div.find_all("p", class_="s-text-subtle mb-0")
-            for ad_id_label in ad_id_labels:
-                if "Annons-ID" in ad_id_label.get_text(strip=True):
-                    ad_id_elem = ad_id_label.find_next_sibling("p")
-                    if ad_id_elem:
-                        data["ad_id"] = ad_id_elem.get_text(strip=True)
-                        break

blocket_api-0.3.92/blocket_api/blocket.py

@@ -1,105 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Any
-
-import httpx
-from httpx import Response
-
-from .ad_parser import CarAd, RecommerceAd
-from .constants import (
-    HEADERS,
-    SITE_URL,
-    CarColor,
-    CarModel,
-    CarSortOrder,
-    CarTransmission,
-    Category,
-    Location,
-    SortOrder,
-    SubCategory,
-)
-
-
-@dataclass(frozen=True)
-class QueryParam:
-    name: str
-    value: str | int
-
-
-def _request(
-    *,
-    url: str,
-    params: list[QueryParam],
-) -> Response:
-    response = httpx.get(
-        url,
-        headers=HEADERS,
-        params=[(param.name, param.value) for param in params],
-    )
-    response.raise_for_status()
-    return response
-
-
-@dataclass(frozen=True)
-class BlocketAPI:
-    def search(
-        self,
-        query: str,
-        *,
-        sort_order: SortOrder = SortOrder.RELEVANCE,
-        locations: list[Location] = [],
-        category: Category | None = None,
-        sub_category: SubCategory | None = None,
-    ) -> Any:
-        if category and sub_category:
-            raise AssertionError("Cannot specify both category and sub_categories")
-
-        url = f"{SITE_URL}/recommerce-search-page/api/search/SEARCH_ID_BAP_COMMON"
-        params = [
-            QueryParam("q", query),
-            QueryParam("sort", sort_order.value),
-            *[QueryParam("location", location.value) for location in locations],
-            *([QueryParam("category", category.value)] if category else []),
-            *([QueryParam("sub_category", sub_category.value)] if sub_category else []),
-        ]
-
-        return _request(url=url, params=params).json()
-
-    def search_car(
-        self,
-        query: str | None = None,
-        *,
-        sort_order: CarSortOrder = CarSortOrder.RELEVANCE,
-        locations: list[Location] = [],
-        models: list[CarModel] = [],
-        price_from: int | None = None,
-        price_to: int | None = None,
-        year_from: int | None = None,
-        year_to: int | None = None,
-        milage_from: int | None = None,
-        milage_to: int | None = None,
-        colors: list[CarColor] = [],
-        transmissions: list[CarTransmission] = [],
-    ) -> Any:
-        url = f"{SITE_URL}/mobility/search/api/search/SEARCH_ID_CAR_USED"
-        params = [
-            *([QueryParam("q", query)] if query else []),
-            QueryParam("sort", sort_order.value),
-            *[QueryParam("location", location.value) for location in locations],
-            *[QueryParam("make", model.value) for model in models],
-            *([QueryParam("price_from", price_from)] if price_from else []),
-            *([QueryParam("price_to", price_to)] if price_to else []),
-            *([QueryParam("year_from", year_from)] if year_from else []),
-            *([QueryParam("year_to", year_to)] if year_to else []),
-            *([QueryParam("milage_from", milage_from)] if milage_from else []),
-            *([QueryParam("milage_to", milage_to)] if milage_to else []),
-            *[QueryParam("exterior_colour", color.value) for color in colors],
-            *[QueryParam("transmission", t.value) for t in transmissions],
-        ]
-
-        return _request(url=url, params=params).json()
-
-    def get_ad(self, ad: RecommerceAd | CarAd) -> dict:
-        response = _request(url=ad.url, params=[])
-        return ad.parse(response)