blocket-api 0.3.91__tar.gz → 0.3.93__tar.gz

{blocket_api-0.3.91 → blocket_api-0.3.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blocket_api
-Version: 0.3.91
+Version: 0.3.93
 Summary: A python API wrapper for blocket.se
 Author-email: dunderrrrrr <emil.bjorkroth@gmail.com>
 Requires-Python: >=3.10
@@ -16,7 +16,8 @@ Requires-Dist: mkdocs>=1.6.1
 Requires-Dist: mkdocs-material>=9.6.21
 Requires-Dist: mkdocs-swagger-ui-tag>=0.7.2
 Requires-Dist: websockets>=15.0.1
-Requires-Dist: ruff>=0.14.5
+Requires-Dist: beautifulsoup4>=4.14.2
+Requires-Dist: ruff>=0.14.6
 Dynamic: license-file
 
 <p align="center">
@@ -31,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...
@@ -59,25 +57,46 @@ from blocket_api import (
 
 api = BlocketAPI()
 
-# will search all of blocket
-result = api.search(
-    "Vinterdäck Audi",
+# search all of blocket
+api.search(
+    "Tamagotchi",
     sort_order=SortOrder.PRICE_ASC,
     locations=[Location.STOCKHOLM, Location.UPPSALA],
-    category=Category.FORDONSTILLBEHOR,
+    category=Category.FRITID_HOBBY_OCH_UNDERHALLNING,
 )
 
-# search for cars only
-result = api.search_car(
+# search for cars
+api.search_car(
     "Audi", # query is optional
     sort_order=CarSortOrder.MILEAGE_ASC,
     models=[CarModel.AUDI],
     colors=[CarColor.GULD],
     price_from=10000,
     price_to=50000,
-    transmission=CarTransmission.MANUAL,
+    transmissions=[CarTransmission.MANUAL],
+    locations=[Location.STOCKHOLM],
+)
+
+# 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,
 )
+
+
+# get ad details
+from blocket_api import CarAd, RecommerceAd, BoatAd
+
+api.get_ad(RecommerceAd(12345678))
+api.get_ad(CarAd(12345678))
+api.get_ad(BoatAd(12345678))
 ```
 
 ## 📝 Notes

{blocket_api-0.3.91 → blocket_api-0.3.93}/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...
@@ -38,25 +35,46 @@ from blocket_api import (
 
 api = BlocketAPI()
 
-# will search all of blocket
-result = api.search(
-    "Vinterdäck Audi",
+# search all of blocket
+api.search(
+    "Tamagotchi",
     sort_order=SortOrder.PRICE_ASC,
     locations=[Location.STOCKHOLM, Location.UPPSALA],
-    category=Category.FORDONSTILLBEHOR,
+    category=Category.FRITID_HOBBY_OCH_UNDERHALLNING,
 )
 
-# search for cars only
-result = api.search_car(
+# search for cars
+api.search_car(
     "Audi", # query is optional
     sort_order=CarSortOrder.MILEAGE_ASC,
     models=[CarModel.AUDI],
     colors=[CarColor.GULD],
     price_from=10000,
     price_to=50000,
-    transmission=CarTransmission.MANUAL,
+    transmissions=[CarTransmission.MANUAL],
+    locations=[Location.STOCKHOLM],
+)
+
+# 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,
 )
+
+
+# get ad details
+from blocket_api import CarAd, RecommerceAd, BoatAd
+
+api.get_ad(RecommerceAd(12345678))
+api.get_ad(CarAd(12345678))
+api.get_ad(BoatAd(12345678))
 ```
 
 ## 📝 Notes

{blocket_api-0.3.91 → blocket_api-0.3.93}/blocket_api/__init__.py

@@ -1,5 +1,9 @@
+from .ad_parser import BoatAd as BoatAd
+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 BoatType as BoatType
 from .constants import CarColor as CarColor
 from .constants import CarModel as CarModel
 from .constants import CarSortOrder as CarSortOrder

blocket_api-0.3.93/blocket_api/ad_parser.py

@@ -0,0 +1,184 @@
+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)

blocket_api-0.3.93/blocket_api/blocket.py

@@ -0,0 +1,141 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any
+
+import httpx
+from httpx import Response
+
+from .ad_parser import BoatAd, CarAd, RecommerceAd
+from .constants import (
+    HEADERS,
+    SITE_URL,
+    BoatType,
+    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"
+
+        param_dict = {
+            "q": query,
+            "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,
+        *,
+        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 = {
+            "q": query,
+            "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,
+        *,
+        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 = {
+            "q": query,
+            "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 get_ad(self, ad: RecommerceAd | CarAd | BoatAd) -> dict:
+        response = _request(url=ad.url, params=[])
+        return ad.parse(response)

{blocket_api-0.3.91 → blocket_api-0.3.93}/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,22 @@ class CarSortOrder(StrEnum):
     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"
@@ -48,38 +64,26 @@ class Location(StrEnum):
     VASTERBOTTEN = "0.300024"
     VASTERNORRLAND = "0.300022"
     VASTMANLAND = "0.300019"
-    VASTRA_GÖTALAND = "0.300014"
+    VASTRA_GOTALAND = "0.300014"
     OREBRO = "0.300018"
     OSTERGOTLAND = "0.300005"
 
 
 class Category(StrEnum):
     AFFARSVERKSAMHET = "0.91"
-    # BIL_OCH_HUSVAGN = None
-    # BAT = None
     DJUR_OCH_TILLBEHOR = "0.77"
     ELEKTRONIK_OCH_VITVAROR = "0.93"
-    # ENTREPRENAD__OCH_LANTBRUKSMASKINER = None
     FORDONSTILLBEHOR = "0.90"
     FRITID_HOBBY_OCH_UNDERHALLNING = "0.86"
     FORALDRAR_OCH_BARN = "0.68"
     KLADER_KOSMETIKA_OCH_ACCESSOARER = "0.71"
     KONST_OCH_ANTIKT = "0.76"
-    # MOTORCYKLAR = None
     MOBLER_OCH_INREDNING = "0.78"
     SPORT_OCH_FRITID = "0.69"
     TRADGARD_OCH_RENOVERING = "0.67"
 
 
 class SubCategory(StrEnum):
-    BYGGMATERIAL_OCH_RENOVERING = "1.67.3899"
-    BILDELAR_OCH_TILLBEHOR = "1.90.82"
-    CYKEL = "1.69.3963"
-    JAKT_FISKE_OCH_CAMPING = "1.69.3964"
-    TRADGARD_OCH_UTEMILJO = "1.67.3901"
-    MC_UTRUSTNING_OCH_RESERVDELAR = "1.90.20"
-    HUSVAGNS_OCH_HUSBILSDELAR = "1.90.70"
-    VERKTYG = "1.67.5219"
     BUTIK_OCH_DETALJHANDEL = "1.91.3108"
     CONTAINRAR_OCH_BARACKER = "1.91.3111"
     DOMANER_OCH_SAJTER = "1.91.3106"
@@ -91,6 +95,8 @@ class SubCategory(StrEnum):
     SCEN = "1.91.3110"
     STORKOK_OCH_RESTAURANG = "1.91.3103"
     VERKSTAD_BYGG_OCH_KONSTRUKTION = "1.91.3102"
+    BILDELAR_OCH_TILLBEHOR = "1.90.82"
+    HUSVAGNS_OCH_HUSBILSDELAR = "1.90.70"
     SLAP_OCH_TRAILER = "1.90.80"
     BATDELAR_OCH_TILLBEHOR = "1.90.30"
     AKVARIUM = "1.77.3976"
@@ -119,7 +125,79 @@ class SubCategory(StrEnum):
     TV_SPEL_OCH_SPELKONSOLER = "1.93.3905"
     VITVAROR = "1.93.3907"
     ATV_RESERVDELAR = "1.90.3975"
-    OVRIGT = "1.90.3974"
+    MC_UTRUSTNING_OCH_RESERVDELAR = "1.90.20"
+    BILJETTER_OCH_RESOR = "1.86.7735"
+    BOCKER_OCH_TIDNINGAR = "1.86.5209"
+    HANTVERK = "1.86.7734"
+    MAT_OCH_DRYCK = "1.86.3972"
+    MODELLER_OCH_BYGGSATSER = "1.86.7732"
+    MUSIK_OCH_FILM = "1.86.3922"
+    MUSIKINSTRUMENT = "1.86.92"
+    RADIOSTYRDA_ENHETER = "1.86.7733"
+    SAMLAROBJEKT = "1.86.285"
+    SALLSKAPS_OCH_BRADSPEL = "1.86.5203"
+    BARNBOCKER = "1.68.8369"
+    BARNKLADER = "1.68.3913"
+    BARNMOBLER = "1.68.3916"
+    BARNSKOR = "1.68.3915"
+    BARNTILLBEHOR_OCH_SAKERHET = "1.68.3918"
+    BARNVAGNAR = "1.68.3914"
+    BILBARNSTOLAR_OCH_BABYSKYDD = "1.68.3911"
+    GRAVIDKLADER = "1.68.3948"
+    INREDNING_TILL_BARNRUM = "1.68.9445"
+    LEKSAKER = "1.68.3912"
+    ACCESSOARER = "1.71.9481"
+    DAMKLADER = "1.71.3941"
+    GLASOGON_OCH_SOLGLASOGON = "1.71.8344"
+    HERRKLADER = "1.71.3950"
+    HUD_HAR_OCH_KROPPSVARD = "1.71.8280"
+    KLOCKOR_OCH_ARMBANDSUR = "1.71.3945"
+    KOSMETIK = "1.71.8282"
+    MASKERADKLADER = "1.71.8349"
+    SKOR = "1.71.3949"
+    SMYCKEN_OCH_SMYCKESFORVARING = "1.71.7748"
+    VASKOR_OCH_PLANBOCKER = "1.71.3946"
+    ANTIKA_MOBLER = "1.76.5178"
+    KERAMIK_PORSLIN_OCH_GLAS = "1.76.5176"
+    KONST = "1.76.5177"
+    SILVERFOREMAL_OCH_SILVERBESTICK = "1.76.5179"
+    OVRIGA_ANTIKVITETER = "1.76.5175"
+    BORD_OCH_STOLAR = "1.78.5196"
+    DEKORATION_OCH_PRYDNADER = "1.78.5222"
+    GARDEROBER_OCH_FORVARING = "1.78.5198"
+    HYLLOR_OCH_BYRAER = "1.78.8345"
+    KOKSUTRUSTNING_OCH_PORSLIN = "1.78.5223"
+    LAMPOR = "1.78.5181"
+    MATTOR_OCH_TEXTILIER = "1.78.5180"
+    PYNT_TILL_HOGTIDER_OCH_FEST = "1.78.9760"
+    SOFFOR_OCH_FATOLJER = "1.78.7756"
+    SANGAR_OCH_MADRASSER = "1.78.5197"
+    OVRIGA_MOBLER_OCH_INREDNING = "1.78.3971"
+    BOLLSPORTER = "1.69.3961"
+    CYKEL = "1.69.3963"
+    EXTREMSPORT = "1.69.3938"
+    GOLF = "1.69.5164"
+    JAKT_FISKE_OCH_CAMPING = "1.69.3964"
+    KOSTTILLSKOTT = "1.69.8281"
+    RULLSKRIDSKOR_ISHOCKEY_OCH_KONSTAKNING = "1.69.8346"
+    SKYTTE = "1.69.3965"
+    SUPPORTERPRODUKTER = "1.69.3937"
+    TRANINGSKLOCKOR_OCH_AKTIVITETSARMBAND = "1.69.3967"
+    TRANINGSKLADER_OCH_SKOR = "1.69.3940"
+    TRANINGSUTRUSTNING = "1.69.5166"
+    VATTENSPORT = "1.69.7738"
+    VINTERSPORT = "1.69.3962"
+    OVRIGA_SPORTER = "1.69.3966"
+    BADRUM_OCH_BASTU = "1.67.7749"
+    BYGGMATERIAL_OCH_RENOVERING = "1.67.3899"
+    GARAGEDELAR_OCH_TILLBEHOR = "1.67.8348"
+    KOKSINREDNING_OCH_KOKSSTOMMAR = "1.67.3900"
+    LARM_OCH_SAKERHET = "1.67.8347"
+    TRADGARD_OCH_UTEMILJO = "1.67.3901"
+    UTRUSTNING_FOR_FRITIDSHUS = "1.67.3968"
+    VERKTYG = "1.67.5219"
+    VARME_OCH_VENTILATION = "1.67.5218"
+    OVRIGT = "1.67.3969"
 
 
 class CarModel(StrEnum):
@@ -286,3 +364,20 @@ 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

{blocket_api-0.3.91 → blocket_api-0.3.93}/blocket_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blocket_api
-Version: 0.3.91
+Version: 0.3.93
 Summary: A python API wrapper for blocket.se
 Author-email: dunderrrrrr <emil.bjorkroth@gmail.com>
 Requires-Python: >=3.10
@@ -16,7 +16,8 @@ Requires-Dist: mkdocs>=1.6.1
 Requires-Dist: mkdocs-material>=9.6.21
 Requires-Dist: mkdocs-swagger-ui-tag>=0.7.2
 Requires-Dist: websockets>=15.0.1
-Requires-Dist: ruff>=0.14.5
+Requires-Dist: beautifulsoup4>=4.14.2
+Requires-Dist: ruff>=0.14.6
 Dynamic: license-file
 
 <p align="center">
@@ -31,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...
@@ -59,25 +57,46 @@ from blocket_api import (
 
 api = BlocketAPI()
 
-# will search all of blocket
-result = api.search(
-    "Vinterdäck Audi",
+# search all of blocket
+api.search(
+    "Tamagotchi",
     sort_order=SortOrder.PRICE_ASC,
     locations=[Location.STOCKHOLM, Location.UPPSALA],
-    category=Category.FORDONSTILLBEHOR,
+    category=Category.FRITID_HOBBY_OCH_UNDERHALLNING,
 )
 
-# search for cars only
-result = api.search_car(
+# search for cars
+api.search_car(
     "Audi", # query is optional
     sort_order=CarSortOrder.MILEAGE_ASC,
     models=[CarModel.AUDI],
     colors=[CarColor.GULD],
     price_from=10000,
     price_to=50000,
-    transmission=CarTransmission.MANUAL,
+    transmissions=[CarTransmission.MANUAL],
+    locations=[Location.STOCKHOLM],
+)
+
+# 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,
 )
+
+
+# get ad details
+from blocket_api import CarAd, RecommerceAd, BoatAd
+
+api.get_ad(RecommerceAd(12345678))
+api.get_ad(CarAd(12345678))
+api.get_ad(BoatAd(12345678))
 ```
 
 ## 📝 Notes

{blocket_api-0.3.91 → blocket_api-0.3.93}/blocket_api.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 blocket_api/__init__.py
+blocket_api/ad_parser.py
 blocket_api/blocket.py
 blocket_api/constants.py
 blocket_api.egg-info/PKG-INFO

{blocket_api-0.3.91 → blocket_api-0.3.93}/blocket_api.egg-info/requires.txt

@@ -8,4 +8,5 @@ mkdocs>=1.6.1
 mkdocs-material>=9.6.21
 mkdocs-swagger-ui-tag>=0.7.2
 websockets>=15.0.1
-ruff>=0.14.5
+beautifulsoup4>=4.14.2
+ruff>=0.14.6

{blocket_api-0.3.91 → blocket_api-0.3.93}/pyproject.toml

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

blocket_api-0.3.91/blocket_api/blocket.py

@@ -1,98 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Any
-
-import httpx
-
-from .constants import (
-    HEADERS,
-    SITE_URL,
-    CarColor,
-    CarModel,
-    CarSortOrder,
-    Category,
-    Location,
-    SortOrder,
-    SubCategory,
-)
-
-
-@dataclass(frozen=True)
-class QueryParam:
-    name: str
-    value: str | int
-
-
-def _request(
-    *,
-    url: str,
-    params: list[QueryParam],
-) -> Any:
-    response = httpx.get(
-        url,
-        headers=HEADERS,
-        params=[(param.name, param.value) for param in params],
-    )
-    response.raise_for_status()
-    return response.json()
-
-
-@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)
-
-    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] = [],
-        transmission: int | None = None,
-    ) -> 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", transmission)] if transmission else []),
-        ]
-
-        return _request(url=url, params=params)