Merge remote-tracking branch 'refs/remotes/mortada/master' into get_series_with_realtime

Author: elmotec

fredapi/fred.py

@@ -337,7 +337,7 @@ def __do_series_search(self, url):
             data = None
         return data, num_results_total
 
-    def __get_search_results(self, url, limit, order_by, sort_order):
+    def __get_search_results(self, url, limit, order_by, sort_order, filter):
         """
         helper function for getting search results up to specified limit on the number of results. The Fred HTTP API
         truncates to 1000 results per request, so this may issue multiple HTTP requests to obtain more available data.
@@ -352,6 +352,12 @@ def __get_search_results(self, url, limit, order_by, sort_order):
             else:
                 raise ValueError('%s is not in the valid list of order_by options: %s' % (order_by, str(order_by_options)))
 
+        if filter is not None:
+            if len(filter) == 2:
+                url = url + '&filter_variable=%s&filter_value=%s' % (filter[0], filter[1])
+            else:
+                raise ValueError('Filter should be a 2 item tuple like (filter_variable, filter_value)')
+
         sort_order_options = ['asc', 'desc']
         if sort_order is not None:
             if sort_order in sort_order_options:
@@ -375,7 +381,7 @@ def __get_search_results(self, url, limit, order_by, sort_order):
                 data = data.append(next_data)
         return data.head(max_results_needed)
 
-    def search(self, text, limit=1000, order_by=None, sort_order=None):
+    def search(self, text, limit=1000, order_by=None, sort_order=None, filter=None):
         """
         Do a fulltext search for series in the Fred dataset. Returns information about matching series in a DataFrame.
 
@@ -391,6 +397,9 @@ def search(self, text, limit=1000, order_by=None, sort_order=None):
             'popularity'
         sort_order : str, optional
             sort the results by ascending or descending order. Valid options are 'asc' or 'desc'
+        filter : tuple, optional
+            filters the results. Expects a tuple like (filter_variable, filter_value).
+            Valid filter_variable values are 'frequency', 'units', and 'seasonal_adjustment'
 
         Returns
         -------
@@ -399,10 +408,10 @@ def search(self, text, limit=1000, order_by=None, sort_order=None):
         """
         url = "%s/series/search?search_text=%s&" % (self.root_url,
                                                     quote_plus(text))
-        info = self.__get_search_results(url, limit, order_by, sort_order)
+        info = self.__get_search_results(url, limit, order_by, sort_order, filter)
         return info
 
-    def search_by_release(self, release_id, limit=0, order_by=None, sort_order=None):
+    def search_by_release(self, release_id, limit=0, order_by=None, sort_order=None, filter=None):
         """
         Search for series that belongs to a release id. Returns information about matching series in a DataFrame.
 
@@ -418,19 +427,22 @@ def search_by_release(self, release_id, limit=0, order_by=None, sort_order=None)
             'popularity'
         sort_order : str, optional
             sort the results by ascending or descending order. Valid options are 'asc' or 'desc'
+        filter : tuple, optional
+            filters the results. Expects a tuple like (filter_variable, filter_value).
+            Valid filter_variable values are 'frequency', 'units', and 'seasonal_adjustment'
 
         Returns
         -------
         info : DataFrame
             a DataFrame containing information about the matching Fred series
         """
         url = "%s/release/series?release_id=%d" % (self.root_url, release_id)
-        info = self.__get_search_results(url, limit, order_by, sort_order)
+        info = self.__get_search_results(url, limit, order_by, sort_order, filter)
         if info is None:
             raise ValueError('No series exists for release id: ' + str(release_id))
         return info
 
-    def search_by_category(self, category_id, limit=0, order_by=None, sort_order=None):
+    def search_by_category(self, category_id, limit=0, order_by=None, sort_order=None, filter=None):
         """
         Search for series that belongs to a category id. Returns information about matching series in a DataFrame.
 
@@ -446,6 +458,9 @@ def search_by_category(self, category_id, limit=0, order_by=None, sort_order=Non
             'popularity'
         sort_order : str, optional
             sort the results by ascending or descending order. Valid options are 'asc' or 'desc'
+        filter : tuple, optional
+            filters the results. Expects a tuple like (filter_variable, filter_value).
+            Valid filter_variable values are 'frequency', 'units', and 'seasonal_adjustment'
 
         Returns
         -------
@@ -454,7 +469,7 @@ def search_by_category(self, category_id, limit=0, order_by=None, sort_order=Non
         """
         url = "%s/category/series?category_id=%d&" % (self.root_url,
                                                       category_id)
-        info = self.__get_search_results(url, limit, order_by, sort_order)
+        info = self.__get_search_results(url, limit, order_by, sort_order, filter)
         if info is None:
             raise ValueError('No series exists for category id: ' + str(category_id))
         return info