more updates for perf

Author: dtam

guardrails/async_guard.py

@@ -574,13 +574,13 @@ async def _stream_server_call(
                         validated_output=validated_output,
                         validation_passed=(validation_output.validation_passed is True),
                     )
-            if validation_output:
-                guard_history = self._api_client.get_history(
-                    self.name, validation_output.call_id
-                )
-                self.history.extend(
-                    [Call.from_interface(call) for call in guard_history]
-                )
+            # if validation_output:
+            #     guard_history = self._api_client.get_history(
+            #         self.name, validation_output.call_id
+            #     )
+            #     self.history.extend(
+            #         [Call.from_interface(call) for call in guard_history]
+            #     )
         else:
             raise ValueError("AsyncGuard does not have an api client!")
 

guardrails/run/async_stream_runner.py

@@ -148,6 +148,7 @@ async def async_step(
                 _ = self.is_last_chunk(chunk, api)
 
                 fragment += chunk_text
+
                 results = await validator_service.async_partial_validate(
                     chunk_text,
                     self.metadata,
@@ -157,7 +158,8 @@ async def async_step(
                     "$",
                     True,
                 )
-                validators = self.validation_map["$"] or []
+                validators = self.validation_map.get("$", [])
+
                 # collect the result validated_chunk into validation progress
                 # per validator
                 for result in results:
@@ -210,7 +212,7 @@ async def async_step(
                         validation_progress[validator_log.validator_name] += chunk
                 # if there is an entry for every validator
                 # run a merge and emit a validation outcome
-                if len(validation_progress) == len(validators):
+                if len(validation_progress) == len(validators) or len(validators) == 0:
                     if refrain_triggered:
                         current = ""
                     else:

guardrails/telemetry/guard_tracing.py

@@ -145,17 +145,17 @@ def trace_stream_guard(
             res = next(result)  # type: ignore
             # FIXME: This should only be called once;
             # Accumulate the validated output and call at the end
-            if not guard_span.is_recording():
-                # Assuming you have a tracer instance
-                tracer = get_tracer(__name__)
-                # Create a new span and link it to the previous span
-                with tracer.start_as_current_span(
-                    "new_guard_span",  # type: ignore
-                    links=[Link(guard_span.get_span_context())],
-                ) as new_span:
-                    guard_span = new_span
-                    add_guard_attributes(guard_span, history, res)
-                    add_user_attributes(guard_span)
+            # if not guard_span.is_recording():
+            #     # Assuming you have a tracer instance
+            #     tracer = get_tracer(__name__)
+            #     # Create a new span and link it to the previous span
+            #     with tracer.start_as_current_span(
+            #         "new_guard_span",  # type: ignore
+            #         links=[Link(guard_span.get_span_context())],
+            #     ) as new_span:
+            #         guard_span = new_span
+            #         add_guard_attributes(guard_span, history, res)
+            #         add_user_attributes(guard_span)
             yield res
         except StopIteration:
             next_exists = False
@@ -209,18 +209,18 @@ async def trace_async_stream_guard(
     while next_exists:
         try:
             res = await anext(result)  # type: ignore
-            if not guard_span.is_recording():
+            # if not guard_span.is_recording():
                 # Assuming you have a tracer instance
-                tracer = get_tracer(__name__)
-                # Create a new span and link it to the previous span
-                with tracer.start_as_current_span(
-                    "new_guard_span",  # type: ignore
-                    links=[Link(guard_span.get_span_context())],
-                ) as new_span:
-                    guard_span = new_span
-
-                    add_guard_attributes(guard_span, history, res)
-                    add_user_attributes(guard_span)
+                # tracer = get_tracer(__name__)
+                # # Create a new span and link it to the previous span
+                # with tracer.start_as_current_span(
+                #     "new_guard_span",  # type: ignore
+                #     links=[Link(guard_span.get_span_context())],
+                # ) as new_span:
+                #     guard_span = new_span
+
+                #     add_guard_attributes(guard_span, history, res)
+                #     add_user_attributes(guard_span)
             yield res
         except StopIteration:
             next_exists = False

guardrails/validator_service/validator_service_base.py

@@ -169,6 +169,8 @@ def run_validator(
 
     # requires at least 2 validators
     def multi_merge(self, original: str, new_values: list[str]) -> Optional[str]:
+        if len(new_values) == 0:
+            return original
         current = new_values.pop()
         while len(new_values) > 0:
             nextval = new_values.pop()