diff --git a/arena/Dockerfile b/arena/Dockerfile index 6f8a85a..8ada9ff 100644 --- a/arena/Dockerfile +++ b/arena/Dockerfile @@ -1,7 +1,7 @@ from h4ckermike/act_base add vendor/agent-protocol-client-python/ /opt/agent-protocol add vendor/agent-protocol-sdk-python/ /opt/agent-protocol-sdk -add arena/agent.json /tmp/ -add arena/run.py /tmp/ RUN pip install /opt/agent-protocol RUN pip install /opt/agent-protocol-sdk + +add arena/run.py /tmp/ diff --git a/arena/agent.json b/arena/agent.json deleted file mode 100644 index 4a4ef06..0000000 --- a/arena/agent.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input":"Write hello", - "additional_input":{ - "test_run_id": "123" - } -} diff --git a/arena/run.py b/arena/run.py index 38cd1aa..64e652e 100644 --- a/arena/run.py +++ b/arena/run.py @@ -1,5 +1,5 @@ import asyncio - +import os from agent_protocol.models import StepRequestBody from agent_protocol_client import ( Configuration, @@ -11,7 +11,7 @@ # Defining the host is optional and defaults to http://localhost # See configuration.py for a list of all supported configuration parameters. -configuration = Configuration(host="http://ghostcoder:8000") +configuration = Configuration(host=os.environ.get("TARGET")) async def main(): diff --git a/docker-compose.yml b/docker-compose.yml index fb61965..512b937 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,9 @@ services: context : . dockerfile: arena/Dockerfile #entrypoint: bash -c "curl -d @/tmp/agent.json --request POST http://ghostcoder:8000/ap/v1/agent/tasks " + environment: + - TARGET=http://the_agency_3:8000 + entrypoint: python /tmp/run.py act_base: #root base of action @@ -218,68 +221,33 @@ services: - ./vendor/Jarvis/benchmark:/benchmark - ./vendor/Jarvis/autogpts/autogpt//app/ #mount the source in for editing witho - ./tests/ai_settings.yaml:/tmp/ai_settings.yaml - the_agency_1: + + the_agency_3: depends_on: - mockopenai - - entrypoint: bash -c "poetry install && poetry run python -m autogpt -y --skip-news --ai-settings /tmp/ai_settings.yaml " - environment: - - GITHUB_PAT="${GITHUB_PAT}" - - GITHUB_REPO="jmikedupont2/ai-ticket" - - OPENAI_API_KEY=your-openai-api-key - - OPENAI_API_BASE=http://mockopenai:5000/v1 - build: - context: vendor/TheAgency/ - dockerfile: autogpts/autogpt/Dockerfile - volumes: - - ./vendor/TheAgency/benchmark:/benchmark - - ./vendor/TheAgency/autogpts/autogpt/:/app/ #mount the source in for editing witho - - ./tests/ai_settings.yaml:/tmp/ai_settings.yaml - the_agency_2: - #entrypoint: bash -c "poetry run python -m autogpt -y --skip-news --ai-settings /tmp/ai_settings.yaml " - entrypoint: bash - environment: - - GITHUB_PAT="${GITHUB_PAT}" - - GITHUB_REPO="jmikedupont2/ai-ticket" - - OPENAI_API_KEY=your-openai-api-key - - OPENAI_API_BASE=http://mockopenai:5000/v1 - build: - context: vendor/TheAgency/ - dockerfile : autogpts/ZEROAGPT_02/Dockerfile - volumes: - - ./vendor/TheAgency/benchmark:/benchmark - - ./vendor/TheAgency/autogpts/ZEROAGPT_02/:/app/ #mount the source in for editing witho - - ./vendor/Auto-GPT/autogpts/autogpt/ai_settings.yaml:/tmp/ai_settings.yaml - the_agency_3: - entrypoint: bash -c "poetry run python -m autogpt -y --skip-news --ai-settings /tmp/ai_settings.yaml " - environment: - - GITHUB_PAT="${GITHUB_PAT}" - - GITHUB_REPO="jmikedupont2/ai-ticket" - - OPENAI_API_KEY=your-openai-api-key - - OPENAI_API_BASE=http://mockopenai:5000/v1 - build: - #context: vendor/TheAgency/autogpts/ZEROAGPT_01/ - context: vendor/TheAgency/ - dockerfile : autogpts/ZEROAGPT_01/Dockerfile - - volumes: - - ./vendor/TheAgency/autogpts/ZEROAGPT_01/:/app/ #mount the source in for editing witho - - ./vendor/Auto-GPT/autogpts/autogpt/ai_settings.yaml:/tmp/ai_settings.yaml - the_agency_4: - entrypoint: bash -c "poetry run python -m autogpt -y --skip-news --ai-settings /tmp/ai_settings.yaml " + #entrypoint: bash -c "poetry install && poetry run python -m autogpt -y --skip-news --ai-settings /tmp/ai_settings.yaml " + entrypoint: bash -c "poetry run python -m forge agent start ZEROAGPT" environment: - GITHUB_PAT="${GITHUB_PAT}" - GITHUB_REPO="jmikedupont2/ai-ticket" - OPENAI_API_KEY=your-openai-api-key - OPENAI_API_BASE=http://mockopenai:5000/v1 + - BOT_NAME=ZEROAGPT_03 #FIXME do we need this? + - AGENT_WORKSPACE=/tmp/workspace/ + - AGENT_MODEL=/tmp/workspace/ + - OPENAI_MODEL="gpt-4" + - DATABASE_STRING=sqlite:///agent.db build: - #context: vendor/TheAgency/autogpts/ZEROAGPT_03/ context: vendor/TheAgency/ - dockerfile : autogpts/ZEROAGPT_03/Dockerfile + dockerfile: autogpts/ZEROAGPT_03/Dockerfile + args: + BASE_IMAGE: h4ckermike/basic_agent volumes: + - ./vendor/TheAgency/benchmark:/benchmark - ./vendor/TheAgency/autogpts/ZEROAGPT_03/:/app/ #mount the source in for editing witho - - ./vendor/Auto-GPT/autogpts/autogpt/ai_settings.yaml:/tmp/ai_settings.yaml + - ./tests/ai_settings.yaml:/tmp/ai_settings.yaml + mason_boom: entrypoint: bash -c "poetry run python -m autogpt -y --skip-news --ai-settings /tmp/ai_settings.yaml " environment: @@ -292,6 +260,7 @@ services: volumes: - ./vendor/MasonBoomPersonalAssistant/autogpts/autogpt/:/app/ #mount the source in for editixong witho - ./vendor/Auto-GPT/autogpts/autogpt/ai_settings.yaml:/tmp/ai_settings.yaml + mason_boom_pa: entrypoint: bash -c "poetry run python -m autogpt -y --skip-news --ai-settings /tmp/ai_settings.yaml " environment: diff --git a/vendor/TheAgency b/vendor/TheAgency index 8f4b05c..08198a9 160000 --- a/vendor/TheAgency +++ b/vendor/TheAgency @@ -1 +1 @@ -Subproject commit 8f4b05cf20bf5d0148ad382dc8e6035714c37651 +Subproject commit 08198a982ab6e4eef17815119fc8c2a9228f3f44