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

janito/cli/main.py

@@ -12,205 +12,183 @@ import janito.agent.tools  # noqa: F401
 from janito.i18n import tr
 
 
+def handle_list_sessions(args):
+    import os
+    import glob
+
+    n = args.list if args.list is not None else 10
+    history_dir = os.path.join(os.path.expanduser(".janito"), "chat_history")
+    if not os.path.exists(history_dir):
+        print("No session history found.")
+        return True
+    files = glob.glob(os.path.join(history_dir, "*.json"))
+    files = sorted(files, key=os.path.getmtime, reverse=True)
+    print(f"Last {n} sessions:")
+    for f in files[:n]:
+        session_id = os.path.splitext(os.path.basename(f))[0]
+        print(session_id)
+    return True
+
+
+def handle_view_session(args):
+    import os
+    import json
+
+    history_dir = os.path.join(os.path.expanduser(".janito"), "chat_history")
+    session_file = os.path.join(history_dir, f"{args.view}.json")
+    if not os.path.exists(session_file):
+        print(f"Session '{args.view}' not found.")
+        return 1
+    with open(session_file, "r", encoding="utf-8") as f:
+        try:
+            messages = json.load(f)
+        except Exception as e:
+            print(f"Failed to load session: {e}")
+            return 1
+    print(f"Conversation history for session '{args.view}':\n")
+    for i, msg in enumerate(messages, 1):
+        role = msg.get("role", "?")
+        content = msg.get("content", "")
+        print(f"[{i}] {role}: {content}\n")
+    return 0
+
+
+def handle_lang_selection(args):
+    import janito.i18n as i18n
+    from janito.agent.runtime_config import runtime_config
+
+    lang = getattr(args, "lang", None) or unified_config.get("lang", None) or "en"
+    runtime_config.set("lang", lang)
+    i18n.set_locale(lang)
+
+
+def handle_help_config(args):
+    from janito.agent.config import CONFIG_OPTIONS
+    from janito.agent.config_defaults import CONFIG_DEFAULTS
+
+    print(tr("Available configuration options:\n"))
+    for key, desc in CONFIG_OPTIONS.items():
+        default = CONFIG_DEFAULTS.get(key, None)
+        print(
+            tr(
+                "{key:15} {desc} (default: {default})",
+                key=key,
+                desc=desc,
+                default=default,
+            )
+        )
+
+
+def handle_list_tools(args):
+    from janito.agent.tool_registry import get_tool_schemas
+    from rich.console import Console
+    from rich.table import Table
+
+    console = Console()
+    table = Table(
+        title="Ferramentas Registradas", show_lines=True, style="bold magenta"
+    )
+    table.add_column("Gnome", style="cyan", no_wrap=True)
+    table.add_column("Descrição", style="green")
+    table.add_column("Parâmetros", style="yellow")
+    for schema in get_tool_schemas():
+        fn = schema["function"]
+        params = "\n".join(
+            [
+                f"[bold]{k}[/]: {v['type']}"
+                for k, v in fn["parameters"].get("properties", {}).items()
+            ]
+        )
+        table.add_row(f"[b]{fn['name']}[/b]", fn["description"], params or "-")
+    console.print(table)
+
+
+def handle_info(args):
+    from janito import __version__
+    from rich.console import Console
+    from rich.text import Text
+    from janito.agent.runtime_config import runtime_config
+
+    model = unified_config.get("model")
+    temperature = unified_config.get("temperature")
+    max_tokens = unified_config.get("max_tokens")
+    system_prompt_val = None
+    if getattr(args, "system_file", None):
+        try:
+            with open(args.system_file, "r", encoding="utf-8") as f:
+                system_prompt_val = f.read().strip()
+            runtime_config.set("system_prompt_template", system_prompt_val)
+        except Exception as e:
+            system_prompt_val = f"(error reading system-file: {e})"
+    elif getattr(args, "system", None):
+        system_prompt_val = args.system
+        runtime_config.set("system_prompt_template", system_prompt_val)
+    else:
+        system_prompt_val = runtime_config.get("system_prompt_template")
+    if not system_prompt_val:
+        try:
+            from janito.agent.profile_manager import AgentProfileManager
+            from janito.agent.config import get_api_key
+
+            role = args.role or unified_config.get("role", "software engineer")
+            interaction_mode = "chat" if not getattr(args, "prompt", None) else "prompt"
+            profile = "base"
+            profile_manager = AgentProfileManager(
+                api_key=get_api_key(),
+                model=unified_config.get("model"),
+            )
+            system_prompt_val = profile_manager.get_system_prompt(
+                role, interaction_mode, profile
+            )
+        except Exception as e:
+            system_prompt_val = f"(error: {e})"
+    console = Console()
+    info_text = Text()
+    info_text.append(f"Janito v{__version__}", style="bold cyan")
+    info_text.append(" | model: ", style="white")
+    info_text.append(str(model), style="green")
+    info_text.append(" | temp: ", style="white")
+    info_text.append(str(temperature), style="yellow")
+    info_text.append(" | max_tokens: ", style="white")
+    info_text.append(str(max_tokens), style="magenta")
+    info_text.append(" | system: ", style="white")
+    info_text.append(str(system_prompt_val), style="bold blue")
+    console.print(info_text, style="dim")
+
+
 def main():
     """Unified entry point for the Janito CLI and web server."""
     import sys
-
     from janito.agent.config import local_config, global_config
-    import janito.i18n as i18n
-    from janito.agent.runtime_config import runtime_config
 
     local_config.load()
     global_config.load()
-
     parser = create_parser()
     args = parser.parse_args()
-
-    # Handle --set-provider-config <name> <key> <value>
-    if getattr(args, "set_provider_config", None) is not None:
-        import os
-        import json
-
-        name, key, value = args.set_provider_config
-        config_dir = os.path.expanduser("~/.janito")
-        os.makedirs(config_dir, exist_ok=True)
-        providers_path = os.path.join(config_dir, "providers.json")
-
-        # Load or initialize providers config
-        if os.path.exists(providers_path):
-            with open(providers_path, "r", encoding="utf-8") as f:
-                try:
-                    providers = json.load(f)
-                except Exception:
-                    providers = {}
-        else:
-            providers = {}
-
-        if name not in providers or not isinstance(providers[name], dict):
-            providers[name] = {}
-        providers[name][key] = value
-
-        with open(providers_path, "w", encoding="utf-8") as f:
-            json.dump(providers, f, indent=2)
-
-        print(f"Set {key} for provider '{name}' in {providers_path}.")
-        sys.exit(0)
-
     # Handle --list [n] before anything else
     if getattr(args, "list", None) is not None:
-        import os
-        import glob
-
-        n = args.list if args.list is not None else 10
-        history_dir = os.path.join(os.path.expanduser(".janito"), "chat_history")
-        if not os.path.exists(history_dir):
-            print("No session history found.")
+        if handle_list_sessions(args):
             sys.exit(0)
-        files = glob.glob(os.path.join(history_dir, "*.json"))
-        files = sorted(files, key=os.path.getmtime, reverse=True)
-        print(f"Last {n} sessions:")
-        for f in files[:n]:
-            session_id = os.path.splitext(os.path.basename(f))[0]
-            print(session_id)
-        sys.exit(0)
-
     # Handle --view <id> to print conversation history
     if getattr(args, "view", None) is not None:
-        import os
-        import json
-
-        history_dir = os.path.join(os.path.expanduser(".janito"), "chat_history")
-        session_file = os.path.join(history_dir, f"{args.view}.json")
-        if not os.path.exists(session_file):
-            print(f"Session '{args.view}' not found.")
-            sys.exit(1)
-        with open(session_file, "r", encoding="utf-8") as f:
-            try:
-                messages = json.load(f)
-            except Exception as e:
-                print(f"Failed to load session: {e}")
-                sys.exit(1)
-        print(f"Conversation history for session '{args.view}':\n")
-        for i, msg in enumerate(messages, 1):
-            role = msg.get("role", "?")
-            content = msg.get("content", "")
-            print(f"[{i}] {role}: {content}\n")
-        sys.exit(0)
-
-    # Seleção de idioma: prioridade --lang > config.json > padrão
-    lang = getattr(args, "lang", None) or unified_config.get("lang", None) or "en"
-    runtime_config.set("lang", lang)
-    i18n.set_locale(lang)
-
-    from janito.agent.config import CONFIG_OPTIONS
-    from janito.agent.config_defaults import CONFIG_DEFAULTS
-
+        sys.exit(handle_view_session(args))
+    handle_lang_selection(args)
     if getattr(args, "help_config", False):
-        print(tr("Available configuration options:\n"))
-        for key, desc in CONFIG_OPTIONS.items():
-            default = CONFIG_DEFAULTS.get(key, None)
-            print(
-                tr(
-                    "{key:15} {desc} (default: {default})",
-                    key=key,
-                    desc=desc,
-                    default=default,
-                )
-            )
+        handle_help_config(args)
         sys.exit(0)
-
     if getattr(args, "list_tools", False):
-        from janito.agent.tool_registry import get_tool_schemas
-        from rich.console import Console
-        from rich.table import Table
-
-        console = Console()
-        table = Table(
-            title="Ferramentas Registradas", show_lines=True, style="bold magenta"
-        )
-        table.add_column("Gnome", style="cyan", no_wrap=True)
-        table.add_column("Descrição", style="green")
-        table.add_column("Parâmetros", style="yellow")
-        for schema in get_tool_schemas():
-            fn = schema["function"]
-            params = "\n".join(
-                [
-                    f"[bold]{k}[/]: {v['type']}"
-                    for k, v in fn["parameters"].get("properties", {}).items()
-                ]
-            )
-            table.add_row(f"[b]{fn['name']}[/b]", fn["description"], params or "-")
-        console.print(table)
+        handle_list_tools(args)
         sys.exit(0)
-
     if getattr(args, "info", False):
-        # Compact, colored, single-line info output using rich
-        from janito import __version__
-        from rich.console import Console
-        from rich.text import Text
-        from janito.agent.runtime_config import runtime_config
-
-        model = unified_config.get("model")
-        temperature = unified_config.get("temperature")
-        max_tokens = unified_config.get("max_tokens")
-        system_prompt_val = None
-        if getattr(args, "system_file", None):
-            try:
-                with open(args.system_file, "r", encoding="utf-8") as f:
-                    system_prompt_val = f.read().strip()
-                runtime_config.set("system_prompt_template", system_prompt_val)
-            except Exception as e:
-                system_prompt_val = f"(error reading system-file: {e})"
-        elif getattr(args, "system", None):
-            system_prompt_val = args.system
-            runtime_config.set("system_prompt_template", system_prompt_val)
-        else:
-            system_prompt_val = runtime_config.get("system_prompt_template")
-            # if system_prompt_val:
-            #     origem = "runtime_config"
-        if not system_prompt_val:
-            try:
-                from janito.agent.profile_manager import AgentProfileManager
-                from janito.agent.config import get_api_key
-
-                role = args.role or unified_config.get("role", "software engineer")
-                interaction_mode = (
-                    "chat" if not getattr(args, "prompt", None) else "prompt"
-                )
-                profile = "base"
-                profile_manager = AgentProfileManager(
-                    api_key=get_api_key(),
-                    model=unified_config.get("model"),
-                )
-                system_prompt_val = profile_manager.get_system_prompt(
-                    role, interaction_mode, profile
-                )
-            except Exception as e:
-                system_prompt_val = f"(error: {e})"
-
-        console = Console()
-        info_text = Text()
-        info_text.append(f"Janito v{__version__}", style="bold cyan")
-        info_text.append(" | model: ", style="white")
-        info_text.append(str(model), style="green")
-        info_text.append(" | temp: ", style="white")
-        info_text.append(str(temperature), style="yellow")
-        info_text.append(" | max_tokens: ", style="white")
-        info_text.append(str(max_tokens), style="magenta")
-        info_text.append(" | system: ", style="white")
-        info_text.append(str(system_prompt_val), style="bold blue")
-        console.print(info_text, style="dim")
-        # Previously: sys.exit(0) would exit after showing info. Now, program continues after displaying info.
-
-    # ... resto do main ...
+        handle_info(args)
     handle_config_commands(args)
     setup_verbose_logging(args)
     if getattr(args, "web", False):
-        import subprocess  # Only needed if launching web
+        import subprocess
 
         subprocess.run([sys.executable, "-m", "janito.web"])
     elif getattr(args, "live", False):
-        port = 35729  # Default livereload port
+        port = 35729
         livereload_proc, started, livereload_stdout_path, livereload_stderr_path = (
             start_livereload(port)
         )

janito/cli/one_shot.py

@@ -3,15 +3,12 @@ from janito.agent.conversation_exceptions import (
     ProviderError,
     EmptyResponseError,
 )
+from janito.agent.api_exceptions import ApiError
+from janito.agent.llm_conversation_history import LLMConversationHistory
 
 
-def run_oneshot_mode(args, profile_manager, runtime_config):
+def prepare_messages(args, profile_manager, runtime_config):
     prompt = getattr(args, "input_arg", None)
-    from rich.console import Console
-    from janito.agent.rich_message_handler import RichMessageHandler
-
-    console = Console()
-    message_handler = RichMessageHandler()
     messages = []
     system_prompt_override = runtime_config.get("system_prompt_template")
     if system_prompt_override:
@@ -26,41 +23,58 @@ def run_oneshot_mode(args, profile_manager, runtime_config):
             {"role": "system", "content": profile_manager.system_prompt_template}
         )
     messages.append({"role": "user", "content": prompt})
+    return messages
+
+
+def print_usage_info(args, info_start_time, result, console):
+    if (
+        getattr(args, "info", False)
+        and info_start_time is not None
+        and result is not None
+    ):
+        usage_info = result.get("usage")
+        total_tokens = usage_info.get("total_tokens") if usage_info else None
+        prompt_tokens = usage_info.get("prompt_tokens") if usage_info else None
+        completion_tokens = usage_info.get("completion_tokens") if usage_info else None
+        elapsed = time.time() - info_start_time
+        console.print(
+            f"[bold green]Total tokens:[/] [yellow]{total_tokens}[/yellow] [bold green]| Input:[/] [cyan]{prompt_tokens}[/cyan] [bold green]| Output:[/] [magenta]{completion_tokens}[/magenta] [bold green]| Elapsed:[/] [yellow]{elapsed:.2f}s[/yellow]",
+            style="dim",
+        )
+
+
+def run_oneshot_mode(args, profile_manager, runtime_config):
+    from rich.console import Console
+    from janito.agent.rich_message_handler import RichMessageHandler
     import time
 
+    console = Console()
+    message_handler = RichMessageHandler()
+    messages = prepare_messages(args, profile_manager, runtime_config)
     info_start_time = None
     if getattr(args, "info", False):
         info_start_time = time.time()
     try:
         max_rounds = 100
-        from janito.agent.conversation_history import ConversationHistory
-
         result = profile_manager.agent.chat(
-            ConversationHistory(messages),
+            LLMConversationHistory(messages),
             message_handler=message_handler,
             spinner=True,
             max_rounds=max_rounds,
-            stream=getattr(args, "stream", False),
         )
-        if (
-            getattr(args, "info", False)
-            and info_start_time is not None
-            and result is not None
-        ):
-            usage_info = result.get("usage")
-            total_tokens = usage_info.get("total_tokens") if usage_info else None
-            prompt_tokens = usage_info.get("prompt_tokens") if usage_info else None
-            completion_tokens = (
-                usage_info.get("completion_tokens") if usage_info else None
-            )
-            elapsed = time.time() - info_start_time
-            console.print(
-                f"[bold green]Total tokens:[/] [yellow]{total_tokens}[/yellow] [bold green]| Input:[/] [cyan]{prompt_tokens}[/cyan] [bold green]| Output:[/] [magenta]{completion_tokens}[/magenta] [bold green]| Elapsed:[/] [yellow]{elapsed:.2f}s[/yellow]",
-                style="dim",
-            )
+        print_usage_info(args, info_start_time, result, console)
     except MaxRoundsExceededError:
         console.print("[red]Max conversation rounds exceeded.[/red]")
     except ProviderError as e:
         console.print(f"[red]Provider error:[/red] {e}")
     except EmptyResponseError as e:
         console.print(f"[red]Error:[/red] {e}")
+    except ApiError as e:
+        if "maximum context length" in str(e):
+            console.print(
+                f"[red]Error:[/red] {e}\n[bold yellow]Tip:[/] Try using [green]--max-tokens[/green] with a lower value."
+            )
+        else:
+            console.print(f"[red]API error:[/red] {e}")
+    except Exception:
+        raise

janito/i18n/__init__.py

@@ -23,7 +23,7 @@ def set_locale(locale):
 
 def tr(msg, **kwargs):
     """Translate message to current locale, usando hash SHA-1 da mensagem como chave."""
-    msg_hash = hashlib.sha1(msg.encode("utf-8")).hexdigest()
+    msg_hash = hashlib.sha1(msg.encode("utf-8", errors="surrogatepass")).hexdigest()
     template = _translations.get(msg_hash, msg)
     try:
         return template.format(**kwargs)

janito/rich_utils.py

@@ -3,19 +3,57 @@ Utilities for working with the Rich library.
 """
 
 from rich.console import Console
+from typing import Optional
 
 
-def print_info(console: Console, message: str):
-    console.print(message, style="cyan", end="")
+class RichPrinter:
+    """
+    Utility class for printing styled messages using the Rich library.
 
+    Args:
+        console (Optional[Console]): An optional Rich Console instance. If not provided, a default Console will be created.
 
-def print_error(console: Console, message: str):
-    console.print(message, style="bold red", end="\n")
+    Methods:
+        print_info(message: str)
+            Print an informational message in cyan (no newline at end).
 
+        print_error(message: str)
+            Print an error message in bold red.
 
-def print_warning(console: Console, message: str):
-    console.print(message, style="bold yellow", end="\n")
+        print_warning(message: str)
+            Print a warning message in bold yellow.
 
+        print_magenta(message: str)
+            Print a message in magenta.
+    """
 
-def print_magenta(console: Console, message: str):
-    console.print(message, style="magenta", end="\n")
+    def __init__(self, console: Optional[Console] = None):
+        self.console = console or Console()
+
+    def print_info(self, message: str):
+        self.console.print(message, style="cyan", end="")
+
+    def print_error(self, message: str):
+        self.console.print(message, style="bold red", end="\n")
+
+    def print_warning(self, message: str):
+        self.console.print(message, style="bold yellow", end="\n")
+
+    def print_magenta(self, message: str):
+        self.console.print(message, style="magenta", end="\n")
+
+    def print_colored_message(self, message: str, color_index: int = 0):
+        """
+        Print a message with a cycling background color for verbose-messages.
+        """
+        bg_colors = [
+            "on blue",
+            "on green",
+            "on magenta",
+            "on cyan",
+            "on yellow",
+            "on red",
+            "on bright_black",
+        ]
+        style = f"bold white {bg_colors[color_index % len(bg_colors)]}"
+        self.console.print(message, style=style, end="\n")

janito/shell/commands/__init__.py

@@ -6,14 +6,13 @@ from .utility import handle_help, handle_clear, handle_multi
 from .tools import handle_tools
 from .termweb_log import handle_termweb_log_tail, handle_termweb_status
 from .livelogs import handle_livelogs
-from .sum import handle_sum
 from .edit import handle_edit
-
 from .history_view import handle_view
 from janito.shell.session.config import handle_config_shell
 from .verbose import handle_verbose
 from .lang import handle_lang
 from janito.agent.runtime_config import runtime_config
+from .track import handle_track
 
 COMMAND_HANDLERS = {
     "/termweb-logs": handle_termweb_log_tail,
@@ -35,12 +34,11 @@ COMMAND_HANDLERS = {
 if not runtime_config.get("vanilla_mode", False):
     COMMAND_HANDLERS["/role"] = handle_role
 
-
 COMMAND_HANDLERS["/lang"] = handle_lang
+COMMAND_HANDLERS["/track"] = handle_track
 
 COMMAND_HANDLERS.update(
     {
-        "/sum": handle_sum,
         "/clear": handle_clear,
         "/restart": handle_restart,
         "/config": handle_config_shell,

janito/shell/commands/conversation_restart.py

@@ -1,6 +1,5 @@
 import os
 
-
 from janito.shell.session.manager import reset_session_id
 
 
@@ -70,3 +69,6 @@ def handle_restart(console, shell_state=None, **kwargs):
     console.print(
         "[bold green]Conversation history has been started (context reset).[/bold green]"
     )
+
+
+handle_restart.help_text = "Start a new conversation (reset context)"

janito/shell/commands/edit.py

@@ -19,3 +19,6 @@ def handle_edit(console, args=None, shell_state=None, **kwargs):
         f"[green]Opening in browser:[/green] [underline blue]{url}[/underline blue]"
     )
     webbrowser.open(url)
+
+
+handle_edit.help_text = "Open a file in the browser-based editor"

janito/shell/commands/history_view.py

@@ -1,7 +1,4 @@
 def handle_view(console, args=None, shell_state=None, **kwargs):
-    """
-    Prints the current LLM conversation history in a readable format.
-    """
     messages = shell_state.conversation_history.get_messages()
     if not messages:
         console.print("[yellow]Conversation history is empty.[/yellow]")
@@ -16,3 +13,6 @@ def handle_view(console, args=None, shell_state=None, **kwargs):
             console.print(f"   [cyan]tool_calls:[/cyan] {tool_calls}")
         if tool_call_id:
             console.print(f"   [magenta]tool_call_id:[/magenta] {tool_call_id}")
+
+
+handle_view.help_text = "Print the current LLM conversation history"

janito/shell/commands/lang.py

@@ -14,3 +14,6 @@ def handle_lang(console, args=None, **kwargs):
     console.print(
         f"[bold green]Idioma alterado para:[/bold green] [cyan]{lang_code}[/cyan]"
     )
+
+
+handle_lang.help_text = "Change the interface language (e.g., /lang en)"

janito/shell/commands/livelogs.py

@@ -1,7 +1,4 @@
 def handle_livelogs(console, args=None, shell_state=None, **kwargs):
-    """
-    /livelogs [N] - Show the last N lines of the livereload server logs (default: 20)
-    """
     lines = 20
     if args and len(args) > 0 and str(args[0]).isdigit():
         lines = int(args[0])
@@ -38,3 +35,8 @@ def handle_livelogs(console, args=None, shell_state=None, **kwargs):
             console.print(f"[red][livereload][stderr] Error: {e}[/red]")
     if (not stdout_path or not stdout_lines) and (not stderr_path or not stderr_lines):
         console.print("[livereload] No output or errors captured in logs.")
+
+
+handle_livelogs.help_text = (
+    "Show live updates from the server log file (default: server.log)"
+)

janito/shell/commands/prompt.py

@@ -9,6 +9,9 @@ def handle_prompt(console, shell_state=None, **kwargs):
     console.print(f"[bold magenta]System Prompt:[/bold magenta]\n{prompt}")
 
 
+handle_prompt.help_text = "Show the system prompt"
+
+
 def handle_role(console, args=None, shell_state=None, **kwargs):
     profile_manager = (
         shell_state.profile_manager
@@ -40,6 +43,9 @@ def handle_role(console, args=None, shell_state=None, **kwargs):
     console.print(f"[bold green]System role updated to:[/bold green] {new_role}")
 
 
+handle_role.help_text = "Change the system role"
+
+
 def handle_profile(console, *args, **kwargs):
     """/profile - Show the current and available Agent Profile (only 'base' is supported)"""
     console.print("[bold green]Current profile:[/bold green] base")

janito/shell/commands/session.py

@@ -30,3 +30,6 @@ def handle_history(console, shell_state=None, *args, **kwargs):
             role = "user"
             content = line
         console.print(f"[bold]{idx} [{role}]:[/bold] {content}")
+
+
+handle_history.help_text = "Show input history for this session"

janito/shell/commands/session_control.py

@@ -40,3 +40,6 @@ def restart_cli():
 def handle_exit(console, **kwargs):
     console.print("[bold red]Exiting chat mode.[/bold red]")
     sys.exit(0)
+
+
+handle_exit.help_text = "Exit chat mode"

janito/shell/commands/termweb_log.py

@@ -51,6 +51,9 @@ def handle_termweb_log_tail(console: Console, *args, shell_state=None, **kwargs)
         console.print("[termweb] No output or errors captured in logs.")
 
 
+handle_termweb_log_tail.help_text = "Show the last lines of the latest termweb logs"
+
+
 def handle_termweb_status(console: Console, *args, shell_state=None, **kwargs):
     if shell_state is None:
         console.print(
@@ -84,3 +87,8 @@ def handle_termweb_status(console: Console, *args, shell_state=None, **kwargs):
         console.print(f"  Stdout log: {stdout_path}")
     if stderr_path:
         console.print(f"  Stderr log: {stderr_path}")
+
+
+handle_termweb_status.help_text = (
+    "Show status information about the running termweb server"
+)