changing lightly stats args in request args building process

solidata_api/_core/queries_db/query_stats.py

@@ -94,7 +94,10 @@ def Query_db_stats (
   search_for = query_args.get('search_for', None )
   # search_in = query_args.get('search_in', None )
   search_filters = query_args.get('search_filters', None )
+  as_series = query_args.get('as_series', False )
   descending = query_args.get('descending', False )
+
+  ### prepare sorting order
   if descending : 
     sort_order = -1
   else : 
@@ -261,9 +264,18 @@ def Query_db_stats (
     ### check and run pipeline
     log.debug( "q_aggregate : \n%s", pformat(q_aggregate) )
     results = db_collection.aggregate(q_aggregate)
-    message  = "stats required for this {}".format(document_type_full)
+    message = "stats required for this {}".format(document_type_full)
     document_out = list(results)
 
+    ### transform list of results as series (e.g. for apexChart format)
+    if as_series : 
+      log.debug( "as_series : %s", as_series )
+      serie_format = query_args.get('serie_format', "apexCharts" )
+      log.debug( "serie_format : %s", serie_format )
+
+      ### TO DO ...
+
+
 
 
 

solidata_api/_parsers/parser_classes.py

@@ -24,12 +24,13 @@
 
 class RequestParserBuilder :
 
-  def __init__(	self, 
+  def __init__(  self, 
       add_pagination = False,
       add_sorting = False,
       add_slice_query = True,
       add_queries = False,
       add_data_query = False,
+      add_extra_options_query = False,
       add_utils_query = False,
       add_map_query = False,
       add_filter_query = False,
@@ -89,73 +90,73 @@ def __init__(	self,
         required=False, 
         default=True, 
         help='just retrieve a slice of the f_data',
-        # location = 'values'
+        location = 'args'
       )
 
     if add_queries : 
 
       # self.baseParser.add_argument('q_title', 
-      # 	# action='append', ### multiple values
-      # 	type=str, 
-      # 	required=False, 
-      # 	help='find documents matching this string in the title',
-      # 	# location = 'values'
+      #   # action='append', ### multiple values
+      #   type=str, 
+      #   required=False, 
+      #   help='find documents matching this string in the title',
+      #   location = 'args'
       # )
       # self.baseParser.add_argument('q_description', 
-      # 	# action='append', ### multiple values
-      # 	type=str, 
-      # 	required=False, 
-      # 	help='find documents matching this string in the description',
-      # 	# location = 'values'
+      #   # action='append', ### multiple values
+      #   type=str, 
+      #   required=False, 
+      #   help='find documents matching this string in the description',
+      #   location = 'args'
       # )
       self.baseParser.add_argument('search_for', 
         action='append',
         type=str, 
         required=False, 
         help='find data in documents matching this string in records',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('tags', 
         action='split',
         type=str, 
         required=False, 
         help='find documents matching this list of tags oid (separated by commas)',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('oids', 
         action='split', ### expects string where values are separated by commas
         type=str, 
         required=False, 
         help='find documents matching this list of oid to find (separated by commas)',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('only_stats', 
         type=inputs.boolean, 
         required=False, 
         default=False, 
         help='just retrieve the stats of the result',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('ignore_teams', 
         type=inputs.boolean, 
         required=False, 
         default=False, 
         help='if true retrieve results mixing docs user is in the team or not',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('pivot_results', 
         type=inputs.boolean, 
         required=False, 
         default=False, 
         help='pivot results',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('normalize', 
         type=inputs.boolean, 
         required=False, 
         default=False, 
         help='normalize results',
-        # location = 'values'
+        location = 'args'
       )
 
     if add_map_query : 
@@ -165,29 +166,29 @@ def __init__(	self,
         required=False, 
         default=False, 
         help='get light results for map display : only sd_id, lat, lon',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('as_latlng', 
         type=inputs.boolean, 
         required=False, 
         default=False, 
         help='coordinates as latlng tuple',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('only_geocoded', 
         type=inputs.boolean, 
         required=False, 
         default=True, 
         help='retrieve only geocoded items',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('geo_precision', 
         type=int, 
         required=False, 
         default=6, 
         choices=[0,1,2,3,4,5,6],
         help='precision of the coordinates as float numbers',
-        # location = 'values'
+        location = 'args'
       )
 
     if add_filter_query : 
@@ -197,15 +198,15 @@ def __init__(	self,
         required=False, 
         default=False, 
         help='retrieve uniques values for each tag or category column in records',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('get_uniques', 
         type=str, 
         required=False, 
         # default=None, 
         choices=dmf_types_uniques,
         help='retrieve uniques values for each column in records : text, tag, category, other',
-        # location = 'values'
+        location = 'args'
       )
 
     if add_data_query : 
@@ -260,11 +261,11 @@ def __init__(	self,
         location = 'args'
       )
       # self.baseParser.add_argument('only_f_data', 
-      # 	type=inputs.boolean, 
-      # 	required=False, 
-      # 	default=False, 
-      # 	help='just retrieve the f_data of the result',
-      #	# location = 'args'
+      #   type=inputs.boolean, 
+      #   required=False, 
+      #   default=False, 
+      #   help='just retrieve the f_data of the result',
+      #  # location = 'args'
       # )
 
     if add_utils_query : 
@@ -274,40 +275,57 @@ def __init__(	self,
         required=False, 
         default=False, 
         help='just retrieve the complete f_data docs from the result',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('only_stats', 
         type=inputs.boolean, 
         required=False, 
         default=False, 
         help='just retrieve the stats of the result',
-        # location = 'values'
+        location = 'args'
       )
       self.baseParser.add_argument('normalize', 
         type=inputs.boolean, 
         required=False, 
         default=False, 
         help='normalize results (aka data) in response',
-        # location = 'values'
+        location = 'args'
       )
 
-    if add_stats_query : 
+    if add_extra_options_query : 
 
       self.baseParser.add_argument('fields_to_return', 
         action='split',
         type=str, 
         required=False, 
         help='return fields values of this list of fields title (separated by commas)',
-        # location = 'values'
+        location = 'args'
       )
-      self.baseParser.add_argument('agreg_categs', 
-        action='split',
+
+    if add_stats_query : 
+
+      # self.baseParser.add_argument('agreg_categs', 
+      #   action='split',
+      #   type=str, 
+      #   required=False, 
+      #   help='agregate unique values of this list of fields title (separated by commas)',
+      #   location = 'args'
+      # )
+      self.baseParser.add_argument('as_series', 
+        type=inputs.boolean, 
+        required=False, 
+        default=False, 
+        help='retrieve only geocoded items',
+        location = 'args'
+      )
+      self.baseParser.add_argument('serie_format', 
         type=str, 
         required=False, 
-        help='agregate unique values of this list of fields title (separated by commas)',
-        # location = 'values'
+        default="apexCharts", 
+        help='return serie as format',
+        location = 'args'
       )
-    
+
     if add_shuffle : 
 
       self.baseParser.add_argument('shuffle_seed', 
@@ -316,17 +334,17 @@ def __init__(	self,
         required=False, 
         default=None, 
         help='shuffle the list of results given a seed',
-        # location = 'values'
+        location = 'args'
       )
 
     if add_files : 
 
       self.baseParser.add_argument('data_file',  
         type=FileStorage, 
         # location=['files', 'form'], 
-        location='files', 
         required=False, 
         help='any data file : tsv, csv, xml, xls, xlsx',
+        location='files', 
       )
       self.baseParser.add_argument('csv_separator', 
         type=str, 
@@ -337,11 +355,11 @@ def __init__(	self,
         location = 'values'
       )
       # self.baseParser.add_argument(
-      # 	'form_file',  
-      # 	type=FileStorage, 
-      # 	location='form', 
-      # 	required=False, 
-      # 	help='any data file : tsv, csv, xml, xls, xlsx',
+      #   'form_file',  
+      #   type=FileStorage, 
+      #   location='form', 
+      #   required=False, 
+      #   help='any data file : tsv, csv, xml, xls, xlsx',
       # )
       # self.baseParser.add_argument(
         # 'xls_file',  
@@ -407,8 +425,8 @@ def get_parser (self) :
     return self.baseParser
 
 
-q_minimal	= RequestParserBuilder()
-query_min_arguments	= q_minimal.get_parser
+q_minimal  = RequestParserBuilder()
+query_min_arguments  = q_minimal.get_parser
 
 q_arguments = RequestParserBuilder( add_queries=True )
 query_arguments = q_arguments.get_parser
@@ -421,7 +439,7 @@ def get_parser (self) :
 query_data_arguments = q_data.get_parser
 
 q_files = RequestParserBuilder( add_files=True )
-file_parser	= q_files.get_parser
+file_parser  = q_files.get_parser
 
 q_pagination = RequestParserBuilder( 
   add_pagination=True,
@@ -443,7 +461,8 @@ def get_parser (self) :
   add_slice_query=False, 
   add_data_query=True, 
   add_utils_query=True,
-  add_stats_query=True,
+  # add_stats_query=True,
+  add_extra_options_query=True,
   add_map_query=True, 
   add_filter_query=True,
   # add_shuffle=True, 
@@ -456,7 +475,8 @@ def get_parser (self) :
   add_slice_query=False, 
   add_data_query=True, 
   add_utils_query=True,
-  add_stats_query=True, 
+  # add_stats_query=True,
+  add_extra_options_query=True, 
   add_map_query=True, 
   add_filter_query=True,
   # add_shuffle=True, 
@@ -469,7 +489,7 @@ def get_parser (self) :
   add_sorting=True,
   add_slice_query=False, 
   add_data_query=True, 
-  # add_stats_query=True, 
+  add_stats_query=True, 
   # add_map_query=True, 
   # add_filter_query=True
 )