shareddata 3.86.0__tar.gz → 4.0.0__tar.gz

{shareddata-3.86.0/src/shareddata.egg-info → shareddata-4.0.0}/PKG-INFO

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

{shareddata-3.86.0 → shareddata-4.0.0}/setup.cfg

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

{shareddata-3.86.0 → shareddata-4.0.0}/src/SharedData/AWSKinesis.py

@@ -22,23 +22,39 @@ class KinesisLogStreamHandler(logging.StreamHandler):
         logging.StreamHandler.__init__(self)
 
         self.user = user
-        self.datastream = None
         self.stream_buffer = []
+        self.client = None
+        self.stream_name = os.environ['LOG_STREAMNAME']
 
-        try:
-            session = boto3.Session(
-                profile_name=os.environ['KINESIS_AWS_PROFILE'])
-            if 'KINESIS_ENDPOINT_URL' in os.environ:
-                self.datastream = session.client('kinesis',
-                                                 endpoint_url=os.environ['KINESIS_ENDPOINT_URL'])
-            else:
-                self.datastream = session.client('kinesis')
-        except Exception:
-            print('Kinesis client initialization failed.')
+        if not self.get_client():
+            raise Exception('Logging failed check aws credentials!')
+
+        self.create_stream()
+        
+
+    def get_client(self):
+        success = False
+        trials = 3
+        while trials>0:
+            trials-=1
+            try:
+                session = boto3.Session(
+                    profile_name=os.environ['KINESIS_AWS_PROFILE'])
+                if 'KINESIS_ENDPOINT_URL' in os.environ:
+                    self.client = session.client('kinesis',
+                        endpoint_url=os.environ['KINESIS_ENDPOINT_URL'])
+                else:
+                    self.client = session.client('kinesis')
+                success = True
+            except Exception:
+                time.sleep(1)
+                pass
+        return success
+
+    def create_stream(self):
 
-        self.stream_name = os.environ['LOG_STREAMNAME']
         try:
-            self.datastream.create_stream(
+            self.client.create_stream(
                 StreamName=self.stream_name,
                 ShardCount=1,
                 StreamModeDetails={
@@ -49,6 +65,7 @@ class KinesisLogStreamHandler(logging.StreamHandler):
         except Exception as e:
             pass
 
+
     def emit(self, record):
         try:
             # msg = self.format(record)
@@ -67,7 +84,7 @@ class KinesisLogStreamHandler(logging.StreamHandler):
                 # 'file_name': record.filename,
             }
             msg = json.dumps(msg)
-            if self.datastream:
+            if self.client:
                 self.stream_buffer.append({
                     'Data': str(msg).encode(encoding="UTF-8", errors="strict"),
                     'PartitionKey': user,
@@ -84,8 +101,8 @@ class KinesisLogStreamHandler(logging.StreamHandler):
     def flush(self):
         self.acquire()
         try:
-            if self.datastream and self.stream_buffer:
-                self.datastream.put_records(
+            if self.client and self.stream_buffer:
+                self.client.put_records(
                     StreamName=self.stream_name,
                     Records=self.stream_buffer
                 )
@@ -95,7 +112,10 @@ class KinesisLogStreamHandler(logging.StreamHandler):
             print("An error occurred during flush operation.")
             print(f"Exception: {e}")
             print(f"Stream buffer: {self.stream_buffer}")
-            raise Exception('Logging failed check aws credentials!')
+
+            if not self.get_client():
+                raise Exception('Logging failed check aws credentials!')
+            
         finally:
             if self.stream and hasattr(self.stream, "flush"):
                 self.stream.flush()
@@ -292,21 +312,21 @@ class KinesisLogStreamConsumer():
 class KinesisStreamProducer():
     def __init__(self, stream_name):
         self.stream_name = stream_name
-        self.datastream = None
+        self.client = None
         self.stream_buffer = []
         try:
             session = boto3.Session(
                 profile_name=os.environ['KINESIS_AWS_PROFILE'])
             if 'KINESIS_ENDPOINT_URL' in os.environ:
-                self.datastream = session.client('kinesis',
+                self.client = session.client('kinesis',
                                                  endpoint_url=os.environ['KINESIS_ENDPOINT_URL'])
             else:
-                self.datastream = session.client('kinesis')
+                self.client = session.client('kinesis')
         except Exception:
             print('Kinesis client initialization failed.')
 
         try:
-            self.datastream.create_stream(
+            self.client.create_stream(
                 StreamName=stream_name,
                 ShardCount=1,
                 StreamModeDetails={
@@ -323,7 +343,7 @@ class KinesisStreamProducer():
             'Data': str(_rec).encode(encoding="UTF-8", errors="strict"),
             'PartitionKey': partitionkey,
         })
-        self.datastream.put_records(
+        self.client.put_records(
             StreamName=self.stream_name,
             Records=self.stream_buffer
         )

{shareddata-3.86.0 → shareddata-4.0.0}/src/SharedData/Routines/Schedule.py

@@ -15,7 +15,7 @@ from datetime import datetime
 from tzlocal import get_localzone
 local_tz = pytz.timezone(str(get_localzone()))
 
-
+#TODO: ADD STOPED STATE TO REALTIME ROUTINES
 class Schedule:
 
     def __init__(self, schedule_name):

{shareddata-3.86.0 → shareddata-4.0.0}/src/SharedData/Routines/WorkerLib.py

@@ -530,20 +530,20 @@ def process_command(command):
         kill_routine(command)
 
     elif command['job'] == 'restart':
-        kill_routine(command)
+        if kill_routine(command):
 
-        start_time = time.time()
-        routine = {
-            'command': command,
-            'thread': None,
-            'process': None,
-            'start_time': start_time,
-        }
-        thread = Thread(target=run_routine,
-                        args=(command, routine))
-        routine['thread'] = thread
-        routines.append(routine)
-        thread.start()
+            start_time = time.time()
+            routine = {
+                'command': command,
+                'thread': None,
+                'process': None,
+                'start_time': start_time,
+            }
+            thread = Thread(target=run_routine,
+                            args=(command, routine))
+            routine['thread'] = thread
+            routines.append(routine)
+            thread.start()
 
     elif command['job'] == 'status':
 

{shareddata-3.86.0 → shareddata-4.0.0}/src/SharedData/TimeseriesContainer.py

@@ -381,7 +381,7 @@ class TimeseriesContainer:
             io_obj.write(np.ascontiguousarray(df.values.astype(np.float64)))
 
         m = hashlib.md5(io_obj.getvalue()).digest()
-        io_obj.write(np.array([0]).astype(int))
+        io_obj.write(np.array([0]).astype(np.int64))
         io_obj.write(m)
         return io_obj
 

{shareddata-3.86.0 → shareddata-4.0.0/src/shareddata.egg-info}/PKG-INFO

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