[rest] Adding SKEMA_GRAPH_DB_HOST and SKEMA_GRAPH_DB_PORT environment…

… variables (#650) ## Adding environmental variables Adds the `SKEMA_GRAPH_DB_HOST` and `SKEMA_GRAPH_DB_PORT` environmental variables to skema/rest. Updates the execution engine to use these values to connect to Memgraph. See the corresponding PR to set these values in the ASKEM-TA1-DockerVM repo: ml4ai/ASKEM-TA1-DockerVM#44 --------- Co-authored-by: Justin <[email protected]> Co-authored-by: Gus Hahn-Powell <[email protected]>
ml4ai · Nov 15, 2023 · d5aecfd · d5aecfd
1 parent 12cb0ca
commit d5aecfd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/skema/gromet/execution_engine/server.py b/skema/gromet/execution_engine/server.py
@@ -5,9 +5,10 @@
 from fastapi import APIRouter, FastAPI
 from pydantic import BaseModel, Field
 
+from skema.rest.proxies import SKEMA_GRAPH_DB_HOST, SKEMA_GRAPH_DB_PORT
 from skema.gromet.execution_engine.execution_engine import ExecutionEngine
-HOST = "localhost"
-PORT = 7687
+HOST = SKEMA_GRAPH_DB_HOST
+PORT = int(SKEMA_GRAPH_DB_PORT)
 
 router = APIRouter()
 

diff --git a/skema/gromet/execution_engine/tests/test_execution.py b/skema/gromet/execution_engine/tests/test_execution.py
@@ -3,11 +3,11 @@
 from pathlib import Path
 from tempfile import TemporaryDirectory, TemporaryFile
 
+from skema.rest.proxies import SKEMA_GRAPH_DB_HOST, SKEMA_GRAPH_DB_PORT
 from skema.gromet.execution_engine.execution_engine import ExecutionEngine
 
-MEMGRAPH_CI_HOST = "localhost"
-MEMGRAPH_CI_PORT = 7687
-
+MEMGRAPH_CI_HOST = SKEMA_GRAPH_DB_HOST
+MEMGRAPH_CI_PORT = int(SKEMA_GRAPH_DB_PORT)
 
 @pytest.mark.ci_only
 def test_parameter_extraction():

diff --git a/skema/rest/proxies.py b/skema/rest/proxies.py
@@ -6,6 +6,8 @@
 import os
 
 # MORAE etc
+SKEMA_GRAPH_DB_HOST = os.environ.get("SKEMA_GRAPH_DB_HOST", "127.0.0.1")
+SKEMA_GRAPH_DB_PORT = os.environ.get("SKEMA_GRAPH_DB_PORT", "7687")
 SKEMA_RS_ADDESS = os.environ.get("SKEMA_RS_ADDRESS", "https://skema-rs.askem.lum.ai")
 SKEMA_OPENAI_KEY = os.environ.get("SKEMA_OPENAI_KEY", "YOU_FORGOT_TO_SET_SKEMA_OPENAI_KEY")