janito 1.2.0__tar.gz → 1.3.0__tar.gz

janito-1.3.0/PKG-INFO

@@ -0,0 +1,142 @@
+Metadata-Version: 2.4
+Name: janito
+Version: 1.3.0
+Summary: A Natural Programming Language Agent,
+Author-email: João Pinto <joao.pinto@gmail.com>
+License: MIT
+Project-URL: homepage, https://github.com/joaompinto/janito
+Project-URL: repository, https://github.com/joaompinto/janito
+Keywords: agent,framework,tools,automation
+Classifier: Programming Language :: Python :: 3.10
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: beautifulsoup4
+Requires-Dist: flask
+Requires-Dist: jinja2
+Requires-Dist: openai
+Requires-Dist: pathspec
+Requires-Dist: prompt_toolkit
+Requires-Dist: requests
+Requires-Dist: rich
+Dynamic: license-file
+
+# 🚀 Janito: Agent
+
+Janito is an AI-powered assistant for the command line and web that interprets natural language instructions to edit code, manage files, and analyze projects using patterns and tools designed by experienced software engineers. It prioritizes transparency, interactive clarification, and precise, reviewable changes.
+
+---
+
+## ⚡ Quick Start
+
+Run a one-off prompt:
+```bash
+python -m janito "Refactor the data processing module to improve readability."
+```
+
+Or start the interactive chat shell:
+```bash
+python -m janito
+```
+
+Launch the web UI:
+```bash
+python -m janito.web
+```
+
+---
+
+## ✨ Key Features
+- 📝 **Code Editing via Natural Language:** Modify, create, or delete code files simply by describing the changes.
+- 📁 **File & Directory Management:** Navigate, create, move, or remove files and folders.
+- 🧠 **Context-Aware:** Understands your project structure for precise edits.
+- 💬 **Interactive User Prompts:** Asks for clarification when needed.
+- 🧩 **Extensible Tooling:** Built-in tools for file operations, shell commands, directory listing, Python file validation, text replacement, code execution, and more. Recent tools include:
+  - `find_files`: Search for files matching a pattern in directories.
+  - `get_lines`: Retrieve specific lines from files for efficient context.
+  - `py_compile_file`: Validate Python files for syntax correctness.
+  - `replace_text_in_file`: Replace exact text fragments in files.
+  - `search_files`: Search for text patterns across files.
+  - `python_exec`: Execute Python code and capture output.
+  - And more, see `janito/agent/tools/` for the full list.
+- 🌐 **Web Interface (In Development):** Upcoming simple web UI for streaming responses and tool progress.
+
+---
+
+
+## 📦 Installation
+
+### Requirements
+- Python 3.10+
+
+...
+
+### Configuration & CLI Options
+
+Below are the supported configuration parameters and CLI flags. Some options can be set via config files, CLI flags, or both. Use `python -m janito --help` for a full list, or `python -m janito --help-config` to see all config keys and their descriptions.
+
+| Key / Flag                | 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 for this session                                                          | `--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 the system prompt                                                      | `--role` or config                                            | "software engineer"                     |
+| `system_prompt`           | Override the entire system prompt as a raw string                                           | `--system-prompt` or config                                   | _Default prompt_               |
+| `system_file`             | Use a plain text file as the system prompt (takes precedence over `system_prompt`)         | `--system-file` (CLI only)                                     | _None_                                     |
+| `temperature`             | Sampling temperature (float, e.g., 0.0 - 2.0)                                              | `--temperature` or config                                      | 0.2                                        |
+| `max_tokens`              | Maximum tokens for model response                                                          | `--max-tokens` or config                                      | 200000                                     |
+| `max_rounds`              | Maximum number of agent rounds per prompt/session                                          | `--max-rounds` or config                                      | 50                                         |
+| `max_tools`               | Maximum number of tool calls allowed within a chat session                                 | `--max-tools` or config                                       | _None_ (unlimited)                         |
+| `no_tools`           | Disable tool use (no tools passed to agent)                                                | `-n`, `--no-tools` (CLI only)                                   | False                                       |
+| `trust`                   | Trust mode: suppresses run_bash_command output, only shows output file locations                  | `--trust` (CLI only)                                           | False                                       |
+| `template` / `template.*` | Template context dictionary for prompt rendering (nested or flat keys)                     | Config only                                                    | _None_                                     |
+
+Other config-related CLI flags:
+
+- `--set-local-config key=val`   Set a local config value
+- `--set-global-config key=val`  Set a global config value
+- `--run-config key=val`         Set a runtime (in-memory only) config value (can be repeated)
+- `--show-config`                Show effective configuration and exit
+- `--config-reset-local`         Remove the local config file
+- `--config-reset-global`        Remove the global config file
+- `--set-api-key KEY`            Set and save the API key globally
+- `--help-config`                Show all configuration options and exit
+
+Session & shell options:
+
+- `--continue-session`           Continue from the last saved conversation
+- `--web`                        Launch the Janito web server instead of CLI
+
+Verbose/debugging flags:
+
+- `--verbose-http`               Enable verbose HTTP logging
+- `--verbose-http-raw`           Enable raw HTTP wire-level logging
+- `--verbose-response`           Pretty print the full response object
+- `--verbose-tools`              Print tool call parameters and results
+- `--show-system`                Show model, parameters, system prompt, and tool definitions, then exit
+- `--version`                    Show program's version number and exit
+
+
+
+---
+
+## 🧩 System Prompt & Role
+
+Janito operates using a system prompt template that defines its behavior, communication style, and capabilities. By default, Janito assumes the role of a "software engineer"—this means its responses and actions are tailored to the expectations and best practices of professional software engineering.
+
+- **Role:** You can customize the agent's role (e.g., "data scientist", "DevOps engineer") using the `--role` flag or config. The default is `software engineer`.
+- **System Prompt Template:** The system prompt is rendered from a Jinja2 template (see `janito/agent/templates/system_instructions.j2` (now located directly under the agent directory)). This template governs how the agent interprets instructions, interacts with files, and communicates with users.
+- **Customization:** Advanced users can override the system prompt with the `--system-prompt` flag (raw string), or point to a custom file using `--system-file`.
+
+The default template ensures the agent:
+- Prioritizes safe, reviewable, and minimal changes
+- Asks for clarification when instructions are ambiguous
+- Provides concise plans before taking action
+- Documents any changes made
+
+For more details or to customize the prompt, see the template file at `janito/agent/templates/system_instructions.j2`.
+
+---
+

janito-1.3.0/README.md

@@ -0,0 +1,117 @@
+# 🚀 Janito: Agent
+
+Janito is an AI-powered assistant for the command line and web that interprets natural language instructions to edit code, manage files, and analyze projects using patterns and tools designed by experienced software engineers. It prioritizes transparency, interactive clarification, and precise, reviewable changes.
+
+---
+
+## ⚡ Quick Start
+
+Run a one-off prompt:
+```bash
+python -m janito "Refactor the data processing module to improve readability."
+```
+
+Or start the interactive chat shell:
+```bash
+python -m janito
+```
+
+Launch the web UI:
+```bash
+python -m janito.web
+```
+
+---
+
+## ✨ Key Features
+- 📝 **Code Editing via Natural Language:** Modify, create, or delete code files simply by describing the changes.
+- 📁 **File & Directory Management:** Navigate, create, move, or remove files and folders.
+- 🧠 **Context-Aware:** Understands your project structure for precise edits.
+- 💬 **Interactive User Prompts:** Asks for clarification when needed.
+- 🧩 **Extensible Tooling:** Built-in tools for file operations, shell commands, directory listing, Python file validation, text replacement, code execution, and more. Recent tools include:
+  - `find_files`: Search for files matching a pattern in directories.
+  - `get_lines`: Retrieve specific lines from files for efficient context.
+  - `py_compile_file`: Validate Python files for syntax correctness.
+  - `replace_text_in_file`: Replace exact text fragments in files.
+  - `search_files`: Search for text patterns across files.
+  - `python_exec`: Execute Python code and capture output.
+  - And more, see `janito/agent/tools/` for the full list.
+- 🌐 **Web Interface (In Development):** Upcoming simple web UI for streaming responses and tool progress.
+
+---
+
+
+## 📦 Installation
+
+### Requirements
+- Python 3.10+
+
+...
+
+### Configuration & CLI Options
+
+Below are the supported configuration parameters and CLI flags. Some options can be set via config files, CLI flags, or both. Use `python -m janito --help` for a full list, or `python -m janito --help-config` to see all config keys and their descriptions.
+
+| Key / Flag                | 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 for this session                                                          | `--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 the system prompt                                                      | `--role` or config                                            | "software engineer"                     |
+| `system_prompt`           | Override the entire system prompt as a raw string                                           | `--system-prompt` or config                                   | _Default prompt_               |
+| `system_file`             | Use a plain text file as the system prompt (takes precedence over `system_prompt`)         | `--system-file` (CLI only)                                     | _None_                                     |
+| `temperature`             | Sampling temperature (float, e.g., 0.0 - 2.0)                                              | `--temperature` or config                                      | 0.2                                        |
+| `max_tokens`              | Maximum tokens for model response                                                          | `--max-tokens` or config                                      | 200000                                     |
+| `max_rounds`              | Maximum number of agent rounds per prompt/session                                          | `--max-rounds` or config                                      | 50                                         |
+| `max_tools`               | Maximum number of tool calls allowed within a chat session                                 | `--max-tools` or config                                       | _None_ (unlimited)                         |
+| `no_tools`           | Disable tool use (no tools passed to agent)                                                | `-n`, `--no-tools` (CLI only)                                   | False                                       |
+| `trust`                   | Trust mode: suppresses run_bash_command output, only shows output file locations                  | `--trust` (CLI only)                                           | False                                       |
+| `template` / `template.*` | Template context dictionary for prompt rendering (nested or flat keys)                     | Config only                                                    | _None_                                     |
+
+Other config-related CLI flags:
+
+- `--set-local-config key=val`   Set a local config value
+- `--set-global-config key=val`  Set a global config value
+- `--run-config key=val`         Set a runtime (in-memory only) config value (can be repeated)
+- `--show-config`                Show effective configuration and exit
+- `--config-reset-local`         Remove the local config file
+- `--config-reset-global`        Remove the global config file
+- `--set-api-key KEY`            Set and save the API key globally
+- `--help-config`                Show all configuration options and exit
+
+Session & shell options:
+
+- `--continue-session`           Continue from the last saved conversation
+- `--web`                        Launch the Janito web server instead of CLI
+
+Verbose/debugging flags:
+
+- `--verbose-http`               Enable verbose HTTP logging
+- `--verbose-http-raw`           Enable raw HTTP wire-level logging
+- `--verbose-response`           Pretty print the full response object
+- `--verbose-tools`              Print tool call parameters and results
+- `--show-system`                Show model, parameters, system prompt, and tool definitions, then exit
+- `--version`                    Show program's version number and exit
+
+
+
+---
+
+## 🧩 System Prompt & Role
+
+Janito operates using a system prompt template that defines its behavior, communication style, and capabilities. By default, Janito assumes the role of a "software engineer"—this means its responses and actions are tailored to the expectations and best practices of professional software engineering.
+
+- **Role:** You can customize the agent's role (e.g., "data scientist", "DevOps engineer") using the `--role` flag or config. The default is `software engineer`.
+- **System Prompt Template:** The system prompt is rendered from a Jinja2 template (see `janito/agent/templates/system_instructions.j2` (now located directly under the agent directory)). This template governs how the agent interprets instructions, interacts with files, and communicates with users.
+- **Customization:** Advanced users can override the system prompt with the `--system-prompt` flag (raw string), or point to a custom file using `--system-file`.
+
+The default template ensures the agent:
+- Prioritizes safe, reviewable, and minimal changes
+- Asks for clarification when instructions are ambiguous
+- Provides concise plans before taking action
+- Documents any changes made
+
+For more details or to customize the prompt, see the template file at `janito/agent/templates/system_instructions.j2`.
+
+---
+

janito-1.3.0/janito/__init__.py

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

{janito-1.2.0 → janito-1.3.0}/janito/agent/agent.py

@@ -7,7 +7,7 @@ from janito.agent.conversation import ConversationHandler
 from janito.agent.tool_handler import ToolHandler
 
 class Agent:
-    """LLM Agent capable of handling conversations and tool calls."""
+    """Agent capable of handling conversations and tool calls."""
 
     REFERER = "www.janito.dev"
     TITLE = "Janito"
@@ -19,10 +19,22 @@ class Agent:
         system_prompt: str | None = None,
         verbose_tools: bool = False,
         tool_handler = None,
-        base_url: str = "https://openrouter.ai/api/v1"
+        base_url: str = "https://openrouter.ai/api/v1",
+        azure_openai_api_version: str = "2023-05-15",
+        use_azure_openai: bool = False
     ):
         """
-        Initialize the Agent.
+        Initialize Agent,
+
+        Args:
+            api_key: API key for OpenAI-compatible service.
+            model: Model name to use.
+            system_prompt: Optional system prompt override.
+            verbose_tools: Enable verbose tool call logging.
+            tool_handler: Optional custom ToolHandler instance.
+            base_url: API base URL.
+            azure_openai_api_version: Azure OpenAI API version (default: "2023-05-15").
+            use_azure_openai: Whether to use Azure OpenAI client (default: False).
 
         Args:
             api_key: API key for OpenAI-compatible service.
@@ -35,12 +47,12 @@ class Agent:
         self.api_key = api_key
         self.model = model
         self.system_prompt = system_prompt
-        if os.environ.get("USE_AZURE_OPENAI"):
+        if use_azure_openai:
             from openai import AzureOpenAI
             self.client = AzureOpenAI(
                 api_key=api_key,
-                azure_endpoint=os.environ.get("AZURE_OPENAI_ENDPOINT"),
-                api_version=os.environ.get("AZURE_OPENAI_API_VERSION", "2023-05-15"),
+                azure_endpoint=base_url,
+                api_version=azure_openai_api_version,
             )
         else:
             self.client = OpenAI(
@@ -60,7 +72,11 @@ class Agent:
             self.client, self.model, self.tool_handler
         )
 
-    def chat(self, messages, on_content=None, on_tool_progress=None, verbose_response=False, spinner=False, max_tokens=None):
+    @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, max_rounds=50):
         import time
         from janito.agent.conversation import ProviderError
 
@@ -69,11 +85,12 @@ class Agent:
             try:
                 return self.conversation_handler.handle_conversation(
                     messages,
-                    max_tokens=max_tokens,
+                    max_rounds=max_rounds,
                     on_content=on_content,
                     on_tool_progress=on_tool_progress,
                     verbose_response=verbose_response,
-                    spinner=spinner
+                    spinner=spinner,
+                    max_tokens=max_tokens
                 )
             except ProviderError as e:
                 error_data = getattr(e, 'error_data', {}) or {}
@@ -92,5 +109,5 @@ class Agent:
                 else:
                     print("Max retries reached. Raising error.")
                     raise
-            except Exception:
+
                 raise

{janito-1.2.0 → janito-1.3.0}/janito/agent/config.py

@@ -40,14 +40,12 @@ class FileConfig(BaseConfig):
 
     def load(self):
         if self.path.exists():
-            try:
-                with open(self.path, 'r') as f:
-                    self._data = json.load(f)
-                    # Remove keys with value None (null in JSON)
-                    self._data = {k: v for k, v in self._data.items() if v is not None}
-            except Exception as e:
-                print(f"Warning: Failed to load config file {self.path}: {e}")
-                self._data = {}
+            with open(self.path, 'r') as f:
+                self._data = json.load(f)
+                # Remove keys with value None (null in JSON)
+                self._data = {k: v for k, v in self._data.items() if v is not None}
+
+
         else:
             self._data = {}
 
@@ -57,6 +55,7 @@ class FileConfig(BaseConfig):
             json.dump(self._data, f, indent=2)
 
 
+
 CONFIG_OPTIONS = {
     "api_key": "API key for OpenAI-compatible service (required)",
     "model": "Model name to use (e.g., 'openai/gpt-4.1')",
@@ -64,9 +63,38 @@ CONFIG_OPTIONS = {
     "role": "Role description for the system prompt (e.g., 'software engineer')",
     "system_prompt": "Override the entire system prompt text",
     "temperature": "Sampling temperature (float, e.g., 0.0 - 2.0)",
-    "max_tokens": "Maximum tokens for model response (int)"
+    "max_tokens": "Maximum tokens for model response (int)",
+    # Accept template.* keys as valid config keys (for CLI validation, etc.)
+    "template": "Template context dictionary for prompt rendering (nested)",
+    # Note: template.* keys are validated dynamically, not statically here
 }
 
+class BaseConfig:
+    def __init__(self):
+        self._data = {}
+
+    def get(self, key, default=None):
+        return self._data.get(key, default)
+
+    def set(self, key, value):
+        self._data[key] = value
+
+    def all(self):
+        return self._data
+
+
+        """
+        Returns a dictionary suitable for passing as Jinja2 template variables.
+        Merges the nested 'template' dict (if present) and all flat 'template.*' keys.
+        Flat keys override nested dict keys if there is a conflict.
+        """
+        template_vars = dict(self._data.get("template", {}))
+        for k, v in self._data.items():
+            if k.startswith("template.") and k != "template":
+                template_vars[k[9:]] = v
+        return template_vars
+
+
 # Import defaults for reference
 from .config_defaults import CONFIG_DEFAULTS
 

janito-1.3.0/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.2.0 → janito-1.3.0}/janito/agent/conversation.py

@@ -16,8 +16,12 @@ 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):
+        from janito.agent.runtime_config import runtime_config
+        max_tools = runtime_config.get('max_tools', None)
+        tool_calls_made = 0
         if not messages:
             raise ValueError("No prompt provided in messages")
 
@@ -95,16 +99,28 @@ 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
+                }
 
+            from janito.agent.runtime_config import runtime_config
             tool_responses = []
+            # Sequential tool execution (default, only mode)
             for tool_call in choice.message.tool_calls:
+                if max_tools is not None and tool_calls_made >= max_tools:
+                    raise MaxRoundsExceededError(f"Maximum number of tool calls ({max_tools}) reached in this chat session.")
                 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})
+                tool_calls_made += 1
 
+            # 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.2.0 → janito-1.3.0}/janito/agent/runtime_config.py

@@ -16,6 +16,7 @@ class UnifiedConfig:
         self.runtime_cfg = runtime_cfg
         self.effective_cfg = effective_cfg
 
+
     def get(self, key, default=None):
         val = self.runtime_cfg.get(key)
         if val is not None: