Merge remote-tracking branch 'origin/main' into feature/litellm_cleanup

Author: dtam

guardrails/cli/configure.py

@@ -43,6 +43,8 @@ def save_configuration_file(
         rc_file.writelines(lines)
         rc_file.close()
 
+    settings._initialize()
+
 
 def _get_default_token() -> str:
     """Get the default token from the configuration file."""
@@ -106,6 +108,7 @@ def configure(
 
     try:
         save_configuration_file(token, enable_metrics, remote_inferencing)
+        # update setting singleton
         logger.info("Configuration saved.")
     except Exception as e:
         logger.error("An unexpected error occured saving configuration!")

guardrails/cli/create.py

@@ -118,7 +118,7 @@ def generate_template_config(
     guard_instantiations = []
 
     for i, guard in enumerate(template["guards"]):
-        guard_instantiations.append(f"guard{i} = AsyncGuard.from_dict(guards[{i}])")
+        guard_instantiations.append(f"guard{i} = Guard.from_dict(guards[{i}])")
     guard_instantiations = "\n".join(guard_instantiations)
     # Interpolate variables
     output_content = template_content.format(

guardrails/cli/hub/template_config.py.template

@@ -1,6 +1,6 @@
 import json
 import os
-from guardrails import AsyncGuard, Guard
+from guardrails import Guard
 from guardrails.hub import {VALIDATOR_IMPORTS}
 
 try:

guardrails/integrations/databricks/ml_flow_instrumentor.py

@@ -54,8 +54,7 @@ def __init__(self, experiment_name: str):
         settings.disable_tracing = True
 
     def instrument(self):
-        if not mlflow.tracing.provider._is_enabled():
-            mlflow.tracing.enable()
+        mlflow.tracing.enable()
         mlflow.set_experiment(self.experiment_name)
 
         wrapped_guard_execute = self._instrument_guard(Guard._execute)

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "guardrails-ai"
-version = "0.5.14"
+version = "0.5.15"
 description = "Adding guardrails to large language models."
 authors = ["Guardrails AI <[email protected]>"]
 license = "Apache License 2.0"
@@ -56,10 +56,10 @@ opentelemetry-sdk = "^1.24.0"
 opentelemetry-exporter-otlp-proto-grpc = "^1.24.0"
 opentelemetry-exporter-otlp-proto-http = "^1.24.0"
 guardrails-hub-types = "^0.0.4"
-guardrails-api-client = ">=0.3.13"
+guardrails-api-client = "^0.3.13"
 diff-match-patch = "^20230430"
-guardrails-api = ">=0.0.1"
-mlflow = {version = ">=2.0.1", optional = true}
+guardrails-api = "^0.0.3"
+mlflow = {version = "^2.0.1", optional = true}
 uvloop = {version = "^0.20.0", optional = true}
 semver = "^3.0.2"
 

pyproject.toml

@@ -1,6 +1,6 @@
 import json
 import os
-from guardrails import AsyncGuard
+from guardrails import Guard
 
 try:
     file_path = os.path.join(os.getcwd(), "guard-template.json")
@@ -11,4 +11,4 @@
     SystemExit(1)
 
 # instantiate guards
-guard0 = AsyncGuard.from_dict(guards[0])
+guard0 = Guard.from_dict(guards[0])

server_ci/config.py

@@ -69,6 +69,9 @@ def test_save_configuration_file(mocker):
     expanduser_mock = mocker.patch("guardrails.cli.configure.expanduser")
     expanduser_mock.return_value = "/Home"
 
+    rcexpanduser_mock = mocker.patch("guardrails.classes.rc.expanduser")
+    rcexpanduser_mock.return_value = "/Home"
+
     import os
 
     join_spy = mocker.spy(os.path, "join")
@@ -88,7 +91,9 @@ def test_save_configuration_file(mocker):
     save_configuration_file("token", True)
 
     assert expanduser_mock.called is True
-    join_spy.assert_called_once_with("/Home", ".guardrailsrc")
+    assert rcexpanduser_mock.called is True
+    join_spy.assert_called_with("/Home", ".guardrailsrc")
+    assert join_spy.call_count == 2
 
     assert mock_open.call_count == 1
     writelines_spy.assert_called_once_with(

tests/unit_tests/cli/test_configure.py

@@ -37,10 +37,6 @@ def test__init__(self):
         assert settings.disable_tracing is True
 
     def test_instrument(self, mocker):
-        mock_is_enabled = mocker.patch(
-            "guardrails.integrations.databricks.ml_flow_instrumentor.mlflow.tracing.provider._is_enabled",
-            return_value=False,
-        )
         mock_enable = mocker.patch(
             "guardrails.integrations.databricks.ml_flow_instrumentor.mlflow.tracing.enable"
         )
@@ -115,7 +111,6 @@ def test_instrument(self, mocker):
 
         m.instrument()
 
-        mock_is_enabled.assert_called_once()
         mock_enable.assert_called_once()
         mock_set_experiment.assert_called_once_with("mock experiment")