pycoustic 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

pycoustic/streamlit_pycoustic_gpt5_dead.py

@@ -0,0 +1,234 @@
+# streamlit_pycoustic_app.py
+import ast
+import datetime as dt
+import tempfile
+from pathlib import Path
+from typing import Any, Dict, Iterable
+
+import streamlit as st
+
+from pycoustic import Log, Survey
+
+
+def _parse_kwargs(text: str) -> Dict[str, Any]:
+    """
+    Safely parse a Python dict literal from text area.
+    Returns {} if empty or invalid.
+    """
+    if not text or not text.strip():
+        return {}
+    try:
+        parsed = ast.literal_eval(text)
+        return parsed if isinstance(parsed, dict) else {}
+    except Exception:
+        return {}
+
+
+def _display_result(obj: Any):
+    """
+    Display helper to handle common return types.
+    """
+    # Plotly Figure-like
+    if hasattr(obj, "to_plotly_json"):
+        st.plotly_chart(obj, use_container_width=True)
+        return
+
+    # Pandas DataFrame-like
+    if hasattr(obj, "to_dict") and hasattr(obj, "columns"):
+        st.dataframe(obj, use_container_width=True)
+        return
+
+    # Dict/list -> JSON
+    if isinstance(obj, (dict, list)):
+        st.json(obj)
+        return
+
+    # Fallback
+    st.write(obj)
+
+
+def _ensure_state():
+    if "survey" not in st.session_state:
+        st.session_state["survey"] = None
+    if "periods" not in st.session_state:
+        st.session_state["periods"] = {"day": (7, 0), "evening": (19, 0), "night": (23, 0)}
+
+
+def _write_uploaded_to_temp(uploaded) -> str:
+    """
+    Persist an UploadedFile to a temporary file and return the path.
+    Using a real file path keeps Log(...) happy across environments.
+    """
+    suffix = Path(uploaded.name).suffix or ".csv"
+    with tempfile.NamedTemporaryFile(delete=False, suffix=suffix) as tmp:
+        tmp.write(uploaded.getbuffer())
+        return tmp.name
+
+
+def _build_survey_from_files(files) -> Survey:
+    """
+    Create a Survey and attach Log objects for each uploaded file.
+    """
+    survey = Survey()
+    for f in files:
+        # Persist to disk to ensure compatibility with pandas and any path usage in Log
+        tmp_path = _write_uploaded_to_temp(f)
+        log_obj = Log(path=tmp_path)
+
+        key = Path(f.name).stem
+        # Attach Log to survey
+        if hasattr(survey, "add_log"):
+            try:
+                survey.add_log(key, log_obj)
+            except TypeError:
+                survey.add_log(log_obj, key)
+        else:
+            # Fallback to internal storage if no public API is available
+            survey._logs[key] = log_obj  # noqa: SLF001
+    return survey
+
+
+def _apply_periods_to_all_logs(survey: Survey, times: Dict[str, tuple[int, int]]):
+    """
+    Apply set_periods to each Log attached to the Survey.
+    This avoids calling set_periods on Survey if it doesn't exist.
+    """
+    logs: Iterable[Log] = getattr(survey, "_logs", {}).values()
+    for log in logs:
+        if hasattr(log, "set_periods"):
+            log.set_periods(times=times)
+
+
+def _render_period_controls(survey: Survey):
+    st.subheader("Assessment Periods")
+
+    # Current periods from session (defaults set in _ensure_state)
+    periods = st.session_state["periods"]
+    day_h, day_m = periods["day"]
+    eve_h, eve_m = periods["evening"]
+    night_h, night_m = periods["night"]
+
+    c1, c2, c3 = st.columns(3)
+    with c1:
+        day_time = st.time_input("Day starts", value=dt.time(day_h, day_m), key="period_day_start")
+    with c2:
+        eve_time = st.time_input("Evening starts", value=dt.time(eve_h, eve_m), key="period_eve_start")
+    with c3:
+        night_time = st.time_input("Night starts", value=dt.time(night_h, night_m), key="period_night_start")
+
+    new_periods = {
+        "day": (int(day_time.hour), int(day_time.minute)),
+        "evening": (int(eve_time.hour), int(eve_time.minute)),
+        "night": (int(night_time.hour), int(night_time.minute)),
+    }
+
+    if st.button("Apply periods to all logs", key="apply_periods"):
+        try:
+            _apply_periods_to_all_logs(survey, new_periods)
+            st.session_state["periods"] = new_periods
+            st.success("Periods applied to all logs.")
+        except Exception as e:
+            st.warning(f"Could not set periods: {e}")
+
+
+def _render_method_runner(survey: Survey, method_name: str, help_text: str = ""):
+    """
+    Generic UI for running a Survey method with kwargs provided via text area.
+    """
+    with st.expander(method_name, expanded=True):
+        if help_text:
+            st.caption(help_text)
+
+        kwargs_text = st.text_area(
+            "kwargs (Python dict literal)",
+            value="{}",
+            key=f"kwargs_{method_name}",
+            placeholder='Example: {"position": "UA1", "date": "2023-06-01"}',
+            height=100,
+        )
+
+        kwargs = _parse_kwargs(kwargs_text)
+        if st.button(f"Run {method_name}", key=f"run_{method_name}"):
+            try:
+                fn = getattr(survey, method_name)
+                result = fn(**kwargs)
+                _display_result(result)
+            except AttributeError:
+                st.error(f"Survey has no method named '{method_name}'.")
+            except Exception as e:
+                st.error(f"Error running {method_name}: {e}")
+
+
+def main():
+    st.set_page_config(page_title="pycoustic GUI", layout="wide")
+    st.title("pycoustic – Streamlit GUI")
+
+    _ensure_state()
+
+    st.sidebar.header("Load CSV Logs")
+    files = st.sidebar.file_uploader(
+        "Upload one or more CSV files",
+        type=["csv"],
+        accept_multiple_files=True,
+        help="Each file becomes a Log; all Logs go into one Survey."
+    )
+
+    build = st.sidebar.button("Create / Update Survey", type="primary")
+
+    if build and files:
+        try:
+            survey = _build_survey_from_files(files)
+            # Apply default periods to all logs
+            _apply_periods_to_all_logs(survey, st.session_state["periods"])
+            st.session_state["survey"] = survey
+            st.success("Survey created/updated.")
+        except Exception as e:
+            st.error(f"Unable to create Survey: {e}")
+
+    survey: Survey = st.session_state.get("survey")
+
+    if survey is None:
+        st.info("Upload CSV files in the sidebar and click 'Create / Update Survey' to begin.")
+        return
+
+    # Period controls
+    _render_period_controls(survey)
+
+    st.markdown("---")
+    st.header("Survey Outputs")
+
+    _render_method_runner(
+        survey,
+        "resi_summary",
+        help_text="Summary results for residential assessment. Provide any optional kwargs here."
+    )
+    _render_method_runner(
+        survey,
+        "modal",
+        help_text="Run modal analysis over the survey. Provide any optional kwargs here."
+    )
+    _render_method_runner(
+        survey,
+        "leq_spectra",
+        help_text="Compute or plot Leq spectra. Provide any optional kwargs here."
+    )
+    _render_method_runner(
+        survey,
+        "lmax_spectra",
+        help_text="Compute or plot Lmax spectra. Provide any optional kwargs here."
+    )
+
+    st.markdown("---")
+    with st.expander("Loaded Logs", expanded=False):
+        try:
+            names = list(getattr(survey, "_logs", {}).keys())
+            if names:
+                st.write(", ".join(names))
+            else:
+                st.write("No logs found in survey.")
+        except Exception:
+            st.write("Unable to list logs.")
+
+
+if __name__ == "__main__":
+    main()

pycoustic/survey.py

@@ -10,7 +10,7 @@ pd.set_option('display.max_rows', None)
 
 #survey.leq_spectra() bug
 #TODO: C:\Users\tonyr\PycharmProjects\pycoustic\.venv1\Lib\site-packages\pycoustic\survey.py:287: 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 combi = pd.concat(all_pos, axis=1, keys=["UA1", "UA2"])
-
+#TODO: Survey should make a deep copy of Log objects. Otherwise setting time periods messes it up for other instances.
 
 class Survey:
     """
@@ -39,6 +39,17 @@ class Survey:
         df.columns = new_cols
         return df
 
+    # def _leq_by_date(self, data, cols=None):
+    #     """
+    #     Delegate Leq-by-date computation to one of the underlying Log instances.
+    #     Assumes all logs share the same period configuration.
+    #     """
+    #     if not getattr(self, "_logs", None):
+    #         raise AttributeError("Survey has no logs available to compute _leq_by_date")
+    #     any_log = next(iter(self._logs.values()))
+    #     if not hasattr(any_log, "_leq_by_date"):
+    #         raise AttributeError("Underlying Log does not implement _leq_by_date")
+    #     return any_log._leq_by_date(data, cols=cols)
     # ###########################---PUBLIC---######################################
 
     def set_periods(self, times=None):
@@ -105,51 +116,54 @@ class Survey:
             leq_cols = [("Leq", "A")]
         if max_cols is None:
             max_cols = [("Lmax", "A")]
-        for key in self._logs.keys():
-            log = self._logs[key]
+
+        for key, lg in self._logs.items():  # changed: iterate items() to get lg directly
             combined_list = []
+            headers_for_log = []  # new: collect headers per log
+
             # Day
-            days = log._leq_by_date(log._get_period(data=log.get_antilogs(), period="days"), cols=leq_cols)
+            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)
-            period_headers = ["Daytime" for i in range(len(leq_cols))]
+            headers_for_log.extend(["Daytime"] * len(leq_cols))  # changed: don't reset global headers
+
             # Evening
-            if log.is_evening():
-                evenings = log._leq_by_date(log._get_period(data=log.get_antilogs(), period="evenings"), cols=leq_cols)
+            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)
-                for i in range(len(leq_cols)):
-                    period_headers.append("Evening")
+                headers_for_log.extend(["Evening"] * len(leq_cols))
+
             # Night Leq
-            nights = log._leq_by_date(log._get_period(data=log.get_antilogs(), period="nights"), cols=leq_cols)
+            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)
-            for i in range(len(leq_cols)):
-                period_headers.append("Night-time")
+            headers_for_log.extend(["Night-time"] * len(leq_cols))
+
             # Night max
-            maxes = log.as_interval(t=lmax_t)
-            maxes = log._get_period(data=maxes, period="nights", night_idx=True)
-            maxes = log.get_nth_high_low(n=lmax_n, data=maxes)[max_cols]
+            maxes = lg.as_interval(t=lmax_t)
+            maxes = lg.get_period(data=maxes, period="nights", night_idx=True)
+            maxes = lg.get_nth_high_low(n=lmax_n, data=maxes)[max_cols]
             maxes.sort_index(inplace=True)
-            #  +++
-            # SS Feb2025  - Code changed to prevent exception
-            #maxes.index = maxes.index.date
             try:
                 maxes.index = pd.to_datetime(maxes.index)
                 maxes.index = maxes.index.date
             except Exception as e:
                 print(f"Error converting index to date: {e}")
-            # SSS ---
             maxes.index.name = None
             combined_list.append(maxes)
-            for i in range(len(max_cols)):
-                period_headers.append("Night-time")
+            headers_for_log.extend(["Night-time"] * len(max_cols))
+
             summary = pd.concat(objs=combined_list, axis=1)
             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)
+
         combi = self._insert_header(df=combi, new_head_list=period_headers, header_idx=0)
         return combi
-
+#test
     def modal(self, cols=None, by_date=False, day_t="60min", evening_t="60min", night_t="15min"):
         """
         Get a dataframe summarising Modal L90 values for each time period, as suggested by BS 4142:2014.
@@ -200,6 +214,7 @@ class Survey:
         return combi
 
     def counts(self, cols=None, day_t="60min", evening_t="60min", night_t="15min"):
+        #TODO Need to order rows and rename from 'date'
         """
         Returns counts for each time period. For example, this can return the number of L90 occurrences at each decibel
         level for daytime and night-time periods.
@@ -327,3 +342,91 @@ class Survey:
             raise ValueError("No weather history available. Use Survey.weather() first.")
         return pd.DataFrame([self._weatherhist.min(), self._weatherhist.max(), self._weatherhist.mean()],
                             index=["Min", "Max", "Mean"]).drop(columns=["dt"]).round(decimals=1)
+
+
+# TODO: Fix this bug in weatherhist
+# survey.weather(api_key=r"eef3f749e018627b70c2ead1475a1a32", postcode="HA8")
+#                     dt   temp pressure humidity clouds wind_speed wind_deg  \
+# 0  2025-09-03 08:59:00  17.52      998       97     75       6.69      210
+# 1  2025-09-03 14:59:00  19.85      997       84     40       9.26      220
+# 2  2025-09-03 20:59:00  16.27   1003.0     90.0   20.0       4.63    240.0
+# 3  2025-09-04 02:59:00  14.59   1005.0     91.0   99.0       3.09    230.0
+# 4  2025-09-04 08:59:00  15.08     1004       93     40       4.12      200
+# 5  2025-09-04 14:59:00  18.73     1007       63     40       8.75      260
+# 6  2025-09-04 20:59:00  15.64   1013.0     76.0    0.0        3.6    270.0
+# 7  2025-09-05 02:59:00  11.42   1016.0     94.0    0.0       3.09    260.0
+# 8  2025-09-05 08:59:00  14.12   1020.0     89.0   20.0       3.09    270.0
+# 9  2025-09-05 14:59:00  22.16   1021.0     50.0    0.0       4.12    280.0
+# 10 2025-09-05 20:59:00  17.38   1023.0     75.0   75.0       3.09    220.0
+# 11 2025-09-06 02:59:00  14.37   1022.0     83.0   99.0       1.78    187.0
+# 12 2025-09-06 08:59:00  16.44   1020.0     73.0  100.0       3.48    138.0
+# 13 2025-09-06 14:59:00  23.21   1037.0     50.0    0.0       7.72    160.0
+# 14 2025-09-06 20:59:00   18.5   1035.0     75.0   93.0        3.6    120.0
+# 15 2025-09-07 02:59:00  16.06   1031.0     77.0   84.0       3.09    120.0
+# 16 2025-09-07 08:59:00  18.78   1029.0     77.0    0.0       4.63    110.0
+# 17 2025-09-07 14:59:00  23.82   1027.0     67.0   75.0       8.75    200.0
+# 18 2025-09-07 20:59:00  19.38   1031.0     76.0   72.0       4.63    200.0
+# 19 2025-09-08 02:59:00  14.49   1034.0     91.0    4.0       1.54    190.0
+# 20 2025-09-08 08:59:00  14.84   1037.0     85.0   20.0       4.12    240.0
+#             rain wind_gust   uvi
+# 0   {'1h': 0.25}       NaN   NaN
+# 1   {'1h': 1.27}     14.92   NaN
+# 2            NaN       NaN   NaN
+# 3            NaN       NaN   NaN
+# 4   {'1h': 1.27}       NaN   NaN
+# 5   {'3h': 0.13}       NaN   NaN
+# 6            NaN       NaN   NaN
+# 7            NaN       NaN   NaN
+# 8            NaN       NaN   NaN
+# 9            NaN       NaN   NaN
+# 10           NaN       NaN   NaN
+# 11           NaN      3.31   0.0
+# 12           NaN       7.4  0.86
+# 13           NaN       NaN  2.96
+# 14           NaN       NaN   0.0
+# 15           NaN       NaN   0.0
+# 16           NaN       NaN   1.1
+# 17           NaN       NaN  2.24
+# 18           NaN       NaN   0.0
+# 19           NaN       NaN   0.0
+# 20           NaN       NaN  1.12
+# survey.weather_summary()
+# Traceback (most recent call last):
+#   File "<input>", line 1, in <module>
+#   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'

pycoustic/weather.py

@@ -93,3 +93,4 @@ class WeatherHistory:
 
     def get_weather_history(self):
         return self._hist
+

{pycoustic-0.1.7.dist-info → pycoustic-0.1.9.dist-info}/METADATA

@@ -1,11 +1,13 @@
 Metadata-Version: 2.3
 Name: pycoustic
-Version: 0.1.7
+Version: 0.1.9
 Summary: 
 Author: thumpercastle
 Author-email: tony.ryb@gmail.com
-Requires-Python: >=3.11.9,<4.0
+Requires-Python: >=3.10,<=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.2.6)

pycoustic-0.1.9.dist-info/RECORD

@@ -0,0 +1,14 @@
+pycoustic/__init__.py,sha256=jq9Tzc5nEgXh8eNf0AkAypmw3Dda9A-iSy-tyFaTksA,89
+pycoustic/log.py,sha256=e8rAy9hIYP2H-3vTDVe0-6swe_n_gXjuFCu6Q-xNiYQ,17827
+pycoustic/pycoustic_gui_app-ai.py,sha256=nEX7Q5oWzTLmtC_xqbh74vXpQak8gwuqf2ScPq1Ir7o,24432
+pycoustic/pycoustic_gui_app.py,sha256=Hs61Y8fAp7uoRONa4RLSVl0UvGXZZ96n5eJGilErlAU,11143
+pycoustic/pycoustic_streamlit_gpt5.py,sha256=gpkPPBGwADt9HFI4S7YD1U-TjpLTMVwcBUJd7wTefek,14259
+pycoustic/streamlit-ai.py,sha256=OZdrQbGwQyVvA_4Q8bTOCZUZGdSlZG9NL9z3f16W-A8,16414
+pycoustic/streamlit-new.py,sha256=AR5dwQinMXugvGcyNvI_W59bfFRGj6E90Fqah9toKto,4885
+pycoustic/streamlit_pycoustic_gpt5_dead.py,sha256=sFUxLkvNUZoh2cVzruqsJJiLIlJxOQQpYYK6oHZfPlM,7309
+pycoustic/survey.py,sha256=6gC2sd0vOusx8bEyCwqmfSR5k04VeV93Ong0OdEVVks,24071
+pycoustic/tkgui.py,sha256=YAy5f_qkXZ3yU8BvB-nIVQX1fYwPs_IkwmDEXHPMAa4,13997
+pycoustic/weather.py,sha256=q9FbDKjY0WaNvaYMHeDk7Bhbq0_Q7ehsTM_vUaCjeAk,3753
+pycoustic-0.1.9.dist-info/METADATA,sha256=2NDXL0ovNkEJKxx-P2ErBkdTHNA1AWL77RFAaKQdI6o,8515
+pycoustic-0.1.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pycoustic-0.1.9.dist-info/RECORD,,

pycoustic-0.1.7.dist-info/RECORD

@@ -1,8 +0,0 @@
-pycoustic/__init__.py,sha256=jq9Tzc5nEgXh8eNf0AkAypmw3Dda9A-iSy-tyFaTksA,89
-pycoustic/log.py,sha256=HNdS2hKKbUdqY7iAMj9QJqoI9r4ZtJ7GCXnIx8XpTH4,17145
-pycoustic/survey.py,sha256=KTNCt4kV63Dq06RCbh9G9Nl8Frk8NsTt6AhxiMIEixg,17746
-pycoustic/tkgui.py,sha256=YAy5f_qkXZ3yU8BvB-nIVQX1fYwPs_IkwmDEXHPMAa4,13997
-pycoustic/weather.py,sha256=3FIzpp3jniA1SRObMCnKsobVFZxJX5gpugsAWA3bH8o,3751
-pycoustic-0.1.7.dist-info/METADATA,sha256=SEdgTvtyNxGVcgYFKrjwIh0TZw5gUzHoc_GRGaxkykg,8413
-pycoustic-0.1.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pycoustic-0.1.7.dist-info/RECORD,,