Skip to content

armgit / dspy

Public Imported from GitHub
0

DSPy: The framework for programming—not prompting—language models

Python

Update GPT3 class to openai ^1.0

DanielUH20193c0f472cedfd
diff --git a/dsp/modules/gpt3.py b/dsp/modules/gpt3.py
index 8f378bfe2..46315d6b9 100644
--- a/dsp/modules/gpt3.py
+++ b/dsp/modules/gpt3.py
@@ -1,11 +1,9 @@
import functools
import json
-from typing import Any, Literal, Optional, cast
+from typing import Any, Literal, Optional
import backoff
import openai
-import openai.error
-from openai.openai_object import OpenAIObject
from dsp.modules.cache_utils import CacheMemory, NotebookCacheMemory, cache_turn_on
from dsp.modules.lm import LM
@@ -36,13 +34,19 @@ class GPT3(LM):
model: str = "gpt-3.5-turbo-instruct",
api_key: Optional[str] = None,
api_provider: Literal["openai", "azure"] = "openai",
+ api_base: Optional[str] = None,
model_type: Literal["chat", "text"] = None,
**kwargs,
):
super().__init__(model)
self.provider = "openai"
- default_model_type = "chat" if ('gpt-3.5' in model or 'turbo' in model or 'gpt-4' in model) and ('instruct' not in model) else "text"
+ default_model_type = (
+ "chat"
+ if ("gpt-3.5" in model or "turbo" in model or "gpt-4" in model)
+ and ("instruct" not in model)
+ else "text"
+ )
self.model_type = model_type if model_type else default_model_type
if api_provider == "azure":
@@ -58,8 +62,8 @@ class GPT3(LM):
if api_key:
openai.api_key = api_key
- if kwargs.get("api_base"):
- openai.api_base = kwargs["api_base"]
+ if api_base:
+ openai.base_url = api_base
self.kwargs = {
"temperature": 0.0,
@@ -70,29 +74,27 @@ class GPT3(LM):
"n": 1,
**kwargs,
} # TODO: add kwargs above for </s>
-
+
if api_provider != "azure":
self.kwargs["model"] = model
self.history: list[dict[str, Any]] = []
- def _openai_client():
+ def _openai_client(self):
return openai
- def basic_request(self, prompt: str, **kwargs) -> OpenAIObject:
+ def basic_request(self, prompt: str, **kwargs):
raw_kwargs = kwargs
kwargs = {**self.kwargs, **kwargs}
if self.model_type == "chat":
# caching mechanism requires hashable kwargs
kwargs["messages"] = [{"role": "user", "content": prompt}]
- kwargs = {
- "stringify_request": json.dumps(kwargs)
- }
- response = cached_gpt3_turbo_request(**kwargs)
-
+ kwargs = {"stringify_request": json.dumps(kwargs)}
+ response = cached_gpt3_turbo_request(**kwargs).model_dump()
+
else:
kwargs["prompt"] = prompt
- response = cached_gpt3_request(**kwargs)
+ response = cached_gpt3_request(**kwargs).model_dump()
history = {
"prompt": prompt,
@@ -106,15 +108,15 @@ class GPT3(LM):
@backoff.on_exception(
backoff.expo,
- (openai.error.RateLimitError, openai.error.ServiceUnavailableError, openai.error.APIError),
+ (openai.RateLimitError, openai.APIError),
max_time=1000,
on_backoff=backoff_hdlr,
)
- def request(self, prompt: str, **kwargs) -> OpenAIObject:
+ def request(self, prompt: str, **kwargs):
"""Handles retreival of GPT-3 completions whilst handling rate limiting and caching."""
if "model_type" in kwargs:
del kwargs["model_type"]
-
+
return self.basic_request(prompt, **kwargs)
def _get_choice_text(self, choice: dict[str, Any]) -> str:
@@ -150,6 +152,7 @@ class GPT3(LM):
# kwargs = {**kwargs, "logprobs": 5}
response = self.request(prompt, **kwargs)
+
choices = response["choices"]
completed_choices = [c for c in choices if c["finish_reason"] != "length"]
@@ -158,7 +161,6 @@ class GPT3(LM):
choices = completed_choices
completions = [self._get_choice_text(c) for c in choices]
-
if return_sorted and kwargs.get("n", 1) > 1:
scored_completions = []
@@ -183,7 +185,7 @@ class GPT3(LM):
@CacheMemory.cache
def cached_gpt3_request_v2(**kwargs):
- return openai.Completion.create(**kwargs)
+ return openai.completions.create(**kwargs)
@functools.lru_cache(maxsize=None if cache_turn_on else 0)
@@ -196,15 +198,16 @@ cached_gpt3_request = cached_gpt3_request_v2_wrapped
@CacheMemory.cache
-def _cached_gpt3_turbo_request_v2(**kwargs) -> OpenAIObject:
+def _cached_gpt3_turbo_request_v2(**kwargs):
if "stringify_request" in kwargs:
kwargs = json.loads(kwargs["stringify_request"])
- return cast(OpenAIObject, openai.ChatCompletion.create(**kwargs))
+
+ return openai.chat.completions.create(**kwargs)
@functools.lru_cache(maxsize=None if cache_turn_on else 0)
@NotebookCacheMemory.cache
-def _cached_gpt3_turbo_request_v2_wrapped(**kwargs) -> OpenAIObject:
+def _cached_gpt3_turbo_request_v2_wrapped(**kwargs):
return _cached_gpt3_turbo_request_v2(**kwargs)