update refs to v0.1.0 and llama3.1

MorpheusAIs · Sep 12, 2024 · 074ff8d · 074ff8d
1 parent 870e0ee
commit 074ff8d
Show file tree

Hide file tree

Showing 35 changed files with 35 additions and 32 deletions.
diff --git a/.github/workflows/mor-agents-build-linux.yml b/.github/workflows/mor-agents-build-linux.yml
@@ -152,18 +152,18 @@ jobs:
 
         # Pull Ollama models
         echo -e "\${YELLOW}Pulling Ollama models...${NC}"
-        pull_ollama_model llama3
+        pull_ollama_model llama3.1
         pull_ollama_model nomic-embed-text
 
         # Pull necessary Docker images
         echo -e "\${YELLOW}Pulling Docker images...${NC}"
-        sudo docker pull lachsbagel/moragents_dockers-nginx:amd64-0.0.9
-        sudo docker pull lachsbagel/moragents_dockers-agents:amd64-0.0.9
+        sudo docker pull lachsbagel/moragents_dockers-nginx:amd64-0.1.0
+        sudo docker pull lachsbagel/moragents_dockers-agents:amd64-0.1.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.0.9
-        sudo docker run -d --name nginx -p 3333:80 lachsbagel/moragents_dockers-nginx:amd64-0.0.9
+        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.0
+        sudo docker run -d --name nginx -p 3333:80 lachsbagel/moragents_dockers-nginx:amd64-0.1.0
 
         echo -e "\${GREEN}Setup complete!${NC}"
         EOF

diff --git a/build_assets/macOS/Packaging_Instructions_macOS.md b/build_assets/macOS/Packaging_Instructions_macOS.md
@@ -28,17 +28,17 @@ Future usage only requires you to run MORagents from your searchbar.
 
 ## Signing
 ```sh 
-  productsign --sign "Developer ID Installer: Liquid Tensor LLC (ZQN244GMTD)" MORagents.pkg MORagents009.pkg
+  productsign --sign "Developer ID Installer: Liquid Tensor LLC (ZQN244GMTD)" MORagents.pkg MORagents010.pkg
 ```
 
 ## Notarize 
 ```sh 
-xcrun notarytool submit MORagents009.pkg --keychain-profile "NotaryProfile" --wait
+xcrun notarytool submit MORagents010.pkg --keychain-profile "NotaryProfile" --wait
 ```
 
 ## Staple
 ```sh 
-xcrun stapler staple MORagents009.pkg
+xcrun stapler staple MORagents010.pkg
 ```
 
 ---

diff --git a/build_assets/macOS/preinstall_ollama.sh b/build_assets/macOS/preinstall_ollama.sh
@@ -7,5 +7,5 @@ chmod +x ollama
 sudo mv ollama /usr/local/bin/
 
 nohup /usr/local/bin/ollama serve > /dev/null 2>&1 &
-/usr/local/bin/ollama pull llama3
+/usr/local/bin/ollama pull llama3.1
 /usr/local/bin/ollama pull nomic-embed-text
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.0.9 Installer</title>
+  <title>Welcome to MORagents v0.1.0 Installer</title>
   <style>
     body {
       font-family: Arial, sans-serif;
@@ -29,7 +29,7 @@
   </style>
 </head>
 <body>
-  <h1>Welcome to MORagents v0.0.9 Installer</h1>
+  <h1>Welcome to MORagents v0.1.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 dependencies.</p>
   <p>The installer will perform the following steps:</p>
   <ul>

diff --git a/config.py b/config.py
@@ -16,18 +16,18 @@
 
 class AgentDockerConfig:
     MACOS_IMAGE_NAMES = [
-        "lachsbagel/moragents_dockers-nginx:apple-0.0.9",
-        "lachsbagel/moragents_dockers-agents:apple-0.0.9"
+        "lachsbagel/moragents_dockers-nginx:apple-0.1.0",
+        "lachsbagel/moragents_dockers-agents:apple-0.1.0"
     ]
     WINDOWS_IMAGE_NAMES = [
-        "lachsbagel/moragents_dockers-nginx:amd64-0.0.9",
-        "lachsbagel/moragents_dockers-agents:amd64-0.0.9"
+        "lachsbagel/moragents_dockers-nginx:amd64-0.1.0",
+        "lachsbagel/moragents_dockers-agents:amd64-0.1.0"
     ]
-    LINUX_IMAGE_NAMES = [
-        "lachsbagel/moragents_dockers-nginx:amd64-0.0.9",
-        "lachsbagel/moragents_dockers-agents:amd64-0.0.9"
+    LINUX_IMAGE_NAMES = [  # TODO, may need linux specific tagged images
+        "lachsbagel/moragents_dockers-nginx:amd64-0.1.0",
+        "lachsbagel/moragents_dockers-agents:amd64-0.1.0"
     ]
-    
+
     @staticmethod
     def get_current_image_names():
         if os_name == "macOS":
@@ -43,5 +43,9 @@ class AgentDockerConfigDeprecate:
     OLD_IMAGE_NAMES = [
         "morpheus/price_fetcher_agent:latest",
         "moragents_dockers-nginx:latest",
-        "moragents_dockers-agents: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"
+    ]
diff --git a/submodules/__init__.py b/submodules/__init__.py
diff --git a/submodules/benchmarks/__init__.py b/submodules/benchmarks/__init__.py
diff --git a/submodules/claim_agent_benchmarks/README.md → ...nchmarks/claim_agent_benchmarks/README.md b/submodules/claim_agent_benchmarks/README.md → ...nchmarks/claim_agent_benchmarks/README.md
diff --git a/submodules/benchmarks/claim_agent_benchmarks/__init__.py b/submodules/benchmarks/claim_agent_benchmarks/__init__.py
diff --git a/submodules/benchmarks/claim_agent_benchmarks/adapters/__init__.py b/submodules/benchmarks/claim_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/...ules/claim_agent_benchmarks/benchmarks.py → ...arks/claim_agent_benchmarks/benchmarks.py b/...ules/claim_agent_benchmarks/benchmarks.py → ...arks/claim_agent_benchmarks/benchmarks.py
@@ -1,6 +1,6 @@
 import pytest
 from helpers import request_claim, provide_receiver_address, confirm_transaction
-from config import Config
+from submodules.benchmarks.claim_agent_benchmarks.config import Config
 
 
 def test_claim_process():

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

diff --git a/...dules/claim_agent_benchmarks/user_flow.py → ...marks/claim_agent_benchmarks/user_flow.py b/...dules/claim_agent_benchmarks/user_flow.py → ...marks/claim_agent_benchmarks/user_flow.py
diff --git a/submodules/benchmarks/price_fetching/__init__.py b/submodules/benchmarks/price_fetching/__init__.py
diff --git a/submodules/benchmarks/price_fetching/adapters/__init__.py b/submodules/benchmarks/price_fetching/adapters/__init__.py
diff --git a/...dules/benchmarks/adapters/base_adapter.py → ...s/price_fetching/adapters/base_adapter.py b/...dules/benchmarks/adapters/base_adapter.py → ...s/price_fetching/adapters/base_adapter.py
diff --git a/.../benchmarks/adapters/coingecko_adapter.py → ...ce_fetching/adapters/coingecko_adapter.py b/.../benchmarks/adapters/coingecko_adapter.py → ...ce_fetching/adapters/coingecko_adapter.py
diff --git a/.../benchmarks/adapters/defillama_adapter.py → ...ce_fetching/adapters/defillama_adapter.py b/.../benchmarks/adapters/defillama_adapter.py → ...ce_fetching/adapters/defillama_adapter.py
diff --git a/submodules/benchmarks/benchmarks.py → ...s/benchmarks/price_fetching/benchmarks.py b/submodules/benchmarks/benchmarks.py → ...s/benchmarks/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 config import coins, price_prompts, mcap_prompts, price_error_tolerance, mcap_error_tolerance, loop_delay
+from submodules.benchmarks.price_fetching.config 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/submodules/benchmarks/config.py → ...dules/benchmarks/price_fetching/config.py b/submodules/benchmarks/config.py → ...dules/benchmarks/price_fetching/config.py
diff --git a/submodules/benchmarks/helpers.py → ...ules/benchmarks/price_fetching/helpers.py b/submodules/benchmarks/helpers.py → ...ules/benchmarks/price_fetching/helpers.py
diff --git a/submodules/benchmarks/readme.md → ...dules/benchmarks/price_fetching/readme.md b/submodules/benchmarks/readme.md → ...dules/benchmarks/price_fetching/readme.md
@@ -8,7 +8,7 @@
 
 ## Running
 
-## 0. Start [ DataAgent Docker Service](../moragents_dockers/agents/src/data_agent/README.md)
+## 0. Start [ DataAgent Docker Service](../../moragents_dockers/agents/src/data_agent/README.md)
 ## 1. Modify `config.py` with new prompts, coins & error tolerances
 ## 2. `cd submodules/benchmarks`
 ## 3. Run `pip install -r requirements.txt`

diff --git a/submodules/benchmarks/requirements.txt → ...enchmarks/price_fetching/requirements.txt b/submodules/benchmarks/requirements.txt → ...enchmarks/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/benchmarks/reward_check_agent_benchmarks/__init__.py b/submodules/benchmarks/reward_check_agent_benchmarks/__init__.py
diff --git a/submodules/benchmarks/reward_check_agent_benchmarks/adapters/__init__.py b/submodules/benchmarks/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,5 +1,5 @@
 from helpers import ask_claim_agent, get_current_user_reward, extract_reward_value_from_response
-from config import test_cases, reward_check_prompts
+from submodules.benchmarks.reward_check_agent_benchmarks.config import test_cases, reward_check_prompts
 
 
 def run_reward_check_tests():

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
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
@@ -1,8 +1,7 @@
 import requests
-import json
 import re
 from web3 import Web3
-from config import Config
+from submodules.benchmarks.reward_check_agent_benchmarks.config import Config
 
 url = 'http://127.0.0.1:5000/'
 

diff --git a/submodules/moragents_dockers/README.md b/submodules/moragents_dockers/README.md
@@ -8,7 +8,7 @@ This project is a Flask-based AI chat application featuring intelligent response
 * [Download Ollama](https://ollama.com/ )for your operating system
 * Then after finishing installation pull these two models:
 
-```ollama pull llama3```
+```ollama pull llama3.1```
 
 ```ollama pull nomic-embed-text```
 

diff --git a/submodules/moragents_dockers/agents/src/app.py b/submodules/moragents_dockers/agents/src/app.py
@@ -69,7 +69,7 @@ def load_llm():
     logger.error(f"Failed to load LLM: {str(e)}")
     llm = None
 
-llm_ollama = Ollama(model="llama3", base_url=Config.OLLAMA_URL)
+llm_ollama = Ollama(model="llama3.1", base_url=Config.OLLAMA_URL)
 embeddings = OllamaEmbeddings(model="nomic-embed-text", base_url=Config.OLLAMA_URL)
 
 delegator = Delegator(Config.DELEGATOR_CONFIG, llm, llm_ollama, embeddings, app)

diff --git a/wizard_windows.iss b/wizard_windows.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=MORagents
-AppVersion=0.0.9
+AppVersion=0.1.0
 DefaultDirName={commonpf}\MORagents
 OutputDir=.\MORagentsWindowsInstaller
 OutputBaseFilename=MORagentsSetup
@@ -27,7 +27,7 @@ Filename: "{tmp}\DockerDesktopInstaller.exe"; Parameters: "install"; StatusMsg:
 Filename: "{tmp}\OllamaSetup.exe"; StatusMsg: "Installing Ollama..."; Flags: waituntilterminated
 Filename: "{app}\LICENSE.md"; Description: "View License Agreement"; Flags: postinstall shellexec skipifsilent
 Filename: "{app}\MORagents.exe"; Description: "Launch MORagents"; Flags: postinstall nowait skipifsilent unchecked
-Filename: "cmd.exe"; Parameters: "/c ollama pull llama3 && ollama pull nomic-embed-text"; StatusMsg: "Pulling Ollama models..."; Flags: runhidden waituntilterminated
+Filename: "cmd.exe"; Parameters: "/c ollama pull llama3.1 && ollama pull nomic-embed-text"; StatusMsg: "Pulling Ollama models..."; Flags: runhidden waituntilterminated
 
 [Code]
 var