tsp 1.7.3__py3-none-any.whl → 1.8.0__py3-none-any.whl

tsp/__meta__.py

@@ -1,3 +1,3 @@
 # Automatically created. Please do not edit.
-__version__ = '1.7.3'
+__version__ = '1.8.0'
 __author__ = 'Nick Brown'

tsp/concatenation.py

@@ -0,0 +1,153 @@
+from __future__ import annotations
+
+import numpy as np
+import pandas as pd
+
+from typing import Any, TYPE_CHECKING
+
+
+if TYPE_CHECKING:
+    from tsp import TSP
+
+
+def _tsp_concat(tsp_list: "list[TSP]", on_conflict="error", metadata='first') -> dict[str, Any]:
+    """ Helper for core.tsp_concat """
+    # Validate the TSPs in the list
+    _validate_tsp_list(tsp_list)
+    
+    # Combine the TSPs
+    dfs = [t.wide for t in tsp_list]
+    combined_df = _concat_deduplicate(dfs, on_conflict=on_conflict)
+    
+    # Combine metadata
+    if metadata == 'first':
+        metadata = {key:val for key, val in tsp_list[0].metadata.items()}
+        latitude = tsp_list[0].latitude
+        longitude = tsp_list[0].longitude
+        site_id = tsp_list[0].site_id
+
+    elif metadata == 'identical':
+        metadata = {key:val for key, val in tsp_list[0].metadata.items()}
+        for key, val in metadata.items():
+            for t in tsp_list[1:]:
+                if key not in t.metadata or t.metadata[key] != val:
+                    _ = metadata.pop(key)
+        latitude = _none_if_not_identical([t.latitude for t in tsp_list])
+        longitude = _none_if_not_identical([t.longitude for t in tsp_list])
+        site_id = _none_if_not_identical([t.site_id for t in tsp_list])
+            
+    elif metadata == 'none':
+        metadata = None
+        latitude, longitude, site_id = None, None, None
+    
+    else:
+        raise ValueError(f"Unknown metadata method: {metadata}")
+    
+    #final_tsp = TSP(times=combined_df.index, values=combined_df.values, depths=combined_df.columns, 
+    #                latitude=latitude, longitude=longitude,
+   #                 site_id=site_id, metadata=metadata)
+    try:
+        combined_df.drop('time', axis=1, inplace=True)
+    except KeyError:
+        Warning("Deprecation Error: The 'time' column is no longer used in TSP objects. Please update your code to avoid this warning.")
+
+    tsp_dict = {
+        'times': combined_df.index,
+        'values': combined_df.values,
+        'depths': combined_df.columns,
+        'latitude': latitude,
+        'longitude': longitude,
+        'site_id': site_id,
+        'metadata': metadata
+    }
+    return tsp_dict
+
+
+def _none_if_not_identical(list):
+    """Check if all elements in the list are identical. If they are, return the first element; otherwise, return None."""
+    first = list[0]
+    for item in list[1:]:
+        if item != first:
+            return None
+    return first
+
+
+def _validate_tsp_list(tsp_list: "list[TSP]"):
+    """Check that all TSPs in the list have the same depths."""
+    depths0 = tsp_list[0].depths
+    for t in tsp_list[1:]:
+        if not np.array_equal(depths0, t.depths):
+            raise ValueError("All TSPs must have the same depths.")
+        
+
+def _concat_deduplicate(df_list, on_conflict='error'):
+    """
+    Concatenates a list of DataFrames, handling duplicate indices based on row values.
+
+    Args:
+        df_list (list): A list of pandas DataFrames. Assumes they have identical
+                        column names.
+        on_conflict (str): Specifies how to handle duplicate indices with
+                           unequal row values.
+                           - 'error': Raise a ValueError (default).
+                           - 'keep_first': Keep the row corresponding to the first
+                                           DataFrame in the list where the index appeared.
+
+    Returns:
+        pandas.DataFrame: The concatenated DataFrame with duplicates handled
+                          according to the specified rules.
+
+    Raises:
+        ValueError: If df_list is empty.
+        ValueError: If on_conflict is not 'error' or 'keep_first'.
+        ValueError: If on_conflict='error' and duplicate indices with
+                    non-identical row values are found.
+    """
+    if not df_list:
+        raise ValueError("Input DataFrame list cannot be empty.")
+
+    if on_conflict not in ['error', 'keep_first']:
+        raise ValueError("on_conflict must be either 'error' or 'keep_first'")
+
+    # Store original index name if it exists
+    original_index_name = df_list[0].index.name
+
+    # Concatenate all DataFrames. The order is preserved.
+    combined_df = pd.concat(df_list, ignore_index=False) # Keep original indices
+
+    temp_index_col = "__temp_index__"
+    combined_reset = combined_df.reset_index(names=temp_index_col)
+
+    # Drop rows that are duplicates based on *all* columns
+    deduplicated_reset = combined_reset.drop_duplicates(keep='first')
+
+    # Check for remaining duplicates *only* in the original index column. 
+    remaining_duplicates_mask = deduplicated_reset.duplicated(subset=temp_index_col, keep=False)
+
+    if remaining_duplicates_mask.any():
+        # We have indices that appeared multiple times with different values.
+        if on_conflict == 'error':
+            conflicting_indices = deduplicated_reset.loc[remaining_duplicates_mask, temp_index_col].unique()
+            raise ValueError(
+                f"Duplicate indices with non-identical values found: "
+                f"{list(conflicting_indices)}. Use on_conflict='keep_first' to keep "
+                f"the first occurrence."
+            )
+        elif on_conflict == 'keep_first':
+            # Drop the later occurrences of these conflicting index values.
+            # Since 'deduplicated_reset' preserved the first unique (index, row_value)
+            # combination, dropping duplicates based solely on the index column
+            # while keeping the first achieves the desired outcome.
+            final_reset = deduplicated_reset.drop_duplicates(subset=temp_index_col, keep='first')
+        else: 
+            pass
+    else:
+        # No conflicting duplicates (duplicate indices with different values) were found.
+        final_reset = deduplicated_reset
+
+    final_df = final_reset.set_index(temp_index_col)
+    final_df.index.name = original_index_name
+    # Sort by time, ascending
+    final_df.sort_index(inplace=True)
+
+    return final_df

tsp/core.py

@@ -19,15 +19,19 @@ except ModuleNotFoundError:
     warnings.warn("Missing netCDF4 library. Some functionality will be limited.", stacklevel=2)
 
 from typing import Union, Optional
+from numpy.typing import NDArray
 from datetime import datetime, tzinfo, timezone, timedelta
 
 import tsp
 import tsp.labels as lbl
+import tsp.tspwarnings as tw
+
 from tsp.physics import analytical_fourier
-from tsp.plots.static import trumpet_curve, colour_contour, time_series
+from tsp.plots.static import trumpet_curve, colour_contour, time_series, profile_evolution
 from tsp.time import format_utc_offset
 from tsp.time import get_utc_offset
 from tsp.misc import completeness
+from tsp.concatenation import _tsp_concat
 
 from matplotlib.figure import Figure
 
@@ -74,6 +78,28 @@ class TSP:
 
     def __str__(self) -> str:
         return str(self.wide)
+    
+    def __add__(self, other: TSP) -> TSP:
+        """ Concatenate two TSP objects along the time axis. 
+        The two TSP objects must have the same depths and the same UTC offset.
+
+        Parameters
+        ----------
+        other : TSP
+            Another TSP object to concatenate with this one
+
+        Returns
+        -------
+        TSP
+            A new TSP object with the concatenated data
+        """
+        if not isinstance(other, TSP):
+            raise TypeError("Can only concatenate TSP objects.")
+        
+        if self.utc_offset != other.utc_offset:
+            raise ValueError("UTC offsets must be the same to concatenate.")
+        
+        return tsp_concat([self, other])
 
     def __init__(self, times, depths, values, 
                  latitude: Optional[float]=None, 
@@ -83,7 +109,7 @@ class TSP:
 
         self._times = handle_incoming_times(times)
         if self._times.duplicated().any():
-            warnings.warn(f"Duplicate timestamps found: {self._times[np.where(self._times.duplicated())[0]]}. That's bad.", stacklevel=2)
+            warnings.warn(tw.DuplicateTimesWarning(self._times), stacklevel=2)
         
         if self.utc_offset:
             self._output_utc_offset = self.utc_offset
@@ -101,6 +127,8 @@ class TSP:
         self._freq = None
         self._completeness = None
 
+        self._export_precision = 3
+
     @property
     def freq(self) -> Optional[int]:
         """ Measurement frequency [s] """
@@ -216,12 +244,15 @@ class TSP:
         return t
 
     @classmethod
-    def synthetic(cls, depths: "np.ndarray", start="2000-01-01", end="2003-01-01",
-                  Q:"Optional[float]"=0.2, 
-                  c:"Optional[float]"=1.6e6,
-                  k:"Optional[float]"=2.5,
-                  A:"Optional[float]"=6,
-                  MAGST:"Optional[float]"=-0.5) -> "TSP":
+    def synthetic(cls, depths: NDArray[np.number], 
+                  start:str ="2000-01-01", 
+                  end:str ="2003-01-01",
+                  freq: "str"="D",
+                  Q:float=0.2, 
+                  c:float=1.6e6,
+                  k:float=2.5,
+                  A:float=6,
+                  MAGST:float=-0.5) -> "TSP":
         """
         Create a 'synthetic' temperature time series using the analytical solution to the heat conduction equation.
         Suitable for testing 
@@ -229,9 +260,13 @@ class TSP:
         Parameters
         ----------   
         depths : np.ndarray
-            array of depths in m
+            array of depths in metres
         start : str
-            array of times in seconds
+            start date for the time series, in the format "YYYY-MM-DD"
+        end : str
+            end date for the time series, in the format "YYYY-MM-DD"
+        freq : str
+            pandas frequency string, e.g. "D" for daily, "H" for hourly, etc.
         Q : Optional[float], optional
             Ground heat flux [W m-2], by default 0.2
         c : Optional[float], optional
@@ -248,10 +283,16 @@ class TSP:
         TSP 
             A timeseries profile (TSP) object
         """
-        times = pd.date_range(start=start, end=end).to_pydatetime()
+        times = pd.date_range(start=start, end=end, freq=freq).to_pydatetime()
         t_sec = np.array([(t-times[0]).total_seconds() for t in times])
         
-        values = analytical_fourier(depths=depths, times=t_sec, Q=Q, c=c, k=k, A=A, MAGST=MAGST)
+        values = analytical_fourier(depths=depths,
+                                    times=t_sec,
+                                    Q=Q,
+                                    c=c,
+                                    k=k,
+                                    A=A,
+                                    MAGST=MAGST)
         
         this = cls(depths=depths, times=times, values=values)
         
@@ -550,7 +591,7 @@ class TSP:
         return t
 
     @property
-    def depths(self) -> "np.ndarray":
+    def depths(self) -> NDArray[np.number]:
         """ Return the depth values in the profile 
 
         Returns
@@ -602,9 +643,9 @@ class TSP:
         filename : str
             Path to the file to write to
         """
-        df = self.wide.rename(columns={'time': 'Date/Depth'})
+        df = self.wide.round(self._export_precision).rename(columns={'time': 'Date/Depth'})
         df['Date/Depth'] = df['Date/Depth'].dt.strftime("%Y-%m-%d %H:%M:%S")
-
+        
         df.to_csv(filename, index=False, na_rep="-999")
 
     def to_ntgs(self, filename:str, project_name:str="", site_id:"Optional[str]" = None, latitude:"Optional[float]"=None, longitude:"Optional[float]"=None) -> None:
@@ -650,7 +691,7 @@ class TSP:
         headers = [str(d) + "_m" for d in self.depths]
         
         for i, h in enumerate(headers):
-            df[h] = data[:, i]
+            df[h] = data[:, i].round(self._export_precision)
 
         df.to_csv(filename, index=False)
 
@@ -690,8 +731,27 @@ class TSP:
             f.write(self._to_json())
 
     def _to_json(self) -> str:
-        return self.wide.to_json()
+        return self.wide.round(self._export_precision).to_json()
 
+    def plot_profiles(self, P:int=100, n:int=10) -> Figure:
+        """ Create a plot of the temperature profiles at different times
+        
+        Parameters
+        ----------
+        P : int
+            Percentage of time range to plot
+        n : int
+            Number of evenly-spaced profiles to plot
+        
+        Returns
+        -------
+        Figure
+            matplotlib `Figure` object
+        """
+        fig = profile_evolution(depths=self.depths, times=self.times, values=self._values, P=P, n=n)
+        fig.show()
+        return fig
+    
     def plot_trumpet(self, 
                      year: Optional[int]=None,
                      begin: Optional[datetime]=None,
@@ -708,6 +768,10 @@ class TSP:
             If 'end' also provided, the earliest measurement to include in the averaging for the plot
         end : datetime, optional
             If 'begin' also provided, the latest measurement to include in the averaging for the plot
+        min_completeness : float, optional
+            If provided, the minimum completeness (fractional, 0 to 1) required to include
+            in temperature envelope, otherwise
+            the point is plotted as an unconnected, slightly transparent dot, by default None
         **kwargs : dict, optional
             Extra arguments to the plotting function: refer to the documentation for :func:`~tsp.plots.static.trumpet_curve` for a
             list of all possible arguments.
@@ -1008,3 +1072,37 @@ def handle_incoming_times(times: "Union[np.ndarray, pd.DatetimeIndex, pd.Series,
 
     else:
         raise ValueError(invalid_msg)
+
+def tsp_concat(tsp_list, on_conflict='error', metadata='first') -> TSP:
+    """Combine multiple TSPs into a single TSP.
+    
+    Parameters
+    ----------
+    tsp_list : list[TSP]
+        List of TSPs to combine. They must have the same depths
+    on_conflict : str, optional
+        Method to resolve duplicate times with different values. Chosen from "error", "keep", by default "error"
+        - "error": Raise an error if duplicate times with different values are found.
+        - "keep": Keep the first occurrence of the duplicate time.
+    metadata : str, optional
+        Method to select metadata from the TSPs. Chosen from "first", "identical", or "none", by default "first"
+        - "first": Use the metadata from the first TSP in the list.
+        - "identical": Only keep metadata records that are identical across TSPs.
+        - "none": Ignore metadata and set it to None.
+    Returns
+    -------
+    TSP
+        Combined TSP.
+        
+    Description
+    -----------
+    This function combines multiple TSPs into a single TSP. The TSPs must have the same depths.
+    """
+    tsp_dict = _tsp_concat(tsp_list=tsp_list, on_conflict=on_conflict, metadata=metadata)
+    times = tsp_dict.pop('times')
+    depths = tsp_dict.pop('depths')
+    values = tsp_dict.pop('values')
+
+    t = TSP(times, depths, values, **tsp_dict)
+    
+    return t

tsp/data/NTGS_example_csv.csv

@@ -0,0 +1,6 @@
+project_name,site_id,latitude,longitude,date_YYYY-MM-DD,time_HH:MM:SS,0.05_m,0.1_m,0.2_m,0.5_m,0.75_m
+Your Great Project,West Whale Lake,63.390429,-109.364898,2015-04-14,03:00:00,-3.510,-2.411,-1.871,-1.037,-0.814
+Your Great Project,West Whale Lake,63.390429,-109.364898,2015-04-14,04:00:00,-3.469,-2.382,-1.856,-1.046,-0.818
+Your Great Project,West Whale Lake,63.390429,-109.364898,2015-04-14,05:00:00,-3.457,-2.353,-1.835,-1.037,-0.828
+Your Great Project,West Whale Lake,63.390429,-109.364898,2015-04-14,06:00:00,-3.466,-2.336,-1.825,-1.039,-0.831
+

tsp/data/NTGS_example_slash_dates.csv

@@ -0,0 +1,6 @@
+project_name,site_id,latitude,longitude,date_YYYY-MM-DD,time_HH:MM:SS,0.05_m,0.1_m,0.2_m,0.5_m,0.75_m
+Your Great Project,West Whale Lake,63.390429,-109.364898,2015/04/14,03:00:00,-3.510,-2.411,-1.871,-1.037,-0.814
+Your Great Project,West Whale Lake,63.390429,-109.364898,2015/04/14,04:00:00,-3.469,-2.382,-1.856,-1.046,-0.818
+Your Great Project,West Whale Lake,63.390429,-109.364898,2015/04/14,05:00:00,-3.457,-2.353,-1.835,-1.037,-0.828
+Your Great Project,West Whale Lake,63.390429,-109.364898,2015/04/14,06:00:00,-3.466,-2.336,-1.825,-1.039,-0.831
+

tsp/data/example_permos.csv

@@ -0,0 +1,8 @@
+time,0,0.5,1,1.5,2.3,3.6,5.09,7.08,9.57,12.56,20.04
+2002-11-18 00:00:00,NA,-0.38333,-0.18833,-0.27,-0.25167,-0.45667,-0.68167,-0.67333,-0.76333,-0.67667,-0.53167
+2002-11-19 00:00:00,NA,-0.53667,-0.1925,-0.2575,-0.24667,-0.45667,-0.6825,-0.685,-0.75083,-0.68083,-0.5375
+2002-11-20 00:00:00,NA,-0.61083,-0.21167,-0.26333,-0.24333,-0.46417,-0.67833,-0.66833,-0.7525,-0.6825,-0.54
+2002-11-21 00:00:00,NA,-0.46333,-0.2,-0.26333,-0.245,-0.45917,-0.66917,-0.67333,-0.74833,-0.68167,-0.54083
+2002-11-22 00:00:00,NA,-0.35583,-0.195,-0.2625,-0.2425,-0.46333,-0.66417,-0.67333,-0.75,-0.68417,-0.54
+2002-11-23 00:00:00,NA,-0.33333,-0.19833,-0.265,-0.2425,-0.46333,-0.66,-0.66833,-0.75,-0.68667,-0.53917
+2002-11-24 00:00:00,NA,-0.32333,-0.20083,-0.2675,-0.2425,-0.46667,-0.65833,-0.66167,-0.7475,-0.68417,-0.54

tsp/gtnp.py

@@ -3,6 +3,7 @@ from typing import Optional
 from collections import OrderedDict
 
 import re
+import warnings
 
 from tsp.time import get_utc_offset
 
@@ -22,8 +23,14 @@ class GtnpMetadata:
         self._parse()
 
     def _read(self):
-        with open(self.filepath, 'r') as f:
-            self._raw = f.readlines()
+        try:
+            with open(self.filepath, 'r') as f:
+                self._raw = f.readlines()
+
+        except UnicodeDecodeError:
+            warnings.warn("Couldn't read file with utf-8 encoding. Metadata might be corrupted.")
+            with open(self.filepath, 'r', errors='ignore') as f:
+                self._raw = f.readlines()
 
     @property
     def raw(self) -> 'list[str]':

tsp/plots/static.py

@@ -2,8 +2,10 @@ import numpy as np
 import warnings
 
 import matplotlib.dates as mdates
+import matplotlib.cm as cm
 from matplotlib import pyplot as plt
 from matplotlib.figure import Figure
+from matplotlib.colors import ListedColormap
 from typing import Optional
 
 try:
@@ -123,8 +125,9 @@ def colour_contour(depths, times, values, title="", colours: "Union[str, list]"=
         A title for the figure, by default ""
     colours : Union[str, list], optional
         Either a list of colours to be used for the colour bar, or one of:
-        * **symmetric**: 
-        * **dynamic**: 
+        * **symmetric**: ensure colour switch is centered at 0C
+        * **dynamic**: Maximize dynamic range
+        * **basic**: distinguish unfrozen, warm (>-2C) and 
         ,by default 'symmetric'
     contour : list, optional
         A list of float values. If provided, draw contours at each of those values, by default []
@@ -172,7 +175,14 @@ def colour_contour(depths, times, values, title="", colours: "Union[str, list]"=
     clev = contour_levels(Z, colours, step=1)
 
     # Add data
-    cs = ax1.contourf(X, Y, Z, levels=clev, cmap=plt.cm.coolwarm)
+    if colours == 'basic':
+        co = ["darkblue", "lightblue", "lightgreen", "lightred"]
+        cmap = None
+    else: 
+        co = None
+        cmap = plt.cm.coolwarm
+
+    cs = ax1.contourf(X, Y, Z, levels=clev, cmap=cmap, colors=co)
     fig.colorbar(cs, ticks = np.arange(-25,25,5))
 
     if len(contour) > 0:
@@ -240,12 +250,16 @@ def time_series(depths, times, values, title='', d_units='m', t_units=u'\N{DEGRE
         leg = ax.legend(loc='center left', bbox_to_anchor=(1.04, 0.5), fancybox=True, shadow=True)
 
         lined = {}  # Will map legend lines to original lines.
-        for legline, origline in zip(leg.get_lines(), lines):
+        for legline, label, origline in zip(leg.get_lines(), leg.get_texts(), lines):
             legline.set_picker(True)  # Enable picking on the legend line.
-            lined[legline] = origline
+            label.set_picker(True)  # Enable picking on the legend label.
+            lined[legline] = [origline, [label]]
+            lined[label] = [origline, [legline]]
         
         on_pick = create_legend_picker(fig, lined)
+        on_tilde = create_tilde_toggle(fig, lined)
         fig.canvas.mpl_connect('pick_event', on_pick)
+        fig.canvas.mpl_connect('key_press_event', on_tilde)
 
     zero = ax.hlines(y=0.0, xmin=min(times), xmax=max(times), linewidth=0.5, linestyles='dotted', color='grey')
     # Set axis properties
@@ -258,6 +272,42 @@ def time_series(depths, times, values, title='', d_units='m', t_units=u'\N{DEGRE
     return fig
 
 
+def profile_evolution(depths, times, values, P:int=100, n:int=10):
+    """ Plot sample of temperature profiles over time
+    
+    Parameters
+    ----------
+    depths : array-like
+        Depths of the temperature profile
+    times : array-like
+        Times of the temperature profile
+    values : array-like
+        Temperature values of the temperature profile
+    P : int, optional
+        Percentage of the time series to plot, starting from the end, by default 100
+    n : int, optional  
+        Number of profiles to plot, evenly spaced over time period to plot, by default 10
+    """
+    cmap = cm.get_cmap('winter')
+    clist = cmap(np.arange(0,1,1/10))
+
+    fig, ax = plt.subplots()
+
+    p = 100 - P
+    lastP = (p*(len(times) // 100))
+
+    true_depths = -np.abs(depths)
+    plot_times = times[lastP:][::len(times[lastP:]) // n][:n]
+    plot_temps = values[lastP:,][::len(times[lastP:]) // n, :][:n,]
+    
+    for i in range(n):
+        ax.plot(plot_temps[i,:], true_depths, color=clist[i],
+                alpha=0.5, label=f"{plot_times[i].year}")
+    
+    ax.legend(fontsize="8")
+    ax.vlines(0, ymin=min(true_depths), ymax=max(true_depths), linewidth=0.5, color='black')
+
+    return fig
 
 
 def alpha(rgb, alpha):
@@ -269,13 +319,15 @@ def alpha(rgb, alpha):
     return rgba
     
 
-def contour_levels(data, levels: "Union[str,list]", step=1) -> "np.ndarray":
+def contour_levels(data, levels: "Union[str,list]", step=1) -> np.ndarray:
     if levels == "dynamic":
         return np.arange(np.nanmin(data), np.nanmax(data), step)
     
     elif levels == "symmetric":
         return np.arange(min(np.nanmin(data), -np.nanmax(data) + 1),
                          max(-np.nanmin(data) - 1, np.nanmax(data)), step)
+    elif levels == 'basic':
+        return np.array([min(-5, np.nanmin(data)), -2, 0, max(1, np.nanmax(data))])
     else:
         try:
             lev = np.array(levels, dtype='float')
@@ -290,16 +342,33 @@ def create_legend_picker(fig, lined) -> object:
         # On the pick event, find the original line corresponding to the legend
         # proxy line, and toggle its visibility.
         legline = event.artist
-        origline = lined[legline]
+        origline = lined[legline][0]
+        other_toggles = lined[legline][1]
         visible = not origline.get_visible()
         origline.set_visible(visible)
         # Change the alpha on the line in the legend so we can see what lines
         # have been toggled.
         legline.set_alpha(1.0 if visible else 0.2)
+        for t in other_toggles:
+            t.set_alpha(1.0 if visible else 0.2)
         fig.canvas.draw()
     
     return on_pick
 
-
-
-
+def create_tilde_toggle(fig, lined) -> object:
+
+    def on_click(event):
+        # on the "`" keypress, toggle lines off if any are on.
+        # on the "`" keypress, toggle lines on if all are off.
+        if event.key == '`':
+            visible = False
+            for togglable, [origline, other_toggles] in lined.items():
+                visible = visible or origline.get_visible()
+            for togglable, [origline, other_toggles] in lined.items():
+                origline.set_visible(not visible)
+                togglable.set_alpha(1.0 if not visible else 0.2)
+                for t in other_toggles:
+                    t.set_alpha(1.0 if not visible else 0.2)
+            fig.canvas.draw()
+    
+    return on_click

tsp/readers.py

@@ -17,11 +17,71 @@ from tsp.dataloggers.HOBO import HOBO, HOBOProperties
 from tsp.dataloggers.logr import LogR, guessed_depths_ok
 from tsp.dataloggers.RBRXL800 import RBRXL800
 from tsp.dataloggers.RBRXR420 import RBRXR420
+import tsp.tspwarnings as tw
 
 from tsp.core import TSP, IndexedTSP
 from tsp.misc import _is_depth_column
 from tsp.gtnp import GtnpMetadata
 
+
+def read_classic(filepath: str, init_file: "Optional[str]"=None) -> TSP:
+    """Read output from CLASSIC land surface model
+
+    Depth values, if provided, represent the midpoint of the model cells.
+
+    Parameters
+    ----------
+    filepath : str
+        Path to an output file
+    init_file : str
+        Path to a classic init file. If provided, depth values will be calculated. Otherwise an :py:class:`~tsp.core.IndexedTSP` is returned
+    
+    Returns
+    -------
+    TSP
+        An IndexedTSP. Use :py:meth:`~tsp.core.IndexedTSP.set_depths` to provide depth information if init_file is not provided.
+    """
+    try:
+        nc
+    except NameError:
+        warnings.warn("netCDF4 library must be installed.")
+
+    # tbaracc_d / tbaracc_m / tbaracc_y
+    with nc.Dataset(filepath, 'r') as ncdf:
+        lat = ncdf['lat'][:]
+        lon = ncdf['lon'][:]
+        temp = ncdf['tsl'][:]  # t, z
+        
+        try:
+            time = nc.num2date(ncdf['time'][:], ncdf['time'].units, ncdf['time'].calendar,
+                            only_use_cftime_datetimes=False,
+                            only_use_python_datetimes=True)
+        except ValueError:
+            cf_time = nc.num2date(ncdf['time'][:], ncdf['time'].units, ncdf['time'].calendar)
+            time = np.array([datetime.datetime.fromisoformat(t.isoformat()) for t in cf_time])
+    
+    if init_file:
+        with nc.Dataset(init_file, 'r') as init:
+            delz = init["DELZ"][:]
+        depths = np.round(np.cumsum(delz) - np.multiply(delz, 0.5), 7)  # delz precision is lower so we get some very small offsets
+
+    if len(lat) > 1:
+        warnings.warn("Multiple points in file. Returning the first one found.")
+        # TODO: return Ensemble if multiple points
+        lat = lat[0]
+        lon = lon[0]
+        temp = temp[:,:,0,0]
+    else:
+        temp = temp[:,:,0,0]
+
+    t = IndexedTSP(times=time, values=temp, latitude=lat, longitude=lon)
+    
+    if init_file:
+        t.set_depths(depths)
+
+    return t
+
+
 def read_csv(filepath: str,
               datecol: "Union[str, int]",
               datefmt: str = "%Y-%m-%d %H:%M:%S",
@@ -83,6 +143,85 @@ def read_csv(filepath: str,
     return t
 
 
+def read_geoprecision(filepath: str) -> IndexedTSP:
+    """Read a Geoprecision datalogger export (text file)
+
+    Reads GP5W- and FG2-style files from geoprecision.
+
+    Parameters
+    ----------
+    filepath : str
+        Path to file.
+
+    Returns
+    -------
+    IndexedTSP
+        An IndexedTSP
+    """
+    Reader = detect_geoprecision_type(filepath)
+    
+    if Reader is None:
+        raise RuntimeError("Could not detect type of geoprecision file (GP5W or FG2 missing from header")
+    reader = Reader()
+    
+    data = reader.read(filepath)
+    t = IndexedTSP(times=data['TIME'].dt.to_pydatetime(),
+                     values=data.drop("TIME", axis=1).values)
+
+    t.metadata = reader.META
+    return t
+
+
+def read_geotop(file: str) -> TSP:
+    """Read a GEOtop soil temperature output file
+
+    Parameters
+    ----------
+    file : str
+        Path to file.
+
+    Returns
+    -------
+    TSP
+        A TSP
+
+    Description
+    -----------
+    Only the last run of the last simulation period is returned. This is because GEOtop outputs
+    all runs of all simulation periods in the same file. This function will only return the last
+    run of the last simulation period.
+    """
+    with warnings.catch_warnings():
+        warnings.filterwarnings("ignore", category=tw.DuplicateTimesWarning)
+
+        t = read_csv(file,
+                    na_values=[-9999.0],
+                    datecol="^(Date.*)",
+                    datefmt=r"%d/%m/%Y %H:%M",
+                    depth_pattern=r"^(-?[0-9\.]+\s*)$")
+    
+    t._depths *= 0.001  # Convert to [m]
+
+    # Only use last simulation period 
+    # TODO: this could be improved
+    raw = pd.read_csv(file)
+
+    is_max_sim_period = raw['Simulation_Period'] == max( raw['Simulation_Period'])
+    is_last_run_in_max_sim_period = raw['Run'] = raw['Run'][is_max_sim_period].max()
+    last_run = np.logical_and(is_max_sim_period, is_last_run_in_max_sim_period)
+    
+    last = TSP(times = t.times[last_run],
+               depths = t.depths,
+               values = t.values[last_run, :],
+               metadata={"Simulation_Period": max(raw['Simulation_Period']),
+                         "Run": max( raw['Run'] )
+                         }
+    )
+
+    return last
+    
+
+
 def read_gtnp(filename: str,
               metadata_filepath=None,
               autodetect_metadata=True) -> TSP:
@@ -141,45 +280,6 @@ def read_gtnp(filename: str,
     return t
 
 
-def read_geotop(file: str) -> TSP:
-    """Read a GEOtop soil temperature output file
-
-    Parameters
-    ----------
-    file : str
-        Path to file.
-
-    Returns
-    -------
-    TSP
-        A TSP
-    """
-    
-    t = read_csv(file,
-                   na_values=[-9999.0],
-                   datecol="^(Date.*)",
-                   datefmt=r"%d/%m/%Y %H:%M",
-                   depth_pattern=r"^(-?[0-9\.]+\s*)$")
-    
-    t._depths *= 0.001  # Convert to [m]
-
-    # Only use last simulation period 
-    # TODO: this could be improved
-    raw = pd.read_csv(file)
-    last_run = np.logical_and(raw['Simulation_Period'] == max( raw['Simulation_Period'] ),
-               raw['Run'] == max( raw['Run'] ))
-    
-    last = TSP(times = t.times[last_run],
-               depths = t.depths,
-               values = t.values[last_run, :],
-               metadata={"Simulation_Period": max(raw['Simulation_Period']),
-                         "Run": max( raw['Run'] )
-                         }
-    )
-
-    return last
-
-
 def read_gtpem(file: str) -> "list[TSP]":
     output = list()
     try:
@@ -195,6 +295,70 @@ def read_gtpem(file: str) -> "list[TSP]":
     return output
 
 
+def read_hoboware(filepath: str, hoboware_config: Optional[HOBOProperties]=None) -> IndexedTSP:
+    """Read Onset HoboWare datalogger exports
+
+    Parameters
+    ----------
+    filepath : str
+        Path to a file
+    hoboware_config : HOBOProperties, optional
+        A HOBOProperties object with information about how the file is configured. If not 
+        provided, the configuration will be automatically detected if possible, by default None
+
+    Returns
+    -------
+    IndexedTSP
+        An IndexedTSP. Use the `set_depths` method to provide depth information
+    """
+    reader = HOBO(properties=hoboware_config)
+    data = reader.read(filepath)
+
+    t = IndexedTSP(times=data['TIME'],
+                     values=data.drop("TIME", axis=1).values)
+
+    return t
+
+
+def read_logr(filepath: str) -> "Union[IndexedTSP,TSP]":
+    """Read a LogR datalogger export (text file)
+
+    Reads LogR ULogC16-32 files.
+
+    Parameters
+    ----------
+    filepath : str
+        Path to file.
+
+    Returns
+    -------
+    IndexedTSP, TSP
+        An IndexedTSP or TSP, depending on whether the depth labels are sensible
+    """
+    r = LogR()
+    data = r.read(filepath)
+    
+    times = data['TIME'].dt.to_pydatetime()
+    channels = pd.Series(data.columns).str.match("^CH")
+    values = data.loc[:, channels.to_numpy()]
+
+    if guessed_depths_ok(r.META['guessed_depths'], sum(channels)):
+        t = TSP(times=times,
+                depths=r.META['guessed_depths'][-sum(channels):],
+                values=values.values,)
+
+    else:
+        warnings.warn(f"Could not convert all channel labels into numeric depths."
+                      "Use the set_depths() method to specify observation depths."
+                      "Guessed depths can be accessed from .metadata['guessed_depths'].")
+                      
+        t = IndexedTSP(times=times,
+                       values=values.values,
+                       metadata = r.META)
+
+    return t
+
+
 def read_netcdf(file:str, standard_name='temperature_in_ground') -> TSP:
     """Read a CF-compliant netCDF file
 
@@ -282,8 +446,7 @@ def read_ntgs(filename: str) -> TSP:
         try:
             raw = pd.read_csv(filename, 
                               keep_default_na=False,na_values=[''], 
-                              parse_dates={"time": ["date_YYYY-MM-DD","time_HH:MM:SS"]},
-                              date_parser=__nt_date_parser)
+                              parse_dates={"time": ["date_YYYY-MM-DD","time_HH:MM:SS"]})
         except IndexError:
             raise IndexError("There are insufficient columns, the file format is invalid.")
     elif Path(filename).suffix in [".xls", ".xlsx"]:
@@ -316,185 +479,6 @@ def read_ntgs(filename: str) -> TSP:
     return t
 
 
-def __nt_date_parser(date, time) -> datetime.datetime:
-        if isinstance(date, str):
-            # Case from CSV files where the date is string
-            try:
-                year, month, day = [int(dateVal) for dateVal in date.split("-")]
-            except ValueError:
-                raise ValueError(f"The date {date} was unable to be parsed. The format required is YYYY-MM-DD.")
-        elif isinstance(date, datetime.datetime):
-            # Case XLSX files - are "timestamp" objects
-            year, month, day = date.year, date.month, date.day
-        else:
-            raise ValueError(f"The date {date} was unable to be parsed.")
-            
-        if isinstance(time, str):
-            try:
-                h, m, s = [int(timeVal) for timeVal in time.split(":")]
-            except ValueError:
-                raise ValueError(f"The time {time} was unable to be parsed. The format required is (H)H:MM:SS.")
-        
-        elif isinstance(time, datetime.time):
-            h, m, s = int(time.hour), time.minute, time.second
-        
-        else:
-            raise ValueError(f"The time {time} was unable to be parsed.")
-        
-        return datetime.datetime(year, month, day, hour=h, minute=m, second=s)
-
-
-def read_geoprecision(filepath: str) -> IndexedTSP:
-    """Read a Geoprecision datalogger export (text file)
-
-    Reads GP5W- and FG2-style files from geoprecision.
-
-    Parameters
-    ----------
-    filepath : str
-        Path to file.
-
-    Returns
-    -------
-    IndexedTSP
-        An IndexedTSP
-    """
-    Reader = detect_geoprecision_type(filepath)
-    
-    if Reader is None:
-        raise RuntimeError("Could not detect type of geoprecision file (GP5W or FG2 missing from header")
-    reader = Reader()
-    
-    data = reader.read(filepath)
-    t = IndexedTSP(times=data['TIME'].dt.to_pydatetime(),
-                     values=data.drop("TIME", axis=1).values)
-
-    t.metadata = reader.META
-    return t
-
-
-def read_logr(filepath: str) -> "Union[IndexedTSP,TSP]":
-    """Read a LogR datalogger export (text file)
-
-    Reads LogR ULogC16-32 files.
-
-    Parameters
-    ----------
-    filepath : str
-        Path to file.
-
-    Returns
-    -------
-    IndexedTSP, TSP
-        An IndexedTSP or TSP, depending on whether the depth labels are sensible
-    """
-    r = LogR()
-    data = r.read(filepath)
-    
-    times = data['TIME'].dt.to_pydatetime()
-    channels = pd.Series(data.columns).str.match("^CH")
-    values = data.loc[:, channels.to_numpy()]
-
-    if guessed_depths_ok(r.META['guessed_depths'], sum(channels)):
-        t = TSP(times=times,
-                depths=r.META['guessed_depths'][-sum(channels):],
-                values=values.values,)
-
-    else:
-        warnings.warn(f"Could not convert all channel labels into numeric depths."
-                      "Use the set_depths() method to specify observation depths."
-                      "Guessed depths can be accessed from .metadata['guessed_depths'].")
-                      
-        t = IndexedTSP(times=times,
-                       values=values.values,
-                       metadata = r.META)
-
-    return t
-
-
-def read_hoboware(filepath: str, hoboware_config: Optional[HOBOProperties]=None) -> IndexedTSP:
-    """Read Onset HoboWare datalogger exports
-
-    Parameters
-    ----------
-    filepath : str
-        Path to a file
-    hoboware_config : HOBOProperties, optional
-        A HOBOProperties object with information about how the file is configured. If not 
-        provided, the configuration will be automatically detected if possible, by default None
-
-    Returns
-    -------
-    IndexedTSP
-        An IndexedTSP. Use the `set_depths` method to provide depth information
-    """
-    reader = HOBO(properties=hoboware_config)
-    data = reader.read(filepath)
-
-    t = IndexedTSP(times=data['TIME'],
-                     values=data.drop("TIME", axis=1).values)
-
-    return t
-
-
-def read_classic(filepath: str, init_file: "Optional[str]"=None) -> TSP:
-    """Read output from CLASSIC land surface model
-
-    Depth values, if provided, represent the midpoint of the model cells.
-
-    Parameters
-    ----------
-    filepath : str
-        Path to an output file
-    init_file : str
-        Path to a classic init file. If provided, depth values will be calculated. Otherwise an :py:class:`~tsp.core.IndexedTSP` is returned
-    
-    Returns
-    -------
-    TSP
-        An IndexedTSP. Use :py:meth:`~tsp.core.IndexedTSP.set_depths` to provide depth information if init_file is not provided.
-    """
-    try:
-        nc
-    except NameError:
-        warnings.warn("netCDF4 library must be installed.")
-
-    # tbaracc_d / tbaracc_m / tbaracc_y
-    with nc.Dataset(filepath, 'r') as ncdf:
-        lat = ncdf['lat'][:]
-        lon = ncdf['lon'][:]
-        temp = ncdf['tsl'][:]  # t, z
-        
-        try:
-            time = nc.num2date(ncdf['time'][:], ncdf['time'].units, ncdf['time'].calendar,
-                            only_use_cftime_datetimes=False,
-                            only_use_python_datetimes=True)
-        except ValueError:
-            cf_time = nc.num2date(ncdf['time'][:], ncdf['time'].units, ncdf['time'].calendar)
-            time = np.array([datetime.datetime.fromisoformat(t.isoformat()) for t in cf_time])
-    
-    if init_file:
-        with nc.Dataset(init_file, 'r') as init:
-            delz = init["DELZ"][:]
-        depths = np.round(np.cumsum(delz) - np.multiply(delz, 0.5), 7)  # delz precision is lower so we get some very small offsets
-
-    if len(lat) > 1:
-        warnings.warn("Multiple points in file. Returning the first one found.")
-        # TODO: return Ensemble if multiple points
-        lat = lat[0]
-        lon = lon[0]
-        temp = temp[:,:,0,0]
-    else:
-        temp = temp[:,:,0,0]
-
-    t = IndexedTSP(times=time, values=temp, latitude=lat, longitude=lon)
-    
-    if init_file:
-        t.set_depths(depths)
-
-    return t
-
-
 def read_rbr(file_path: str) -> IndexedTSP:
     """
 
@@ -534,3 +518,31 @@ def read_rbr(file_path: str) -> IndexedTSP:
 
     return t
 
+
+def read_permos(filepath:str) -> TSP:
+    """Read file from PERMOS database export
+
+    Parameters
+    ----------
+    filename : str
+        Path to file.
+
+    Returns
+    -------
+    TSP
+        A TSP
+
+    Used for data obtained from PERMOS (permos.ch/data-portal/permafrost-temperature-and-active-layer)
+    """
+    try:
+        raw = pd.read_csv(filepath,
+                          index_col=0,
+                          parse_dates=True)
+    except IndexError:
+        raise IndexError("There are insufficient columns, the file format is invalid.")
+    
+    t = TSP(times=raw.index,
+            depths=[float(C) for C in raw.columns],
+            values=raw.values)
+    
+    return t

tsp/tspwarnings.py

@@ -0,0 +1,15 @@
+import numpy as np
+
+
+class DuplicateTimesWarning(UserWarning):
+    """For when duplicate times are found in a file."""
+    def __init__(self, times):
+        self.times = times
+    
+    def _msg(self, times) -> str:
+        m = f"Duplicate timestamps found: {times[np.where(times.duplicated())[0]]}. That's bad."
+        return m
+    
+    def __str__(self):
+        return self._msg(self.times)
+    

tsp/version.py

@@ -1 +1 @@
-version="1.7.3"
+version="1.8.0"

{tsp-1.7.3.dist-info → tsp-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: tsp
-Version: 1.7.3
+Version: 1.8.0
 Summary: Making permafrost data effortless
 Home-page: https://gitlab.com/permafrostnet/teaspoon
 Author: Nick Brown
@@ -17,26 +17,37 @@ Requires-Dist: pandas
 Requires-Dist: numpy
 Requires-Dist: regex
 Requires-Dist: matplotlib
-Provides-Extra: dev
-Requires-Dist: manuel ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: pytest-cov ; extra == 'dev'
-Requires-Dist: coverage ; extra == 'dev'
-Requires-Dist: mock ; extra == 'dev'
-Provides-Extra: full
-Requires-Dist: pfit ==0.2.1 ; extra == 'full'
-Requires-Dist: pyrsktools ; extra == 'full'
-Requires-Dist: scipy ; extra == 'full'
-Requires-Dist: openpyxl ; extra == 'full'
-Requires-Dist: netCDF4 ; extra == 'full'
+Requires-Dist: setuptools
 Provides-Extra: nc
-Requires-Dist: netCDF4 ; extra == 'nc'
-Requires-Dist: pfit ==0.2.1 ; extra == 'nc'
+Requires-Dist: netCDF4; extra == "nc"
+Requires-Dist: pfit==0.2.1; extra == "nc"
 Provides-Extra: plotting
-Requires-Dist: scipy ; extra == 'plotting'
+Requires-Dist: scipy; extra == "plotting"
 Provides-Extra: rbr
-Requires-Dist: pyrsktools ; extra == 'rbr'
-Requires-Dist: openpyxl ; extra == 'rbr'
+Requires-Dist: pyrsktools; extra == "rbr"
+Requires-Dist: openpyxl; extra == "rbr"
+Provides-Extra: full
+Requires-Dist: netCDF4; extra == "full"
+Requires-Dist: pyrsktools; extra == "full"
+Requires-Dist: scipy; extra == "full"
+Requires-Dist: pfit==0.2.1; extra == "full"
+Requires-Dist: openpyxl; extra == "full"
+Provides-Extra: dev
+Requires-Dist: manuel; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Requires-Dist: mock; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # Teaspoon
 

{tsp-1.7.3.dist-info → tsp-1.8.0.dist-info}/RECORD

@@ -1,18 +1,23 @@
 tsp/__init__.py,sha256=V_rDl4XxSRtbFWK7KFZJkKqwjqwLREvlnVc7BCGjHaw,427
-tsp/__meta__.py,sha256=s5i_2brSLEf6ifjRKvtw2H4-2LFzGGtR7ynEWoQUzPk,93
-tsp/core.py,sha256=PW4J_TDURHV8AaOppD7GZfyTWdlChzeeWMjQEhLUZxA,34323
-tsp/gtnp.py,sha256=kIxhLq_ve_cxU9v4_nDebc8jy6l7KQ87MOg8vK8lih4,3991
+tsp/__meta__.py,sha256=HPbBgUW82WNWV430sfTj9LXxF17fdFaQrKi-NL5mOo0,93
+tsp/concatenation.py,sha256=XK-5ec_IrlIVShp9eqd5QVg1yDgk3ysPFzeJpo2G2gc,5990
+tsp/core.py,sha256=gXGyY08_EHo2rttH2nqKMD3hUnVBrPQbjlNm-2ZXMME,37899
+tsp/gtnp.py,sha256=cFFSOVzudEkxqtXSMnsVE7clVoXFH0Gb8ES-Cx_iwUU,4269
 tsp/labels.py,sha256=URV4zxfur6aYojdra7KGTipFdiN9pAOCEVvkcc2pj-Q,78
 tsp/misc.py,sha256=y0NvW5jOlli5s220QnaLYTOadSlj3Lyu-EE-RsoSbok,2614
 tsp/physics.py,sha256=hgVOGU0Bj1g-gxBNhLEl7Gm3VXJKIHHu35uPvgVMOxE,2699
-tsp/readers.py,sha256=5rEmC12dqiid22YGQD3xQdoPAA5eRfyHmmoEJMXlpds,18540
+tsp/readers.py,sha256=1rPcS9eRpkGPWU6MsSrgiMh2QCKvAAY5_KiTQMMcsxk,18464
 tsp/time.py,sha256=82h7nxM-iXs2XwetF-alLtNvUm0qRtAA111gTMp5SY4,1379
+tsp/tspwarnings.py,sha256=AGCmSlwM3JbnrEZSbyBKLnyQkKygsKU_YYbte4iZsK8,399
 tsp/utils.py,sha256=sOJSZLmfv7sh4X971_gNgtZvXtS8ZwGmUdqnUybcVE4,2932
-tsp/version.py,sha256=jVVJ1XqyGriV5CDoioX5vjYZp75DKC3MfzBS5a39Sw4,15
+tsp/version.py,sha256=Xzb-lP-C0B-Xa7NdEdQP8ANIyFtMIaeq0GhSeSluzrk,15
 tsp/data/2023-01-06_755-test-Dataset_2031-Constant_Over_Interval-Hourly-Ground_Temperature-Thermistor_Automated.timeserie.csv,sha256=Q3Ssnoo_kiSn9_orZHjtMxQ02YbrjCAEQKs5sHPFJCg,171
 tsp/data/2023-01-06_755-test.metadata.txt,sha256=Ux1YGqmAmRQmMIqqK8-OloQXflg4Y45FRwdT-WgCg8c,5686
+tsp/data/NTGS_example_csv.csv,sha256=OirFmLRqj7TUYfAUHqKbZFSqQ-g3I13QwUfUzgiJ-h4,554
+tsp/data/NTGS_example_slash_dates.csv,sha256=RzeYXsGnOnmLqgrpeCr9pGi-ncaJSJKrsYvI5sf6xqo,554
 tsp/data/example_geotop.csv,sha256=rgVP7_tGEvUtn1K_KI98VVgm275D7qt8YegKMe3Vjw4,262289
 tsp/data/example_gtnp.csv,sha256=E5km06-cWlWMwzF-Qo7v0ZrlAvCTpyWIKY6hpzln4sc,191812
+tsp/data/example_permos.csv,sha256=tz-Z4A9x3Uc8Dym65Roto95X_bgSUySC9wJrUnGVBPE,797
 tsp/data/test_geotop_has_space.txt,sha256=BaloXQVxyPD7LLeI6YCnHsR3pjA_BZsHYH9OeW57cC4,203
 tsp/dataloggers/AbstractReader.py,sha256=YsmESWrmH2jdL-Oli9pwjaFmPCEfJxjm4wx16FoRxpY,1777
 tsp/dataloggers/FG2.py,sha256=kvfjMQtoSs5ZzV7hc1lJ_SaDuSOOTONfI_nw2VaihO8,3281
@@ -81,9 +86,9 @@ tsp/dataloggers/test_files/rbr_xl_002.DAT,sha256=JQNHL6X9z4Rp6IDqDBYx8vWsUU6oigl
 tsp/dataloggers/test_files/rbr_xl_003.DAT,sha256=ZEKheCvB1CiubY2kMngigY0NNhWTYAiC_hmQhzODPYw,221656
 tsp/dataloggers/test_files/rbr_xl_003.HEX,sha256=sunCD5C1t8l5y4p1b9iiHNsZUznYIuBLz4uwoGkZh3E,118459
 tsp/plots/__init__.py,sha256=i5AhpNwyuT6il7uk2Vtc4YBjVnZ0ifvHNXw19rvDtsM,71
-tsp/plots/static.py,sha256=hUGMtx-AQ8eHPVKurEK1T9BHitnvfC3gQLB5h5ykeic,11039
-tsp-1.7.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-tsp-1.7.3.dist-info/METADATA,sha256=c7Cc2iyrUtMm3bgTouMjpvdANGEJ1jWvidZnaufwfWo,3044
-tsp-1.7.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-tsp-1.7.3.dist-info/top_level.txt,sha256=7tOR6y7BarphfWD2D7QFi_3F1jxagUZpHG8zwJIw4ck,30
-tsp-1.7.3.dist-info/RECORD,,
+tsp/plots/static.py,sha256=pvLFM3_HuRgnPMe7smxj9v65zcM3JLsCvhhwGgdt5Uk,13836
+tsp-1.8.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+tsp-1.8.0.dist-info/METADATA,sha256=rvZdIOFdzkkQe3Euae8ESNPAL2p6HukH2BRj-r2Auys,3271
+tsp-1.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tsp-1.8.0.dist-info/top_level.txt,sha256=7tOR6y7BarphfWD2D7QFi_3F1jxagUZpHG8zwJIw4ck,30
+tsp-1.8.0.dist-info/RECORD,,

{tsp-1.7.3.dist-info → tsp-1.8.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any