pycoustic 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

pycoustic/__init__.py

@@ -1,3 +1,4 @@
 from .log import Log
 from .survey import Survey
-from .weather import WeatherHistory
+from .weather import WeatherHistory
+

pycoustic/survey.py

@@ -3,10 +3,14 @@ import numpy as np
 from .weather import WeatherHistory
 
 
-DECIMALS=0
+DECIMALS=1
+
+pd.set_option('display.max_columns', None)
+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"])
 
-# pd.set_option('display.max_columns', None)
-# pd.set_option('display.max_rows', None)
 
 class Survey:
     """
@@ -19,6 +23,7 @@ class Survey:
     def __init__(self):
         self._logs = {}
         self._weather = WeatherHistory()
+        self._weatherhist = None
 
     def _insert_multiindex(self, df=None, super=None, name1="Position", name2="Date"):
         subs = df.index.to_list()   # List of subheaders (dates)
@@ -95,6 +100,7 @@ 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:
@@ -194,6 +200,15 @@ class Survey:
         return combi
 
     def counts(self, cols=None, day_t="60min", evening_t="60min", night_t="15min"):
+        """
+        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.
+        :param cols: Which columns to consider. Default (L90, A).
+        :param day_t: Daytime averaging period. Default 60min.
+        :param evening_t: Evening average period. Default 60min.
+        :param night_t: Night-time average period. Default 15min.
+        :return: Returns a dataframe of counts for each time period.
+        """
         if cols is None:
             cols = [("L90", "A")]
         combi = pd.DataFrame()
@@ -222,6 +237,7 @@ class Survey:
             pos_df = self._insert_multiindex(pos_df, super=key)
             combi = pd.concat([combi, pos_df], axis=0)
         combi = self._insert_header(df=combi, new_head_list=period_headers, header_idx=0)
+        #TODO: This dataframe needs tidying.
         return combi
 
     def lmax_spectra(self, n=10, t="2min", period="nights"):
@@ -253,8 +269,6 @@ class Survey:
             combi = pd.concat(objs=[combi, summary], axis=0)
         return combi
 
-    # TODO: get_lowest_l90
-
     def leq_spectra(self, leq_cols=None):
         """
         Compute Leqs over daytime, evening and night-time periods.
@@ -263,7 +277,7 @@ class Survey:
         For all Leq columns, use ["Leq"]. For specific columns, use list of tuples [("Leq", "A"), ("Leq", 125)]
         :return: A dataframe with a continuous Leq computation across dates, for each time period.
         """
-        #TODO: C:\Users\tonyr\PycharmProjects\src\tests.py:674: 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: C:\Users\tonyr\PycharmProjects\pycoustic\tests.py:674: 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"])
         all_pos = []
         if leq_cols is None:
             leq_cols = ["Leq"]
@@ -293,55 +307,23 @@ class Survey:
         ends = [self._logs[key].get_end() for key in self._logs.keys()]
         return min(starts), max(ends)
 
-    def weather(self, interval=6, api_key="", country="GB", postcode="WC1", tz="",):
-        start, end = self.get_start_end()
-        self._weather.reinit(start=start, end=end, interval=interval, api_key=api_key, country=country,
-                             postcode=postcode, tz=tz, units="metric")
-        self._weather.compute_weather_history()
-        return self._weather.get_weather_history()
+    def weather(self, interval=6, api_key=None, country="GB", postcode="WC1", tz="", recompute=False,
+                drop_cols=None):
+        if drop_cols is None:
+            drop_cols = ["sunrise", "sunset", "feels_like", "dew_point", "visibility"]
+        if self._weatherhist is not None and recompute==False:
+            return self._weatherhist
+        else:
+            if api_key is None:
+                raise ValueError("api_key is required")
+            start, end = self.get_start_end()
+            self._weather.reinit(start=start, end=end, interval=interval, api_key=api_key, country=country,
+                                 postcode=postcode, tz=tz, units="metric")
+            self._weatherhist = self._weather.compute_weather_history(drop_cols=drop_cols)
+        return self._weatherhist
 
-    # def typical_leq_spectra(self, leq_cols=None):
-    #     """
-    #     DEPRECATED 2025/06/05. Replaced by .leq_spectra() **TT**
-    #     Compute Leqs over daytime, evening and night-time periods.
-    #     This is an overall Leq, and does not group Leqs by date.
-    #     :param leq_cols: List of strings or List of Tuples.
-    #     For all Leq columns, use ["Leq"]. For specific columns, use list of tuples [("Leq", "A"), ("Leq", 125)]
-    #     :return: A dataframe with a continuous Leq computation across dates, for each time period.
-    #     """
-    #     combi = pd.DataFrame()
-    #     if leq_cols is None:
-    #         leq_cols = ["Leq"]
-    #     for key in self._logs.keys():
-    #         log = self._logs[key]
-    #         combined_list = []
-    #         # Day
-    #         days = log._get_period(data=log.get_antilogs(), period="days")
-    #         days = days[leq_cols].apply(lambda x: np.round(10*np.log10(np.mean(x)), DECIMALS))
-    #         #days.sort_index(inplace=True)
-    #         combined_list.append(days)
-    #         period_headers = ["Daytime" for i in range(len(leq_cols))]
-    #         # Evening
-    #         if log.is_evening():
-    #             evenings = log._get_period(data=log.get_antilogs(), period="evenings")
-    #             evenings = evenings[leq_cols].apply(lambda x: np.round(10*np.log10(np.mean(x)), DECIMALS))
-    #             evenings.sort_index(inplace=True)
-    #             combined_list.append(evenings)
-    #             for i in range(len(leq_cols)):
-    #                 period_headers.append("Evening")
-    #         # Night Leq
-    #         nights = log._get_period(data=log.get_antilogs(), period="nights")
-    #         nights = nights[leq_cols].apply(lambda x: np.round(10*np.log10(np.mean(x)), DECIMALS))
-    #         nights.sort_index(inplace=True)
-    #         combined_list.append(nights)
-    #         for i in range(len(leq_cols)):
-    #             period_headers.append("Night-time")
-    #         summary = pd.concat(objs=combined_list, axis=1)
-    #         summary = self._insert_multiindex(df=summary, super=key)
-    #         combi = pd.concat(objs=[combi, summary], axis=0)
-    #     new_head_dict = {}
-    #     for i in range(len(period_headers)):
-    #         new_head_dict[i] = period_headers[i]
-    #     combi.rename(columns=new_head_dict, inplace=True)
-    #     #combi = combi.transpose()
-    #     return combi
+    def weather_summary(self):
+        if self._weatherhist is None:
+            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)

pycoustic/tkgui.py

@@ -10,14 +10,14 @@ from tkinter import StringVar
 #import matplotlib
 #from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg
 
-#from src import log  # Assuming log is an instance of a class with the required methods
+#from pycoustic import log  # Assuming log is an instance of a class with the required methods
 test = 0
 
 class Application(tk.Tk):
     
     def __init__(self):
         super().__init__()
-        self.title("src Log Viewer")
+        self.title("pycoustic Log Viewer")
         self.geometry("1200x800")
         import tkinter as tk
 

pycoustic/weather.py

@@ -2,7 +2,6 @@ import requests
 import pandas as pd
 import datetime as dt
 
-test=0
 
 appid = ""
 with open("tests/openweather_app_id.txt") as f:
@@ -18,6 +17,7 @@ w_dict = {
     "tz": "GB"
 }
 
+
 def test_weather_obj(weather_test_dict):
     hist = WeatherHistory(start=w_dict["start"], end=w_dict["end"], interval=w_dict["interval"],
                           api_key=w_dict["api_key"], country=w_dict["country"], postcode=w_dict["postcode"],
@@ -58,7 +58,6 @@ class WeatherHistory:
         base = "https://api.openweathermap.org/data/3.0/onecall/timemachine?"
         query = str(base + "lat=" + str(self._lat) + "&" + "lon=" + str(self._lon) + "&" + "units=" + self._units + \
                     "&" + "dt=" + str(timestamp) + "&" + "appid=" + self._api_key)
-        print(query)
         return query
 
     def _construct_timestamps(self):
@@ -71,28 +70,25 @@ class WeatherHistory:
 
     def _make_and_parse_api_call(self, query):
         response = requests.get(query)
-        print(response.json())
         # This drops some unwanted cols like lat, lon, timezone and tz offset.
         resp_dict = response.json()["data"][0]
         del resp_dict["weather"]    # delete weather key as not useful.
         # TODO: parse 'weather' nested dict.
         return resp_dict
 
-    def compute_weather_history(self):
+    def compute_weather_history(self, drop_cols):
         # construct timestamps
         timestamps = self._construct_timestamps()
         # make calls to API
         responses = []
         for ts in timestamps:
-            print(f"ts: {ts}")
             query = self._construct_api_call(timestamp=ts)
             response_dict = self._make_and_parse_api_call(query=query)
             responses.append(pd.Series(response_dict))
         df = pd.concat(responses, axis=1).transpose()
         for col in ["dt", "sunrise", "sunset"]:
             df[col] = df[col].apply(lambda x: dt.datetime.fromtimestamp(int(x)))  # convert timestamp into datetime
-        print(df)
-        self._hist = df
+        df.drop(columns=drop_cols, inplace=True)
         return df
 
     def get_weather_history(self):

{pycoustic-0.1.5.dist-info → pycoustic-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pycoustic
-Version: 0.1.5
+Version: 0.1.6
 Summary: 
 Author: thumpercastle
 Author-email: tony.ryb@gmail.com

pycoustic-0.1.6.dist-info/RECORD

@@ -0,0 +1,8 @@
+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=_fA62mZxBCoQcIe_gziQ2WgDaWqr4cIW_6YqTXmz_is,3747
+pycoustic-0.1.6.dist-info/METADATA,sha256=4K-HhUHP4yxvKveG9TzZRxIxDPmU13s6_9Cae8dmH8E,7987
+pycoustic-0.1.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pycoustic-0.1.6.dist-info/RECORD,,

pycoustic-0.1.5.dist-info/RECORD

@@ -1,8 +0,0 @@
-pycoustic/__init__.py,sha256=0UGHX-vdulM9x1j8g_DcR_BbtBk0gEFg9l4KjLl4Qrk,85
-pycoustic/log.py,sha256=HNdS2hKKbUdqY7iAMj9QJqoI9r4ZtJ7GCXnIx8XpTH4,17145
-pycoustic/survey.py,sha256=6bQW1UniUgUdj7jOpqTagdos6IRVPhURegmq9PgBYjQ,18453
-pycoustic/tkgui.py,sha256=vvB0D29GER-i7lC_SUuzKrzbh1EFAAhpRaHi7kggtYk,13985
-pycoustic/weather.py,sha256=xEp5-ZYlYJXB-G2QQuEETTfyMALAWJtSWtLn5XHDRFo,3822
-pycoustic-0.1.5.dist-info/METADATA,sha256=z1v2MSgNEJx2pC9cSqsxudUpLzizuzTxnDBRLk9iBuY,7987
-pycoustic-0.1.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pycoustic-0.1.5.dist-info/RECORD,,