rbx 3.21.1.dev179__tar.gz → 3.22.0.dev181__tar.gz

{rbx-3.21.1.dev179 → rbx-3.22.0.dev181}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbx
-Version: 3.21.1.dev179
+Version: 3.22.0.dev181
 Summary: A collection of common tools for Scoota services.
 Author-email: The Scoota Engineering Team <engineering@scoota.com>
 License: 

{rbx-3.21.1.dev179 → rbx-3.22.0.dev181}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rbx"
-version = "3.21.1.dev179"
+version = "3.22.0.dev181"
 description = "A collection of common tools for Scoota services."
 authors = [
     { name = "The Scoota Engineering Team", email = "engineering@scoota.com" }
@@ -80,7 +80,7 @@ homepage = "https://github.com/rockabox/rbx"
 repository = "https://github.com/rockabox/rbx.git"
 
 [tool.bumpversion]
-current_version = "3.21.1.dev179"
+current_version = "3.22.0.dev181"
 commit = true
 parse = """
 	(?P<major>\\d+)\\.

rbx-3.22.0.dev181/rbx/__init__.py

@@ -0,0 +1 @@
+__version__ = "3.22.0.dev181"

{rbx-3.21.1.dev179 → rbx-3.22.0.dev181}/rbx/clients/__init__.py

@@ -124,7 +124,6 @@ class Client(metaclass=Singleton):
         headers=None,
         params=None,
         timeout=None,
-        include_headers=False,
     ):
         """Wrap the method call in common error handling."""
         endpoint = endpoint if endpoint is not None else self.ENDPOINT
@@ -218,15 +217,13 @@ class Client(metaclass=Singleton):
 
         # 204 "No Content" responses return nothing
         if response.status_code == 204:
-            if include_headers:
-                return {"content": None, "headers": dict(response.headers)}
             return
 
         if content_type == "text/plain":
-            content = response.text
+            return response.text
         else:
             try:
-                content = self.get_response(response)
+                return self.get_response(response)
             except ValueError:
                 extra = {
                     "request": payload,
@@ -236,12 +233,6 @@ class Client(metaclass=Singleton):
                     "Invalid JSON response", details=extra, status_code=500, url=url
                 )
 
-        # Return content with headers if requested, otherwise just content
-        if include_headers:
-            return {"content": content, "headers": dict(response.headers)}
-        else:
-            return content
-
     def request(
         self,
         method,
@@ -252,7 +243,6 @@ class Client(metaclass=Singleton):
         headers=None,
         params=None,
         timeout=None,
-        include_headers=False,
     ):
         """Attempt to re-authenticate when the token has expired.
 
@@ -271,7 +261,6 @@ class Client(metaclass=Singleton):
             headers=headers,
             params=params,
             timeout=timeout,
-            include_headers=include_headers,
         )
 
         try:

{rbx-3.21.1.dev179 → rbx-3.22.0.dev181}/rbx/clients/adsquare.py

@@ -1,8 +1,6 @@
 import csv
 from io import StringIO
 import logging
-from os import path
-import shelve
 
 import arrow
 
@@ -25,11 +23,10 @@ class AdsquareClient(Client):
     STANDARD_COMPANY_ID = "588b6428e4b0d7d5f6895bd1"
     TIME_FORMAT = "YYYY-MM-DDTHH:mm:ss.SSS[Z]"
 
-    def __init__(self, company_id, dsp_id, destination="/tmp"):
+    def __init__(self, company_id, dsp_id):
         super().__init__()
         self.company_id = company_id
         self.dsp_id = dsp_id
-        self.shelf = path.join(destination, "adsquare.segments")
 
     @property
     def auth(self):
@@ -83,62 +80,6 @@ class AdsquareClient(Client):
 
         return pois
 
-    def get_segments(self, company_ids=None, country_code=None):
-        """Get segments from local cache."""
-        with shelve.open(self.shelf) as shelf:
-            try:
-                segments = shelf["segments"]
-            except KeyError:
-                # The cache is empty
-                segments = []
-
-        # Always include Standard segments (i.e.: Company ID = adsquare).
-        company_ids = company_ids or []
-        company_ids.append(self.STANDARD_COMPANY_ID)
-
-        # Exclude company_ids that are either None or empty.
-        company_ids[:] = [cid for cid in company_ids if cid]
-
-        segment_list = []
-        for segment in segments:
-            if segment["company_id"] not in company_ids:
-                continue
-            if country_code and country_code not in [segment["country"], "ZZ"]:
-                continue
-            segment_list.append(segment)
-
-        return segment_list
-
-    @retry.Retry(deadline=300.0)
-    def list_segments(self):
-        """List all segments available.
-
-        According to the documentation, there is no pagination on this endpoint, so we expect the
-        full list to be returned with a single call.
-
-        See: https://docs.adsquare.com/#!/enrichmentMetaApi/getEnrichmentAudiences_1
-        """
-        path = f"enrichmentMeta/audiences/{self.dsp_id}"
-        response = self.request("get", path, data={"namev2": "true"})
-
-        return [
-            {
-                "company_id": audience["companyId"],
-                "country": audience["countryCode"],
-                "cpm": audience["cpm"],
-                "currency": audience["currency"],
-                "id": audience["audienceId"],
-                "name": audience["name"],
-                "owner": (
-                    "Standard"
-                    if audience["companyId"] == self.STANDARD_COMPANY_ID
-                    else "Custom"
-                ),
-                "type": audience["type"],
-            }
-            for audience in response["audiences"]
-        ]
-
     def pause_config(self, config_id):
         """Pause the given configuration."""
         self.update_config(config_id=config_id, active=False)
@@ -168,16 +109,6 @@ class AdsquareClient(Client):
         """Resume the given configuration."""
         self.update_config(config_id=config_id, active=True)
 
-    def store_segments(self):
-        """Retrieve the list of segments, and then cache the results on a shelf.
-
-        As no caching mechanism exists on the API, we simply override the content of the cache
-        with the results from the list_segments() call.
-        """
-        segments = self.list_segments()
-        with shelve.open(self.shelf) as shelf:
-            shelf["segments"] = segments
-
     @retry.Retry(deadline=300.0)
     def update_config(self, config_id, active=None, start_date=None, end_date=None):
         """Update the given configuration ID.

{rbx-3.21.1.dev179 → rbx-3.22.0.dev181}/rbx/clients/place.py

@@ -275,26 +275,3 @@ class PlaceExchangeClient(Client):
             path=path,
             params=params if params else None,
         )
-
-    def get_screens(self, page=None):
-        """Retrieve a page of screens from Place Exchange."""
-        path = f"v3/orgs/{self.org_id}/avails"
-        params = {"page_size": 1000}
-
-        if page:
-            params["page"] = page
-
-        response = self.request("get", path, params=params, include_headers=True)
-
-        # Extract the page for the next page from the Link header if it exists
-        next_page = None
-        if "Link" in response["headers"]:
-            links = response["headers"]["Link"].split(",")
-            for link in links:
-                if "rel='next'" in link:
-                    # Extract the page parameter from the URL
-                    url_part = link.split(";")[0].strip("<>")
-                    if "page=" in url_part:
-                        next_page = int(url_part.split("page=")[1].split("&")[0])
-
-        return response["content"], next_page

{rbx-3.21.1.dev179 → rbx-3.22.0.dev181}/rbx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbx
-Version: 3.21.1.dev179
+Version: 3.22.0.dev181
 Summary: A collection of common tools for Scoota services.
 Author-email: The Scoota Engineering Team <engineering@scoota.com>
 License: 

rbx-3.21.1.dev179/rbx/__init__.py

@@ -1 +0,0 @@
-__version__ = "3.21.1.dev179"