blocket-api 0.3.4__tar.gz → 0.3.6__tar.gz

{blocket_api-0.3.4/blocket_api.egg-info → blocket_api-0.3.6}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: blocket_api
-Version: 0.3.4
+Version: 0.3.6
 Summary: A python API wrapper for blocket.se
 Author-email: dunderrrrrr <emil.bjorkroth@gmail.com>
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.27.0
+Requires-Dist: httpx>=0.28.1
 Requires-Dist: pre-commit>=3.7.1
 Requires-Dist: pytest>=8.2.2
 Requires-Dist: respx>=0.21.1
@@ -15,7 +15,8 @@ Requires-Dist: pydantic>=2.11.7
 Requires-Dist: mkdocs>=1.6.1
 Requires-Dist: mkdocs-material>=9.6.21
 Requires-Dist: mkdocs-swagger-ui-tag>=0.7.2
-Requires-Dist: ruff>=0.14.1
+Requires-Dist: websockets>=15.0.1
+Requires-Dist: ruff>=0.14.4
 Dynamic: license-file
 
 <p align="center">
@@ -80,6 +81,8 @@ Some calls require a `bearerToken`. However, some calls are public and don't req
 | [`api.get_user_by_id()`](#get_user_by_id)  | 👏 No | Yes | Get user data from id.
 | [`api.save_ad()`](#save_ad)  | 🔐 Yes | - | Save ad to "Saved ads".
 | [`api.get_saved_ads()`](#get_saved_ads)  | 🔐 Yes | - | List all saved ads. 
+| [`api.get_threads()`](#get_threads)  | 🔐 Yes | - | List all threads (messages).
+| [`api.get_messages_from_thread()`](#get_messages_from_thread)  | 🔐 Yes | - | Get all messages from a thread. 
 
 
 ## 🤓 Detailed usage
@@ -193,6 +196,7 @@ To query listings related to a specific car, supply the following parameters:
 - `modelYear` (`Optional[Tuple[int, int]]`) - Set model year range, ex. `(2000, 2020)`.
 - `milage` (`Optional[Tuple[int, int]]`) - Set milage range, ex. `(1000, 2000)`.
 - `gearbox` (`Optional[GEARBOX_OPTIONS]`) - Filter a specific gearbox, ex. `Automat`.
+- `color` (`Optional[List[COLOR_OPTIONS]]`) - Filter a specific color.
 - `as_objects` (`bool`, optional) - Return results as pydantic models, default is `False`.
 
 ```py
@@ -200,6 +204,7 @@ To query listings related to a specific car, supply the following parameters:
     make=["Audi", "Ford"],
     fuel=["Diesel"],
     chassi=["Cab"],
+    chassi=["Blå", "Röd"],
     price=(50000, 100000),
     page=1,
 )
@@ -366,6 +371,59 @@ Returns all of your saved ads from `https://www.blocket.se/sparade/annonser`.
 
 ```
 
+### get_threads
+Returns all of your threads/conversations from Blocket. This api requires a token.
+
+- `limit` (`int`, optional) - Number of threads to return, default is 15.
+
+```py
+>>> api = BlocketAPI("YourBlocketTokenHere")
+>>> api.get_threads()
+{
+   "channels": [
+      {     
+         "channel_url": "sendbird_group_channel_123",
+         "name": "from:user-id,ad:1214281684,to:c1-user-id",
+         "data": {
+            "ad": {
+               "id": "1214281684",
+               "advertiser_name": "Kalle",
+               "subject": "Elsparkcykel",
+               "status": "active",
+               "url": "https://www.blocket.se/annons/1214281684",
+               "price": "2 400 kr"
+            },
+         },
+      },
+      ...
+   ],
+}
+```
+
+
+
+### get_messages_from_thread
+Returns all of your messages from an existing thread/conversation.
+
+- `channel_id` (`str`, required) - The channel id to fetch messages from.
+
+```py
+>>> api = BlocketAPI("YourBlocketTokenHere")
+>>> api.get_messages_from_thread("sendbird_group_channel_123")
+{
+   "messages": [
+      {
+         "type": "MESG",
+         "message_id": 1354913370,
+         "message": "Hey, is your thing still for sale?",
+         ...
+      },
+   ],
+}
+```
+
+
+
 ## 🔐 Blocket API token
 
 There are two ways to acquire your token:

blocket_api-0.3.4/PKG-INFO → blocket_api-0.3.6/README.md

@@ -1,23 +1,3 @@
-Metadata-Version: 2.4
-Name: blocket_api
-Version: 0.3.4
-Summary: A python API wrapper for blocket.se
-Author-email: dunderrrrrr <emil.bjorkroth@gmail.com>
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: httpx>=0.27.0
-Requires-Dist: pre-commit>=3.7.1
-Requires-Dist: pytest>=8.2.2
-Requires-Dist: respx>=0.21.1
-Requires-Dist: mypy>=1.15.0
-Requires-Dist: pydantic>=2.11.7
-Requires-Dist: mkdocs>=1.6.1
-Requires-Dist: mkdocs-material>=9.6.21
-Requires-Dist: mkdocs-swagger-ui-tag>=0.7.2
-Requires-Dist: ruff>=0.14.1
-Dynamic: license-file
-
 <p align="center">
   <img src="https://blocket-api.se/blocket-api.png" />
 </p>
@@ -80,6 +60,8 @@ Some calls require a `bearerToken`. However, some calls are public and don't req
 | [`api.get_user_by_id()`](#get_user_by_id)  | 👏 No | Yes | Get user data from id.
 | [`api.save_ad()`](#save_ad)  | 🔐 Yes | - | Save ad to "Saved ads".
 | [`api.get_saved_ads()`](#get_saved_ads)  | 🔐 Yes | - | List all saved ads. 
+| [`api.get_threads()`](#get_threads)  | 🔐 Yes | - | List all threads (messages).
+| [`api.get_messages_from_thread()`](#get_messages_from_thread)  | 🔐 Yes | - | Get all messages from a thread. 
 
 
 ## 🤓 Detailed usage
@@ -193,6 +175,7 @@ To query listings related to a specific car, supply the following parameters:
 - `modelYear` (`Optional[Tuple[int, int]]`) - Set model year range, ex. `(2000, 2020)`.
 - `milage` (`Optional[Tuple[int, int]]`) - Set milage range, ex. `(1000, 2000)`.
 - `gearbox` (`Optional[GEARBOX_OPTIONS]`) - Filter a specific gearbox, ex. `Automat`.
+- `color` (`Optional[List[COLOR_OPTIONS]]`) - Filter a specific color.
 - `as_objects` (`bool`, optional) - Return results as pydantic models, default is `False`.
 
 ```py
@@ -200,6 +183,7 @@ To query listings related to a specific car, supply the following parameters:
     make=["Audi", "Ford"],
     fuel=["Diesel"],
     chassi=["Cab"],
+    chassi=["Blå", "Röd"],
     price=(50000, 100000),
     page=1,
 )
@@ -366,6 +350,59 @@ Returns all of your saved ads from `https://www.blocket.se/sparade/annonser`.
 
 ```
 
+### get_threads
+Returns all of your threads/conversations from Blocket. This api requires a token.
+
+- `limit` (`int`, optional) - Number of threads to return, default is 15.
+
+```py
+>>> api = BlocketAPI("YourBlocketTokenHere")
+>>> api.get_threads()
+{
+   "channels": [
+      {     
+         "channel_url": "sendbird_group_channel_123",
+         "name": "from:user-id,ad:1214281684,to:c1-user-id",
+         "data": {
+            "ad": {
+               "id": "1214281684",
+               "advertiser_name": "Kalle",
+               "subject": "Elsparkcykel",
+               "status": "active",
+               "url": "https://www.blocket.se/annons/1214281684",
+               "price": "2 400 kr"
+            },
+         },
+      },
+      ...
+   ],
+}
+```
+
+
+
+### get_messages_from_thread
+Returns all of your messages from an existing thread/conversation.
+
+- `channel_id` (`str`, required) - The channel id to fetch messages from.
+
+```py
+>>> api = BlocketAPI("YourBlocketTokenHere")
+>>> api.get_messages_from_thread("sendbird_group_channel_123")
+{
+   "messages": [
+      {
+         "type": "MESG",
+         "message_id": 1354913370,
+         "message": "Hey, is your thing still for sale?",
+         ...
+      },
+   ],
+}
+```
+
+
+
 ## 🔐 Blocket API token
 
 There are two ways to acquire your token:

blocket_api-0.3.6/blocket_api/__init__.py

@@ -0,0 +1,11 @@
+from .blocket import CHASSI_OPTIONS as CHASSI_OPTIONS
+from .blocket import COLOR_OPTIONS as COLOR_OPTIONS
+from .blocket import FUEL_OPTIONS as FUEL_OPTIONS
+from .blocket import GEARBOX_OPTIONS as GEARBOX_OPTIONS
+from .blocket import MAKE_OPTIONS as MAKE_OPTIONS
+from .blocket import BlocketAPI as BlocketAPI
+from .blocket import Category as Category
+from .blocket import Region as Region
+from .qasa import HOME_SEARCH_ORDERING as HOME_SEARCH_ORDERING
+from .qasa import HomeType as HomeType
+from .qasa import OrderBy as OrderBy

{blocket_api-0.3.4 → blocket_api-0.3.6}/blocket_api/blocket.py

@@ -4,8 +4,7 @@ import urllib
 from collections.abc import Callable
 from dataclasses import dataclass
 from enum import Enum
-from functools import wraps
-from typing import TYPE_CHECKING, Any, List, Literal, Optional, Tuple, Union, overload
+from typing import TYPE_CHECKING, List, Literal, Optional, Tuple, Union, overload
 
 import httpx
 
@@ -21,13 +20,13 @@ from blocket_api.models import (
 )
 from blocket_api.qasa import HOME_SEARCH_ORDERING, HomeType, OrderBy, Qasa
 
+from .constants import BASE_URL, BYTBIL_URL
+from .decorators import auth_token, public_token
+from .sendbird import Sendbird
+
 if TYPE_CHECKING:
     from httpx import Response
 
-BASE_URL = "https://api.blocket.se"
-SITE_URL = "https://www.blocket.se"
-BYTBIL_URL = "https://api.bytbil.com"
-
 
 class Region(Enum):
     hela_sverige = 0
@@ -130,6 +129,7 @@ CHASSI_OPTIONS = Literal[
     "Kombi", "SUV", "Sedan", "Halvkombi", "Coupé", "Cab", "Familjebuss", "Yrkesfordon"
 ]
 GEARBOX_OPTIONS = Literal["Automat", "Manuell"]
+COLOR_OPTIONS = Literal["Blå", "Brun", "Grå", "Grön", "Gul", "Röd", "Svart", "Vit"]
 
 
 class APIError(Exception): ...
@@ -138,33 +138,6 @@ class APIError(Exception): ...
 class LimitError(Exception): ...
 
 
-class TokenError(Exception): ...
-
-
-def auth_token(method: Callable) -> Callable:
-    @wraps(method)
-    def wrapper(self: Any, *args: Any, **kwargs: Any) -> Callable:
-        if not self.token:
-            raise TokenError("Token is required, see documentation.")
-        return method(self, *args, **kwargs)
-
-    return wrapper
-
-
-def public_token(method: Callable) -> Callable:
-    @wraps(method)
-    def wrapper(self: Any, *args: Any, **kwargs: Any) -> Callable:
-        if not self.token:
-            response = httpx.get(
-                f"{SITE_URL}/api/adout-api-route/refresh-token-and-validate-session"
-            )
-            response.raise_for_status()
-            self.token = response.json()["bearerToken"]
-        return method(self, *args, **kwargs)
-
-    return wrapper
-
-
 def _make_request(
     *,
     method: Callable[..., Response] = httpx.get,
@@ -352,6 +325,7 @@ class BlocketAPI:
         modelYear: Optional[Tuple[int, int]] = None,
         milage: Optional[Tuple[int, int]] = None,
         gearbox: Optional[GEARBOX_OPTIONS] = None,
+        color: Optional[List[COLOR_OPTIONS]] = None,
         *,
         as_objects: Literal[False] = False,
     ) -> dict: ...
@@ -367,6 +341,7 @@ class BlocketAPI:
         modelYear: Optional[Tuple[int, int]] = None,
         milage: Optional[Tuple[int, int]] = None,
         gearbox: Optional[GEARBOX_OPTIONS] = None,
+        color: Optional[List[COLOR_OPTIONS]] = None,
         *,
         as_objects: bool = False,
     ) -> Union[dict, MotorSearchResults]: ...
@@ -382,6 +357,7 @@ class BlocketAPI:
         modelYear: Optional[Tuple[int, int]] = None,
         milage: Optional[Tuple[int, int]] = None,
         gearbox: Optional[GEARBOX_OPTIONS] = None,
+        color: Optional[List[COLOR_OPTIONS]] = None,
         *,
         as_objects: bool = False,
     ) -> dict | MotorSearchResults:
@@ -613,3 +589,23 @@ class BlocketAPI:
         url = f"{BASE_URL}/search_bff/v1/saved_content?lim={limit}"
         response = _make_request(url=f"{url}", token=self.token).json()
         return response
+
+    @auth_token
+    def get_threads(self, limit: int = 15) -> dict:
+        """
+        Returns set number of conversations/threads from Blocket, ordered by latest message.
+        """
+        assert self.token
+        sendbird = Sendbird.generate(self.token)
+        return sendbird.get_threads(limit=limit)
+
+    @auth_token
+    def get_messages_from_thread(self, channel_id: str) -> dict:
+        """
+        Returns all messages from a specific channel/thread.
+        Requires a channel_id which can be found by using get_threads().
+        Ex: sendbird_group_channel_12345_abc123abcde
+        """
+        assert self.token
+        sendbird = Sendbird.generate(self.token)
+        return sendbird.get_messages_from_thread(channel_id)

blocket_api-0.3.6/blocket_api/constants.py

@@ -0,0 +1,7 @@
+BASE_URL = "https://api.blocket.se"
+SITE_URL = "https://www.blocket.se"
+BYTBIL_URL = "https://api.bytbil.com"
+QASA_URL = "https://api.qasa.se/graphql"
+
+BLOCKET_SENDBIRD_APP_ID = "162ABE1D-86E9-4C2A-866A-EF1034525DAF"
+SENDBIRD_URL = f"https://api-{BLOCKET_SENDBIRD_APP_ID}.sendbird.com"

blocket_api-0.3.6/blocket_api/decorators.py

@@ -0,0 +1,34 @@
+from collections.abc import Callable
+from functools import wraps
+from typing import Any
+
+import httpx
+
+from .constants import SITE_URL
+
+
+class TokenError(Exception): ...
+
+
+def auth_token(method: Callable) -> Callable:
+    @wraps(method)
+    def wrapper(self: Any, *args: Any, **kwargs: Any) -> Callable:
+        if not self.token:
+            raise TokenError("Token is required, see documentation.")
+        return method(self, *args, **kwargs)
+
+    return wrapper
+
+
+def public_token(method: Callable) -> Callable:
+    @wraps(method)
+    def wrapper(self: Any, *args: Any, **kwargs: Any) -> Callable:
+        if not self.token:
+            response = httpx.get(
+                f"{SITE_URL}/api/adout-api-route/refresh-token-and-validate-session"
+            )
+            response.raise_for_status()
+            self.token = response.json()["bearerToken"]
+        return method(self, *args, **kwargs)
+
+    return wrapper

{blocket_api-0.3.4 → blocket_api-0.3.6}/blocket_api/models.py

@@ -1,35 +1,39 @@
 import datetime
 from typing import Any
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 ### CustomSearch ###
 
 
-class CustomSearchPrice(BaseModel):
+class _BaseModel(BaseModel):
+    model_config = ConfigDict(extra="ignore")
+
+
+class CustomSearchPrice(_BaseModel):
     suffix: str
     value: int
 
 
-class CustomSearchLocation(BaseModel):
+class CustomSearchLocation(_BaseModel):
     image_url: str
     label: str
     query_key: str | None = None
 
 
-class CustomSearchImage(BaseModel):
+class CustomSearchImage(_BaseModel):
     height: int
     type: str
     url: str
     width: int
 
 
-class CustomSearchCategory(BaseModel):
+class CustomSearchCategory(_BaseModel):
     id: str
     name: str
 
 
-class CustomSearchResult(BaseModel):
+class CustomSearchResult(_BaseModel):
     ad_id: str
     ad_status: str
     body: str
@@ -47,7 +51,7 @@ class CustomSearchResult(BaseModel):
     zipcode: str | None = None
 
 
-class CustomSearchResults(BaseModel):
+class CustomSearchResults(_BaseModel):
     data: list[CustomSearchResult]
     total_count: int
 
@@ -55,23 +59,23 @@ class CustomSearchResults(BaseModel):
 ### MotorSearch ###
 
 
-class MotorSearchCarEquipment(BaseModel):
+class MotorSearchCarEquipment(_BaseModel):
     label: str
 
 
-class MotorSearchCarLocation(BaseModel):
+class MotorSearchCarLocation(_BaseModel):
     region: str
     municipality: str
     area: str
 
 
-class MotorSearchCarImage(BaseModel):
+class MotorSearchCarImage(_BaseModel):
     height: int
     width: int
     image: str
 
 
-class MotorSearchCar(BaseModel):
+class MotorSearchCar(_BaseModel):
     images: list[MotorSearchCarImage]
     location: MotorSearchCarLocation
     fuel: str
@@ -81,19 +85,19 @@ class MotorSearchCar(BaseModel):
     equipment: list[MotorSearchCarEquipment] | None = None
 
 
-class MotorSearchPrice(BaseModel):
+class MotorSearchPrice(_BaseModel):
     amount: str
     billingPeriod: str
     oldPrice: str | None = None
 
 
-class MotorSearchSeller(BaseModel):
+class MotorSearchSeller(_BaseModel):
     type: str
     name: str
     id: str
 
 
-class MotorSearchResult(BaseModel):
+class MotorSearchResult(_BaseModel):
     dealId: str
     link: str
     listTime: datetime.datetime
@@ -106,7 +110,7 @@ class MotorSearchResult(BaseModel):
     description: str
 
 
-class MotorSearchResults(BaseModel):
+class MotorSearchResults(_BaseModel):
     cars: list[MotorSearchResult]
     hits: int
     pages: int
@@ -115,24 +119,24 @@ class MotorSearchResults(BaseModel):
 ### StoreSearch ###
 
 
-class StoreSearchLocation(BaseModel):
+class StoreSearchLocation(_BaseModel):
     longitude: float
     latitude: float
 
 
-class StoreSearchImage(BaseModel):
+class StoreSearchImage(_BaseModel):
     height: int
     width: int
     url: str
 
 
-class StoreSearchLogotype(BaseModel):
+class StoreSearchLogotype(_BaseModel):
     height: int
     width: int
     url: str
 
 
-class StoreSearchResult(BaseModel):
+class StoreSearchResult(_BaseModel):
     address: str | None = None
     id: str
     logotype: StoreSearchLogotype
@@ -146,7 +150,7 @@ class StoreSearchResult(BaseModel):
     category: str
 
 
-class StoreSearchResults(BaseModel):
+class StoreSearchResults(_BaseModel):
     data: list[StoreSearchResult]
     total_count: int
     total_page_count: int
@@ -155,12 +159,12 @@ class StoreSearchResults(BaseModel):
 ### HomeSearch ###
 
 
-class HomeSearchGeoPoint(BaseModel):
+class HomeSearchGeoPoint(_BaseModel):
     lat: float
     lon: float
 
 
-class HomeSearchLocation(BaseModel):
+class HomeSearchLocation(_BaseModel):
     id: int
     locality: str
     countryCode: str
@@ -169,14 +173,14 @@ class HomeSearchLocation(BaseModel):
     route: str
 
 
-class HomeSearchUpload(BaseModel):
+class HomeSearchUpload(_BaseModel):
     id: int
     order: int | None = None
     type: str
     url: str
 
 
-class HomeSearchResult(BaseModel):
+class HomeSearchResult(_BaseModel):
     bedroomCount: int | None = None
     blockListing: bool
     rentalLengthSeconds: float | None = None
@@ -216,7 +220,7 @@ class HomeSearchResult(BaseModel):
     uploads: list[HomeSearchUpload]
 
 
-class Documents(BaseModel):
+class Documents(_BaseModel):
     hasNextPage: bool
     hasPreviousPage: bool
     nodes: list[HomeSearchResult]
@@ -224,80 +228,80 @@ class Documents(BaseModel):
     totalCount: int
 
 
-class HomeIndexSearch(BaseModel):
+class HomeIndexSearch(_BaseModel):
     documents: Documents
 
 
-class DataModel(BaseModel):
+class DataModel(_BaseModel):
     homeIndexSearch: HomeIndexSearch
 
 
-class HomeSearchResults(BaseModel):
+class HomeSearchResults(_BaseModel):
     data: DataModel
 
 
 ### StoreListings ###
 
 
-class StoreListingContactMethods(BaseModel):
+class StoreListingContactMethods(_BaseModel):
     phone: bool
 
 
-class StoreListingAdvertiser(BaseModel):
+class StoreListingAdvertiser(_BaseModel):
     contact_methods: StoreListingContactMethods
     name: str
     store_name: str | None = None
     type: str
 
 
-class StoreListingAttribute(BaseModel):
+class StoreListingAttribute(_BaseModel):
     header: str
     id: str
     items: list[str]
 
 
-class StoreListingCategory(BaseModel):
+class StoreListingCategory(_BaseModel):
     id: str
     name: str
 
 
-class StoreListingImage(BaseModel):
+class StoreListingImage(_BaseModel):
     height: int
     type: str
     url: str
     width: int
 
 
-class StorListingLocationItem(BaseModel):
+class StorListingLocationItem(_BaseModel):
     id: str
     name: str
     query_key: str
 
 
-class StoreListingParameter(BaseModel):
+class StoreListingParameter(_BaseModel):
     id: str
     label: str
     value: str
     suffix: str | None = None
 
 
-class ParameterGroup(BaseModel):
+class ParameterGroup(_BaseModel):
     label: str
     parameters: list[StoreListingParameter]
     type: str
 
 
-class StoreListingPartnerInfo(BaseModel):
+class StoreListingPartnerInfo(_BaseModel):
     external_id: str
     name: str
 
 
-class StoreListingPrice(BaseModel):
+class StoreListingPrice(_BaseModel):
     suffix: str
     value: int
 
 
-class StoreListing(BaseModel):
+class StoreListing(_BaseModel):
     ad_id: str
     ad_status: str
     advertiser: StoreListingAdvertiser
@@ -319,19 +323,19 @@ class StoreListing(BaseModel):
     type: str
 
 
-class StoreListings(BaseModel):
+class StoreListings(_BaseModel):
     data: list[StoreListing]
 
 
 ### GetAdById ###
 
 
-class AdByIdReviews(BaseModel):
+class AdByIdReviews(_BaseModel):
     overall_score: int
     reviews_received_count: int
 
 
-class AdByIdPublicProfile(BaseModel):
+class AdByIdPublicProfile(_BaseModel):
     account_created_at: str
     badges: list[Any]
     blocket_account_id: str
@@ -342,11 +346,11 @@ class AdByIdPublicProfile(BaseModel):
     verified_label: str
 
 
-class AdByIdContactMethods(BaseModel):
+class AdByIdContactMethods(_BaseModel):
     mc: bool
 
 
-class AdByIdAdvertiser(BaseModel):
+class AdByIdAdvertiser(_BaseModel):
     account_id: str
     contact_methods: AdByIdContactMethods
     name: str
@@ -354,57 +358,57 @@ class AdByIdAdvertiser(BaseModel):
     type: str
 
 
-class AdByIdCategory(BaseModel):
+class AdByIdCategory(_BaseModel):
     id: str
     name: str
 
 
-class AdByIdImage(BaseModel):
+class AdByIdImage(_BaseModel):
     height: int
     type: str
     url: str
     width: int
 
 
-class AdByIdLocation(BaseModel):
+class AdByIdLocation(_BaseModel):
     id: str
     name: str
     query_key: str
 
 
-class AdByIdMap(BaseModel):
+class AdByIdMap(_BaseModel):
     image_url: str
     label: str
     type: str
 
 
-class AdByIdParameter(BaseModel):
+class AdByIdParameter(_BaseModel):
     id: str
     label: str
     value: str
     suffix: str | None = None
 
 
-class AdByIdParameterGroup(BaseModel):
+class AdByIdParameterGroup(_BaseModel):
     label: str
     parameters: list[AdByIdParameter]
     type: str
 
 
-class AdByIdPrice(BaseModel):
+class AdByIdPrice(_BaseModel):
     suffix: str
     value: int
 
 
-class AdByIdFeatures(BaseModel):
+class AdByIdFeatures(_BaseModel):
     is_part_of_merge: bool
 
 
-class AdByIdUrls(BaseModel):
+class AdByIdUrls(_BaseModel):
     seller_activate: str
 
 
-class AdByIdBlocketPackage(BaseModel):
+class AdByIdBlocketPackage(_BaseModel):
     activated_providers: list[Any]
     ad_id: str
     blocket_payment_backwards_compatability: Any
@@ -426,7 +430,7 @@ class AdByIdBlocketPackage(BaseModel):
     urls: AdByIdUrls
 
 
-class AdByIdGamApiKeywords(BaseModel):
+class AdByIdGamApiKeywords(_BaseModel):
     adid: list[str]
     adtitle: list[str]
     adtype: list[str]
@@ -451,7 +455,7 @@ class AdByIdGamApiKeywords(BaseModel):
     services: list[Any]
 
 
-class AdByIdClientKeywords(BaseModel):
+class AdByIdClientKeywords(_BaseModel):
     cmp_advertising: str
     logged_in: str
     page_gen: str
@@ -465,39 +469,39 @@ class AdByIdClientKeywords(BaseModel):
     viewport_width: str
 
 
-class AdByIdGamContext(BaseModel):
+class AdByIdGamContext(_BaseModel):
     api_keywords: AdByIdGamApiKeywords
     client_keywords: AdByIdClientKeywords
 
 
-class AdByIdContext(BaseModel):
+class AdByIdContext(_BaseModel):
     gam: AdByIdGamContext
     network_id: str | None = None
 
 
-class AdByIdInventory(BaseModel):
+class AdByIdInventory(_BaseModel):
     context: AdByIdContext
 
 
-class AdByIdGamKeywords(BaseModel):
+class AdByIdGamKeywords(_BaseModel):
     adformat: list[str]
     adsize: list[str]
 
 
-class AdByIdGamMediaType(BaseModel):
+class AdByIdGamMediaType(_BaseModel):
     height: int | None = None
     type: str
     width: int | None = None
 
 
-class AdByIdGamPlacement(BaseModel):
+class AdByIdGamPlacement(_BaseModel):
     keywords: AdByIdGamKeywords
     media_types: list[AdByIdGamMediaType]
     path: str
     target_id: str
 
 
-class AdByIdPlacement(BaseModel):
+class AdByIdPlacement(_BaseModel):
     gam: AdByIdGamPlacement | None = None
     type: str
     vendor: str
@@ -505,7 +509,7 @@ class AdByIdPlacement(BaseModel):
     safe_purchase: dict[str, Any] | None = None
 
 
-class AdByIdData(BaseModel):
+class AdByIdData(_BaseModel):
     ad_id: str
     ad_status: str
     advertiser: AdByIdAdvertiser
@@ -530,7 +534,7 @@ class AdByIdData(BaseModel):
     blocket_package: AdByIdBlocketPackage
 
 
-class AdByIdResults(BaseModel):
+class AdByIdResults(_BaseModel):
     data: AdByIdData
     inventory: AdByIdInventory
     placements: list[AdByIdPlacement] | None = None
@@ -539,7 +543,7 @@ class AdByIdResults(BaseModel):
 ### GetUserById ###
 
 
-class BlocketUserAccount(BaseModel):
+class BlocketUserAccount(_BaseModel):
     blocket_account_id: str
     created_at: datetime.datetime
     is_verified: bool
@@ -548,7 +552,7 @@ class BlocketUserAccount(BaseModel):
     verified_with: str
 
 
-class BlocketUserAd(BaseModel):
+class BlocketUserAd(_BaseModel):
     ad_id: str
     ad_url: str
     image_url: str
@@ -557,13 +561,13 @@ class BlocketUserAd(BaseModel):
     subject: str
 
 
-class BlocketUserActiveAds(BaseModel):
+class BlocketUserActiveAds(_BaseModel):
     ads: list[BlocketUserAd]
     label_primary: str
     label_secondary: str
 
 
-class BlocketUserBadge(BaseModel):
+class BlocketUserBadge(_BaseModel):
     description: str
     icon: str
     icon_blocket_ui: str
@@ -571,19 +575,19 @@ class BlocketUserBadge(BaseModel):
     label: str
 
 
-class BlocketUserCO2Savings(BaseModel):
+class BlocketUserCO2Savings(_BaseModel):
     date_range: str
     equivalent: str
     text: str
 
 
-class BlocketUserProfileInfo(BaseModel):
+class BlocketUserProfileInfo(_BaseModel):
     description: str | None = None
     has_reviews: bool
     name: str
 
 
-class BlocketUser(BaseModel):
+class BlocketUser(_BaseModel):
     account: BlocketUserAccount
     active_ads: BlocketUserActiveAds
     badges: list[BlocketUserBadge]
@@ -595,7 +599,7 @@ class BlocketUser(BaseModel):
 ### SavedSearchesResult ###
 
 
-class SavedSearch(BaseModel):
+class SavedSearch(_BaseModel):
     id: str
     name: str
     query: str
@@ -606,5 +610,5 @@ class SavedSearch(BaseModel):
     email_enabled: bool | None = None
 
 
-class SavedSearchResponse(BaseModel):
+class SavedSearchResponse(_BaseModel):
     searches: list[SavedSearch]

{blocket_api-0.3.4 → blocket_api-0.3.6}/blocket_api/qasa.py

@@ -1,9 +1,11 @@
 from dataclasses import dataclass
 from enum import Enum
 from typing import Literal
+
 import httpx
 
-QASA_URL = "https://api.qasa.se/graphql"
+from .constants import QASA_URL
+
 HOME_SEARCH_ORDERING = Literal["descending", "ascending"]
 
 

blocket_api-0.3.6/blocket_api/sendbird.py

@@ -0,0 +1,177 @@
+from __future__ import annotations
+
+import json
+import time
+import urllib.parse
+from dataclasses import dataclass
+
+import httpx
+from pydantic import BaseModel, ConfigDict
+from websockets.sync.client import connect
+
+from .constants import BASE_URL, BLOCKET_SENDBIRD_APP_ID, SENDBIRD_URL
+
+USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:144.0) Gecko/20100101 Firefox/144.0"
+
+
+class SendbirdResponse(BaseModel):
+    user_id: str
+    nickname: str
+    profile_url: str
+    ekey: str
+    metadata: dict
+
+    ping_interval: int
+    pong_timeout: int
+    login_ts: int
+
+    key: str  # Session key
+    expires_at: int
+
+    unread_cnt: dict
+    premium_feature_list: list[str]
+    application_attributes: list[str]
+    services: list[str]
+
+    model_config = ConfigDict(extra="ignore")
+
+    @property
+    def session_key(self) -> str:
+        return self.key
+
+
+def get_blocket_tokens(bearer_token: str) -> dict:
+    token_response = httpx.get(
+        f"{BASE_URL}/messaging-sendbird-communication/v1/users/tokens",
+        headers={
+            "Authorization": f"Bearer {bearer_token}",
+        },
+    )
+    token_response.raise_for_status()
+    return token_response.json()
+
+
+class SendbirdClient:
+    def __init__(
+        self,
+        app_id: str,
+        user_id: str,
+        access_token: str,
+    ):
+        self.app_id = app_id
+        self.user_id = user_id
+        self.access_token = access_token
+
+    def _build_wss_url(self) -> str:
+        base_url = f"wss://ws-{self.app_id.lower()}.sendbird.com/"
+        timestamp = str(int(time.time() * 1000))
+
+        params = {
+            "p": "JS",
+            "pv": USER_AGENT,
+            "sv": "4.10.8",
+            "ai": self.app_id,
+            "pmce": "1",
+            "active": "1",
+            "device_token_types": "gcm,huawei,apns",
+            "SB-User-Agent": "JS/c4.10.8///oweb",
+            "SB-SDK-User-Agent": "main_sdk_info=chat/js/4.10.8&device_os_platform=web&os_version=Mozilla/5.0 (X11; Linux x86_64; rv:144.0) Gecko/20100101 Firefox/144.0",
+            "Request-Sent-Timestamp": timestamp,
+            "include_extra_data": "premium_feature_list,file_upload_size_limit,application_attributes,emoji_hash,multiple_file_send_max_size,notifications",
+            "use_local_cache": "0",
+            "include_poll_details": "1",
+            "user_id": self.user_id,
+        }
+
+        return base_url + "?" + urllib.parse.urlencode(params)
+
+    def get_data(self) -> str:
+        with connect(
+            self._build_wss_url(),
+            subprotocols=[urllib.parse.quote(json.dumps({"token": self.access_token}))],  # type: ignore[list-item]
+            additional_headers={
+                "User-Agent": USER_AGENT,
+                "Origin": "https://www.blocket.se",
+            },
+            open_timeout=5,
+        ) as websocket:
+            message: str = websocket.recv(timeout=5)  # type: ignore[assignment]
+            return str(message.split("LOGI")[1])
+
+
+@dataclass(frozen=True)
+class Sendbird:
+    sendbird_client: SendbirdClient
+
+    @classmethod
+    def generate(cls, blocket_token: str) -> Sendbird:
+        tokens = get_blocket_tokens(blocket_token)
+        sb_token = tokens["sb_session_token"]
+        sb_user_id = tokens["sb_user_id"]
+        return cls(
+            sendbird_client=SendbirdClient(
+                app_id=BLOCKET_SENDBIRD_APP_ID,
+                user_id=sb_user_id,
+                access_token=sb_token,
+            )
+        )
+
+    def get_threads(self, limit: int) -> dict:
+        sendbird = SendbirdResponse.model_validate_json(self.sendbird_client.get_data())
+        response = httpx.get(
+            f"{SENDBIRD_URL}/v3/users/{self.sendbird_client.user_id}/my_group_channels",
+            params={
+                "token": "",
+                "limit": limit,
+                "order": "latest_last_message",
+                "show_member": True,
+                "show_read_receipt": True,
+                "show_delivery_receipt": True,
+                "show_empty": False,
+                "member_state_filter": "all",
+                "super_mode": "all",
+                "public_mode": "all",
+                "unread_filter": "all",
+                "name_contains": "",
+                "custom_type_startswith": "",
+                "hidden_mode": "unhidden_only",
+                "show_frozen": True,
+                "show_metadata": True,
+                "include_chat_notification": False,
+                "include_left_channel": False,
+            },
+            headers={
+                "Session-Key": sendbird.session_key,
+                "Access-Token": self.sendbird_client.access_token,
+            },
+        )
+        response.raise_for_status()
+        return response.json()
+
+    def get_messages_from_thread(self, channel_id: str) -> dict:
+        sendbird = SendbirdResponse.model_validate_json(self.sendbird_client.get_data())
+        response = httpx.get(
+            f"{SENDBIRD_URL}/v3/group_channels/{channel_id}/messages",
+            params={
+                "is_sdk": True,
+                "prev_limit": 30,
+                "next_limit": 0,
+                "include": False,
+                "reverse": False,
+                "message_ts": 9007199254740991,
+                "message_type": "",
+                "include_reply_type": "none",
+                "with_sorted_meta_array": False,
+                "include_reactions": False,
+                "include_thread_info": False,
+                "include_parent_message_info": False,
+                "show_subchannel_message_only": False,
+                "include_poll_details": True,
+            },
+            headers={
+                "Session-Key": sendbird.session_key,
+                "Access-Token": self.sendbird_client.access_token,
+            },
+        )
+        response.raise_for_status()
+        return response.json()

blocket_api-0.3.4/README.md → blocket_api-0.3.6/blocket_api.egg-info/PKG-INFO

@@ -1,3 +1,24 @@
+Metadata-Version: 2.4
+Name: blocket_api
+Version: 0.3.6
+Summary: A python API wrapper for blocket.se
+Author-email: dunderrrrrr <emil.bjorkroth@gmail.com>
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: httpx>=0.28.1
+Requires-Dist: pre-commit>=3.7.1
+Requires-Dist: pytest>=8.2.2
+Requires-Dist: respx>=0.21.1
+Requires-Dist: mypy>=1.15.0
+Requires-Dist: pydantic>=2.11.7
+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.4
+Dynamic: license-file
+
 <p align="center">
   <img src="https://blocket-api.se/blocket-api.png" />
 </p>
@@ -60,6 +81,8 @@ Some calls require a `bearerToken`. However, some calls are public and don't req
 | [`api.get_user_by_id()`](#get_user_by_id)  | 👏 No | Yes | Get user data from id.
 | [`api.save_ad()`](#save_ad)  | 🔐 Yes | - | Save ad to "Saved ads".
 | [`api.get_saved_ads()`](#get_saved_ads)  | 🔐 Yes | - | List all saved ads. 
+| [`api.get_threads()`](#get_threads)  | 🔐 Yes | - | List all threads (messages).
+| [`api.get_messages_from_thread()`](#get_messages_from_thread)  | 🔐 Yes | - | Get all messages from a thread. 
 
 
 ## 🤓 Detailed usage
@@ -173,6 +196,7 @@ To query listings related to a specific car, supply the following parameters:
 - `modelYear` (`Optional[Tuple[int, int]]`) - Set model year range, ex. `(2000, 2020)`.
 - `milage` (`Optional[Tuple[int, int]]`) - Set milage range, ex. `(1000, 2000)`.
 - `gearbox` (`Optional[GEARBOX_OPTIONS]`) - Filter a specific gearbox, ex. `Automat`.
+- `color` (`Optional[List[COLOR_OPTIONS]]`) - Filter a specific color.
 - `as_objects` (`bool`, optional) - Return results as pydantic models, default is `False`.
 
 ```py
@@ -180,6 +204,7 @@ To query listings related to a specific car, supply the following parameters:
     make=["Audi", "Ford"],
     fuel=["Diesel"],
     chassi=["Cab"],
+    chassi=["Blå", "Röd"],
     price=(50000, 100000),
     page=1,
 )
@@ -346,6 +371,59 @@ Returns all of your saved ads from `https://www.blocket.se/sparade/annonser`.
 
 ```
 
+### get_threads
+Returns all of your threads/conversations from Blocket. This api requires a token.
+
+- `limit` (`int`, optional) - Number of threads to return, default is 15.
+
+```py
+>>> api = BlocketAPI("YourBlocketTokenHere")
+>>> api.get_threads()
+{
+   "channels": [
+      {     
+         "channel_url": "sendbird_group_channel_123",
+         "name": "from:user-id,ad:1214281684,to:c1-user-id",
+         "data": {
+            "ad": {
+               "id": "1214281684",
+               "advertiser_name": "Kalle",
+               "subject": "Elsparkcykel",
+               "status": "active",
+               "url": "https://www.blocket.se/annons/1214281684",
+               "price": "2 400 kr"
+            },
+         },
+      },
+      ...
+   ],
+}
+```
+
+
+
+### get_messages_from_thread
+Returns all of your messages from an existing thread/conversation.
+
+- `channel_id` (`str`, required) - The channel id to fetch messages from.
+
+```py
+>>> api = BlocketAPI("YourBlocketTokenHere")
+>>> api.get_messages_from_thread("sendbird_group_channel_123")
+{
+   "messages": [
+      {
+         "type": "MESG",
+         "message_id": 1354913370,
+         "message": "Hey, is your thing still for sale?",
+         ...
+      },
+   ],
+}
+```
+
+
+
 ## 🔐 Blocket API token
 
 There are two ways to acquire your token:

{blocket_api-0.3.4 → blocket_api-0.3.6}/blocket_api.egg-info/SOURCES.txt

@@ -3,8 +3,11 @@ README.md
 pyproject.toml
 blocket_api/__init__.py
 blocket_api/blocket.py
+blocket_api/constants.py
+blocket_api/decorators.py
 blocket_api/models.py
 blocket_api/qasa.py
+blocket_api/sendbird.py
 blocket_api.egg-info/PKG-INFO
 blocket_api.egg-info/SOURCES.txt
 blocket_api.egg-info/dependency_links.txt

{blocket_api-0.3.4 → blocket_api-0.3.6}/blocket_api.egg-info/requires.txt

@@ -1,4 +1,4 @@
-httpx>=0.27.0
+httpx>=0.28.1
 pre-commit>=3.7.1
 pytest>=8.2.2
 respx>=0.21.1
@@ -7,4 +7,5 @@ pydantic>=2.11.7
 mkdocs>=1.6.1
 mkdocs-material>=9.6.21
 mkdocs-swagger-ui-tag>=0.7.2
-ruff>=0.14.1
+websockets>=15.0.1
+ruff>=0.14.4

{blocket_api-0.3.4 → blocket_api-0.3.6}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "blocket_api"
-version = "0.3.4"
+version = "0.3.6"
 description = "A python API wrapper for blocket.se"
 authors = [{name = "dunderrrrrr", email = "emil.bjorkroth@gmail.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "httpx>=0.27.0",
+    "httpx>=0.28.1",
     "pre-commit>=3.7.1",
     "pytest>=8.2.2",
     "respx>=0.21.1",
@@ -15,7 +15,8 @@ dependencies = [
     "mkdocs>=1.6.1",
     "mkdocs-material>=9.6.21",
     "mkdocs-swagger-ui-tag>=0.7.2",
-    "ruff>=0.14.1",
+    "websockets>=15.0.1",
+    "ruff>=0.14.4",
 ]
 
 

blocket_api-0.3.4/blocket_api/__init__.py

@@ -1,2 +0,0 @@
-from .blocket import BlocketAPI as BlocketAPI
-from .blocket import Region as Region