struct2graph patch to resolve hardcoded url (#1705)

* patch additions

Signed-off-by: siddhivelankar23 <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: siddhivelankar23 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: xiguiw <[email protected]>

Author: 3 people

comps/struct2graph/deployment/docker_compose/struct2graph-compose.yaml

@@ -12,14 +12,18 @@ services:
       - no_proxy=${no_proxy}
       - https_proxy=${https_proxy}
       - http_proxy=${http_proxy}
-      - NEO4J_URL=${NEO4J_URL}
+      - NEO4J_URL=bolt://neo4j-apoc:7687
+      - NEO4J_USERNAME=neo4j
+      - NEO4J_PASSWORD=neo4j_password
+      - NEO4J_URI=bolt://neo4j-apoc:7687
       - NEO4J_server_directories_import=import
       - NEO4J_PLUGINS=["apoc"]
       - NEO4J_dbms_security_allow__csv__import__from__file__urls=true
       - NEO4J_server_directories_import='/var/lib/neo4j/import'
       - NEO4J_dbms_security_procedures_unrestricted=apoc.\\\* neo4j:5.23.0
+      - STRUCT2GRAPH_PORT=${STRUCT2GRAPH_PORT:-8090}
     ports:
-      - ${STRUCT2GRAPH_PORT:-8090}:8090
+      - "${STRUCT2GRAPH_PORT:-8090}:8090"
     depends_on:
       neo4j-apoc:
         condition: service_healthy
@@ -30,7 +34,6 @@ services:
       retries: 10
       start_period: 30s
     ipc: host
-    network_mode: host
     restart: always
 
 networks:

comps/struct2graph/src/environment_setup.sh

@@ -19,6 +19,13 @@ export DATA_DIRECTORY=${DATA_DIRECTORY:-data}
 export FILENAME=${FILENAME:-test1.csv}
 export LOAD_FORMAT=${LOAD_FORMAT:-"CSV"}
 
+export STRUCT2GRAPH_PORT=${STRUCT2GRAPH_PORT:-8090}
+export NEO4J_URL=bolt://neo4j-apoc:7687
+export NEO4J_URI=bolt://neo4j-apoc:7687
+export NEO4J_PORT1=7474
+export NEO4J_PORT2=7687
+export NEO4J_HEALTH_URL="http://localhost:7474"
+
 
 export CYPHER_CSV_CMD="LOAD CSV WITH HEADERS FROM 'file:////test1.csv' AS row \
 CREATE (:Person {ID: toInteger(row.ID), Name: row.Name, Age: toInteger(row.Age), City: row.City});"

comps/struct2graph/src/integrations/opea.py

@@ -61,7 +61,8 @@ async def check_health(self) -> bool:
         """
         try:
             logger.info("Performing health check...")
-            response = requests.get("http://localhost:7474", timeout=5)
+            neo4j_health_url = os.getenv("NEO4J_HEALTH_URL")
+            response = requests.get(neo4j_health_url, timeout=5)
             if response.status_code == 200:
                 return True
             else:

comps/struct2graph/src/opea_struct2graph_microservice.py

@@ -30,7 +30,7 @@
     name="opea_service@struct2graph",
     endpoint="/v1/struct2graph",
     host="0.0.0.0",
-    port=os.getenv("STRUCT2GRAPH_PORT"),
+    port=int(os.getenv("STRUCT2GRAPH_PORT", "8090")),
 )
 async def execute_agent(input: Input):
     """Execute triplet extraction from text file.

comps/struct2graph/src/requirements.txt

@@ -6,6 +6,7 @@ langchain-community
 langchain-neo4j
 neo4j 
 numpy
+openai
 opentelemetry-api
 opentelemetry-exporter-otlp
 opentelemetry-sdk

comps/third_parties/neo4j/deployment/docker_compose/compose.yaml

@@ -13,6 +13,7 @@ services:
         - ./data/neo4j/config:/config
         - ./data/neo4j/data:/data
         - ./data/neo4j/plugins:/plugins
+        - ./data:/var/lib/neo4j/import
     ipc: host
     environment:
       - no_proxy=${no_proxy}

tests/struct2graph/test_struct2graph_opea.sh

@@ -6,7 +6,7 @@ WORKPATH=$(git rev-parse --show-toplevel)
 echo $WORKPATH
 TAG='latest'
 LOG_PATH="$WORKPATH/comps/struct2graph/deployment/docker_compose"
-source $WORKPATH/comps/struct2graph/src/setup_service_env.sh
+source $WORKPATH/comps/struct2graph/src/environment_setup.sh
 STRUCT2GPAPH_PORT=8090
 ip_address=$(hostname -I | awk '{print $1}')
 service_name="struct2graph"