kader 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

kader/agent/base.py

@@ -559,12 +559,13 @@ class BaseAgent:
                         token_usage["total_tokens"],
                     )
 
+                    # estimate the cost...
+                    estimated_cost = self.provider.estimate_cost(token_usage)
+
                     # Calculate and log cost
                     agent_logger.calculate_cost(
                         self.logger_id,
-                        token_usage["prompt_tokens"],
-                        token_usage["completion_tokens"],
-                        getattr(self.provider, "model", ""),
+                        estimated_cost.total_cost,
                     )
 
             # Save session update
@@ -726,12 +727,13 @@ class BaseAgent:
                         token_usage["total_tokens"],
                     )
 
+                    # estimate the cost...
+                    estimated_cost = self.provider.estimate_cost(token_usage)
+
                     # Calculate and log cost
                     agent_logger.calculate_cost(
                         self.logger_id,
-                        token_usage["prompt_tokens"],
-                        token_usage["completion_tokens"],
-                        getattr(self.provider, "model", ""),
+                        estimated_cost.total_cost,
                     )
 
             # Save session update

kader/agent/logger.py

@@ -99,27 +99,9 @@ class AgentLogger:
     def calculate_cost(
         self,
         logger_id: str,
-        prompt_tokens: int,
-        completion_tokens: int,
-        model_name: str = "",
-        pricing_data: Optional[Dict[str, float]] = None,
+        total_cost: float,
     ):
         """Calculate and log cost based on token usage."""
-        # Use provided pricing data or defaults
-        if pricing_data is None:
-            # Default pricing (these would come from a model registry in practice)
-            pricing_data = {
-                "input_cost_per_million": 0.5,  # $0.50 per million input tokens
-                "output_cost_per_million": 1.5,  # $1.50 per million output tokens
-            }
-
-        input_cost = (prompt_tokens / 1_000_000) * pricing_data.get(
-            "input_cost_per_million", 0.5
-        )
-        output_cost = (completion_tokens / 1_000_000) * pricing_data.get(
-            "output_cost_per_million", 1.5
-        )
-        total_cost = input_cost + output_cost
 
         self.log_cost(logger_id, total_cost)
         return total_cost

{kader-0.1.1.dist-info → kader-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kader
-Version: 0.1.1
+Version: 0.1.2
 Summary: kader coding agent
 Requires-Python: >=3.11
 Requires-Dist: faiss-cpu>=1.9.0

{kader-0.1.1.dist-info → kader-0.1.2.dist-info}/RECORD

@@ -12,8 +12,8 @@ kader/__init__.py,sha256=QXb0aQvySAiNmhP2kNMNtuuzG_eSUgRVcTRSafko1r0,602
 kader/config.py,sha256=B1s1PNgZ5SrFEJU5TtJG-ZAc7Umff4cwyHR7mfQgeLA,4261
 kader/agent/__init__.py,sha256=UJzUw9NIzggCrhIBHC6nJnfzkhCjCZnIzmD6uUn2SNA,159
 kader/agent/agents.py,sha256=lo41hlkPm3CStI9VAwSOR6IYhCBkqQJ48Ego5XN1XU8,4299
-kader/agent/base.py,sha256=qWT53Fuw3I61X9wvZFDNJ8YnYSxBJKdnOH1122cWP2s,36452
-kader/agent/logger.py,sha256=Y8Ig6Jab_jEDUCStAnv-zmBf8u7Ubpe5ry-zaPmj0Kk,6582
+kader/agent/base.py,sha256=3SzXH93JW5LGI30c3EL_onol3UFWd0lCqi5gWOaXq8o,36452
+kader/agent/logger.py,sha256=3vFwz_yycSBU-5mcdalfZ3KBVT9P_20Q-WT5Al8yIXo,5796
 kader/memory/__init__.py,sha256=VUzzhGOWvO_2aYB6uuavmtNI8l94K7H3uPn4_1MVUUs,1473
 kader/memory/conversation.py,sha256=h6Bamd8_rYnk0Bwt4MJWZRfv2wxCcg6eUxPvzP-tIyA,11810
 kader/memory/session.py,sha256=VhRPEO474SlwM5UOuFt-b_28sJs3j4SNrobCZvoP5Os,10811
@@ -39,7 +39,7 @@ kader/tools/rag.py,sha256=37Nd49D5R_DlWmMyhSdSvst_XFOnoxpaFNtlbLEt6qM,15653
 kader/tools/todo.py,sha256=omirxoG7_KVHAmMoD12DGmn7scqRaewbI1cqWm0ShUo,7735
 kader/tools/utils.py,sha256=bfq7b1vpA1qBaL_QZYBFTqOM35-omu_UeDjo6v0rxEg,14176
 kader/tools/web.py,sha256=2Aqy0nO7ZwNLAqE9IWjCg5y8qnhbt-AIZOHy02XgbxA,8464
-kader-0.1.1.dist-info/METADATA,sha256=EEFa_a5JeTZV9CZ8wKchfbYv1NXyZhUuHIu7zburgnU,9490
-kader-0.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-kader-0.1.1.dist-info/entry_points.txt,sha256=TK0VOtrfDFqZ8JQfxpuAHHvDLHyoiafUjS-VOixl02c,39
-kader-0.1.1.dist-info/RECORD,,
+kader-0.1.2.dist-info/METADATA,sha256=FvswsMNeTn3O6mOQR5jiK_MXgKhgPeKB18eC4Hkq3hA,9490
+kader-0.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+kader-0.1.2.dist-info/entry_points.txt,sha256=TK0VOtrfDFqZ8JQfxpuAHHvDLHyoiafUjS-VOixl02c,39
+kader-0.1.2.dist-info/RECORD,,