add .env file, simplify graph initialization

Author: swilly22

.env

@@ -0,0 +1,3 @@
+FALKORDB_HOST=localhost
+FALKORDB_PORT=6379
+

code_graph/analyzers/source_analyzer.py

@@ -20,12 +20,6 @@
              '.py': PythonAnalyzer()}
 
 class SourceAnalyzer():
-    def __init__(self) -> None:
-        self.host      = os.getenv('FALKORDB_HOST')
-        self.port      = os.getenv('FALKORDB_PORT')
-        self.username  = os.getenv('FALKORDB_USERNAME')
-        self.password  = os.getenv('FALKORDB_PASSWORD')
-
     def first_pass(self, ignore: List[str], executor: concurrent.futures.Executor) -> None:
         """
         Perform the first pass analysis on source files in the given directory tree.
@@ -167,8 +161,7 @@ def analyze_github_repository(
 
         try:
             # Initialize the graph and analyzer
-            self.graph = Graph(repo_name, self.host, self.port, self.username,
-                               self.password)
+            self.graph = Graph(repo_name)
 
             # Analyze repository
             self.analyze_sources(ignore)
@@ -195,8 +188,7 @@ def analyze_local_folder(self, path: str, ignore: Optional[List[str]] = []) -> G
         logger.debug(f'proj_name: {proj_name}')
 
         # Initialize the graph and analyzer
-        self.graph = Graph(proj_name, self.host, self.port, self.username,
-                           self.password)
+        self.graph = Graph(proj_name)
 
         # Analyze source files
         self.analyze_sources(ignore)

code_graph/git_utils/git_graph.py

@@ -1,3 +1,4 @@
+import os
 from falkordb import FalkorDB, Node
 from typing import List, Optional
 
@@ -9,11 +10,13 @@ class GitGraph():
     from the current commit to parent / child
     """
 
-    def __init__(self, name: str, host: str = 'localhost', port: int = 6379,
-                 username: Optional[str] = None, password: Optional[str] = None):
+    def __init__(self, name: str):
+
+        self.db = FalkorDB(host=os.getenv('FALKORDB_HOST'),
+                           port=os.getenv('FALKORDB_PORT'),
+                           username=os.getenv('FALKORDB_USERNAME'),
+                           password=os.getenv('FALKORDB_PASSWORD'))
 
-        self.db = FalkorDB(host=host, port=port, username=username,
-                           password=password)
         self.g = self.db.select_graph(name)
 
         # create indicies

code_graph/git_utils/git_utils.py

@@ -20,93 +20,6 @@
 def GitRepoName(repo_name):
     return "{" + repo_name + "}_git"
 
-# setup replication to the master
-def setup_replication():
-    global replica_process
-
-    # start replica server
-    command = [
-        "redis-server",
-        "--port", "6380",
-        "--replicaof", "localhost", "6379",
-        "--loadmodule", "/Users/roilipman/Dev/FalkorDB/bin/macos-arm64v8-release/src/falkordb.so"
-    ]
-    replica_process = subprocess.Popen(command)
-
-# closes redis replica
-def teardown_replica():
-    print("closing replica")
-
-    # Gracefully terminate the process
-    replica_process.terminate()
-
-    # Wait for the process to exit
-    replica_process.wait()
-
-    print("replica terminated.")
-
-# runs on a dedicated thread, capture GRAPH.EFFECT commands
-def _monitor_effects(graph_name):
-    # Connect to Redis server
-    r = redis.Redis(host='localhost', port=6380)
-
-    # Start monitoring the Redis server
-    with r.monitor() as m:
-        print("MONITOR ACTIVATED!")
-        # Print commands as they are executed on the Redis server
-        for command in m.listen():
-            print("listening for monitor commands")
-            # check for exit signal
-            if monitor_exit_event.is_set():
-                print("exit signal recived")
-                break
-
-            cmd = command['command']
-            print(f"cmd: {cmd}")
-            if "GRAPH.EFFECT" in cmd and graph_name in cmd:
-                # "GRAPH.EFFECT" "FalkorDB" "\x01\x05\x00\x00\x00\x90\x14\x00\x00\x00\x00\x00\x00"
-                print(f"Detected effect: {cmd}")
-
-                # save effect
-
-                #{'time': 1728840094.85141, 'db': 0, 'client_address': '[::1]', 'client_port': '6379', 'client_type': 'tcp'
-                #, 'command': 'set x 7'}
-
-# monitor graph.effect commands
-def start_monitor_effects(graph_name):
-    print(f"graph_name: {graph_name}")
-    r = redis.Redis(host='localhost', port=6380, decode_responses=True)
-
-    # wait for replica to become responsive
-    connected = False
-    while not connected:
-        # wait one sec
-        time.sleep(1)
-        try:
-            role = r.role()
-            connected = (role[0] == 'slave' and role[1] == 'localhost' and role[2] == 6379 and role[3] == 'connected')
-        except Exception:
-            pass
-
-    print("starting monitor thread")
-
-    monitor_thread = threading.Thread(target=_monitor_effects, args=(graph_name,))
-    monitor_thread.start()
-
-    print("monitor thread started")
-
-# stop monitoring graph.effect commands
-def stop_monitor_effects():
-    print("signaling monitor thread to exit")
-
-    # Signal the thread to exit
-    monitor_exit_event.set()
-
-    # Wait for the thread to finish
-    monitor_thread.join()
-
-    print("monitor thread exited")
-
 # build a graph capturing the git commit history
 def build_commit_graph(path: str, repo_name: str, ignore_list: Optional[List[str]] = []) -> GitGraph:
     repo = Repo(path)

code_graph/graph.py

@@ -1,20 +1,18 @@
+import os
 import time
 from .entities import *
 from typing import Dict, List, Optional
 from falkordb import FalkorDB, Path, Node, QueryResult
 
-FALKORDB_HOST     = "localhost"
-FALKORDB_PORT     = 6379
-FALKORDB_USERNAME = None
-FALKORDB_PASSWORD = None
-
 def list_repos() -> List[str]:
     """
         List processed repositories
     """
 
-    db = FalkorDB(host=FALKORDB_HOST, port=FALKORDB_PORT,
-                  username=FALKORDB_USERNAME, password=FALKORDB_PASSWORD)
+    db = FalkorDB(host=os.getenv('FALKORDB_HOST'),
+                  port=os.getenv('FALKORDB_PORT'),
+                  username=os.getenv('FALKORDB_USERNAME'),
+                  password=os.getenv('FALKORDB_PASSWORD'))
 
     graphs = db.list_graphs()
     graphs = [g for g in graphs if not g.endswith('_git')]
@@ -25,17 +23,13 @@ class Graph():
     Represents a connection to a graph database using FalkorDB.
     """
 
-    def __init__(self, name: str, host: str = 'localhost', port: int = 6379,
-                 username: Optional[str] = None, password: Optional[str] = None) -> None:
-        self.db = FalkorDB(host=host, port=port, username=username,
-                           password=password)
-
-        self.host = host
-        self.port = port
-        self.username = username
-        self.password = password
-
-        self.g = self.db.select_graph(name)
+    def __init__(self, name: str) -> None:
+        self.name = name
+        self.db   = FalkorDB(host=os.getenv('FALKORDB_HOST'),
+                             port=os.getenv('FALKORDB_PORT'),
+                             username=os.getenv('FALKORDB_USERNAME'),
+                             password=os.getenv('FALKORDB_PASSWORD'))
+        self.g    = self.db.select_graph(name)
 
         # create indicies
 
@@ -76,7 +70,7 @@ def clone(self, clone: str) -> "Graph":
             # TODO: add a waiting limit
             time.sleep(1)
 
-        return Graph(clone, self.host, self.port, self.username, self.password)
+        return Graph(clone)
 
 
     def delete(self) -> None:

main.py

@@ -12,11 +12,6 @@
 load_dotenv()
 
 # Access environment variables
-FALKORDB_HOST = os.getenv('FALKORDB_HOST')
-FALKORDB_PORT = os.getenv('FALKORDB_PORT')
-FALKORDB_USERNAME = os.getenv('FALKORDB_USERNAME')
-FALKORDB_PASSWORD = os.getenv('FALKORDB_PASSWORD')
-
 app = Flask(__name__, static_folder='static')
 
 # Configure the logger
@@ -57,8 +52,7 @@ def graph_entities():
 
     try:
         # Initialize the graph with the provided repo and credentials
-        g = Graph(repo, host=FALKORDB_HOST, port=FALKORDB_PORT,
-                  username=FALKORDB_USERNAME, password=FALKORDB_PASSWORD)
+        g = Graph(repo)
 
         # Retrieve a sub-graph of up to 100 entities
         sub_graph = g.get_sub_graph(100)
@@ -96,8 +90,7 @@ def get_neighbors():
 
     try:
         # Initialize the graph with the provided repo and credentials
-        g = Graph(repo, host=FALKORDB_HOST, port=FALKORDB_PORT,
-                  username=FALKORDB_USERNAME, password=FALKORDB_PASSWORD)
+        g = Graph(repo)
 
         # Get neighbors of the given node
         neighbors = g.get_neighbors(node_id)
@@ -324,8 +317,7 @@ def process_list_commits():
         return jsonify({'status': f'Missing mandatory parameter "repo"'}), 400
 
     # Get JSON data from the request
-    git_graph = GitGraph(GitRepoName(repo), host=FALKORDB_HOST, port=FALKORDB_PORT,
-                 username=FALKORDB_USERNAME, password=FALKORDB_PASSWORD)
+    git_graph = GitGraph(GitRepoName(repo))
 
     commits = git_graph.list_commits()
 
@@ -339,35 +331,47 @@ def process_list_commits():
 
 @app.route('/find_paths', methods=['POST'])
 def find_paths():
+    """
+    Finds all paths between a source node (src) and a destination node (dest) in the graph.
+    The graph is associated with the repository (repo) provided in the request.
+
+    Request Body (JSON):
+        - repo (str): Name of the repository.
+        - src (int): ID of the source node.
+        - dest (int): ID of the destination node.
+
+    Returns:
+        A JSON response with:
+        - status (str): Status of the request ("success" or "error").
+        - paths (list): List of paths between the source and destination nodes.
+    """
+
     # Get JSON data from the request
     data = request.get_json()
 
-    # name of repository
+    # Validate 'repo' parameter
     repo = data.get('repo')
     if repo is None:
         return jsonify({'status': f'Missing mandatory parameter "repo"'}), 400
 
-    # source ID
+    # Validate 'src' parameter
     src = data.get('src')
     if src is None:
         return jsonify({'status': f'Missing mandatory parameter "src"'}), 400
 
-    # dest ID
+    # Validate 'dest' parameter
     dest = data.get('dest')
     if dest is None:
         return jsonify({'status': f'Missing mandatory parameter "dest"'}), 400
 
-    # Get JSON data from the request
-    g = Graph(repo, host=FALKORDB_HOST, port=FALKORDB_PORT,
-                 username=FALKORDB_USERNAME, password=FALKORDB_PASSWORD)
+    # Initialize graph with provided repo and credentials
+    g = Graph(repo)
 
+    # Find paths between the source and destination nodes
     paths = g.find_paths(src, dest)
 
-    # Create a response
-    response = {
-        'status': 'success',
-        'paths': paths
-    }
+    # Create and return a successful response
+    response = { 'status': 'success', 'paths': paths }
 
     return jsonify(response), 200