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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blocket_api
-Version: 0.3.93
+Version: 0.4.0
 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.6
+Requires-Dist: ruff>=0.14.10
 Dynamic: license-file
 
 <p align="center">
@@ -90,13 +90,28 @@ api.search_boat(
     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
+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.93 → blocket_api-0.4.0}/README.md

@@ -68,13 +68,28 @@ api.search_boat(
     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
+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.4.0/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.93 → blocket_api-0.4.0}/blocket_api/ad_parser.py

@@ -17,7 +17,7 @@ class RecommerceAd:
     def url(self) -> str:
         return f"{SITE_URL}/recommerce/forsale/item/{self.id}"
 
-    def parse(self, response: Response) -> Any:
+    def parse(self, response: Response) -> dict[str, Any]:
         soup = BeautifulSoup(response.content, "html.parser")
         json_script_tag = soup.select_one(
             'script:-soup-contains("window.__staticRouterHydrationData")'
@@ -41,7 +41,7 @@ class MobilityAd:
     def url(self) -> str:
         return f"{SITE_URL}/mobility/item/{self.id}"
 
-    def parse(self, response: Response) -> dict:
+    def parse(self, response: Response) -> dict[str, Any]:
         soup = BeautifulSoup(response.content, "html.parser")
         grid = soup.find("div", class_="grid grid-cols-1 md:grid-cols-3 md:gap-x-32")
 
@@ -182,3 +182,18 @@ class BoatAd(MobilityAd):
         ):
             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.93 → blocket_api-0.4.0}/blocket_api/blocket.py

@@ -6,7 +6,7 @@ from typing import Any
 import httpx
 from httpx import Response
 
-from .ad_parser import BoatAd, CarAd, RecommerceAd
+from .ad_parser import BoatAd, CarAd, McAd, RecommerceAd
 from .constants import (
     HEADERS,
     SITE_URL,
@@ -17,6 +17,9 @@ from .constants import (
     CarTransmission,
     Category,
     Location,
+    McModel,
+    McSortOrder,
+    McType,
     SortOrder,
     SubCategory,
 )
@@ -44,18 +47,20 @@ class BlocketAPI:
         self,
         query: str,
         *,
+        page: int = 1,
         sort_order: SortOrder = SortOrder.RELEVANCE,
         locations: list[Location] = [],
         category: Category | None = None,
         sub_category: SubCategory | None = None,
-    ) -> Any:
+    ) -> dict[str, 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"
+        url = f"{SITE_URL}/recommerce/forsale/search/api/search/SEARCH_ID_BAP_COMMON"
 
-        param_dict = {
+        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,
@@ -71,6 +76,7 @@ class BlocketAPI:
         self,
         query: str | None = None,
         *,
+        page: int = 1,
         sort_order: CarSortOrder = CarSortOrder.RELEVANCE,
         locations: list[Location] = [],
         models: list[CarModel] = [],
@@ -82,11 +88,12 @@ class BlocketAPI:
         milage_to: int | None = None,
         colors: list[CarColor] = [],
         transmissions: list[CarTransmission] = [],
-    ) -> Any:
+    ) -> dict[str, Any]:
         url = f"{SITE_URL}/mobility/search/api/search/SEARCH_ID_CAR_USED"
 
-        param_dict = {
+        param_dict: dict[str, str | int | None] = {
             "q": query,
+            "page": page,
             "sort": sort_order.value,
             "price_from": price_from,
             "price_to": price_to,
@@ -110,6 +117,7 @@ class BlocketAPI:
         self,
         query: str | None = None,
         *,
+        page: int = 1,
         sort_order: CarSortOrder = CarSortOrder.RELEVANCE,
         types: list[BoatType] = [],
         locations: list[Location] = [],
@@ -120,8 +128,9 @@ class BlocketAPI:
     ) -> Any:
         url = f"{SITE_URL}/mobility/search/api/search/SEARCH_ID_BOAT_USED"
 
-        param_dict = {
+        param_dict: dict[str, str | int | None] = {
             "q": query,
+            "page": page,
             "sort": sort_order.value,
             "price_from": price_from,
             "price_to": price_to,
@@ -136,6 +145,40 @@ class BlocketAPI:
 
         return _request(url=url, params=params).json()
 
-    def get_ad(self, ad: RecommerceAd | CarAd | BoatAd) -> dict:
+    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,
+    ) -> dict[str, 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[str, Any]:
         response = _request(url=ad.url, params=[])
         return ad.parse(response)

{blocket_api-0.3.93 → blocket_api-0.4.0}/blocket_api/constants.py

@@ -29,6 +29,21 @@ 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"
@@ -381,3 +396,122 @@ class BoatType(IntEnum):
     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.93 → blocket_api-0.4.0}/blocket_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blocket_api
-Version: 0.3.93
+Version: 0.4.0
 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.6
+Requires-Dist: ruff>=0.14.10
 Dynamic: license-file
 
 <p align="center">
@@ -90,13 +90,28 @@ api.search_boat(
     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
+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.93 → blocket_api-0.4.0}/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.6
+ruff>=0.14.10

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

@@ -1,6 +1,6 @@
 [project]
 name = "blocket_api"
-version = "0.3.93"
+version = "0.4.0"
 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.6",
+    "ruff>=0.14.10",
 ]
 
 

blocket_api-0.3.93/blocket_api/__init__.py

@@ -1,13 +0,0 @@
-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
-from .constants import CarTransmission as CarTransmission
-from .constants import Category as Category
-from .constants import SortOrder as SortOrder
-from .constants import SubCategory as SubCategory