From 0433161fc1c2e419beb570cdf424540fd5c65e3c Mon Sep 17 00:00:00 2001 From: Kye Date: Sat, 5 Aug 2023 18:32:39 -0400 Subject: [PATCH] clean up of th eprompts folder into the models since its clean --- swarms/agents/base.py | 8 ++++---- swarms/agents/{ => models}/prompts/__init__.py | 0 swarms/agents/{ => models}/prompts/agent_output_parser.py | 0 swarms/agents/{ => models}/prompts/agent_prompt.py | 0 swarms/agents/{ => models}/prompts/agent_prompt_auto.py | 0 swarms/agents/{ => models}/prompts/chains/__init__.py | 0 swarms/agents/{ => models}/prompts/chains/llm.py | 0 swarms/agents/{ => models}/prompts/chat_prompt.py | 0 swarms/agents/{ => models}/prompts/project_manager.py | 0 swarms/agents/{ => models}/prompts/prompt_generator.py | 0 swarms/agents/{ => models}/prompts/prompts.py | 0 swarms/agents/{ => models}/prompts/sales.py | 0 swarms/agents/{ => models}/prompts/summaries.py | 0 swarms/agents/tools/models.py | 2 +- swarms/agents/utils/ConversationalChatAgent.py | 2 +- swarms/agents/utils/agent_setup.py | 2 +- swarms/agents/utils/output_parser.py | 2 +- 17 files changed, 8 insertions(+), 8 deletions(-) rename swarms/agents/{ => models}/prompts/__init__.py (100%) rename swarms/agents/{ => models}/prompts/agent_output_parser.py (100%) rename swarms/agents/{ => models}/prompts/agent_prompt.py (100%) rename swarms/agents/{ => models}/prompts/agent_prompt_auto.py (100%) rename swarms/agents/{ => models}/prompts/chains/__init__.py (100%) rename swarms/agents/{ => models}/prompts/chains/llm.py (100%) rename swarms/agents/{ => models}/prompts/chat_prompt.py (100%) rename swarms/agents/{ => models}/prompts/project_manager.py (100%) rename swarms/agents/{ => models}/prompts/prompt_generator.py (100%) rename swarms/agents/{ => models}/prompts/prompts.py (100%) rename swarms/agents/{ => models}/prompts/sales.py (100%) rename swarms/agents/{ => models}/prompts/summaries.py (100%) diff --git a/swarms/agents/base.py b/swarms/agents/base.py index c10d9bdd..c807afa2 100644 --- a/swarms/agents/base.py +++ b/swarms/agents/base.py @@ -9,10 +9,10 @@ from langchain.vectorstores.base import VectorStoreRetriever from pydantic import ValidationError from swarms.agents.models.base import AbstractModel -from swarms.agents.prompts.agent_output_parser import AgentOutputParser -from swarms.agents.prompts.agent_prompt import AIMessage, HumanMessage, SystemMessage -from swarms.agents.prompts.agent_prompt_auto import MessageFormatter, PromptConstructor -from swarms.agents.prompts.prompt_generator import FINISH_NAME +from swarms.agents.models.prompts.agent_output_parser import AgentOutputParser +from swarms.agents.models.prompts.agent_prompt import AIMessage, HumanMessage, SystemMessage +from swarms.agents.models.prompts.agent_prompt_auto import MessageFormatter, PromptConstructor +from swarms.agents.models.prompts.prompt_generator import FINISH_NAME from swarms.agents.tools.base import BaseTool from swarms.agents.utils.Agent import AgentOutputParser from swarms.agents.utils.human_input import HumanInputRun diff --git a/swarms/agents/prompts/__init__.py b/swarms/agents/models/prompts/__init__.py similarity index 100% rename from swarms/agents/prompts/__init__.py rename to swarms/agents/models/prompts/__init__.py diff --git a/swarms/agents/prompts/agent_output_parser.py b/swarms/agents/models/prompts/agent_output_parser.py similarity index 100% rename from swarms/agents/prompts/agent_output_parser.py rename to swarms/agents/models/prompts/agent_output_parser.py diff --git a/swarms/agents/prompts/agent_prompt.py b/swarms/agents/models/prompts/agent_prompt.py similarity index 100% rename from swarms/agents/prompts/agent_prompt.py rename to swarms/agents/models/prompts/agent_prompt.py diff --git a/swarms/agents/prompts/agent_prompt_auto.py b/swarms/agents/models/prompts/agent_prompt_auto.py similarity index 100% rename from swarms/agents/prompts/agent_prompt_auto.py rename to swarms/agents/models/prompts/agent_prompt_auto.py diff --git a/swarms/agents/prompts/chains/__init__.py b/swarms/agents/models/prompts/chains/__init__.py similarity index 100% rename from swarms/agents/prompts/chains/__init__.py rename to swarms/agents/models/prompts/chains/__init__.py diff --git a/swarms/agents/prompts/chains/llm.py b/swarms/agents/models/prompts/chains/llm.py similarity index 100% rename from swarms/agents/prompts/chains/llm.py rename to swarms/agents/models/prompts/chains/llm.py diff --git a/swarms/agents/prompts/chat_prompt.py b/swarms/agents/models/prompts/chat_prompt.py similarity index 100% rename from swarms/agents/prompts/chat_prompt.py rename to swarms/agents/models/prompts/chat_prompt.py diff --git a/swarms/agents/prompts/project_manager.py b/swarms/agents/models/prompts/project_manager.py similarity index 100% rename from swarms/agents/prompts/project_manager.py rename to swarms/agents/models/prompts/project_manager.py diff --git a/swarms/agents/prompts/prompt_generator.py b/swarms/agents/models/prompts/prompt_generator.py similarity index 100% rename from swarms/agents/prompts/prompt_generator.py rename to swarms/agents/models/prompts/prompt_generator.py diff --git a/swarms/agents/prompts/prompts.py b/swarms/agents/models/prompts/prompts.py similarity index 100% rename from swarms/agents/prompts/prompts.py rename to swarms/agents/models/prompts/prompts.py diff --git a/swarms/agents/prompts/sales.py b/swarms/agents/models/prompts/sales.py similarity index 100% rename from swarms/agents/prompts/sales.py rename to swarms/agents/models/prompts/sales.py diff --git a/swarms/agents/prompts/summaries.py b/swarms/agents/models/prompts/summaries.py similarity index 100% rename from swarms/agents/prompts/summaries.py rename to swarms/agents/models/prompts/summaries.py diff --git a/swarms/agents/tools/models.py b/swarms/agents/tools/models.py index 9ae5abe5..23f714f9 100644 --- a/swarms/agents/tools/models.py +++ b/swarms/agents/tools/models.py @@ -18,7 +18,7 @@ from transformers import ( CLIPSegProcessor, ) -from swarms.agents.prompts.prompts import IMAGE_PROMPT +from swarms.agents.models.prompts.prompts import IMAGE_PROMPT from swarms.agents.tools.base import tool from swarms.agents.tools.main import BaseToolSet from swarms.utils.logger import logger diff --git a/swarms/agents/utils/ConversationalChatAgent.py b/swarms/agents/utils/ConversationalChatAgent.py index 981c3815..54215506 100644 --- a/swarms/agents/utils/ConversationalChatAgent.py +++ b/swarms/agents/utils/ConversationalChatAgent.py @@ -21,7 +21,7 @@ from langchain.schema import ( ) from langchain.tools.base import BaseTool -from swarms.agents.prompts.prompts import EVAL_TOOL_RESPONSE +from swarms.agents.models.prompts.prompts import EVAL_TOOL_RESPONSE from swarms.agents.utils.Agent import Agent logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s') diff --git a/swarms/agents/utils/agent_setup.py b/swarms/agents/utils/agent_setup.py index 2e71cf27..c78c2a14 100644 --- a/swarms/agents/utils/agent_setup.py +++ b/swarms/agents/utils/agent_setup.py @@ -7,7 +7,7 @@ from langchain.chat_models import ChatOpenAI from langchain.chat_models.base import BaseChatModel from langchain.schema import BaseOutputParser -from swarms.agents.prompts.prompts import EVAL_PREFIX, EVAL_SUFFIX +from swarms.agents.models.prompts.prompts import EVAL_PREFIX, EVAL_SUFFIX from swarms.agents.tools.main import BaseToolSet, ToolsFactory from .ConversationalChatAgent import ConversationalChatAgent diff --git a/swarms/agents/utils/output_parser.py b/swarms/agents/utils/output_parser.py index 9156927d..96cb6176 100644 --- a/swarms/agents/utils/output_parser.py +++ b/swarms/agents/utils/output_parser.py @@ -5,7 +5,7 @@ from typing import Dict, NamedTuple from langchain.schema import BaseOutputParser -from swarms.agents.prompts.prompts import EVAL_FORMAT_INSTRUCTIONS +from swarms.agents.models.prompts.prompts import EVAL_FORMAT_INSTRUCTIONS class EvalOutputParser(BaseOutputParser):