PyAutomationIO 1.1.0__tar.gz → 1.1.2__tar.gz

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyAutomationIO
-Version: 1.1.0
+Version: 1.1.2
 Summary: A python library to develop automation continuous tasks using sync or async concurrent threads
 Home-page: https://github.com/know-ai/PyAutomation
 Author: KnowAI

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/PyAutomationIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyAutomationIO
-Version: 1.1.0
+Version: 1.1.2
 Summary: A python library to develop automation continuous tasks using sync or async concurrent threads
 Home-page: https://github.com/know-ai/PyAutomation
 Author: KnowAI

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/automation/core.py

@@ -1370,6 +1370,10 @@ class PyAutomation(Singleton):
         Documentation here
         """
         if self.is_db_connected():
+            
+            # Ensure pagination parameters are present or defaulted
+            if 'page' not in fields: fields['page'] = 1
+            if 'limit' not in fields: fields['limit'] = 20
 
             return self.alarms_engine.filter_alarm_summary_by(**fields)
 
@@ -1542,7 +1546,9 @@ class PyAutomation(Singleton):
             description:str="",
             greater_than_timestamp:datetime=None,
             less_than_timestamp:datetime=None,
-            timezone:str="UTC")->list:
+            timezone:str="UTC",
+            page:int=1,
+            limit:int=20)->list:
         r"""
         Documentation here
         """
@@ -1557,7 +1563,9 @@ class PyAutomation(Singleton):
                 classification=classification,
                 greater_than_timestamp=greater_than_timestamp,
                 less_than_timestamp=less_than_timestamp,
-                timezone=timezone
+                timezone=timezone,
+                page=page,
+                limit=limit
             )
         
         return list()

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/automation/dbmodels/alarms.py

@@ -448,11 +448,14 @@ class AlarmSummary(BaseModel):
         tags:list[str]=None,
         greater_than_timestamp:datetime=None,
         less_than_timestamp:datetime=None,
-        timezone:str='UTC'
+        timezone:str='UTC',
+        page:int=1,
+        limit:int=20
         ):
         r"""
         Documentation here
         """
+        import math
         _timezone = pytz.timezone(timezone)
         query = cls.select()
         
@@ -478,11 +481,33 @@ class AlarmSummary(BaseModel):
             query = query.where(cls.alarm_time < less_than_timestamp)
         
         query = query.order_by(cls.id.desc())
-        if not query.exists():
-            
-            return []
         
-        return [alarm.serialize() for alarm in query]
+        total_records = query.count()
+        
+        if limit <= 0: limit = 20
+        if page <= 0: page = 1
+        
+        total_pages = math.ceil(total_records / limit)
+        if total_pages == 0: total_pages = 1
+        
+        has_next = page < total_pages
+        has_prev = page > 1
+        
+        paginated_query = query.paginate(page, limit)
+        
+        data = [alarm.serialize() for alarm in paginated_query]
+        
+        return {
+            "data": data,
+            "pagination": {
+                "page": page,
+                "limit": limit,
+                "total_records": total_records,
+                "total_pages": total_pages,
+                "has_next": has_next,
+                "has_prev": has_prev
+            }
+        }
 
     @classmethod
     def get_alarm_summary_comments(cls, id:int):

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/automation/dbmodels/events.py

@@ -77,10 +77,14 @@ class Events(BaseModel):
         description:str="",
         message:str="",
         classification:str="",
-        timezone:str='UTC'):
+        timezone:str='UTC',
+        page:int=1,
+        limit:int=20
+        ):
         r"""
         Documentation here
         """
+        import math
         _timezone = pytz.timezone(timezone)
         query = cls.select()
         
@@ -113,11 +117,32 @@ class Events(BaseModel):
             
         query = query.order_by(cls.id.desc())
 
-        if not query.exists():
-            
-            return []
+        total_records = query.count()
+        
+        if limit <= 0: limit = 20
+        if page <= 0: page = 1
+        
+        total_pages = math.ceil(total_records / limit)
+        if total_pages == 0: total_pages = 1
+        
+        has_next = page < total_pages
+        has_prev = page > 1
         
-        return [event.serialize() for event in query]
+        paginated_query = query.paginate(page, limit)
+        
+        data = [event.serialize() for event in paginated_query]
+        
+        return {
+            "data": data,
+            "pagination": {
+                "page": page,
+                "limit": limit,
+                "total_records": total_records,
+                "total_pages": total_pages,
+                "has_next": has_next,
+                "has_prev": has_prev
+            }
+        }
     
     @classmethod
     def get_comments(cls, id:int):

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/automation/logger/alarms.py

@@ -119,7 +119,9 @@ class AlarmsLogger(BaseLogger):
             tags:list[str]=None,
             greater_than_timestamp:datetime=None,
             less_than_timestamp:datetime=None,
-            timezone:str="UTC"
+            timezone:str="UTC",
+            page:int=1,
+            limit:int=20
         ):
         r"""
         Documentation here
@@ -138,7 +140,9 @@ class AlarmsLogger(BaseLogger):
             tags=tags,
             greater_than_timestamp=greater_than_timestamp,
             less_than_timestamp=less_than_timestamp,
-            timezone=timezone
+            timezone=timezone,
+            page=page,
+            limit=limit
         )
     
     @db_rollback
@@ -326,7 +330,9 @@ class AlarmsLoggerEngine(BaseEngine):
         tags:list[int]=None,
         greater_than_timestamp:datetime=None,
         less_than_timestamp:datetime=None,
-        timezone:str='UTC'
+        timezone:str='UTC',
+        page:int=1,
+        limit:int=20
         ):
 
         _query = dict()
@@ -338,6 +344,8 @@ class AlarmsLoggerEngine(BaseEngine):
         _query["parameters"]["greater_than_timestamp"] = greater_than_timestamp
         _query["parameters"]["less_than_timestamp"] = less_than_timestamp
         _query["parameters"]["timezone"] = timezone
+        _query["parameters"]["page"] = page
+        _query["parameters"]["limit"] = limit
         
         return self.query(_query)
     

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/automation/logger/datalogger.py

@@ -5,6 +5,7 @@ This module implements a database logger for the CVT instance,
 will create a time-serie for each tag in a short memory data base.
 """
 import pytz, logging, math
+from peewee import fn
 from collections import defaultdict
 from datetime import datetime
 from ..tags.tag import Tag
@@ -404,7 +405,9 @@ class DataLogger(BaseLogger):
             
         Returns:
             dict: {
-                "data": [...],
+                "tag_names": ["timestamp", "tag1", ...],
+                "display_names": ["timestamp", "Display Tag 1", ...],
+                "values": [[ts, val1, ...], ...],
                 "pagination": {...}
             }
         """
@@ -425,10 +428,70 @@ class DataLogger(BaseLogger):
         except ValueError:
             return dict()
 
+        if sample_time <= 0:
+            return dict()
+
+        # Get display names mapping early
+        try:
+            tags_info = Tags.select(Tags.name, Tags.display_name).where(Tags.name.in_(tags)).dicts()
+            display_map = {t['name']: t['display_name'] for t in tags_info}
+        except Exception:
+            display_map = {}
+
+        tag_names = ["timestamp"] + tags
+        display_names = ["timestamp"] + [display_map.get(tag, tag) for tag in tags]
+
+        empty_result = {
+            "tag_names": tag_names,
+            "display_names": display_names,
+            "values": [],
+            "pagination": {}
+        }
+
+        # Check for data presence to adjust start time if necessary
+        # 1. Check if there is any data BEFORE or AT start_dt (history)
+        has_history = (TagValue
+            .select()
+            .join(Tags)
+            .where(
+                (Tags.name.in_(tags)) & 
+                (TagValue.timestamp <= start_dt)
+            )
+            .limit(1)
+            .count() > 0)
+        
+        if not has_history:
+            # 2. If no history, find the first actual data point within the requested range
+            min_ts = (TagValue
+                .select(fn.Min(TagValue.timestamp))
+                .join(Tags)
+                .where(
+                    (Tags.name.in_(tags)) & 
+                    (TagValue.timestamp >= start_dt) & 
+                    (TagValue.timestamp <= stop_dt) &
+                    (TagValue.value.is_null(False))
+                )
+                .scalar())
+            
+            if min_ts is None:
+                # No data in range and no history
+                return empty_result
+            
+            # Adjust start to the first actual data point
+            # Ensure min_ts is timezone aware if needed, though scalar() returns DB format
+            if isinstance(min_ts, datetime):
+                 if min_ts.tzinfo is None:
+                     min_ts = utc_timezone.localize(min_ts)
+                 start_dt = min_ts
+                 start_ts = start_dt.timestamp()
+            elif isinstance(min_ts, (int, float)):
+                 start_ts = float(min_ts)
+                 start_dt = datetime.fromtimestamp(start_ts, pytz.UTC)
+
         # Calculate total records based on time range and sample time
         total_duration = stop_ts - start_ts
         if total_duration < 0:
-            return {"data": [], "pagination": {}}
+            return empty_result
             
         total_records = math.floor(total_duration / sample_time) + 1
         
@@ -456,13 +519,6 @@ class DataLogger(BaseLogger):
         data_points = []
         current_ts = page_start_ts
         
-        # Pre-fetch data for optimization could be complex due to forward fill requirement across large gaps.
-        # However, we can query per tag or query all data in range. 
-        # For efficiency with many tags/large range, we should query intelligently.
-        # But to guarantee "last known value", we might need to look back indefinitely if no recent data.
-        # A simple approach for now: Query "last value before or at page_start_ts" for each tag, 
-        # and all values between page_start_ts and page_end_ts.
-        
         # 1. Get initial values (state at page_start_ts)
         current_values = {}
         # Convert float timestamp to datetime for Peewee comparison
@@ -497,7 +553,8 @@ class DataLogger(BaseLogger):
             .where(
                 (Tags.name.in_(tags)) & 
                 (TagValue.timestamp > page_start_dt) & 
-                (TagValue.timestamp <= page_end_dt)
+                (TagValue.timestamp <= page_end_dt) &
+                (TagValue.value.is_null(False))
             )
             .order_by(TagValue.timestamp.asc())
             .dicts())
@@ -521,12 +578,6 @@ class DataLogger(BaseLogger):
         # We iterate step by step. This might be slow if step is small and range is large, 
         # but we are limited by pagination 'limit' (e.g. 20 rows), so it's fast!
         
-        # We need to process from page_start_ts to page_end_ts in sample_time steps.
-        # BUT we have a list of changes. 
-        # The simple way: Iterate steps.
-        
-        # Optimization: We have 'limit' steps.
-        
         changes_iter = sorted(changes_by_ts.keys())
         change_idx = 0
         
@@ -550,14 +601,21 @@ class DataLogger(BaseLogger):
             dt_object = datetime.fromtimestamp(step_ts, pytz.UTC)
             formatted_ts = dt_object.astimezone(_timezone).strftime(DATETIME_FORMAT)
             
-            row = {"timestamp": formatted_ts}
+            row_values = [formatted_ts]
+            has_data = False
             for tag in tags:
-                row[tag] = current_values.get(tag) # None if no value ever recorded
+                val = current_values.get(tag)
+                row_values.append(val)
+                if val is not None:
+                    has_data = True
                 
-            data_points.append(row)
+            if has_data:
+                data_points.append(row_values)
 
         return {
-            "data": data_points,
+            "tag_names": tag_names,
+            "display_names": display_names,
+            "values": data_points,
             "pagination": {
                 "page": page,
                 "limit": limit,

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/automation/logger/events.py

@@ -68,7 +68,9 @@ class EventsLogger(BaseLogger):
         classification:str="",
         greater_than_timestamp:datetime=None,
         less_than_timestamp:datetime=None,
-        timezone:str="UTC"
+        timezone:str="UTC",
+        page:int=1,
+        limit:int=20
         ):
         r"""
         Documentation here
@@ -90,7 +92,9 @@ class EventsLogger(BaseLogger):
             description=description,
             greater_than_timestamp=greater_than_timestamp,
             less_than_timestamp=less_than_timestamp,
-            timezone=timezone
+            timezone=timezone,
+            page=page,
+            limit=limit
             )
 
     def get_summary(self)->tuple[list, str]:
@@ -164,7 +168,9 @@ class EventsLoggerEngine(BaseEngine):
         description:str="",
         greater_than_timestamp:datetime=None,
         less_than_timestamp:datetime=None,
-        timezone:str='UTC'
+        timezone:str='UTC',
+        page:int=1,
+        limit:int=20
         ):
 
         _query = dict()
@@ -179,6 +185,8 @@ class EventsLoggerEngine(BaseEngine):
         _query["parameters"]["greater_than_timestamp"] = greater_than_timestamp
         _query["parameters"]["less_than_timestamp"] = less_than_timestamp
         _query["parameters"]["timezone"] = timezone
+        _query["parameters"]["page"] = page
+        _query["parameters"]["limit"] = limit
         
         return self.query(_query)
 

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/automation/modules/alarms/resources/summary.py

@@ -16,7 +16,9 @@ alarms_summary_filter_model = api.model("alarms_summary_filter_model",{
     'tags': fields.List(fields.String(), required=False),
     'greater_than_timestamp': fields.DateTime(required=False, default=datetime.now(pytz.utc).astimezone(TIMEZONE) - timedelta(minutes=30), description=f'Greater than timestamp - DateTime Format: {app.cvt.DATETIME_FORMAT}'),
     'less_than_timestamp': fields.DateTime(required=False, default=datetime.now(pytz.utc).astimezone(TIMEZONE), description=f'Less than timestamp - DateTime Format: {app.cvt.DATETIME_FORMAT}'),
-    'timezone': fields.String(required=False, default=_TIMEZONE)
+    'timezone': fields.String(required=False, default=_TIMEZONE),
+    'page': fields.Integer(required=False, default=1, description='Page number'),
+    'limit': fields.Integer(required=False, default=20, description='Items per page')
 })
 
     

{pyautomationio-1.1.0 → pyautomationio-1.1.2}/automation/modules/events/resources/events.py

@@ -20,7 +20,9 @@ events_filter_model = api.model("events_filter_model",{
     'description': fields.String(required=False),
     'greater_than_timestamp': fields.DateTime(required=False, default=datetime.now(pytz.utc).astimezone(TIMEZONE) - timedelta(minutes=30), description=f'Greater than timestamp - DateTime Format: {app.cvt.DATETIME_FORMAT}'),
     'less_than_timestamp': fields.DateTime(required=False, default=datetime.now(pytz.utc).astimezone(TIMEZONE), description=f'Less than timestamp - DateTime Format: {app.cvt.DATETIME_FORMAT}'),
-    'timezone': fields.String(required=False, default=_TIMEZONE)
+    'timezone': fields.String(required=False, default=_TIMEZONE),
+    'page': fields.Integer(required=False, default=1, description='Page number'),
+    'limit': fields.Integer(required=False, default=20, description='Items per page')
 })
 
     

pyautomationio-1.1.2/version.py

@@ -0,0 +1,2 @@
+__version__ = '1.1.2'
+

pyautomationio-1.1.0/version.py

@@ -1,2 +0,0 @@
-__version__ = '1.1.0'
-