PyAutomationIO 1.1.3__tar.gz → 1.1.4__tar.gz

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyAutomationIO
-Version: 1.1.3
+Version: 1.1.4
 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
@@ -117,10 +117,22 @@ services:
     volumes:
       - automation_db:/app/db
       - automation_logs:/app/logs
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m" # Rota cuando llega a 10MB
+        max-file: "3" # Guarda máximo 3 archivos (30MB total)
     environment:
       OPCUA_SERVER_PORT: ${AUTOMATION_OPCUA_SERVER_PORT}
       LOG_MAX_BYTES: ${AUTOMATION_LOG_MAX_BYTES}
       LOG_BACKUP_COUNT: ${AUTOMATION_LOG_BACKUP_COUNT}
+    tmpfs:
+      - /tmp:size=500k
+    deploy:
+      resources:
+        limits:
+          cpus: "0.5"
+          memory: 256M
     healthcheck:
       test: ["CMD", "python", "/app/healthcheck.py"]
       interval: 15s
@@ -130,7 +142,6 @@ services:
 volumes:
   automation_db:
   automation_logs:
-
 ```
 
 Start the docker compose file

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/PyAutomationIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyAutomationIO
-Version: 1.1.3
+Version: 1.1.4
 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
@@ -117,10 +117,22 @@ services:
     volumes:
       - automation_db:/app/db
       - automation_logs:/app/logs
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m" # Rota cuando llega a 10MB
+        max-file: "3" # Guarda máximo 3 archivos (30MB total)
     environment:
       OPCUA_SERVER_PORT: ${AUTOMATION_OPCUA_SERVER_PORT}
       LOG_MAX_BYTES: ${AUTOMATION_LOG_MAX_BYTES}
       LOG_BACKUP_COUNT: ${AUTOMATION_LOG_BACKUP_COUNT}
+    tmpfs:
+      - /tmp:size=500k
+    deploy:
+      resources:
+        limits:
+          cpus: "0.5"
+          memory: 256M
     healthcheck:
       test: ["CMD", "python", "/app/healthcheck.py"]
       interval: 15s
@@ -130,7 +142,6 @@ services:
 volumes:
   automation_db:
   automation_logs:
-
 ```
 
 Start the docker compose file

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/PyAutomationIO.egg-info/SOURCES.txt

@@ -60,6 +60,9 @@ automation/modules/events/__init__.py
 automation/modules/events/resources/__init__.py
 automation/modules/events/resources/events.py
 automation/modules/events/resources/logs.py
+automation/modules/settings/__init__.py
+automation/modules/settings/resources/__init__.py
+automation/modules/settings/resources/settings.py
 automation/modules/tags/__init__.py
 automation/modules/tags/resources/__init__.py
 automation/modules/tags/resources/tags.py

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/README.md

@@ -64,10 +64,22 @@ services:
     volumes:
       - automation_db:/app/db
       - automation_logs:/app/logs
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m" # Rota cuando llega a 10MB
+        max-file: "3" # Guarda máximo 3 archivos (30MB total)
     environment:
       OPCUA_SERVER_PORT: ${AUTOMATION_OPCUA_SERVER_PORT}
       LOG_MAX_BYTES: ${AUTOMATION_LOG_MAX_BYTES}
       LOG_BACKUP_COUNT: ${AUTOMATION_LOG_BACKUP_COUNT}
+    tmpfs:
+      - /tmp:size=500k
+    deploy:
+      resources:
+        limits:
+          cpus: "0.5"
+          memory: 256M
     healthcheck:
       test: ["CMD", "python", "/app/healthcheck.py"]
       interval: 15s
@@ -77,7 +89,6 @@ services:
 volumes:
   automation_db:
   automation_logs:
-
 ```
 
 Start the docker compose file

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/automation/__init__.py

@@ -17,6 +17,7 @@ if not os.path.isfile(CERT_FILE):
 if not os.path.isfile(KEY_FILE):
     KEY_FILE = None
 OPCUA_SERVER_PORT = os.environ.get('OPCUA_SERVER_PORT') or "53530"
+LOGGER_PERIOD = os.environ.get('LOGGER_PERIOD') or 10.0
 
 
 class CreateApp():

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/automation/core.py

@@ -1066,6 +1066,50 @@ class PyAutomation(Singleton):
             logging.warning(message)
             return None
 
+    @logging_error_handler
+    def set_app_config(self, **kwargs):
+        r"""
+        Update app configuration into app_config.json
+        """
+        try:
+            config_path = os.path.join(".", "db", "app_config.json")
+            config = {}
+            
+            if os.path.exists(config_path):
+                with open(config_path, 'r') as f:
+                    config = json.load(f)
+            
+            config.update(kwargs)
+            
+            with open(config_path, 'w') as f:
+                json.dump(config, f, indent=4)
+                
+        except Exception as e:
+            logging.error(f"Failed to persist app config: {e}")
+
+    @logging_error_handler
+    def get_app_config(self) -> dict:
+        r"""
+        Get app configuration from app_config.json
+        """
+        try:
+            config_path = os.path.join(".", "db", "app_config.json")
+            if os.path.exists(config_path):
+                with open(config_path, 'r') as f:
+                    return json.load(f)
+            else:
+                # Create default config if not exists
+                default_config = {
+                    "logger_period": 10.0,
+                    "log_level": 20
+                }
+                self.set_app_config(**default_config)
+                return default_config
+                
+        except Exception as e:
+            logging.error(f"Failed to read app config: {e}")
+            return {"logger_period": 10.0, "log_level": 20}
+
     @logging_error_handler
     @validate_types(output=bool)
     def is_db_connected(self):
@@ -1655,6 +1699,18 @@ class PyAutomation(Singleton):
 
         **Returns:** `None`
         """
+        str_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        logging.critical(f"{str_date} Starting app with configuration:")
+        logging.critical(f"{str_date} Logger period: {self.get_app_config().get('logger_period', 10.0)} seconds")
+        logging.critical(f"{str_date} Log max bytes: {self.get_app_config().get('log_max_bytes', 10 * 1024 * 1024)} bytes")
+        logging.critical(f"{str_date} Log backup count: {self.get_app_config().get('log_backup_count', 3)} backups")
+        logging.critical(f"{str_date} Log level: {self.get_app_config().get('log_level', 20)}")
+        print(f"[INFO] {str_date} Starting app with configuration:")
+        print(f"[INFO] {str_date} Logger period: {self.get_app_config().get('logger_period', 10.0)} seconds")
+        print(f"[INFO] {str_date} Log max bytes: {self.get_app_config().get('log_max_bytes', 10 * 1024 * 1024)} bytes")
+        print(f"[INFO] {str_date} Log backup count: {self.get_app_config().get('log_backup_count', 3)} backups")
+        print(f"[INFO] {str_date} Log level: {self.get_app_config().get('log_level', 20)}")
+
         self.safe_start(test=test, create_tables=create_tables, machines=machines)
         self.create_system_user()
 
@@ -1694,6 +1750,23 @@ class PyAutomation(Singleton):
         self._create_tables = create_tables
         self.__start_logger()
         self.__start_workers(test=test, machines=machines)
+        str_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        logging.critical(f"{str_date} App started successfully")
+        print(f"[INFO] {str_date} App started successfully")
+
+    @logging_error_handler
+    @validate_types(period=float, output=None)
+    def update_logger_period(self, period:float):
+        r"""
+        Update logger worker period
+        """
+        if hasattr(self, 'db_worker'):
+            self.db_worker._period = period
+            str_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            logging.info(f"{str_date} Logger period updated to {period} seconds")
+            print(f"[INFO] {str_date} Logger period updated to {period} seconds")
+        
+        self.set_app_config(logger_period=period)
 
     @logging_error_handler
     @validate_types(output=None)
@@ -1723,8 +1796,11 @@ class PyAutomation(Singleton):
         * DASWorker
         """
         if self._create_tables:
+            
+            app_config = self.get_app_config()
+            logger_period = float(app_config.get("logger_period", 10.0))
 
-            self.db_worker = LoggerWorker(self.db_manager)
+            self.db_worker = LoggerWorker(self.db_manager, period=logger_period)
             self.connect_to_db(test=test)
             self.db_worker.start()
 
@@ -1753,6 +1829,50 @@ class PyAutomation(Singleton):
         if hasattr(self, 'subscription_monitor'):
             self.subscription_monitor.stop()
 
+    @logging_error_handler
+    @validate_types(level=int, output=None)
+    def update_log_level(self, level:int):
+        r"""
+        Update logger level dynamically and persist it.
+        """
+        self._logging_level = level
+        
+        # Update root logger
+        root_logger = logging.getLogger()
+        root_logger.setLevel(level)
+        
+        # Update app logger
+        app_logger = logging.getLogger("pyautomation")
+        app_logger.setLevel(level)
+        
+        logging.log(level, f"Log level updated to {level}")
+        
+        # Persist to config
+        self.set_app_config(log_level=level)
+
+    @logging_error_handler
+    @validate_types(max_bytes=int, backup_count=int, output=None)
+    def update_log_config(self, max_bytes:int, backup_count:int):
+        r"""
+        Update logger configuration (maxBytes and backupCount) dynamically and persist it.
+        """
+        # 1. Update runtime logger
+        root_logger = logging.getLogger()
+        for handler in root_logger.handlers:
+            if isinstance(handler, RotatingFileHandler):
+                # Update handler properties
+                handler.maxBytes = max_bytes
+                handler.backupCount = backup_count
+                # Trigger rollover if needed (optional, or wait for next write)
+                # handler.doRollover() 
+                str_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                logging.info(f"{str_date} Log configuration updated: maxBytes={max_bytes}, backupCount={backup_count}")
+                print(f"[INFO] {str_date} Log configuration updated: maxBytes={max_bytes}, backupCount={backup_count}")
+                break
+        
+        # 2. Persist to config
+        self.set_app_config(log_max_bytes=max_bytes, log_backup_count=backup_count)
+
     @logging_error_handler
     @validate_types(output=None)
     def __start_logger(self)->None:
@@ -1768,13 +1888,26 @@ class PyAutomation(Singleton):
         logging.getLogger('opcua').setLevel(logging.CRITICAL)
         # Configure root logger with rotating file handler (size-based)
         root_logger = logging.getLogger()
+        
+        # Load level from config
+        app_config = self.get_app_config()
+        # Default logging.INFO (20) if not set in config, overriding __init__ warning default
+        persisted_level = int(app_config.get('log_level', logging.INFO))
+        self._logging_level = persisted_level
+        
         root_logger.setLevel(self._logging_level)
         # Clear existing handlers to avoid duplicates
         for _h in list(root_logger.handlers):
             root_logger.removeHandler(_h)
 
-        max_bytes = int(os.environ.get('LOG_MAX_BYTES', 10 * 1024 * 1024)) # 10MB
-        backup_count = int(os.environ.get('LOG_BACKUP_COUNT', 3)) # 3 backups
+        app_config = self.get_app_config()
+        # Default fallback to env or hardcoded
+        env_max_bytes = int(os.environ.get('LOG_MAX_BYTES', 10 * 1024 * 1024))
+        env_backup_count = int(os.environ.get('LOG_BACKUP_COUNT', 3))
+
+        max_bytes = int(app_config.get('log_max_bytes', env_max_bytes))
+        backup_count = int(app_config.get('log_backup_count', env_backup_count))
+
         handler = RotatingFileHandler(
             filename=self._log_file,
             maxBytes=max_bytes,

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/automation/modules/__init__.py

@@ -7,8 +7,10 @@ def init_app(app):
     from ..modules.alarms.resources import init_app as init_alarms
     from ..modules.users.resources import init_app as init_users
     from ..modules.events.resources import init_app as init_events
+    from ..modules.settings.resources import init_app as init_settings
 
     init_tags()
     init_alarms()
     init_users()
-    init_events()
+    init_events()
+    init_settings()

pyautomationio-1.1.4/automation/modules/settings/__init__.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+"""automation/modules/settings/__init__.py
+
+This module implements settings resources.
+"""
+from .resources.settings import ns
+

pyautomationio-1.1.4/automation/modules/settings/resources/__init__.py

@@ -0,0 +1,5 @@
+from .settings import ns
+
+def init_app():
+    from ....extensions.api import api
+    api.add_namespace(ns, path="/settings")

pyautomationio-1.1.4/automation/modules/settings/resources/settings.py

@@ -0,0 +1,79 @@
+from flask_restx import Namespace, Resource, fields
+from .... import PyAutomation
+from ....extensions.api import api
+from ....extensions import _api as Api
+
+ns = Namespace('Settings', description='Settings')
+app = PyAutomation()
+
+settings_model = api.model("settings_model", {
+    'logger_period': fields.Float(required=False, min=1.0, description='Logger worker period in seconds'),
+    'log_max_bytes': fields.Integer(required=False, min=1024, description='Max bytes for log file rotation'),
+    'log_backup_count': fields.Integer(required=False, min=1, description='Number of backup log files to keep'),
+    'log_level': fields.Integer(required=False, min=0, max=50, description='Logging level (0=NOTSET, 10=DEBUG, 20=INFO, 30=WARNING, 40=ERROR, 50=CRITICAL)')
+})
+
+@ns.route('/update')
+class SettingsUpdateResource(Resource):
+    
+    @api.doc(security='apikey')
+    @Api.token_required(auth=True)
+    @ns.expect(settings_model)
+    def put(self):
+        """
+        Update application settings (Logger period, Log rotation config, Log level)
+        """
+        data = api.payload
+        
+        # 1. Update Logger Worker Period
+        if 'logger_period' in data:
+            logger_period = data['logger_period']
+            if logger_period < 1.0:
+                return "Logger period must be >= 1.0", 400
+            app.update_logger_period(logger_period)
+
+        # 2. Update Log Rotation Config
+        if 'log_max_bytes' in data and 'log_backup_count' in data:
+            max_bytes = data['log_max_bytes']
+            backup_count = data['log_backup_count']
+            
+            if max_bytes < 1024:
+                 return "log_max_bytes must be >= 1024", 400
+            if backup_count < 1:
+                 return "log_backup_count must be >= 1", 400
+                 
+            app.update_log_config(max_bytes, backup_count)
+        
+        elif 'log_max_bytes' in data or 'log_backup_count' in data:
+             return "Both log_max_bytes and log_backup_count must be provided together", 400
+
+        # 3. Update Log Level
+        if 'log_level' in data:
+            log_level = data['log_level']
+            # Basic validation for standard levels
+            if log_level not in [0, 10, 20, 30, 40, 50]:
+                return "Invalid log_level. Use standard Python logging levels (10, 20, 30, 40, 50)", 400
+            
+            app.update_log_level(log_level)
+
+        return "Settings updated", 200
+
+@ns.route('/logger_period')
+class LoggerPeriodResource(Resource):
+    
+    @api.doc(security='apikey')
+    @Api.token_required(auth=True)
+    @ns.expect(settings_model)
+    def put(self):
+        """
+        Update logger worker period
+        """
+        logger_period = api.payload.get('logger_period')
+        
+        if logger_period < 1.0:
+            return "Logger period must be >= 1.0", 400
+            
+        app.update_logger_period(logger_period)
+        
+        return "Logger period updated", 200
+

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/automation/utils/decorators.py

@@ -1,4 +1,4 @@
-import functools, logging, sys
+import functools, logging, sys, datetime
 from ..modules.users.users import User, Users
 from ..logger.events import EventsLoggerEngine
 
@@ -159,6 +159,8 @@ def validate_types(**validations):
                             message = f"Expected output type ({counter}) {expected}, but got {type(result[counter])} in func {func}"
                             logger = logging.getLogger("pyautomation")
                             logger.error(message)
+                            str_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                            print(f"[ERROR] {str_date} {message}")
                             raise TypeError(message)
                         
                 else:
@@ -167,6 +169,8 @@ def validate_types(**validations):
                         message = f"Expected output type {_output}, but got {type(result)} in func {func}"
                         logger = logging.getLogger("pyautomation")
                         logger.error(message)
+                        str_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                        print(f"[ERROR] {str_date} {message}")
                         raise TypeError(message)
 
             return result
@@ -201,6 +205,8 @@ def logging_error_handler(func, args, kwargs):
         })
         logger = logging.getLogger("pyautomation")
         logger.error(msg=msg)
+        str_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        print(f"[ERROR] {str_date} {msg}")
 
 @decorator
 def db_rollback(func, args, kwargs):

{pyautomationio-1.1.3 → pyautomationio-1.1.4}/automation/workers/logger.py

@@ -19,7 +19,7 @@ from ..dbmodels.logs import Logs
 
 class LoggerWorker(BaseWorker):
 
-    def __init__(self, manager:DBManager, period:int=5.0):
+    def __init__(self, manager:DBManager, period:float=10.0):
 
         super(LoggerWorker, self).__init__()
         

pyautomationio-1.1.4/version.py

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

pyautomationio-1.1.3/version.py

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