Skip to content

Commit

Permalink
making a couple env vars optional, adding name res endpoint as an env…
Browse files Browse the repository at this point in the history
… var
  • Loading branch information
EvanDietzMorris committed Mar 26, 2024
1 parent cde0bce commit 3ee028a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Common/build_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def get_graph_dir_path(self, graph_id: str, graph_version: str):
return os.path.join(self.graphs_dir, graph_id, graph_version)

def get_graph_output_URL(self, graph_id: str, graph_version: str):
graph_output_url = os.environ['ORION_OUTPUT_URL']
graph_output_url = os.environ.get('DATA_SERVICES_OUTPUT_URL', "https://localhost/")
if graph_output_url[-1] != '/':
graph_output_url += '/'
return f'{graph_output_url}{graph_id}/{graph_version}/'
Expand Down
2 changes: 1 addition & 1 deletion Common/neo4j_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self,
self.http_port = http_port
self.https_port = https_port
self.bolt_port = bolt_port
self.password = password if password else os.environ['ORION_NEO4J_PASSWORD']
self.password = password if password else os.environ.get('ORION_NEO4J_PASSWORD', 'orion-password')
self.graph_db_uri = f'bolt://{neo4j_host}:{bolt_port}'
self.graph_db_auth = ("neo4j", self.password)
self.neo4j_driver = neo4j.GraphDatabase.driver(self.graph_db_uri, auth=self.graph_db_auth)
Expand Down
8 changes: 3 additions & 5 deletions set_up_test_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@ export ORION_GRAPH_SPEC=testing-graph-spec.yml
#ORION_GRAPH_SPEC_URL - a URL pointing to a Graph Spec file
#export ORION_GRAPH_SPEC_URL=https://raw.githubusercontent.com/RENCI-AUTOMAT/ORION/helm_deploy/graph_specs/yeast-graph-spec.yml

export ORION_NEO4J_PASSWORD=insecurepasswordexample
export PYTHONPATH="$PYTHONPATH:$PWD"

export ORION_OUTPUT_URL=https://localhost/

#The following environment variables are optional
export EDGE_NORMALIZATION_ENDPOINT=https://bl-lookup-sri.renci.org/
export NODE_NORMALIZATION_ENDPOINT=https://nodenormalization-sri.renci.org/

export NAME_RESOLVER_ENDPOINT=https://name-resolution-sri.renci.org/
export ORION_OUTPUT_URL=https://localhost/ # this is currently only used to generate metadata
export BL_VERSION=4.1.6

export PYTHONPATH="$PYTHONPATH:$PWD"

0 comments on commit 3ee028a

Please sign in to comment.