shareddata 3.3.9__tar.gz → 3.3.12__tar.gz

{shareddata-3.3.9/src/shareddata.egg-info → shareddata-3.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shareddata
-Version: 3.3.9
+Version: 3.3.12
 Summary: Shared Memory Database with S3 repository
 Home-page: https://github.com/jcarlitooliveira/SharedData
 Author: Jose Carlito de Oliveira Filho

{shareddata-3.3.9 → shareddata-3.3.12}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = shareddata
-version = 3.3.9
+version = 3.3.12
 author = Jose Carlito de Oliveira Filho
 author_email = jcarlitooliveira@gmail.com
 description = Shared Memory Database with S3 repository

{shareddata-3.3.9 → shareddata-3.3.12}/src/SharedData/Routines/Scheduler.py

@@ -98,9 +98,9 @@ class RoutineScheduler:
                 else:
                     break
 
-        sched_sort.index.name='sequence'
-        self.lastschedule = sched_sort
+        sched_sort.index.name='sequence'        
         self.schedule = sched_sort
+        self.lastschedule = self.schedule.copy()
         self.save()
         return sched_sort
 
@@ -110,13 +110,16 @@ class RoutineScheduler:
         # RefreshLogs
         dflogs = self.consumer.readLogs().copy()        
         if not dflogs.empty:
+            # CREATE AN INDEX
             dflogs['index'] = dflogs['user_name']+':'+dflogs['logger_name']
             dflogs['index'] = [s.lower().replace('\\','/') for s in dflogs['index']]
 
+            # LOCALIZE TIME
             dflogs = dflogs[dflogs['asctime'].notnull()].copy()
             dflogs['asctime'] = pd.to_datetime(dflogs['asctime'])
             dflogs['asctime'] = [dt.astimezone(tz=local_tz) for dt in dflogs['asctime']]
 
+            # GET LAST MESSAGE
             i=0
             now = datetime.now().astimezone(tz=local_tz)
             for i in sched.index:
@@ -128,7 +131,7 @@ class RoutineScheduler:
                     sched.loc[i,'LstMsgTimestamp'] = dflogs[idx].iloc[-1]['asctime']                    
                     sched.loc[i,'LstMsgAge'] = (now - sched.loc[i,'LstMsgTimestamp']).seconds
 
-                                
+            # ERROR ROUTINES
             dferr = dflogs[dflogs['message']=='ROUTINE ERROR!']
             dferr = dferr.reset_index(drop=True).sort_values(by='asctime')
             i=0
@@ -143,7 +146,9 @@ class RoutineScheduler:
                     idx = idx.index[idx]
                     sched.loc[idx,'Status'] = 'EXPIRED'
 
-            compl = dflogs[dflogs['message']=='ROUTINE COMPLETED!'].reset_index(drop=True).sort_values(by='asctime')
+            # COMPLETED ROUTINES
+            compl = dflogs[dflogs['message']=='ROUTINE COMPLETED!'].\
+                reset_index(drop=True).sort_values(by='asctime')
             i=0
             for i in compl.index:
                 r = compl.iloc[i]
@@ -156,16 +161,19 @@ class RoutineScheduler:
                     idx = idx.index[idx]
                     sched.loc[idx,'Status'] = 'EXPIRED'
 
-        # mark pending routines
+        # PENDING ROUTINES
         idx = datetime.now().astimezone(tz=local_tz)>=sched['Run Times']
-        idx = (idx) & ((sched['Status'].isnull()) | (sched['Status']=='WAITING DEPENDENCIES'))
-        
+        idx = (idx) & ((sched['Status'].isnull()) | (sched['Realtime']) \
+            | (sched['Status']=='WAITING DEPENDENCIES'))
         dfpending = sched[idx]
+
+        # EXPIRED ROUTINES
         expiredidx = dfpending.duplicated(['Computer','Script'],keep='last')
         if expiredidx.any():
             expiredids = expiredidx.index[expiredidx]
             sched.loc[expiredids,'Status'] = 'EXPIRED'
-        
+                
+        # PENDING ROUTINES
         dfpending = dfpending[~expiredidx]
         for i in dfpending.index:
             r = dfpending.loc[i]
@@ -182,57 +190,54 @@ class RoutineScheduler:
                     else:
                         if not str(sched.loc[ids[-1],'Status']) == 'COMPLETED':
                             run=False
-                if run:                    
-                    if (str(sched.loc[i,'Last Message'])=='nan') \
-                        & (np.isnan(sched.loc[i,'RunMsgTimestamp'])):
-                        if sched.loc[i,'Run']:
-                            sched.loc[i,'Status'] = 'PENDING'
+                if run: 
+                    if not sched.loc[i,'Realtime']:
+                        if (str(sched.loc[i,'Last Message'])=='nan') \
+                            & (np.isnan(sched.loc[i,'RunMsgTimestamp'])):
+                            if sched.loc[i,'Run']:
+                                sched.loc[i,'Status'] = 'PENDING'
+                            else:
+                                sched.loc[i,'Status'] = 'PENDING EXTERNAL'
                         else:
-                            sched.loc[i,'Status'] = 'PENDING EXTERNAL'
-                    else:
-                        if sched.loc[i,'Realtime']:
-                            if sched.loc[i,'LstMsgAge']<=35:
+                            if sched.loc[i,'LstMsgAge']<=300:
                                 if (sched.loc[i,'Run']):
                                     sched.loc[i,'Status'] = 'RUNNING'
                                 else:
                                     sched.loc[i,'Status'] = 'RUNNING EXTERNAL'
                             else:
                                 if (sched.loc[i,'Run']):
-                                    sched.loc[i,'Status'] = 'RESTART'
+                                    sched.loc[i,'Status'] = 'DELAYED'
                                 else:
-                                    sched.loc[i,'Status'] = 'RESTART EXTERNAL'
+                                    sched.loc[i,'Status'] = 'DELAYED EXTERNAL'
+                    else: # is realtime
+                        if (str(sched.loc[i,'Last Message'])=='nan') \
+                            & (np.isnan(sched.loc[i,'RunMsgTimestamp'])):
+                            if sched.loc[i,'Run']:
+                                sched.loc[i,'Status'] = 'PENDING'
+                            else:
+                                sched.loc[i,'Status'] = 'PENDING EXTERNAL'
                         else:
-                            if sched.loc[i,'LstMsgAge']<=300:
+                            if sched.loc[i,'LstMsgAge']<=45:
                                 if (sched.loc[i,'Run']):
                                     sched.loc[i,'Status'] = 'RUNNING'
                                 else:
                                     sched.loc[i,'Status'] = 'RUNNING EXTERNAL'
                             else:
                                 if (sched.loc[i,'Run']):
-                                    sched.loc[i,'Status'] = 'DELAYED'
+                                    sched.loc[i,'Status'] = 'RESTART'
                                 else:
-                                    sched.loc[i,'Status'] = 'DELAYED EXTERNAL'
-                
+                                    sched.loc[i,'Status'] = 'RESTART EXTERNAL'
+
+            
             else: # has no dependency
-                if (str(sched.loc[i,'Last Message'])=='nan') \
-                    & (np.isnan(sched.loc[i,'RunMsgTimestamp'])):
-                        if sched.loc[i,'Run']:
-                            sched.loc[i,'Status'] = 'PENDING'
-                        else:
-                            sched.loc[i,'Status'] = 'PENDING EXTERNAL'
-                else:
-                    if sched.loc[i,'Realtime']:
-                        if sched.loc[i,'LstMsgAge']<=35:
-                            if (sched.loc[i,'Run']):
-                                sched.loc[i,'Status'] = 'RUNNING'
-                            else:
-                                sched.loc[i,'Status'] = 'RUNNING EXTERNAL'
-                        else:
-                            if (sched.loc[i,'Run']):
-                                sched.loc[i,'Status'] = 'RESTART'
+                if not sched.loc[i,'Realtime']:
+                    if (str(sched.loc[i,'Last Message'])=='nan') \
+                        & (np.isnan(sched.loc[i,'RunMsgTimestamp'])):
+                            if sched.loc[i,'Run']:
+                                sched.loc[i,'Status'] = 'PENDING'
                             else:
-                                sched.loc[i,'Status'] = 'RESTART EXTERNAL'
-                    else:
+                                sched.loc[i,'Status'] = 'PENDING EXTERNAL'
+                    else:                        
                         if sched.loc[i,'LstMsgAge']<=300:
                             if (sched.loc[i,'Run']):
                                 sched.loc[i,'Status'] = 'RUNNING'
@@ -242,12 +247,30 @@ class RoutineScheduler:
                             if (sched.loc[i,'Run']):
                                 sched.loc[i,'Status'] = 'DELAYED'
                             else:
-                                sched.loc[i,'Status'] = 'DELAYED EXTERNAL'      
-        
+                                sched.loc[i,'Status'] = 'DELAYED EXTERNAL'   
+                else: # is realtime
+                        if (str(sched.loc[i,'Last Message'])=='nan') \
+                            & (np.isnan(sched.loc[i,'RunMsgTimestamp'])):
+                            if sched.loc[i,'Run']:
+                                sched.loc[i,'Status'] = 'PENDING'
+                            else:
+                                sched.loc[i,'Status'] = 'PENDING EXTERNAL'
+                        else:
+                            if sched.loc[i,'LstMsgAge']<=45:
+                                if (sched.loc[i,'Run']):
+                                    sched.loc[i,'Status'] = 'RUNNING'
+                                else:
+                                    sched.loc[i,'Status'] = 'RUNNING EXTERNAL'
+                            else:
+                                if (sched.loc[i,'Run']):
+                                    sched.loc[i,'Status'] = 'RESTART'
+                                else:
+                                    sched.loc[i,'Status'] = 'RESTART EXTERNAL'
+    
         self.schedule=sched
 
         if not self.schedule.equals(self.lastschedule):
-            self.schedule = self.lastschedule
+            self.lastschedule = self.schedule.copy()
             self.save()
         return sched
 
@@ -297,7 +320,7 @@ class RoutineScheduler:
         
         self.schedule = sched
         if newcommand:
-            self.schedule = self.lastschedule
+            self.lastschedule = self.schedule.copy()
             self.save()
 
         return sched

{shareddata-3.3.9 → shareddata-3.3.12/src/shareddata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shareddata
-Version: 3.3.9
+Version: 3.3.12
 Summary: Shared Memory Database with S3 repository
 Home-page: https://github.com/jcarlitooliveira/SharedData
 Author: Jose Carlito de Oliveira Filho