Skip to content

Commit

Permalink
Merge pull request #81 from dbpunk-labs/feat/rename
Browse files Browse the repository at this point in the history
Feat/rename
  • Loading branch information
imotai authored Sep 27, 2023
2 parents fe46b65 + 3fc987a commit 58abb25
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release_libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ jobs:
run: |
ROOT_DIR=`pwd`
RELEASE_NAME=${GITHUB_REF/refs\/tags\//}
cd ${ROOT_DIR}/docker && docker build -f Dockerfile --no-cache -t dbpunk/octopus:${RELEASE_NAME} .
docker push dbpunk/octopus:${RELEASE_NAME}
cd ${ROOT_DIR}/docker && docker build -f Dockerfile --no-cache -t dbpunk/octogen:${RELEASE_NAME} .
docker push dbpunk/octogen:${RELEASE_NAME}
echo "the new images version $RELEASE_NAME"
6 changes: 3 additions & 3 deletions docker/start_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ then
fi

echo "start kernel.."
cd ${ROOT_DIR}/kernel && hap run -n octopus_kernel -- octopus_kernel_rpc_server
cd ${ROOT_DIR}/kernel && hap run -n octopus_kernel -- og_kernel_rpc_server

echo "start agent"
cd ${ROOT_DIR}/agent && hap run -n octopus_agent -- octopus_agent_rpc_server
cd ${ROOT_DIR}/agent && hap run -n octopus_agent -- og_agent_rpc_server

sleep 3

AGENT_RPC_KEY=$(cat ${ROOT_DIR}/agent/.env | grep admin_key | tr -d '\r' | cut -d "=" -f 2)
KERNEL_RPC_KEY=$(cat ${ROOT_DIR}/kernel/.env | grep rpc_key | td -d '\r' | cut -d "=" -f 2)
octopus_agent_setup --kernel_endpoint=127.0.0.1:9527 --kernel_api_key=${KERNEL_RPC_KEY} --agent_endpoint=127.0.0.1:9528 --admin_key=${AGENT_RPC_KEY}
og_agent_setup --kernel_endpoint=127.0.0.1:9527 --kernel_api_key=${KERNEL_RPC_KEY} --agent_endpoint=127.0.0.1:9528 --admin_key=${AGENT_RPC_KEY}

while true
do
Expand Down
6 changes: 3 additions & 3 deletions start_sandbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo "rpc_host=127.0.0.1">> .env
echo "rpc_port=9527">> .env
echo "rpc_key=${KERNEL_RPC_KEY}">> .env
echo "start kernel with endpoint 127.0.0.1:9527"
octopus_kernel_rpc_server > kernel_rpc.log 2>&1 &
og_kernel_rpc_server > kernel_rpc.log 2>&1 &
sleep 2
cd ${WORKDIR}/sandbox/agent
AGENT_RPC_KEY=ZCeI9cYtOCyLISoi488BgZHeBkHWuFUH
Expand All @@ -29,7 +29,7 @@ echo "max_file_size=10240000" >> .env
echo "verbose=True" >> .env
echo "db_path=/tmp/octopus_sandbox.db" >> .env
echo "cases_path=${WORKDIR}/sdk/tests/mock_messages.json" >> .env
octopus_agent_rpc_server > agent_rpc.log 2>&1 &
og_agent_rpc_server > agent_rpc.log 2>&1 &
sleep 2
echo "add a kernel"
octopus_agent_setup --kernel_endpoint=127.0.0.1:9527 --kernel_api_key=${KERNEL_RPC_KEY} --agent_endpoint=127.0.0.1:9528 --admin_key=${AGENT_RPC_KEY}
og_agent_setup --kernel_endpoint=127.0.0.1:9527 --kernel_api_key=${KERNEL_RPC_KEY} --agent_endpoint=127.0.0.1:9528 --admin_key=${AGENT_RPC_KEY}
8 changes: 4 additions & 4 deletions up/src/og_up/up.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from rich.live import Live
from rich.spinner import Spinner
from rich.console import Group
from octopus_sdk.utils import process_char_stream
from og_sdk.utils import process_char_stream

OCTOGEN_TITLE = "🐙[bold red]Octogen Up"
USE_SHELL = sys.platform.startswith("win")
Expand Down Expand Up @@ -102,7 +102,7 @@ def run_with_realtime_print(
def refresh(
live,
segments,
title=OCTOPUS_TITLE,
title=OCTOGEN_TITLE,
):
table = Table.grid(padding=(0, 1, 0, 0), pad_edge=True)
table.add_column("Index", no_wrap=True, justify="center")
Expand Down Expand Up @@ -176,7 +176,7 @@ def load_docker_image(version, image_name, repo_name, live, segments, chunk_size
"""
full_name = f"{image_name}:{version}"
spinner = Spinner("dots", style="status.spinner", speed=1.0, text="")
step = "Pull Octopus Image"
step = "Pull Octogen Image"
segments.append((spinner, step, ""))
refresh(live, segments)
return_code = 0
Expand Down Expand Up @@ -224,7 +224,7 @@ def generate_agent_common(fd, rpc_key):
fd.write(f"admin_key={rpc_key}\n")
fd.write("max_file_size=202400000\n")
fd.write("max_iterations=8\n")
fd.write("db_path=/app/agent/octopus.db\n")
fd.write("db_path=/app/agent/octogen.db\n")


def generate_agent_azure_openai(
Expand Down

0 comments on commit 58abb25

Please sign in to comment.