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

janito/README.md

@@ -43,7 +43,12 @@ janito -p google -m gemini-2.0-flash-exp "Generate unit tests"
 
 ### Interactive Chat Mode
 
-Start an interactive session:
+Start an interactive session (default mode):
+```bash
+janito
+```
+
+Or explicitly:
 ```bash
 janito --chat
 ```
@@ -80,17 +85,23 @@ janito --set model=kimi-k1-8k
 
 ### OpenAI
 
-- **Models**: gpt-4, gpt-4-turbo, gpt-3.5-turbo
+- **Models**: gpt-5, gpt-4.1, gpt-4o, gpt-4-turbo, gpt-3.5-turbo
 - **Setup**: Get API key from [OpenAI Platform](https://platform.openai.com/)
 
 ### Anthropic
 
-- **Models**: claude-3-5-sonnet-20241022, claude-3-opus-20240229
+- **Models**: claude-3-7-sonnet-20250219, claude-3-5-sonnet-20241022, claude-3-opus-20250514
 - **Setup**: Get API key from [Anthropic Console](https://console.anthropic.com/)
 
+### IBM WatsonX
+
+- **Models**: ibm/granite-3-8b-instruct, ibm/granite-3-2b-instruct, meta-llama/llama-3-1-8b-instruct, meta-llama/llama-3-1-70b-instruct, mistralai/mistral-large
+- **Strengths**: Enterprise-grade AI, IBM Granite models, hosted Llama and Mistral models
+- **Setup**: Get API key and project ID from [IBM Cloud](https://cloud.ibm.com/)
+
 ### Google
 
-- **Models**: gemini-2.0-flash-exp, gemini-1.5-pro
+- **Models**: gemini-2.5-flash, gemini-2.5-pro, gemini-2.5-flash-lite-preview-06-17
 - **Setup**: Get API key from [Google AI Studio](https://makersuite.google.com/)
 
 ## Advanced Features
@@ -114,12 +125,44 @@ janito --role python-expert "Optimize this algorithm"
 
 ### Environment Variables
 You can also configure via environment variables:
+
+**MoonshotAI:**
 ```bash
 export MOONSHOTAI_API_KEY=your_key_here
 export JANITO_PROVIDER=moonshotai
 export JANITO_MODEL=kimi-k1-8k
 ```
 
+**OpenAI:**
+```bash
+export OPENAI_API_KEY=your_key_here
+export JANITO_PROVIDER=openai
+export JANITO_MODEL=gpt-5
+```
+
+**IBM WatsonX:**
+```bash
+export WATSONX_API_KEY=your_key_here
+export WATSONX_PROJECT_ID=your_project_id
+export WATSONX_SPACE_ID=your_space_id  # optional
+export JANITO_PROVIDER=ibm
+export JANITO_MODEL=ibm/granite-3-8b-instruct
+```
+
+**Anthropic:**
+```bash
+export ANTHROPIC_API_KEY=your_key_here
+export JANITO_PROVIDER=anthropic
+export JANITO_MODEL=claude-3-7-sonnet-20250219
+```
+
+**Google:**
+```bash
+export GOOGLE_API_KEY=your_key_here
+export JANITO_PROVIDER=google
+export JANITO_MODEL=gemini-2.5-flash
+```
+
 ## Examples
 
 ### Code Generation

janito/agent/setup_agent.py

@@ -52,10 +52,40 @@ def _load_template_content(profile, templates_dir):
         with open(user_template_path, "r", encoding="utf-8") as file:
             return file.read(), user_template_path
 
-    # If nothing matched, raise an informative error
-    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}."
-    )
+    # If nothing matched, list available profiles and raise an informative error
+    from janito.cli.cli_commands.list_profiles import _gather_default_profiles, _gather_user_profiles
+    
+    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)
     # Replace spaces in profile name with underscores for filename resolution
     sanitized_profile = re.sub(r"\\s+", "_", profile.strip()) if profile else profile
     """

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

@@ -0,0 +1,10 @@
+You are: market analyst specializing in financial markets, business intelligence, and economic research
+
+Focus on providing market analysis, financial insights, and business intelligence. When analyzing data:
+
+ • 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

janito/cli/chat_mode/session_profile_select.py

@@ -111,6 +111,7 @@ def select_profile():
     choices = [
         "Developer with Python Tools",
         "Developer",
+        "Market Analyst",
         "Custom system prompt...",
         "Raw Model Session (no tools, no context)",
     ]
@@ -146,9 +147,9 @@ def select_profile():
         from jinja2 import Template
         from janito.agent.setup_agent import _prepare_template_context
 
-        template_path = Path(
-            "./janito/agent/templates/profiles/system_prompt_template_Developer.txt.j2"
-        )
+        # Get the absolute path relative to the current script location
+        current_dir = Path(__file__).parent
+        template_path = current_dir / "../../agent/templates/profiles/system_prompt_template_developer.txt.j2"
         with open(template_path, "r", encoding="utf-8") as f:
             template_content = f.read()
 
@@ -156,4 +157,20 @@ def select_profile():
         context = _prepare_template_context("developer", "Developer", None)
         prompt = template.render(**context)
         return {"profile": "Developer", "profile_system_prompt": prompt}
+    elif answer == "Market Analyst":
+        # Return the content of the built-in Market Analyst profile prompt
+        from pathlib import Path
+        from jinja2 import Template
+        from janito.agent.setup_agent import _prepare_template_context
+
+        # Get the absolute path relative to the current script location
+        current_dir = Path(__file__).parent
+        template_path = current_dir / "../../agent/templates/profiles/system_prompt_template_market_analyst.txt.j2"
+        with open(template_path, "r", encoding="utf-8") as f:
+            template_content = f.read()
+
+        template = Template(template_content)
+        context = _prepare_template_context("market_analyst", "Market Analyst", None)
+        prompt = template.render(**context)
+        return {"profile": "Market Analyst", "profile_system_prompt": prompt}
     return answer

janito/cli/cli_commands/list_profiles.py

@@ -19,7 +19,35 @@ def _extract_profile_name(filename: str) -> str:
         filename = filename[len(_PREFIX) :]
     if filename.endswith(_SUFFIX):
         filename = filename[: -len(_SUFFIX)]
-    return filename.replace("_", " ")
+    
+    # Convert to title case for consistent capitalization, but handle common acronyms
+    name = filename.replace("_", " ")
+    
+    # Convert to proper title case with consistent capitalization
+    name = filename.replace("_", " ")
+    
+    # Handle special cases and acronyms
+    special_cases = {
+        "python": "Python",
+        "tools": "Tools",
+        "model": "Model",
+        "context": "Context",
+        "developer": "Developer",
+        "analyst": "Analyst",
+        "conversation": "Conversation",
+        "without": "Without"
+    }
+    
+    words = name.split()
+    capitalized_words = []
+    for word in words:
+        lower_word = word.lower()
+        if lower_word in special_cases:
+            capitalized_words.append(special_cases[lower_word])
+        else:
+            capitalized_words.append(word.capitalize())
+    
+    return " ".join(capitalized_words)
 
 
 def _gather_default_profiles():

janito/cli/cli_commands/show_system_prompt.py

@@ -60,7 +60,17 @@ def _load_template(profile, templates_dir):
             ).open("r", encoding="utf-8") as file:
                 template_content = file.read()
         except (FileNotFoundError, ModuleNotFoundError, AttributeError):
-            return template_filename, None
+            # Also check user profiles directory
+            from pathlib import Path
+            import os
+            user_profiles_dir = Path(os.path.expanduser("~/.janito/profiles"))
+            user_template_path = user_profiles_dir / template_filename
+            if user_template_path.exists():
+                with open(user_template_path, "r", encoding="utf-8") as file:
+                    template_content = file.read()
+            else:
+                template_content = None
+            return template_filename, template_content
     return template_filename, template_content
 
 
@@ -117,9 +127,40 @@ def handle_show_system_prompt(args):
 
     if not template_content:
         if profile:
-            raise FileNotFoundError(
-                f"[janito] Could not find profile-specific template '{template_filename}' in {templates_dir / template_filename} nor in janito.agent.templates.profiles package."
-            )
+            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."

janito/docs/GETTING_STARTED.md

@@ -1,6 +1,6 @@
 # Getting Started with Janito
 
-This guide will help you set up Janito CLI quickly and start using it with MoonshotAI as your default provider.
+This guide will help you set up Janito CLI quickly and start using it with your preferred AI provider.
 
 ## Quick Setup (2 minutes)
 
@@ -9,14 +9,29 @@ This guide will help you set up Janito CLI quickly and start using it with Moons
 pip install janito
 ```
 
-### 2. Get Your MoonshotAI API Key
+### 2. Choose Your Provider
 
+Janito supports multiple AI providers. Choose one to get started:
+
+**MoonshotAI (Recommended for Chinese users)**
 1. Go to [Moonshot AI Platform](https://platform.moonshot.cn/)
 2. Sign up for an account
 3. Navigate to API Keys section
 4. Create a new API key
 
+**OpenAI**
+1. Go to [OpenAI Platform](https://platform.openai.com/)
+2. Sign up and add payment method
+3. Create an API key
+
+**IBM WatsonX**
+1. Go to [IBM Cloud](https://cloud.ibm.com/)
+2. Create a WatsonX AI service
+3. Get your API key and project ID
+
 ### 3. Configure Janito
+
+**MoonshotAI Setup:**
 ```bash
 # Set MoonshotAI as your default provider
 janito --set-api-key YOUR_API_KEY -p moonshotai
@@ -25,6 +40,25 @@ janito --set-api-key YOUR_API_KEY -p moonshotai
 janito "Hello, can you introduce yourself?"
 ```
 
+**OpenAI Setup:**
+```bash
+# Set OpenAI as your default provider
+janito --set-api-key YOUR_OPENAI_API_KEY -p openai
+
+# Verify it's working
+janito "Hello, can you introduce yourself?"
+```
+
+**IBM WatsonX Setup:**
+```bash
+# Set IBM WatsonX as your default provider
+janito --set-api-key YOUR_WATSONX_API_KEY -p ibm
+janito --set-config ibm project_id YOUR_PROJECT_ID
+
+# Verify it's working
+janito "Hello, can you introduce yourself?"
+```
+
 ## Your First Commands
 
 ### Basic Usage
@@ -52,29 +86,59 @@ janito -W ./my_project "Create a REST API with FastAPI"
 
 ### Set as Default Provider
 ```bash
-# Make MoonshotAI your permanent default
-janito --set provider=moonshotai
-janito --set model=kimi-k1-8k
+# Make your chosen provider the permanent default
+janito --set provider=moonshotai  # or openai, ibm, etc.
+janito --set model=kimi-k1-8k     # or gpt-5, ibm/granite-3-8b-instruct, etc.
 ```
 
 ### Environment Variables
 You can also use environment variables:
+
+**MoonshotAI:**
 ```bash
 export MOONSHOTAI_API_KEY=your_key_here
 export JANITO_PROVIDER=moonshotai
 export JANITO_MODEL=kimi-k1-8k
 ```
 
-## MoonshotAI Models
+**OpenAI:**
+```bash
+export OPENAI_API_KEY=your_key_here
+export JANITO_PROVIDER=openai
+export JANITO_MODEL=gpt-5
+```
+
+**IBM WatsonX:**
+```bash
+export WATSONX_API_KEY=your_key_here
+export WATSONX_PROJECT_ID=your_project_id
+export WATSONX_SPACE_ID=your_space_id  # optional
+export JANITO_PROVIDER=ibm
+export JANITO_MODEL=ibm/granite-3-3-8b-instruct
+```
 
-Janito supports these MoonshotAI models:
+## Available Models by Provider
 
+### MoonshotAI Models
 - **kimi-k1-8k**: Fast responses, good for general tasks
 - **kimi-k1-32k**: Better for longer contexts
 - **kimi-k1-128k**: Best for very long documents
 - **kimi-k2-turbo-preview**: Latest model with enhanced capabilities
 - **kimi-k2-turbo-preview**: Turbo version of the advanced reasoning model
 
+### OpenAI Models
+- **gpt-5**: Latest GPT model with advanced capabilities
+- **gpt-4.1**: High-performance model for complex tasks
+- **gpt-4o**: Optimized for speed and cost
+- **o3-mini**: Reasoning-focused model
+
+### IBM WatsonX Models
+- **ibm/granite-3-3-8b-instruct**: IBM's latest Granite 3.3 8B Instruct model (default)
+- **ibm/granite-3-8b-instruct**: IBM's Granite 3 8B Instruct model
+- **meta-llama/llama-3-3-70b-instruct**: Meta Llama 3.3 70B hosted on WatsonX
+- **meta-llama/llama-3-1-70b-instruct**: Meta Llama 3.1 70B hosted on WatsonX
+- **mistralai/mistral-large-2407**: Latest Mistral Large model hosted on WatsonX
+
 ## Next Steps
 
 1. **Explore tools**: Run `janito --list-tools` to see available tools
@@ -91,14 +155,14 @@ Janito supports these MoonshotAI models:
 # Check available providers
 janito --list-providers
 
-# Re-register MoonshotAI
-janito --set-api-key YOUR_KEY -p moonshotai
+# Re-register your provider
+janito --set-api-key YOUR_KEY -p YOUR_PROVIDER
 ```
 
 **"Model not available" error**
 ```bash
-# List available MoonshotAI models
-janito -p moonshotai --list-models
+# List available models for your provider
+janito -p YOUR_PROVIDER --list-models
 ```
 
 **API key issues**
@@ -107,7 +171,16 @@ janito -p moonshotai --list-models
 janito --show-config
 
 # Reset API key
-janito --set-api-key NEW_KEY -p moonshotai
+janito --set-api-key NEW_KEY -p YOUR_PROVIDER
+```
+
+**IBM WatsonX specific issues**
+```bash
+# Check if project ID is set
+janito --show-config
+
+# Set project ID if missing
+janito --set-config ibm project_id YOUR_PROJECT_ID
 ```
 
 ### Getting Help

janito/providers/__init__.py

@@ -9,3 +9,4 @@ import janito.providers.alibaba.provider
 import janito.providers.zai.provider
 import janito.providers.cerebras.provider
 import janito.providers.mistral.provider
+import janito.providers.ibm.provider

janito/providers/azure_openai/provider.py

@@ -82,7 +82,7 @@ class AzureOpenAIProvider(LLMProvider):
         If the model_name is not in MODEL_SPECS, return a generic info dict.
         """
         if model_name is None:
-            # Return all known specs, but note: only static ones are listed
+            # Return all known specs
             return {
                 name: model_info.to_dict()
                 for name, model_info in self.MODEL_SPECS.items()

janito/providers/ibm/README.md

@@ -0,0 +1,99 @@
+# IBM WatsonX AI Provider
+
+This provider enables access to IBM WatsonX AI services, including IBM's Granite models and other hosted models.
+
+## Setup
+
+### Prerequisites
+
+1. **IBM Cloud Account**: You need an IBM Cloud account with WatsonX AI service enabled.
+2. **API Key**: Generate an API key from your IBM Cloud dashboard.
+3. **Project ID**: Create a WatsonX project and get the project ID.
+
+### Authentication
+
+Set up your credentials using the CLI:
+
+```bash
+# Set the API key
+janito --set-api-key YOUR_IBM_API_KEY -p ibm
+
+# Set the project ID
+janito --set-config ibm project_id YOUR_PROJECT_ID
+
+# Optional: Set space ID if using WatsonX spaces
+janito --set-config ibm space_id YOUR_SPACE_ID
+```
+
+### Environment Variables
+
+Alternatively, you can set environment variables:
+
+```bash
+export WATSONX_API_KEY="your-api-key"
+export WATSONX_PROJECT_ID="your-project-id"
+export WATSONX_SPACE_ID="your-space-id"  # optional
+```
+
+## Available Models
+
+The IBM provider supports the following models:
+
+- **ibm/granite-3-8b-instruct**: IBM's Granite 3 8B Instruct model (default)
+- **ibm/granite-3-2b-instruct**: IBM's Granite 3 2B Instruct model
+- **meta-llama/llama-3-1-8b-instruct**: Meta Llama 3.1 8B hosted on WatsonX
+- **meta-llama/llama-3-1-70b-instruct**: Meta Llama 3.1 70B hosted on WatsonX
+- **mistralai/mistral-large**: Mistral Large model hosted on WatsonX
+
+## Usage
+
+### Command Line
+
+```bash
+# Use IBM provider with default model
+janito -p ibm "Explain quantum computing"
+
+# Use specific IBM model
+janito -p ibm -m ibm/granite-3-2b-instruct "Generate a Python function"
+
+# Interactive chat mode
+janito -p ibm --chat
+```
+
+### Configuration
+
+You can set IBM as your default provider:
+
+```bash
+janito --set-config provider ibm
+```
+
+## API Reference
+
+The IBM provider uses IBM WatsonX's REST API with OpenAI-compatible format. The base URL is:
+
+```
+https://us-south.ml.cloud.ibm.com
+```
+
+## Limitations
+
+- **Rate Limits**: IBM WatsonX has rate limits based on your subscription tier
+- **Context Window**: Models have different context window limits (typically 128K tokens)
+- **Region Support**: Currently configured for US-South region
+
+## Troubleshooting
+
+### Common Issues
+
+1. **Authentication Error**: Ensure your API key and project ID are correct
+2. **Model Not Found**: Check if the model is available in your WatsonX project
+3. **Rate Limit Exceeded**: Wait and retry, or upgrade your subscription
+
+### Debug Mode
+
+Enable debug logging to see API requests:
+
+```bash
+janito -p ibm --verbose "Your prompt here"
+```

janito/providers/ibm/__init__.py

@@ -0,0 +1 @@
+# IBM WatsonX AI Provider

janito/providers/ibm/model_info.py

@@ -0,0 +1,87 @@
+"""IBM WatsonX AI model specifications."""
+
+from janito.llm.model import LLMModelInfo
+
+MODEL_SPECS = {
+    "openai/gpt-oss-120b": LLMModelInfo(
+        name="openai/gpt-oss-120b",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=True,
+        category="IBM WatsonX",
+    ),
+    "ibm/granite-3-8b-instruct": LLMModelInfo(
+        name="ibm/granite-3-8b-instruct",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=False,
+        category="IBM WatsonX",
+    ),
+    "ibm/granite-3-3-8b-instruct": LLMModelInfo(
+        name="ibm/granite-3-3-8b-instruct",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=False,
+        category="IBM WatsonX",
+    ),
+    "meta-llama/llama-3-1-70b-instruct": LLMModelInfo(
+        name="meta-llama/llama-3-1-70b-instruct",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=False,
+        category="IBM WatsonX",
+    ),
+    "meta-llama/llama-3-3-70b-instruct": LLMModelInfo(
+        name="meta-llama/llama-3-3-70b-instruct",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=False,
+        category="IBM WatsonX",
+    ),
+    "mistralai/mistral-large": LLMModelInfo(
+        name="mistralai/mistral-large",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=False,
+        category="IBM WatsonX",
+    ),
+    "mistralai/mistral-large-2407": LLMModelInfo(
+        name="mistralai/mistral-large-2407",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=False,
+        category="IBM WatsonX",
+    ),
+    "openai/gpt-oss-120b": LLMModelInfo(
+        name="openai/gpt-oss-120b",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=True,
+        category="IBM WatsonX",
+    ),
+    "openai/gpt-oss-20b": LLMModelInfo(
+        name="openai/gpt-oss-20b",
+        context=128000,
+        max_input=128000,
+        max_response=4096,
+        max_cot=4096,
+        thinking_supported=True,
+        category="IBM WatsonX",
+    ),
+}