Commit
Β·
2f85c93
1
Parent(s):
60b4d0f
refactor
Browse files- deleteAgents.py +2 -2
- main.py +1 -1
- cost_benefit.py β src/cost_benefit.py +0 -0
- {default_tools β src/default_tools}/agent_creater_tool.py +3 -3
- {default_tools β src/default_tools}/ask_agent_tool.py +2 -2
- {default_tools β src/default_tools}/fire_agent.py +1 -1
- {default_tools β src/default_tools}/get_agents_tool.py +1 -1
- {default_tools β src/default_tools}/get_budget.py +1 -1
- {default_tools β src/default_tools}/google_search_tool.py +0 -0
- {default_tools β src/default_tools}/list_files.py +0 -0
- {default_tools β src/default_tools}/read_file.py +0 -0
- {default_tools β src/default_tools}/test_cost/agent_creator_tool.py +4 -4
- {default_tools β src/default_tools}/tool_creator.py +0 -0
- {default_tools β src/default_tools}/tool_deletor.py +0 -0
- src/default_tools/update_memory.py +35 -0
- src/{__init__.py β manager/__init__.py} +0 -0
- src/{agent_manager.py β manager/agent_manager.py} +3 -3
- src/{budget_manager.py β manager/budget_manager.py} +1 -1
- src/{config β manager/config}/model_selector.py +1 -1
- src/{llm_models.py β manager/llm_models.py} +1 -1
- src/{manager.py β manager/manager.py} +3 -3
- src/{tool_manager.py β manager/tool_manager.py} +7 -7
- src/{utils β manager/utils}/__init__.py +0 -0
- src/{utils β manager/utils}/runtime_selector.py +0 -0
- src/{utils β manager/utils}/singleton.py +0 -0
- src/{utils β manager/utils}/streamlit_interface.py +1 -1
- src/{utils β manager/utils}/suppress_outputs.py +0 -0
- {models β src/models}/models.json +0 -0
- {models β src/models}/system.prompt +0 -0
- {models β src/models}/system2.prompt +0 -0
- {models β src/models}/system3.prompt +0 -0
- {models β src/models}/system_.prompt +0 -0
- test_env.py β src/test_env.py +0 -0
- testing_cost.py β src/testing_cost.py +0 -0
- {tools β src/tools}/arxiv_tool.py +0 -0
- {tools β src/tools}/get_website_tool.py +0 -0
- {tools β src/tools}/globle_tool.py +0 -0
- {tools β src/tools}/weather_tool.py +0 -0
- {tools β src/tools}/wikipedia_tool.py +0 -0
- {tools β src/tools}/wordle_tool.py +1 -1
deleteAgents.py
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
import json
|
2 |
import ollama
|
3 |
-
from src.utils.streamlit_interface import output_assistant_response
|
4 |
|
5 |
-
with open("./models/models.json", "r", encoding="utf8") as f:
|
6 |
models = f.read()
|
7 |
models = json.loads(models)
|
8 |
for agent in models:
|
|
|
1 |
import json
|
2 |
import ollama
|
3 |
+
from src.manager.utils.streamlit_interface import output_assistant_response
|
4 |
|
5 |
+
with open("./src/models/models.json", "r", encoding="utf8") as f:
|
6 |
models = f.read()
|
7 |
models = json.loads(models)
|
8 |
for agent in models:
|
main.py
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
import gradio as gr
|
2 |
|
3 |
import base64
|
4 |
-
from src.manager import GeminiManager
|
5 |
|
6 |
model_manager = GeminiManager(gemini_model="gemini-2.0-flash")
|
7 |
|
|
|
1 |
import gradio as gr
|
2 |
|
3 |
import base64
|
4 |
+
from src.manager.manager import GeminiManager
|
5 |
|
6 |
model_manager = GeminiManager(gemini_model="gemini-2.0-flash")
|
7 |
|
cost_benefit.py β src/cost_benefit.py
RENAMED
File without changes
|
{default_tools β src/default_tools}/agent_creater_tool.py
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
-
from src.agent_manager import AgentManager
|
2 |
-
from src.config.model_selector import choose_best_model
|
3 |
-
from src.utils.runtime_selector import detect_runtime_environment
|
4 |
__all__ = ['AgentCreator']
|
5 |
|
6 |
class AgentCreator():
|
|
|
1 |
+
from src.manager.agent_manager import AgentManager
|
2 |
+
from src.manager.config.model_selector import choose_best_model
|
3 |
+
from src.manager.utils.runtime_selector import detect_runtime_environment
|
4 |
__all__ = ['AgentCreator']
|
5 |
|
6 |
class AgentCreator():
|
{default_tools β src/default_tools}/ask_agent_tool.py
RENAMED
@@ -1,5 +1,5 @@
|
|
1 |
-
from src.budget_manager import BudgetManager
|
2 |
-
from src.agent_manager import AgentManager
|
3 |
|
4 |
__all__ = ['AskAgent']
|
5 |
|
|
|
1 |
+
from src.manager.budget_manager import BudgetManager
|
2 |
+
from src.manager.agent_manager import AgentManager
|
3 |
|
4 |
__all__ = ['AskAgent']
|
5 |
|
{default_tools β src/default_tools}/fire_agent.py
RENAMED
@@ -1,4 +1,4 @@
|
|
1 |
-
from src.agent_manager import AgentManager
|
2 |
|
3 |
__all__ = ['FireAgent']
|
4 |
|
|
|
1 |
+
from src.manager.agent_manager import AgentManager
|
2 |
|
3 |
__all__ = ['FireAgent']
|
4 |
|
{default_tools β src/default_tools}/get_agents_tool.py
RENAMED
@@ -1,4 +1,4 @@
|
|
1 |
-
from src.agent_manager import AgentManager
|
2 |
|
3 |
__all__ = ['GetAgents']
|
4 |
|
|
|
1 |
+
from src.manager.agent_manager import AgentManager
|
2 |
|
3 |
__all__ = ['GetAgents']
|
4 |
|
{default_tools β src/default_tools}/get_budget.py
RENAMED
@@ -1,7 +1,7 @@
|
|
1 |
|
2 |
__all__ = ['GetBudget']
|
3 |
|
4 |
-
from src.budget_manager import BudgetManager
|
5 |
|
6 |
|
7 |
class GetBudget():
|
|
|
1 |
|
2 |
__all__ = ['GetBudget']
|
3 |
|
4 |
+
from src.manager.budget_manager import BudgetManager
|
5 |
|
6 |
|
7 |
class GetBudget():
|
{default_tools β src/default_tools}/google_search_tool.py
RENAMED
File without changes
|
{default_tools β src/default_tools}/list_files.py
RENAMED
File without changes
|
{default_tools β src/default_tools}/read_file.py
RENAMED
File without changes
|
{default_tools β src/default_tools}/test_cost/agent_creator_tool.py
RENAMED
@@ -1,7 +1,7 @@
|
|
1 |
-
from src.agent_manager import AgentManager
|
2 |
-
from src.config.model_selector import choose_best_model
|
3 |
-
from src.utils.runtime_selector import detect_runtime_environment
|
4 |
-
|
5 |
__all__ = ['AgentCreator']
|
6 |
|
7 |
class AgentCreator():
|
|
|
1 |
+
from src.manager.agent_manager import AgentManager
|
2 |
+
from src.manager.config.model_selector import choose_best_model
|
3 |
+
from src.manager.utils.runtime_selector import detect_runtime_environment
|
4 |
+
|
5 |
__all__ = ['AgentCreator']
|
6 |
|
7 |
class AgentCreator():
|
{default_tools β src/default_tools}/tool_creator.py
RENAMED
File without changes
|
{default_tools β src/default_tools}/tool_deletor.py
RENAMED
File without changes
|
src/default_tools/update_memory.py
ADDED
@@ -0,0 +1,35 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
|
2 |
+
__all__ = ['GetBudget']
|
3 |
+
|
4 |
+
from src.manager.budget_manager import BudgetManager
|
5 |
+
|
6 |
+
|
7 |
+
class GetBudget():
|
8 |
+
dependencies = []
|
9 |
+
|
10 |
+
inputSchema = {
|
11 |
+
"name": "GetBudget",
|
12 |
+
"description": "Retrieves the current budget available.",
|
13 |
+
"parameters": {
|
14 |
+
"type": "object",
|
15 |
+
"properties":{},
|
16 |
+
"required": [],
|
17 |
+
},
|
18 |
+
}
|
19 |
+
|
20 |
+
|
21 |
+
def run(self, **kwargs):
|
22 |
+
budget_manager = BudgetManager()
|
23 |
+
total_budget = budget_manager.get_total_budget()
|
24 |
+
current_expense = budget_manager.get_current_expense()
|
25 |
+
current_remaining_budget = budget_manager.get_current_remaining_budget()
|
26 |
+
return {
|
27 |
+
"status": "success",
|
28 |
+
"message": "Budget retrieved successfully",
|
29 |
+
"output": {
|
30 |
+
"total_budget": total_budget,
|
31 |
+
"current_expense": current_expense,
|
32 |
+
"current_remaining_budget": current_remaining_budget
|
33 |
+
}
|
34 |
+
}
|
35 |
+
|
src/{__init__.py β manager/__init__.py}
RENAMED
File without changes
|
src/{agent_manager.py β manager/agent_manager.py}
RENAMED
@@ -3,14 +3,14 @@ from typing import Dict, Type, Any, Optional, Tuple
|
|
3 |
import os
|
4 |
import json
|
5 |
import ollama
|
6 |
-
from src.utils.singleton import singleton
|
7 |
-
from src.utils.streamlit_interface import output_assistant_response
|
8 |
from google import genai
|
9 |
from google.genai import types
|
10 |
from google.genai.types import *
|
11 |
import os
|
12 |
from dotenv import load_dotenv
|
13 |
-
from src.budget_manager import BudgetManager
|
14 |
|
15 |
class Agent(ABC):
|
16 |
|
|
|
3 |
import os
|
4 |
import json
|
5 |
import ollama
|
6 |
+
from src.manager.utils.singleton import singleton
|
7 |
+
from src.manager.utils.streamlit_interface import output_assistant_response
|
8 |
from google import genai
|
9 |
from google.genai import types
|
10 |
from google.genai.types import *
|
11 |
import os
|
12 |
from dotenv import load_dotenv
|
13 |
+
from src.manager.budget_manager import BudgetManager
|
14 |
|
15 |
class Agent(ABC):
|
16 |
|
src/{budget_manager.py β manager/budget_manager.py}
RENAMED
@@ -1,4 +1,4 @@
|
|
1 |
-
from src.utils.singleton import singleton
|
2 |
|
3 |
@singleton
|
4 |
class BudgetManager():
|
|
|
1 |
+
from src.manager.utils.singleton import singleton
|
2 |
|
3 |
@singleton
|
4 |
class BudgetManager():
|
src/{config β manager/config}/model_selector.py
RENAMED
@@ -1,4 +1,4 @@
|
|
1 |
-
from src.utils.runtime_selector import detect_runtime_environment
|
2 |
from cost_benefit import get_best_model
|
3 |
import os
|
4 |
from dotenv import load_dotenv
|
|
|
1 |
+
from src.manager.utils.runtime_selector import detect_runtime_environment
|
2 |
from cost_benefit import get_best_model
|
3 |
import os
|
4 |
from dotenv import load_dotenv
|
src/{llm_models.py β manager/llm_models.py}
RENAMED
@@ -5,7 +5,7 @@ from pathlib import Path
|
|
5 |
from google import genai
|
6 |
from google.genai import types
|
7 |
from mistralai import Mistral
|
8 |
-
from src.utils.streamlit_interface import output_assistant_response
|
9 |
|
10 |
|
11 |
class AbstractModelManager(ABC):
|
|
|
5 |
from google import genai
|
6 |
from google.genai import types
|
7 |
from mistralai import Mistral
|
8 |
+
from src.manager.utils.streamlit_interface import output_assistant_response
|
9 |
|
10 |
|
11 |
class AbstractModelManager(ABC):
|
src/{manager.py β manager/manager.py}
RENAMED
@@ -4,8 +4,8 @@ from google.genai.types import *
|
|
4 |
import os
|
5 |
from dotenv import load_dotenv
|
6 |
import sys
|
7 |
-
from src.tool_manager import ToolManager
|
8 |
-
from src.utils.suppress_outputs import suppress_output
|
9 |
import logging
|
10 |
import gradio as gr
|
11 |
|
@@ -17,7 +17,7 @@ logger.addHandler(handler)
|
|
17 |
|
18 |
class GeminiManager:
|
19 |
def __init__(self, toolsLoader: ToolManager = None,
|
20 |
-
system_prompt_file="./models/system3.prompt",
|
21 |
gemini_model="gemini-2.5-pro-exp-03-25",
|
22 |
local_only=False, allow_tool_creation=True,
|
23 |
cloud_only=False, use_economy=True):
|
|
|
4 |
import os
|
5 |
from dotenv import load_dotenv
|
6 |
import sys
|
7 |
+
from src.manager.tool_manager import ToolManager
|
8 |
+
from src.manager.utils.suppress_outputs import suppress_output
|
9 |
import logging
|
10 |
import gradio as gr
|
11 |
|
|
|
17 |
|
18 |
class GeminiManager:
|
19 |
def __init__(self, toolsLoader: ToolManager = None,
|
20 |
+
system_prompt_file="./src/models/system3.prompt",
|
21 |
gemini_model="gemini-2.5-pro-exp-03-25",
|
22 |
local_only=False, allow_tool_creation=True,
|
23 |
cloud_only=False, use_economy=True):
|
src/{tool_manager.py β manager/tool_manager.py}
RENAMED
@@ -7,16 +7,16 @@ import pip
|
|
7 |
from google.genai import types
|
8 |
import sys
|
9 |
|
10 |
-
from src.budget_manager import BudgetManager
|
11 |
-
from src.utils.singleton import singleton
|
12 |
-
from src.utils.suppress_outputs import suppress_output
|
13 |
-
from default_tools.get_agents_tool import GetAgents
|
14 |
-
from default_tools.tool_deletor import ToolDeletor
|
15 |
-
from src.utils.streamlit_interface import output_assistant_response
|
16 |
|
17 |
toolsImported = []
|
18 |
|
19 |
-
TOOLS_DIRECTORIES = [os.path.abspath("./default_tools"), os.path.abspath("./tools")]
|
20 |
|
21 |
class Tool:
|
22 |
def __init__(self, toolClass):
|
|
|
7 |
from google.genai import types
|
8 |
import sys
|
9 |
|
10 |
+
from src.manager.budget_manager import BudgetManager
|
11 |
+
from src.manager.utils.singleton import singleton
|
12 |
+
from src.manager.utils.suppress_outputs import suppress_output
|
13 |
+
from src.default_tools.get_agents_tool import GetAgents
|
14 |
+
from src.default_tools.tool_deletor import ToolDeletor
|
15 |
+
from src.manager.utils.streamlit_interface import output_assistant_response
|
16 |
|
17 |
toolsImported = []
|
18 |
|
19 |
+
TOOLS_DIRECTORIES = [os.path.abspath("./src/default_tools"), os.path.abspath("./src/tools")]
|
20 |
|
21 |
class Tool:
|
22 |
def __init__(self, toolClass):
|
src/{utils β manager/utils}/__init__.py
RENAMED
File without changes
|
src/{utils β manager/utils}/runtime_selector.py
RENAMED
File without changes
|
src/{utils β manager/utils}/singleton.py
RENAMED
File without changes
|
src/{utils β manager/utils}/streamlit_interface.py
RENAMED
@@ -1,4 +1,4 @@
|
|
1 |
-
from src.utils.singleton import singleton
|
2 |
|
3 |
def get_user_message(message):
|
4 |
user_input = input(message)
|
|
|
1 |
+
from src.manager.utils.singleton import singleton
|
2 |
|
3 |
def get_user_message(message):
|
4 |
user_input = input(message)
|
src/{utils β manager/utils}/suppress_outputs.py
RENAMED
File without changes
|
{models β src/models}/models.json
RENAMED
File without changes
|
{models β src/models}/system.prompt
RENAMED
File without changes
|
{models β src/models}/system2.prompt
RENAMED
File without changes
|
{models β src/models}/system3.prompt
RENAMED
File without changes
|
{models β src/models}/system_.prompt
RENAMED
File without changes
|
test_env.py β src/test_env.py
RENAMED
File without changes
|
testing_cost.py β src/testing_cost.py
RENAMED
File without changes
|
{tools β src/tools}/arxiv_tool.py
RENAMED
File without changes
|
{tools β src/tools}/get_website_tool.py
RENAMED
File without changes
|
{tools β src/tools}/globle_tool.py
RENAMED
File without changes
|
{tools β src/tools}/weather_tool.py
RENAMED
File without changes
|
{tools β src/tools}/wikipedia_tool.py
RENAMED
File without changes
|
{tools β src/tools}/wordle_tool.py
RENAMED
@@ -33,7 +33,7 @@ class WordleTool():
|
|
33 |
def __init__(self):
|
34 |
self.secret_word = None
|
35 |
self.word_list_url = "https://github.com/kiprobinson/wordle-solver/raw/main/app/resources/word-list.txt"
|
36 |
-
self.file_path = "secret_word.json" # Path for storing the secret word
|
37 |
|
38 |
def _load_word_list(self):
|
39 |
try:
|
|
|
33 |
def __init__(self):
|
34 |
self.secret_word = None
|
35 |
self.word_list_url = "https://github.com/kiprobinson/wordle-solver/raw/main/app/resources/word-list.txt"
|
36 |
+
self.file_path = "src/data/secret_word.json" # Path for storing the secret word
|
37 |
|
38 |
def _load_word_list(self):
|
39 |
try:
|