llama-index-llms-openai 0.1.28__py3-none-any.whl → 0.1.30__py3-none-any.whl

llama_index/llms/openai/base.py

@@ -604,18 +604,29 @@ class OpenAI(FunctionCallingLLM):
 
     def _get_response_token_counts(self, raw_response: Any) -> dict:
         """Get the token usage reported by the response."""
-        if not isinstance(raw_response, dict):
-            return {}
-
-        usage = raw_response.get("usage", {})
-        # NOTE: other model providers that use the OpenAI client may not report usage
-        if usage is None:
+        if hasattr(raw_response, "usage"):
+            try:
+                prompt_tokens = raw_response.usage.prompt_tokens
+                completion_tokens = raw_response.usage.completion_tokens
+                total_tokens = raw_response.usage.total_tokens
+            except AttributeError:
+                return {}
+        elif isinstance(raw_response, dict):
+            usage = raw_response.get("usage", {})
+            # NOTE: other model providers that use the OpenAI client may not report usage
+            if usage is None:
+                return {}
+            # Backwards compatibility with old dict type
+            prompt_tokens = usage.get("prompt_tokens", 0)
+            completion_tokens = usage.get("completion_tokens", 0)
+            total_tokens = usage.get("total_tokens", 0)
+        else:
             return {}
 
         return {
-            "prompt_tokens": usage.get("prompt_tokens", 0),
-            "completion_tokens": usage.get("completion_tokens", 0),
-            "total_tokens": usage.get("total_tokens", 0),
+            "prompt_tokens": prompt_tokens,
+            "completion_tokens": completion_tokens,
+            "total_tokens": total_tokens,
         }
 
     # ===== Async Endpoints =====

llama_index/llms/openai/utils.py

@@ -47,6 +47,7 @@ GPT4_MODELS: Dict[str, int] = {
     "gpt-4-turbo": 128000,
     "gpt-4o": 128000,
     "gpt-4o-2024-05-13": 128000,
+    "gpt-4o-2024-08-06": 128000,
     "gpt-4o-mini": 128000,
     "gpt-4o-mini-2024-07-18": 128000,
     # 0613 models (function calling):

{llama_index_llms_openai-0.1.28.dist-info → llama_index_llms_openai-0.1.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-llms-openai
-Version: 0.1.28
+Version: 0.1.30
 Summary: llama-index llms openai integration
 License: MIT
 Author: llama-index

llama_index_llms_openai-0.1.30.dist-info/RECORD

@@ -0,0 +1,6 @@
+llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
+llama_index/llms/openai/base.py,sha256=j-BiZ9E3pFG2RDSP8Vq75SHfZCId9XU5ymAddBF8x8I,33876
+llama_index/llms/openai/utils.py,sha256=VuDXkLR_BGVqoZc9IJqiJlVloZwG9Z7s1nGPAhlbvWE,13079
+llama_index_llms_openai-0.1.30.dist-info/METADATA,sha256=VnG5MXkR-ZUoxou8H9tUsy1uY8zGoC578GUG0Dx5Eoc,650
+llama_index_llms_openai-0.1.30.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_llms_openai-0.1.30.dist-info/RECORD,,

llama_index_llms_openai-0.1.28.dist-info/RECORD

@@ -1,6 +0,0 @@
-llama_index/llms/openai/__init__.py,sha256=vm3cIBSGkBFlE77GyfyN0EhpJcnJZN95QMhPN53EkbE,148
-llama_index/llms/openai/base.py,sha256=XX74bUlw8I20lqlMjGvlga6y565c2RUXFM5b-UQDZtQ,33338
-llama_index/llms/openai/utils.py,sha256=djxNH9V6ye93Mn9yI57pQ8ULHET2QqlVmpFsAcxJfdo,13046
-llama_index_llms_openai-0.1.28.dist-info/METADATA,sha256=ZAaKgeA6zLH50nOlJJ7U_f3fgVb40oYFxsM9QAjSNs0,650
-llama_index_llms_openai-0.1.28.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_llms_openai-0.1.28.dist-info/RECORD,,