alihan/OpenPipe-llm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python compat fixes

Browse Source
This commit is contained in:
Kyle Corbitt
2023-08-23 17:14:19 -07:00
parent f59150ff5b
commit 50a79b6e3a
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client-libs/python/openpipe/openai.py
View File

@@ -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:

9
client-libs/python/openpipe/openpipe_meta.py
View File

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

14
client-libs/python/openpipe/test_client.py
View File

@@ -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"