pybarb 0.4__tar.gz → 0.4.2__tar.gz

{pybarb-0.4 → pybarb-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybarb
-Version: 0.4
+Version: 0.4.2
 Summary: A package to interact with the BARB API
 Home-page: https://github.com/coppeliaMLA/barb_api
 Author: Simon Raper

{pybarb-0.4 → pybarb-0.4.2}/pybarb/pybarb.py

@@ -131,7 +131,7 @@ class BarbAPI:
         else:
             raise Exception(f"Panel name {panel_region} not found.")
         return panel_code
-
+    
     def programme_ratings(self, min_transmission_date, max_transmission_date, station=None, panel=None, consolidated=True, last_updated_greater_than=None, use_reporting_days=True, limit=5000):
         """
         Gets the programme ratings for a given date range.
@@ -280,7 +280,7 @@ class BarbAPI:
         api_url = f"{self.api_root}{endpoint}"
         r = requests.get(url=api_url, params=parameters, headers=self.headers)
         r_json = r.json()
-        api_response_data = {"endpoint": "programme_ratings",
+        api_response_data = {"endpoint": endpoint,
                              "events": r_json["events"],
                              "audience_categories": r_json["audience_categories"]}
         while r.headers.__contains__("X-Next"):
@@ -308,7 +308,7 @@ class BarbAPI:
 
         if regex_filter is not None:
 
-            regex = re.compile(regex_filter)
+            regex = re.compile(regex_filter, flags=re.IGNORECASE)
             list_of_stations = list(filter(regex.search, list_of_stations))
 
         return list_of_stations
@@ -329,7 +329,7 @@ class BarbAPI:
 
         if regex_filter is not None:
 
-            regex = re.compile(regex_filter)
+            regex = re.compile(regex_filter, flags=re.IGNORECASE)
             list_of_stations = list(filter(regex.search, list_of_stations))
 
         return list_of_stations
@@ -349,7 +349,7 @@ class BarbAPI:
 
         if regex_filter is not None:
 
-            regex = re.compile(regex_filter)
+            regex = re.compile(regex_filter, flags=re.IGNORECASE)
             list_of_panels = list(filter(regex.search, list_of_panels))
 
         return list_of_panels
@@ -369,7 +369,7 @@ class BarbAPI:
 
         if regex_filter is not None:
 
-            regex = re.compile(regex_filter)
+            regex = re.compile(regex_filter, flags=re.IGNORECASE)
             list_of_buyers = list(filter(regex.search, list_of_buyers))
 
         return list_of_buyers
@@ -382,15 +382,15 @@ class BarbAPI:
                 list: The advertisers result set.
         """
 
-        api_url = f"{self.api_root}advertiers"
+        api_url = f"{self.api_root}advertisers"
         api_response_data = requests.get(url=api_url, headers=self.headers)
 
-        list_of_advertisers = api_response_data.json()
+        list_of_advertisers = [a['advertiser_name'] for a in api_response_data.json()]
 
         if regex_filter is not None:
 
-            regex = re.compile(regex_filter)
-            list_of_buyers = list(filter(regex.search, list_of_advertisers))
+            regex = re.compile(regex_filter, flags=re.IGNORECASE)
+            list_of_advertisers = list(filter(regex.search, list_of_advertisers))
 
         return list_of_advertisers
 
@@ -618,9 +618,9 @@ class ProgrammeRatingsResultSet(APIResultSet):
                            'uk_premiere': e['uk_premier'],
                            'broadcaster_premiere': e['broadcaster_premier'],
                            'programme_repeat': e['repeat'],
-                           'episode_number': e['episode']['episode_number'] if 'episode' in e else None,
-                           'episode_name': e['episode']['episode_name'] if 'episode' in e else None,
-                           'genre': e['genre'] if 'genre' in e else None,
+                           'episode_number': e['programme_content']['episode']['episode_number'] if 'episode' in e['programme_content'].keys() else None,
+                           'episode_name': e['programme_content']['episode']['episode_name'] if 'episode' in e['programme_content'].keys() else None,
+                           'genre': e['programme_content']['genre'] if 'genre' in e['programme_content'].keys() else None,
                            'audience_code': v['audience_code'],
                            'audience_size_hundreds': v['audience_size_hundreds']})
         # Convert the result into a data frame

{pybarb-0.4 → pybarb-0.4.2}/pybarb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybarb
-Version: 0.4
+Version: 0.4.2
 Summary: A package to interact with the BARB API
 Home-page: https://github.com/coppeliaMLA/barb_api
 Author: Simon Raper

{pybarb-0.4 → pybarb-0.4.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='pybarb',
-    version='0.4',
+    version='0.4.2',
     packages=find_packages(),
     install_requires=[
         'pandas',