janito 1.1.0__tar.gz → 1.2.1__tar.gz

{janito-1.1.0 → janito-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 1.1.0
+Version: 1.2.1
 Summary: An agent framework with built-in tools.
 Author-email: João Pinto <joao.pinto@gmail.com>
 License: MIT
@@ -17,6 +17,7 @@ Requires-Dist: rich
 Requires-Dist: openai
 Requires-Dist: flask
 Requires-Dist: pathspec
+Requires-Dist: beautifulsoup4
 Dynamic: license-file
 
 # 🚀 Janito: Natural Language Code Editing Agent
@@ -66,7 +67,7 @@ Janito is a command-line and web-based AI agent designed to **edit code and mana
 | Key                 | Description                                                                                 | How to set                                                      | Default                                    |
 |---------------------|---------------------------------------------------------------------------------------------|-----------------------------------------------------------------|--------------------------------------------|
 | `api_key`           | API key for OpenAI-compatible service                                                       | `--set-api-key`, config file                                    | _None_ (required)                          |
-| `model`             | Model name to use                                                                           | `--set-local-config model=...` or `--set-global-config`         | `openrouter/optimus-alpha`                 |
+| `model`             | Model name to use                                                                           | `--model` (session only), `--set-local-config model=...`, or `--set-global-config`         | `openai/gpt-4.1`                 |
 | `base_url`          | API base URL (OpenAI-compatible endpoint)                                                   | `--set-local-config base_url=...` or `--set-global-config`      | `https://openrouter.ai/api/v1`            |
 | `role`              | Role description for system prompt                                                          | CLI `--role` or config                                          | "software engineer"                     |
 | `system_prompt`     | Override the entire system prompt as a raw string.                                          | CLI `--system-prompt` or config                                 | _Template-generated prompt_               |

{janito-1.1.0 → janito-1.2.1}/README.md

@@ -45,7 +45,7 @@ Janito is a command-line and web-based AI agent designed to **edit code and mana
 | Key                 | Description                                                                                 | How to set                                                      | Default                                    |
 |---------------------|---------------------------------------------------------------------------------------------|-----------------------------------------------------------------|--------------------------------------------|
 | `api_key`           | API key for OpenAI-compatible service                                                       | `--set-api-key`, config file                                    | _None_ (required)                          |
-| `model`             | Model name to use                                                                           | `--set-local-config model=...` or `--set-global-config`         | `openrouter/optimus-alpha`                 |
+| `model`             | Model name to use                                                                           | `--model` (session only), `--set-local-config model=...`, or `--set-global-config`         | `openai/gpt-4.1`                 |
 | `base_url`          | API base URL (OpenAI-compatible endpoint)                                                   | `--set-local-config base_url=...` or `--set-global-config`      | `https://openrouter.ai/api/v1`            |
 | `role`              | Role description for system prompt                                                          | CLI `--role` or config                                          | "software engineer"                     |
 | `system_prompt`     | Override the entire system prompt as a raw string.                                          | CLI `--system-prompt` or config                                 | _Template-generated prompt_               |

janito-1.2.1/janito/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.1"

{janito-1.1.0 → janito-1.2.1}/janito/agent/agent.py

@@ -60,6 +60,10 @@ class Agent:
             self.client, self.model, self.tool_handler
         )
 
+    @property
+    def usage_history(self):
+        return self.conversation_handler.usage_history
+
     def chat(self, messages, on_content=None, on_tool_progress=None, verbose_response=False, spinner=False, max_tokens=None):
         import time
         from janito.agent.conversation import ProviderError

{janito-1.1.0 → janito-1.2.1}/janito/agent/config.py

@@ -59,7 +59,7 @@ class FileConfig(BaseConfig):
 
 CONFIG_OPTIONS = {
     "api_key": "API key for OpenAI-compatible service (required)",
-    "model": "Model name to use (e.g., 'openrouter/optimus-alpha')",
+    "model": "Model name to use (e.g., 'openai/gpt-4.1')",
     "base_url": "API base URL (OpenAI-compatible endpoint)",
     "role": "Role description for the system prompt (e.g., 'software engineer')",
     "system_prompt": "Override the entire system prompt text",

{janito-1.1.0 → janito-1.2.1}/janito/agent/config_defaults.py

@@ -1,7 +1,7 @@
 # Centralized config defaults for Janito
 CONFIG_DEFAULTS = {
     "api_key": None,  # Must be set by user
-    "model": "openrouter/optimus-alpha",    # Default model
+    "model": "openai/gpt-4.1",    # Default model
     "base_url": "https://openrouter.ai/api/v1",
     "role": "software engineer",
     "system_prompt": None,  # None means auto-generate from role

janito-1.2.1/janito/agent/config_utils.py

@@ -0,0 +1,9 @@
+def merge_configs(*configs):
+    """
+    Merge multiple config-like objects (with .all()) into one dict.
+    Later configs override earlier ones.
+    """
+    merged = {}
+    for cfg in configs:
+        merged.update(cfg.all())
+    return merged

{janito-1.1.0 → janito-1.2.1}/janito/agent/conversation.py

@@ -16,6 +16,7 @@ class ConversationHandler:
         self.client = client
         self.model = model
         self.tool_handler = tool_handler
+        self.usage_history = []
 
     def handle_conversation(self, messages, max_rounds=50, on_content=None, on_tool_progress=None, verbose_response=False, spinner=False, max_tokens=None):
         if not messages:
@@ -31,6 +32,12 @@ class ConversationHandler:
         if resolved_max_tokens is None:
             resolved_max_tokens = unified_config.get('max_tokens', 200000)
 
+        # Ensure max_tokens is always an int (handles config/CLI string values)
+        try:
+            resolved_max_tokens = int(resolved_max_tokens)
+        except (TypeError, ValueError):
+            raise ValueError(f"max_tokens must be an integer, got: {resolved_max_tokens!r}")
+
         for _ in range(max_rounds):
             if spinner:
                                 # Calculate word count for all messages
@@ -89,16 +96,23 @@ class ConversationHandler:
 
             # If no tool calls, return the assistant's message and usage info
             if not choice.message.tool_calls:
+                # Store usage info in usage_history, linked to the next assistant message index
+                assistant_idx = len([m for m in messages if m.get('role') == 'assistant'])
+                self.usage_history.append({"assistant_index": assistant_idx, "usage": usage_info})
                 return {
-    "content": choice.message.content,
-    "usage": usage_info
-}
+                    "content": choice.message.content,
+                    "usage": usage_info,
+                    "usage_history": self.usage_history
+                }
 
             tool_responses = []
             for tool_call in choice.message.tool_calls:
                 result = self.tool_handler.handle_tool_call(tool_call, on_progress=on_tool_progress)
                 tool_responses.append({"tool_call_id": tool_call.id, "content": result})
 
+            # Store usage info in usage_history, linked to the next assistant message index
+            assistant_idx = len([m for m in messages if m.get('role') == 'assistant'])
+            self.usage_history.append({"assistant_index": assistant_idx, "usage": usage_info})
             messages.append({"role": "assistant", "content": choice.message.content, "tool_calls": [tc.to_dict() for tc in choice.message.tool_calls]})
 
             for tr in tool_responses:

{janito-1.1.0 → janito-1.2.1}/janito/agent/tools/__init__.py

@@ -1,11 +1,9 @@
 from .ask_user import ask_user
-from .create_directory import create_directory
-from .create_file import create_file
-from .remove_file import remove_file
+from .file_ops import create_directory, create_file, remove_file, move_file
 from .view_file import view_file
 from .find_files import find_files
 from .search_text import search_text
 from .bash_exec import bash_exec
 from .fetch_url import fetch_url
-from .move_file import move_file
+
 from .file_str_replace import file_str_replace

janito-1.2.1/janito/agent/tools/file_ops.py

@@ -0,0 +1,67 @@
+import os
+import shutil
+from janito.agent.tool_handler import ToolHandler
+from janito.agent.tools.rich_utils import print_info, print_success, print_error, format_path
+
+@ToolHandler.register_tool
+def create_file(path: str, content: str, overwrite: bool = False) -> str:
+    if os.path.exists(path):
+        if os.path.isdir(path):
+            print_error("❌ Error: is a directory")
+            return f"❌ Cannot create file: '{path}' is an existing directory."
+        if not overwrite:
+            print_error(f"❗ Error: file '{path}' exists and overwrite is False")
+            return f"❗ Cannot create file: '{path}' already exists and overwrite is False."
+    print_info(f"📝 Creating file: '{format_path(path)}' ... ")
+    try:
+        with open(path, "w", encoding="utf-8") as f:
+            f.write(content)
+        print_success("✅ Success")
+        return f"✅ Successfully created the file at '{path}'."
+    except Exception as e:
+        print_error(f"❌ Error: {e}")
+        return f"❌ Failed to create the file at '{path}': {e}"
+
+@ToolHandler.register_tool
+def remove_file(path: str) -> str:
+    print_info(f"🗑️ Removing file: '{format_path(path)}' ... ")
+    try:
+        os.remove(path)
+        print_success("✅ Success")
+        return f"✅ Successfully deleted the file at '{path}'."
+    except Exception as e:
+        print_error(f"❌ Error: {e}")
+        return f"❌ Failed to delete the file at '{path}': {e}"
+
+@ToolHandler.register_tool
+def move_file(source_path: str, destination_path: str, overwrite: bool = False) -> str:
+    print_info(f"🚚 Moving '{format_path(source_path)}' to '{format_path(destination_path)}' ... ")
+    try:
+        if not os.path.exists(source_path):
+            print_error("❌ Error: source does not exist")
+            return f"❌ Source path '{source_path}' does not exist."
+        if os.path.exists(destination_path):
+            if not overwrite:
+                print_error("❌ Error: destination exists and overwrite is False")
+                return f"❌ Destination path '{destination_path}' already exists. Use overwrite=True to replace it."
+            if os.path.isdir(destination_path):
+                shutil.rmtree(destination_path)
+            else:
+                os.remove(destination_path)
+        shutil.move(source_path, destination_path)
+        print_success("✅ Success")
+        return f"✅ Successfully moved '{source_path}' to '{destination_path}'."
+    except Exception as e:
+        print_error(f"❌ Error: {e}")
+        return f"❌ Failed to move '{source_path}' to '{destination_path}': {e}"
+
+@ToolHandler.register_tool
+def create_directory(path: str) -> str:
+    print_info(f"📁 Creating directory: '{format_path(path)}' ... ")
+    try:
+        os.makedirs(path, exist_ok=True)
+        print_success("✅ Success")
+        return f"✅ Directory '{path}' created successfully."
+    except Exception as e:
+        print_error(f"❌ Error: {e}")
+        return f"❌ Error creating directory '{path}': {e}"

{janito-1.1.0 → janito-1.2.1}/janito/cli/_print_config.py

@@ -1,22 +1,22 @@
 import os
-from rich import print
+from janito.agent.tools.rich_utils import print_info, print_success, print_error, print_warning, print_magenta
 from ._utils import home_shorten
 
 def print_config_items(items, color_label=None):
     if not items:
         return
     if color_label:
-        print(color_label)
+        print_info(color_label)
     home = os.path.expanduser("~")
     for key, value in items.items():
         if key == "system_prompt" and isinstance(value, str):
             if value.startswith(home):
                 print(f"{key} = {home_shorten(value)}")
             else:
-                print(f"{key} = {value}")
+                print_info(f"{key} = {value}")
         else:
-            print(f"{key} = {value}")
-    print()
+            print_info(f"{key} = {value}")
+    print_info("")
 
 def print_full_config(local_config, global_config, unified_config, config_defaults, console=None):
     """
@@ -28,9 +28,9 @@ def print_full_config(local_config, global_config, unified_config, config_defaul
     local_keys = set(local_config.all().keys())
     global_keys = set(global_config.all().keys())
     all_keys = set(config_defaults.keys()) | global_keys | local_keys
-    out = print if console is None else console.print
+    out = print_info if console is None else console.print
     if not (local_keys or global_keys):
-        out("No configuration found.")
+        print_warning("No configuration found.")
     else:
         for key in sorted(local_keys):
             if key == "api_key":
@@ -57,12 +57,12 @@ def print_full_config(local_config, global_config, unified_config, config_defaul
         shown_keys = set(local_items.keys()) | set(global_items.keys())
         default_items = {k: v for k, v in config_defaults.items() if k not in shown_keys and k != 'api_key'}
         if default_items:
-            out("[green]🟢 Defaults (not set in config files)[/green]")
+            print_magenta("[green]🟢 Defaults (not set in config files)[/green]")
             from pathlib import Path
             template_path = Path(__file__).parent.parent / "templates" / "system_instructions.j2"
             for key, value in default_items.items():
                 if key == "system_prompt" and value is None:
-                    out(f"{key} = (default template path: {home_shorten(str(template_path))})")
+                    print_info(f"{key} = (default template path: {home_shorten(str(template_path))})")
                 else:
-                    out(f"{key} = {value}")
-            out("")
+                    print_info(f"{key} = {value}")
+            print_info("")

{janito-1.1.0 → janito-1.2.1}/janito/cli/arg_parser.py

@@ -5,6 +5,7 @@ def create_parser():
     parser = argparse.ArgumentParser(description="OpenRouter API call using OpenAI Python SDK")
     parser.add_argument("prompt", type=str, nargs="?", help="Prompt to send to the model")
     parser.add_argument("--max-tokens", type=int, default=None, help="Maximum tokens for model response (overrides config, default: 200000)")
+    parser.add_argument("--model", type=str, default=None, help="Model name to use for this session (overrides config, does not persist)")
 
     # Mutually exclusive group for system prompt options
     group = parser.add_mutually_exclusive_group()

{janito-1.1.0 → janito-1.2.1}/janito/cli/runner.py

@@ -35,6 +35,10 @@ def run_cli(args):
     if args.role:
         runtime_config.set('role', args.role)
 
+    # Set runtime_config['model'] if --model is provided (highest priority, session only)
+    if getattr(args, 'model', None):
+        runtime_config.set('model', args.model)
+
     # New logic for --system-file
     system_prompt = None
     if getattr(args, 'system_file', None):
@@ -54,6 +58,7 @@ def run_cli(args):
 
     if args.show_system:
         api_key = get_api_key()
+        # Always get model from unified_config (which checks runtime_config first)
         model = unified_config.get('model')
         agent = Agent(api_key=api_key, model=model)
         print("Model:", agent.model)
@@ -64,6 +69,7 @@ def run_cli(args):
 
     api_key = get_api_key()
 
+    # Always get model from unified_config (which checks runtime_config first)
     model = unified_config.get('model')
     base_url = unified_config.get('base_url', 'https://openrouter.ai/api/v1')
     # Handle --enable-tools flag
@@ -112,4 +118,4 @@ def run_cli(args):
         except EmptyResponseError as e:
             print(f"[red]Error:[/red] {e}")
     except KeyboardInterrupt:
-        print("[yellow]Interrupted by user.[/yellow]")
+        console.print("[yellow]Interrupted by user.[/yellow]")

{janito-1.1.0 → janito-1.2.1}/janito/templates/system_instructions.j2

@@ -18,7 +18,7 @@ If in doubt during editing, use the `ask_user` function to get additional inform
 
 When you need to make changes to a file, consider the following:
 
-- Use `file_str_replace` when you want to update or fix specific text fragments within a file without altering the rest of its content. It is preferred over full file replacement when:  
+- Use `file_str_replace` when you want to update or fix specific text fragments within a file without altering the rest of its content. It is preferred over full file replacement when:
     - Only small, targeted changes are needed.
     - You want to avoid the risk of accidentally overwriting unrelated content.
     - The file is large, and rewriting the entire file would be inefficient.
@@ -34,5 +34,5 @@ After performing changes:
 
 - Review the README content if there are user-exposed or public API changes.
 - Use `git commit` to save the changes. Unless requested otherwise, review `git diff` when composing the commit message.
-- Review `docs/structure.md` considering discovered, created, or modified files.
+- Update `docs/structure.md` considering discovered, created, or modified files.
 </finishing>

janito-1.2.1/janito/web/app.py

@@ -0,0 +1,189 @@
+from flask import Flask, request, render_template, Response, send_from_directory, session, jsonify
+from queue import Queue
+import json
+from janito.agent.queued_tool_handler import QueuedToolHandler
+from janito.agent.agent import Agent
+from janito.agent.config import get_api_key
+from janito.render_prompt import render_system_prompt
+import os
+import threading
+
+from janito.agent.runtime_config import unified_config
+
+# Render system prompt from config
+role = unified_config.get("role", "software engineer")
+system_prompt_override = unified_config.get("system_prompt")
+if system_prompt_override:
+    system_prompt = system_prompt_override
+else:
+    system_prompt = render_system_prompt(role)
+
+app = Flask(
+    __name__,
+    static_url_path='/static',
+    static_folder=os.path.join(os.path.dirname(__file__), 'static')
+)
+
+# Secret key for session management
+app.secret_key = 'replace_with_a_secure_random_secret_key'
+
+# Path for persistent conversation storage
+conversation_file = os.path.expanduser('~/.janito/last_conversation_web.json')
+
+# Initially no conversation loaded
+conversation = None
+
+
+# Global event queue for streaming
+stream_queue = Queue()
+
+# Create a QueuedToolHandler with the queue
+queued_handler = QueuedToolHandler(stream_queue)
+
+# Instantiate the Agent with config-driven parameters
+agent = Agent(
+    api_key=unified_config.get("api_key"),
+    model=unified_config.get("model"),
+    base_url=unified_config.get("base_url"),
+    tool_handler=queued_handler
+)
+
+@app.route('/get_config')
+def get_config():
+    # Expose full config for the web app: defaults, effective, runtime (mask api_key)
+    from janito.agent.runtime_config import unified_config
+    from janito.agent.config_defaults import CONFIG_DEFAULTS
+    # Start with defaults
+    config = dict(CONFIG_DEFAULTS)
+    # Overlay effective config
+    config.update(unified_config.effective_cfg.all())
+    # Overlay runtime config (highest priority)
+    config.update(unified_config.runtime_cfg.all())
+    api_key = config.get("api_key")
+    if api_key:
+        config["api_key"] = api_key[:4] + '...' + api_key[-4:] if len(api_key) > 8 else '***'
+    return jsonify(config)
+
+@app.route('/set_config', methods=['POST'])
+def set_config():
+    from janito.agent.runtime_config import runtime_config
+    from janito.agent.config import CONFIG_OPTIONS
+    from janito.agent.config_defaults import CONFIG_DEFAULTS
+    data = request.get_json()
+    key = data.get('key')
+    value = data.get('value')
+    if key not in CONFIG_OPTIONS:
+        return jsonify({'status': 'error', 'message': f'Invalid config key: {key}'}), 400
+    # Type coercion based on defaults
+    default = CONFIG_DEFAULTS.get(key)
+    if default is not None and value is not None:
+        try:
+            if isinstance(default, bool):
+                value = bool(value)
+            elif isinstance(default, int):
+                value = int(value)
+            elif isinstance(default, float):
+                value = float(value)
+            # else: leave as string or None
+        except Exception as e:
+            return jsonify({'status': 'error', 'message': f'Invalid value type for {key}: {e}'}), 400
+    runtime_config.set(key, value)
+    # Mask api_key in response
+    resp_value = value
+    if key == 'api_key' and value:
+        resp_value = value[:4] + '...' + value[-4:] if len(value) > 8 else '***'
+    return jsonify({'status': 'ok', 'key': key, 'value': resp_value})
+
+
+@app.route('/favicon.ico')
+def favicon():
+    return send_from_directory(
+        os.path.join(app.root_path, 'static'),
+        'favicon.ico',
+        mimetype='image/vnd.microsoft.icon'
+    )
+
+
+@app.route('/')
+def index():
+    return render_template('index.html')
+
+@app.route('/load_conversation')
+def load_conversation():
+    global conversation
+    try:
+        with open(conversation_file, 'r') as f:
+            conversation = json.load(f)
+    except (FileNotFoundError, json.JSONDecodeError):
+        conversation = []
+    return jsonify({'status': 'ok', 'conversation': conversation})
+
+@app.route('/new_conversation', methods=['POST'])
+def new_conversation():
+    global conversation
+    conversation = []
+    return jsonify({'status': 'ok'})
+
+@app.route('/execute_stream', methods=['POST'])
+def execute_stream():
+    data = request.get_json()
+    user_input = data.get('input', '')
+
+    global conversation
+    if conversation is None:
+        # If no conversation loaded, start a new one
+        conversation = []
+
+    # Always start with the system prompt as the first message
+    if not conversation or conversation[0]['role'] != 'system':
+        conversation.insert(0, {"role": "system", "content": system_prompt})
+
+    # Append the new user message
+    conversation.append({"role": "user", "content": user_input})
+
+    def run_agent():
+        try:
+            response = agent.chat(
+                conversation,
+                on_content=lambda data: stream_queue.put({"type": "content", "content": data.get("content")})
+            )
+            if response and 'content' in response:
+                conversation.append({"role": "assistant", "content": response['content']})
+            try:
+                os.makedirs(os.path.dirname(conversation_file), exist_ok=True)
+                with open(conversation_file, 'w') as f:
+                    json.dump(conversation, f, indent=2)
+            except Exception as e:
+                print(f"Error saving conversation: {e}")
+        except Exception as e:
+            import traceback
+            tb = traceback.format_exc()
+            stream_queue.put({"type": "error", "error": str(e), "traceback": tb})
+        finally:
+            stream_queue.put(None)
+
+    threading.Thread(target=run_agent, daemon=True).start()
+
+    def generate():
+        while True:
+            content = stream_queue.get()
+            if content is None:
+                break
+            if isinstance(content, tuple) and content[0] == 'tool_progress':
+                message = json.dumps({"type": "tool_progress", "data": content[1]})
+            else:
+                message = json.dumps(content)
+            yield f"data: {message}\n\n"
+            import sys
+            sys.stdout.flush()
+
+    return Response(
+        generate(),
+        mimetype='text/event-stream',
+        headers={
+            'Cache-Control': 'no-cache',
+            'X-Accel-Buffering': 'no',
+            'Connection': 'keep-alive',
+            'Transfer-Encoding': 'chunked'
+        }
+    )

{janito-1.1.0 → janito-1.2.1}/janito.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 1.1.0
+Version: 1.2.1
 Summary: An agent framework with built-in tools.
 Author-email: João Pinto <joao.pinto@gmail.com>
 License: MIT
@@ -17,6 +17,7 @@ Requires-Dist: rich
 Requires-Dist: openai
 Requires-Dist: flask
 Requires-Dist: pathspec
+Requires-Dist: beautifulsoup4
 Dynamic: license-file
 
 # 🚀 Janito: Natural Language Code Editing Agent
@@ -66,7 +67,7 @@ Janito is a command-line and web-based AI agent designed to **edit code and mana
 | Key                 | Description                                                                                 | How to set                                                      | Default                                    |
 |---------------------|---------------------------------------------------------------------------------------------|-----------------------------------------------------------------|--------------------------------------------|
 | `api_key`           | API key for OpenAI-compatible service                                                       | `--set-api-key`, config file                                    | _None_ (required)                          |
-| `model`             | Model name to use                                                                           | `--set-local-config model=...` or `--set-global-config`         | `openrouter/optimus-alpha`                 |
+| `model`             | Model name to use                                                                           | `--model` (session only), `--set-local-config model=...`, or `--set-global-config`         | `openai/gpt-4.1`                 |
 | `base_url`          | API base URL (OpenAI-compatible endpoint)                                                   | `--set-local-config base_url=...` or `--set-global-config`      | `https://openrouter.ai/api/v1`            |
 | `role`              | Role description for system prompt                                                          | CLI `--role` or config                                          | "software engineer"                     |
 | `system_prompt`     | Override the entire system prompt as a raw string.                                          | CLI `--system-prompt` or config                                 | _Template-generated prompt_               |

{janito-1.1.0 → janito-1.2.1}/janito.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ janito/agent/__init__.py
 janito/agent/agent.py
 janito/agent/config.py
 janito/agent/config_defaults.py
+janito/agent/config_utils.py
 janito/agent/conversation.py
 janito/agent/queued_tool_handler.py
 janito/agent/runtime_config.py
@@ -21,14 +22,11 @@ janito/agent/tool_handler.py
 janito/agent/tools/__init__.py
 janito/agent/tools/ask_user.py
 janito/agent/tools/bash_exec.py
-janito/agent/tools/create_directory.py
-janito/agent/tools/create_file.py
 janito/agent/tools/fetch_url.py
+janito/agent/tools/file_ops.py
 janito/agent/tools/file_str_replace.py
 janito/agent/tools/find_files.py
 janito/agent/tools/gitignore_utils.py
-janito/agent/tools/move_file.py
-janito/agent/tools/remove_file.py
 janito/agent/tools/rich_live.py
 janito/agent/tools/rich_utils.py
 janito/agent/tools/search_text.py

{janito-1.1.0 → janito-1.2.1}/janito.egg-info/requires.txt

@@ -2,3 +2,4 @@ rich
 openai
 flask
 pathspec
+beautifulsoup4

{janito-1.1.0 → janito-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "janito"
-version = "1.1.0"
+version = "1.2.1"
 description = "An agent framework with built-in tools."
 authors = [
     { name = "João Pinto", email = "joao.pinto@gmail.com" }
@@ -10,7 +10,8 @@ dependencies = [
     "rich",
     "openai",
     "flask",
-    "pathspec"
+    "pathspec",
+    "beautifulsoup4"
 ]
 license = { text = "MIT" }
 readme = "README.md"

janito-1.1.0/janito/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.1.0"

janito-1.1.0/janito/agent/tools/create_directory.py

@@ -1,19 +0,0 @@
-import os
-from janito.agent.tool_handler import ToolHandler
-from janito.agent.tools.rich_utils import print_info, print_success, print_error, format_path
-
-@ToolHandler.register_tool
-def create_directory(path: str) -> str:
-    """
-    Create a directory at the specified path.
-
-    path: The path of the directory to create
-    """
-    print_info(f"📁 Creating directory: '{format_path(path)}' ... ")
-    try:
-        os.makedirs(path, exist_ok=True)
-        print_success("✅ Success")
-        return f"✅ Directory '{path}' created successfully."
-    except Exception as e:
-        print_error(f"❌ Error: {e}")
-        return f"❌ Error creating directory '{path}': {e}"

janito-1.1.0/janito/agent/tools/create_file.py

@@ -1,43 +0,0 @@
-import os
-from janito.agent.tool_handler import ToolHandler
-from janito.agent.tools.rich_utils import print_info, print_success, print_error, format_path
-
-@ToolHandler.register_tool
-def create_file(path: str, content: str, overwrite: bool = False) -> str:
-    """
-    Create a file with the specified content.
-
-    path: The path of the file to create
-    content: The content to write into the file
-    overwrite: Whether to overwrite the file if it exists (default: False)
-    """
-    old_lines = None
-    if os.path.exists(path):
-        if os.path.isdir(path):
-            print_error("❌ Error: is a directory")
-            return f"❌ Cannot create file: '{path}' is an existing directory."
-        if overwrite:
-            try:
-                with open(path, "r", encoding="utf-8") as f:
-                    old_lines = sum(1 for _ in f)
-            except Exception:
-                old_lines = 'unknown'
-        else:
-            print_error(f"❗ Error: file '{path}' exists and overwrite is False")
-            return f"❗ Cannot create file: '{path}' already exists and overwrite is False."
-
-    new_lines = content.count('\n') + 1 if content else 0
-
-    if old_lines is not None:
-        print_info(f"♻️  Replacing file: '{format_path(path)}' (line count: {old_lines} -> {new_lines}) ... ")
-    else:
-        print_info(f"📝 Creating file: '{format_path(path)}' (lines: {new_lines}) ... ")
-
-    try:
-        with open(path, "w", encoding="utf-8") as f:
-            f.write(content)
-        print_success("✅ Success")
-        return f"✅ Successfully created the file at '{path}'."
-    except Exception as e:
-        print_error(f"❌ Error: {e}")
-        return f"❌ Failed to create the file at '{path}': {e}"

janito-1.1.0/janito/agent/tools/move_file.py

@@ -1,37 +0,0 @@
-import shutil
-import os
-from janito.agent.tool_handler import ToolHandler
-from janito.agent.tools.rich_utils import print_info, print_success, print_error, format_path
-
-
-@ToolHandler.register_tool
-def move_file(source_path: str, destination_path: str, overwrite: bool = False) -> str:
-    """
-    Move a file or directory from source_path to destination_path.
-
-    source_path: The path of the file or directory to move
-    destination_path: The target path
-    overwrite: Whether to overwrite the destination if it exists (default: False)
-    """
-    print_info(f"🚚 Moving '{format_path(source_path)}' to '{format_path(destination_path)}' ... ")
-    try:
-        if not os.path.exists(source_path):
-            print_error("❌ Error: source does not exist")
-            return f"❌ Source path '{source_path}' does not exist."
-
-        if os.path.exists(destination_path):
-            if not overwrite:
-                print_error("❌ Error: destination exists and overwrite is False")
-                return f"❌ Destination path '{destination_path}' already exists. Use overwrite=True to replace it."
-            # Remove destination if overwrite is True
-            if os.path.isdir(destination_path):
-                shutil.rmtree(destination_path)
-            else:
-                os.remove(destination_path)
-
-        shutil.move(source_path, destination_path)
-        print_success("✅ Success")
-        return f"✅ Successfully moved '{source_path}' to '{destination_path}'."
-    except Exception as e:
-        print_error(f"❌ Error: {e}")
-        return f"❌ Failed to move '{source_path}' to '{destination_path}': {e}"

janito-1.1.0/janito/agent/tools/remove_file.py

@@ -1,19 +0,0 @@
-import os
-from janito.agent.tool_handler import ToolHandler
-from janito.agent.tools.rich_utils import print_info, print_success, print_error, format_path
-
-@ToolHandler.register_tool
-def remove_file(path: str) -> str:
-    """
-    Remove a specified file.
-
-    path: The path of the file to remove
-    """
-    print_info(f"🗑️ Removing file: '{format_path(path)}' ... ")
-    try:
-        os.remove(path)
-        print_success("✅ Success")
-        return f"✅ Successfully deleted the file at '{path}'."
-    except Exception as e:
-        print_error(f"❌ Error: {e}")
-        return f"❌ Failed to delete the file at '{path}': {e}"

janito-1.1.0/janito/web/app.py

@@ -1,132 +0,0 @@
-from flask import Flask, request, render_template, Response, send_from_directory, session, jsonify
-from queue import Queue
-import json
-from janito.agent.queued_tool_handler import QueuedToolHandler
-from janito.agent.agent import Agent
-from janito.agent.config import get_api_key
-from janito.render_prompt import render_system_prompt
-import os
-import threading
-
-# Render system prompt once
-system_prompt = render_system_prompt("software engineer")
-
-app = Flask(
-    __name__,
-    static_url_path='/static',
-    static_folder=os.path.join(os.path.dirname(__file__), 'static')
-)
-
-# Secret key for session management
-app.secret_key = 'replace_with_a_secure_random_secret_key'
-
-# Path for persistent conversation storage
-conversation_file = os.path.expanduser('~/.janito/last_conversation_web.json')
-
-# Initially no conversation loaded
-conversation = None
-
-
-# Global event queue for streaming
-stream_queue = Queue()
-
-# Create a QueuedToolHandler with the queue
-queued_handler = QueuedToolHandler(stream_queue)
-
-# Instantiate the Agent with the custom tool handler
-agent = Agent(
-    api_key=get_api_key(),
-    tool_handler=queued_handler
-)
-
-@app.route('/get_model_name')
-def get_model_name():
-    return jsonify({"model": agent.model})
-
-
-@app.route('/favicon.ico')
-def favicon():
-    return send_from_directory(
-        os.path.join(app.root_path, 'static'),
-        'favicon.ico',
-        mimetype='image/vnd.microsoft.icon'
-    )
-
-
-@app.route('/')
-def index():
-    return render_template('index.html')
-
-@app.route('/load_conversation')
-def load_conversation():
-    global conversation
-    try:
-        with open(conversation_file, 'r') as f:
-            conversation = json.load(f)
-    except (FileNotFoundError, json.JSONDecodeError):
-        conversation = []
-    return jsonify({'status': 'ok', 'conversation': conversation})
-
-@app.route('/new_conversation', methods=['POST'])
-def new_conversation():
-    global conversation
-    conversation = []
-    return jsonify({'status': 'ok'})
-
-@app.route('/execute_stream', methods=['POST'])
-def execute_stream():
-    data = request.get_json()
-    user_input = data.get('input', '')
-
-    global conversation
-    if conversation is None:
-        # If no conversation loaded, start a new one
-        conversation = []
-
-    # Always start with the system prompt as the first message
-    if not conversation or conversation[0]['role'] != 'system':
-        conversation.insert(0, {"role": "system", "content": system_prompt})
-
-    # Append the new user message
-    conversation.append({"role": "user", "content": user_input})
-
-    def run_agent():
-        response = agent.chat(
-            conversation,
-            on_content=lambda data: stream_queue.put({"type": "content", "content": data.get("content")})
-        )
-        if response and 'content' in response:
-            conversation.append({"role": "assistant", "content": response['content']})
-        try:
-            os.makedirs(os.path.dirname(conversation_file), exist_ok=True)
-            with open(conversation_file, 'w') as f:
-                json.dump(conversation, f, indent=2)
-        except Exception as e:
-            print(f"Error saving conversation: {e}")
-        stream_queue.put(None)
-
-    threading.Thread(target=run_agent, daemon=True).start()
-
-    def generate():
-        while True:
-            content = stream_queue.get()
-            if content is None:
-                break
-            if isinstance(content, tuple) and content[0] == 'tool_progress':
-                message = json.dumps({"type": "tool_progress", "data": content[1]})
-            else:
-                message = json.dumps(content)
-            yield f"data: {message}\n\n"
-            import sys
-            sys.stdout.flush()
-
-    return Response(
-        generate(),
-        mimetype='text/event-stream',
-        headers={
-            'Cache-Control': 'no-cache',
-            'X-Accel-Buffering': 'no',
-            'Connection': 'keep-alive',
-            'Transfer-Encoding': 'chunked'
-        }
-    )