easy-utils-dev 2.145__tar.gz → 2.153__tar.gz

{easy_utils_dev-2.145 → easy_utils_dev-2.153}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy_utils_dev
-Version: 2.145
+Version: 2.153
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil
@@ -16,8 +16,6 @@ Requires-Dist: flask_socketio
 Requires-Dist: python-dotenv
 Requires-Dist: gevent
 Requires-Dist: pyzipper
-Requires-Dist: shutil
-Requires-Dist: bs4
 Requires-Dist: pyjwt
 Requires-Dist: authlib
 Requires-Dist: kafka-python

{easy_utils_dev-2.145 → easy_utils_dev-2.153}/easy_utils_dev/debugger.py

@@ -1,9 +1,10 @@
 import logging
 import os
+import shutil
 import  sys
 from datetime import datetime
 from logging.handlers import RotatingFileHandler
-from .utils import getRandomKey , convert_mb_to_bytes , getTimestamp , start_thread
+from .utils import getRandomKey , convert_mb_to_bytes , getTimestamp, mkdirs , start_thread
 from .custom_env import custom_env , setupEnvironment
 from .Events import EventEmitter
 from threading import Thread
@@ -58,12 +59,11 @@ class DEBUGGER:
         self.file_handler_class=None
         self.LOG_SIZE_THRESHOLD_IN_BYTES = 10 * 1024 * 1024
         self.BACKUP_COUNT = log_rotation
-        self.homePath = homePath
-        self.lastAbsoluteHomePath= None
+        self.name = name
+        self.create_log_path(homePath, file_name)
         self.fullSyntax=fullSyntax
         self.onScreen= onscreen
         self.id = id
-        self.how_many_times_write= 0
         self.stream_service = None
         if not env['debugger'].get(name) :
             self.console = console_handler = logging.StreamHandler()
@@ -71,7 +71,6 @@ class DEBUGGER:
             self.console = console_handler = env['debugger'].get(name).console
         if not self.logger.hasHandlers() :
             self.logger.addHandler(self.console)
-        self.name = name
         self.rotate_disabled=False
         self.isInPyinstaller = False
         self.log_iterations=0
@@ -86,13 +85,11 @@ class DEBUGGER:
             f = f"[{self.name}]-[%(levelname)s]: %(message)s"
         self.syntax = f
         self.formatter = logging.Formatter(f , datefmt='%Y-%m-%d %H:%M:%S' )
-        self.filename = file_name
-        path = self.homepath(homePath)
         if not env['debugger'].get(name) :
             console_handler.setFormatter(self.formatter)
         if not disable_log_write :
             if not env['debugger'].get(name) :
-                self.file_handler_class = self.createRotateFileHandler(path)
+                self.file_handler_class = self.createRotateFileHandler(self.log_path_with_filename)
         if onscreen : 
             self.enable_print()
         elif not onscreen : 
@@ -118,6 +115,35 @@ class DEBUGGER:
                 self.set_level(EASY_UTILS_DEBUG_LEVEL)
         if os.environ.get("EASY_UTILS_ENABLE_PRINT" , '' ).lower() == 'true' :
             self.enable_print()
+        start_thread(target=self.checks_in_bg)
+
+    def create_log_path(self , base_path , logname ) :
+        if not base_path :
+            base_path = os.path.join(os.getcwd() , 'debug')
+        if not logname :
+            logname = self.name
+        mkdirs(base_path)
+        self.baseHomePath = base_path
+        self.filename = logname
+        self.lastAbsoluteHomePath = base_path
+        self.log_path_with_filename = os.path.join(base_path, f'{logname}.log')
+        # print(f"Filename : {self.filename}")
+        # print(f"Base Home Path : {self.baseHomePath}")
+        # print(f"Log path With Filename : {self.log_path_with_filename}")
+        # print(f"Last Absolute Home Path : {self.lastAbsoluteHomePath}")
+
+    def fix_file_not_found_file_rotation(self) : 
+        for i in range(self.BACKUP_COUNT) :
+            try :
+                file_path = self.homePath + f'.{i}'
+                # print(f"Checking log file path  : {file_path}")
+                if not os.path.exists(file_path) :
+                    with open(file_path, 'a+') as f :
+                        # print(f"Creating log file path  : {file_path}")
+                        f.write('')
+            except :
+                pass
+
 
     def switch_full_syntax(self , toggle) :
         if toggle :
@@ -140,9 +166,10 @@ class DEBUGGER:
     def updateGlobalHomePath(self ) :
         if not self.isLogWriteDisabled :
             getFromEnv = self.env.get('debugger_homepath' , None )
-            self.homepath(getFromEnv)
+            # print(f"getFromEnv : {getFromEnv}")
+            self.create_log_path(getFromEnv, self.filename)
             if getFromEnv : 
-                self.file_handler_class = self.createRotateFileHandler(self.homePath)
+                self.file_handler_class = self.createRotateFileHandler(self.log_path_with_filename)
 
     def updateGlobalSetLevel( self ) :
         self.set_level(self.env['debugger_global_level'])
@@ -211,13 +238,7 @@ class DEBUGGER:
             self.logger.removeHandler(self.file_handler_class)
     
     def enable_log_write(self) :
-        self.createRotateFileHandler(self.homePath)
-        
-    def manage_file_rotation(self, record ) :
-        handler = self.get_rotate_handler()
-        if handler.shouldRollover(record) :
-            handler.doRollover()
-            self.log_iterations = 0
+        self.createRotateFileHandler(self.log_path_with_filename)
 
     def get_rotate_handler(self) :
         return self.file_handler_class
@@ -233,10 +254,10 @@ class DEBUGGER:
         handler = self.get_rotate_handler()
         handler.maxBytes = size
         return True
-
     
     def checks_in_bg(self) :
         while True :
+            #self.fix_file_not_found_file_rotation()
             if self.env.get('GLOBAL_DEBUGGER_STREAM_SERVICE') :
                 self.addStreamService(socketio=self.env.get('GLOBAL_DEBUGGER_STREAM_SERVICE'))
             if self.env.get('debugger_global_level' , None) : 
@@ -254,7 +275,7 @@ class DEBUGGER:
             self.updateGlobalHomePath()
             if os.environ.get("EASY_UTILS_ENABLE_PRINT" , '' ).lower() == 'true' :
                 self.enable_print()
-            sleep(5)
+            sleep(10)
 
     def close(self) :
         try :
@@ -262,28 +283,6 @@ class DEBUGGER:
         except :
             pass
 
-    def homepath(self , path=None ) :
-        env = custom_env()
-        getFromEnv = env.get('debugger_homepath' , None )
-        if getFromEnv is not None :
-            self.homePath = getFromEnv
-        else :
-            if path is not None :
-                if self.homePath and '.log' in str(self.homePath): 
-                    self.lastAbsoluteHomePath= self.homePath
-                self.homePath = path
-            else :
-                self.homePath = os.path.join(os.getcwd() , 'debug')
-        if not os.path.exists( self.homePath ) :
-            try : 
-                os.makedirs( self.homePath )
-            except : 
-                pass
-        if self.filename :
-            self.homePath = os.path.join( self.homePath, f'{self.filename}.log' ) 
-        else :
-            self.homePath = os.path.join( self.homePath, f'{self.name}.log' ) 
-        return self.homePath
 
     def get_current_levels(self):
         """
@@ -312,10 +311,16 @@ class DEBUGGER:
         self.logger.removeHandler(self.console)
 
     def changeHomePath( self , path ) :
-        p = self.homepath(path)
-        self.file_handler_class = self.createRotateFileHandler(p)
-        if self.lastAbsoluteHomePath :
-            os.remove(self.lastAbsoluteHomePath)
+        def delet_later(lastAbsoluteHomePath) :
+            if lastAbsoluteHomePath :
+                sleep(3)
+                try :
+                    shutil.rmtree(lastAbsoluteHomePath)
+                except :
+                    pass
+        start_thread(target=delet_later, args=[self.lastAbsoluteHomePath])
+        self.create_log_path( path , self.filename)
+        self.file_handler_class = self.createRotateFileHandler(self.log_path_with_filename)
 
     def isGlobalDebuggerDefined(self) :
         if self.global_debugger :
@@ -349,16 +354,19 @@ class DEBUGGER:
             if self.isStreamServiceAvailable() :
                 d = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
                 streamUrl = self.getStreamServiceUrlPath()
-                self.stream_service.emit( streamUrl , {
-                    'message' : message ,
-                    'level' : level ,
-                    'msg' : message,
-                    'date' : d ,
-                    'id' : self.id,
-                    'formate' : 'json' ,
-                    'source' : self.name ,
-                    'getTimestamp' : getTimestamp()
-                })
+                try :
+                    self.stream_service.emit( streamUrl , {
+                        'message' : message ,
+                        'level' : level ,
+                        'msg' : message,
+                        'date' : d ,
+                        'id' : self.id,
+                        'formate' : 'json' ,
+                        'source' : self.name ,
+                        'getTimestamp' : getTimestamp()
+                    })
+                except :
+                    pass
         try :
             t= Thread(target=__call_thread__)
             # t.daemon=True

{easy_utils_dev-2.145 → easy_utils_dev-2.153}/easy_utils_dev/uiserver.py

@@ -1,7 +1,5 @@
-import copy
 import gc
 import time
-from tkinter import NO
 from werkzeug.serving import ThreadedWSGIServer
 from easy_utils_dev.utils import getRandomKey , generateToken , getTimestamp
 from flask_socketio import SocketIO

{easy_utils_dev-2.145 → easy_utils_dev-2.153}/easy_utils_dev/utils.py

@@ -49,14 +49,14 @@ def timenow() :
     return  str(now().strftime("%d/%m/%Y %H:%M:%S"))
     
 
-def timenowForLabels() : 
+def timenowForLabels(format='%d-%m-%Y_%H-%M-%S') : 
     """
     Get current date and time formatted for use in file labels.
     
     Returns:
         str: Current date and time in format "DD-MM-YYYY_HH-MM-SS".
     """
-    return now().strftime("%d-%m-%Y_%H-%M-%S")
+    return now().strftime(format)
 
 def fixTupleForSql(list):
     """
@@ -399,7 +399,10 @@ def mkdirs(path) :
         path (str): Path of directory to create.
     """
     if not os.path.exists(path) :
-        os.makedirs(path)
+        try :
+            os.makedirs(path)
+        except :
+            pass
 
 def releasify(release : float ) -> tuple :
     """

{easy_utils_dev-2.145 → easy_utils_dev-2.153}/easy_utils_dev/wsnoclib.py

@@ -1,4 +1,3 @@
-from tkinter import NO
 from easy_utils_dev.debugger import DEBUGGER
 import requests , json , subprocess
 from requests.auth import HTTPBasicAuth as BAuth    
@@ -87,6 +86,7 @@ class WSNOCLIB :
         self.current_requests = 0
         self.connected = False
         self.pm_hadoop = PmHadoopClient(self)
+        self.verify_connection_by_ping = True
         if register_atexit :
             atexit.register(self.goodbye)
 
@@ -130,8 +130,9 @@ class WSNOCLIB :
         self.logger.debug(f"loggedOut flag is {self.loggedOut}")
         if self.loggedOut :
             return
-        if not pingAddress(self.address) :
-            raise Exception(f'Address {self.address} is not pingable.')
+        if self.verify_connection_by_ping :
+            if not pingAddress(self.address)  :
+                raise Exception(f'Address {self.address} is not pingable.')
         # self.logger.info(f'Connecting to {self.address} using username: {self.username}')
         self.logger.debug(f'Connecting to {self.address} using username: {self.username}')
         URL = f"https://{self.address}/rest-gateway/rest/api/v1/auth/token"
@@ -379,7 +380,7 @@ class WSNOCLIB :
         return self.kafka
 
     def change_kafka_refresh_period(self , period : int =3000) :
-        self.logger.warning('Deprecated, Kafka refresh period is now managed by WSNOC API SLEEP PERIOD. Nothing is applied now.')
+        self.logger.warning('Deprecated, Kafka refresh period is now managed by WSNOC API SLEEP PERIOD. Nothing is applied from this function.')
 
     def renewSubscription(self) :
         self.logger.info('Renewing subscription ...')

{easy_utils_dev-2.145 → easy_utils_dev-2.153}/easy_utils_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy_utils_dev
-Version: 2.145
+Version: 2.153
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil
@@ -16,8 +16,6 @@ Requires-Dist: flask_socketio
 Requires-Dist: python-dotenv
 Requires-Dist: gevent
 Requires-Dist: pyzipper
-Requires-Dist: shutil
-Requires-Dist: bs4
 Requires-Dist: pyjwt
 Requires-Dist: authlib
 Requires-Dist: kafka-python

{easy_utils_dev-2.145 → easy_utils_dev-2.153}/easy_utils_dev.egg-info/requires.txt

@@ -11,8 +11,6 @@ flask_socketio
 python-dotenv
 gevent
 pyzipper
-shutil
-bs4
 pyjwt
 authlib
 kafka-python

{easy_utils_dev-2.145 → easy_utils_dev-2.153}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '2.145'
+VERSION = '2.153'
 
 # Setting up
 setup(
@@ -22,8 +22,6 @@ setup(
             'python-dotenv',
             'gevent',
             'pyzipper',
-            "shutil",
-            "bs4",
             'pyjwt',
             'authlib',
             'kafka-python'