Max turns

Author: KillianLucas

interpreter_1/cli.py

@@ -89,11 +89,10 @@ def _profile_to_arg_params(profile: Profile) -> Dict[str, Dict[str, Any]]:
             "default": profile.instructions,
             "help": "Appended to default system message",
         },
-        "max_budget": {
-            "flags": ["--max-budget"],
-            "type": float,
-            "default": profile.max_budget,
-            "help": f"Set maximum budget, defaults to -1 (unlimited)",
+        "input": {
+            "flags": ["--input"],
+            "default": profile.input,
+            "help": "Set initial input message",
         },
         "max_turns": {
             "flags": ["--max-turns"],
@@ -126,7 +125,6 @@ def parse_args():
 
     # Hidden arguments
     parser.add_argument("--help", "-h", action="store_true", help=argparse.SUPPRESS)
-    parser.add_argument("--input-message", help=argparse.SUPPRESS)
 
     # Add arguments programmatically from config
     arg_params = _profile_to_arg_params(profile)
@@ -198,7 +196,7 @@ async def async_load():
         sys.stdout.write("\r\033[K")  # Clear entire line
         sys.stdout.flush()
 
-    if args["input_message"] is None and sys.stdin.isatty():
+    if args["input"] is None and sys.stdin.isatty():
         from .misc.welcome import welcome_message
 
         welcome_message(args)
@@ -210,8 +208,8 @@ async def async_load():
         spinner.start()
         load_interpreter()
         spinner.stop()
-        if args["input_message"]:
-            message = args["input_message"]
+        if args["input"]:
+            message = args["input"]
         else:
             message = sys.stdin.read().strip()
             # print("---")

interpreter_1/interpreter.py

@@ -129,8 +129,6 @@ class Interpreter:
         API key being used
     api_version : str or None
         API version being used
-    max_budget : float
-        Maximum budget in USD (-1 for unlimited)
     max_turns : int
         Maximum conversation turns (-1 for unlimited)
     """
@@ -207,6 +205,7 @@ async def async_respond(self):
         model_info = litellm.get_model_info(self.model)
         if self.provider == None:
             self.provider = model_info["litellm_provider"]
+
         max_tokens = model_info["max_tokens"]
 
         system_message = self.system_message + "\n\n" + self.instructions
@@ -217,7 +216,15 @@ async def async_respond(self):
             text=system_message,
         )
 
+        # Count turns
+        turn_count = 0
+
         while True:
+            turn_count += 1
+            if turn_count > self.max_turns and self.max_turns != -1:
+                print("\nMax turns reached, exiting\n")
+                break
+
             self._spinner.start()
 
             enable_prompt_caching = False
@@ -469,10 +476,10 @@ async def async_respond(self):
                         }
                     )
                 if "editor" in self.tools:
-                    # print("Editor is not supported for non-Anthropic models.")
+                    print("\nEditor is not supported for non-Anthropic models yet.\n")
                     pass
                 if "gui" in self.tools:
-                    # print("GUI is not supported for non-Anthropic models.")
+                    print("\nGUI is not supported for non-Anthropic models yet.\n")
                     pass
 
                 if self.model.startswith("ollama/"):
@@ -629,7 +636,6 @@ def _handle_command(self, cmd: str, parts: list[str]) -> bool:
             "api_key": (str, "API key"),
             "api_version": (str, "API version"),
             "temperature": (float, "Sampling temperature (0-1)"),
-            "max_budget": (float, "Maximum budget in USD (-1 for unlimited)"),
             "max_turns": (int, "Maximum conversation turns (-1 for unlimited)"),
         }
 
@@ -799,29 +805,32 @@ def chat(self):
                 placeholder = HTML(
                     f"<{placeholder_color}>{placeholder_text}</{placeholder_color}>"
                 )
-                if self._prompt_session is None:
-                    self._prompt_session = PromptSession()
-                user_input = self._prompt_session.prompt(
-                    "> ", placeholder=placeholder
-                ).strip()
-                print()
-
-                # Handle multi-line input
-                if user_input == '"""':
-                    user_input = ""
-                    print('> """')
-                    while True:
-                        placeholder = HTML(
-                            f'<{placeholder_color}>Use """ again to finish</{placeholder_color}>'
-                        )
-                        line = self._prompt_session.prompt(
-                            "", placeholder=placeholder
-                        ).strip()
-                        if line == '"""':
-                            break
-                        user_input += line + "\n"
+                if self.input:
+                    user_input = self.input
+                else:
+                    if self._prompt_session is None:
+                        self._prompt_session = PromptSession()
+                    user_input = self._prompt_session.prompt(
+                        "> ", placeholder=placeholder
+                    ).strip()
                     print()
 
+                    # Handle multi-line input
+                    if user_input == '"""':
+                        user_input = ""
+                        print('> """')
+                        while True:
+                            placeholder = HTML(
+                                f'<{placeholder_color}>Use """ again to finish</{placeholder_color}>'
+                            )
+                            line = self._prompt_session.prompt(
+                                "", placeholder=placeholder
+                            ).strip()
+                            if line == '"""':
+                                break
+                            user_input += line + "\n"
+                        print()
+
                 message_count += 1  # Increment counter after each message
 
                 if user_input.startswith("/"):

interpreter_1/profiles.py

@@ -57,13 +57,13 @@ def __init__(self):
         self.api_version = None  # API version to use
 
         # Runtime limits
-        self.max_budget = -1  # Maximum budget in USD (-1 for unlimited)
         self.max_turns = -1  # Maximum conversation turns (-1 for unlimited)
 
         # Conversation state
         self.messages = []  # List of conversation messages
         self.system_message = SYSTEM_PROMPT  # System prompt override
         self.instructions = ""  # Additional model instructions
+        self.input = None  # Input message override
 
         # Available tools and settings
         self.tools = ["interpreter", "editor"]  # Enabled tool modules