🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
Fix a typo in ModelType (#68)
Guohao Lie2854ab2ea68
diff --git a/camel/__init__.py b/camel/__init__.pyindex e8e247b79..fed93dc4b 100644--- a/camel/__init__.py+++ b/camel/__init__.py@@ -7,7 +7,7 @@ from .generator import (SingleTxtGenerator,SystemMessageGenerator,)-from .typing import ModeType, RoleType+from .typing import ModelType, RoleTypefrom .utils import get_model_token_limit, num_tokens_from_messages__version__ = '0.0.1'@@ -17,7 +17,7 @@ __all__ = ['get_model_token_limit','num_tokens_from_messages','RoleType',- 'ModeType',+ 'ModelType','ChatGPTConfig','ChatAgent','TaskSpecifyAgent',diff --git a/camel/agent/chat_agent.py b/camel/agent/chat_agent.pyindex 5c349b2d4..db0889d4e 100644--- a/camel/agent/chat_agent.py+++ b/camel/agent/chat_agent.py@@ -5,7 +5,7 @@ from tenacity import retry, stop_after_attempt, wait_exponentialfrom camel.configs import ChatGPTConfigfrom camel.message import ChatMessage, MessageType, SystemMessage-from camel.typing import ModeType+from camel.typing import ModelTypefrom camel.utils import get_model_token_limit, num_tokens_from_messages@@ -14,7 +14,7 @@ class ChatAgent:def __init__(self,system_message: SystemMessage,- model: ModeType = ModeType.GPT_3_5_TURBO,+ model: ModelType = ModelType.GPT_3_5_TURBO,model_config: Any = None,message_window_size: Optional[int] = None,) -> None:diff --git a/camel/agent/role_playing.py b/camel/agent/role_playing.pyindex be9c4780c..0434e01b2 100644--- a/camel/agent/role_playing.py+++ b/camel/agent/role_playing.py@@ -2,7 +2,7 @@ from typing import Dict, List, Optional, Tuplefrom camel.generator import SystemMessageGeneratorfrom camel.message import AssistantChatMessage, ChatMessage, UserChatMessage-from camel.typing import ModeType, RoleType, TaskType+from camel.typing import ModelType, RoleType, TaskTypefrom .chat_agent import ChatAgentfrom .task_agent import TaskPlannerAgent, TaskSpecifyAgent@@ -18,7 +18,7 @@ class RolePlaying:task_prompt: str = "",with_task_specify: bool = True,with_task_planner: bool = False,- mode_type: ModeType = ModeType.GPT_3_5_TURBO,+ mode_type: ModelType = ModelType.GPT_3_5_TURBO,task_type: Optional[TaskType] = TaskType.AI_SOCIETY,assistant_agent_kwargs: Optional[Dict] = None,user_agent_kwargs: Optional[Dict] = None,diff --git a/camel/agent/task_agent.py b/camel/agent/task_agent.pyindex bab5c821d..67210c23e 100644--- a/camel/agent/task_agent.py+++ b/camel/agent/task_agent.py@@ -3,14 +3,14 @@ from typing import Any, List, Optional, Tuplefrom camel.agent import ChatAgentfrom camel.configs import ChatGPTConfigfrom camel.message import SystemMessage, UserChatMessage-from camel.typing import ModeType, RoleType, TaskType+from camel.typing import ModelType, RoleType, TaskTypeclass TaskSpecifyAgent(ChatAgent):def __init__(self,- model: ModeType = ModeType.GPT_3_5_TURBO,+ model: ModelType = ModelType.GPT_3_5_TURBO,task_type: TaskType = TaskType.AI_SOCIETY,model_config: Any = None,task_specify_prompt: Optional[str] = None,@@ -74,7 +74,7 @@ class TaskPlannerAgent(ChatAgent):def __init__(self,- model: ModeType = ModeType.GPT_3_5_TURBO,+ model: ModelType = ModelType.GPT_3_5_TURBO,model_config: Any = None,) -> None:diff --git a/camel/typing.py b/camel/typing.pyindex c8dd5e2e3..319be2940 100644--- a/camel/typing.py+++ b/camel/typing.py@@ -7,7 +7,7 @@ class RoleType(Enum):DEFAULT = "default"-class ModeType(Enum):+class ModelType(Enum):GPT_3_5_TURBO = "gpt-3.5-turbo"GPT_4 = "gpt-4"GPT_4_32k = "gpt-4-32k"@@ -21,4 +21,4 @@ class TaskType(Enum):DEFAULT = "default"-__all__ = ['RoleType', 'ModeType', 'TaskType']+__all__ = ['RoleType', 'ModelType', 'TaskType']diff --git a/camel/utils.py b/camel/utils.pyindex f102cbcc9..2c8ea3e2c 100644--- a/camel/utils.py+++ b/camel/utils.py@@ -3,7 +3,7 @@ from typing import Any, Listimport tiktokenfrom camel.message import OpenAIMessage-from camel.typing import ModeType+from camel.typing import ModelTypedef count_tokens_openai_chat_models(@@ -24,18 +24,18 @@ def count_tokens_openai_chat_models(def num_tokens_from_messages(messages: List[OpenAIMessage],- model: ModeType,+ model: ModelType,) -> int:"""Returns the number of tokens used by a list of messages."""try:encoding = tiktoken.encoding_for_model(model.value)except KeyError:encoding = tiktoken.get_encoding("cl100k_base")- if model == ModeType.GPT_3_5_TURBO:+ if model == ModelType.GPT_3_5_TURBO:return count_tokens_openai_chat_models(messages, encoding)- elif model == ModeType.GPT_4:+ elif model == ModelType.GPT_4:return count_tokens_openai_chat_models(messages, encoding)- elif model == ModeType.GPT_4_32k:+ elif model == ModelType.GPT_4_32k:return count_tokens_openai_chat_models(messages, encoding)else:raise NotImplementedError(@@ -48,11 +48,11 @@ def num_tokens_from_messages(f"for information about openai chat models.")-def get_model_token_limit(model: ModeType) -> int:+def get_model_token_limit(model: ModelType) -> int:"""Returns the maximum number of tokens for a given model."""- if model == ModeType.GPT_3_5_TURBO:+ if model == ModelType.GPT_3_5_TURBO:return 4096- if model == ModeType.GPT_4:+ if model == ModelType.GPT_4:return 8192- if model == ModeType.GPT_4_32k:+ if model == ModelType.GPT_4_32k:return 32768diff --git a/examples/misalignment/task_generation.py b/examples/misalignment/task_generation.pyindex a962a614e..711e104ea 100644--- a/examples/misalignment/task_generation.py+++ b/examples/misalignment/task_generation.py@@ -9,7 +9,7 @@ from camel.generator import (SystemMessageGenerator,)from camel.message import UserChatMessage-from camel.typing import ModeType, RoleType+from camel.typing import ModelType, RoleTypedef generate_tasks(role_names: str, task_generator_prompt: str,@@ -19,7 +19,7 @@ def generate_tasks(role_names: str, task_generator_prompt: str,assistant_sys_msg = sys_msg_generator.from_role(role_type=RoleType.DEFAULT,role_prompt=role_prompt)- assistant_agent = ChatAgent(assistant_sys_msg, ModeType.GPT_3_5_TURBO)+ assistant_agent = ChatAgent(assistant_sys_msg, ModelType.GPT_3_5_TURBO)user_msg = UserChatMessage(role_name="Task Generator",content=task_generator_prompt)diff --git a/examples/translation/translator.py b/examples/translation/translator.pyindex b190aebb6..335870d61 100644--- a/examples/translation/translator.py+++ b/examples/translation/translator.py@@ -6,7 +6,7 @@ import osfrom camel.agent import ChatAgentfrom camel.generator import SystemMessageGeneratorfrom camel.message import UserChatMessage-from camel.typing import ModeType, RoleType, TaskType+from camel.typing import ModelType, RoleType, TaskTypedef translate_content(directory_path: str, file_path: str,@@ -37,7 +37,7 @@ def translate_content(directory_path: str, file_path: str,meta_dict={'<LANGUAGE>': language.capitalize()},role_tuple=('Language Translator', RoleType.ASSISTANT))- assistant_agent = ChatAgent(assistant_sys_msg, ModeType.GPT_3_5_TURBO)+ assistant_agent = ChatAgent(assistant_sys_msg, ModelType.GPT_3_5_TURBO)user_msg = UserChatMessage(role_name="Language Translator",content=msg_i_content)diff --git a/test/agent/test_chat_agent.py b/test/agent/test_chat_agent.pyindex 974fb0a2a..09a629592 100644--- a/test/agent/test_chat_agent.py+++ b/test/agent/test_chat_agent.py@@ -6,14 +6,14 @@ from camel.agent import ChatAgentfrom camel.configs import ChatGPTConfigfrom camel.generator import SystemMessageGeneratorfrom camel.message import ChatMessage-from camel.typing import ModeType, RoleType, TaskType+from camel.typing import ModelType, RoleType, TaskTypefrom camel.utils import get_model_token_limitassert os.environ.get("OPENAI_API_KEY") is not None, "Missing OPENAI_API_KEY"@pytest.mark.parametrize(- 'model', [ModeType.GPT_3_5_TURBO, ModeType.GPT_4, ModeType.GPT_4_32k])+ 'model', [ModelType.GPT_3_5_TURBO, ModelType.GPT_4, ModelType.GPT_4_32k])def test_chat_agent(model):model_config = ChatGPTConfig()system_message = SystemMessageGenerator(