janito 2.1.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

janito/formatting_token.py

@@ -1,54 +1,54 @@
-"""
-Token summary formatter for rich and pt markup.
-- Used to display token/message counters after completions.
-"""
-
-from janito.perf_singleton import performance_collector
-
-from rich.rule import Rule
-
-
-def format_tokens(n, tag=None, use_rich=False):
-    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"
-    if tag:
-        if use_rich:
-            return f"[{tag}]{val}[/{tag}]"
-        else:
-            return f"<{tag}>{val}</{tag}>"
-    return val
-
-
-def format_token_message_summary(msg_count, usage, width=96, use_rich=False):
-    """
-    Returns a string (rich or pt markup) summarizing message count and last token usage.
-    """
-    left = f" Messages: {'[' if use_rich else '<'}msg_count{']' if use_rich else '>'}{msg_count}{'[/msg_count]' if use_rich else '</msg_count>'}"
-    tokens_part = ""
-    if usage:
-        prompt_tokens = usage.get("prompt_tokens")
-        completion_tokens = usage.get("completion_tokens")
-        total_tokens = usage.get("total_tokens")
-        tokens_part = (
-            f" | Tokens - Prompt: {format_tokens(prompt_tokens, 'tokens_in', use_rich)}, "
-            f"Completion: {format_tokens(completion_tokens, 'tokens_out', use_rich)}, "
-            f"Total: {format_tokens(total_tokens, 'tokens_total', use_rich)}"
-        )
-    return f"{left}{tokens_part}"
-
-
-def print_token_message_summary(console, msg_count=None, usage=None, width=96):
-    """Prints the summary using rich markup, using defaults from perf_singleton if not given."""
-    if usage is None:
-        usage = performance_collector.get_last_request_usage()
-    if msg_count is None:
-        msg_count = performance_collector.get_total_turns() or 0
-    line = format_token_message_summary(msg_count, usage, width, use_rich=True)
-    if line.strip():
-        console.print(Rule(line))
+"""
+Token summary formatter for rich and pt markup.
+- Used to display token/message counters after completions.
+"""
+
+from janito.perf_singleton import performance_collector
+
+from rich.rule import Rule
+
+
+def format_tokens(n, tag=None, use_rich=False):
+    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"
+    if tag:
+        if use_rich:
+            return f"[{tag}]{val}[/{tag}]"
+        else:
+            return f"<{tag}>{val}</{tag}>"
+    return val
+
+
+def format_token_message_summary(msg_count, usage, width=96, use_rich=False):
+    """
+    Returns a string (rich or pt markup) summarizing message count and last token usage.
+    """
+    left = f" Messages: {'[' if use_rich else '<'}msg_count{']' if use_rich else '>'}{msg_count}{'[/msg_count]' if use_rich else '</msg_count>'}"
+    tokens_part = ""
+    if usage:
+        prompt_tokens = usage.get("prompt_tokens")
+        completion_tokens = usage.get("completion_tokens")
+        total_tokens = usage.get("total_tokens")
+        tokens_part = (
+            f" | Tokens - Prompt: {format_tokens(prompt_tokens, 'tokens_in', use_rich)}, "
+            f"Completion: {format_tokens(completion_tokens, 'tokens_out', use_rich)}, "
+            f"Total: {format_tokens(total_tokens, 'tokens_total', use_rich)}"
+        )
+    return f"{left}{tokens_part}"
+
+
+def print_token_message_summary(console, msg_count=None, usage=None, width=96):
+    """Prints the summary using rich markup, using defaults from perf_singleton if not given."""
+    if usage is None:
+        usage = performance_collector.get_last_request_usage()
+    if msg_count is None:
+        msg_count = performance_collector.get_total_turns() or 0
+    line = format_token_message_summary(msg_count, usage, width, use_rich=True)
+    if line.strip():
+        console.print(Rule(line))

janito/i18n/__init__.py

@@ -1,35 +1,35 @@
-import importlib
-import threading
-import hashlib
-
-_current_locale = "en"
-_translations = {}
-_lock = threading.Lock()
-
-
-def set_locale(locale):
-    global _current_locale, _translations
-    with _lock:
-        _current_locale = locale
-        if locale == "en":
-            _translations = {}
-        else:
-            try:
-                mod = importlib.import_module(f"janito.i18n.{locale}")
-                _translations = getattr(mod, "translations", {})
-            except ImportError:
-                _translations = {}
-
-
-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", errors="surrogatepass")).hexdigest()
-    template = _translations.get(msg_hash, msg)
-    try:
-        return template.format(**kwargs)
-    except Exception:
-        return template  # fallback if formatting fails
-
-
-# Inicializa com o idioma padrão (en)
-set_locale("en")
+import importlib
+import threading
+import hashlib
+
+_current_locale = "en"
+_translations = {}
+_lock = threading.Lock()
+
+
+def set_locale(locale):
+    global _current_locale, _translations
+    with _lock:
+        _current_locale = locale
+        if locale == "en":
+            _translations = {}
+        else:
+            try:
+                mod = importlib.import_module(f"janito.i18n.{locale}")
+                _translations = getattr(mod, "translations", {})
+            except ImportError:
+                _translations = {}
+
+
+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", errors="surrogatepass")).hexdigest()
+    template = _translations.get(msg_hash, msg)
+    try:
+        return template.format(**kwargs)
+    except Exception:
+        return template  # fallback if formatting fails
+
+
+# Inicializa com o idioma padrão (en)
+set_locale("en")

janito/i18n/messages.py

@@ -1,23 +1,23 @@
-# Arquivo base de mensagens para i18n
-# Chave = SHA-1 da string original em inglês
-
-MESSAGES = {
-    # create_directory.py
-    "e3d8e1e5e0b3e4a2a7a5e2e1e4e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "Successfully created the directory at '{path}'.",
-    "f2b7e4e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1": "Cannot create directory: '{path}' already exists.",
-    "d3e2e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5": "Path '{path}' exists and is not a directory.",
-    "b1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1": "Error creating directory '{path}': {error}",
-    # create_file.py
-    "a2e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "File already exists at '{path}'. Use overwrite=True to overwrite.",
-    "c3e2e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5": "Created file ({lines} lines).",
-    "d4e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "Updated file ({lines} lines, backup at {backup_path}).",
-    # remove_file.py
-    "e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5": "File '{path}' does not exist.",
-    "f6e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "Path '{path}' is not a file.",
-    "a7e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1": "Successfully removed the file at '{path}'.",
-    "b8e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "Error removing file: {error}",
-    # replace_text_in_file.py (exemplo)
-    "c9e2e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5": "Text replaced in {file_path} (backup at {backup_path}). {details}",
-    "d0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "No changes made. {warning_detail}",
-    "e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1": "Error replacing text: {error}",
-}
+# Arquivo base de mensagens para i18n
+# Chave = SHA-1 da string original em inglês
+
+MESSAGES = {
+    # create_directory.py
+    "e3d8e1e5e0b3e4a2a7a5e2e1e4e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "Successfully created the directory at '{path}'.",
+    "f2b7e4e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1": "Cannot create directory: '{path}' already exists.",
+    "d3e2e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5": "Path '{path}' exists and is not a directory.",
+    "b1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1": "Error creating directory '{path}': {error}",
+    # create_file.py
+    "a2e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "File already exists at '{path}'. Use overwrite=True to overwrite.",
+    "c3e2e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5": "Created file ({lines} lines).",
+    "d4e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "Updated file ({lines} lines, backup at {backup_path}).",
+    # remove_file.py
+    "e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5": "File '{path}' does not exist.",
+    "f6e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "Path '{path}' is not a file.",
+    "a7e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1": "Successfully removed the file at '{path}'.",
+    "b8e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "Error removing file: {error}",
+    # replace_text_in_file.py (exemplo)
+    "c9e2e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5": "Text replaced in {file_path} (backup at {backup_path}). {details}",
+    "d0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0": "No changes made. {warning_detail}",
+    "e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1e5e0e1": "Error replacing text: {error}",
+}

janito/i18n/pt.py

@@ -1,47 +1,47 @@
-# pragma: allowlist secret
-translations = {
-    "36107ed78ab25f6fb12ad8ce13018cd1ce6735d1": "Iniciando servidor web...",
-    "70a0d194687568a47aa617fd85036ace1e69a982": "Deseja realmente sair? (s/n): ",
-    "5c9ebcbbd7632ecb328bd52958b17158afaa32c6": "F12 = Ação Rápida (segue a ação recomendada)",
-    "e4034394acca752c021b2ab50f60da8273e3c314": "TermWeb iniciado... Disponível em http://localhost:{selected_port}",
-    "fe21121e2934234b68d19b2757532117d440c1e3": "Chave de API não encontrada. Por favor, configure 'api_key' no seu arquivo de configuração.",
-    "c9e3759b1756eba35b381ce2b72cd659e132b01f": "Olá, {name}!",
-    "ca1fee2f55baabdc2e4b0e9529c89ee024e62079": "Nenhum prompt fornecido nas mensagens",
-    "f7449d23d0c500ae2a0b31e04f92b47a4d8ae845": "max_tokens deve ser um inteiro, recebido: {resolved_max_tokens!r}",
-    "70a9ed8edb6da12e208431a31aa16ba54419b26f": "Resposta inválida/malformada do OpenAI (tentativa {attempt}/{max_retries}). Tentando novamente em {wait_time} segundos...",
-    "a873085e3b06184fb5d27e842f97b06b6190976d": "Número máximo de tentativas para resposta inválida atingido. Gerando erro.",
-    "66a34568bbe846bb1bde3619eb4d6dfa10211104": "A API não suporta o uso de ferramentas.",
-    "09b81476b75586da4116b83f8be70d77b174cec3": "Limit de taxa da API OpenAI (429) (tentativa {attempt}/{max_retries}): {e}. Tentando novamente em {wait_time} segundos...",
-    "5717a35dd2a1533fb7e15edc8c9329cb69f3410b": "Erro do servidor da API OpenAI (tentativa {attempt}/{max_retries}): {e}. Tentando novamente em {wait_time} segundos...",
-    "02e760ba15ed863176c1290ac8a9b923963103cd": "Erro do client da API OpenAI {status_code}: {e}. Não será feita nova tentativa.",
-    "2e52b0bbc8f16226b70e3e20f95c9245d2bcdb47": "Erro da API OpenAI (tentativa {attempt}/{max_retries}): {e}. Tentando novamente em {wait_time} segundos...",
-    "012cc970e039fdd79c452fc676202c814ffc76ae": "Número máximo de tentativas para erro da API OpenAI atingido. Gerando erro.",
-    "d0438e45667d31e0022b2497b5901cd4300f084b": "QueuedMessageHandler.handle_message espera um dicionário com 'type' e 'message', recebido {msg_type}: {msg!r}",
-    "9d3460187ffa19c7c8a4020157072b1087e1bd2f": "[QueuedMessageHandler] {msg_type}: {msg}",
-    "3813833343430e8afa8fce33385c5e39fb24dd60": "[QueuedMessageHandler] {msg_type}: {message}",
-    "0be9a22226e16a40797010d23a0f581542dca40e": "[ToolExecutor] {tool_name} chamado com arguments: {args}",
-    "42c68edcb25442f518b1af77c6a2ddc07461aae0": "[ToolExecutor] Motivo da chamada: {tool_call_reason}",
-    "002ff598115d84595ffeee6219cb5c03d3a1d4a6": "Pergunta",
-    "35747d13dcd91e8e8790c7f767d5ed764f541b9e": "prosseguir",
-    "33dde3a1afbc418768a69fa53168d9b0638fe1aa": "avançar",
-    "eee0bbba4ff92adbeb038a77df0466d660f15716": "continuar",
-    "edee9402d198b04ac77dcf5dc9cc3dac44573782": "próximo",
-    "8fdb7e2fa84f4faf0d9b92f466df424ec47a165b": "ok",
-    "5f8f924671cda79b5205a6bf1b776f347c4a7a07": "Opções de configuração disponíveis:\n",
-    "cef780a309cd234750764d42697882c24168ddab": "{key:15} {desc} (padrão: {default})",
-    "68c2cc7f0ceaa3e499ecb4db331feb4debbbcc23": "Modelo",
-    "c3f104d1365744b538bfde9f4adb6a6df4b80355": "Função",
-    "99a0efc6cfd85d8ff2732a6718140f822cb90472": "Estilo",
-    "f1702b4686278becffc88baabe6f4b7a8355532c": "Mensagens",
-    "c38c6c1f3a2743f8626703abb302e403d20ff81c": "Tokens",
-    "a817d7eb8e0f1dab755ab5203a082e5c3c094fce": "Prompt",
-    "2ff255684a2277f806fcebf3fe338ed27857f350": "Conclusão",
-    "b25928c69902557b0ef0a628490a3a1768d7b82f": "Total",
-    "76e63d65c883ed50df40ac3aeef0c2d6a1c4ad60": "Ação Rápida",
-    "5397e0583f14f6c88de06b1ef28f460a1fb5b0ae": "Sim",
-    "816c52fd2bdd94a63cd0944823a6c0aa9384c103": "Não",
-    "c47ae15370cfe1ed2781eedc1dc2547d12d9e972": "Ajuda",
-    "cc3dbd47e1cf9003a55d3366b3adbcd72275e525": "Nova Tarefa",
-    "efa5a8b84e1afe65c81ecfce28c398c48f19ddc2": "Bem-vindo ao Janito{version_str}! Entrando no modo de chat. Digite /exit para sair.",
-    "b314d6e1460f86e0f21abc5aceb7935a2a0667e8": "Bem-vindo ao Janito{version_str} no [white on magenta]MODO VANILLA[/white on magenta]! Ferramentas, prompt do sistema e temperatura estão desativados, a menos que sejam substituídos.",
-}
+# pragma: allowlist secret
+translations = {
+    "36107ed78ab25f6fb12ad8ce13018cd1ce6735d1": "Iniciando servidor web...",
+    "70a0d194687568a47aa617fd85036ace1e69a982": "Deseja realmente sair? (s/n): ",
+    "5c9ebcbbd7632ecb328bd52958b17158afaa32c6": "F12 = Ação Rápida (segue a ação recomendada)",
+    "e4034394acca752c021b2ab50f60da8273e3c314": "TermWeb iniciado... Disponível em http://localhost:{selected_port}",
+    "fe21121e2934234b68d19b2757532117d440c1e3": "Chave de API não encontrada. Por favor, configure 'api_key' no seu arquivo de configuração.",
+    "c9e3759b1756eba35b381ce2b72cd659e132b01f": "Olá, {name}!",
+    "ca1fee2f55baabdc2e4b0e9529c89ee024e62079": "Nenhum prompt fornecido nas mensagens",
+    "f7449d23d0c500ae2a0b31e04f92b47a4d8ae845": "max_tokens deve ser um inteiro, recebido: {resolved_max_tokens!r}",
+    "70a9ed8edb6da12e208431a31aa16ba54419b26f": "Resposta inválida/malformada do OpenAI (tentativa {attempt}/{max_retries}). Tentando novamente em {wait_time} segundos...",
+    "a873085e3b06184fb5d27e842f97b06b6190976d": "Número máximo de tentativas para resposta inválida atingido. Gerando erro.",
+    "66a34568bbe846bb1bde3619eb4d6dfa10211104": "A API não suporta o uso de ferramentas.",
+    "09b81476b75586da4116b83f8be70d77b174cec3": "Limit de taxa da API OpenAI (429) (tentativa {attempt}/{max_retries}): {e}. Tentando novamente em {wait_time} segundos...",
+    "5717a35dd2a1533fb7e15edc8c9329cb69f3410b": "Erro do servidor da API OpenAI (tentativa {attempt}/{max_retries}): {e}. Tentando novamente em {wait_time} segundos...",
+    "02e760ba15ed863176c1290ac8a9b923963103cd": "Erro do client da API OpenAI {status_code}: {e}. Não será feita nova tentativa.",
+    "2e52b0bbc8f16226b70e3e20f95c9245d2bcdb47": "Erro da API OpenAI (tentativa {attempt}/{max_retries}): {e}. Tentando novamente em {wait_time} segundos...",
+    "012cc970e039fdd79c452fc676202c814ffc76ae": "Número máximo de tentativas para erro da API OpenAI atingido. Gerando erro.",
+    "d0438e45667d31e0022b2497b5901cd4300f084b": "QueuedMessageHandler.handle_message espera um dicionário com 'type' e 'message', recebido {msg_type}: {msg!r}",
+    "9d3460187ffa19c7c8a4020157072b1087e1bd2f": "[QueuedMessageHandler] {msg_type}: {msg}",
+    "3813833343430e8afa8fce33385c5e39fb24dd60": "[QueuedMessageHandler] {msg_type}: {message}",
+    "0be9a22226e16a40797010d23a0f581542dca40e": "[ToolExecutor] {tool_name} chamado com arguments: {args}",
+    "42c68edcb25442f518b1af77c6a2ddc07461aae0": "[ToolExecutor] Motivo da chamada: {tool_call_reason}",
+    "002ff598115d84595ffeee6219cb5c03d3a1d4a6": "Pergunta",
+    "35747d13dcd91e8e8790c7f767d5ed764f541b9e": "prosseguir",
+    "33dde3a1afbc418768a69fa53168d9b0638fe1aa": "avançar",
+    "eee0bbba4ff92adbeb038a77df0466d660f15716": "continuar",
+    "edee9402d198b04ac77dcf5dc9cc3dac44573782": "próximo",
+    "8fdb7e2fa84f4faf0d9b92f466df424ec47a165b": "ok",
+    "5f8f924671cda79b5205a6bf1b776f347c4a7a07": "Opções de configuração disponíveis:\n",
+    "cef780a309cd234750764d42697882c24168ddab": "{key:15} {desc} (padrão: {default})",
+    "68c2cc7f0ceaa3e499ecb4db331feb4debbbcc23": "Modelo",
+    "c3f104d1365744b538bfde9f4adb6a6df4b80355": "Função",
+    "99a0efc6cfd85d8ff2732a6718140f822cb90472": "Estilo",
+    "f1702b4686278becffc88baabe6f4b7a8355532c": "Mensagens",
+    "c38c6c1f3a2743f8626703abb302e403d20ff81c": "Tokens",
+    "a817d7eb8e0f1dab755ab5203a082e5c3c094fce": "Prompt",
+    "2ff255684a2277f806fcebf3fe338ed27857f350": "Conclusão",
+    "b25928c69902557b0ef0a628490a3a1768d7b82f": "Total",
+    "76e63d65c883ed50df40ac3aeef0c2d6a1c4ad60": "Ação Rápida",
+    "5397e0583f14f6c88de06b1ef28f460a1fb5b0ae": "Sim",
+    "816c52fd2bdd94a63cd0944823a6c0aa9384c103": "Não",
+    "c47ae15370cfe1ed2781eedc1dc2547d12d9e972": "Ajuda",
+    "cc3dbd47e1cf9003a55d3366b3adbcd72275e525": "Nova Tarefa",
+    "efa5a8b84e1afe65c81ecfce28c398c48f19ddc2": "Bem-vindo ao Janito{version_str}! Entrando no modo de chat. Digite /exit para sair.",
+    "b314d6e1460f86e0f21abc5aceb7935a2a0667e8": "Bem-vindo ao Janito{version_str} no [white on magenta]MODO VANILLA[/white on magenta]! Ferramentas, prompt do sistema e temperatura estão desativados, a menos que sejam substituídos.",
+}

janito/llm/__init__.py

@@ -1,5 +1,5 @@
-# janito.llm package
-
-from .driver import LLMDriver
-from .provider import LLMProvider
-from .driver_config import LLMDriverConfig
+# janito.llm package
+
+from .driver import LLMDriver
+from .provider import LLMProvider
+from .driver_config import LLMDriverConfig