pycoustic 0.1.13__py3-none-any.whl → 0.1.15__py3-none-any.whl

pycoustic/survey.py

@@ -35,10 +35,31 @@ class Survey:
         return df.set_index(idx, inplace=False)
 
     def _insert_header(self, df=None, new_head_list=None, header_idx=None):
-        cols = df.columns.to_list()
-        new_cols = [list(c) for c in zip(*cols)]
-        new_cols.insert(header_idx, new_head_list)
-        df.columns = new_cols
+        if df is None or new_head_list is None:
+            return df
+
+        ncols = df.shape[1]
+
+        # Allow scalar broadcast for convenience
+        if isinstance(new_head_list, (str, int, float)):
+            new_head_list = [new_head_list] * ncols
+
+        if len(new_head_list) != ncols:
+            raise ValueError(
+                f"new_head_list length ({len(new_head_list)}) must equal number of columns ({ncols})."
+            )
+
+        cols = list(df.columns)
+        # Normalize columns into list of tuples
+        if isinstance(df.columns, pd.MultiIndex):
+            tuples = cols  # already list of tuples
+        else:
+            tuples = [(c,) for c in cols]
+
+        # Build arrays per level and insert new header list
+        arrays = [list(x) for x in zip(*tuples)]
+        arrays.insert(header_idx, list(new_head_list))
+        df.columns = pd.MultiIndex.from_arrays(arrays)
         return df
 
     # def _leq_by_date(self, data, cols=None):
@@ -113,34 +134,33 @@ class Survey:
         :return: A dataframe presenting a summary of the Leq and Lmax values requested.
         """
         combi = pd.DataFrame()
-        period_headers = []
         if leq_cols is None:
             leq_cols = [("Leq", "A")]
         if max_cols is None:
             max_cols = [("Lmax", "A")]
 
-        for key, lg in self._logs.items():  # changed: iterate items() to get lg directly
-            combined_list = []
-            headers_for_log = []  # new: collect headers per log
+        for key, lg in self._logs.items():
+            period_blocks = []
+            period_names = []
 
             # Day
             days = lg.leq_by_date(lg.get_period(data=lg.get_antilogs(), period="days"), cols=leq_cols)
             days.sort_index(inplace=True)
-            combined_list.append(days)
-            headers_for_log.extend(["Daytime"] * len(leq_cols))  # changed: don't reset global headers
+            period_blocks.append(days)
+            period_names.append("Daytime")
 
-            # Evening
+            # Evening (optional)
             if lg.is_evening():
                 evenings = lg.leq_by_date(lg.get_period(data=lg.get_antilogs(), period="evenings"), cols=leq_cols)
                 evenings.sort_index(inplace=True)
-                combined_list.append(evenings)
-                headers_for_log.extend(["Evening"] * len(leq_cols))
+                period_blocks.append(evenings)
+                period_names.append("Evening")
 
             # Night Leq
             nights = lg.leq_by_date(lg.get_period(data=lg.get_antilogs(), period="nights"), cols=leq_cols)
             nights.sort_index(inplace=True)
-            combined_list.append(nights)
-            headers_for_log.extend(["Night-time"] * len(leq_cols))
+            period_blocks.append(nights)
+            period_names.append("Night-time")
 
             # Night max
             maxes = lg.as_interval(t=lmax_t)
@@ -153,20 +173,23 @@ class Survey:
             except Exception as e:
                 print(f"Error converting index to date: {e}")
             maxes.index.name = None
-            combined_list.append(maxes)
-            headers_for_log.extend(["Night-time"] * len(max_cols))
+            period_blocks.append(maxes)
+            period_names.append("Night-time")
 
-            summary = pd.concat(objs=combined_list, axis=1)
+            # Build Period as a proper column level to avoid manual header length mismatches
+            summary = pd.concat(objs=period_blocks, axis=1, keys=period_names, names=["Period"])
+
+            # Add the per-log super level (kept as before)
             summary = self._insert_multiindex(df=summary, super=key)
-            combi = pd.concat(objs=[combi, summary], axis=0)
 
-            # append this log's headers to the global list
-            period_headers.extend(headers_for_log)
+            # Stack logs by rows; columns remain aligned across logs
+            combi = pd.concat(objs=[combi, summary], axis=0)
 
-        combi = self._insert_header(df=combi, new_head_list=period_headers, header_idx=0)
+        # No manual header insertion needed anymore; Period is already a column level
         return combi
 #test
     def modal(self, cols=None, by_date=False, day_t="60min", evening_t="60min", night_t="15min"):
+        #TODO rename second level index so it is not 'date'
         """
         Get a dataframe summarising Modal L90 values for each time period, as suggested by BS 4142:2014.
         Currently, this method rounds the values to 0 decimal places by default and there is no alternative
@@ -493,43 +516,4 @@ class WeatherHistory:
 #   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pycoustic\survey.py", line 328, in weather_summary
 #     return pd.DataFrame([self._weatherhist.min(), self._weatherhist.max(), self._weatherhist.mean()],
 #                          ^^^^^^^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\frame.py", line 11643, in min
-#     result = super().min(axis, skipna, numeric_only, **kwargs)
-#              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\generic.py", line 12388, in min
-#     return self._stat_function(
-#            ^^^^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\generic.py", line 12377, in _stat_function
-#     return self._reduce(
-#            ^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\frame.py", line 11562, in _reduce
-#     res = df._mgr.reduce(blk_func)
-#           ^^^^^^^^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\internals\managers.py", line 1500, in reduce
-#     nbs = blk.reduce(func)
-#           ^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\internals\blocks.py", line 404, in reduce
-#     result = func(self.values)
-#              ^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\frame.py", line 11481, in blk_func
-#     return op(values, axis=axis, skipna=skipna, **kwds)
-#            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\nanops.py", line 147, in f
-#     result = alt(values, axis=axis, skipna=skipna, **kwds)
-#              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\nanops.py", line 404, in new_func
-#     result = func(values, axis=axis, skipna=skipna, mask=mask, **kwargs)
-#              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\pandas\core\nanops.py", line 1098, in reduction
-#     result = getattr(values, meth)(axis)
-#              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\numpy\_core\_methods.py", line 48, in _amin
-#     return umr_minimum(a, axis, None, out, keepdims, initial, where)
-#            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-# TypeError: '<=' not supported between instances of 'dict' and 'dict'
-
-
-#TODO: Fix this error:
-#
-# C:\Users\tonyr\PycharmProjects\pycoustic\pycoustic\survey.py:316: FutureWarning:
-# The behavior of pd.concat with len(keys) != len(objs) is deprecated. In a future version this will raise instead of truncating to the smaller of the two sequences
+#   File "C:\Users\tonyr\PycharmProjects\pycoustic\.venv2\Lib\site-packages\

{pycoustic-0.1.13.dist-info → pycoustic-0.1.15.dist-info}/METADATA

@@ -1,19 +1,18 @@
 Metadata-Version: 2.3
 Name: pycoustic
-Version: 0.1.13
+Version: 0.1.15
 Summary: 
 Author: thumpercastle
 Author-email: tony.ryb@gmail.com
-Requires-Python: >=3.10,<=3.13
+Requires-Python: >=3.11,<=3.13
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: numpy (==2.3.3)
 Requires-Dist: openpyxl (==3.1.5)
 Requires-Dist: pandas (==2.3.3)
-Requires-Dist: plotly (==6.1.2)
+Requires-Dist: plotly (>=6.3.1,<7.0.0)
 Requires-Dist: requests (>=2.32.4,<3.0.0)
 Requires-Dist: streamlit (>=1.46.1,<2.0.0)
 Description-Content-Type: text/markdown

{pycoustic-0.1.13.dist-info → pycoustic-0.1.15.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pycoustic/__init__.py,sha256=jq9Tzc5nEgXh8eNf0AkAypmw3Dda9A-iSy-tyFaTksA,89
 pycoustic/log.py,sha256=e8rAy9hIYP2H-3vTDVe0-6swe_n_gXjuFCu6Q-xNiYQ,17827
 pycoustic/pycoustic_gui_app.py,sha256=Hs61Y8fAp7uoRONa4RLSVl0UvGXZZ96n5eJGilErlAU,11143
-pycoustic/survey.py,sha256=zrRI1cWZf8ihAyeqb_-8d5MEVbD3Gfy1D83g6QEnwzE,28143
+pycoustic/survey.py,sha256=yPOCNLaNJ85MhNN5ehWPWM5EQ_ixsE9Y3ikk84yIfTY,26154
 pycoustic/tkgui.py,sha256=YAy5f_qkXZ3yU8BvB-nIVQX1fYwPs_IkwmDEXHPMAa4,13997
 pycoustic/weather.py,sha256=q9FbDKjY0WaNvaYMHeDk7Bhbq0_Q7ehsTM_vUaCjeAk,3753
-pycoustic-0.1.13.dist-info/METADATA,sha256=gGrQfkqXRk_t--Zf5BF2EmTq0d-AVPWxdbVdLe3Nhuo,8516
-pycoustic-0.1.13.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pycoustic-0.1.13.dist-info/RECORD,,
+pycoustic-0.1.15.dist-info/METADATA,sha256=T3GDJd8La3Bp2HJtl5qsM_eMc98EwNoru34KqZOJBAY,8472
+pycoustic-0.1.15.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pycoustic-0.1.15.dist-info/RECORD,,