Refactor code

Author: g-despot

cache_handler/cache_handler.py

@@ -4,12 +4,15 @@
 import redis
 import logging
 import data_translator
+from time import sleep
 from typing import Dict, Any
-from database import Memgraph
+from gqlalchemy import Memgraph
 
 
 DB_FETCH_TIME = float(os.getenv('DB_FETCH_TIME', '0.5'))
-REDIS_HOST = os.getenv('REDIS_HOST', '172.18.0.2')
+MEMGRAPH_IP = os.getenv('MEMGRAPH_IP', 'memgraph')
+MEMGRAPH_PORT = os.getenv('MEMGRAPH_PORT', '7687')
+REDIS_HOST = os.getenv('REDIS_HOST', 'redis')
 REDIS_PORT = int(os.getenv('REDIS_PORT', '6379'))
 
 logging.basicConfig(format='%(asctime)-15s [%(levelname)s]: %(message)s')
@@ -21,9 +24,21 @@
 
 r = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT,
                       charset="utf-8", decode_responses=True)
-db = Memgraph()
+
+def connect_to_memgraph(memgraph_ip, memgraph_port):
+    memgraph = Memgraph(host=memgraph_ip, port=int(memgraph_port))
+    while(True):
+        try:
+            if (memgraph._get_cached_connection().is_active()):
+                return memgraph
+        except:
+            logger.info("Memgraph probably isn't running.")
+            sleep(1)
+
+db = connect_to_memgraph(MEMGRAPH_IP, MEMGRAPH_PORT)
 results = {}
 
+            
 while(True):
     start_time = time.time()
 

cache_handler/data_translator.py

@@ -4,7 +4,7 @@
 from typing import Any, Dict, Iterator
 
 
-logger = logging.getLogger('cache')
+logger = logging.getLogger("cache")
 
 
 def json_relationships_satellites(relationships: Iterator[Dict[str, Any]]) -> "JSON":
@@ -14,22 +14,26 @@ def json_relationships_satellites(relationships: Iterator[Dict[str, Any]]) -> "J
     json_satellites = {}
     sat_ids = set()
     for rel in relationships:
-        r = rel['r']
-        s1 = rel['s1']
-        s2 = rel['s2']
-
-        json_relationships.append([s1.properties['x'], s1.properties['y'],
-                                   s2.properties['x'], s2.properties['y'], r.properties['transmission_time']])
-
-        if(not s1.properties['id'] in sat_ids):
-            json_satellites[s1.properties['id']] = [
-                s1.properties['x'], s1.properties['y']]
-            sat_ids.add(s1.properties['id'])
-        if(not s2.properties['id'] in sat_ids):
-            json_satellites[s2.properties['id']] = [
-                s2.properties['x'], s2.properties['y']]
-            sat_ids.add(s2.properties['id'])
+        r = rel["r"]
+        s1 = rel["s1"]
+        s2 = rel["s2"]
+        print(rel)
+        json_relationships.append([s1.x, s1.y, s2.x, s2.y, r.transmission_time])
+
+        if not s1.id in sat_ids:
+            json_satellites[s1.id] = [
+                s1.x,
+                s1.y,
+            ]
+            sat_ids.add(s1.id)
+        if not s2.id in sat_ids:
+            json_satellites[s2.id] = [
+                s2.x,
+                s2.y,
+            ]
+            sat_ids.add(s2.id)
 
     logger.info(
-        f'Relationship and Satellite JSON created in {time.time() - start_time} seconds.')
+        f"Relationship and Satellite JSON created in {time.time() - start_time} seconds."
+    )
     return json.dumps(json_relationships), json.dumps(json_satellites)