janito 2.0.1__tar.gz → 2.1.1__tar.gz

{janito-2.0.1 → janito-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 2.0.1
+Version: 2.1.1
 Summary: A new Python package called janito.
 Author-email: Your Name <your.email@example.com>
 Project-URL: Homepage, https://github.com/janito-dev/janito

{janito-2.0.1 → janito-2.1.1}/janito/__init__.py

@@ -3,4 +3,4 @@ janito: A Python package for managing and interacting with Large Language Model
 Provides a CLI for credential management and an extensible driver system for LLMs.
 """
 
-__version__ = "2.0.1"
+__version__ = "2.1.1"

{janito-2.0.1 → janito-2.1.1}/janito/cli/config.py

@@ -8,7 +8,6 @@ CONFIG_OPTIONS = {
     "role": "Role description for the Agent Profile (e.g., 'software engineer')",
     "temperature": "Sampling temperature (float, e.g., 0.0 - 2.0)",
     "max_tokens": "Maximum tokens for model response (int)",
-    "use_azure_openai": "Whether to use Azure OpenAI client (default: False)",
     "template": "Template context dictionary for Agent Profile prompt rendering (nested)",
     "profile": "Agent Profile name (only 'base' is supported)",
 }

{janito-2.0.1 → janito-2.1.1}/janito/cli/core/runner.py

@@ -66,16 +66,18 @@ def prepare_llm_driver_config(args, modifiers):
         provider_instance = None
         try:
             provider_instance = ProviderRegistry().get_instance(provider)
-            available_models = [
-                m["name"]
-                for m in provider_instance.get_model_info().values()
-                if isinstance(m, dict) and "name" in m
-            ]
-            if model not in available_models:
+            if not provider_instance.is_model_available(model):
                 print(
                     f"Error: Model '{model}' is not available for provider '{provider}'."
                 )
-                print(f"Available models: {', '.join(available_models)}")
+                # Optionally, print available models if possible
+                if hasattr(provider_instance, 'get_model_info'):
+                    available_models = [
+                        m["name"]
+                        for m in provider_instance.get_model_info().values()
+                        if isinstance(m, dict) and "name" in m
+                    ]
+                    print(f"Available models: {', '.join(available_models)}")
                 return provider, None, None
         except Exception as e:
             print(f"Error validating model for provider '{provider}': {e}")
@@ -98,11 +100,12 @@ def handle_runner(args, provider, llm_driver_config, agent_role, verbose_tools=F
     # Patch: disable execution/run tools if not enabled
     if not exec_enabled:
         import janito.tools
-        adapter = janito.tools.get_local_tools_adapter()
+        adapter = janito.tools.get_local_tools_adapter(workdir=getattr(args, "workdir", None))
         if hasattr(adapter, "disable_execution_tools"):
             adapter.disable_execution_tools()
     else:
-        pass
+        import janito.tools
+        adapter = janito.tools.get_local_tools_adapter(workdir=getattr(args, "workdir", None))
 
     provider_instance = ProviderRegistry().get_instance(provider, llm_driver_config)
     mode = get_prompt_mode(args)

{janito-2.0.1 → janito-2.1.1}/janito/cli/main_cli.py

@@ -13,6 +13,14 @@ from janito.cli.core.event_logger import (
 )
 
 definition = [
+    (
+        ["-W", "--workdir"],
+        {
+            "metavar": "WORKDIR",
+            "help": "Working directory to chdir to before tool execution",
+            "default": None,
+        },
+    ),
     (
         ["--verbose-api"],
         {

janito-2.1.1/janito/drivers/azure_openai/driver.py

@@ -0,0 +1,55 @@
+from janito.drivers.openai.driver import OpenAIModelDriver
+
+# Safe import of AzureOpenAI SDK
+try:
+    from openai import AzureOpenAI
+
+    DRIVER_AVAILABLE = True
+    DRIVER_UNAVAILABLE_REASON = None
+except ImportError:
+    DRIVER_AVAILABLE = False
+    DRIVER_UNAVAILABLE_REASON = "Missing dependency: openai (pip install openai)"
+
+from janito.llm.driver_config import LLMDriverConfig
+
+
+class AzureOpenAIModelDriver(OpenAIModelDriver):
+    available = DRIVER_AVAILABLE
+    unavailable_reason = DRIVER_UNAVAILABLE_REASON
+
+    @classmethod
+    def is_available(cls):
+        return cls.available
+
+    required_config = {"base_url"}  # Update key as used in your config logic
+
+    def __init__(self, tools_adapter=None):
+        if not self.available:
+            raise ImportError(
+                f"AzureOpenAIModelDriver unavailable: {self.unavailable_reason}"
+            )
+        # Do NOT call super().__init__ if Azure SDK is not available
+        OpenAIModelDriver.__init__(self, tools_adapter=tools_adapter)
+        self.azure_endpoint = None
+        self.api_version = None
+        self.api_key = None
+
+    def _instantiate_openai_client(self, config):
+        try:
+            from openai import AzureOpenAI
+            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,
+                "azure_endpoint": getattr(config, "base_url", None),
+                "api_version": config.extra.get("api_version", "2023-05-15"),
+            }
+            client = AzureOpenAI(**client_kwargs)
+            return client
+        except Exception as e:
+            print(f"[ERROR] Exception during AzureOpenAI client instantiation: {e}", flush=True)
+            import traceback
+            print(traceback.format_exc(), flush=True)
+            raise
+

{janito-2.0.1 → janito-2.1.1}/janito/llm/provider.py

@@ -93,6 +93,15 @@ class LLMProvider(ABC):
     def driver(self) -> LLMDriver:
         pass
 
+    def is_model_available(self, model_name):
+        """
+        Returns True if the given model is available for this provider.
+        Default implementation checks MODEL_SPECS; override for dynamic providers.
+        """
+        if not hasattr(self, "MODEL_SPECS"):
+            return False
+        return model_name in self.MODEL_SPECS
+
     def get_model_info(self, model_name=None):
         """
         Return the info dict for a given model (driver, params, etc). If model_name is None, return all model info dicts.

{janito-2.0.1 → janito-2.1.1}/janito/providers/azure_openai/provider.py

@@ -55,6 +55,12 @@ class AzureOpenAIProvider(LLMProvider):
     def unavailable_reason(self):
         return unavailable_reason
 
+    def is_model_available(self, model_name):
+        """
+        Returns True for any model name, since Azure deployments are user-defined and not enumerable in advance.
+        """
+        return True
+
     def create_agent(self, tools_adapter=None, agent_name: str = None, **kwargs):
         from janito.llm.agent import LLMAgent
         from janito.drivers.azure_openai.driver import AzureOpenAIModelDriver

{janito-2.0.1 → janito-2.1.1}/janito/providers/deepseek/model_info.py

@@ -6,8 +6,8 @@ MODEL_SPECS = {
         "family": "deepseek",
         "default": True,
     },
-    "deepseek-coder": {
-        "description": "DeepSeek Coder Model (OpenAI-compatible)",
+    "deepseek-reasoner": {
+        "description": "DeepSeek Reasoner Model (OpenAI-compatible)",
         "context_window": 8192,
         "max_tokens": 4096,
         "family": "deepseek",

{janito-2.0.1 → janito-2.1.1}/janito/providers/deepseek/provider.py

@@ -16,7 +16,7 @@ class DeepseekProvider(LLMProvider):
     name = "deepseek"
     maintainer = "Needs maintainer"
     MODEL_SPECS = MODEL_SPECS
-    DEFAULT_MODEL = "deepseek-chat"  # Options: deepseek-chat, deepseek-coder
+    DEFAULT_MODEL = "deepseek-chat"  # Options: deepseek-chat, deepseek-reasoner
 
     def __init__(
         self, auth_manager: LLMAuthManager = None, config: LLMDriverConfig = None

{janito-2.0.1 → janito-2.1.1}/janito/tools/__init__.py

@@ -4,9 +4,13 @@ from janito.tools.adapters.local import (
 )
 
 
-def get_local_tools_adapter():
-
+def get_local_tools_adapter(workdir=None):
     # Use set_verbose_tools on the returned adapter to set verbosity as needed
+    if workdir is not None:
+        import os
+        if not os.path.exists(workdir):
+            os.makedirs(workdir, exist_ok=True)
+        return LocalToolsAdapter(workdir=workdir)
     return _internal_local_tools_adapter
 
 

{janito-2.0.1 → janito-2.1.1}/janito/tools/adapters/local/__init__.py

@@ -9,6 +9,7 @@ from .find_files import FindFilesTool
 from .view_file import ViewFileTool
 from .move_file import MoveFileTool
 from .open_url import OpenUrlTool
+from .open_html_in_browser import OpenHtmlInBrowserTool
 from .python_code_run import PythonCodeRunTool
 from .python_command_run import PythonCommandRunTool
 from .python_file_run import PythonFileRunTool
@@ -23,7 +24,12 @@ from .search_text.core import SearchTextTool
 from .validate_file_syntax.core import ValidateFileSyntaxTool
 
 # Singleton tools adapter with all standard tools registered
-local_tools_adapter = LocalToolsAdapter()
+import os
+local_tools_adapter = LocalToolsAdapter(workdir=os.getcwd())
+
+def get_local_tools_adapter(workdir=None):
+    import os
+    return LocalToolsAdapter(workdir=workdir or os.getcwd())
 
 # Register tools
 for tool_class in [
@@ -36,6 +42,7 @@ for tool_class in [
     ViewFileTool,
     MoveFileTool,
     OpenUrlTool,
+    OpenHtmlInBrowserTool,
     PythonCodeRunTool,
     PythonCommandRunTool,
     PythonFileRunTool,
@@ -52,3 +59,4 @@ for tool_class in [
     local_tools_adapter.register_tool(tool_class)
 
 # DEBUG: Print registered tools at startup
+

{janito-2.0.1 → janito-2.1.1}/janito/tools/adapters/local/adapter.py

@@ -15,9 +15,13 @@ class LocalToolsAdapter(ToolsAdapter):
     Handles registration, lookup, enabling/disabling, listing, and now, tool execution (merged from executor).
     """
 
-    def __init__(self, tools=None, event_bus=None, allowed_tools=None):
+    def __init__(self, tools=None, event_bus=None, allowed_tools=None, workdir=None):
         super().__init__(tools=tools, event_bus=event_bus, allowed_tools=allowed_tools)
         self._tools: Dict[str, Dict[str, Any]] = {}
+        self.workdir = workdir
+        if self.workdir:
+            import os
+            os.chdir(self.workdir)
         if tools:
             for tool in tools:
                 self.register_tool(tool)

{janito-2.0.1 → janito-2.1.1}/janito/tools/adapters/local/ask_user.py

@@ -43,26 +43,13 @@ class AskUserTool(ToolBase):
         def _(event):
             pass
 
-        # F12 instruction rotation
-        _f12_instructions = [
-            tr("proceed"),
-            tr("go ahead"),
-            tr("continue"),
-            tr("next"),
-            tr("okay"),
-        ]
-        _f12_index = {"value": 0}
-
         @bindings.add("f12")
         def _(event):
-            """When F12 is pressed, rotate through a set of short instructions."""
             buf = event.app.current_buffer
-            idx = _f12_index["value"]
-            buf.text = _f12_instructions[idx]
+            buf.text = "Do It"
             buf.validate_and_handle()
-            _f12_index["value"] = (idx + 1) % len(_f12_instructions)
 
-            # Use shared CLI styles
+        # Use shared CLI styles
 
         # prompt_style contains the prompt area and input background
         # toolbar_style contains the bottom-toolbar styling

{janito-2.0.1 → janito-2.1.1}/janito/tools/adapters/local/open_html_in_browser.py

@@ -1,5 +1,6 @@
 from janito.tools.tool_base import ToolBase
 from janito.tools.adapters.local.adapter import register_local_tool
+from janito.report_events import ReportAction
 import webbrowser
 import os
 
@@ -21,14 +22,22 @@ class OpenHtmlInBrowserTool(ToolBase):
     tool_name = "open_html_in_browser"
 
     def run(self, file_path: str) -> str:
+        from janito.i18n import tr
+        disp_path = file_path
+        self.report_action(tr("📖 Opening HTML file: '{disp_path}'", disp_path=disp_path), ReportAction.EXECUTE)
+
         if not os.path.exists(file_path):
-            return "⚠️ Error: The specified file does not exist."
-        
+            self.report_error(tr("⚠️ The specified file does not exist: '{disp_path}'", disp_path=disp_path))
+            return "⚠️ The specified file does not exist."
+
         if not file_path.lower().endswith('.html'):
-            return "⚠️ Error: The specified file is not an HTML file."
-        
+            self.report_error(tr("⚠️ The specified file is not an HTML file: '{disp_path}'", disp_path=disp_path))
+            return "⚠️ The specified file is not an HTML file."
+
         try:
             webbrowser.open(f"file://{os.path.abspath(file_path)}")
-            return "✅ Opened."
+            self.report_success(tr("✅ Ok"))
+            return "✅ Ok"
         except Exception as e:
-            return f"⚠️ Error: {str(e)}"
+            self.report_error(tr("⚠️ Failed to open the HTML file: {err}", err=str(e)))
+            return f"⚠️ Failed to open the file: {str(e)}"

{janito-2.0.1 → janito-2.1.1}/janito/tools/adapters/local/python_code_run.py

@@ -32,6 +32,7 @@ class PythonCodeRunTool(ToolBase):
             tr("⚡ Running: python (stdin mode) ...\n{code}\n", code=code),
             ReportAction.EXECUTE,
         )
+        self.report_stdout("\n")
         try:
             with (
                 tempfile.NamedTemporaryFile(

{janito-2.0.1 → janito-2.1.1}/janito/tools/adapters/local/python_command_run.py

@@ -31,6 +31,7 @@ class PythonCommandRunTool(ToolBase):
         self.report_action(
             tr("🐍 Running: python -c ...\n{code}\n", code=code), ReportAction.EXECUTE
         )
+        self.report_stdout("\n")
         try:
             with (
                 tempfile.NamedTemporaryFile(

{janito-2.0.1 → janito-2.1.1}/janito/tools/adapters/local/python_file_run.py

@@ -29,6 +29,7 @@ class PythonFileRunTool(ToolBase):
             tr("🚀 Running: python {file_path}", file_path=file_path),
             ReportAction.EXECUTE,
         )
+        self.report_stdout("\n")
         try:
             with (
                 tempfile.NamedTemporaryFile(

{janito-2.0.1 → janito-2.1.1}/janito/version.py

@@ -1,4 +1,4 @@
 # janito/version.py
 """Single source of truth for the janito package version."""
 
-__version__ = "2.0.1"
+__version__ = "2.1.1"

{janito-2.0.1 → janito-2.1.1}/janito.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 2.0.1
+Version: 2.1.1
 Summary: A new Python package called janito.
 Author-email: Your Name <your.email@example.com>
 Project-URL: Homepage, https://github.com/janito-dev/janito

{janito-2.0.1 → janito-2.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "janito"
-version = "2.0.1"
+version = "2.1.1"
 description = "A new Python package called janito."
 authors = [
     { name="Your Name", email="your.email@example.com" }

janito-2.0.1/janito/drivers/azure_openai/driver.py

@@ -1,36 +0,0 @@
-from janito.drivers.openai.driver import OpenAIModelDriver
-
-# Safe import of AzureOpenAI SDK
-try:
-    from openai import AzureOpenAI
-
-    DRIVER_AVAILABLE = True
-    DRIVER_UNAVAILABLE_REASON = None
-except ImportError:
-    DRIVER_AVAILABLE = False
-    DRIVER_UNAVAILABLE_REASON = "Missing dependency: openai (pip install openai)"
-
-from janito.llm.driver_config import LLMDriverConfig
-
-
-class AzureOpenAIModelDriver(OpenAIModelDriver):
-    available = DRIVER_AVAILABLE
-    unavailable_reason = DRIVER_UNAVAILABLE_REASON
-
-    @classmethod
-    def is_available(cls):
-        return cls.available
-
-    required_config = {"base_url"}  # Update key as used in your config logic
-
-    def __init__(self, tools_adapter=None):
-        if not self.available:
-            raise ImportError(
-                f"AzureOpenAIModelDriver unavailable: {self.unavailable_reason}"
-            )
-        super().__init__(tools_adapter=tools_adapter)
-        self.azure_endpoint = None
-        self.api_version = None
-        self.api_key = None
-
-    # ... rest of the implementation ...