janito 1.10.0__py3-none-any.whl → 1.11.1__py3-none-any.whl

janito/__init__.py

@@ -1 +1 @@
-__version__ = "1.10.0-dev"
+__version__ = "1.11.0"

janito/agent/conversation_api.py

@@ -9,19 +9,19 @@ from janito.agent.runtime_config import runtime_config
 from janito.agent.tool_registry import get_tool_schemas
 from janito.agent.conversation_exceptions import NoToolSupportError, EmptyResponseError
 from janito.agent.api_exceptions import ApiError
+from rich.console import Console
+from rich.status import Status
+
+console = Console()
 
 
 def _sanitize_utf8_surrogates(obj):
-    """
-    Recursively sanitize a dict/list/string by replacing surrogate codepoints with the unicode replacement character.
-    """
-    if isinstance(obj, str):
-        # Encode with surrogatepass, then decode with 'utf-8', replacing errors
-        return obj.encode("utf-8", "replace").decode("utf-8", "replace")
-    elif isinstance(obj, dict):
+    if isinstance(obj, dict):
         return {k: _sanitize_utf8_surrogates(v) for k, v in obj.items()}
     elif isinstance(obj, list):
-        return [_sanitize_utf8_surrogates(x) for x in obj]
+        return [_sanitize_utf8_surrogates(i) for i in obj]
+    elif isinstance(obj, str):
+        return obj.encode("utf-8", "surrogatepass").decode("utf-8", "ignore")
     else:
         return obj
 
@@ -75,110 +75,176 @@ def _extract_status_and_retry_after(e, error_message):
         status_code = getattr(e, "status_code")
     elif hasattr(e, "response") and hasattr(e.response, "status_code"):
         status_code = getattr(e.response, "status_code")
-        if hasattr(e.response, "headers") and e.response.headers:
-            retry_after = e.response.headers.get("Retry-After")
-    else:
-        import re
-
-        match = re.search(r"[Ee]rror code: (\d{3})", error_message)
-        if match:
-            status_code = int(match.group(1))
-        retry_after_match = re.search(r"Retry-After\['\"]?:?\s*(\d+)", error_message)
-        if retry_after_match:
-            retry_after = retry_after_match.group(1)
+    elif "429" in error_message:
+        status_code = 429
+    import re
+
+    match = re.search(r"status[ _]?code[=: ]+([0-9]+)", error_message)
+    if match:
+        status_code = int(match.group(1))
+    match_retry = re.search(r"retry[-_ ]?after[=: ]+([0-9]+)", error_message)
+    if match_retry:
+        retry_after = int(match_retry.group(1))
     return status_code, retry_after
 
 
 def _calculate_wait_time(status_code, retry_after, attempt):
-    if status_code == 429 and retry_after is not None:
-        try:
-            return int(float(retry_after))
-        except Exception:
-            return 2**attempt
+    if status_code == 429 and retry_after:
+        return max(retry_after, 2**attempt)
     return 2**attempt
 
 
-def _log_and_sleep(message, attempt, max_retries, e=None, wait_time=None):
-    print(
-        tr(
-            message,
-            attempt=attempt,
-            max_retries=max_retries,
-            e=e,
-            wait_time=wait_time,
-        )
+def _log_and_sleep(
+    message,
+    attempt,
+    max_retries,
+    e=None,
+    wait_time=None,
+    status=None,
+    waiting_message=None,
+    restore_message=None,
+):
+    status_message = tr(
+        message,
+        attempt=attempt,
+        max_retries=max_retries,
+        e=e,
+        wait_time=wait_time,
     )
-    time.sleep(wait_time)
+    if (
+        status is not None
+        and waiting_message is not None
+        and restore_message is not None
+    ):
+        original_message = status.status
+        status.update(waiting_message)
+        time.sleep(wait_time)
+        status.update(restore_message)
+    else:
+        with Status(status_message, console=console, spinner="dots"):
+            time.sleep(wait_time)
 
 
-def _handle_json_decode_error(e, attempt, max_retries):
+def _handle_json_decode_error(e, attempt, max_retries, status=None):
     if attempt < max_retries:
         wait_time = 2**attempt
-        _log_and_sleep(
-            "Invalid/malformed response from OpenAI (attempt {attempt}/{max_retries}). Retrying in {wait_time} seconds...",
-            attempt,
-            max_retries,
-            wait_time=wait_time,
-        )
+        if status is not None:
+            _log_and_sleep(
+                "Invalid/malformed response from OpenAI (attempt {attempt}/{max_retries}). Retrying in {wait_time} seconds...",
+                attempt,
+                max_retries,
+                wait_time=wait_time,
+                status=status,
+                waiting_message="Waiting after error...",
+                restore_message="Waiting for AI response...",
+            )
+        else:
+            _log_and_sleep(
+                "Invalid/malformed response from OpenAI (attempt {attempt}/{max_retries}). Retrying in {wait_time} seconds...",
+                attempt,
+                max_retries,
+                wait_time=wait_time,
+            )
         return None
     else:
         print(tr("Max retries for invalid response reached. Raising error."))
         raise e
 
 
-def _handle_general_exception(e, attempt, max_retries):
-    error_message = str(e)
+def _handle_no_tool_support(error_message):
     if "No endpoints found that support tool use" in error_message:
         print(tr("API does not support tool use."))
         raise NoToolSupportError(error_message)
-    status_code, retry_after = _extract_status_and_retry_after(e, error_message)
-    if status_code is not None:
-        if status_code == 429:
-            wait_time = _calculate_wait_time(status_code, retry_after, attempt)
-            if attempt < max_retries:
-                _log_and_sleep(
-                    "OpenAI API rate limit (429) (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
-                    attempt,
-                    max_retries,
-                    e=e,
-                    wait_time=wait_time,
-                )
-                return None
-            else:
-                print("Max retries for OpenAI API rate limit reached. Raising error.")
-                raise e
-        elif 500 <= status_code < 600:
-            wait_time = 2**attempt
-            if attempt < max_retries:
-                _log_and_sleep(
-                    "OpenAI API server error (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
-                    attempt,
-                    max_retries,
-                    e=e,
-                    wait_time=wait_time,
-                )
-                return None
-            else:
-                print("Max retries for OpenAI API server error reached. Raising error.")
-                raise e
-        elif 400 <= status_code < 500:
-            print(
-                tr(
-                    "OpenAI API client error {status_code}: {e}. Not retrying.",
-                    status_code=status_code,
-                    e=e,
-                )
+
+
+def _handle_rate_limit(e, attempt, max_retries, status, status_code, retry_after):
+    wait_time = _calculate_wait_time(status_code, retry_after, attempt)
+    if attempt < max_retries:
+        if status is not None:
+            _log_and_sleep(
+                "OpenAI API rate limit (429) (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
+                attempt,
+                max_retries,
+                e=e,
+                wait_time=wait_time,
+                status=status,
+                waiting_message="Waiting after rate limit reached...",
+                restore_message="Waiting for AI response...",
+            )
+        else:
+            _log_and_sleep(
+                "OpenAI API rate limit (429) (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
+                attempt,
+                max_retries,
+                e=e,
+                wait_time=wait_time,
             )
-            raise e
+        return None
+    else:
+        raise e
+
+
+def _handle_server_error(e, attempt, max_retries, status, status_code):
+    wait_time = 2**attempt
     if attempt < max_retries:
-        wait_time = 2**attempt
-        _log_and_sleep(
-            "OpenAI API error (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
-            attempt,
-            max_retries,
+        if status is not None:
+            _log_and_sleep(
+                "OpenAI API server error (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
+                attempt,
+                max_retries,
+                e=e,
+                wait_time=wait_time,
+                status=status,
+                waiting_message="Waiting after server error...",
+                restore_message="Waiting for AI response...",
+            )
+        else:
+            _log_and_sleep(
+                "OpenAI API server error (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
+                attempt,
+                max_retries,
+                e=e,
+                wait_time=wait_time,
+            )
+        return None
+    else:
+        print("Max retries for OpenAI API server error reached. Raising error.")
+        raise e
+
+
+def _handle_client_error(e, status_code):
+    print(
+        tr(
+            "OpenAI API client error {status_code}: {e}. Not retrying.",
+            status_code=status_code,
             e=e,
-            wait_time=wait_time,
         )
+    )
+    raise e
+
+
+def _handle_generic_error(e, attempt, max_retries, status):
+    wait_time = 2**attempt
+    if attempt < max_retries:
+        if status is not None:
+            _log_and_sleep(
+                "OpenAI API error (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
+                attempt,
+                max_retries,
+                e=e,
+                wait_time=wait_time,
+                status=status,
+                waiting_message="Waiting after error...",
+                restore_message="Waiting for AI response...",
+            )
+        else:
+            _log_and_sleep(
+                "OpenAI API error (attempt {attempt}/{max_retries}): {e}. Retrying in {wait_time} seconds...",
+                attempt,
+                max_retries,
+                e=e,
+                wait_time=wait_time,
+            )
         print(f"[DEBUG] Exception repr: {repr(e)}")
         return None
     else:
@@ -186,8 +252,30 @@ def _handle_general_exception(e, attempt, max_retries):
         raise e
 
 
+def _handle_general_exception(e, attempt, max_retries, status=None):
+    error_message = str(e)
+    _handle_no_tool_support(error_message)
+    status_code, retry_after = _extract_status_and_retry_after(e, error_message)
+    if status_code is not None:
+        if status_code == 429:
+            return _handle_rate_limit(
+                e, attempt, max_retries, status, status_code, retry_after
+            )
+        elif 500 <= status_code < 600:
+            return _handle_server_error(e, attempt, max_retries, status, status_code)
+        elif 400 <= status_code < 500:
+            _handle_client_error(e, status_code)
+    return _handle_generic_error(e, attempt, max_retries, status)
+
+
 def retry_api_call(
-    api_func, max_retries=5, *args, history=None, user_message_on_empty=None, **kwargs
+    api_func,
+    max_retries=5,
+    *args,
+    history=None,
+    user_message_on_empty=None,
+    status=None,
+    **kwargs,
 ):
     for attempt in range(1, max_retries + 1):
         try:
@@ -209,10 +297,10 @@ def retry_api_call(
             else:
                 raise
         except json.JSONDecodeError as e:
-            result = _handle_json_decode_error(e, attempt, max_retries)
+            result = _handle_json_decode_error(e, attempt, max_retries, status=status)
             if result is not None:
                 return result
         except Exception as e:
-            result = _handle_general_exception(e, attempt, max_retries)
+            result = _handle_general_exception(e, attempt, max_retries, status=status)
             if result is not None:
                 return result

janito/agent/conversation_ui.py

@@ -8,7 +8,7 @@ from rich.console import Console
 def show_spinner(message, func, *args, **kwargs):
     console = Console()
     with console.status(message, spinner="dots") as status:
-        result = func(*args, **kwargs)
+        result = func(*args, status=status, **kwargs)
         status.stop()
         return result
 

janito/agent/llm_conversation_history.py

@@ -68,3 +68,15 @@ class LLMConversationHistory:
 
     def __getitem__(self, idx):
         return self._messages[idx]
+
+    def remove_last_message(self):
+        """Remove and return the last message in the history, or None if empty."""
+        if self._messages:
+            return self._messages.pop()
+        return None
+
+    def last_message(self):
+        """Return the last message in the history, or None if empty."""
+        if self._messages:
+            return self._messages[-1]
+        return None

janito/agent/templates/profiles/system_prompt_template_base.txt.j2

@@ -1,15 +1,30 @@
+{#  General role setup
+  ex. "Search in code" -> Python Developer -> find(*.py) | Java Developer -> find(*.java)
+#}
 You are: {{ role }}
 
+{# Improves tool selection and platform specific constrains, eg, path format, C:\ vs /path #}
 You will be developing and testing in the following environment:
  Platform: {{ platform }}
  Python version: {{ python_version }}
  Shell/Environment: {{ shell_info }}
 
 Respond according to the following guidelines:
-  - Before answering check for files that might be related to the question
+{# Exploratory hint #}
+  - Before answering to the user, explore the content related to the question
+{# Define exploration order, prefers search/outline, reduces chunking roundtip #}
+  - When exploring full files content, provide empty range to read the entire files instead of chunked reads
+{# Prefix tools with purpose for user awarnesses #}
   - Before using your namespace functions, provide a concise explanation.
-  - When planning to get the entire file content, set the range line numbers to None
-  - Do not provide the code in the messages, use the namespace functions to provide the code changes.
+{# Reduce unrequest code verbosity overhead #}
+  - Use the namespace functions to deliver the code changes instead of showing the code.
+{# Drive edit mode, place holders critical as shown to be crucial to avoid corruption with code placeholders #}
   - Prefer making localized edits using string replacements. If the required change is extensive, replace the entire file instead, provide full content without placeholders.
+ {# Trying to prevent surrogates generation, found this frequently in gpt4.1/windows #}
+  - While writing code, if you need an emoji or special Unicode character in a string, then insert the actual character (e.g., 📖) directly instead of using surrogate pairs or escape sequences.
+{# Without this, the LLM choses to create files from a literal interpretation of the purpose and intention #}
   - Before creating files search the code for the location related to the file purpose
- - Once development or updates are finished, ensure that all new or updated packages, modules, functions, and methods
+{# This will trigger a search for the old names/locations to be updates #}  
+  - After moving, removing or renaming functions or classes to different modules, update all imports, references, tests, and documentation to reflect the new locations, then verify functionality.
+{# Keeping docstrings update is key to have semanatic match between prompts and code  #}
+  - Once development or updates are finished, ensure that new or updated packages, modules, functions are properly documented.

janito/agent/tools/__init__.py

@@ -3,6 +3,7 @@ from . import create_directory
 from . import create_file
 from . import replace_file
 from . import fetch_url
+from . import open_url
 from . import find_files
 from . import get_lines
 from .get_file_outline import core  # noqa: F401,F811
@@ -25,6 +26,7 @@ __all__ = [
     "create_directory",
     "create_file",
     "fetch_url",
+    "open_url",
     "find_files",
     "GetFileOutlineTool",
     "get_lines",

janito/agent/tools/create_directory.py

@@ -26,7 +26,7 @@ class CreateDirectoryTool(ToolBase):
         disp_path = display_path(file_path)
         self.report_info(
             ActionType.WRITE,
-            tr("📁 Creating directory '{disp_path}' ...", disp_path=disp_path),
+            tr("📁 Create directory '{disp_path}' ...", disp_path=disp_path),
         )
         try:
             if os.path.exists(file_path):

janito/agent/tools/create_file.py

@@ -45,7 +45,7 @@ class CreateFileTool(ToolBase):
             os.makedirs(dir_name, exist_ok=True)
         self.report_info(
             ActionType.WRITE,
-            tr("📝 Creating file '{disp_path}' ...", disp_path=disp_path),
+            tr("📝 Create file '{disp_path}' ...", disp_path=disp_path),
         )
         with open(file_path, "w", encoding="utf-8", errors="replace") as f:
             f.write(content)

janito/agent/tools/fetch_url.py

@@ -25,7 +25,7 @@ class FetchUrlTool(ToolBase):
         if not url.strip():
             self.report_warning(tr("ℹ️ Empty URL provided."))
             return tr("Warning: Empty URL provided. Operation skipped.")
-        self.report_info(ActionType.READ, tr("🌐 Fetching URL '{url}' ...", url=url))
+        self.report_info(ActionType.READ, tr("🌐 Fetch URL '{url}' ...", url=url))
         try:
             response = requests.get(url, timeout=10)
             response.raise_for_status()

janito/agent/tools/find_files.py

@@ -25,6 +25,26 @@ class FindFilesTool(ToolBase):
             If max_results is reached, appends a note to the output.
     """
 
+    def _match_directories(self, root, dirs, pat):
+        dir_output = set()
+        dir_pat = pat.rstrip("/\\")
+        for d in dirs:
+            if fnmatch.fnmatch(d, dir_pat):
+                dir_output.add(os.path.join(root, d) + os.sep)
+        return dir_output
+
+    def _match_files(self, root, files, pat):
+        file_output = set()
+        for filename in fnmatch.filter(files, pat):
+            file_output.add(os.path.join(root, filename))
+        return file_output
+
+    def _match_dirs_without_slash(self, root, dirs, pat):
+        dir_output = set()
+        for d in fnmatch.filter(dirs, pat):
+            dir_output.add(os.path.join(root, d))
+        return dir_output
+
     def run(self, paths: str, pattern: str, max_depth: int = None) -> str:
         if not pattern:
             self.report_warning(tr("ℹ️ Empty file pattern provided."))
@@ -41,7 +61,7 @@ class FindFilesTool(ToolBase):
             self.report_info(
                 ActionType.READ,
                 tr(
-                    "🔍 Searching for files '{pattern}' in '{disp_path}'{depth_msg} ...",
+                    "🔍 Search for files '{pattern}' in '{disp_path}'{depth_msg} ...",
                     pattern=pattern,
                     disp_path=disp_path,
                     depth_msg=depth_msg,
@@ -52,19 +72,13 @@ class FindFilesTool(ToolBase):
                 directory, max_depth=max_depth
             ):
                 for pat in patterns:
-                    # Directory matching: pattern ends with '/' or '\'
                     if pat.endswith("/") or pat.endswith("\\"):
-                        dir_pat = pat.rstrip("/\\")
-                        for d in dirs:
-                            if fnmatch.fnmatch(d, dir_pat):
-                                dir_output.add(os.path.join(root, d) + os.sep)
+                        dir_output.update(self._match_directories(root, dirs, pat))
                     else:
-                        # Match files
-                        for filename in fnmatch.filter(files, pat):
-                            dir_output.add(os.path.join(root, filename))
-                        # Also match directories (without trailing slash)
-                        for d in fnmatch.filter(dirs, pat):
-                            dir_output.add(os.path.join(root, d))
+                        dir_output.update(self._match_files(root, files, pat))
+                        dir_output.update(
+                            self._match_dirs_without_slash(root, dirs, pat)
+                        )
             self.report_success(
                 tr(
                     " ✅ {count} {file_word}",
@@ -72,7 +86,6 @@ class FindFilesTool(ToolBase):
                     file_word=pluralize("file", len(dir_output)),
                 )
             )
-            # If searching in '.', strip leading './' from results
             if directory.strip() == ".":
                 dir_output = {
                     p[2:] if (p.startswith("./") or p.startswith(".\\")) else p

janito/agent/tools/get_file_outline/core.py

@@ -23,7 +23,7 @@ class GetFileOutlineTool(ToolBase):
             self.report_info(
                 ActionType.READ,
                 tr(
-                    "📄 Outlining file '{disp_path}' ...",
+                    "📄 Outline file '{disp_path}' ...",
                     disp_path=display_path(file_path),
                 ),
             )