janito 1.14.3__py3-none-any.whl → 2.0.0__py3-none-any.whl

janito/shell/prompt/session_setup.py

@@ -1,57 +0,0 @@
-from janito.shell.ui.interactive import (
-    print_welcome,
-    get_toolbar_func,
-    get_prompt_session,
-)
-from janito import __version__
-from janito.agent.config import effective_config
-from janito.agent.runtime_config import runtime_config
-from janito.shell.session.manager import get_session_id
-
-
-def setup_prompt_session(
-    messages,
-    last_usage_info_ref,
-    last_elapsed,
-    mem_history,
-    profile_manager,
-    agent,
-    history_ref,
-):
-    model_name = getattr(agent, "model", None)
-    session_id = get_session_id()
-
-    def get_messages():
-        return messages
-
-    def get_usage():
-        return last_usage_info_ref()
-
-    def get_elapsed():
-        return last_elapsed
-
-    session = get_prompt_session(
-        get_toolbar_func(
-            get_messages,
-            get_usage,
-            get_elapsed,
-            model_name=model_name,
-            role_ref=lambda: (
-                "*using custom system prompt*"
-                if (
-                    runtime_config.get("system_prompt_template")
-                    or runtime_config.get("system_prompt_template_file")
-                )
-                else (runtime_config.get("role") or effective_config.get("role"))
-            ),
-            version=__version__,
-            session_id=session_id,
-            history_ref=history_ref,
-        ),
-        mem_history,
-    )
-    return session
-
-
-def print_welcome_message(console, continue_id=None):
-    print_welcome(console, version=__version__, continue_id=continue_id)

janito/shell/session/config.py

@@ -1,109 +0,0 @@
-from janito.agent.config import local_config, global_config, CONFIG_OPTIONS
-from janito.agent.config_defaults import CONFIG_DEFAULTS
-from janito.agent.runtime_config import unified_config, runtime_config
-
-
-def handle_config_shell(console, *args, **kwargs):
-    """
-    /config show
-    /config set local key=value
-    /config set global key=value
-    /config reset local
-    /config reset global
-    """
-    if not args or args[0] not in ("show", "set", "reset"):
-        _print_usage(console)
-        return
-    if args[0] == "show":
-        _show_config(console)
-        return
-    if args[0] == "reset":
-        _reset_config(console, args)
-        return
-    if args[0] == "set":
-        _set_config(console, args)
-        return
-
-
-def _print_usage(console):
-    console.print(
-        "[bold red]Usage:[/bold red] /config show | /config set local|global key=value | /config reset local|global"
-    )
-
-
-def _show_config(console):
-    from janito.cli._print_config import print_full_config
-
-    print_full_config(
-        local_config,
-        global_config,
-        unified_config,
-        CONFIG_DEFAULTS,
-        console=console,
-    )
-
-
-def _reset_config(console, args):
-    if len(args) < 2 or args[1] not in ("local", "global"):
-        console.print("[bold red]Usage:[/bold red] /config reset local|global")
-        return
-    import os
-    from pathlib import Path
-
-    scope = args[1]
-    if scope == "local":
-        local_path = Path(".janito/config.json")
-        if local_path.exists():
-            os.remove(local_path)
-            console.print(f"[green]Removed local config file:[/green] {local_path}")
-        else:
-            console.print(
-                f"[yellow]Local config file does not exist:[/yellow] {local_path}"
-            )
-    elif scope == "global":
-        global_path = Path.home() / ".janito/config.json"
-        if global_path.exists():
-            os.remove(global_path)
-            console.print(f"[green]Removed global config file:[/green] {global_path}")
-        else:
-            console.print(
-                f"[yellow]Global config file does not exist:[/yellow] {global_path}"
-            )
-    console.print(
-        "[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]"
-    )
-
-
-def _set_config(console, args):
-    if len(args) < 3 or args[1] not in ("local", "global"):
-        console.print("[bold red]Usage:[/bold red] /config set local|global key=value")
-        return
-    scope = args[1]
-    try:
-        key, val = args[2].split("=", 1)
-    except ValueError:
-        console.print("[bold red]Invalid format, expected key=val[/bold red]")
-        return
-    key = key.strip()
-    if key not in CONFIG_OPTIONS and not key.startswith("template."):
-        console.print(
-            f"[bold red]Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}"
-        )
-        return
-    val = val.strip()
-    if scope == "local":
-        local_config.set(key, val)
-        local_config.save()
-        runtime_config.set(key, val)
-        console.print(f"[green]Local config updated:[/green] {key} = {val}")
-        console.print(
-            "[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]"
-        )
-    elif scope == "global":
-        global_config.set(key, val)
-        global_config.save()
-        runtime_config.set(key, val)
-        console.print(f"[green]Global config updated:[/green] {key} = {val}")
-        console.print(
-            "[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]"
-        )

janito/shell/ui/interactive.py

@@ -1,226 +0,0 @@
-from prompt_toolkit import PromptSession
-from prompt_toolkit.enums import EditingMode
-from prompt_toolkit.formatted_text import HTML
-from prompt_toolkit.styles import Style
-from prompt_toolkit.key_binding import KeyBindings
-from janito.agent.runtime_config import runtime_config
-from janito.i18n import tr
-
-
-def print_welcome(console, version=None, continue_id=None):
-    version_str = f" (v{version})" if version else ""
-    # DEBUG: Show continue_id/session_id at runtime
-    if continue_id:
-        console.print(
-            f"[bold yellow]{tr('Resuming session')}[/bold yellow] [white on blue]{continue_id}[/white on blue]\n"
-        )
-    if runtime_config.get("vanilla_mode", False):
-        console.print(
-            f"[bold magenta]{tr('Welcome to Janito{version_str} in [white on magenta]VANILLA MODE[/white on magenta]! Tools, system prompt, and temperature are disabled unless overridden.', version_str=version_str)}[/bold magenta]\n"
-        )
-    else:
-        console.print(
-            f"[bold green]{tr('Welcome to Janito{version_str}! Entering chat mode. Type /exit to exit.', version_str=version_str)}[/bold green]\n"
-        )
-
-
-def format_tokens(n, tag=None):
-    if n is None:
-        return "?"
-    if n < 1000:
-        val = str(n)
-    elif n < 1000000:
-        val = f"{n/1000:.1f}k"
-    else:
-        val = f"{n/1000000:.1f}M"
-    return f"<{tag}>{val}</{tag}>" if tag else val
-
-
-def assemble_first_line(model_name, role_ref, style_ref, version=None):
-    version_part = f" Janito v{version}" if version else ""
-    model_part = f" {tr('Model')}: <model>{model_name}</model>" if model_name else ""
-    role_part = ""
-    vanilla_mode = runtime_config.get("vanilla_mode", False)
-    if role_ref and not vanilla_mode:
-        role = role_ref()
-        if role:
-            role_part = f"{tr('Role')}: <role>{role}</role>"
-    style_part = ""
-    if style_ref:
-        style = style_ref()
-        if style:
-            style_part = f"{tr('Style')}: <b>{style}</b>"
-    first_line_parts = []
-    if version_part:
-        first_line_parts.append(version_part)
-    if model_part:
-        first_line_parts.append(model_part)
-    if role_part:
-        first_line_parts.append(role_part)
-    if style_part:
-        first_line_parts.append(style_part)
-    return " | ".join(first_line_parts)
-
-
-def assemble_second_line(
-    width,
-    last_usage_info_ref,
-    history_ref,
-    messages_ref,
-    session_id,
-    model_name,
-    role_ref,
-    style_ref,
-):
-    usage = last_usage_info_ref()
-    prompt_tokens = usage.get("prompt_tokens") if usage else None
-    completion_tokens = usage.get("completion_tokens") if usage else None
-    total_tokens = usage.get("total_tokens") if usage else None
-    msg_count = len(history_ref()) if history_ref else len(messages_ref())
-    left = f" {tr('Messages')}: <msg_count>{msg_count}</msg_count>"
-    tokens_part = ""
-    if (
-        prompt_tokens is not None
-        or completion_tokens is not None
-        or total_tokens is not None
-    ):
-        tokens_part = (
-            f" | {tr('Tokens')} - {tr('Prompt')}: {format_tokens(prompt_tokens, 'tokens_in')}, "
-            f"{tr('Completion')}: {format_tokens(completion_tokens, 'tokens_out')}, "
-            f"{tr('Total')}: {format_tokens(total_tokens, 'tokens_total')}"
-        )
-    session_part = (
-        f" | Session ID: <session_id>{session_id}</session_id>" if session_id else ""
-    )
-    second_line = f"{left}{tokens_part}{session_part}"
-    total_len = len(left) + len(tokens_part) + len(session_part)
-    first_line = assemble_first_line(model_name, role_ref, style_ref)
-    if first_line:
-        total_len += len(first_line) + 3
-    if total_len < width:
-        padding = " " * (width - total_len)
-        second_line = f"{left}{tokens_part}{session_part}{padding}"
-    return second_line
-
-
-def assemble_bindings_line():
-    return (
-        f" <b>F1</b>: {tr('Restart Conversation')} | "
-        f"<b>F12</b>: {tr('Do It')} | "
-        f"<b>Ctrl-Y</b>: {tr('Yes')} | "
-        f"<b>Ctrl-N</b>: {tr('No')} | "
-        f"<b>/help</b>: {tr('Help')}"
-    )
-
-
-def get_toolbar_func(
-    messages_ref,
-    last_usage_info_ref,
-    last_elapsed_ref,
-    model_name=None,
-    role_ref=None,
-    style_ref=None,
-    version=None,
-    session_id=None,
-    history_ref=None,
-):
-    from prompt_toolkit.application.current import get_app
-
-    def get_toolbar():
-        width = get_app().output.get_size().columns
-        first_line = assemble_first_line(
-            model_name, role_ref, style_ref, version=version
-        )
-        second_line = assemble_second_line(
-            width,
-            last_usage_info_ref,
-            history_ref,
-            messages_ref,
-            session_id,
-            model_name,
-            role_ref,
-            style_ref,
-        )
-        bindings_line = assemble_bindings_line()
-        if first_line:
-            toolbar_text = first_line + "\n" + second_line + "\n" + bindings_line
-        else:
-            toolbar_text = second_line + "\n" + bindings_line
-        return HTML(toolbar_text)
-
-    return get_toolbar
-
-
-def get_custom_key_bindings():
-    """
-    Returns prompt_toolkit KeyBindings for custom CLI shortcuts:
-    - F12: Inserts 'Do It' and submits.
-    - Ctrl-Y: Inserts 'Yes' and submits (for confirmation prompts).
-    - Ctrl-N: Inserts 'No' and submits (for confirmation prompts).
-    """
-    bindings = KeyBindings()
-
-    @bindings.add("f12")
-    def _(event):
-        buf = event.app.current_buffer
-        buf.text = "Do It"
-        buf.validate_and_handle()
-
-    @bindings.add("c-y")
-    def _(event):
-        buf = event.app.current_buffer
-        buf.text = "Yes"
-        buf.validate_and_handle()
-
-    @bindings.add("c-n")
-    def _(event):
-        buf = event.app.current_buffer
-        buf.text = "No"
-        buf.validate_and_handle()
-
-    @bindings.add("f1")
-    def _(event):
-        buf = event.app.current_buffer
-        buf.text = "/restart"
-        buf.validate_and_handle()
-
-    return bindings
-
-
-def get_prompt_session(get_toolbar_func, mem_history):
-    style = Style.from_dict(
-        {
-            "bottom-toolbar": "bg:#333333 #ffffff",
-            "model": "bold bg:#005f5f #ffffff",
-            "role": "bold ansiyellow",
-            "tokens_in": "ansicyan bold",
-            "tokens_out": "ansigreen bold",
-            "tokens_total": "ansiyellow bold",
-            "msg_count": "bg:#333333 #ffff00 bold",
-            "session_id": "bg:#005f00 #ffffff bold",
-            "b": "bold",
-            "prompt": "bg:#005f5f #ffffff",  # (legacy, not used)
-            # Style for prompt_toolkit input line:
-            #   - '': affects the actual user input area background (full line, most reliable)
-            #   - "input-field": also affects the input area in some prompt_toolkit versions
-            #   - <inputline> tag: only affects the prompt label, not the input area
-            "": "bg:#005fdd #ffffff",  # Blue background for the user input area (recommended)
-            "input-field": "bg:#005fdd #ffffff",  # Blue background for the user input area (optional)
-            "inputline": "bg:#005fdd #ffffff",  # Blue background for the prompt label (icon/text)
-        }
-    )
-    from janito.shell.prompt.completer import ShellCommandCompleter
-
-    completer = ShellCommandCompleter()
-    return PromptSession(
-        bottom_toolbar=get_toolbar_func,
-        style=style,
-        editing_mode=EditingMode.VI,
-        key_bindings=get_custom_key_bindings(),
-        history=mem_history,
-        completer=completer,
-    )
-
-
-def _(text):
-    return text

janito/termweb/static/editor.css

@@ -1,158 +0,0 @@
-/* Highlight active line in CodeMirror */
-.CodeMirror-activeline-background {
-    background: #353b45;
-}
-body.light-theme .CodeMirror-activeline-background {
-    background: #e0eaff;
-}
-html, body {
-    height: 100%;
-    margin: 0;
-    padding: 0;
-}
-body {
-    display: flex;
-    flex-direction: column;
-    min-height: 100vh;
-    background: #181a1b;
-    color: #eee;
-    transition: background 0.2s, color 0.2s;
-}
-body.light-theme {
-    background: #f5f5f5;
-    color: #222;
-}
-.main {
-    flex: 1 1 auto;
-    display: flex;
-    flex-direction: column;
-    justify-content: stretch;
-    align-items: stretch;
-    min-height: 0;
-    padding: 0;
-    margin: 0;
-}
-.editor-pane {
-    flex: 1 1 auto;
-    display: flex;
-    flex-direction: column;
-    min-height: 0;
-    padding: 0;
-    margin: 0;
-}
-/* Removed custom .CodeMirror background/color to use CodeMirror's theme defaults */
-
-/* Ensure editor fills available space */
-.editor-pane textarea, .editor-pane .CodeMirror {
-    flex: 1 1 auto;
-    width: 100%;
-    height: 100%;
-    min-height: 0;
-    min-width: 0;
-    box-sizing: border-box;
-    resize: none;
-    display: block;
-}
-
-.header {
-    background: #222;
-    color: #fff;
-    padding: 4px 12px;
-    font-size: 0.95em;
-    font-weight: bold;
-    position: relative;
-    transition: background 0.2s, color 0.2s;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    height: 36px;
-}
-
-.header-title {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    pointer-events: none;
-    font-weight: bold;
-    font-size: 1.05em;
-    display: flex;
-    align-items: center;
-    gap: 0.5em;
-}
-
-.filename-display {
-    font-weight: normal;
-    font-size: 0.98em;
-    color: #bbb;
-    margin-left: 0.5em;
-    pointer-events: auto;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    max-width: 180px;
-}
-body.light-theme .filename-display {
-    color: #666;
-}
-
-.footer {
-    position: relative;
-    flex-shrink: 0;
-    width: 100%;
-    background: #222;
-    color: #fff;
-    padding: 4px 12px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    border-top: 1px solid #333;
-    height: 36px;
-    font-size: 0.95em;
-}
-
-.save-btn {
-    /* No margin needed, align left in footer */
-}
-
-.theme-switcher {
-    margin-left: auto;
-}
-
-.save-btn {
-    background: #4caf50;
-    color: #fff;
-    border: none;
-    border-radius: 4px;
-    padding: 6px 14px;
-    cursor: pointer;
-    font-size: 1em;
-}
-
-.theme-switcher {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    aspect-ratio: 1/1;
-    font-size: 1.3em;
-    line-height: 1;
-    padding: 0;
-    background: #444;
-    color: #fff;
-    border: none;
-    border-radius: 4px;
-    cursor: pointer;
-    transition: background 0.2s, color 0.2s;
-}
-
-body.light-theme .theme-switcher {
-    background: #ddd;
-    color: #222;
-}
-
-body.light-theme .header {
-    background: #eaeaea;
-    color: #222;
-}

janito/termweb/static/editor.css.bak

@@ -1,145 +0,0 @@
-/* Highlight active line in CodeMirror */
-.CodeMirror-activeline-background {
-    background: #353b45;
-}
-body.light-theme .CodeMirror-activeline-background {
-    background: #e0eaff;
-}
-html, body {
-    height: 100%;
-    margin: 0;
-    padding: 0;
-}
-body {
-    display: flex;
-    flex-direction: column;
-    min-height: 100vh;
-    background: #181a1b;
-    color: #eee;
-    transition: background 0.2s, color 0.2s;
-}
-body.light-theme {
-    background: #f5f5f5;
-    color: #222;
-}
-.main {
-    flex: 1 1 auto;
-    display: flex;
-    flex-direction: column;
-    justify-content: stretch;
-    align-items: stretch;
-    min-height: 0;
-    padding: 0;
-    margin: 0;
-    height: 100%;
-}
-.editor-pane {
-    flex: 1 1 auto;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    min-height: 0;
-    padding: 0;
-    margin: 0;
-}
-/* Removed custom .CodeMirror background/color to use CodeMirror's theme defaults */
-.header {
-    background: #222;
-    color: #fff;
-    padding: 4px 12px;
-    font-size: 0.95em;
-    font-weight: bold;
-    position: relative;
-    transition: background 0.2s, color 0.2s;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    height: 36px;
-}
-
-.header-title {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    pointer-events: none;
-    font-weight: bold;
-    font-size: 1.05em;
-    display: flex;
-    align-items: center;
-    gap: 0.5em;
-}
-
-.filename-display {
-    font-weight: normal;
-    font-size: 0.98em;
-    color: #bbb;
-    margin-left: 0.5em;
-    pointer-events: auto;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    max-width: 180px;
-}
-body.light-theme .filename-display {
-    color: #666;
-}
-
-.footer {
-    width: 100%;
-    background: #23272b;
-    color: #fff;
-    padding: 4px 12px;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    border-top: 1px solid #333;
-    min-height: 28px;
-    font-size: 0.95em;
-}
-
-.save-btn {
-    /* No margin needed, align left in footer */
-}
-
-.theme-switcher {
-    margin-left: auto;
-}
-
-.save-btn {
-    background: #4caf50;
-    color: #fff;
-    border: none;
-    border-radius: 4px;
-    padding: 6px 14px;
-    cursor: pointer;
-    font-size: 1em;
-}
-
-.theme-switcher {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 36px;
-    height: 36px;
-    font-size: 1.3em;
-    line-height: 1;
-    padding: 0;
-    background: #444;
-    color: #fff;
-    border: none;
-    border-radius: 4px;
-    cursor: pointer;
-    transition: background 0.2s, color 0.2s;
-}
-
-body.light-theme .theme-switcher {
-    background: #ddd;
-    color: #222;
-}
-
-body.light-theme .header {
-    background: #eaeaea;
-    color: #222;
-}