janito 2.22.0__py3-none-any.whl → 2.24.1__py3-none-any.whl

janito/agent/setup_agent.py

@@ -144,6 +144,20 @@ def _prepare_template_context(role, profile, allowed_permissions):
         context["platform"] = pd.get_platform_name()
         context["python_version"] = pd.get_python_version()
         context["shell_info"] = pd.detect_shell()
+    
+    # Add allowed sites for market analyst profile
+    if profile == "market-analyst":
+        from janito.tools.url_whitelist import get_url_whitelist_manager
+        whitelist_manager = get_url_whitelist_manager()
+        allowed_sites = whitelist_manager.get_allowed_sites()
+        context["allowed_sites"] = allowed_sites
+        
+        # Add market data sources documentation
+        if not allowed_sites:
+            context["allowed_sites_info"] = "No whitelist restrictions - all sites allowed"
+        else:
+            context["allowed_sites_info"] = f"Restricted to: {', '.join(allowed_sites)}"
+    
     return context
 
 

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

@@ -1,22 +1,70 @@
-{#  General role setup
+{# Profile Metadata #}
+{% if name %}Name: {{ name }}{% endif %}
+{% if version %}Version: {{ version }}{% endif %}
+{% if description %}Description: {{ description }}{% endif %}
+{% if author %}Author: {{ author }}{% endif %}
+{% if tags %}Tags: {{ tags | join(', ') }}{% endif %}
+
+{# General role setup
   ex. "Search in code" -> Python Developer -> find(*.py) | Java Developer -> find(*.java)
 #}
-You are: {{ role }}
+You are: {{ role | default('developer') }}
 
-{# Improves tool selection and platform specific constrains, eg, path format, C:\ vs /path #}
-{% if allowed_permissions and 'x' in allowed_permissions %}
-You will be using the following environment:
-  Platform: {{ platform }}
-  Python version: {{ python_version }}
-  Shell/Environment: {{ shell_info }}
+{% if capabilities %}
+## Capabilities
+{% for capability in capabilities %}
+- {{ capability }}
+{% endfor %}
+{% else %}
+## Capabilities
+- Software development and engineering
+- Code analysis and debugging
+- File system operations
+- Python development and tooling
+- Cross-platform development
 {% endif %}
 
+{% if constraints %}
+## Constraints
+{% for constraint in constraints %}
+- {{ constraint }}
+{% endfor %}
+{% endif %}
 
-{% if allowed_permissions and 'r' in allowed_permissions %}
-Before answering map the questions to artifacts found in the current directory - the current project.
+{% if environment or platform or python_version or shell_info %}
+## Environment
+{% if platform %}Platform: {{ platform }}{% endif %}
+{% if python_version %}Python version: {{ python_version }}{% endif %}
+{% if shell_info %}Shell/Environment: {{ shell_info }}{% endif %}
+{% endif %}
+
+{% if examples %}
+## Examples
+{% for example in examples %}
+### {{ example.title }}
+{{ example.description }}
+```
+{{ example.code }}
+```
+{% endfor %}
+{% endif %}
+
+{% if custom_instructions %}
+## Custom Instructions
+{{ custom_instructions }}
+{% endif %}
+
+{% if available_tools %}
+## Available Tools
+{% for tool in available_tools %}
+- **{{ tool.name }}**: {{ tool.description }}
+{% if tool.parameters %}
+  Parameters: {{ tool.parameters | join(', ') }}
+{% endif %}
+{% endfor %}
 {% endif %}
 
-Respond according to the following guidelines:
+## Guidelines
 {% if allowed_permissions %}
   - Before using the namespace tools provide a short reason
 {% endif %}

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

@@ -1,14 +1,60 @@
-You are: software developer
+{# Profile Metadata #}
+{% if name %}Name: {{ name }}{% endif %}
+{% if version %}Version: {{ version }}{% endif %}
+{% if description %}Description: {{ description }}{% endif %}
+{% if author %}Author: {{ author }}{% endif %}
+{% if tags %}Tags: {{ tags | join(', ') }}{% endif %}
 
-{# Improves tool selection and platform specific constrains, eg, path format, C:\ vs /path #}
-You will be using the following environment:
-  Platform: Windows
-  Shell/Environment: PowerShell
+You are: {{ role | default('software developer') }}
 
+{% if capabilities %}
+## Capabilities
+{% for capability in capabilities %}
+- {{ capability }}
+{% endfor %}
+{% endif %}
+
+{% if constraints %}
+## Constraints
+{% for constraint in constraints %}
+- {{ constraint }}
+{% endfor %}
+{% endif %}
 
-Before answering map the questions to artifacts found in the current directory - the current project.
+{% if environment or platform or shell_info %}
+## Environment
+{% if platform %}Platform: {{ platform }}{% endif %}
+{% if python_version %}Python version: {{ python_version }}{% endif %}
+{% if shell_info %}Shell/Environment: {{ shell_info }}{% endif %}
+{% endif %}
+
+{% if examples %}
+## Examples
+{% for example in examples %}
+### {{ example.title }}
+{{ example.description }}
+```
+{{ example.code }}
+```
+{% endfor %}
+{% endif %}
+
+{% if custom_instructions %}
+## Custom Instructions
+{{ custom_instructions }}
+{% endif %}
+
+{% if available_tools %}
+## Available Tools
+{% for tool in available_tools %}
+- **{{ tool.name }}**: {{ tool.description }}
+{% if tool.parameters %}
+  Parameters: {{ tool.parameters | join(', ') }}
+{% endif %}
+{% endfor %}
+{% endif %}
 
-Respond according to the following guidelines:
+## Guidelines
 {% if allowed_permissions %}
   - Before using the namespace tools provide a short reason
 {% endif %}

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

@@ -1,10 +1,110 @@
-You are: market analyst specializing in financial markets, business intelligence, and economic research
+{# Profile Metadata #}
+{% if name %}Name: {{ name }}{% endif %}
+{% if version %}Version: {{ version }}{% endif %}
+{% if description %}Description: {{ description }}{% endif %}
+{% if author %}Author: {{ author }}{% endif %}
+{% if tags %}Tags: {{ tags | join(', ') }}{% endif %}
 
-Focus on providing market analysis, financial insights, and business intelligence. When analyzing data:
+You are: {{ role | default('market analyst specializing in financial markets, business intelligence, and economic research') }}
 
- • Identify market trends and patterns
- • Provide quantitative analysis with clear metrics
- • Consider economic indicators and market sentiment
- • Offer actionable insights for business decisions
- • Use appropriate financial terminology and frameworks
- • Reference relevant market data, benchmarks, and industry standards
+{% if capabilities %}
+## Capabilities
+{% for capability in capabilities %}
+- {{ capability }}
+{% endfor %}
+{% else %}
+## Capabilities
+- Financial analysis and market insights
+- Stock recommendations and trading strategies
+- Technical and fundamental analysis
+- Risk management and position sizing
+- Economic research and business intelligence
+{% endif %}
+
+{% if constraints %}
+## Constraints
+{% for constraint in constraints %}
+- {{ constraint }}
+{% endfor %}
+{% else %}
+## Constraints
+- Only use allowed sites configured via security settings
+- Never attempt to access unauthorized sources
+- Provide actionable insights with specific entry/exit strategies
+- Include risk management in all recommendations
+{% endif %}
+
+{% if data_sources %}
+## Data Sources
+{% for source in data_sources %}
+- {{ source }}
+{% endfor %}
+{% else %}
+## Data Sources
+{% if allowed_sites %}
+✅ **Configured Sources:** {{ ', '.join(allowed_sites) }}
+{% else %}
+⚠️ **No whitelist configured** - All sites allowed (use with caution)
+{% endif %}
+
+**Recommended Market Data Sources:**
+- **Tier 1 (Government):** sec.gov, fred.stlouisfed.org
+- **Tier 2 (Public):** tradingview.com, investing.com, finance.yahoo.com
+- **Tier 3 (APIs):** alphavantage.co, financialmodelingprep.com, twelvedata.com
+{% endif %}
+
+{% if environment or platform or shell_info %}
+## Environment
+{% if platform %}Platform: {{ platform }}{% endif %}
+{% if python_version %}Python version: {{ python_version }}{% endif %}
+{% if shell_info %}Shell/Environment: {{ shell_info }}{% endif %}
+{% endif %}
+
+{% if examples %}
+## Examples
+{% for example in examples %}
+### {{ example.title }}
+{{ example.description }}
+```
+{{ example.code }}
+```
+{% endfor %}
+{% else %}
+## Analysis Framework
+
+When analyzing data:
+
+ • Identify market trends and patterns with specific technical indicators (RSI, MACD, moving averages, support/resistance levels)
+ • Provide quantitative analysis with clear metrics, valuation ratios (P/E, P/S, EV/EBITDA), and financial ratios
+ • Consider economic indicators, market sentiment, and sector rotation patterns
+ • Offer actionable insights for trading and investment decisions with specific entry/exit strategies
+ • Use appropriate financial terminology and frameworks (DCF, comparable company analysis, technical analysis)
+ • Reference relevant market data, benchmarks, and industry standards
+ • Provide specific stock recommendations with risk management strategies and position sizing guidance
+ • Analyze options flow, institutional positioning, and sentiment indicators
+
+When asked about specific stocks or market movements, provide detailed analysis including:
+ - Technical indicators and chart patterns
+ - Fundamental valuation metrics
+ - Analyst estimate revisions and sentiment shifts
+ - Options market activity and flow
+ - Risk/reward profiles for trades
+ - Specific price targets and stop-loss levels
+{% endif %}
+
+{% if custom_instructions %}
+## Custom Instructions
+{{ custom_instructions }}
+{% endif %}
+
+{% if available_tools %}
+## Available Tools
+{% for tool in available_tools %}
+- **{{ tool.name }}**: {{ tool.description }}
+{% if tool.parameters %}
+  Parameters: {{ tool.parameters | join(', ') }}
+{% endif %}
+{% endfor %}
+{% endif %}
+
+## Guidelines

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

@@ -1 +1,53 @@
-You are a helpful assistant.
+{# Profile Metadata #}
+{% if name %}Name: {{ name }}{% endif %}
+{% if version %}Version: {{ version }}{% endif %}
+{% if description %}Description: {{ description }}{% endif %}
+{% if author %}Author: {{ author }}{% endif %}
+{% if tags %}Tags: {{ tags | join(', ') }}{% endif %}
+
+You are: {{ role | default('helpful assistant') }}
+
+{% if capabilities %}
+## Capabilities
+{% for capability in capabilities %}
+- {{ capability }}
+{% endfor %}
+{% endif %}
+
+{% if constraints %}
+## Constraints
+{% for constraint in constraints %}
+- {{ constraint }}
+{% endfor %}
+{% endif %}
+
+{% if examples %}
+## Examples
+{% for example in examples %}
+### {{ example.title }}
+{{ example.description }}
+```
+{{ example.code }}
+```
+{% endfor %}
+{% endif %}
+
+{% if custom_instructions %}
+## Custom Instructions
+{{ custom_instructions }}
+{% endif %}
+
+{% if available_tools %}
+## Available Tools
+{% for tool in available_tools %}
+- **{{ tool.name }}**: {{ tool.description }}
+{% if tool.parameters %}
+  Parameters: {{ tool.parameters | join(', ') }}
+{% endif %}
+{% endfor %}
+{% endif %}
+
+## Guidelines
+- Provide helpful, accurate, and concise responses
+- Ask clarifying questions when needed
+- Maintain a friendly and professional tone

janito/cli/chat_mode/session.py

@@ -94,6 +94,7 @@ class ChatSession:
             profile_system_prompt,
             conversation_history,
         )
+        self.profile = profile  # Store profile name for welcome message
         self.shell_state = ChatShellState(self.mem_history, conversation_history)
         self.shell_state.agent = self.agent
         # Set no_tools_mode if present
@@ -116,6 +117,7 @@ class ChatSession:
         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
         python_profile = getattr(args, "python", False) if args is not None else False
+        market_profile = getattr(args, "market", False) if args is not None else False
         profile_system_prompt = None
         no_tools_mode = False
 
@@ -123,7 +125,11 @@ class ChatSession:
         if python_profile and profile is None and role_arg is None:
             profile = "Developer with Python Tools"
 
-        if profile is None and role_arg is None and not python_profile:
+        # Handle --market flag
+        if market_profile and profile is None and role_arg is None:
+            profile = "Market Analyst"
+
+        if profile is None and role_arg is None and not python_profile and not market_profile:
             try:
                 from janito.cli.chat_mode.session_profile_select import select_profile
 
@@ -202,6 +208,7 @@ class ChatSession:
         from janito import __version__
 
         self.console.print(f"[bold green]Janito Chat Mode v{__version__}[/bold green]")
+        self.console.print(f"[dim]Profile: {self.profile}[/dim]")
         self.console.print(
             "[green]/help for commands   /exit or Ctrl+C to quit[/green]"
         )

janito/cli/chat_mode/shell/commands/__init__.py

@@ -9,6 +9,7 @@ from .role import RoleCommandShellHandler
 from .session import HistoryShellHandler
 from .tools import ToolsShellHandler
 from .help import HelpShellHandler
+from .security_command import SecurityCommand
 from janito.cli.console import shared_console
 
 COMMAND_HANDLERS = {
@@ -41,6 +42,7 @@ COMMAND_HANDLERS = {
     "/model": ModelShellHandler,
     "/multi": MultiShellHandler,
     "/help": HelpShellHandler,
+    "/security": SecurityCommand,
 }
 
 

janito/cli/chat_mode/shell/commands/security/__init__.py

@@ -0,0 +1 @@
+"""Security management commands for chat mode."""

janito/cli/chat_mode/shell/commands/security/allowed_sites.py

@@ -0,0 +1,94 @@
+"""Security commands for managing allowed sites."""
+
+from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler as BaseCommand
+from janito.tools.url_whitelist import get_url_whitelist_manager
+
+
+class SecurityAllowedSitesCommand(BaseCommand):
+    """Manage allowed sites for fetch_url tool."""
+    
+    def get_name(self) -> str:
+        return "allowed-sites"
+    
+    def get_description(self) -> str:
+        return "Manage allowed sites for the fetch_url tool"
+    
+    def get_usage(self):
+        return self.get_description() + """
+Usage: /security allowed-sites [command] [site]
+
+Commands:
+  list                    List all allowed sites
+  add <site>              Add a site to the whitelist
+  remove <site>           Remove a site from the whitelist
+  clear                   Clear all allowed sites (allow all)
+  
+Examples:
+  /security allowed-sites list
+  /security allowed-sites add tradingview.com
+  /security allowed-sites remove yahoo.com
+  /security allowed-sites clear
+"""
+        return """
+Usage: /security allowed-sites [command] [site]
+
+Commands:
+  list                    List all allowed sites
+  add <site>              Add a site to the whitelist
+  remove <site>           Remove a site from the whitelist
+  clear                   Clear all allowed sites (allow all)
+  
+Examples:
+  /security allowed-sites list
+  /security allowed-sites add tradingview.com
+  /security allowed-sites remove yahoo.com
+  /security allowed-sites clear
+"""
+    
+    def run(self):
+        """Execute the allowed-sites command."""
+        args = self.after_cmd_line.strip().split()
+        
+        if not args:
+            print(self.get_usage())
+            return
+            
+        command = args[0].lower()
+        whitelist_manager = get_url_whitelist_manager()
+        
+        if command == "list":
+            sites = whitelist_manager.get_allowed_sites()
+            if sites:
+                print("Allowed sites:")
+                for site in sites:
+                    print(f"  • {site}")
+            else:
+                print("No sites are whitelisted (all sites are allowed)")
+                
+        elif command == "add":
+            if len(args) < 2:
+                print("Error: Please specify a site to add")
+                return
+            site = args[1]
+            if whitelist_manager.add_allowed_site(site):
+                print(f"✅ Added '{site}' to allowed sites")
+            else:
+                print(f"ℹ️ '{site}' is already in allowed sites")
+                
+        elif command == "remove":
+            if len(args) < 2:
+                print("Error: Please specify a site to remove")
+                return
+            site = args[1]
+            if whitelist_manager.remove_allowed_site(site):
+                print(f"✅ Removed '{site}' from allowed sites")
+            else:
+                print(f"ℹ️ '{site}' was not in allowed sites")
+                
+        elif command == "clear":
+            whitelist_manager.clear_whitelist()
+            print("✅ Cleared all allowed sites (all sites are now allowed)")
+            
+        else:
+            print(f"Error: Unknown command '{command}'")
+            print(self.get_usage())

janito/cli/chat_mode/shell/commands/security_command.py

@@ -0,0 +1,51 @@
+"""Security command group for chat mode."""
+
+from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler as BaseCommand
+from janito.cli.chat_mode.shell.commands.security.allowed_sites import SecurityAllowedSitesCommand
+
+
+class SecurityCommand(BaseCommand):
+    """Security management command group."""
+    
+    def get_name(self) -> str:
+        return "security"
+    
+    def get_description(self) -> str:
+        return "Security management commands"
+    
+    def get_usage(self):
+        return """
+Usage: /security <subcommand> [args...]
+
+Subcommands:
+  allowed-sites    Manage allowed sites for fetch_url tool
+  
+Examples:
+  /security allowed-sites list
+  /security allowed-sites add tradingview.com
+  /security allowed-sites remove yahoo.com
+"""
+    
+    def __init__(self, after_cmd_line=None, shell_state=None):
+        super().__init__(after_cmd_line=after_cmd_line, shell_state=shell_state)
+        self.subcommands = {
+            "allowed-sites": SecurityAllowedSitesCommand(after_cmd_line=after_cmd_line, shell_state=shell_state)
+        }
+    
+    def run(self):
+        """Execute the security command."""
+        args = self.after_cmd_line.strip().split()
+        
+        if not args:
+            print(self.get_usage())
+            return
+            
+        subcommand = args[0].lower()
+        if subcommand in self.subcommands:
+            # Pass the remaining args to the subcommand
+            remaining_args = " ".join(args[1:]) if len(args) > 1 else ""
+            self.subcommands[subcommand].after_cmd_line = remaining_args
+            self.subcommands[subcommand].run()
+        else:
+            print(f"Error: Unknown security subcommand '{subcommand}'")
+            print(self.get_usage())

janito/cli/cli_commands/list_plugins.py

@@ -0,0 +1,45 @@
+"""
+CLI command to list available and loaded plugins.
+"""
+
+import argparse
+from typing import List, Dict, Any
+from janito.plugins.discovery import list_available_plugins, discover_plugins
+import os
+from janito.plugins.manager import PluginManager
+
+
+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()
+        if available:
+            print("Available plugins:")
+            for plugin in available:
+                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")
+    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)
+                if metadata:
+                    print(f"  - {metadata.name} v{metadata.version}")
+                    print(f"    {metadata.description}")
+                    if metadata.author:
+                        print(f"    Author: {metadata.author}")
+                    print()
+        else:
+            print("No plugins loaded")
+
+

janito/cli/cli_commands/show_system_prompt.py

@@ -9,6 +9,7 @@ from janito.platform_discovery import PlatformDiscovery
 from pathlib import Path
 from jinja2 import Template
 import importlib.resources
+import importlib.resources as resources
 import re
 
 
@@ -115,6 +116,11 @@ def handle_show_system_prompt(args):
         Path(__file__).parent.parent.parent / "agent" / "templates" / "profiles"
     )
     profile = getattr(args, "profile", None)
+    
+    # Handle --market flag mapping to Market Analyst profile
+    if profile is None and getattr(args, "market", False):
+        profile = "Market Analyst"
+    
     if not profile:
         print(
             "[janito] No profile specified. The main agent runs without a system prompt template.\n"
@@ -126,46 +132,13 @@ def handle_show_system_prompt(args):
     _print_debug_info(debug_flag, template_filename, allowed_permissions, context)
 
     if not template_content:
-        if profile:
-            from janito.cli.cli_commands.list_profiles import _gather_default_profiles, _gather_user_profiles
-            import re
-            
-            default_profiles = _gather_default_profiles()
-            user_profiles = _gather_user_profiles()
-            
-            available_profiles = []
-            if default_profiles:
-                available_profiles.extend([(p, "default") for p in default_profiles])
-            if user_profiles:
-                available_profiles.extend([(p, "user") for p in user_profiles])
-            
-            # Normalize the input profile for better matching suggestions
-            normalized_input = re.sub(r"\s+", " ", profile.strip().lower())
-            
-            if available_profiles:
-                profile_list = "\n".join([f"  - {name} ({source})" for name, source in available_profiles])
-                
-                # Find close matches
-                close_matches = []
-                for name, source in available_profiles:
-                    normalized_name = name.lower()
-                    if normalized_input in normalized_name or normalized_name in normalized_input:
-                        close_matches.append(name)
-                
-                suggestion = ""
-                if close_matches:
-                    suggestion = f"\nDid you mean: {', '.join(close_matches)}?"
-                
-                error_msg = f"[janito] Could not find profile '{profile}'. Available profiles:\n{profile_list}{suggestion}"
-            else:
-                error_msg = f"[janito] Could not find profile '{profile}'. No profiles available."
-            
-            raise FileNotFoundError(error_msg)
-        else:
-            print(
-                f"[janito] Could not find {template_filename} in {templates_dir / template_filename} nor in janito.agent.templates.profiles package."
-            )
-            print("No system prompt is set or resolved for this configuration.")
+        # Try to load directly from package resources as fallback
+        try:
+            template_content = resources.files("janito.agent.templates.profiles").joinpath(
+                f"system_prompt_template_{profile.lower().replace(' ', '_')}.txt.j2"
+            ).read_text(encoding="utf-8")
+        except (FileNotFoundError, ModuleNotFoundError, AttributeError):
+            print(f"[janito] Could not find profile '{profile}'. This may be a configuration issue.")
             return
 
     template = Template(template_content)