PyAutomationIO 2.1.0__tar.gz → 2.1.2__tar.gz

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyAutomationIO
-Version: 2.1.0
+Version: 2.1.2
 Summary: A python framework to develop automation industrial processes applications and Artificial Intelligence applications for the industrial field
 Home-page: https://github.com/know-ai/PyAutomation
 Author: KnowAI

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/PyAutomationIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyAutomationIO
-Version: 2.1.0
+Version: 2.1.2
 Summary: A python framework to develop automation industrial processes applications and Artificial Intelligence applications for the industrial field
 Home-page: https://github.com/know-ai/PyAutomation
 Author: KnowAI

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/automation/core.py

@@ -586,7 +586,7 @@ class PyAutomation(Singleton):
 
     @logging_error_handler
     @validate_types(kp_min=int|float, kp_max=int|float, output=list)
-    def get_tags_by_kp_range(self, kp_min:float, kp_max:float)->list:
+    def get_tags_by_kp_range(self, kp_min:float, kp_max:float, segment:str=None)->list:
         r"""
         Retrieves tags whose KP is between kp_min and kp_max (inclusive).
 
@@ -594,12 +594,13 @@ class PyAutomation(Singleton):
 
         * **kp_min** (float): Lower KP bound.
         * **kp_max** (float): Upper KP bound.
+        * **segment** (str): Optional segment name to filter by.
 
         **Returns:**
 
         * **list**: Serialized tags in the requested KP range.
         """
-        return self.cvt.get_tags_by_kp_range(kp_min=kp_min, kp_max=kp_max)
+        return self.cvt.get_tags_by_kp_range(kp_min=kp_min, kp_max=kp_max, segment=segment)
 
     @logging_error_handler
     @validate_types(segment_name=str, kp=int|float, latitude=int|float, longitude=int|float, elevation=int|float|type(None), output=tuple)
@@ -3981,6 +3982,24 @@ class PyAutomation(Singleton):
         """
         return self.alarm_manager.get_alarms_by_tag(tag=tag)
 
+    @logging_error_handler
+    @validate_types(kp_min=int|float, kp_max=int|float, output=list)
+    def get_alarms_by_kp_range(self, kp_min:float, kp_max:float, segment:str=None)->list:
+        r"""
+        Retrieves alarms whose associated tag KP is within [kp_min, kp_max].
+
+        **Parameters:**
+
+        * **kp_min** (float): Lower KP bound.
+        * **kp_max** (float): Upper KP bound.
+        * **segment** (str, optional): If provided, only alarms whose tag belongs to this segment are returned.
+
+        **Returns:**
+
+        * **list**: List of serialized alarm dictionaries.
+        """
+        return self.alarm_manager.get_alarms_by_kp_range(kp_min=kp_min, kp_max=kp_max, segment=segment)
+
     @logging_error_handler
     @validate_types(id=str, user=User|type(None), output=None)
     def delete_alarm(self, id:str, user:User=None):

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/automation/logger/datalogger.py

@@ -145,14 +145,11 @@ class DataLogger(BaseLogger):
         tag = Tags.get(identifier=id)
 
         if "gaussian_filter" in kwargs:
-            
-            if kwargs['gaussian_filter'].lower() in ('1', 'true'):
-
-                kwargs['gaussian_filter'] = True
-
+            gaussian_filter_value = kwargs["gaussian_filter"]
+            if isinstance(gaussian_filter_value, str):
+                kwargs["gaussian_filter"] = gaussian_filter_value.strip().lower() in ("1", "true", "yes", "on")
             else:
-
-                kwargs['gaussian_filter'] = False
+                kwargs["gaussian_filter"] = bool(gaussian_filter_value)
         
         return Tags.put(id=tag.id, **kwargs)
 

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/automation/managers/alarms.py

@@ -278,6 +278,38 @@ class AlarmManager(Singleton):
 
     #     return alarms
 
+    @logging_error_handler
+    def get_alarms_by_kp_range(self, kp_min:float, kp_max:float, segment:str=None)->list:
+        r"""
+        Returns serialized alarms whose associated tag KP is within [kp_min, kp_max].
+
+        **Parameters:**
+
+        * **kp_min** (float): Lower bound for KP.
+        * **kp_max** (float): Upper bound for KP.
+        * **segment** (str, optional): If provided, only alarms whose tag belongs to this segment are returned.
+
+        **Returns:**
+
+        * **list**: List of serialized alarm dictionaries.
+        """
+        lower = min(kp_min, kp_max)
+        upper = max(kp_min, kp_max)
+        result = []
+        for _, alarm in self._alarms.items():
+            tag = alarm.tag
+            if not hasattr(tag, 'get_kp'):
+                continue
+            kp = tag.get_kp()
+            if kp is None:
+                continue
+            if not (lower <= kp <= upper):
+                continue
+            if segment is not None and alarm.segment != segment:
+                continue
+            result.append(alarm.serialize())
+        return result
+
     @logging_error_handler
     def get_alarm_by_tag(self, tag:str)->list[Alarm]:
         r"""

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/automation/modules/alarms/resources/alarms.py

@@ -33,6 +33,12 @@ create_alarm_model = api.model("create_alarm_model", {
     'description': fields.String(required=False, description='Alarm description', default='')
 })
 
+alarms_kp_range_model = api.model("alarms_kp_range_model", {
+    'kp_min': fields.Float(required=True, description='Lower bound KP (inclusive)'),
+    'kp_max': fields.Float(required=True, description='Upper bound KP (inclusive)'),
+    'segment': fields.String(required=False, description='Filter by segment (optional)')
+})
+
 update_alarm_model = api.model("update_alarm_model", {
     'id': fields.String(required=True, description='Alarm ID'),
     'name': fields.String(required=False, description='Alarm name'),
@@ -124,6 +130,34 @@ class ActiveAlarmsCollection(Resource):
         return False, 200
 
     
+@ns.route('/kp_range')
+class AlarmsByKpRangeCollection(Resource):
+
+    @api.doc(security='apikey', description="Retrieves alarms whose associated tag KP is between two bounds (inclusive). Optionally filter by segment.")
+    @api.response(200, "Success")
+    @api.response(400, "Invalid payload")
+    @Api.token_required(auth=True)
+    @ns.expect(alarms_kp_range_model)
+    def post(self):
+        """
+        Get alarms by KP range.
+
+        Returns alarms whose associated tag has a `kp` value between `kp_min` and
+        `kp_max` (inclusive). An optional `segment` filter can be applied to further
+        restrict the results.
+        """
+        payload = api.payload or {}
+        kp_min = payload.get('kp_min')
+        kp_max = payload.get('kp_max')
+        segment = payload.get('segment')
+
+        if kp_min is None or kp_max is None:
+            return {'message': 'kp_min and kp_max are required'}, 400
+
+        data = app.get_alarms_by_kp_range(kp_min=kp_min, kp_max=kp_max, segment=segment)
+        return {'data': data}, 200
+
+
 @ns.route('/<id>')
 @api.param('id', 'The alarm identifier')
 class AlarmResource(Resource):

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/automation/modules/linear_referencing/resources/linear_referencing_geospatial.py

@@ -2,6 +2,7 @@ import csv
 from io import StringIO, BytesIO
 from flask import request
 from flask_restx import Namespace, Resource, fields, reqparse
+from werkzeug.datastructures import FileStorage
 from .... import PyAutomation
 from ....extensions.api import api
 from ....extensions import _api as Api
@@ -136,6 +137,31 @@ class LinearReferencingInterpolateResource(Resource):
         return {"message": message, "data": data}, 200
 
 
+bulk_import_parser = reqparse.RequestParser()
+bulk_import_parser.add_argument(
+    'file',
+    type=FileStorage,
+    location='files',
+    required=True,
+    help='CSV or XLSX file to import'
+)
+bulk_import_parser.add_argument(
+    'segment_name',
+    type=str,
+    location='form',
+    required=False,
+    help='Default segment name (used when the file does not include a segment_name column)'
+)
+bulk_import_parser.add_argument(
+    'update_existing',
+    type=str,
+    location='form',
+    required=False,
+    default='true',
+    help='Update existing points if they already exist (true/false, default: true)'
+)
+
+
 @ns.route('/bulk_import')
 class LinearReferencingBulkImportResource(Resource):
 
@@ -147,6 +173,7 @@ class LinearReferencingBulkImportResource(Resource):
     @api.response(200, "Import processed")
     @api.response(400, "Invalid file or payload")
     @Api.token_required(auth=True)
+    @ns.expect(bulk_import_parser)
     def post(self):
         if "file" not in request.files:
             return {"message": "file is required (CSV or XLSX)"}, 400

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/automation/modules/tags/resources/tags.py

@@ -97,7 +97,8 @@ tags_list_filter_model = api.model("tags_list_filter_model", {
 
 tags_kp_range_model = api.model("tags_kp_range_model", {
     'kp_min': fields.Float(required=True, description='Lower bound KP (inclusive)'),
-    'kp_max': fields.Float(required=True, description='Upper bound KP (inclusive)')
+    'kp_max': fields.Float(required=True, description='Upper bound KP (inclusive)'),
+    'segment': fields.String(required=False, description='Filter by segment (optional)')
 })
 
 
@@ -185,11 +186,12 @@ class TagsByKpRangeCollection(Resource):
         payload = api.payload or {}
         kp_min = payload.get('kp_min')
         kp_max = payload.get('kp_max')
+        segment = payload.get('segment')
 
         if kp_min is None or kp_max is None:
             return {'message': 'kp_min and kp_max are required'}, 400
 
-        data = app.get_tags_by_kp_range(kp_min=kp_min, kp_max=kp_max)
+        data = app.get_tags_by_kp_range(kp_min=kp_min, kp_max=kp_max, segment=segment)
         return {'data': data}, 200
 
 @ns.route('/names')

{pyautomationio-2.1.0 → pyautomationio-2.1.2}/automation/tags/cvt.py

@@ -219,14 +219,11 @@ class CVT:
         if "kp" in kwargs:
             tag.set_kp(kp=kwargs["kp"])
         if "gaussian_filter" in kwargs:
-            
-            if kwargs['gaussian_filter'].lower() in ('1', 'true'):
-
-                tag.gaussian_filter = True
-
+            gaussian_filter_value = kwargs["gaussian_filter"]
+            if isinstance(gaussian_filter_value, str):
+                tag.gaussian_filter = gaussian_filter_value.strip().lower() in ("1", "true", "yes", "on")
             else:
-
-                tag.gaussian_filter = False
+                tag.gaussian_filter = bool(gaussian_filter_value)
 
         if "gaussian_filter_r_value" in kwargs:
 
@@ -386,7 +383,7 @@ class CVT:
         return result
 
     @logging_error_handler
-    def get_tags_by_kp_range(self, kp_min:float, kp_max:float)->list:
+    def get_tags_by_kp_range(self, kp_min:float, kp_max:float, segment:str=None)->list:
         r"""
         Returns a list of serialized tags whose KP is between kp_min and kp_max (inclusive).
 
@@ -394,6 +391,7 @@ class CVT:
 
         * **kp_min** (float): Lower bound for KP.
         * **kp_max** (float): Upper bound for KP.
+        * **segment** (str): Optional segment name to filter by.
 
         **Returns:**
 
@@ -407,6 +405,7 @@ class CVT:
             tag.serialize()
             for _, tag in self._tags.items()
             if tag.get_kp() is not None and lower <= tag.get_kp() <= upper
+            and (segment is None or tag.segment == segment)
         ]
 
     @logging_error_handler
@@ -940,7 +939,7 @@ class CVTEngine(Singleton):
         return self.__query(_query)
 
     @logging_error_handler
-    def get_tags_by_kp_range(self, kp_min:float, kp_max:float):
+    def get_tags_by_kp_range(self, kp_min:float, kp_max:float, segment:str=None):
         r"""
         Thread-safe method to get tags whose KP is within a given range.
         """
@@ -949,6 +948,7 @@ class CVTEngine(Singleton):
         _query["parameters"] = dict()
         _query["parameters"]["kp_min"] = kp_min
         _query["parameters"]["kp_max"] = kp_max
+        _query["parameters"]["segment"] = segment
         return self.__query(_query)
 
     @logging_error_handler

pyautomationio-2.1.2/version.py

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

pyautomationio-2.1.0/version.py

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