tokenator 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

tokenator/anthropic/client_anthropic.py

@@ -71,7 +71,6 @@ def _create_usage_callback(execution_id, log_usage_fn):
                 usage_data.usage.prompt_tokens += chunk.message.usage.input_tokens
                 usage_data.usage.completion_tokens += chunk.message.usage.output_tokens
             elif isinstance(chunk, RawMessageDeltaEvent):
-                usage_data.usage.prompt_tokens += chunk.usage.input_tokens
                 usage_data.usage.completion_tokens += chunk.usage.output_tokens
         
         usage_data.usage.total_tokens = usage_data.usage.prompt_tokens + usage_data.usage.completion_tokens

tokenator/base_wrapper.py

@@ -47,7 +47,7 @@ class BaseWrapper:
                 total_tokens=token_usage_stats.usage.total_tokens,
             )
             session.add(token_usage)
-            logger.info(
+            logger.debug(
                 "Logged token usage: model=%s, total_tokens=%d",
                 token_usage_stats.model,
                 token_usage_stats.usage.total_tokens,

tokenator/openai/client_openai.py

@@ -14,7 +14,9 @@ logger = logging.getLogger(__name__)
 
 
 class BaseOpenAIWrapper(BaseWrapper):
-    provider = "openai"
+    def __init__(self, client, db_path=None, provider: str = "openai"):
+        super().__init__(client, db_path)
+        self.provider = provider
 
     def _process_response_usage(
         self, response: ResponseType
@@ -134,6 +136,7 @@ class AsyncOpenAIWrapper(BaseOpenAIWrapper):
 def tokenator_openai(
     client: OpenAI,
     db_path: Optional[str] = None,
+    provider: str = "openai",
 ) -> OpenAIWrapper: ...
 
 
@@ -141,23 +144,26 @@ def tokenator_openai(
 def tokenator_openai(
     client: AsyncOpenAI,
     db_path: Optional[str] = None,
+    provider: str = "openai",
 ) -> AsyncOpenAIWrapper: ...
 
 
 def tokenator_openai(
     client: Union[OpenAI, AsyncOpenAI],
     db_path: Optional[str] = None,
+    provider: str = "openai",
 ) -> Union[OpenAIWrapper, AsyncOpenAIWrapper]:
     """Create a token-tracking wrapper for an OpenAI client.
 
     Args:
         client: OpenAI or AsyncOpenAI client instance
         db_path: Optional path to SQLite database for token tracking
+        provider: Provider name, defaults to "openai"
     """
     if isinstance(client, OpenAI):
-        return OpenAIWrapper(client=client, db_path=db_path)
+        return OpenAIWrapper(client=client, db_path=db_path, provider=provider)
 
     if isinstance(client, AsyncOpenAI):
-        return AsyncOpenAIWrapper(client=client, db_path=db_path)
+        return AsyncOpenAIWrapper(client=client, db_path=db_path, provider=provider)
 
     raise ValueError("Client must be an instance of OpenAI or AsyncOpenAI")

tokenator-0.1.12.dist-info/METADATA

@@ -0,0 +1,240 @@
+Metadata-Version: 2.3
+Name: tokenator
+Version: 0.1.12
+Summary: Token usage tracking wrapper for LLMs
+License: MIT
+Author: Ujjwal Maheshwari
+Author-email: your.email@example.com
+Requires-Python: >=3.9,<4.0
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: alembic (>=1.13.0,<2.0.0)
+Requires-Dist: anthropic (>=0.40.0,<0.41.0)
+Requires-Dist: openai (>=1.57.0,<2.0.0)
+Requires-Dist: requests (>=2.32.3,<3.0.0)
+Requires-Dist: sqlalchemy (>=2.0.0,<3.0.0)
+Description-Content-Type: text/markdown
+
+# Tokenator : Track and analyze LLM token usage and cost
+
+Have you ever wondered about :
+- How many tokens does your AI agent consume? 
+- How much does it cost to do run a complex AI workflow with multiple LLM providers?
+- How much money/tokens did you spend today on developing with LLMs?
+
+Afraid not, tokenator is here! With tokenator's easy to use API, you can start tracking LLM usage in a matter of minutes.
+
+Get started with just 3 lines of code!
+
+## Installation
+
+```bash
+pip install tokenator
+```
+
+## Usage
+
+### OpenAI
+
+```python
+from openai import OpenAI
+from tokenator import tokenator_openai
+
+openai_client = OpenAI(api_key="your-api-key")
+
+# Wrap it with Tokenator
+client = tokenator_openai(openai_client)
+
+# Use it exactly like the OpenAI client
+response = client.chat.completions.create(
+    model="gpt-4o",
+    messages=[{"role": "user", "content": "Hello!"}]
+)
+```
+
+Works with AsyncOpenAI and `streaming=True` as well!
+Note : When streaming, don't forget to add `stream_options={"include_usage": True}` to the `create()` call!
+
+### Cost Analysis
+
+```python
+from tokenator import usage
+
+# Get usage for different time periods
+usage.last_hour()
+usage.last_day()
+usage.last_week()
+usage.last_month()
+
+# Custom date range
+usage.between("2024-03-01", "2024-03-15")
+
+# Get usage for different LLM providers
+usage.last_day("openai")
+usage.last_day("anthropic")
+usage.last_day("google")
+```
+
+### Example `usage` object
+
+```python
+print(cost.last_hour().model_dump_json(indent=4))
+```
+
+```json
+{
+    "total_cost": 0.0004,
+    "total_tokens": 79,
+    "prompt_tokens": 52,
+    "completion_tokens": 27,
+    "providers": [
+        {
+            "total_cost": 0.0004,
+            "total_tokens": 79,
+            "prompt_tokens": 52,
+            "completion_tokens": 27,
+            "provider": "openai",
+            "models": [
+                {
+                    "total_cost": 0.0004,
+                    "total_tokens": 79,
+                    "prompt_tokens": 52,
+                    "completion_tokens": 27,
+                    "model": "gpt-4o-2024-08-06"
+                }
+            ]
+        }
+    ]
+}
+```
+
+## Features
+
+- Drop-in replacement for OpenAI, Anthropic client
+- Automatic token usage tracking
+- Cost analysis for different time periods
+- SQLite storage with zero configuration
+- Thread-safe operations
+- Minimal memory footprint
+- Minimal latency footprint
+
+### Anthropic
+
+```python
+from anthropic import Anthropic, AsyncAnthropic
+from tokenator import tokenator_anthropic
+
+anthropic_client = AsyncAnthropic(api_key="your-api-key")
+
+# Wrap it with Tokenator
+client = tokenator_anthropic(anthropic_client)
+
+# Use it exactly like the Anthropic client
+response = await client.messages.create(
+    model="claude-3-5-haiku-20241022",
+    messages=[{"role": "user", "content": "hello how are you"}],
+    max_tokens=20,
+)
+
+print(response)
+
+print(usage.last_execution().model_dump_json(indent=4))
+"""
+{
+    "total_cost": 0.0001,
+    "total_tokens": 23,
+    "prompt_tokens": 10,
+    "completion_tokens": 13,
+    "providers": [
+        {
+            "total_cost": 0.0001,
+            "total_tokens": 23,
+            "prompt_tokens": 10,
+            "completion_tokens": 13,
+            "provider": "anthropic",
+            "models": [
+                {
+                    "total_cost": 0.0004,
+                    "total_tokens": 79,
+                    "prompt_tokens": 52,
+                    "completion_tokens": 27,
+                    "model": "claude-3-5-haiku-20241022"
+                }
+            ]
+        }
+    ]
+}
+"""
+```
+
+### xAI
+
+You can use xAI models through the `openai` SDK and track usage using `provider` parameter in `tokenator`.
+
+```python
+from openai import OpenAI
+from tokenator import tokenator_openai
+
+xai_client = OpenAI(
+            api_key=os.getenv("XAI_API_KEY"),
+            base_url="https://api.x.ai/v1"
+        )
+
+# Wrap it with Tokenator
+client = tokenator_openai(client, db_path=temp_db, provider="xai")
+
+# Use it exactly like the OpenAI client but with xAI models
+response = client.chat.completions.create(
+    model="grok-2-latest",
+    messages=[{"role": "user", "content": "Hello!"}]
+)
+
+print(response)
+
+print(usage.last_execution())
+```
+
+### Other AI model providers through openai SDKs
+
+Today, a variety of AI companies have made their APIs compatible to the `openai` SDK.
+You can track usage of any such AI models using `tokenator`'s `provider` parameter.
+
+For example, let's see how we can track usage of `perplexity` tokens.
+
+```python
+from openai import OpenAI
+from tokenator import tokenator_openai
+
+xai_client = OpenAI(
+            api_key=os.getenv("PERPLEXITY_API_KEY"),
+            base_url="https://api.perplexity.ai"
+        )
+
+# Wrap it with Tokenator
+client = tokenator_openai(client, db_path=temp_db, provider="perplexity")
+
+# Use it exactly like the OpenAI client but with xAI models
+response = client.chat.completions.create(
+    model="grok-2-latest",
+    messages=[{"role": "user", "content": "Hello!"}]
+)
+
+print(response)
+
+print(usage.last_execution())
+
+print(usage.provider("perplexity"))
+```
+
+---
+
+Most importantly, none of your data is ever sent to any server.
+
+## License
+
+MIT 

{tokenator-0.1.10.dist-info → tokenator-0.1.12.dist-info}/RECORD

@@ -1,19 +1,19 @@
 tokenator/__init__.py,sha256=bIAPyGAvWreS2i_5tzxJEyX9JlZgAUNxzVk1iHNUhvU,593
-tokenator/anthropic/client_anthropic.py,sha256=fcKxGsLex99II-WD9SVNI5QVzH0IEWRmVLjyvZd9wKs,5936
+tokenator/anthropic/client_anthropic.py,sha256=fnjWz_Kf8D0GUTudkZNeSmH9ueCGFLDSBDz1U8Jri3Y,5861
 tokenator/anthropic/stream_interceptors.py,sha256=4VHC_-WkG3Pa10YizmFLrHcbz0Tm2MR_YB5-uohKp5A,5221
-tokenator/base_wrapper.py,sha256=VYSkQB1MEudgzBX60T-VAMsNg4fFx7IRzpadzjm4klE,2466
+tokenator/base_wrapper.py,sha256=IO344KWbRswQy4vG_pBxWPR7Wp7K-4mlgmS3SCYGep8,2467
 tokenator/create_migrations.py,sha256=k9IHiGK21dLTA8MYNsuhO0-kUVIcMSViMFYtY4WU2Rw,730
 tokenator/migrations/env.py,sha256=JoF5MJ4ae0wJW5kdBHuFlG3ZqeCCDvbMcU8fNA_a6hM,1396
 tokenator/migrations/script.py.mako,sha256=nJL-tbLQE0Qy4P9S4r4ntNAcikPtoFUlvXe6xvm9ot8,635
 tokenator/migrations/versions/f6f1f2437513_initial_migration.py,sha256=4cveHkwSxs-hxOPCm81YfvGZTkJJ2ClAFmyL98-1VCo,1910
 tokenator/migrations.py,sha256=YAf9gZmDzAq36PWWXPtdUQoJFYPXtIDzflC79H6gcJg,1114
 tokenator/models.py,sha256=MhYwCvmqposUNDRxFZNAVnzCqBTHxNL3Hp0MNFXM5ck,1201
-tokenator/openai/client_openai.py,sha256=Umfxha3BhBFU_JebPjyuaUZEZuPqJWQo1xTCuAy3R24,5691
+tokenator/openai/client_openai.py,sha256=Ffa3ujLh5PuPe1W8KSISGH3NonZ_AC6ZpKhO6kTupTU,5996
 tokenator/openai/stream_interceptors.py,sha256=ez1MnjRZW_rEalv2SIPAvrU9oMD6OJoD9vht-057fDM,5243
 tokenator/schemas.py,sha256=Ye8hqZlrm3Gh2FyvOVX-hWCpKynWxS58QQRQMfDtIAQ,2114
 tokenator/usage.py,sha256=eTWfcRrTLop-30FmwHpi7_GwCJxU6Qfji374hG1Qptw,8476
 tokenator/utils.py,sha256=xg9l2GV1yJL1BlxKL1r8CboABWDslf3G5rGQEJSjFrE,1973
-tokenator-0.1.10.dist-info/LICENSE,sha256=wdG-B6-ODk8RQ4jq5uXSn0w1UWTzCH_MMyvh7AwtGns,1074
-tokenator-0.1.10.dist-info/METADATA,sha256=ryILkOYlq8V8219sVmK0xUeEEw51msw_FCoF_3VJ_k8,3108
-tokenator-0.1.10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-tokenator-0.1.10.dist-info/RECORD,,
+tokenator-0.1.12.dist-info/LICENSE,sha256=wdG-B6-ODk8RQ4jq5uXSn0w1UWTzCH_MMyvh7AwtGns,1074
+tokenator-0.1.12.dist-info/METADATA,sha256=VdJVlwESY2_QbiterwI1lH9dng4r4WwWYd6MwXlT9V4,5969
+tokenator-0.1.12.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+tokenator-0.1.12.dist-info/RECORD,,

{tokenator-0.1.10.dist-info → tokenator-0.1.12.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any

tokenator-0.1.10.dist-info/METADATA

@@ -1,127 +0,0 @@
-Metadata-Version: 2.1
-Name: tokenator
-Version: 0.1.10
-Summary: Token usage tracking wrapper for LLMs
-License: MIT
-Author: Ujjwal Maheshwari
-Author-email: your.email@example.com
-Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: alembic (>=1.13.0,<2.0.0)
-Requires-Dist: anthropic (>=0.40.0,<0.41.0)
-Requires-Dist: openai (>=1.57.0,<2.0.0)
-Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: sqlalchemy (>=2.0.0,<3.0.0)
-Description-Content-Type: text/markdown
-
-# Tokenator : Easiest way to track and analyze LLM token usage and cost
-
-Have you ever wondered about :
-- How many tokens does your AI agent consume? 
-- How much does it cost to do run a complex AI workflow with multiple LLM providers?
-- How much money did I spent today on development?
-
-Afraid not, tokenator is here! With tokenator's easy to use API, you can start tracking LLM usage in a matter of minutes.
-
-Get started with just 3 lines of code!
-
-## Installation
-
-```bash
-pip install tokenator
-```
-
-## Usage
-
-### OpenAI
-
-```python
-from openai import OpenAI
-from tokenator import tokenator_openai
-
-openai_client = OpenAI(api_key="your-api-key")
-
-# Wrap it with Tokenator
-client = tokenator_openai(openai_client)
-
-# Use it exactly like the OpenAI client
-response = client.chat.completions.create(
-    model="gpt-4o",
-    messages=[{"role": "user", "content": "Hello!"}]
-)
-```
-
-### Cost Analysis
-
-```python
-from tokenator import usage
-
-# Get usage for different time periods
-usage.last_hour()
-usage.last_day()
-usage.last_week()
-usage.last_month()
-
-# Custom date range
-usage.between("2024-03-01", "2024-03-15")
-
-# Get usage for different LLM providers
-usage.last_day("openai")
-usage.last_day("anthropic")
-usage.last_day("google")
-```
-
-### Example `usage` object
-
-```python
-print(cost.last_hour().model_dump_json(indent=4))
-```
-
-```json
-{
-    "total_cost": 0.0004,
-    "total_tokens": 79,
-    "prompt_tokens": 52,
-    "completion_tokens": 27,
-    "providers": [
-        {
-            "total_cost": 0.0004,
-            "total_tokens": 79,
-            "prompt_tokens": 52,
-            "completion_tokens": 27,
-            "provider": "openai",
-            "models": [
-                {
-                    "total_cost": 0.0004,
-                    "total_tokens": 79,
-                    "prompt_tokens": 52,
-                    "completion_tokens": 27,
-                    "model": "gpt-4o-2024-08-06"
-                }
-            ]
-        }
-    ]
-}
-```
-
-## Features
-
-- Drop-in replacement for OpenAI, Anthropic client
-- Automatic token usage tracking
-- Cost analysis for different time periods
-- SQLite storage with zero configuration
-- Thread-safe operations
-- Minimal memory footprint
-- Minimal latency footprint
-
-Most importantly, none of your data is ever sent to any server.
-
-## License
-
-MIT