DSPy: The framework for programming—not prompting—language models
Python
Merge remote-tracking branch 'upstream/main'
nbqua44eb50ff2dd
diff --cc dsp/modules/google.pyindex 78c4ff0f8,9b4516e9c..a422c637f--- a/dsp/modules/google.py+++ b/dsp/modules/google.py@@@ -6,13 -6,11 +6,14 @@@ from dsp.modules.lm import Ltry:import google.generativeai as genai+ from google.api_core.exceptions import GoogleAPICallError+ google_api_error = GoogleAPICallErrorexcept ImportError:google_api_error = Exception- print("Not loading Google because it is not installed.")+ # print("Not loading Google because it is not installed.")++def backoff_hdlr(details):"""Handler from https://pypi.org/project/backoff/"""print(@@@ -74,32 -49,16 +75,32 @@@ class Google(LM)Additional arguments to pass to the API provider."""super().__init__(model)- self.google = genai.configure(api_key=api_key)+ api_key = os.environ.get("GOOGLE_API_KEY") if api_key is None else api_key+ genai.configure(api_key=api_key)++ # Google API uses "candidate_count" instead of "n" or "num_generations"+ # For now, google API only supports 1 generation at a time. Raises an error if candidate_count > 1+ num_generations = kwargs.pop("n", kwargs.pop("num_generations", 1))+ if num_generations > 1 and kwargs['temperature'] == 0.0:+ kwargs['temperature'] = 0.7+self.provider = "google"- self.kwargs = {- "model_name": model,- "temperature": 0.0- if "temperature" not in kwargs- else kwargs["temperature"],+ kwargs = {+ "candidate_count": 1,+ "temperature": 0.0 if "temperature" not in kwargs else kwargs["temperature"],"max_output_tokens": 2048,"top_p": 1,- "top_k": 40,+ "top_k": 1,+ **kwargs+ }++ self.config = genai.GenerationConfig(**kwargs)+ self.llm = genai.GenerativeModel(model_name=model,+ generation_config=self.config,+ safety_settings=safety_settings)++ self.kwargs = {+ "n": num_generations,**kwargs,}@@@ -131,9 -85,8 +132,9 @@@@backoff.on_exception(backoff.expo,- (google_api_error),+ (Exception),max_time=1000,+ max_tries=5,on_backoff=backoff_hdlr,giveup=giveup_hdlr,)@@@ -146,54 -99,6 +147,54 @@@prompt: str,only_completed: bool = True,return_sorted: bool = False,- **kwargs+ **kwargs,):- return self.request(prompt, **kwargs)+ assert only_completed, "for now"+ assert return_sorted is False, "for now"++ n = kwargs.pop("n", 1)++ completions = []+ for i in range(n):+ response = self.request(prompt, **kwargs)+ completions.append(response.parts[0].text)++ return completions++ def inspect_history(self, n: int = 1, skip: int = 0):+ """Prints the last n prompts and their completions.+ TODO: print the valid choice that contains filled output field instead of the first+ """++ last_prompt = None+ printed = []+ n = n + skip++ for x in reversed(self.history[-100:]):+ prompt = x["prompt"]++ if prompt != last_prompt:+ printed.append(+ (+ prompt,+ x['response']+ )+ )++ last_prompt = prompt++ if len(printed) >= n:+ break++ for idx, (prompt, response) in enumerate(reversed(printed)):+ # skip the first `skip` prompts+ if (n - idx - 1) < skip:+ continue++ print("\n\n\n")+ print(prompt, end="")+ text = response.parts[0].text+ self.print_green(text, end="")+ print("\n\n\n")++