python compat fixes

client-libs/python/openpipe/openai.py

@@ -4,7 +4,7 @@ import time
 import inspect
 
 from openpipe.merge_openai_chunks import merge_openai_chunks
-from openpipe.openpipe_meta import OpenPipeMeta
+from openpipe.openpipe_meta import openpipe_meta
 
 from .shared import (
     _should_check_cache,
@@ -41,9 +41,11 @@ class WrappedChatCompletion(original_openai.ChatCompletion):
                         )
 
                         cache_status = (
-                            "MISS" if _should_check_cache(openpipe_options) else "SKIP"
+                            "MISS"
+                            if _should_check_cache(openpipe_options, kwargs)
+                            else "SKIP"
                         )
-                        chunk.openpipe = OpenPipeMeta(cache_status=cache_status)
+                        chunk.openpipe = openpipe_meta(cache_status=cache_status)
 
                         yield chunk
 
@@ -72,9 +74,9 @@ class WrappedChatCompletion(original_openai.ChatCompletion):
                 )
 
                 cache_status = (
-                    "MISS" if _should_check_cache(openpipe_options) else "SKIP"
+                    "MISS" if _should_check_cache(openpipe_options, kwargs) else "SKIP"
                 )
-                chat_completion["openpipe"] = OpenPipeMeta(cache_status=cache_status)
+                chat_completion["openpipe"] = openpipe_meta(cache_status=cache_status)
             return chat_completion
         except Exception as e:
             received_at = int(time.time() * 1000)
@@ -126,9 +128,11 @@ class WrappedChatCompletion(original_openai.ChatCompletion):
                             assembled_completion, chunk
                         )
                         cache_status = (
-                            "MISS" if _should_check_cache(openpipe_options) else "SKIP"
+                            "MISS"
+                            if _should_check_cache(openpipe_options, kwargs)
+                            else "SKIP"
                         )
-                        chunk.openpipe = OpenPipeMeta(cache_status=cache_status)
+                        chunk.openpipe = openpipe_meta(cache_status=cache_status)
 
                         yield chunk
 
@@ -157,9 +161,9 @@ class WrappedChatCompletion(original_openai.ChatCompletion):
                 )
 
                 cache_status = (
-                    "MISS" if _should_check_cache(openpipe_options) else "SKIP"
+                    "MISS" if _should_check_cache(openpipe_options, kwargs) else "SKIP"
                 )
-                chat_completion["openpipe"] = OpenPipeMeta(cache_status=cache_status)
+                chat_completion["openpipe"] = openpipe_meta(cache_status=cache_status)
 
             return chat_completion
         except Exception as e:

client-libs/python/openpipe/openpipe_meta.py

@@ -1,7 +1,2 @@
-from attr import dataclass
+def openpipe_meta(cache_status: str):
-
+    return {"cache_status": cache_status}
-
-@dataclass
-class OpenPipeMeta:
-    # Cache status. One of 'HIT', 'MISS', 'SKIP'
-    cache_status: str

client-libs/python/openpipe/test_client.py

@@ -27,12 +27,14 @@ def last_logged_call():
     return local_testing_only_get_latest_logged_call.sync(client=configured_client)
 
 
+@pytest.mark.focus
 def test_sync():
     completion = openai.ChatCompletion.create(
         model="gpt-3.5-turbo",
         messages=[{"role": "system", "content": "count to 3"}],
     )
 
+    print("completion is", completion)
     last_logged = last_logged_call()
     assert (
         last_logged.model_response.resp_payload["choices"][0]["message"]["content"]
@@ -42,7 +44,7 @@ def test_sync():
         last_logged.model_response.req_payload["messages"][0]["content"] == "count to 3"
     )
 
-    assert completion.openpipe.cache_status == "SKIP"
+    assert completion.openpipe["cache_status"] == "SKIP"
 
 
 def test_streaming():
@@ -75,7 +77,7 @@ async def test_async():
         == "count down from 5"
     )
 
-    assert completion.openpipe.cache_status == "SKIP"
+    assert completion.openpipe["cache_status"] == "SKIP"
 
 
 async def test_async_streaming():
@@ -87,7 +89,7 @@ async def test_async_streaming():
 
     merged = None
     async for chunk in completion:
-        assert chunk.openpipe.cache_status == "SKIP"
+        assert chunk.openpipe["cache_status"] == "SKIP"
         merged = merge_openai_chunks(merged, chunk)
 
     last_logged = last_logged_call()
@@ -100,7 +102,7 @@ async def test_async_streaming():
         last_logged.model_response.req_payload["messages"][0]["content"]
         == "count down from 5"
     )
-    assert merged["openpipe"].cache_status == "SKIP"
+    assert merged["openpipe"]["cache_status"] == "SKIP"
 
 
 def test_sync_with_tags():
@@ -146,7 +148,7 @@ async def test_caching():
         messages=messages,
         openpipe={"cache": True},
     )
-    assert completion.openpipe.cache_status == "MISS"
+    assert completion.openpipe["cache_status"] == "MISS"
 
     first_logged = last_logged_call()
     assert (
@@ -159,4 +161,4 @@ async def test_caching():
         messages=messages,
         openpipe={"cache": True},
     )
-    assert completion2.openpipe.cache_status == "HIT"
+    assert completion2.openpipe["cache_status"] == "HIT"

client-libs/python/pyproject.toml

@@ -1,8 +1,8 @@
 [tool.poetry]
 name = "openpipe"
-version = "0.1.0"
+version = "3.0.0"
 description = ""
-authors = ["Kyle Corbitt <kyle@corbt.com>"]
+authors = ["Kyle Corbitt <kyle@openpipe.ai>"]
 license = "Apache-2.0"
 
 [tool.poetry.dependencies]