janito 3.16.1__py3-none-any.whl → 3.16.3__py3-none-any.whl

janito/cli/rich_terminal_reporter.py

@@ -1,168 +1,182 @@
-from rich.console import Console
-from rich.markdown import Markdown
-from rich.pretty import Pretty
-from rich.panel import Panel
-from rich.text import Text
-from janito.event_bus.handler import EventHandlerBase
-import janito.driver_events as driver_events
-from janito.report_events import ReportSubtype, ReportAction
-from janito.event_bus.bus import event_bus
-from janito.llm import message_parts
-import janito.agent_events as agent_events
-
-
-import sys
-
-
-class RichTerminalReporter(EventHandlerBase):
-    """
-    Handles UI rendering for janito events using Rich.
-
-    - For ResponseReceived events, iterates over the 'parts' field and displays each part appropriately:
-        - TextMessagePart: rendered as Markdown (uses 'content' field)
-        - Other MessageParts: displayed using Pretty or a suitable Rich representation
-    - For RequestFinished events, output is printed only if raw mode is enabled (using Pretty formatting).
-    - Report events (info, success, error, etc.) are always printed with appropriate styling.
-    """
-
-    def __init__(self, raw_mode=False):
-        from janito.cli.console import shared_console
-
-        self.console = shared_console
-        self.raw_mode = raw_mode
-        import janito.report_events as report_events
-
-        import janito.tools.tool_events as tool_events
-
-        super().__init__(driver_events, report_events, tool_events, agent_events)
-        self._waiting_printed = False
-
-    def on_RequestStarted(self, event):
-        # Print waiting message with provider and model name
-        provider = None
-        model = None
-        if hasattr(event, "payload") and isinstance(event.payload, dict):
-            provider = event.payload.get("provider_name")
-            model = event.payload.get("model") or event.payload.get("model_name")
-        if not provider:
-            provider = getattr(event, "provider_name", None)
-        if not provider:
-            provider = getattr(event, "driver_name", None)
-        if not provider:
-            provider = "LLM"
-        if not model:
-            model = getattr(event, "model", None)
-        if not model:
-            model = getattr(event, "model_name", None)
-        if not model:
-            model = "?"
-        self.console.print(
-            f"[bold cyan]Waiting for {provider} (model: {model})...[/bold cyan]", end=""
-        )
-        self._waiting_printed = True
-
-    def on_AgentWaitingForResponse(self, event):
-        # Agent waiting - set flag but don't print anything
-        self._waiting_printed = True
-
-    def on_ResponseReceived(self, event):
-        parts = event.parts if hasattr(event, "parts") else None
-        if not parts:
-            self.console.print("[No response parts to display]")
-            self.console.file.flush()
-            return
-        for part in parts:
-            if isinstance(part, message_parts.TextMessagePart):
-                self.console.print(Markdown(part.content))
-                self.console.file.flush()
-
-    def delete_current_line(self):
-        """
-        Clears the entire current line in the terminal and returns the cursor to column 1.
-        """
-        # Use raw ANSI escape sequences but write directly to the underlying file
-        # to bypass Rich's escaping/interpretation
-        if hasattr(self.console, 'file') and hasattr(self.console.file, 'write'):
-            self.console.file.write("\r\033[2K")
-            self.console.file.flush()
-        else:
-            # Fallback to sys.stdout if console.file is not available
-            import sys
-            sys.stdout.write("\r\033[2K")
-            sys.stdout.flush()
-
-    def on_RequestFinished(self, event):
-        if self._waiting_printed:
-            self.delete_current_line()
-            self._waiting_printed = False
-
-    def on_AgentReceivedResponse(self, event):
-        # Clear any waiting message when agent receives response
-        if self._waiting_printed:
-            self.delete_current_line()
-            self._waiting_printed = False
-
-    def on_ToolCallError(self, event):
-        # Optionally handle tool call errors in a user-friendly way
-        error = getattr(event, "error", None)
-        tool = getattr(event, "tool_name", None)
-        if error and tool:
-            self.console.print(f"[bold red]Tool Error ({tool}):[/] {error}")
-            self.console.file.flush()
-
-    def on_ReportEvent(self, event):
-        # Special handling for security-related report events
-        subtype = getattr(event, "subtype", None)
-        msg = getattr(event, "message", None)
-        action = getattr(event, "action", None)
-        tool = getattr(event, "tool", None)
-        context = getattr(event, "context", None)
-        if (
-            subtype == ReportSubtype.ERROR
-            and msg
-            and "[SECURITY] Path access denied" in msg
-        ):
-            # Highlight security errors with a distinct style
-            self.console.print(
-                Panel(f"{msg}", title="[red]SECURITY VIOLATION[/red]", style="bold red")
-            )
-            self.console.file.flush()
-            return
-
-        msg = event.message if hasattr(event, "message") else None
-        subtype = event.subtype if hasattr(event, "subtype") else None
-        if not msg or not subtype:
-            return
-        if subtype == ReportSubtype.ACTION_INFO:
-            # Clear any waiting message before showing action info
-            if self._waiting_printed:
-                self.delete_current_line()
-                self._waiting_printed = False
-            # Use orange for all write/modification actions
-            modification_actions = (
-                getattr(ReportAction, "UPDATE", None),
-                getattr(ReportAction, "WRITE", None),
-                getattr(ReportAction, "DELETE", None),
-                getattr(ReportAction, "CREATE", None),
-            )
-            style = (
-                "orange1"
-                if getattr(event, "action", None) in modification_actions
-                else "cyan"
-            )
-            self.console.print(Text(msg, style=style), end="")
-            self.console.file.flush()
-        elif subtype in (
-            ReportSubtype.SUCCESS,
-            ReportSubtype.ERROR,
-            ReportSubtype.WARNING,
-        ):
-            self.console.print(msg)
-            self.console.file.flush()
-        elif subtype == ReportSubtype.STDOUT:
-            print(msg)
-        elif subtype == ReportSubtype.STDERR:
-            print(msg, file=sys.stderr)
-        else:
-            self.console.print(msg)
-            self.console.file.flush()
+from rich.console import Console
+from rich.markdown import Markdown
+from rich.pretty import Pretty
+from rich.panel import Panel
+from rich.text import Text
+from janito.event_bus.handler import EventHandlerBase
+import janito.driver_events as driver_events
+from janito.report_events import ReportSubtype, ReportAction
+from janito.event_bus.bus import event_bus
+from janito.llm import message_parts
+import janito.agent_events as agent_events
+
+
+import sys
+
+
+class RichTerminalReporter(EventHandlerBase):
+    """
+    Handles UI rendering for janito events using Rich.
+
+    - For ResponseReceived events, iterates over the 'parts' field and displays each part appropriately:
+        - TextMessagePart: rendered as Markdown (uses 'content' field)
+        - Other MessageParts: displayed using Pretty or a suitable Rich representation
+    - For RequestFinished events, output is printed only if raw mode is enabled (using Pretty formatting).
+    - Report events (info, success, error, etc.) are always printed with appropriate styling.
+    """
+
+    def __init__(self, raw_mode=False):
+        from janito.cli.console import shared_console
+
+        self.console = shared_console
+        self.raw_mode = raw_mode
+        import janito.report_events as report_events
+
+        import janito.tools.tool_events as tool_events
+
+        super().__init__(driver_events, report_events, tool_events, agent_events)
+        self._waiting_printed = False
+
+    def on_RequestStarted(self, event):
+        # Print waiting message with provider and model name
+        provider = None
+        model = None
+        if hasattr(event, "payload") and isinstance(event.payload, dict):
+            provider = event.payload.get("provider_name")
+            model = event.payload.get("model") or event.payload.get("model_name")
+        if not provider:
+            provider = getattr(event, "provider_name", None)
+        if not provider:
+            provider = getattr(event, "driver_name", None)
+        if not provider:
+            provider = "LLM"
+        if not model:
+            model = getattr(event, "model", None)
+        if not model:
+            model = getattr(event, "model_name", None)
+        if not model:
+            model = "?"
+        self.console.print(
+            f"[bold cyan]Waiting for {provider} (model: {model})...[/bold cyan]", end=""
+        )
+        self._waiting_printed = True
+
+    def on_AgentWaitingForResponse(self, event):
+        # Agent waiting - set flag but don't print anything
+        self._waiting_printed = True
+
+    def on_ResponseReceived(self, event):
+        parts = event.parts if hasattr(event, "parts") else None
+        if not parts:
+            self.console.print("[No response parts to display]")
+            self.console.file.flush()
+            return
+        for part in parts:
+            if isinstance(part, message_parts.TextMessagePart):
+                self.console.print(Markdown(part.content))
+                self.console.file.flush()
+
+    def delete_current_line(self):
+        """
+        Clears the entire current line in the terminal and returns the cursor to column 1.
+        """
+        # Use raw ANSI escape sequences but write directly to the underlying file
+        # to bypass Rich's escaping/interpretation
+        if hasattr(self.console, "file") and hasattr(self.console.file, "write"):
+            self.console.file.write("\r\033[2K")
+            self.console.file.flush()
+        else:
+            # Fallback to sys.stdout if console.file is not available
+            import sys
+
+            sys.stdout.write("\r\033[2K")
+            sys.stdout.flush()
+
+    def on_RequestFinished(self, event):
+        # Check if this is an error status and display the error message
+        status = getattr(event, "status", None)
+        if status == driver_events.RequestStatus.ERROR:
+            error_msg = getattr(event, "error", "Unknown error occurred")
+            self.console.print(f"[bold red]Request Error:[/bold red] {error_msg}")
+
+            # Optionally print the traceback if available and in raw mode
+            if self.raw_mode:
+                traceback = getattr(event, "traceback", None)
+                if traceback:
+                    self.console.print("[bold yellow]Traceback:[/bold yellow]")
+                    self.console.print(traceback)
+
+        if self._waiting_printed:
+            self.delete_current_line()
+            self._waiting_printed = False
+
+    def on_AgentReceivedResponse(self, event):
+        # Clear any waiting message when agent receives response
+        if self._waiting_printed:
+            self.delete_current_line()
+            self._waiting_printed = False
+
+    def on_ToolCallError(self, event):
+        # Optionally handle tool call errors in a user-friendly way
+        error = getattr(event, "error", None)
+        tool = getattr(event, "tool_name", None)
+        if error and tool:
+            self.console.print(f"[bold red]Tool Error ({tool}):[/] {error}")
+            self.console.file.flush()
+
+    def on_ReportEvent(self, event):
+        # Special handling for security-related report events
+        subtype = getattr(event, "subtype", None)
+        msg = getattr(event, "message", None)
+        action = getattr(event, "action", None)
+        tool = getattr(event, "tool", None)
+        context = getattr(event, "context", None)
+        if (
+            subtype == ReportSubtype.ERROR
+            and msg
+            and "[SECURITY] Path access denied" in msg
+        ):
+            # Highlight security errors with a distinct style
+            self.console.print(
+                Panel(f"{msg}", title="[red]SECURITY VIOLATION[/red]", style="bold red")
+            )
+            self.console.file.flush()
+            return
+
+        msg = event.message if hasattr(event, "message") else None
+        subtype = event.subtype if hasattr(event, "subtype") else None
+        if not msg or not subtype:
+            return
+        if subtype == ReportSubtype.ACTION_INFO:
+            # Clear any waiting message before showing action info
+            if self._waiting_printed:
+                self.delete_current_line()
+                self._waiting_printed = False
+            # Use orange for all write/modification actions
+            modification_actions = (
+                getattr(ReportAction, "UPDATE", None),
+                getattr(ReportAction, "WRITE", None),
+                getattr(ReportAction, "DELETE", None),
+                getattr(ReportAction, "CREATE", None),
+            )
+            style = (
+                "orange1"
+                if getattr(event, "action", None) in modification_actions
+                else "cyan"
+            )
+            self.console.print(Text(msg, style=style), end="")
+            self.console.file.flush()
+        elif subtype in (
+            ReportSubtype.SUCCESS,
+            ReportSubtype.ERROR,
+            ReportSubtype.WARNING,
+        ):
+            self.console.print(msg)
+            self.console.file.flush()
+        elif subtype == ReportSubtype.STDOUT:
+            print(msg)
+        elif subtype == ReportSubtype.STDERR:
+            print(msg, file=sys.stderr)
+        else:
+            self.console.print(msg)
+            self.console.file.flush()

{janito-3.16.1.dist-info → janito-3.16.3.dist-info}/METADATA

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

{janito-3.16.1.dist-info → janito-3.16.3.dist-info}/RECORD

@@ -21,20 +21,20 @@ janito/provider_registry.py,sha256=IRNB35Cjn4PSXMWOxKBjPg0DfUEOoL4vh63OSPxhMtk,6
 janito/report_events.py,sha256=q4OR_jTZNfcqaQF_fzTjgqo6_VlUIxSGWfhpT4nJWcw,938
 janito/shell.bak.zip,sha256=hznHbmgfkAkjuQDJ3w73XPQh05yrtUZQxLmtGbanbYU,22
 janito/utils.py,sha256=eXSsMgM69YyzahgCNrJQLcEbB8ssLI1MQqaa20ONxbE,376
-janito/agent/setup_agent.py,sha256=WVuWkVRkMo9NOTXdSPE5HGe88g5bgIa8T777eW7_KcA,12899
-janito/agent/templates/profiles/system_prompt_template_Developer_with_Python_Tools.txt.j2,sha256=A33q_KPtowfD5IofHAYxJrfLKQIFr13cVLleCbM5Aik,4052
-janito/agent/templates/profiles/system_prompt_template_developer.txt.j2,sha256=rho3zGkoLol5faiALIEPe8-FgT3-VdpyddIwgzv1xDU,3745
-janito/agent/templates/profiles/system_prompt_template_market_analyst.txt.j2,sha256=Tv7mIxUHrZqc8bSeX41bZN8uIaDTdeKuBnHSbnDHDKE,4226
-janito/agent/templates/profiles/system_prompt_template_model_conversation_without_tools_or_context.txt.j2,sha256=Zgoa26AlR37rjYAPl-4ydA3NdHm8ylT831IaMiGTd5o,1722
+janito/agent/setup_agent.py,sha256=NZmbIZfFyRW7B1DYa57q2ylM-cC-Y9vkkjrXU702gKY,12973
+janito/agent/templates/profiles/system_prompt_template_Developer_with_Python_Tools.txt.j2,sha256=70AntMlMV2a4mzQXM4ieWpPJc3ydtZU-KKqmmn7YMJI,3823
+janito/agent/templates/profiles/system_prompt_template_developer.txt.j2,sha256=gN1DCJmHCdQ7PQZzl2slDArhMaBhEIgGdU8biu9jgzU,3506
+janito/agent/templates/profiles/system_prompt_template_market_analyst.txt.j2,sha256=4py-FjgNggjjz9f0ckOHKfgp3cdynq0HlMi1NLzH2EA,3985
+janito/agent/templates/profiles/system_prompt_template_model_conversation_without_tools_or_context.txt.j2,sha256=hkTtdc012FOyPPrZLAj6YL3rrnhWcAbm-CzsoEA4DiQ,1389
 janito/cli/__init__.py,sha256=xaPDOrWphBbCR63Xpcx_yfpXSJIlCaaICc4j2qpWqrM,194
 janito/cli/config.py,sha256=HkZ14701HzIqrvaNyDcDhGlVHfpX_uHlLp2rHmhRm_k,872
 janito/cli/console.py,sha256=dWOa6mbfCQd46wVwwZfeYBxroCxdqvnAZQQ80j89qYA,70
 janito/cli/main.py,sha256=s5odou0txf8pzTf1ADk2yV7T5m8B6cejJ81e7iu776U,312
-janito/cli/main_cli.py,sha256=JaZUedhNdeNRaYU5j2bH0u1dD8B89olk3ZSx1_REQjI,17204
+janito/cli/main_cli.py,sha256=dpHK84e_pIrkfJa2jRENQB9Y46Zn-Z9VJJmfv6NWJA4,17543
 janito/cli/prompt_core.py,sha256=x1RcX1p4wCL4YzXS76T6BZ8nt5cGiXCAB3QOlC6BJQQ,14937
 janito/cli/prompt_handler.py,sha256=SnPTlL64noeAMGlI08VBDD5IDD8jlVMIYA4-fS8zVLg,215
 janito/cli/prompt_setup.py,sha256=s48gvNfZhKjsEhf4EzL1tKIGm4wDidPMDvlM6TAPYes,2116
-janito/cli/rich_terminal_reporter.py,sha256=ZIGrFQJK6VU1hM5hrH8VRJf99tsd1ox4hbop-M4a944,6552
+janito/cli/rich_terminal_reporter.py,sha256=jZAOsOzFZRBId1rTGv7WwfLQ3tz5YwBUsCJ3Wg6RL0c,7397
 janito/cli/utils.py,sha256=plCQiDKIf3V8mFhhX5H9-MF2W86i-xRdWf8Xi117Z0w,677
 janito/cli/verbose_output.py,sha256=wY_B4of5e8Vv7w1fRwOZzNGU2JqbMdcFnGjtEr4hLus,7686
 janito/cli/chat_mode/bindings.py,sha256=odjc5_-YW1t2FRhBUNRNoBMoQIg5sMz3ktV7xG0ADFU,975
@@ -94,7 +94,7 @@ janito/cli/cli_commands/model_utils.py,sha256=4t2ZN8DYA8jxluXHiiliV8gMbF_90nKGtg
 janito/cli/cli_commands/ping_providers.py,sha256=hetZAKKZzQYRpRDT5OvRTOe4jYUVNZGjo8gFoyeRA3I,1921
 janito/cli/cli_commands/set_api_key.py,sha256=IR_hUcLjK-2oJmiIVdjc8epPsQAzqEN9MS7lSTVqmKM,1060
 janito/cli/cli_commands/show_config.py,sha256=ammzVEqJQCAdWFRrhI1zjjmzgTCH2l38REoT4gYJPP0,3467
-janito/cli/cli_commands/show_system_prompt.py,sha256=RvUaSoLFW7rLu7xMF8lNc1E2PGXCEuqQe_vglb7orqw,6321
+janito/cli/cli_commands/show_system_prompt.py,sha256=on3olqfmPNAD9kfl5dAbl7BLFks57dni66QT-ke8kJI,6429
 janito/cli/core/__init__.py,sha256=YH95fhgY9yBX8RgqX9dSrEkl4exjV0T4rbmJ6xUpG-Y,196
 janito/cli/core/event_logger.py,sha256=1X6lR0Ax7AgF8HlPWFoY5Ystuu7Bh4ooTo78vXzeGB0,2008
 janito/cli/core/getters.py,sha256=opmcSz86J-I95Klsh0c4y6lsYvNakrvRqvuA0o5ARWI,2869
@@ -266,9 +266,9 @@ janito/tools/tool_utils.py,sha256=alPm9DvtXSw_zPRKvP5GjbebPRf_nfvmWk2TNlL5Cws,12
 janito/tools/tools_adapter.py,sha256=3Phjw34mOqG0KvXzQpZKIWigfSgZWRvdYuSdvV7Dj4M,21965
 janito/tools/tools_schema.py,sha256=bv7jQfjh6yCbiRNPJykmbCTBgZZrOV2z_WqWQOjeY5o,4324
 janito/tools/url_whitelist.py,sha256=0CPLkHTp5HgnwgjxwgXnJmwPeZQ30q4j3YjW59hiUUE,4295
-janito-3.16.1.dist-info/licenses/LICENSE,sha256=dXV4fOF2ZErugtN8l_Nrj5tsRTYgtjE3cgiya0UfBio,11356
-janito-3.16.1.dist-info/METADATA,sha256=L9KSwTseQzNHWmIUb1wwR-vTFZ9ZPFvUOdI-0bmOAOI,1722
-janito-3.16.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-janito-3.16.1.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-3.16.1.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
-janito-3.16.1.dist-info/RECORD,,
+janito-3.16.3.dist-info/licenses/LICENSE,sha256=dXV4fOF2ZErugtN8l_Nrj5tsRTYgtjE3cgiya0UfBio,11356
+janito-3.16.3.dist-info/METADATA,sha256=CfsM8gUX4A0-ohWhRhshVu1z-QcU2r6jwMIULoLvOPo,1722
+janito-3.16.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+janito-3.16.3.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
+janito-3.16.3.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
+janito-3.16.3.dist-info/RECORD,,