nullabot 1.0.2__py3-none-any.whl → 1.0.3__py3-none-any.whl

nullabot/agents/claude_agent.py

@@ -342,18 +342,35 @@ IMPORTANT:
             # Parse JSON response to extract tokens
             try:
                 data = json.loads(output)
-                result_text = data.get("result", output)
 
-                # Extract token usage from response
-                input_tokens = data.get("input_tokens", 0)
-                output_tokens = data.get("output_tokens", 0)
+                # Get result text - try multiple fields
+                result_text = data.get("result") or data.get("content") or ""
 
-                # Also check nested usage object
+                # If no result text but we have the raw output, use a summary
+                if not result_text and data.get("subtype") == "error_max_turns":
+                    result_text = "Reached max turns limit. Work saved."
+                elif not result_text:
+                    result_text = output  # Fallback to raw output
+
+                # Extract token usage from nested usage object
                 usage = data.get("usage", {})
-                if not input_tokens:
-                    input_tokens = usage.get("input_tokens", 0)
-                if not output_tokens:
-                    output_tokens = usage.get("output_tokens", 0)
+
+                # Input includes regular + cache tokens
+                input_tokens = (
+                    usage.get("input_tokens", 0) +
+                    usage.get("cache_read_input_tokens", 0) +
+                    usage.get("cache_creation_input_tokens", 0)
+                )
+                output_tokens = usage.get("output_tokens", 0)
+
+                # Also check modelUsage for more detailed breakdown
+                model_usage = data.get("modelUsage", {})
+                if model_usage and not input_tokens:
+                    for model, mu in model_usage.items():
+                        input_tokens += mu.get("inputTokens", 0)
+                        input_tokens += mu.get("cacheReadInputTokens", 0)
+                        input_tokens += mu.get("cacheCreationInputTokens", 0)
+                        output_tokens += mu.get("outputTokens", 0)
 
                 return result_text, True, input_tokens, output_tokens
             except json.JSONDecodeError:

{nullabot-1.0.2.dist-info → nullabot-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nullabot
-Version: 1.0.2
+Version: 1.0.3
 Summary: 24/7 AI agents that think, design, and code - controlled via Telegram
 Project-URL: Homepage, https://github.com/ebokoo/nullabot
 Project-URL: Repository, https://github.com/ebokoo/nullabot

{nullabot-1.0.2.dist-info → nullabot-1.0.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 nullabot/__init__.py,sha256=96923LhB3uU4TE33GdjyG8M2fRRcqeWvRWlqxt48OV4,58
 nullabot/cli.py,sha256=zattwGYh4feT_sRjCxSOoG6WSToxc_F1Zp00T_zrAIU,25800
 nullabot/agents/__init__.py,sha256=6mE-zjqFa99WfnE-khjDpCSKzaNlukKVP7tB5Q4o7Vk,133
-nullabot/agents/claude_agent.py,sha256=B-P43PhZ_3wfUYpfsCNci3oEpm3s065FEWTDkneWoG8,32587
+nullabot/agents/claude_agent.py,sha256=gCxu3jUAgJ2ZKyIkSXGRas9K8Oy-9h1ZxaCnWNefKY0,33507
 nullabot/bot/__init__.py,sha256=9axCMJfCE09CxMGsxtx81QZcBEXfz6wruHbYEtQQAeY,102
 nullabot/bot/telegram.py,sha256=ttBv693dpkt327iCjdpvJEcEsAroaHZ1e8QWQZ--SJk,69104
 nullabot/core/__init__.py,sha256=Yn9zEFXF_2-aXiiU_iftYuaXWrX1qC7ZaEd6i3sarIE,314
@@ -12,8 +12,8 @@ nullabot/core/rate_limiter.py,sha256=41CF4cX_n5_PFc6Uk1vp6m4MERxXl25p1wyw2FVdgsM
 nullabot/core/reliability.py,sha256=nfMN29dCQqM_T_MSLe0z9Tk0N5CWYFtmNXVe9Lqmiyw,13985
 nullabot/core/sandbox.py,sha256=fWgjhWglGzXsJ10qxiKwJEkQQv6tLVa-DsshO7qcQvQ,4562
 nullabot/core/state.py,sha256=yeFF4r3h0nRd5LENiXE7SSqfWPuljGy7X0FgE_GuI5o,6307
-nullabot-1.0.2.dist-info/METADATA,sha256=i_73BKTIn0-YsgJF-kOxmEQjSM8pnB6KaQ56XmXe0Fw,3360
-nullabot-1.0.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-nullabot-1.0.2.dist-info/entry_points.txt,sha256=lHaTGUU4ku7Q6ZRZnlpp5LrHRyLxhaRB9HzXzsJwYY8,47
-nullabot-1.0.2.dist-info/licenses/LICENSE,sha256=IppsK7DD3SKtJlMoquzr1-bGKs88x85956yPxCn8H-U,1063
-nullabot-1.0.2.dist-info/RECORD,,
+nullabot-1.0.3.dist-info/METADATA,sha256=gfHS2303WEzHe8GeFJHZsIFmvrDYFGTF6dZ96R1mLC8,3360
+nullabot-1.0.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nullabot-1.0.3.dist-info/entry_points.txt,sha256=lHaTGUU4ku7Q6ZRZnlpp5LrHRyLxhaRB9HzXzsJwYY8,47
+nullabot-1.0.3.dist-info/licenses/LICENSE,sha256=IppsK7DD3SKtJlMoquzr1-bGKs88x85956yPxCn8H-U,1063
+nullabot-1.0.3.dist-info/RECORD,,