Add kwargs instead of single arg to propagate

Author: thekaranacharya

guardrails/run.py

@@ -421,23 +421,13 @@ def validate(
         index: int,
         parsed_output: Any,
         output_schema: Schema,
-        validate_subschema: bool = False,
+        **kwargs,
     ):
         """Validate the output."""
         with start_action(action_type="validate", index=index) as action:
-            if isinstance(output_schema, JsonSchema):
-                validated_output = output_schema.validate(
-                    iteration,
-                    parsed_output,
-                    self.metadata,
-                    validate_subschema=validate_subschema,
-                )
-            else:
-                validated_output = output_schema.validate(
-                    iteration,
-                    parsed_output,
-                    self.metadata,
-                )
+            validated_output = output_schema.validate(
+                iteration, parsed_output, self.metadata, **kwargs
+            )
 
             action.log(
                 message_type="info",
@@ -985,13 +975,19 @@ def get_chunk_text(self, chunk: Any, api: Union[PromptCallableBase, None]) -> st
             if finished:
                 chunk_text = ""
             else:
-                chunk_text = chunk["choices"][0]["text"]
+                if "text" not in chunk["choices"][0]:
+                    chunk_text = ""
+                else:
+                    chunk_text = chunk["choices"][0]["text"]
         elif isinstance(api, OpenAIChatCallable):
             finished = chunk["choices"][0]["finish_reason"]
             if finished:
                 chunk_text = ""
             else:
-                chunk_text = chunk["choices"][0]["delta"]["content"]
+                if "content" not in chunk["choices"][0]["delta"]:
+                    chunk_text = ""
+                else:
+                    chunk_text = chunk["choices"][0]["delta"]["content"]
         else:
             try:
                 chunk_text = chunk

guardrails/schema.py

@@ -110,7 +110,9 @@ def reask_instructions_template(self, value: Optional[str]) -> None:
         else:
             self._reask_instructions_template = None
 
-    def validate(self, iteration: Iteration, data: Any, metadata: Dict) -> Any:
+    def validate(
+        self, iteration: Iteration, data: Any, metadata: Dict, **kwargs
+    ) -> Any:
         """Validate a dictionary of data against the schema.
 
         Args:
@@ -461,7 +463,7 @@ def validate(
         iteration: Iteration,
         data: Optional[Dict[str, Any]],
         metadata: Dict,
-        validate_subschema: bool = False,
+        **kwargs,
     ) -> Any:
         """Validate a dictionary of data against the schema.
 
@@ -484,7 +486,7 @@ def validate(
             validated_response,
             prune_extra_keys=True,
             coerce_types=True,
-            validate_subschema=validate_subschema,
+            validate_subschema=kwargs.get("validate_subschema", False),
         ):
             return SkeletonReAsk(
                 incorrect_value=validated_response,
@@ -721,6 +723,7 @@ def validate(
         iteration: Iteration,
         data: Any,
         metadata: Dict,
+        **kwargs,
     ) -> Any:
         """Validate a dictionary of data against the schema.