Merge branch 'master' into fix_base_agent_mypy

camel/prompts/ai_society.py

@@ -58,7 +58,7 @@ class AISocietyPromptTemplateDict(TextPromptDict):
 Please reply with the specified task in {word_limit} words or less. Do not add anything else."""
     )
 
-    ASSISTANT_PROMPT = TextPrompt(
+    ASSISTANT_PROMPT: TextPrompt = TextPrompt(
         """Never forget you are a {assistant_role} and I am a {user_role}. Never flip roles! Never instruct me!
 We share a common interest in collaborating to successfully complete a task.
 You must help me to complete the task.
@@ -75,7 +75,7 @@ class AISocietyPromptTemplateDict(TextPromptDict):
 <YOUR_SOLUTION> should be very specific, include detailed explanations and provide preferable detailed implementations and examples and lists for task-solving.
 Always end <YOUR_SOLUTION> with: Next request.""")
 
-    USER_PROMPT = TextPrompt(
+    USER_PROMPT: TextPrompt = TextPrompt(
         """Never forget you are a {user_role} and I am a {assistant_role}. Never flip roles! You will always instruct me.
 We share a common interest in collaborating to successfully complete a task.
 I must help you to complete the task.

camel/prompts/base.py

@@ -20,23 +20,23 @@
 
 
 def return_prompt_wrapper(
-    cls: T,
+    cls: Any,
     func: Callable,
-) -> Callable[..., Union[T, tuple]]:
+) -> Callable[..., Union[Any, tuple]]:
     r"""Wrapper that converts the return value of a function to an input
     class instance if it's a string.
 
     Args:
-        cls (type): The class to convert to.
+        cls (Any): The class to convert to.
         func (Callable): The function to decorate.
 
     Returns:
-        Callable[..., Union[T, tuple]]: Decorated function that
+        Callable[..., Union[Any, str]]: Decorated function that
             returns the decorated class instance if the return value is a
             string.
     """
 
-    def wrapper(*args: Any, **kwargs: Any) -> Union[T, tuple]:
+    def wrapper(*args: Any, **kwargs: Any) -> Union[Any, str]:
         r"""Wrapper function that performs the conversion to :obj:`TextPrompt`
             instance.
 
@@ -45,7 +45,7 @@ def wrapper(*args: Any, **kwargs: Any) -> Union[T, tuple]:
             **kwargs (Any): Arbitrary keyword arguments.
 
         Returns:
-            Union[TextPrompt, tuple]: The converted return value.
+            Union[Any, str]: The converted return value.
         """
         result = func(*args, **kwargs)
         if isinstance(result, str) and not isinstance(result, cls):
@@ -185,7 +185,7 @@ def execute(
             sys.stdout = output_str
 
             global_vars = global_vars or globals()
-            local_vars = {}
+            local_vars: Dict[str, Any] = {}
             exec(
                 self,
                 global_vars,

camel/utils.py

@@ -16,7 +16,7 @@
 import time
 import zipfile
 from functools import wraps
-from typing import Any, Callable, List, Optional, Set, TypeVar
+from typing import Any, Callable, List, Optional, Set, TypeVar, cast
 
 import requests
 import tiktoken
@@ -167,7 +167,7 @@ def wrapper(self, *args, **kwargs):
         else:
             raise ValueError('OpenAI API key not found.')
 
-    return wrapper
+    return cast(F, wrapper)
 
 
 def print_text_animated(text, delay: float = 0.02, end: str = ""):

pyproject.toml

@@ -32,6 +32,7 @@ tenacity = "^8"
 tiktoken = "^0"
 colorama = "^0"
 types-colorama = "^0"
+types-requests = "^2"
 yapf = "^0"
 isort = "^5"
 flake8 = "^6"