can pass additional options for allowed agg functions in View inits

climatic_zones/views.py

@@ -26,7 +26,8 @@ class ClimateView(APIView, CommonViews):
     def __init__(self):
         CommonViews.__init__(self)
         self.keep_only_given_agg_allowed(dict(maxclass=most_common_value,
-                                              frequency=relative_frequency))
+                                              frequency=relative_frequency),
+                                         frequency=dict(bins=13))
 
     def _extract(self, lat, lon, radius, agg, direction, by_direction):
         """perform actual extraction of desired quantity"""

utils/extraction_tools.py

@@ -256,9 +256,10 @@ def extract_value_stats(lonvec, latvec, data, lon=-999., lat=-999.,
                                 radius, dlon, dlat, min_valid=min_valid, max_valid=max_valid,
                                 min_angle=min_angle, max_angle=max_angle)
         # apply statistics
-        if agg is relative_frequency:
-            res = relative_frequency(subset, bins=max_valid+1)
-        else:
+        #if agg is relative_frequency:
+        #    res = relative_frequency(subset, bins=max_valid+1)
+        #else:
+        #    res = agg(subset)
         res = agg(subset)
         if res is None:
             res = default_value

utils/views_commons.py

@@ -23,6 +23,7 @@ import numpy as np
 from functools import partial
 import toar_location_services.settings as settings
 from utils.geoutils import Directions
+import inspect
 
 
 class CommonViews:
@@ -41,9 +42,23 @@ class CommonViews:
     def update_agg_allowed(self):
         self.AGG_ALLOWED = list(self.STATS.keys()) + ['NN%-ile', 'NN-percentile']
 
-    def add_agg_allowed(self, name, func, update=True):
+    def load_kwargs(self, args_dict, func):
+        # check kwargs for usage
+        args = {}
+        for k, v in args_dict.items():
+            if inspect.getargspec(func):
+                args[k] = v
+
+
+    def add_agg_allowed(self, name, func, update=True, **kwargs):
+        # add only if not already present
         if str(name) not in self.STATS.keys():
+            if name not in kwargs.keys():
                 self.STATS[str(name)] = func
+            else:
+                self.STATS[str(name)] = partial(func, **kwargs[name])
+           # if len(args.keys()) == 0:
+           #     self.STATS[str(name)] = func
             if update:
                 self.update_agg_allowed()
 
@@ -53,12 +68,12 @@ class CommonViews:
         if update:
             self.update_agg_allowed()
 
-    def keep_only_given_agg_allowed(self, agg_dict):
+    def keep_only_given_agg_allowed(self, agg_dict, **kwargs):
         for name in list(self.STATS.keys()):
             if name not in agg_dict.keys():
                 self.remove_agg_allowed(name, update=False)
         for name, func in agg_dict.items():
-            self.add_agg_allowed(name, func, update=False)
+            self.add_agg_allowed(name, func, update=False, **kwargs)
         self.update_agg_allowed()
 
     def get_agg_param(self, params):