janito 2.29.0__py3-none-any.whl → 2.30.0__py3-none-any.whl

janito/README.md

@@ -116,11 +116,11 @@ Janito includes powerful built-in tools for:
 - System commands
 - And more...
 
-### Profiles and Roles
+### Profiles
 Use predefined system prompts:
 ```bash
-janito --profile developer "Create a REST API"
-janito --role python-expert "Optimize this algorithm"
+janito --developer "Create a REST API"  # Same as --profile developer
+janito --market "Analyze market trends"   # Same as --profile market-analyst
 ```
 
 ### Environment Variables

janito/agent/setup_agent.py

@@ -25,10 +25,14 @@ def _load_template_content(profile, templates_dir):
 
     Spaces in the profile name are converted to underscores to align with the file-naming convention (e.g. "Developer with Python Tools" ➜ "Developer_with_Python_Tools" (matches: system_prompt_template_Developer_with_Python_Tools.txt.j2)).
     """
-    # Sanitize profile for filename resolution (convert whitespace to underscores)
-    sanitized_profile = re.sub(r"\s+", "_", profile.strip()) if profile else profile
-
+    sanitized_profile = re.sub(r"\s+", "_", profile.strip())
     template_filename = f"system_prompt_template_{sanitized_profile}.txt.j2"
+
+    return _find_template_file(template_filename, templates_dir)
+
+
+def _find_template_file(template_filename, templates_dir):
+    """Find and load template file from various locations."""
     template_path = templates_dir / template_filename
 
     # 1) Check local templates directory
@@ -96,39 +100,9 @@ def _load_template_content(profile, templates_dir):
         )
 
     raise FileNotFoundError(error_msg)
-    # Replace spaces in profile name with underscores for filename resolution
-    sanitized_profile = re.sub(r"\\s+", "_", profile.strip()) if profile else profile
-    """
-    Loads the template content for the given profile from the specified directory or package resources.
-    If the profile template is not found in the default locations, tries to load from the user profiles directory ~/.janito/profiles.
-    """
-
-    # Sanitize profile name by replacing spaces with underscores to match filename conventions
-    sanitized_profile = re.sub(r"\\s+", "_", profile.strip())
-    template_filename = f"system_prompt_template_{sanitized_profile}.txt.j2"
-    template_path = templates_dir / template_filename
-    if template_path.exists():
-        with open(template_path, "r", encoding="utf-8") as file:
-            return file.read(), template_path
-    # Try package import fallback
-    try:
-        with importlib.resources.files("janito.agent.templates.profiles").joinpath(
-            template_filename
-        ).open("r", encoding="utf-8") as file:
-            return file.read(), template_path
-    except (FileNotFoundError, ModuleNotFoundError, AttributeError):
-        # Try user profiles directory
-        user_profiles_dir = Path(os.path.expanduser("~/.janito/profiles"))
-        user_template_path = user_profiles_dir / profile
-        if user_template_path.exists():
-            with open(user_template_path, "r", encoding="utf-8") as file:
-                return file.read(), user_template_path
-        raise FileNotFoundError(
-            f"[janito] Could not find profile-specific template '{template_filename}' in {template_path} nor in janito.agent.templates.profiles package nor in user profiles directory {user_template_path}."
-        )
 
 
-def _prepare_template_context(role, profile, allowed_permissions):
+def _prepare_template_context(role, profile, allowed_permissions, args=None):
     """
     Prepares the context dictionary for Jinja2 template rendering.
     """
@@ -148,6 +122,11 @@ def _prepare_template_context(role, profile, allowed_permissions):
             perm_str += "x"
         allowed_permissions = perm_str or None
     context["allowed_permissions"] = allowed_permissions
+
+    # Add emoji flag for system prompt
+    context["emoji_enabled"] = (
+        getattr(args, "emoji", False) if "args" in locals() else False
+    )
     # Inject platform info if execute permission is present
     if allowed_permissions and "x" in allowed_permissions:
         pd = PlatformDiscovery()
@@ -171,6 +150,11 @@ def _prepare_template_context(role, profile, allowed_permissions):
         else:
             context["allowed_sites_info"] = f"Restricted to: {', '.join(allowed_sites)}"
 
+    # Add emoji flag for system prompt
+    context["emoji_enabled"] = (
+        getattr(args, "emoji", False) if "args" in locals() else False
+    )
+
     return context
 
 
@@ -267,7 +251,9 @@ def setup_agent(
     template_content, template_path = _load_template_content(profile, templates_dir)
 
     template = Template(template_content)
-    context = _prepare_template_context(role, profile, allowed_permissions)
+    context = _prepare_template_context(
+        role, profile, allowed_permissions, locals().get("args")
+    )
 
     # Debug output if requested
     debug_flag = False

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

@@ -88,4 +88,10 @@ You are: {{ role | default('developer') }}
 {# 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.
 {% endif %}
+{% if emoji_enabled %}
+## Emoji Usage
+- Feel free to use emojis in your responses to make them more engaging and expressive 🎉
+- Use appropriate emojis to enhance communication: ✅ for success, ⚠️ for warnings, 🔄 for progress, etc.
+- Emojis should complement the message, not replace clear explanations
+{% endif %}
 

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

@@ -78,4 +78,10 @@ You are: {{ role | default('software developer') }}
 {# 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.
 {% endif %}
+{% if emoji_enabled %}
+## Emoji Usage
+- Feel free to use emojis in your responses to make them more engaging and expressive 🎉
+- Use appropriate emojis to enhance communication: ✅ for success, ⚠️ for warnings, 🔄 for progress, etc.
+- Emojis should complement the message, not replace clear explanations
+{% endif %}
 

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

@@ -107,4 +107,10 @@ When asked about specific stocks or market movements, provide detailed analysis
 {% endfor %}
 {% endif %}
 
-## Guidelines
+## Guidelines
+{% if emoji_enabled %}
+## Emoji Usage
+- Feel free to use emojis in your responses to make them more engaging and expressive 📊
+- Use appropriate emojis to enhance communication: 📈 for uptrends, 📉 for downtrends, 💰 for profits, ⚠️ for warnings, etc.
+- Emojis should complement the message, not replace clear financial analysis
+{% endif %}

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

@@ -50,4 +50,10 @@ You are: {{ role | default('helpful assistant') }}
 ## Guidelines
 - Provide helpful, accurate, and concise responses
 - Ask clarifying questions when needed
-- Maintain a friendly and professional tone
+- Maintain a friendly and professional tone
+{% if emoji_enabled %}
+## Emoji Usage
+- Feel free to use emojis in your responses to make them more engaging and expressive 😊
+- Use appropriate emojis to enhance communication: ✅ for confirmations, ❓ for questions, 💡 for ideas, etc.
+- Emojis should complement the message, not replace clear communication
+{% endif %}

janito/cli/chat_mode/session.py

@@ -119,9 +119,7 @@ class ChatSession:
         profile_system_prompt = None
         no_tools_mode = False
 
-        profile = self._determine_profile(
-            profile, role_arg, python_profile, market_profile
-        )
+        profile = self._determine_profile(profile, python_profile, market_profile)
 
         if (
             profile is None
@@ -136,31 +134,8 @@ class ChatSession:
             if skip_profile_selection:
                 profile = "Developer with Python Tools"  # Default for non-interactive commands
             else:
-                try:
-                    from janito.cli.chat_mode.session_profile_select import (
-                        select_profile,
-                    )
-
-                    result = select_profile()
-                    if isinstance(result, dict):
-                        profile = result.get("profile")
-                        profile_system_prompt = result.get("profile_system_prompt")
-                        no_tools_mode = result.get("no_tools_mode", False)
-                    elif isinstance(result, str) and result.startswith("role:"):
-                        role = result[len("role:") :].strip()
-                        profile = "Developer with Python Tools"
-                    else:
-                        profile = (
-                            "Developer with Python Tools"
-                            if result == "Developer"
-                            else result
-                        )
-                except ImportError:
-                    profile = "Raw Model Session (no tools, no context)"
-        if role_arg is not None:
-            role = role_arg
-            if profile is None:
                 profile = "Developer with Python Tools"
+
         return profile, role, profile_system_prompt, no_tools_mode
 
     def _create_conversation_history(self):
@@ -308,25 +283,6 @@ class ChatSession:
                 )
             )
 
-            for candidate in candidates:
-                try:
-                    if not candidate:
-                        continue
-                    parsed = urlparse(str(candidate))
-                    host = parsed.netloc or parsed.path
-                    if host:
-                        backend_hostname = host
-                        break
-                except Exception:
-                    backend_hostname = str(candidate)
-                    break
-
-            self.console.print(
-                Rule(
-                    f"[bold blue]Model: {model_name} ({provider_name}) | Backend: {backend_hostname}[/bold blue]"
-                )
-            )
-
             self._prompt_handler.run_prompt(cmd_input)
             end_time = time.time()
             elapsed = end_time - start_time
@@ -356,18 +312,18 @@ class ChatSession:
     def _extract_args(self, args):
         """Extract profile and role arguments from args."""
         profile = getattr(args, "profile", None) if args is not None else None
-        role_arg = getattr(args, "role", None) if args is not None else None
+        role_arg = None
         python_profile = (
             getattr(args, "developer", False) if args is not None else False
         )
         market_profile = getattr(args, "market", False) if args is not None else False
         return profile, role_arg, python_profile, market_profile
 
-    def _determine_profile(self, profile, role_arg, python_profile, market_profile):
+    def _determine_profile(self, profile, python_profile, market_profile):
         """Determine the profile based on flags and arguments."""
-        if python_profile and profile is None and role_arg is None:
+        if python_profile and profile is None:
             return "Developer with Python Tools"
-        if market_profile and profile is None and role_arg is None:
+        if market_profile and profile is None:
             return "Market Analyst"
         return profile
 
@@ -517,9 +473,19 @@ class ChatSession:
         else:
             duration_str = f"{session_duration/3600:.1f}h"
 
+        # Format tokens in k/m/t as appropriate
+        if total_tokens >= 1_000_000_000:
+            token_str = f"{total_tokens/1_000_000_000:.1f}t"
+        elif total_tokens >= 1_000_000:
+            token_str = f"{total_tokens/1_000_000:.1f}m"
+        elif total_tokens >= 1_000:
+            token_str = f"{total_tokens/1_000:.1f}k"
+        else:
+            token_str = f"{total_tokens}"
+
         self.console.print(f"[bold yellow]Session completed![/bold yellow]")
         self.console.print(
-            f"[dim]Session time: {duration_str} | Total tokens: {total_tokens:,}[/dim]"
+            f"[dim]Session time: {duration_str} | Total tokens: {token_str}[/dim]"
         )
         self.console.print("[bold yellow]Goodbye![/bold yellow]")
 

janito/cli/cli_commands/list_plugins.py

@@ -14,80 +14,104 @@ def handle_list_plugins(args: argparse.Namespace) -> None:
     """List plugins command handler."""
 
     if getattr(args, "list_plugins_available", False):
-        # List available plugins
-        available = list_available_plugins()
-        builtin_plugins = BuiltinPluginRegistry.list_builtin_plugins()
-
-        if available or builtin_plugins:
-            print("Available plugins:")
-
-            # Show builtin plugins first
-            if builtin_plugins:
-                print("  Builtin plugins:")
-                for plugin in builtin_plugins:
-                    print(f"    - {plugin} [BUILTIN]")
-
-            # Show other available plugins
-            other_plugins = [p for p in available if p not in builtin_plugins]
-            if other_plugins:
-                print("  External plugins:")
-                for plugin in other_plugins:
-                    print(f"    - {plugin}")
-        else:
-            print("No plugins found in search paths")
-            print("Search paths:")
-            print(f"  - {os.getcwd()}/plugins")
-            print(f"  - {os.path.expanduser('~')}/.janito/plugins")
+        _list_available_plugins()
     elif getattr(args, "list_resources", False):
-        # List all resources from loaded plugins
-        manager = PluginManager()
-        all_resources = manager.list_all_resources()
-
-        if all_resources:
-            print("Plugin Resources:")
-            for plugin_name, resources in all_resources.items():
-                metadata = manager.get_plugin_metadata(plugin_name)
-                print(
-                    f"\n{plugin_name} v{metadata.version if metadata else 'unknown'}:"
-                )
-
-                # Group resources by type
-                tools = [r for r in resources if r["type"] == "tool"]
-                commands = [r for r in resources if r["type"] == "command"]
-                configs = [r for r in resources if r["type"] == "config"]
-
-                if tools:
-                    print("  Tools:")
-                    for tool in tools:
-                        print(f"    - {tool['name']}: {tool['description']}")
-
-                if commands:
-                    print("  Commands:")
-                    for cmd in commands:
-                        print(f"    - {cmd['name']}: {cmd['description']}")
-
-                if configs:
-                    print("  Configuration:")
-                    for config in configs:
-                        print(f"    - {config['name']}: {config['description']}")
-        else:
-            print("No plugins loaded")
+        _list_plugin_resources()
     else:
-        # List loaded plugins
-        manager = PluginManager()
-        loaded = manager.list_plugins()
-
-        if loaded:
-            print("Loaded plugins:")
-            for plugin_name in loaded:
-                metadata = manager.get_plugin_metadata(plugin_name)
-                is_builtin = BuiltinPluginRegistry.is_builtin(plugin_name)
-                if metadata:
-                    builtin_tag = " [BUILTIN]" if is_builtin else ""
-                    print(f"  - {metadata.name} v{metadata.version}{builtin_tag}")
-                    print(f"    {metadata.description}")
-                    if metadata.author:
-                        print(f"    Author: {metadata.author}")
-                    print()
-        else:
-            print("No plugins loaded")
+        _list_loaded_plugins()
+
+
+def _list_available_plugins():
+    """List available plugins."""
+    available = list_available_plugins()
+    builtin_plugins = BuiltinPluginRegistry.list_builtin_plugins()
+
+    if available or builtin_plugins:
+        print("Available plugins:")
+        _print_builtin_plugins(builtin_plugins)
+        _print_external_plugins(available, builtin_plugins)
+    else:
+        print("No plugins found in search paths")
+        print("Search paths:")
+        print(f"  - {os.getcwd()}/plugins")
+        print(f"  - {os.path.expanduser('~')}/.janito/plugins")
+
+
+def _print_builtin_plugins(builtin_plugins):
+    """Print builtin plugins."""
+    if builtin_plugins:
+        print("  Builtin plugins:")
+        for plugin in builtin_plugins:
+            print(f"    - {plugin} [BUILTIN]")
+
+
+def _print_external_plugins(available, builtin_plugins):
+    """Print external plugins."""
+    other_plugins = [p for p in available if p not in builtin_plugins]
+    if other_plugins:
+        print("  External plugins:")
+        for plugin in other_plugins:
+            print(f"    - {plugin}")
+
+
+def _list_plugin_resources():
+    """List all resources from loaded plugins."""
+    manager = PluginManager()
+    all_resources = manager.list_all_resources()
+
+    if all_resources:
+        print("Plugin Resources:")
+        for plugin_name, resources in all_resources.items():
+            metadata = manager.get_plugin_metadata(plugin_name)
+            print(f"\n{plugin_name} v{metadata.version if metadata else 'unknown'}:")
+            _print_resources_by_type(resources)
+    else:
+        print("No plugins loaded")
+
+
+def _print_resources_by_type(resources):
+    """Print resources grouped by type."""
+    tools = [r for r in resources if r["type"] == "tool"]
+    commands = [r for r in resources if r["type"] == "command"]
+    configs = [r for r in resources if r["type"] == "config"]
+
+    if tools:
+        print("  Tools:")
+        for tool in tools:
+            print(f"    - {tool['name']}: {tool['description']}")
+
+    if commands:
+        print("  Commands:")
+        for cmd in commands:
+            print(f"    - {cmd['name']}: {cmd['description']}")
+
+    if configs:
+        print("  Configuration:")
+        for config in configs:
+            print(f"    - {config['name']}: {config['description']}")
+
+
+def _list_loaded_plugins():
+    """List loaded plugins."""
+    manager = PluginManager()
+    loaded = manager.list_plugins()
+
+    if loaded:
+        print("Loaded plugins:")
+        for plugin_name in loaded:
+            _print_plugin_details(manager, plugin_name)
+    else:
+        print("No plugins loaded")
+
+
+def _print_plugin_details(manager, plugin_name):
+    """Print details for a loaded plugin."""
+    metadata = manager.get_plugin_metadata(plugin_name)
+    is_builtin = BuiltinPluginRegistry.is_builtin(plugin_name)
+    if metadata:
+        builtin_tag = " [BUILTIN]" if is_builtin else ""
+        print(f"  - {metadata.name} v{metadata.version}{builtin_tag}")
+        print(f"    {metadata.description}")
+        if metadata.author:
+            print(f"    Author: {metadata.author}")
+        print()

janito/cli/cli_commands/show_system_prompt.py

@@ -35,6 +35,7 @@ def _prepare_context(args, agent_role, allowed_permissions):
     context["role"] = agent_role or "developer"
     context["profile"] = getattr(args, "profile", None)
     context["allowed_permissions"] = allowed_permissions
+    context["emoji_enabled"] = getattr(args, "emoji", False)
     if allowed_permissions and "x" in allowed_permissions:
         pd = PlatformDiscovery()
         context["platform"] = pd.get_platform_name()
@@ -122,6 +123,10 @@ def handle_show_system_prompt(args):
     if profile is None and getattr(args, "market", False):
         profile = "Market Analyst"
 
+    # Handle --developer flag mapping to Developer With Python Tools profile
+    if profile is None and getattr(args, "developer", False):
+        profile = "Developer With Python Tools"
+
     if not profile:
         print(
             "[janito] No profile specified. The main agent runs without a system prompt template.\n"
@@ -152,9 +157,9 @@ def handle_show_system_prompt(args):
     system_prompt = template.render(**context)
     system_prompt = re.sub(r"\n{3,}", "\n\n", system_prompt)
 
-    print(
-        f"\n--- System Prompt (resolved, profile: {getattr(args, 'profile', 'main')}) ---\n"
-    )
+    # Use the actual profile name for display, not the resolved value
+    display_profile = profile or "main"
+    print(f"\n--- System Prompt (resolved, profile: {display_profile}) ---\n")
     print(system_prompt)
     print("\n-------------------------------\n")
     if agent_role:

janito/cli/core/runner.py

@@ -109,8 +109,8 @@ def prepare_llm_driver_config(args, modifiers):
     llm_driver_config = LLMDriverConfig(**driver_config_data)
     if getattr(llm_driver_config, "verbose_api", None):
         pass
-    # If both --role and --profile are provided, --role takes precedence for agent_role
-    agent_role = modifiers.get("role") or modifiers.get("profile") or "developer"
+
+    agent_role = modifiers.get("profile") or "developer"
     return provider, llm_driver_config, agent_role
 
 

janito/cli/main_cli.py

@@ -51,14 +51,6 @@ definition = [
             "help": "Start with the Market Analyst profile (equivalent to --profile 'Market Analyst')",
         },
     ),
-    (
-        ["--role"],
-        {
-            "metavar": "ROLE",
-            "help": "Select the developer role name (overrides profile, e.g. 'python-expert').",
-            "default": None,
-        },
-    ),
     (
         ["-W", "--workdir"],
         {
@@ -205,6 +197,13 @@ definition = [
             "help": "Set the reasoning effort for models that support it (low, medium, high, none)",
         },
     ),
+    (
+        ["--emoji"],
+        {
+            "action": "store_true",
+            "help": "Enable emoji usage in responses to make output more engaging and expressive",
+        },
+    ),
     (["user_prompt"], {"nargs": argparse.REMAINDER, "help": "Prompt to submit"}),
     (
         ["-e", "--event-log"],
@@ -244,7 +243,6 @@ definition = [
 MODIFIER_KEYS = [
     "provider",
     "model",
-    "role",
     "profile",
     "developer",
     "market",
@@ -257,6 +255,7 @@ MODIFIER_KEYS = [
     "exec",
     "read",
     "write",
+    "emoji",
 ]
 SETTER_KEYS = ["set", "set_provider", "set_api_key", "unset"]
 GETTER_KEYS = [
@@ -372,9 +371,7 @@ class JanitoCLI:
             for k in MODIFIER_KEYS
             if getattr(self.args, k, None) is not None
         }
-        # If --role is provided, override role in modifiers
-        if getattr(self.args, "role", None):
-            modifiers["role"] = getattr(self.args, "role")
+
         return modifiers
 
     def classify(self):
@@ -420,9 +417,6 @@ class JanitoCLI:
             self.args.exec = True
             # Remove the /rwx prefix from the prompt
             self.args.user_prompt = self.args.user_prompt[1:]
-        elif self.args.user_prompt and self.args.user_prompt[0].startswith("/"):
-            # Skip LLM processing for other commands that start with /
-            return
 
         # If running in single shot mode and --profile is not provided, default to 'developer' profile
         # Skip profile selection for list commands that don't need it

janito/llm/agent.py

@@ -244,7 +244,12 @@ class LLMAgent:
                         f"[agent] [DEBUG] Tool call detected: {getattr(part, 'name', repr(part))} with arguments: {getattr(part, 'arguments', None)}"
                     )
                 tool_calls.append(part)
-                result = self.tools_adapter.execute_function_call_message_part(part)
+                try:
+                    result = self.tools_adapter.execute_function_call_message_part(part)
+                except Exception as e:
+                    # Catch any exception during tool execution and return as string
+                    # instead of letting it propagate to the user
+                    result = str(e)
                 tool_results.append(result)
         if tool_calls:
             # Prepare tool_calls message for assistant

janito/tools/adapters/local/ask_user.py

@@ -5,6 +5,7 @@ from janito.tools.loop_protection_decorator import protect_against_loops
 from rich import print as rich_print
 from janito.i18n import tr
 from rich.panel import Panel
+from rich.markdown import Markdown
 from prompt_toolkit import PromptSession
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.enums import EditingMode
@@ -36,7 +37,7 @@ class AskUserTool(ToolBase):
     def run(self, question: str) -> str:
 
         print()  # Print an empty line before the question panel
-        rich_print(Panel.fit(question, title=tr("Question"), style="cyan"))
+        rich_print(Panel.fit(Markdown(question), title=tr("Question"), style="cyan"))
 
         bindings = KeyBindings()
         mode = {"multiline": False}
@@ -107,4 +108,5 @@ class AskUserTool(ToolBase):
                     rich_print(
                         "[yellow]Warning: Some characters in your input were not valid UTF-8 and have been replaced.[/yellow]"
                     )
+                print("\a", end="", flush=True)  # Print bell character
                 return sanitized