DSPy: The framework for programming—not prompting—language models
Python
Merge branch 'main' into openai_logging
Omar Khattabdf5aac73ad68
diff --cc dsp/modules/gpt3.pyindex ade241793,7c677ad71..49daf6f87--- a/dsp/modules/gpt3.py+++ b/dsp/modules/gpt3.py@@@ -14,11 -2,8 +14,9 @@@ import functoolimport jsonfrom typing import Any, Literal, Optional, cast+import dspimport backoffimport openai- import openai.error- from openai.openai_object import OpenAIObjectfrom dsp.modules.cache_utils import CacheMemory, NotebookCacheMemory, cache_turn_onfrom dsp.modules.lm import LM@@@ -88,17 -95,10 +108,17 @@@ class GPT3(LM)self.kwargs["model"] = modelself.history: list[dict[str, Any]] = []- def _openai_client():+ def _openai_client(self):return openai+ def log_usage(self, response):+ """Log the total tokens from the OpenAI API response."""+ usage_data = response.get('usage')+ if usage_data:+ total_tokens = usage_data.get('total_tokens')+ logging.info(f'{total_tokens}')+- def basic_request(self, prompt: str, **kwargs) -> OpenAIObject:+ def basic_request(self, prompt: str, **kwargs):raw_kwargs = kwargskwargs = {**self.kwargs, **kwargs}@@@ -170,8 -168,7 +188,10 @@@# kwargs = {**kwargs, "logprobs": 5}response = self.request(prompt, **kwargs)++ if dsp.settings.log_openai_usage:+ self.log_usage(response)++choices = response["choices"]completed_choices = [c for c in choices if c["finish_reason"] != "length"]diff --cc dsp/utils/settings.pyindex 44dda21d6,228a960a2..3b2d3eaf0--- a/dsp/utils/settings.py+++ b/dsp/utils/settings.py@@@ -33,7 -37,9 +37,10 @@@ class Settings(object)skip_logprobs=False,trace=None,release=0,+ log_openai_usage=False,+ bypass_assert=False,+ bypass_suggest=False,+ langchain_history=[])cls._instance.__append(config)