janito 2.12.0__tar.gz → 2.15.0__tar.gz

{janito-2.12.0 → janito-2.15.0}/CHANGELOG.md

@@ -2,7 +2,29 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [2.12.0] - 2025-08-05
+
+### Added
+- **Enhanced Provider Documentation**: Updated supported-providers-models.md with comprehensive provider information including drivers and dependencies
+- **Improved Driver Listing**: Enhanced list_drivers command with better dependency detection and duplicate removal
+- **Z.AI Provider**: Added ZAIModelDriver with OpenAI SDK compatibility for Z.AI API
+- **Google Gemini Provider**: Added support for Gemini Pro and Gemini 1.5 Pro models via OpenAI-compatible API
+- **DeepSeek Provider**: Added support for deepseek-chat and deepseek-coder models via OpenAI-compatible API
+- **Alibaba Provider**: Added support for qwen-turbo, qwen-plus, qwen-max, and qwen3-coder-plus models via OpenAI-compatible API
+- **MoonshotAI Provider**: Enhanced with additional models and OpenAI-compatible API support
+- **Azure OpenAI Provider**: Added support for GPT-4o and GPT-4o-mini models
+
+### Changed
+- **CLI Core**: Updated getter functions to exit after execution for better CLI behavior
+- **Driver Architecture**: Enhanced ZAI driver to use OpenAI SDK instead of Z.AI SDK for better compatibility
+- **Dependency Management**: Improved dependency detection in list_drivers command with duplicate removal
+- **Provider Registry**: Enhanced provider information display with driver names and dependency status
+- **Model Support**: Updated all providers to use OpenAI-compatible API where applicable, expanding model availability
+
+### Fixed
+- **Driver Configuration**: Fixed AttributeError in ZAI provider by initializing _driver_config properly
+- **Import Handling**: Added proper import error handling for optional dependencies in ZAI driver
+- **CLI Integration**: Fixed list_drivers integration into main CLI flow
 
 ## [2.11.0] - 2025-08-04
 

{janito-2.12.0 → janito-2.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 2.12.0
+Version: 2.15.0
 Summary: A new Python package called janito.
 Author-email: João Pinto <janito@ikignosis.org>
 Project-URL: Homepage, https://github.com/ikignosis/janito

{janito-2.12.0 → janito-2.15.0}/docs/index.md

@@ -21,5 +21,6 @@ Janito is a lightweight language model client focused on software development ac
 - [What Is a Language Model Client?](concepts/language-model-clients.md) — Thin vs. Thick Clients explained
 - [Configuring Janito for DeepSeek](deepseek-setup.md) — How to set up and use DeepSeek models
 - [Configuring Janito for MoonshotAI](moonshotai-setup.md) — How to set up and use MoonshotAI models
+- [Configuring Janito for Z.ai](z-ai-setup.md) — How to set up and use Z.ai models
 - **Concepts & Terminology:** See the [concepts](concepts/index.md) section for more foundational explanations.
 

janito-2.15.0/docs/supported-providers-models.md

@@ -0,0 +1,95 @@
+# Supported Providers and Models
+
+This page lists the supported providers and their available models.
+
+## OpenAI
+
+- **Driver**: OpenAIModelDriver  
+- **Dependencies**: ✅ openai
+
+**Models:**
+
+- GPT-3.5 Turbo
+- GPT-4
+- GPT-4 Turbo
+- GPT-4o
+- GPT-4o-mini
+
+## Azure OpenAI
+
+- **Driver**: AzureOpenAIModelDriver  
+- **Dependencies**: ✅ openai
+
+**Models:**
+
+- GPT-4o
+- GPT-4o-mini
+- GPT-4 Turbo
+
+## Anthropic
+
+- **Driver**: OpenAIModelDriver (via OpenAI-compatible API)  
+- **Dependencies**: ✅ openai
+
+**Models:**
+
+- Claude 3.7 Sonnet (claude-3-7-sonnet-20250219)
+- Claude 3.5 Sonnet (claude-3-5-sonnet-20241022)
+- Claude 3.5 Haiku (claude-3-5-haiku-20241022)
+- Claude 3 Opus (claude-3-opus-20240229)
+- Claude 3 Haiku (claude-3-haiku-20240307)
+
+## Z.AI
+
+- **Driver**: ZAIModelDriver  
+- **Dependencies**: ❌ zai (install with `pip install zai`)
+
+**Models:**
+
+- glm-4.5
+- glm-4.5-air
+
+## MoonshotAI
+
+- **Driver**: OpenAIModelDriver (via OpenAI-compatible API)  
+- **Dependencies**: ✅ openai
+
+**Models:**
+
+- kimi-k2-turbo-preview
+- kimi-k1-8k
+- kimi-k1-32k
+- kimi-k1-128k
+
+## Alibaba
+
+- **Driver**: OpenAIModelDriver (via OpenAI-compatible API)  
+- **Dependencies**: ✅ openai
+
+**Models:**
+
+- qwen-turbo
+- qwen-plus
+- qwen-max
+- qwen3-coder-plus
+- qwen3-coder-480b-a35b-instruct
+
+## Google Gemini
+
+- **Driver**: OpenAIModelDriver (via OpenAI-compatible API)  
+- **Dependencies**: ✅ openai
+
+**Models:**
+
+- Gemini Pro
+- Gemini 1.5 Pro
+
+## DeepSeek
+
+- **Driver**: OpenAIModelDriver (via OpenAI-compatible API)  
+- **Dependencies**: ✅ openai
+
+**Models:**
+
+- deepseek-chat
+- deepseek-coder

janito-2.15.0/docs/z-ai-setup.md

@@ -0,0 +1,83 @@
+# Z.ai API Setup Guide
+
+This guide explains how to set up and use Z.ai's API with your API key.
+
+## Getting Your API Key
+
+1. Visit [Z.ai API Management](https://z.ai/manage-apikey/apikey-list)
+2. Log in to your Z.ai account
+3. Navigate to the API Keys section
+4. Create a new API key if you don't have one yet
+
+## API Key Format
+
+Z.ai uses a new key format that includes both a user ID and secret:
+```
+{id}.{secret}
+```
+
+**Important Security Notes:**
+
+- Never share your API keys
+- Do not expose keys in browsers or client-side code
+- Leaked keys may be automatically regenerated for security
+- Store keys securely in environment variables or secure vaults
+
+## Setting Up Your Environment
+
+### Environment Variable (Recommended)
+
+Set your API key as an environment variable:
+
+**Linux/macOS:**
+```bash
+export ZAI_API_KEY="your-id.your-secret"
+```
+
+**Windows (Command Prompt):**
+```cmd
+set ZAI_API_KEY=your-id.your-secret
+```
+
+**Windows (PowerShell):**
+```powershell
+$env:ZAI_API_KEY="your-id.your-secret"
+```
+
+### Configuration File
+
+You can also store your API key in a configuration file (ensure proper file permissions):
+
+```json
+{
+  "zai_api_key": "your-id.your-secret"
+}
+```
+
+## Rate Limits and Billing
+
+- Check your [API Management dashboard](https://z.ai/manage-apikey/apikey-list) for current rate limits
+- Monitor your usage and billing information
+- Contact support for API recharge if needed
+
+## Support
+
+For API-related support:
+
+- Visit [Z.ai Contact](https://z.ai/contact) for product support
+- Join the [Discord community](https://z.ai/contact) to chat with developers
+- Check the [API documentation](https://z.ai/model-api) for model-specific details
+
+## Available Models
+
+Z.ai provides several models including:
+
+- **GLM-4.5**: Latest flagship model with reasoning, coding, and agent functionalities
+- **GLM-4.5-Air**: Lightweight flagship model with cost-effectiveness
+- **GLM-4.5-Flash**: Most advanced free model
+- **GLM-4-32B-0414-128K**: General-purpose LLM for business and technical domains
+- **CogVideoX-3**: Text-to-video model for high-fidelity motion
+- **Vidu Q1**: High-fidelity 1080p video generation
+- **Vidu 2**: Fast, low-cost 720p video generation
+
+For complete model specifications and capabilities, visit [Z.ai Models](https://z.ai/model-api).

{janito-2.12.0 → janito-2.15.0}/janito/agent/setup_agent.py

@@ -12,7 +12,7 @@ from queue import Queue
 from rich import print as rich_print
 from janito.tools import get_local_tools_adapter
 from janito.llm.agent import LLMAgent
-from janito.drivers.driver_registry import get_driver_class
+
 from janito.platform_discovery import PlatformDiscovery
 from janito.tools.tool_base import ToolPermissions
 from janito.tools.permissions import get_global_allowed_permissions

janito-2.15.0/janito/cli/cli_commands/list_drivers.py

@@ -0,0 +1,137 @@
+"""
+CLI Command: List available LLM drivers and their dependencies
+"""
+
+import importlib
+import sys
+from pathlib import Path
+from rich.console import Console
+from rich.table import Table
+from rich.panel import Panel
+from rich.text import Text
+
+console = Console()
+
+
+def get_driver_info():
+    """Get information about all available drivers."""
+    drivers = []
+    
+    # Define known driver modules
+    driver_modules = [
+        ("janito.drivers.openai.driver", "OpenAIModelDriver"),
+        ("janito.drivers.azure_openai.driver", "AzureOpenAIModelDriver"),
+        ("janito.drivers.zai.driver", "ZAIModelDriver"),
+    ]
+    
+    for module_path, class_name in driver_modules:
+        try:
+            # Import the module
+            module = importlib.import_module(module_path)
+            driver_class = getattr(module, class_name)
+            
+            # Get availability info
+            available = getattr(driver_class, 'available', True)
+            unavailable_reason = getattr(driver_class, 'unavailable_reason', None)
+            
+            # Get dependencies from module imports
+            dependencies = []
+            module_file = Path(module.__file__)
+            
+            # Read module file to detect imports
+            with open(module_file, 'r', encoding='utf-8') as f:
+                content = f.read()
+                
+            # Simple dependency detection
+            if 'import openai' in content or 'from openai' in content:
+                dependencies.append('openai')
+            if 'import zai' in content or 'from zai' in content:
+                dependencies.append('zai')
+            if 'import anthropic' in content or 'from anthropic' in content:
+                dependencies.append('anthropic')
+            if 'import google' in content or 'from google' in content:
+                dependencies.append('google-generativeai')
+            
+
+            
+            # Remove duplicates while preserving order
+            seen = set()
+            dependencies = [dep for dep in dependencies if not (dep in seen or seen.add(dep))]
+            
+            # Check if dependencies are available
+            dep_status = []
+            for dep in dependencies:
+                try:
+                    importlib.import_module(dep)
+                    dep_status.append(f"✅ {dep}")
+                except ImportError:
+                    dep_status.append(f"❌ {dep}")
+            
+            if not dependencies:
+                dep_status = ["No external dependencies"]
+            
+            drivers.append({
+                'name': class_name,
+                'available': available,
+                'reason': unavailable_reason,
+                'dependencies': dep_status
+            })
+            
+        except (ImportError, AttributeError) as e:
+            drivers.append({
+                'name': class_name,
+                'module': module_path,
+                'available': False,
+                'reason': str(e),
+                'dependencies': ["❌ Module not found"]
+            })
+    
+    return drivers
+
+
+def handle_list_drivers(args=None):
+    """List all available LLM drivers with their status and dependencies."""
+    drivers = get_driver_info()
+    
+    if not drivers:
+        console.print("[red]No drivers found[/red]")
+        return
+    
+    # Create table
+    table = Table(title="Available LLM Drivers")
+    table.add_column("Driver", style="cyan", no_wrap=True)
+    table.add_column("Status", style="bold")
+    table.add_column("Dependencies", style="yellow")
+    
+    for driver in drivers:
+        name = driver['name']
+        
+        if driver['available']:
+            status = "[green]✅ Available[/green]"
+            if driver['reason']:
+                status = f"[yellow]⚠️ Available ({driver['reason']})[/yellow]"
+        else:
+            status = f"[red]❌ Unavailable[/red]"
+            if driver['reason']:
+                status = f"[red]❌ {driver['reason']}[/red]"
+        
+        deps = "\n".join(driver['dependencies'])
+        
+        table.add_row(name, status, deps)
+    
+    console.print(table)
+    
+    # Installation help
+    # Get unique missing dependencies
+    missing_deps = set()
+    for driver in drivers:
+        for dep_status in driver['dependencies']:
+            if dep_status.startswith('❌'):
+                missing_deps.add(dep_status[2:].strip())
+    
+    if missing_deps:
+        console.print(f"\n[dim]💡 Install missing deps: pip install {' '.join(sorted(missing_deps))}[/dim]")
+
+
+if __name__ == "__main__":
+    handle_list_drivers()

{janito-2.12.0 → janito-2.15.0}/janito/cli/core/getters.py

@@ -7,6 +7,7 @@ from janito.cli.cli_commands.list_models import handle_list_models
 from janito.cli.cli_commands.list_tools import handle_list_tools
 from janito.cli.cli_commands.show_config import handle_show_config
 from janito.cli.cli_commands.list_config import handle_list_config
+from janito.cli.cli_commands.list_drivers import handle_list_drivers
 from functools import partial
 from janito.provider_registry import ProviderRegistry
 
@@ -17,6 +18,7 @@ GETTER_KEYS = [
     "list_models",
     "list_tools",
     "list_config",
+    "list_drivers",
 ]
 
 
@@ -42,7 +44,10 @@ def handle_getter(args, config_mgr=None):
         "list_profiles": partial(handle_list_profiles, args),
         "show_config": partial(handle_show_config, args),
         "list_config": partial(handle_list_config, args),
+        "list_drivers": partial(handle_list_drivers, args),
     }
     for arg in GETTER_KEYS:
         if getattr(args, arg, False) and arg in GETTER_DISPATCH:
-            return GETTER_DISPATCH[arg]()
+            GETTER_DISPATCH[arg]()
+            import sys
+            sys.exit(0)

{janito-2.12.0 → janito-2.15.0}/janito/cli/main_cli.py

@@ -117,6 +117,10 @@ definition = [
         ["--list-providers"],
         {"action": "store_true", "help": "List supported LLM providers"},
     ),
+    (
+        ["--list-drivers"],
+        {"action": "store_true", "help": "List available LLM drivers and their dependencies"},
+    ),
     (
         ["-l", "--list-models"],
         {"action": "store_true", "help": "List all supported models"},
@@ -206,6 +210,7 @@ GETTER_KEYS = [
     "list_models",
     "list_tools",
     "list_config",
+    "list_drivers",
 ]
 
 
@@ -321,14 +326,8 @@ class JanitoCLI:
         if run_mode == RunMode.SET:
             if self._run_set_mode():
                 return
-        # Special handling: provider is not required for list_providers, list_tools, show_config
-        if run_mode == RunMode.GET and (
-            self.args.list_providers
-            or self.args.list_tools
-            or self.args.list_profiles
-            or self.args.show_config
-            or self.args.list_config
-        ):
+        # Special handling: provider is not required for list_providers, list_tools, show_config, list_drivers
+        if run_mode == RunMode.GET:
             self._maybe_print_verbose_provider_model()
             handle_getter(self.args)
             return
@@ -364,8 +363,7 @@ class JanitoCLI:
                 agent_role,
                 verbose_tools=self.args.verbose_tools,
             )
-        elif run_mode == RunMode.GET:
-            handle_getter(self.args)
+
 
     def _run_set_mode(self):
         if handle_api_key_set(self.args):

{janito-2.12.0 → janito-2.15.0}/janito/drivers/zai/driver.py

@@ -12,10 +12,18 @@ from janito.llm.driver_input import DriverInput
 from janito.driver_events import RequestFinished, RequestStatus, RateLimitRetry
 from janito.llm.message_parts import TextMessagePart, FunctionCallMessagePart
 
-import openai
+try:
+    import openai
+    available = True
+    unavailable_reason = None
+except ImportError:
+    available = False
+    unavailable_reason = "openai module not installed"
 
 
 class ZAIModelDriver(LLMDriver):
+    available = available
+    unavailable_reason = unavailable_reason
     def _get_message_from_result(self, result):
         """Extract the message object from the provider result (Z.AI-specific)."""
         if hasattr(result, "choices") and result.choices:
@@ -52,15 +60,15 @@ class ZAIModelDriver(LLMDriver):
         # Z.AI-specific parameters
         if config.model:
             api_kwargs["model"] = config.model
-        # Prefer max_completion_tokens if present, else fallback to max_tokens (for backward compatibility)
-        if (
+        # Use max_tokens for Z.ai SDK compatibility
+        if hasattr(config, "max_tokens") and config.max_tokens is not None:
+            api_kwargs["max_tokens"] = int(config.max_tokens)
+        elif (
             hasattr(config, "max_completion_tokens")
             and config.max_completion_tokens is not None
         ):
-            api_kwargs["max_completion_tokens"] = int(config.max_completion_tokens)
-        elif hasattr(config, "max_tokens") and config.max_tokens is not None:
-            # For models that do not support 'max_tokens', map to 'max_completion_tokens'
-            api_kwargs["max_completion_tokens"] = int(config.max_tokens)
+            # Fallback to max_completion_tokens if max_tokens not set
+            api_kwargs["max_tokens"] = int(config.max_completion_tokens)
         for p in (
             "temperature",
             "top_p",
@@ -260,10 +268,6 @@ class ZAIModelDriver(LLMDriver):
             api_key_display = str(config.api_key)
             if api_key_display and len(api_key_display) > 8:
                 api_key_display = api_key_display[:4] + "..." + api_key_display[-4:]
-            client_kwargs = {
-                "api_key": config.api_key,
-                "base_url": "https://api.z.ai/api/paas/v4",
-            }
 
             # HTTP debug wrapper
             if os.environ.get("ZAI_DEBUG_HTTP", "0") == "1":
@@ -280,7 +284,14 @@ class ZAIModelDriver(LLMDriver):
                     flush=True,
                 )
 
-            client = openai.OpenAI(**client_kwargs)
+            # Use OpenAI SDK for Z.AI API compatibility
+            try:
+                import openai
+            except ImportError:
+                raise ImportError("openai module is not available. Please install it with: pip install openai")
+            client = openai.OpenAI(
+                api_key=config.api_key, base_url="https://api.z.ai/api/paas/v4/"
+            )
             return client
         except Exception as e:
             print(

{janito-2.12.0 → janito-2.15.0}/janito/providers/zai/model_info.py

@@ -18,15 +18,15 @@ MODEL_SPECS = {
             "output_cost_per_1k": 0.0015,
         },
     ),
-    "glm-4": LLMModelInfo(
-        name="glm-4",
+    "glm-4.5-air": LLMModelInfo(
+        name="glm-4.5-air",
         context=128000,
         max_input=128000,
-        max_cot="N/A",
+        max_cot=4096,
         max_response=4096,
-        thinking_supported=False,
+        thinking_supported=True,
         other={
-            "description": "Z.AI's GLM-4 model for general purpose tasks",
+            "description": "Z.AI's GLM-4.5-Air model - compact and efficient version",
             "supports_tools": True,
             "supports_images": True,
             "supports_audio": False,
@@ -35,21 +35,4 @@ MODEL_SPECS = {
             "output_cost_per_1k": 0.0009,
         },
     ),
-    "glm-4v": LLMModelInfo(
-        name="glm-4v",
-        context=128000,
-        max_input=128000,
-        max_cot="N/A",
-        max_response=4096,
-        thinking_supported=False,
-        other={
-            "description": "Z.AI's GLM-4V vision model for image understanding",
-            "supports_tools": True,
-            "supports_images": True,
-            "supports_audio": False,
-            "supports_video": False,
-            "input_cost_per_1k": 0.0004,
-            "output_cost_per_1k": 0.0012,
-        },
-    ),
 }

{janito-2.12.0 → janito-2.15.0}/janito/providers/zai/provider.py

@@ -17,7 +17,7 @@ class ZAIProvider(LLMProvider):
     NAME = "zai"
     MAINTAINER = "João Pinto <janito@ikignosis.org>"
     MODEL_SPECS = MODEL_SPECS
-    DEFAULT_MODEL = "glm-4.5"  # Options: glm-4.5, glm-4, glm-4v
+    DEFAULT_MODEL = "glm-4.5"  # Options: glm-4.5, glm-4.5-air
 
     def __init__(
         self, auth_manager: LLMAuthManager = None, config: LLMDriverConfig = None
@@ -33,6 +33,8 @@ class ZAIProvider(LLMProvider):
         # crash with an AttributeError when it tries to access `self._tools_adapter`.
         self._tools_adapter = get_local_tools_adapter()
         self._driver = None
+        # Initialize _driver_config to avoid AttributeError
+        self._driver_config = LLMDriverConfig(model=None)
 
     def _setup_available(self, auth_manager, config):
         self.auth_manager = auth_manager or LLMAuthManager()
@@ -43,6 +45,7 @@ class ZAIProvider(LLMProvider):
             )
             print(f"  janito --set-api-key YOUR_API_KEY -p {self.name}")
             print(f"Or set the ZAI_API_KEY environment variable.")
+            self._tools_adapter = get_local_tools_adapter()
             return
 
         self._tools_adapter = get_local_tools_adapter()

{janito-2.12.0 → janito-2.15.0}/janito/providers/zai/schema_generator.py

@@ -4,7 +4,7 @@ Generate OpenAI-compatible tool schemas for Z.AI API.
 
 import inspect
 from typing import get_type_hints, Dict, Any, Optional, List, Union
-from janito.tools import Tool
+from janito.tools.tool_base import ToolBase
 
 
 def generate_tool_schemas(tool_classes):
@@ -35,14 +35,16 @@ def generate_tool_schema(tool_class):
     Returns:
         OpenAI-compatible tool schema dict
     """
-    if not issubclass(tool_class, Tool):
+    if not issubclass(tool_class, ToolBase):
         return None
 
     tool_instance = tool_class()
 
-    # Get the execute method
+    # Get the execute or run method
     execute_method = getattr(tool_class, "execute", None)
-    if not execute_method:
+    if execute_method is None:
+        execute_method = getattr(tool_class, "run", None)
+    if execute_method is None:
         return None
 
     # Get method signature and type hints
@@ -78,7 +80,7 @@ def generate_tool_schema(tool_class):
     schema = {
         "type": "function",
         "function": {
-            "name": tool_class.__name__,
+            "name": getattr(tool_instance, "tool_name", tool_class.__name__),
             "description": getattr(
                 tool_instance, "description", f"Execute {tool_class.__name__}"
             ),

{janito-2.12.0 → janito-2.15.0}/janito.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 2.12.0
+Version: 2.15.0
 Summary: A new Python package called janito.
 Author-email: João Pinto <janito@ikignosis.org>
 Project-URL: Homepage, https://github.com/ikignosis/janito

{janito-2.12.0 → janito-2.15.0}/janito.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ docs/supported-providers-models.md
 docs/tools-index.md
 docs/tools-natural-results.md
 docs/tools-precision.md
+docs/z-ai-setup.md
 docs/about/costs.md
 docs/about/vs-webchats.md
 docs/about/why.md
@@ -159,6 +160,7 @@ janito/cli/chat_mode/shell/session/__init__.py
 janito/cli/chat_mode/shell/session/history.py
 janito/cli/chat_mode/shell/session/manager.py
 janito/cli/cli_commands/list_config.py
+janito/cli/cli_commands/list_drivers.py
 janito/cli/cli_commands/list_models.py
 janito/cli/cli_commands/list_profiles.py
 janito/cli/cli_commands/list_providers.py
@@ -179,7 +181,6 @@ janito/cli/single_shot_mode/__init__.py
 janito/cli/single_shot_mode/handler.py
 janito/docs/GETTING_STARTED.md
 janito/drivers/dashscope.bak.zip
-janito/drivers/driver_registry.py
 janito/drivers/openai_responses.bak.zip
 janito/drivers/azure_openai/driver.py
 janito/drivers/openai/README.md

{janito-2.12.0 → janito-2.15.0}/mkdocs.yml

@@ -37,6 +37,7 @@ nav:
       - Overview: supported-providers-models.md
       - DeepSeek Setup: deepseek-setup.md
       - MoonshotAI Setup: moonshotai-setup.md
+      - Z.ai Setup: z-ai-setup.md
   - Concepts:
       - Overview: concepts/index.md
       - What Is a Language Model Client?: concepts/language-model-clients.md