not-again-ai 0.8.0__tar.gz → 0.8.1__tar.gz

{not_again_ai-0.8.0 → not_again_ai-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not-again-ai
-Version: 0.8.0
+Version: 0.8.1
 Summary: Designed to once and for all collect all the little things that come up over and over again in AI projects and put them in one place.
 Home-page: https://github.com/DaveCoDev/not-again-ai
 License: MIT
@@ -21,14 +21,14 @@ Provides-Extra: llm
 Provides-Extra: statistics
 Provides-Extra: viz
 Requires-Dist: numpy (>=1.26.4,<2.0.0) ; extra == "statistics" or extra == "viz"
-Requires-Dist: ollama (>=0.1.9,<0.2.0) ; extra == "llm"
-Requires-Dist: openai (>=1.25.1,<2.0.0) ; extra == "llm"
+Requires-Dist: ollama (>=0.2.0,<0.3.0) ; extra == "llm"
+Requires-Dist: openai (>=1.29.0,<2.0.0) ; extra == "llm"
 Requires-Dist: pandas (>=2.2.2,<3.0.0) ; extra == "viz"
 Requires-Dist: python-liquid (>=1.12.1,<2.0.0) ; extra == "llm"
 Requires-Dist: scikit-learn (>=1.4.2,<2.0.0) ; extra == "statistics"
 Requires-Dist: scipy (>=1.13.0,<2.0.0) ; extra == "statistics"
 Requires-Dist: seaborn (>=0.13.2,<0.14.0) ; extra == "viz"
-Requires-Dist: tiktoken (>=0.6.0,<0.7.0) ; extra == "llm"
+Requires-Dist: tiktoken (>=0.7.0,<0.8.0) ; extra == "llm"
 Project-URL: Documentation, https://github.com/DaveCoDev/not-again-ai
 Project-URL: Repository, https://github.com/DaveCoDev/not-again-ai
 Description-Content-Type: text/markdown

{not_again_ai-0.8.0 → not_again_ai-0.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "not-again-ai"
-version = "0.8.0"
+version = "0.8.1"
 description = "Designed to once and for all collect all the little things that come up over and over again in AI projects and put them in one place."
 authors = ["DaveCoDev <dave.co.dev@gmail.com>"]
 license = "MIT"
@@ -28,14 +28,14 @@ python = "^3.11, <3.13"
 
 # Optional dependencies are defined here, and groupings are defined below.
 numpy = { version = "^1.26.4", optional = true }
-ollama = { version = "^0.1.9", optional = true }
-openai = { version = "^1.25.1", optional = true }
+ollama = { version = "^0.2.0", optional = true }
+openai = { version = "^1.29.0", optional = true }
 pandas = { version = "^2.2.2", optional = true }
 python-liquid = { version = "^1.12.1", optional = true }
 scipy = { version = "^1.13.0", optional = true }
 scikit-learn = { version = "^1.4.2", optional = true }
 seaborn = { version = "^0.13.2", optional = true }
-tiktoken = { version = "^0.6.0", optional = true }
+tiktoken = { version = "^0.7.0", optional = true }
 
 [tool.poetry.extras]
 llm = ["ollama", "openai", "python-liquid", "tiktoken"]

{not_again_ai-0.8.0 → not_again_ai-0.8.1}/src/not_again_ai/llm/openai_api/tokens.py

@@ -82,6 +82,8 @@ def num_tokens_from_messages(messages: list[dict[str, str]], model: str = "gpt-3
         "gpt-4-0125-preview",
         "gpt-4-turbo",
         "gpt-4-turbo-2024-04-09",
+        "gpt-4o",
+        "gpt-4o-2024-05-13",
     }:
         tokens_per_message = 3  # every message follows <|start|>{role/name}\n{content}<|end|>\n
         tokens_per_name = 1  # if there's a name, the role is omitted
@@ -91,6 +93,8 @@ def num_tokens_from_messages(messages: list[dict[str, str]], model: str = "gpt-3
     # Approximate catch-all. Assumes future versions of 3.5 and 4 will have the same token counts as the 0613 versions.
     elif "gpt-3.5-turbo" in model:
         return num_tokens_from_messages(messages, model="gpt-3.5-turbo-0613")
+    elif "gpt-4o" in model:
+        return num_tokens_from_messages(messages, model="gpt-4o-2024-05-13")
     elif "gpt-4" in model:
         return num_tokens_from_messages(messages, model="gpt-4-0613")
     else: