update nebulaGraph service and config docker yaml

Author: 云玖

.gitignore

@@ -16,4 +16,5 @@ build
 dist
 .ipynb_checkpoints
 zdatafront*
-*antgroup*
+*antgroup*
+*ipynb

Dockerfile

@@ -1,5 +1,4 @@
-From python:3.9.18-bookworm
-# FROM python:3.9-slim-bookworm
+FROM python:3.9-bookworm
 
 WORKDIR /home/user
 
@@ -16,7 +15,6 @@ COPY ./requirements.txt /home/user/docker_requirements.txt
 # RUN dpkg -i nebula-graph-3.6.0.ubuntu1804.amd64.deb
 
 RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
-RUN pip install fastapi uvicorn notebook
-# RUN pip install -r /home/user/docker_requirements.txt
+RUN pip install -r /home/user/docker_requirements.txt --retries 5 --timeout 120
 
 CMD ["bash"]

docker-compose.yaml

@@ -1,9 +1,8 @@
-version: '0.1'
-
+version: '3.4'
 services:
   metad0:
+    # image: docker.io/vesoft/nebula-metad:v3.8.0
     image: vesoft/nebula-metad:v3.8.0
-    container_name: metad0
     environment:
       USER: root
     command:
@@ -36,8 +35,8 @@ services:
       - SYS_PTRACE
 
   storaged0:
+    # image: docker.io/vesoft/nebula-storaged:v3.8.0
     image: vesoft/nebula-storaged:v3.8.0
-    container_name: storaged0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -73,8 +72,8 @@ services:
       - SYS_PTRACE
 
   graphd:
+    # image: docker.io/vesoft/nebula-graphd:v3.8.0
     image: vesoft/nebula-graphd:v3.8.0
-    container_name: graphd
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -109,7 +108,7 @@ services:
 
   redis-stack:
     image: redis/redis-stack:7.4.0-v0
-    container_name: redis
+    container_name: redis-stack
     ports:
       - "6379:6379"
       - "8001:8001"
@@ -118,7 +117,7 @@ services:
     networks:
       - ekg-net
     restart: always
-
+  
 
   ollama:
     image: ollama/ollama:0.3.6
@@ -129,8 +128,8 @@ services:
     ports:
       - 11434:11434
     volumes:
-      - //d/models/ollama:/root/.ollama # windows path
-      # - /User/models:/root/.ollama # linux/mac path
+      # - //d/models/ollama:/root/.ollama # windows path
+      - /Users/yunjiu/ant/models:/root/.ollama # linux/mac path
     networks:
       - ekg-net
     restart: on-failure
@@ -149,22 +148,26 @@ services:
       context: .
       dockerfile: Dockerfile
     container_name: ekgservice
-    image: muagent:test
+    image: muagent:0.1.0
+    # image: muagent:0.2.0
     environment:
       USER: root
       TZ:   "${TZ}"
     ports:
-      - 5050:3737
-      # - 8080:8888
+      # - 5050:3737
+      - 3737:3737
     volumes:
       - ./examples:/home/user/muagent/examples
       - ./muagent:/home/user/muagent/muagent
       - ./tests:/home/user/muagent/tests
     restart: on-failure
     networks:
       - ekg-net
-    # command: ["python", "/home/user/muagent/examples/ekg_examples/start.py"]  # 指定要执行的脚本
-    command: ["python", "/home/user/muagent/tests/httpapis/fastapi_test.py"]  # 指定要执行的脚本
+    command: ["python", "/home/user/muagent/examples/ekg_examples/start.py"]  # 指定要执行的脚本
+    # command: ["python", "/home/user/muagent/tests/httpapis/fastapi_test.py"]  # 指定要执行的脚本
+
 
 networks:
-  ekg-net:
+  ekg-net: 
+    # driver: bridge
+    external: true

examples/ekg_examples/ekg.yaml

@@ -8,16 +8,17 @@ geabase_config:
 
 # nebula config
 nebula_config:
-  host: 'localhost'
-  port: 7070
-  username: 'default'
-  password: 'default'
-  space_name: 'default'
+  host: 'graphd'
+  port: '9669'
+  username: 'root'
+  password: 'nebula'
+  space_name: 'client'
 
 # tbase config
 tbase_config:
-  host: 'localhost'
-  port: 321321
+  # host: 'localhost'
+  host: 'redis-stack'
+  port: '6379'
   username: 'default'
   password: ''
   definition_value: 'opsgptkg'

examples/ekg_examples/start.py

@@ -211,6 +211,17 @@ def embed_query(self, text: str) -> List[float]:
 #     extra_kwargs={}
 # )
 
+# 初始化 NebulaHandler 实例
+gb_config = GBConfig(
+    gb_type="NebulaHandler", 
+    extra_kwargs={
+        'host': config_data["nebula_config"]['host'],
+        'port': config_data["nebula_config"]['port'],
+        'username': config_data["nebula_config"]['username'] ,
+        'password': config_data["nebula_config"]['password'],
+        "space": config_data["nebula_config"]['space_name'],    
+    }
+)
 
 # 初始化 TbaseHandler 实例
 tb_config = TBConfig(
@@ -236,18 +247,19 @@ def embed_query(self, text: str) -> List[float]:
 
 
 embeddings = CustomEmbeddings()
-embed_config = EmbedConfig(
-    embed_model="default",
-    langchain_embeddings=embeddings
-)
+# embed_config = EmbedConfig(
+#     embed_model="default",
+#     langchain_embeddings=embeddings
+# )
+embed_config = None
 
 
-# ekg_construct_service = EKGConstructService(
-#     embed_config=embed_config,
-#     llm_config=llm_config,
-#     tb_config=tb_config,
-#     gb_config=gb_config,
-# )
+ekg_construct_service = EKGConstructService(
+    embed_config=embed_config,
+    llm_config=llm_config,
+    tb_config=tb_config,
+    gb_config=gb_config,
+)
 
 from muagent.httpapis.ekg_construct import create_api
-create_api(llm, embeddings)
+create_api(llm, embeddings, ekg_construct_service)