fix some more tests

Author: dtam

guardrails/async_guard.py

@@ -408,7 +408,7 @@ async def __call__(
 
         # Determine the final value for messages
         messages = messages or messages_from_kwargs or messages_from_exec_opts or []
-        print("===== messages is", messages)
+
         if messages is not None and not len(messages):
             raise RuntimeError(
                 "You must provide a prompt if messages is empty. "

guardrails/run/async_runner.py

@@ -300,7 +300,7 @@ async def async_prepare(
         prompt_params = prompt_params or {}
         if api is None:
             raise UserFacingException(ValueError("API must be provided."))
-        print("===== runner messages are", messages)
+
         if messages:
             # Runner.prepare_messages
             messages = await self.prepare_messages(

guardrails/run/async_stream_runner.py

@@ -15,9 +15,7 @@
 from guardrails.classes.output_type import OutputTypes
 from guardrails.constants import pass_status
 from guardrails.llm_providers import (
-    AsyncLiteLLMCallable,
     AsyncPromptCallableBase,
-    LiteLLMCallable,
     PromptCallableBase,
 )
 from guardrails.logger import set_scope
@@ -202,23 +200,24 @@ async def async_step(
     def get_chunk_text(self, chunk: Any, api: Union[PromptCallableBase, None]) -> str:
         """Get the text from a chunk."""
         chunk_text = ""
-        if isinstance(api, LiteLLMCallable):
+        try:
             finished = chunk.choices[0].finish_reason
-            content = chunk.choices[0].delta.content
+            content = chunk.choices[0].text
             if not finished and content:
                 chunk_text = content
-        elif isinstance(api, AsyncLiteLLMCallable):
-            finished = chunk.choices[0].finish_reason
-            content = chunk.choices[0].delta.content
-            if not finished and content:
-                chunk_text = content
-        else:
+        except Exception as e:
             try:
-                chunk_text = chunk
+                finished = chunk.choices[0].finish_reason
+                content = chunk.choices[0].delta.content
+                if not finished and content:
+                    chunk_text = content
             except Exception as e:
-                raise ValueError(
-                    f"Error getting chunk from stream: {e}. "
-                    "Non-OpenAI API callables expected to return "
-                    "a generator of strings."
-                ) from e
+                try:
+                    chunk_text = chunk
+                except Exception as e:
+                    raise ValueError(
+                        f"Error getting chunk from stream: {e}. "
+                        "Non-OpenAI API callables expected to return "
+                        "a generator of strings."
+                    ) from e
         return chunk_text

guardrails/run/stream_runner.py

@@ -5,7 +5,6 @@
 from guardrails.classes.output_type import OT, OutputTypes
 from guardrails.classes.validation_outcome import ValidationOutcome
 from guardrails.llm_providers import (
-    LiteLLMCallable,
     PromptCallableBase,
 )
 from guardrails.run.runner import Runner
@@ -249,20 +248,26 @@ def is_last_chunk(self, chunk: Any, api: Union[PromptCallableBase, None]) -> boo
     def get_chunk_text(self, chunk: Any, api: Union[PromptCallableBase, None]) -> str:
         """Get the text from a chunk."""
         chunk_text = ""
-        if isinstance(api, LiteLLMCallable):
+        try:
             finished = chunk.choices[0].finish_reason
-            content = chunk.choices[0].delta.content
+            content = chunk.choices[0].text
             if not finished and content:
                 chunk_text = content
-        else:
+        except Exception as e:
             try:
-                chunk_text = chunk
+                finished = chunk.choices[0].finish_reason
+                content = chunk.choices[0].delta.content
+                if not finished and content:
+                    chunk_text = content
             except Exception as e:
-                raise ValueError(
-                    f"Error getting chunk from stream: {e}. "
-                    "Non-OpenAI API callables expected to return "
-                    "a generator of strings."
-                ) from e
+                try:
+                    chunk_text = chunk
+                except Exception as e:
+                    raise ValueError(
+                        f"Error getting chunk from stream: {e}. "
+                        "Non-OpenAI API callables expected to return "
+                        "a generator of strings."
+                    ) from e
         return chunk_text
 
     def parse(