libsrg 5.2.0__tar.gz → 5.2.2__tar.gz

{libsrg-5.2.0 → libsrg-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libsrg
-Version: 5.2.0
+Version: 5.2.2
 Summary: Utility lib logging, statistics, subprocesses
 Author: Steve Goncalo
 Author-email: steven@goncalo.us

{libsrg-5.2.0 → libsrg-5.2.2}/libsrg/Statistics/DiscreteStatsBase.py

@@ -4,6 +4,7 @@
 
 from collections import Counter
 from dataclasses import dataclass
+from datetime import datetime, timezone
 from typing import Optional, Callable, Any
 
 from libsrg.Statistics.ADStatsBase import ADStatsBase, ADStatsRecord
@@ -24,6 +25,7 @@ class DiscreteStatsBase(ADStatsBase):
     def __init__(self, name, callbacks: Optional[list[Callable]] = None):
         super().__init__(name=name, callbacks=callbacks)
         self.counter = Counter()
+        self.last_time:dict[str,datetime]=dict()
 
     def get_all_callbacks(self) -> list[Callable]:
         lst = super().get_all_callbacks()
@@ -33,6 +35,7 @@ class DiscreteStatsBase(ADStatsBase):
     def sample(self, value: Any, sample_time: Optional[float] = None) -> bool:
         first = super().sample(value=value, sample_time=sample_time)
         self.counter[value] += 1
+        self.last_time[value] = datetime.now(timezone.utc)
         return first
 
     def reset(self):
@@ -42,14 +45,25 @@ class DiscreteStatsBase(ADStatsBase):
     def counts(self) -> Counter:
         return self.counter.copy()
 
+    def datetimes(self) -> dict[str, datetime]:
+        return self.last_time.copy()
+
     def count_for(self, value: Any) -> int:
         return self.counter[value]
 
-    def most_common(self, n: int) -> list[tuple[Any, int]]:
-        return self.counter.most_common(n)
-
-    def most_common_as_str(self, n: int) -> str:
-        return str(self.counter.most_common(n))
+    def most_common(self, n: int) -> list[tuple[Any, int,str]]:
+        if time_format is None:
+            time_format="%Y-%m-%d %H:%M:%S %Z"
+        mc = self.counter.most_common(n)
+        mct = [(key,val,self.last_time[key].astimezone().strftime(time_format)) for key,val in mc]
+        return mct
+
+    def most_common_as_str(self, n: int,time_format:str=None) -> str:
+        if time_format is None:
+            time_format="%Y-%m-%d %H:%M:%S %Z"
+        mc = self.counter.most_common(n)
+        mct = [(key,val,self.last_time[key].astimezone().strftime(time_format)) for key,val in mc]
+        return str(mct)
 
     def form_record(self, name: str, count: int, time: float, val: Any) -> DStatsRecord:
         return DStatsRecord(value=val, name=name, count=count, time=time)

{libsrg-5.2.0 → libsrg-5.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "libsrg"
-version = "5.2.0"
+version = "5.2.2"
 description = "Utility lib logging, statistics, subprocesses"
 authors = ["Steve Goncalo <steven@goncalo.us>"]
 readme = "README.md"