janito 3.12.1__py3-none-any.whl → 3.12.3__py3-none-any.whl

janito/plugins/tools/local/show_image_grid.py

@@ -1,76 +1,134 @@
-from janito.tools.tool_base import ToolBase, ToolPermissions
-from janito.report_events import ReportAction
-from janito.plugins.tools.local.adapter import register_local_tool
-from janito.i18n import tr
-from janito.tools.loop_protection_decorator import protect_against_loops
-from typing import Sequence
-
-
-@register_local_tool
-class ShowImageGridTool(ToolBase):
-    """Display multiple images in a grid inline in the terminal using rich.
-
-    Args:
-        paths (list[str]): List of image file paths.
-        columns (int, optional): Number of columns in the grid. Default: 2.
-        width (int, optional): Max width for each image cell. Default: None (auto).
-        height (int, optional): Max height for each image cell. Default: None (auto).
-        preserve_aspect (bool, optional): Preserve aspect ratio. Default: True.
-
-    Returns:
-        str: Status string summarizing the grid display.
-    """
-
-    permissions = ToolPermissions(read=True)
-    tool_name = "show_image_grid"
-
-    @protect_against_loops(max_calls=5, time_window=10.0, key_field="paths")
-    def run(
-        self,
-        paths: Sequence[str],
-        columns: int = 2,
-        width: int | None = None,
-        height: int | None = None,
-        preserve_aspect: bool = True,
-    ) -> str:
-        from janito.tools.path_utils import expand_path
-        from janito.tools.tool_utils import display_path
-        import os
-
-        try:
-            from rich.console import Console
-            from rich.columns import Columns
-            from PIL import Image as PILImage
-            from rich.panel import Panel
-        except Exception as e:
-            msg = tr("⚠️ Missing dependency: PIL/Pillow ({error})", error=e)
-            self.report_error(msg)
-            return msg
-
-        if not paths:
-            return tr("No images provided")
-
-        self.report_action(tr("🖼️ Show image grid ({n} images)", n=len(paths)), ReportAction.READ)
-
-        console = Console()
-        images = []
-        shown = 0
-        for p in paths:
-            fp = expand_path(p)
-            if not os.path.exists(fp):
-                self.report_warning(tr("❗ not found: {p}", p=display_path(fp)))
-                continue
-            try:
-                img = PILImage.open(fp)
-                title = f"{display_path(fp)} ({img.width}x{img.height})"
-                images.append(Panel.fit(title, title=display_path(fp), border_style="dim"))
-                shown += 1
-            except Exception as e:
-                self.report_warning(tr("⚠️ Skipped {p}: {e}", p=display_path(fp), e=e))
-
-        if not images:
-            return tr("No images could be displayed")
-
-        console.print(Columns(images, equal=True, expand=True, columns=columns))
-        self.report_success(tr("✅ Displayed {n} images", n=shown))
-        return tr("Displayed {shown}/{total} images in a {cols}x? grid", shown=shown, total=len(paths), cols=columns)
+from janito.tools.tool_base import ToolBase, ToolPermissions
+from janito.report_events import ReportAction
+from janito.plugins.tools.local.adapter import register_local_tool
+from janito.i18n import tr
+from janito.tools.loop_protection_decorator import protect_against_loops
+from typing import Sequence
+
+
+@register_local_tool
+class ShowImageGridTool(ToolBase):
+    """Display multiple images in a grid inline in the terminal using rich.
+
+    Args:
+        paths (list[str]): List of image file paths.
+        columns (int, optional): Number of columns in the grid. Default: 2.
+        width (int, optional): Max width for each image cell. Default: None (auto).
+        height (int, optional): Max height for each image cell. Default: None (auto).
+        preserve_aspect (bool, optional): Preserve aspect ratio. Default: True.
+
+    Returns:
+        str: Status string summarizing the grid display.
+    """
+
+    permissions = ToolPermissions(read=True)
+    tool_name = "show_image_grid"
+
+    @protect_against_loops(max_calls=5, time_window=10.0, key_field="paths")
+    def run(
+        self,
+        paths: Sequence[str],
+        columns: int = 2,
+        width: int | None = None,
+        height: int | None = None,
+        preserve_aspect: bool = True,
+    ) -> str:
+        from janito.tools.path_utils import expand_path
+        from janito.tools.tool_utils import display_path
+        import os
+
+        try:
+            from rich.console import Console
+            from rich.columns import Columns
+            from PIL import Image as PILImage
+            from rich.panel import Panel
+        except Exception as e:
+            msg = tr("⚠️ Missing dependency: PIL/Pillow ({error})", error=e)
+            self.report_error(msg)
+            return msg
+
+        if not paths:
+            return tr("No images provided")
+
+        self.report_action(tr("🖼️ Show image grid ({n} images)", n=len(paths)), ReportAction.READ)
+
+        console = Console()
+        images = []
+        shown = 0
+        
+        # Import numpy for ASCII art conversion
+        import numpy as np
+        
+        # Create ASCII art representation function
+        def image_to_ascii(image, target_width=20, target_height=10):
+            try:
+                # Convert to grayscale and resize
+                img_gray = image.convert('L')
+                img_resized = img_gray.resize((target_width, target_height))
+                
+                # Convert to numpy array
+                pixels = np.array(img_resized)
+                
+                # ASCII characters from dark to light
+                ascii_chars = "@%#*+=-:. "
+                
+                # Normalize pixels to ASCII range
+                ascii_art = ""
+                for row in pixels:
+                    for pixel in row:
+                        # Map pixel value (0-255) to ASCII index
+                        ascii_index = int((pixel / 255) * (len(ascii_chars) - 1))
+                        ascii_art += ascii_chars[ascii_index]
+                    ascii_art += "\n"
+                
+                return ascii_art.strip()
+            except Exception:
+                return None
+        
+        for p in paths:
+            fp = expand_path(p)
+            if not os.path.exists(fp):
+                self.report_warning(tr("❗ not found: {p}", p=display_path(fp)))
+                continue
+            try:
+                img = PILImage.open(fp)
+                
+                # Create ASCII art preview
+                ascii_art = image_to_ascii(img, 20, 10)
+                
+                if ascii_art:
+                    from rich.text import Text
+                    title_text = Text(f"{display_path(fp)}\n{img.width}×{img.height}", style="bold")
+                    ascii_text = Text(ascii_art, style="dim")
+                    combined_text = Text.assemble(title_text, "\n", ascii_text)
+                    panel = Panel(combined_text, title="Image", border_style="dim")
+                else:
+                    # Fallback to just info if ASCII art fails
+                    title = f"{display_path(fp)} ({img.width}x{img.height})"
+                    panel = Panel.fit(title, title=display_path(fp), border_style="dim")
+                
+                images.append(panel)
+                shown += 1
+            except Exception as e:
+                self.report_warning(tr("⚠️ Skipped {p}: {e}", p=display_path(fp), e=e))
+
+        if not images:
+            return tr("No images could be displayed")
+
+        # Use manual column layout since Columns doesn't support columns parameter
+        if columns > 1:
+            # Group images into rows
+            rows = []
+            for i in range(0, len(images), columns):
+                row_images = images[i:i+columns]
+                rows.append(Columns(row_images, equal=True, expand=True))
+            
+            # Print all rows
+            for row in rows:
+                console.print(row)
+        else:
+            # Single column - print each image panel separately
+            for image_panel in images:
+                console.print(image_panel)
+        self.report_success(tr("✅ Displayed {n} images", n=shown))
+        return tr("Displayed {shown}/{total} images in a {cols}x? grid", shown=shown, total=len(paths), cols=columns)

janito/plugins/tools/local/view_file.py

@@ -21,7 +21,7 @@ class ViewFileTool(ToolBase):
     Returns:
         str: File content with a header indicating the file name and line range. Example:
             - "---\nFile: /path/to/file.py | Lines: 1-10 (of 100)\n---\n<lines...>"
-            - "---\nFile: /path/to/file.py | All lines (total: 100 (all))\n---\n<all lines...>"
+            - "---\nFile: /path/to/file.py | All lines (total: 100 ⚪)\n---\n<all lines...>"
             - "Error reading file: <error message>"
             - "❗ not found"
     """
@@ -123,7 +123,7 @@ class ViewFileTool(ToolBase):
         else:
             self.report_success(
                 tr(
-                    " ✅ {selected_len} {line_word} (all)",
+                    " ✅ {selected_len} {line_word} ⚪",
                     selected_len=selected_len,
                     line_word=pluralize("line", selected_len),
                 )
@@ -158,7 +158,7 @@ class ViewFileTool(ToolBase):
             )
         else:
             return tr(
-                "---\n{disp_path} All lines (total: {total_lines} (all))\n---\n",
+                "---\n{disp_path} All lines (total: {total_lines} ⚪)\n---\n",
                 disp_path=disp_path,
                 total_lines=total_lines,
             )

janito/providers/alibaba/model_info.py

@@ -1,105 +1,136 @@
-from janito.llm.model import LLMModelInfo
-
-MODEL_SPECS = {
-    "qwen-turbo": LLMModelInfo(
-        name="qwen-turbo",
-        context=1008192,
-        max_response=8192,
-        category="Alibaba Qwen Turbo Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking_supported=True,
-        thinking=False,
-        max_cot=8192,
-    ),
-    "qwen-plus": LLMModelInfo(
-        name="qwen-plus",
-        context=131072,
-        max_response=8192,
-        category="Alibaba Qwen Plus Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking_supported=True,
-        thinking=False,
-        max_cot=8192,
-    ),
-    "qwen-max": LLMModelInfo(
-        name="qwen-max",
-        context=32768,
-        max_response=8192,
-        category="Alibaba Qwen Max Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking_supported=True,
-        thinking=False,
-        max_cot=8192,
-    ),
-    "qwen3-coder-plus": LLMModelInfo(
-        name="qwen3-coder-plus",
-        context=1048576,
-        max_response=65536,
-        category="Alibaba Qwen3 Coder Plus Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking_supported=True,
-        thinking=False,
-        max_cot=65536,
-    ),
-    "qwen3-coder-480b-a35b-instruct": LLMModelInfo(
-        name="qwen3-coder-480b-a35b-instruct",
-        context=262144,
-        max_response=65536,
-        category="Alibaba Qwen3 Coder 480B A35B Instruct Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking_supported=True,
-        thinking=False,
-        max_cot=65536,
-    ),
-    # Qwen3 1M context models (July 2025 update)
-    "qwen3-235b-a22b-thinking-2507": LLMModelInfo(
-        name="qwen3-235b-a22b-thinking-2507",
-        context=131072,  # Supports up to 1M with special config
-        max_response=32768,
-        category="Alibaba Qwen3 235B A22B Thinking Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking=True,
-        thinking_supported=True,
-        max_cot=32768,
-    ),
-    "qwen3-235b-a22b-instruct-2507": LLMModelInfo(
-        name="qwen3-235b-a22b-instruct-2507",
-        context=129024,  # Supports up to 1M with special config
-        max_response=32768,
-        category="Alibaba Qwen3 235B A22B Instruct Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking_supported=True,
-        thinking=False,
-        max_cot=32768,
-    ),
-    "qwen3-30b-a3b-thinking-2507": LLMModelInfo(
-        name="qwen3-30b-a3b-thinking-2507",
-        context=126976,  # Supports up to 1M with special config
-        max_response=32768,
-        category="Alibaba Qwen3 30B A3B Thinking Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking=True,
-        thinking_supported=True,
-        max_cot=32768,
-    ),
-    "qwen3-30b-a3b-instruct-2507": LLMModelInfo(
-        name="qwen3-30b-a3b-instruct-2507",
-        context=129024,  # Supports up to 1M with special config
-        max_response=32768,
-        category="Alibaba Qwen3 30B A3B Instruct Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking_supported=True,
-        thinking=False,
-        max_cot=32768,
-    ),
-    "qwen3-max-preview": LLMModelInfo(
-        name="qwen3-max-preview",
-        context=131072,  # 128K context window
-        max_response=32768,
-        category="Alibaba Qwen3 Max Preview Model (OpenAI-compatible)",
-        driver="OpenAIModelDriver",
-        thinking_supported=True,
-        thinking=False,
-        max_cot=32768,
-    ),
-}
+from janito.llm.model import LLMModelInfo
+
+MODEL_SPECS = {
+    "qwen-turbo": LLMModelInfo(
+        name="qwen-turbo",
+        context=1008192,
+        max_response=8192,
+        category="Alibaba Qwen Turbo Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=8192,
+    ),
+    "qwen-plus": LLMModelInfo(
+        name="qwen-plus",
+        context=131072,
+        max_response=8192,
+        category="Alibaba Qwen Plus Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=8192,
+    ),
+    "qwen-flash": LLMModelInfo(
+        name="qwen-flash",
+        context=1000000,
+        max_response=8192,
+        category="Alibaba Qwen Flash Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=8192,
+    ),
+    "qwen-max": LLMModelInfo(
+        name="qwen-max",
+        context=32768,
+        max_response=8192,
+        category="Alibaba Qwen Max Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=8192,
+    ),
+    "qwen3-coder-plus": LLMModelInfo(
+        name="qwen3-coder-plus",
+        context=1048576,
+        max_response=65536,
+        category="Alibaba Qwen3 Coder Plus Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=65536,
+    ),
+    "qwen3-coder-480b-a35b-instruct": LLMModelInfo(
+        name="qwen3-coder-480b-a35b-instruct",
+        context=262144,
+        max_response=65536,
+        category="Alibaba Qwen3 Coder 480B A35B Instruct Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=65536,
+    ),
+    # Qwen3 1M context models (July 2025 update)
+    "qwen3-235b-a22b-thinking-2507": LLMModelInfo(
+        name="qwen3-235b-a22b-thinking-2507",
+        context=131072,  # Supports up to 1M with special config
+        max_response=32768,
+        category="Alibaba Qwen3 235B A22B Thinking Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking=True,
+        thinking_supported=True,
+        max_cot=32768,
+    ),
+    "qwen3-235b-a22b-instruct-2507": LLMModelInfo(
+        name="qwen3-235b-a22b-instruct-2507",
+        context=129024,  # Supports up to 1M with special config
+        max_response=32768,
+        category="Alibaba Qwen3 235B A22B Instruct Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=32768,
+    ),
+    "qwen3-30b-a3b-thinking-2507": LLMModelInfo(
+        name="qwen3-30b-a3b-thinking-2507",
+        context=126976,  # Supports up to 1M with special config
+        max_response=32768,
+        category="Alibaba Qwen3 30B A3B Thinking Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking=True,
+        thinking_supported=True,
+        max_cot=32768,
+    ),
+    "qwen3-30b-a3b-instruct-2507": LLMModelInfo(
+        name="qwen3-30b-a3b-instruct-2507",
+        context=129024,  # Supports up to 1M with special config
+        max_response=32768,
+        category="Alibaba Qwen3 30B A3B Instruct Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=32768,
+    ),
+    # Qwen3 Next models (September 2025 update)
+    "qwen3-next-80b-a3b-instruct": LLMModelInfo(
+        name="qwen3-next-80b-a3b-instruct",
+        context=262144,  # 256K context window (Qwen3-Max Preview)
+        max_response=65536,  # Matches Qwen3-Max Preview output limit
+        category="Alibaba Qwen3-Max Preview (256K) - 80B A3B Instruct Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=65536,
+    ),
+    "qwen3-next-80b-a3b-thinking": LLMModelInfo(
+        name="qwen3-next-80b-a3b-thinking",
+        context=262144,  # 256K context window (Qwen3-Max Preview)
+        max_response=65536,  # Matches Qwen3-Max Preview output limit
+        category="Alibaba Qwen3-Max Preview (256K) - 80B A3B Thinking Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking=True,
+        thinking_supported=True,
+        max_cot=65536,
+    ),
+    "qwen3-max-preview": LLMModelInfo(
+        name="qwen3-max-preview",
+        context=262144,  # 256K context window (Qwen3-Max Preview)
+        max_response=65536,  # Matches Qwen3-Max Preview output limit
+        category="Alibaba Qwen3-Max Preview (256K) - Standard Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=65536,
+    ),
+}