janito 1.8.1__py3-none-any.whl → 1.10.0__py3-none-any.whl

janito/termweb/static/index.html

@@ -24,11 +24,10 @@
         <img src="/static/termicon.svg" alt="TermWeb Logo" class="header-logo">
         <span class="header-title">TermWeb</span>
         <span class="header-subtitle">Explorador de Projetos com IA</span>
-        <button class="theme-switcher" id="theme-switcher">Alternate para tema claro</button>
+        <button class="theme-switcher" id="theme-switcher" title="Alternate tema"><span id="theme-icon">🌙</span></button>
     </div>
     <div class="toolbar" id="explorer-toolbar">
-        <button id="view-list" class="view-toggle active" title="Visualização em Lista">&#9776; List</button>
-        <button id="view-icons" class="view-toggle" title="Visualização em Ícones">&#9632; Icons</button>
+
     </div>
     <div class="main">
         <div id="explorer-main"></div>

janito/termweb/static/index.html.bak

@@ -24,11 +24,10 @@
         <img src="/static/termicon.svg" alt="TermWeb Logo" class="header-logo">
         <span class="header-title">TermWeb</span>
         <span class="header-subtitle">Explorador de Projetos com IA</span>
-        <button class="theme-switcher" id="theme-switcher">Alternar para tema claro</button>
+        <button class="theme-switcher" id="theme-switcher" title="Alternar tema"><span id="theme-icon">🌙</span></button>
     </div>
     <div class="toolbar" id="explorer-toolbar">
-        <button id="view-list" class="view-toggle active" title="Visualização em Lista">&#9776; List</button>
-        <button id="view-icons" class="view-toggle" title="Visualização em Ícones">&#9632; Icons</button>
+
     </div>
     <div class="main">
         <div id="explorer-main"></div>

janito/termweb/static/termweb.css.bak

@@ -81,30 +81,48 @@ body.light-theme .header {
 .main {
     flex: 1 1 auto;
     display: flex;
-    flex-direction: column;
-    justify-content: stretch;
-    align-items: stretch;
-    min-height: 0;
-    padding: 0;
+    flex-direction: row;
+    gap: 2em;
+    padding: 2em;
+    min-height: 60vh;
     background: transparent;
 }
+#explorer-main, #explorer-preview {
+    background: #22262b;
+    border-radius: 1.1em;
+    box-shadow: 0 4px 24px #0004;
+    border: 1px solid #1a73e8;
+    padding: 1.5em 1.2em;
+    min-height: 40vh;
+    overflow: auto;
+}
+#explorer-main {
+    margin-right: 0.5em;
+}
+#explorer-preview {
+    margin-left: 0.5em;
+    display: flex;
+    flex-direction: column;
+    flex: 1 1 0;
+    min-width: 0;
+}
 
-.editor-pane {
+/* --- CodeMirror Integration for Preview --- */
+#explorer-codemirror-preview {
     flex: 1 1 auto;
+    min-height: 0;
+    min-width: 0;
     display: flex;
     flex-direction: column;
-    height: 100%;
-    min-height: 0;
 }
-
 .CodeMirror {
     flex: 1 1 auto;
-    height: 100% !important;
+    height: 60vh !important;
     min-height: 0;
     font-size: 1.1em;
     background: #23272b;
     color: #f8f8f2;
-    border-radius: 0;
+    border-radius: 0.5em;
     border: none;
     transition: background 0.2s, color 0.2s;
 }
@@ -198,81 +216,9 @@ body.light-theme .explorer-link, body.light-theme .explorer-link:visited {
     color: #42a5f5;
 }
 body.light-theme .explorer-link:hover {
-    color: #0d47a1;
-}
-
-/* Error and status messages */
-.error {
-    color: #ff5252;
-    background: #2d2d2d;
-    padding: 0.5em 1em;
-    border-radius: 4px;
-    margin: 1em 0;
-}
-body.light-theme .error {
-    color: #b71c1c;
-    background: #fff3f3;
-}
-
-/* Spinner for loading */
-.spinner {
-    border: 4px solid #f3f3f3;
-    border-top: 4px solid #1976d2;
-    border-radius: 50%;
-    width: 24px;
-    height: 24px;
-    animation: spin 1s linear infinite;
-    display: inline-block;
-}
-@keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
+    color: #1565c0;
 }
 
-/* --- Enhanced Toolbar & Panes --- */
-.toolbar {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-    gap: 0.7em;
-    background: #23272b;
-    border-bottom: 1px solid #1a73e8;
-    padding: 0.7em 2em;
-    margin-bottom: 0.5em;
-    box-shadow: 0 2px 8px #0002;
-}
-.view-toggle {
-    background: #23272b;
-    color: #90caf9;
-    border: 1px solid #1a73e8;
-    border-radius: 0.5em;
-    padding: 0.5em 1.2em;
-    font-size: 1.1em;
-    cursor: pointer;
-    transition: background 0.15s, color 0.15s, box-shadow 0.15s;
-    margin-left: 0.2em;
-}
-.view-toggle.active, .view-toggle:hover {
-    background: #1a73e8;
-    color: #fff;
-    box-shadow: 0 2px 8px #1976d255;
-}
-
-#explorer-main, #explorer-preview {
-    background: #22262b;
-    border-radius: 1.1em;
-    box-shadow: 0 4px 24px #0004;
-    border: 1px solid #1a73e8;
-    padding: 1.5em 1.2em;
-    min-height: 40vh;
-    overflow: auto;
-}
-#explorer-main {
-    margin-right: 0.5em;
-}
-#explorer-preview {
-    margin-left: 0.5em;
-}
 @media (max-width: 900px) {
     .main {
         flex-direction: column;
@@ -283,4 +229,7 @@ body.light-theme .error {
         min-height: 20vh;
         padding: 1em 0.7em;
     }
+    #explorer-preview {
+        margin-left: 0;
+    }
 }

janito/termweb/static/termweb.js

@@ -16,8 +16,6 @@ function getPaiPath(path) {
 function setExplorerView(view) {
     explorerView = view;
     localStorage.setItem('explorerView', view);
-    document.getElementById('view-list').classList.toggle('active', view === 'list');
-    document.getElementById('view-icons').classList.toggle('active', view === 'icons');
 }
 
 function normalizeExplorerPath(path) {
@@ -63,22 +61,8 @@ function renderExplorer(path, pushUrl=true) {
                         }
                     }
                     html += '</ul>';
-                } else {
-                    html += `<div class='explorer-icons'>`;
-                    if (data.path !== '.') {
-                        const parent = getPaiPath(data.path);
-                        html += `<div class='explorer-icon'><a href='#' data-path='${parent}' class='explorer-link' title='Pai'>(..)</a></div>`;
-                    }
-                    for (const entry of data.entries) {
-                        const entryPath = data.path === '.' ? entry.name : data.path + '/' + entry.name;
-                        if (entry.is_dir) {
-                            html += `<div class='explorer-icon'><a href='#' data-path='${entryPath}' class='explorer-link' title='${entry.name}'>📁<br>${entry.name}</a></div>`;
-                        } else {
-                            html += `<div class='explorer-icon'><a href='#' data-path='${entryPath}' class='explorer-link file-link' title='${entry.name}'>📄<br>${entry.name}</a></div>`;
-                        }
-                    }
-                    html += '</div>';
                 }
+
                 main.innerHTML = html;
                 // Clear preview panel when changing directories
                 const preview = document.getElementById('explorer-preview');
@@ -131,7 +115,7 @@ window.renderCodePreview = function(container, content, mode) {
         var textarea = document.createElement('textarea');
         textarea.value = (typeof content === 'string') ? content : '';
         container.appendChild(textarea);
-        if (window.CodeMirror && container.offsetPai !== null) {
+        if (window.CodeMirror) {
             var editor = CodeMirror.fromTextArea(textarea, {
                 lineNumbers: true,
                 mode: mode || 'python',
@@ -140,7 +124,7 @@ window.renderCodePreview = function(container, content, mode) {
                 indentUnit: 4,
                 tabSize: 4,
             });
-            editor.setSize('100%', 'calc(60vh)');
+            editor.setSize('100%', '60vh');
             return editor;
         } else {
             container.innerHTML = '<pre>' + (content ? String(content) : '') + '</pre>';
@@ -148,7 +132,7 @@ window.renderCodePreview = function(container, content, mode) {
     } catch (e) {
         container.innerHTML = '<pre>' + (content ? String(content) : '') + '</pre>';
     }
-}
+};
 
 // Theme switcher logic
 function setTheme(dark) {
@@ -156,31 +140,28 @@ function setTheme(dark) {
         document.body.classList.add('dark-theme');
         document.body.classList.remove('light-theme');
         localStorage.setItem('theme', 'dark');
-        document.getElementById('theme-switcher').textContent = 'Switch to Light Theme';
+        var themeIcon = document.getElementById('theme-icon');
+        if (themeIcon) themeIcon.textContent = '🌙'; // Moon for dark theme
     } else {
         document.body.classList.remove('dark-theme');
         document.body.classList.add('light-theme');
         localStorage.setItem('theme', 'light');
-        document.getElementById('theme-switcher').textContent = 'Switch to Dark Theme';
+        var themeIcon = document.getElementById('theme-icon');
+        if (themeIcon) themeIcon.textContent = '☀️'; // Sun for light theme
     }
 }
 document.addEventListener('DOMContentLoaded', function() {
     // Initial theme
     var theme = localStorage.getItem('theme') || 'dark';
     setTheme(theme === 'dark');
-    document.getElementById('theme-switcher').onclick = function() {
-        setTheme(document.body.classList.contains('light-theme'));
-    };
+    var themeSwitcher = document.getElementById('theme-switcher');
+    if (themeSwitcher) {
+        themeSwitcher.onclick = function() {
+            setTheme(document.body.classList.contains('light-theme'));
+        };
+    }
+    setExplorerView('list'); // Always use list view
     renderExplorer('.')
-    setExplorerView(localStorage.getItem('explorerView') || 'list');
-    document.getElementById('view-list').onclick = function() {
-        setExplorerView('list');
-        renderExplorer('.')
-    };
-    document.getElementById('view-icons').onclick = function() {
-        setExplorerView('icons');
-        renderExplorer('.')
-    };
 });
 
 window.renderExplorer = renderExplorer;

janito/termweb/static/termweb.js.bak

@@ -16,8 +16,7 @@ function getPaiPath(path) {
 function setExplorerView(view) {
     explorerView = view;
     localStorage.setItem('explorerView', view);
-    document.getElementById('view-list').classList.toggle('active', view === 'list');
-    document.getElementById('view-icons').classList.toggle('active', view === 'icons');
+
 }
 
 function normalizeExplorerPath(path) {
@@ -52,33 +51,19 @@ function renderExplorer(path, pushUrl=true) {
                     html += `<ul class='explorer-list'>`;
                     if (data.path !== '.') {
                         const parent = getPaiPath(data.path);
-                        html += `<li><a href='#' data-path='${parent}' class='explorer-link'><span class='explorer-entry'><span class='explorer-icon'>\u2b06\ufe0f</span><span class='explorer-name'>(.. parent)</span></span></a></li>`;
+                        html += `<li><a href='#' data-path='${parent}' class='explorer-link'><span class='explorer-entry'><span class='explorer-icon'>⬆️</span><span class='explorer-name'>(.. parent)</span></span></a></li>`;
                     }
                     for (const entry of data.entries) {
                         const entryPath = data.path === '.' ? entry.name : data.path + '/' + entry.name;
                         if (entry.is_dir) {
-                            html += `<li><a href='#' data-path='${entryPath}' class='explorer-link'><span class='explorer-entry'><span class='explorer-icon'>\ud83d\udcc1</span><span class='explorer-name'>${entry.name}</span></span></a></li>`;
+                            html += `<li><a href='#' data-path='${entryPath}' class='explorer-link'><span class='explorer-entry'><span class='explorer-icon'>📁</span><span class='explorer-name'>${entry.name}</span></span></a></li>`;
                         } else {
-                            html += `<li><a href='#' data-path='${entryPath}' class='explorer-link file-link'><span class='explorer-entry'><span class='explorer-icon'>\ud83d\udcc4</span><span class='explorer-name'>${entry.name}</span></span></a></li>`;
+                            html += `<li><a href='#' data-path='${entryPath}' class='explorer-link file-link'><span class='explorer-entry'><span class='explorer-icon'>📄</span><span class='explorer-name'>${entry.name}</span></span></a></li>`;
                         }
                     }
                     html += '</ul>';
-                } else {
-                    html += `<div class='explorer-icons'>`;
-                    if (data.path !== '.') {
-                        const parent = getPaiPath(data.path);
-                        html += `<div class='explorer-icon'><a href='#' data-path='${parent}' class='explorer-link' title='Pai'>(..)</a></div>`;
-                    }
-                    for (const entry of data.entries) {
-                        const entryPath = data.path === '.' ? entry.name : data.path + '/' + entry.name;
-                        if (entry.is_dir) {
-                            html += `<div class='explorer-icon'><a href='#' data-path='${entryPath}' class='explorer-link' title='${entry.name}'>\ud83d\udcc1<br>${entry.name}</a></div>`;
-                        } else {
-                            html += `<div class='explorer-icon'><a href='#' data-path='${entryPath}' class='explorer-link file-link' title='${entry.name}'>\ud83d\udcc4<br>${entry.name}</a></div>`;
-                        }
-                    }
-                    html += '</div>';
                 }
+
                 main.innerHTML = html;
                 // Clear preview panel when changing directories
                 const preview = document.getElementById('explorer-preview');
@@ -131,7 +116,7 @@ window.renderCodePreview = function(container, content, mode) {
         var textarea = document.createElement('textarea');
         textarea.value = (typeof content === 'string') ? content : '';
         container.appendChild(textarea);
-        if (window.CodeMirror && container.offsetPai !== null) {
+        if (window.CodeMirror) {
             var editor = CodeMirror.fromTextArea(textarea, {
                 lineNumbers: true,
                 mode: mode || 'python',
@@ -140,7 +125,7 @@ window.renderCodePreview = function(container, content, mode) {
                 indentUnit: 4,
                 tabSize: 4,
             });
-            editor.setSize('100%', 'calc(60vh)');
+            editor.setSize('100%', '60vh');
             return editor;
         } else {
             container.innerHTML = '<pre>' + (content ? String(content) : '') + '</pre>';
@@ -156,31 +141,28 @@ function setTheme(dark) {
         document.body.classList.add('dark-theme');
         document.body.classList.remove('light-theme');
         localStorage.setItem('theme', 'dark');
-        document.getElementById('theme-switcher').textContent = 'Switch to Light Theme';
+        var themeIcon = document.getElementById('theme-icon');
+        if (themeIcon) themeIcon.textContent = '🌙'; // Moon for dark theme
     } else {
         document.body.classList.remove('dark-theme');
         document.body.classList.add('light-theme');
         localStorage.setItem('theme', 'light');
-        document.getElementById('theme-switcher').textContent = 'Switch to Dark Theme';
+        var themeIcon = document.getElementById('theme-icon');
+        if (themeIcon) themeIcon.textContent = '☀️'; // Sun for light theme
     }
 }
 document.addEventListener('DOMContentLoaded', function() {
     // Initial theme
     var theme = localStorage.getItem('theme') || 'dark';
     setTheme(theme === 'dark');
-    document.getElementById('theme-switcher').onclick = function() {
-        setTheme(document.body.classList.contains('light-theme'));
-    };
+    var themeSwitcher = document.getElementById('theme-switcher');
+    if (themeSwitcher) {
+        themeSwitcher.onclick = function() {
+            setTheme(document.body.classList.contains('light-theme'));
+        };
+    }
+    setExplorerView('list'); // Always use list view
     renderExplorer('.')
-    setExplorerView(localStorage.getItem('explorerView') || 'list');
-    document.getElementById('view-list').onclick = function() {
-        setExplorerView('list');
-        renderExplorer('.')
-    };
-    document.getElementById('view-icons').onclick = function() {
-        setExplorerView('icons');
-        renderExplorer('.')
-    };
 });
 
 window.renderExplorer = renderExplorer;

janito/tests/test_rich_utils.py

@@ -0,0 +1,44 @@
+import io
+from rich.console import Console
+from janito.rich_utils import RichPrinter
+
+
+def test_print_info(capsys=None):
+    buf = io.StringIO()
+    printer = RichPrinter(
+        console=Console(file=buf, force_terminal=True, color_system=None)
+    )
+    printer.print_info("info message")
+    output = buf.getvalue()
+    assert "info message" in output
+    assert "cyan" in output or output  # Style is present if rich renders ANSI
+
+
+def test_print_error():
+    buf = io.StringIO()
+    printer = RichPrinter(
+        console=Console(file=buf, force_terminal=True, color_system=None)
+    )
+    printer.print_error("error message")
+    output = buf.getvalue()
+    assert "error message" in output
+
+
+def test_print_warning():
+    buf = io.StringIO()
+    printer = RichPrinter(
+        console=Console(file=buf, force_terminal=True, color_system=None)
+    )
+    printer.print_warning("warning message")
+    output = buf.getvalue()
+    assert "warning message" in output
+
+
+def test_print_magenta():
+    buf = io.StringIO()
+    printer = RichPrinter(
+        console=Console(file=buf, force_terminal=True, color_system=None)
+    )
+    printer.print_magenta("magenta message")
+    output = buf.getvalue()
+    assert "magenta message" in output

janito/web/app.py

@@ -1,19 +1,13 @@
 from flask import (
     Flask,
     request,
-    Response,
     send_from_directory,
     jsonify,
     render_template,
 )
-from queue import Queue
 import json
-from janito.agent.queued_message_handler import QueuedMessageHandler
 from janito.agent.profile_manager import AgentProfileManager
 import os
-import threading
-import traceback
-import sys
 
 from janito.agent.runtime_config import unified_config, runtime_config
 
@@ -53,13 +47,6 @@ conversation_file = os.path.expanduser("~/.janito/last_conversation_web.json")
 # Initially no conversation loaded
 conversation = None
 
-
-# Global event queue for streaming
-stream_queue = Queue()
-
-# Create a QueuedMessageHandler with the queue
-message_handler = QueuedMessageHandler(stream_queue)
-
 # Instantiate the Agent with config-driven parameters (no tool_handler)
 agent = profile_manager.agent
 
@@ -156,65 +143,3 @@ def new_conversation():
     global conversation
     conversation = []
     return jsonify({"status": "ok"})
-
-
-@app.route("/execute_stream", methods=["POST"])
-def execute_stream():
-    data = request.get_json()
-    user_input = data.get("input", "")
-
-    global conversation
-    if conversation is None:
-        # If no conversation loaded, start a new one
-        conversation = []
-
-    # Always start with the system prompt as the first message
-    if not conversation or conversation[0]["role"] != "system":
-        conversation.insert(0, {"role": "system", "content": system_prompt_template})
-
-    # Append the new user message
-    conversation.append({"role": "user", "content": user_input})
-
-    def run_agent():
-        try:
-            response = agent.chat(conversation, message_handler=message_handler)
-            if response and "content" in response:
-                conversation.append(
-                    {"role": "assistant", "content": response["content"]}
-                )
-            try:
-                os.makedirs(os.path.dirname(conversation_file), exist_ok=True)
-                with open(conversation_file, "w", encoding="utf-8") as f:
-                    json.dump(conversation, f, indent=2)
-            except Exception as e:
-                print(f"Error saving conversation: {e}")
-        except Exception as e:
-            tb = traceback.format_exc()
-            stream_queue.put({"type": "error", "error": str(e), "traceback": tb})
-        finally:
-            stream_queue.put(None)
-
-    threading.Thread(target=run_agent, daemon=True).start()
-
-    def generate():
-        while True:
-            content = stream_queue.get()
-            if content is None:
-                break
-            if isinstance(content, tuple) and content[0] == "tool_progress":
-                message = json.dumps({"type": "tool_progress", "data": content[1]})
-            else:
-                message = json.dumps(content)
-            yield f"data: {message}\n\n"
-            sys.stdout.flush()
-
-    return Response(
-        generate(),
-        mimetype="text/event-stream",
-        headers={
-            "Cache-Control": "no-cache",
-            "X-Accel-Buffering": "no",
-            "Connection": "keep-alive",
-            "Transfer-Encoding": "chunked",
-        },
-    )