Merge branch 'main' into support-other-models-and-all-fields-pgvector

Author: Joshmantova

dsp/modules/hf_client.py

@@ -116,7 +116,16 @@ def send_hftgi_request_v00(arg, **kwargs):
 class HFClientVLLM(HFModel):
     def __init__(self, model, port, url="http://localhost", **kwargs):
         super().__init__(model=model, is_client=True)
-        self.url = f"{url}:{port}"
+
+        if isinstance(url, list):
+            self.urls = url
+        
+        elif isinstance(url, str):
+            self.urls = [f'{url}:{port}']
+        
+        else:
+            raise ValueError(f"The url provided to `HFClientVLLM` is neither a string nor a list of strings. It is of type {type(url)}.")
+        
         self.headers = {"Content-Type": "application/json"}
 
     def _generate(self, prompt, **kwargs):
@@ -128,9 +137,13 @@ def _generate(self, prompt, **kwargs):
             "max_tokens": kwargs["max_tokens"],
             "temperature": kwargs["temperature"],
         }
+        
+        # Round robin the urls.
+        url = self.urls.pop(0)
+        self.urls.append(url)
 
         response = send_hfvllm_request_v00(
-            f"{self.url}/v1/completions",
+            f"{url}/v1/completions",
             json=payload,
             headers=self.headers,
         )

dsp/modules/lm.py

@@ -33,7 +33,8 @@ def print_red(self, text: str, end: str = "\n"):
 
     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
+
+        TODO: print the valid choice that contains filled output field instead of the first.
         """
         provider: str = self.provider
 
@@ -45,23 +46,15 @@ def inspect_history(self, n: int = 1, skip: int = 0):
             prompt = x["prompt"]
 
             if prompt != last_prompt:
-
-                if provider == "clarifai" or provider == "google" or provider == "claude":
-                    printed.append(
-                        (
-                            prompt,
-                            x['response'],
-                        ),
-                    )
+                if provider == "clarifai" or provider == "google":
+                    printed.append((prompt, x["response"]))
+                elif provider == "anthropic":
+                    blocks = [{"text": block.text} for block in x["response"].content if block.type == "text"]
+                    printed.append((prompt, blocks))
+                elif provider == "cohere":
+                    printed.append((prompt, x["response"].generations))
                 else:
-                    printed.append(
-                        (
-                            prompt,
-                            x["response"].generations
-                            if provider == "cohere"
-                            else x["response"]["choices"],
-                        ),
-                    )
+                    printed.append((prompt, x["response"]["choices"]))
 
             last_prompt = prompt
 
@@ -79,9 +72,9 @@ def inspect_history(self, n: int = 1, skip: int = 0):
             if provider == "cohere":
                 text = choices[0].text
             elif provider == "openai" or provider == "ollama":
-                text = ' ' + self._get_choice_text(choices[0]).strip()
-            elif provider == "clarifai" or provider == "claude" :
-                text=choices
+                text = " " + self._get_choice_text(choices[0]).strip()
+            elif provider == "clarifai":
+                text = choices
             elif provider == "google":
                 text = choices[0].parts[0].text
             else:
@@ -99,6 +92,6 @@ def __call__(self, prompt, only_completed=True, return_sorted=False, **kwargs):
     def copy(self, **kwargs):
         """Returns a copy of the language model with the same parameters."""
         kwargs = {**self.kwargs, **kwargs}
-        model = kwargs.pop('model')
+        model = kwargs.pop("model")
 
         return self.__class__(model=model, **kwargs)