WIP

MorpheusAIs · Oct 8, 2024 · 1023dd0 · 1023dd0
1 parent ef2a4ad
commit 1023dd0
Show file tree

Hide file tree

Showing 45 changed files with 39 additions and 35 deletions.
diff --git a/.github/workflows/mor-agents-build-linux.yml b/.github/workflows/mor-agents-build-linux.yml
@@ -157,13 +157,13 @@ jobs:
 
           # Pull necessary Docker images
           echo -e "\${YELLOW}Pulling Docker images...${NC}"
-          sudo docker pull lachsbagel/moragents_dockers-nginx:amd64-0.1.1
-          sudo docker pull lachsbagel/moragents_dockers-agents:amd64-0.1.1
+          sudo docker pull lachsbagel/moragents_dockers-nginx:amd64-0.2.0
+          sudo docker pull lachsbagel/moragents_dockers-agents:amd64-0.2.0
 
           # Start Docker containers
           echo -e "\${YELLOW}Starting Docker containers...${NC}"
-          sudo docker run -d --name agents -p 8080:5000 --restart always -v /var/lib/agents -v /app/src lachsbagel/moragents_dockers-agents:amd64-0.1.1
-          sudo docker run -d --name nginx -p 3333:80 lachsbagel/moragents_dockers-nginx:amd64-0.1.1
+          sudo docker run -d --name agents -p 8080:5000 --restart always -v /var/lib/agents -v /app/src lachsbagel/moragents_dockers-agents:amd64-0.2.0
+          sudo docker run -d --name nginx -p 3333:80 lachsbagel/moragents_dockers-nginx:amd64-0.2.0
 
           echo -e "\${GREEN}Setup complete!${NC}"
           EOF

diff --git a/build_assets/macOS/welcome.html b/build_assets/macOS/welcome.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Welcome to MORagents v0.1.1 Installer</title>
+    <title>Welcome to MORagents v0.2.0 Installer</title>
     <style>
       body {
         font-family: Arial, sans-serif;
@@ -29,7 +29,7 @@
     </style>
   </head>
   <body>
-    <h1>Welcome to MORagents v0.1.1 Installer</h1>
+    <h1>Welcome to MORagents v0.2.0 Installer</h1>
     <p>
       Thank you for choosing to install MORagents on your system. This installer
       will guide you through the process of setting up MORagents and its

diff --git a/config.py b/config.py
@@ -16,20 +16,20 @@
 
 class AgentDockerConfig:
     MACOS_APPLE_IMAGE_NAMES = [
-        "lachsbagel/moragents_dockers-nginx:apple-0.1.1",
-        "lachsbagel/moragents_dockers-agents:apple-0.1.1"
+        "lachsbagel/moragents_dockers-nginx:apple-0.2.0",
+        "lachsbagel/moragents_dockers-agents:apple-0.2.0"
     ]
     MACOS_INTEL_IMAGE_NAMES = [
-        "lachsbagel/moragents_dockers-nginx:amd64-0.1.1",
-        "lachsbagel/moragents_dockers-agents:amd64-0.1.1"
+        "lachsbagel/moragents_dockers-nginx:amd64-0.2.0",
+        "lachsbagel/moragents_dockers-agents:amd64-0.2.0"
     ]
     WINDOWS_IMAGE_NAMES = [
-        "lachsbagel/moragents_dockers-nginx:amd64-0.1.1",
-        "lachsbagel/moragents_dockers-agents:amd64-0.1.1"
+        "lachsbagel/moragents_dockers-nginx:amd64-0.2.0",
+        "lachsbagel/moragents_dockers-agents:amd64-0.2.0"
     ]
     LINUX_IMAGE_NAMES = [  # TODO, may need linux specific tagged images
-        "lachsbagel/moragents_dockers-nginx:amd64-0.1.1",
-        "lachsbagel/moragents_dockers-agents:amd64-0.1.1"
+        "lachsbagel/moragents_dockers-nginx:amd64-0.2.0",
+        "lachsbagel/moragents_dockers-agents:amd64-0.2.0"
     ]
 
     @staticmethod
@@ -50,6 +50,10 @@ class AgentDockerConfigDeprecate:
         "morpheus/price_fetcher_agent:latest",
         "moragents_dockers-nginx:latest",
         "moragents_dockers-agents:latest",
+        "lachsbagel/moragents_dockers-nginx:apple-0.0.9",
+        "lachsbagel/moragents_dockers-agents:apple-0.0.9",
+        "lachsbagel/moragents_dockers-nginx:amd64-0.0.9",
+        "lachsbagel/moragents_dockers-agents:amd64-0.0.9",
         "lachsbagel/moragents_dockers-nginx:apple-0.1.0",
         "lachsbagel/moragents_dockers-agents:apple-0.1.0",
         "lachsbagel/moragents_dockers-nginx:amd64-0.1.0",

diff --git a/submodules/benchmarks/__init__.py → submodules/moragents_dockers/__init__.py b/submodules/benchmarks/__init__.py → submodules/moragents_dockers/__init__.py
diff --git a/...hmarks/claim_agent_benchmarks/__init__.py → ...ules/moragents_dockers/agents/__init__.py b/...hmarks/claim_agent_benchmarks/__init__.py → ...ules/moragents_dockers/agents/__init__.py
diff --git a/...aim_agent_benchmarks/adapters/__init__.py → .../agents/src/agents/news_agent/__init__.py b/...aim_agent_benchmarks/adapters/__init__.py → .../agents/src/agents/news_agent/__init__.py
diff --git a/...ockers/agents/src/news_agent/src/agent.py → ...ers/agents/src/agents/news_agent/agent.py b/...ockers/agents/src/news_agent/src/agent.py → ...ers/agents/src/agents/news_agent/agent.py
@@ -2,8 +2,8 @@
 import logging
 import re
 import urllib.parse
-from news_agent.src.config import Config
-from news_agent.src.tools import clean_html, is_within_time_window, fetch_rss_feed
+from src.agents.news_agent.config import Config
+from src.agents.news_agent.tools import clean_html, is_within_time_window, fetch_rss_feed
 import pyshorteners
 
 logger = logging.getLogger(__name__)

diff --git a/...ckers/agents/src/news_agent/src/config.py → ...rs/agents/src/agents/news_agent/config.py b/...ckers/agents/src/news_agent/src/config.py → ...rs/agents/src/agents/news_agent/config.py
diff --git a/...ockers/agents/src/news_agent/src/tools.py → ...ers/agents/src/agents/news_agent/tools.py b/...ockers/agents/src/news_agent/src/tools.py → ...ers/agents/src/agents/news_agent/tools.py
@@ -4,7 +4,7 @@
 from dateutil import parser
 import re
 from html import unescape
-from news_agent.src.config import Config
+from news_agent.config import Config
 import logging
 import urllib.parse
 

diff --git a/submodules/moragents_dockers/agents/src/config.py b/submodules/moragents_dockers/agents/src/config.py
@@ -65,7 +65,7 @@ class Config:
                 "upload_required": False,
             },
             {
-                "path": "news_agent.src.agent",
+                "path": "src.agents.news_agent.agent",
                 "class": "NewsAgent",
                 "description": "Fetches and analyzes cryptocurrency news for potential price impacts.",
                 "name": "crypto news agent",

diff --git a/...chmarks/news_agent_benchmarks/__init__.py → ...oragents_dockers/agents/tests/__init__.py b/...chmarks/news_agent_benchmarks/__init__.py → ...oragents_dockers/agents/tests/__init__.py
diff --git a/...nchmarks/claim_agent_benchmarks/README.md → ...ts/tests/claim_agent_benchmarks/README.md b/...nchmarks/claim_agent_benchmarks/README.md → ...ts/tests/claim_agent_benchmarks/README.md
diff --git a/...les/benchmarks/price_fetching/__init__.py → .../tests/claim_agent_benchmarks/__init__.py b/...les/benchmarks/price_fetching/__init__.py → .../tests/claim_agent_benchmarks/__init__.py
diff --git a/...marks/price_fetching/adapters/__init__.py → ...aim_agent_benchmarks/adapters/__init__.py b/...marks/price_fetching/adapters/__init__.py → ...aim_agent_benchmarks/adapters/__init__.py
diff --git a/...gent_benchmarks/adapters/claim_adapter.py → ...gent_benchmarks/adapters/claim_adapter.py b/...gent_benchmarks/adapters/claim_adapter.py → ...gent_benchmarks/adapters/claim_adapter.py
diff --git a/...arks/claim_agent_benchmarks/benchmarks.py → ...ests/claim_agent_benchmarks/benchmarks.py b/...arks/claim_agent_benchmarks/benchmarks.py → ...ests/claim_agent_benchmarks/benchmarks.py
@@ -1,6 +1,6 @@
 import pytest
 from helpers import request_claim, provide_receiver_address, confirm_transaction
-from submodules.benchmarks.claim_agent_benchmarks.config import Config
+from submodules.moragents_dockers.agents.tests.claim_agent_benchmarks.config import Config
 
 
 def test_claim_process():

diff --git a/...nchmarks/claim_agent_benchmarks/config.py → ...ts/tests/claim_agent_benchmarks/config.py b/...nchmarks/claim_agent_benchmarks/config.py → ...ts/tests/claim_agent_benchmarks/config.py
diff --git a/...chmarks/claim_agent_benchmarks/helpers.py → ...s/tests/claim_agent_benchmarks/helpers.py b/...chmarks/claim_agent_benchmarks/helpers.py → ...s/tests/claim_agent_benchmarks/helpers.py
@@ -1,5 +1,5 @@
-from submodules.benchmarks.claim_agent_benchmarks.config import Config
-from submodules.benchmarks.claim_agent_benchmarks.adapters.claim_adapter import ClaimAdapter
+from submodules.moragents_dockers.agents.tests.claim_agent_benchmarks.config import Config
+from submodules.moragents_dockers.agents.tests.claim_agent_benchmarks.adapters.claim_adapter import ClaimAdapter
 
 claim_adapter = ClaimAdapter(Config.URL, Config.HEADERS)
 

diff --git a/...enchmarks/news_agent_benchmarks/README.md → ...nts/tests/news_agent_benchmarks/README.md b/...enchmarks/news_agent_benchmarks/README.md → ...nts/tests/news_agent_benchmarks/README.md
diff --git a/...reward_check_agent_benchmarks/__init__.py → ...s/tests/news_agent_benchmarks/__init__.py b/...reward_check_agent_benchmarks/__init__.py → ...s/tests/news_agent_benchmarks/__init__.py
diff --git a/...marks/news_agent_benchmarks/benchmarks.py → ...tests/news_agent_benchmarks/benchmarks.py b/...marks/news_agent_benchmarks/benchmarks.py → ...tests/news_agent_benchmarks/benchmarks.py
@@ -2,8 +2,8 @@
 
 import pytest
 import logging
-from submodules.benchmarks.news_agent_benchmarks.config import Config
-from submodules.benchmarks.news_agent_benchmarks.helpers import ask_news_agent, extract_classification
+from submodules.moragents_dockers.agents.tests.news_agent_benchmarks.config import Config
+from submodules.moragents_dockers.agents.tests.news_agent_benchmarks.helpers import ask_news_agent, extract_classification
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

diff --git a/...enchmarks/news_agent_benchmarks/config.py → ...nts/tests/news_agent_benchmarks/config.py b/...enchmarks/news_agent_benchmarks/config.py → ...nts/tests/news_agent_benchmarks/config.py
diff --git a/...nchmarks/news_agent_benchmarks/helpers.py → ...ts/tests/news_agent_benchmarks/helpers.py b/...nchmarks/news_agent_benchmarks/helpers.py → ...ts/tests/news_agent_benchmarks/helpers.py
diff --git a/...eck_agent_benchmarks/adapters/__init__.py → ...s/agents/tests/price_fetching/__init__.py b/...eck_agent_benchmarks/adapters/__init__.py → ...s/agents/tests/price_fetching/__init__.py
diff --git a/...ers/agents/src/news_agent/src/__init__.py → ...tests/price_fetching/adapters/__init__.py b/...ers/agents/src/news_agent/src/__init__.py → ...tests/price_fetching/adapters/__init__.py
diff --git a/...s/price_fetching/adapters/base_adapter.py → ...s/price_fetching/adapters/base_adapter.py b/...s/price_fetching/adapters/base_adapter.py → ...s/price_fetching/adapters/base_adapter.py
diff --git a/...ce_fetching/adapters/coingecko_adapter.py → ...ce_fetching/adapters/coingecko_adapter.py b/...ce_fetching/adapters/coingecko_adapter.py → ...ce_fetching/adapters/coingecko_adapter.py
diff --git a/...ce_fetching/adapters/defillama_adapter.py → ...ce_fetching/adapters/defillama_adapter.py b/...ce_fetching/adapters/defillama_adapter.py → ...ce_fetching/adapters/defillama_adapter.py
diff --git a/...s/benchmarks/price_fetching/benchmarks.py → ...agents/tests/price_fetching/benchmarks.py b/...s/benchmarks/price_fetching/benchmarks.py → ...agents/tests/price_fetching/benchmarks.py
@@ -1,7 +1,7 @@
 import time
 import argparse
 from helpers import ask_data_agent, compare_usd_values, extract_agent_usd_value
-from submodules.benchmarks.price_fetching.config import coins, price_prompts, mcap_prompts, price_error_tolerance, mcap_error_tolerance, loop_delay
+from submodules.moragents_dockers.agents.tests.price_fetching import coins, price_prompts, mcap_prompts, price_error_tolerance, mcap_error_tolerance, loop_delay
 from adapters.coingecko_adapter import CoingeckoAdapter
 from adapters.defillama_adapter import DefillamaAdapter
 

diff --git a/...dules/benchmarks/price_fetching/config.py → ...ers/agents/tests/price_fetching/config.py b/...dules/benchmarks/price_fetching/config.py → ...ers/agents/tests/price_fetching/config.py
diff --git a/...ules/benchmarks/price_fetching/helpers.py → ...rs/agents/tests/price_fetching/helpers.py b/...ules/benchmarks/price_fetching/helpers.py → ...rs/agents/tests/price_fetching/helpers.py
diff --git a/...dules/benchmarks/price_fetching/readme.md → ...ers/agents/tests/price_fetching/readme.md b/...dules/benchmarks/price_fetching/readme.md → ...ers/agents/tests/price_fetching/readme.md
diff --git a/...enchmarks/price_fetching/requirements.txt → ...nts/tests/price_fetching/requirements.txt b/...enchmarks/price_fetching/requirements.txt → ...nts/tests/price_fetching/requirements.txt
diff --git a/...s/reward_check_agent_benchmarks/README.md → ...s/reward_check_agent_benchmarks/README.md b/...s/reward_check_agent_benchmarks/README.md → ...s/reward_check_agent_benchmarks/README.md
diff --git a/submodules/moragents_dockers/agents/tests/reward_check_agent_benchmarks/__init__.py b/submodules/moragents_dockers/agents/tests/reward_check_agent_benchmarks/__init__.py
diff --git a/submodules/moragents_dockers/agents/tests/reward_check_agent_benchmarks/adapters/__init__.py b/submodules/moragents_dockers/agents/tests/reward_check_agent_benchmarks/adapters/__init__.py
diff --git a/...nchmarks/adapters/reward_check_adapter.py → ...nchmarks/adapters/reward_check_adapter.py b/...nchmarks/adapters/reward_check_adapter.py → ...nchmarks/adapters/reward_check_adapter.py
diff --git a/...ward_check_agent_benchmarks/benchmarks.py → ...ward_check_agent_benchmarks/benchmarks.py b/...ward_check_agent_benchmarks/benchmarks.py → ...ward_check_agent_benchmarks/benchmarks.py
@@ -1,6 +1,6 @@
 import pytest
-from submodules.benchmarks.claim_agent_benchmarks.helpers import request_claim, confirm_transaction
-from submodules.benchmarks.claim_agent_benchmarks.config import Config
+from submodules.benchmarks.claim_agent_benchmarks.helpers import request_claim
+from submodules.moragents_dockers.agents.tests.claim_agent_benchmarks.config import Config
 
 
 def test_claim_process():

diff --git a/...s/reward_check_agent_benchmarks/config.py → ...s/reward_check_agent_benchmarks/config.py b/...s/reward_check_agent_benchmarks/config.py → ...s/reward_check_agent_benchmarks/config.py
@@ -7,7 +7,7 @@
 # Configuration object
 class Config:
     WEB3RPCURL = {
-        "1": "https://cloudflare-eth.com",
+        "1": "https://eth.llamarpc.com/",
     }
 
     DISTRIBUTION_PROXY_ADDRESS = "0x47176B2Af9885dC6C4575d4eFd63895f7Aaa4790"

diff --git a/.../reward_check_agent_benchmarks/helpers.py → .../reward_check_agent_benchmarks/helpers.py b/.../reward_check_agent_benchmarks/helpers.py → .../reward_check_agent_benchmarks/helpers.py
diff --git a/submodules/moragents_dockers/docker-compose-apple.yml b/submodules/moragents_dockers/docker-compose-apple.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   agents:
-    image: lachsbagel/moragents_dockers-agents:apple-0.1.1
+    image: lachsbagel/moragents_dockers-agents:apple-0.2.0
     build:
       dockerfile: Dockerfile-apple
       context: ./agents
@@ -18,7 +18,7 @@ services:
       - BASE_URL=http://host.docker.internal:11434
 
   nginx:
-    image: lachsbagel/moragents_dockers-nginx:apple-0.1.1
+    image: lachsbagel/moragents_dockers-nginx:apple-0.2.0
     build:
       context: ./frontend
       dockerfile: Dockerfile

diff --git a/submodules/moragents_dockers/docker-compose.yml b/submodules/moragents_dockers/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   agents:
-    image: lachsbagel/moragents_dockers-agents:amd64-0.1.1
+    image: lachsbagel/moragents_dockers-agents:amd64-0.2.0
     build:
       dockerfile: Dockerfile
       context: ./agents
@@ -18,7 +18,7 @@ services:
       - BASE_URL=http://host.docker.internal:11434
 
   nginx:
-    image: lachsbagel/moragents_dockers-nginx:amd64-0.1.1
+    image: lachsbagel/moragents_dockers-nginx:amd64-0.2.0
     build:
       context: ./frontend
       dockerfile: Dockerfile

diff --git a/submodules/moragents_dockers/frontend/package-lock.json b/submodules/moragents_dockers/frontend/package-lock.json
diff --git a/submodules/moragents_dockers/frontend/package.json b/submodules/moragents_dockers/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Morpheus AI",
   "private": true,
-  "version": "0.1.1",
+  "version": "0.2.0",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

diff --git a/wizard_windows.iss b/wizard_windows.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=MORagents
-AppVersion=0.1.1
+AppVersion=0.2.0
 DefaultDirName={commonpf}\MORagents
 OutputDir=.\MORagentsWindowsInstaller
 OutputBaseFilename=MORagentsSetup