apmtools 0.2.31__tar.gz → 0.2.32__tar.gz

{apmtools-0.2.31 → apmtools-0.2.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: apmtools
-Version: 0.2.31
+Version: 0.2.32
 Summary: A collection of tools for processing air pollution monitoring data
 Project-URL: Homepage, https://github.com/federlorenz/apmtools
 Author-email: Federico Lorenzetti <lorenzetti.federico@gmail.com>

{apmtools-0.2.31 → apmtools-0.2.32}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apmtools"
-version = "0.2.31"
+version = "0.2.32"
 authors = [
   { name="Federico Lorenzetti", email="lorenzetti.federico@gmail.com" },
 ]

{apmtools-0.2.31 → apmtools-0.2.32}/src/apmtools/classes.py

@@ -1454,9 +1454,26 @@ class Summary(pd.DataFrame):
             else:
                 output = df
 
-        output = output[value_cols].agg(aggregate)
+        if isinstance(frequency, str) and aggregate is None:
+            if grouping_by != None:
+                output = df[grouping_by+[frequency]]
+            else:
+                output = df[[frequency]]
+        if isinstance(frequency, list) and aggregate is None:
+            if grouping_by != None:
+                output = df[grouping_by+frequency]
+            else:
+                output = df[frequency]
+        if frequency == None and aggregate is None:
+            if grouping_by != None:
+                output = df[grouping_by]
+            else:
+                output = df
+                
+        if aggregate is not None:
+            output = output[value_cols].agg(aggregate)
 
-        if frequency != None or grouping_by != None:
+        if aggregate != None and (frequency != None or grouping_by != None):
             output.columns = [
                 "_".join(str(x) for x in col if pd.notna(x) and x != "")
                 for col in output.columns.to_flat_index()
@@ -1472,8 +1489,8 @@ class Summary(pd.DataFrame):
         output.m["aggregate"] = aggregate
 
         return output
-
-
+    
+    
     def get_monitor(self, value):
         
         out = self.subset({"monitor": [value]})