Pre-commit

Author: Joaopeuko

mqpy/indicator_connector.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+import ast
 import json
 import logging
 import socket
@@ -173,15 +174,17 @@ def accumulation_distribution(
             result = data.decode("utf-8")
             try:
                 return json.loads(result)
-
             except ValueError:
                 logger.exception("Connection lost to MQL5 Service")
-
         except ConnectionResetError:
-            pass
-
+            logger.exception("Connection reset by MQL5 Service")
         except ConnectionAbortedError:
-            pass
+            logger.exception("Connection aborted by MQL5 Service")
+        finally:
+            if "client_socket" in locals():
+                client_socket.close()
+
+        return None
 
     # -------------------------------------------------------------------- #
 
@@ -236,15 +239,17 @@ def adaptive_moving_average(
             result = data.decode("utf-8")
             try:
                 return json.loads(result)
-
             except ValueError:
                 logger.exception("Connection lost to MQL5 Service")
-
         except ConnectionResetError:
-            pass
-
+            logger.exception("Connection reset by MQL5 Service")
         except ConnectionAbortedError:
-            pass
+            logger.exception("Connection aborted by MQL5 Service")
+        finally:
+            if "client_socket" in locals():
+                client_socket.close()
+
+        return None
 
     # -------------------------------------------------------------------- #
 
@@ -307,15 +312,17 @@ def alligator(
             result = data.decode("utf-8")
             try:
                 return json.loads(result)
-
             except ValueError:
                 logger.exception("Connection lost to MQL5 Service")
-
         except ConnectionResetError:
-            pass
-
+            logger.exception("Connection reset by MQL5 Service")
         except ConnectionAbortedError:
-            pass
+            logger.exception("Connection aborted by MQL5 Service")
+        finally:
+            if "client_socket" in locals():
+                client_socket.close()
+
+        return None
 
     # -------------------------------------------------------------------- #
 
@@ -347,15 +354,17 @@ def average_directional_index(
             result = data.decode("utf-8")
             try:
                 return json.loads(result)
-
             except ValueError:
                 logger.exception("Connection lost to MQL5 Service")
-
         except ConnectionResetError:
-            pass
-
+            logger.exception("Connection reset by MQL5 Service")
         except ConnectionAbortedError:
-            pass
+            logger.exception("Connection aborted by MQL5 Service")
+        finally:
+            if "client_socket" in locals():
+                client_socket.close()
+
+        return None
 
     # -------------------------------------------------------------------- #
 
@@ -389,15 +398,17 @@ def average_directional_index_wilder(
             result = data.decode("utf-8")
             try:
                 return json.loads(result)
-
             except ValueError:
                 logger.exception("Connection lost to MQL5 Service")
-
         except ConnectionResetError:
-            pass
-
+            logger.exception("Connection reset by MQL5 Service")
         except ConnectionAbortedError:
-            pass
+            logger.exception("Connection aborted by MQL5 Service")
+        finally:
+            if "client_socket" in locals():
+                client_socket.close()
+
+        return None
 
     # -------------------------------------------------------------------- #
 
@@ -429,15 +440,17 @@ def average_true_range(
             result = data.decode("utf-8")
             try:
                 return json.loads(result)
-
             except ValueError:
                 logger.exception("Connection lost to MQL5 Service")
-
         except ConnectionResetError:
-            pass
-
+            logger.exception("Connection reset by MQL5 Service")
         except ConnectionAbortedError:
-            pass
+            logger.exception("Connection aborted by MQL5 Service")
+        finally:
+            if "client_socket" in locals():
+                client_socket.close()
+
+        return None
 
     # -------------------------------------------------------------------- #
 
@@ -1879,7 +1892,7 @@ def triple_exponential_ma_oscillator(
                 data = f"TEMA_OSC,{symbol},{time_frame},{start_position},{count},{ma_period},{applied_price}"
                 client_socket.send(data.encode())
                 response = client_socket.recv(1024).decode()
-                return eval(response)
+                return ast.literal_eval(response)
             except ValueError:
                 logger.exception("Connection lost to MQL5 Service")
         except ConnectionResetError: