runner, validator, and cli updates

Author: CalebCourier

guardrails/cli/configure.py

@@ -78,7 +78,8 @@ def configure(
         help="Clear the existing token from the configuration file.",
     ),
 ):
-    trace_if_enabled("configure")
+    if settings.rc.exists():
+        trace_if_enabled("configure")
     existing_token = _get_default_token()
     last4 = existing_token[-4:] if existing_token else ""
 

guardrails/cli/create.py

@@ -10,11 +10,12 @@
 
 from guardrails.cli.guardrails import guardrails as gr_cli
 from guardrails.cli.hub.template import get_template
-from guardrails.cli.telemetry import trace_if_enabled
+from guardrails.telemetry.hub_tracing import trace
 
 console = Console()
 
 
+@trace(name="guardrails-cli/create", is_parent=True)
 @gr_cli.command(name="create")
 def create_command(
     validators: Optional[str] = typer.Option(
@@ -46,7 +47,6 @@ def create_command(
         help="Print out the validators to be installed without making any changes.",
     ),
 ):
-    trace_if_enabled("create")
     # fix pyright typing issue
     validators = cast(str, validators)
     filepath = check_filename(filepath)

guardrails/cli/hub/create_validator.py

@@ -8,7 +8,7 @@
 
 from guardrails.cli.hub.hub import hub_command
 from guardrails.cli.logger import LEVELS, logger
-from guardrails.cli.telemetry import trace_if_enabled
+from guardrails.telemetry.hub_tracing import trace
 
 validator_template = Template(
     """
@@ -147,6 +147,7 @@ def test_failure_case(self):
 )
 
 
+@trace(name="guardrails-cli/hub/create-validator", is_parent=True)
 @hub_command.command(name="create-validator")
 def create_validator(
     name: str = typer.Argument(help="The name for your validator."),
@@ -170,7 +171,6 @@ def create_validator(
     The template repository can be found here:\
         https://github.com/guardrails-ai/validator-template
     """
-    trace_if_enabled("hub/create-validator")
     logger.log(level=LEVELS.get("NOTICE") or 0, msg=disclaimer)
 
     package_name = snake_case(name)

guardrails/cli/hub/install.py

@@ -5,9 +5,10 @@
 
 from guardrails.cli.hub.hub import hub_command
 from guardrails.cli.logger import logger
-from guardrails.cli.telemetry import trace_if_enabled
+from guardrails.telemetry.hub_tracing import trace
 
 
+@trace(name="guardrails-cli/hub/install", is_parent=True)
 @hub_command.command()
 def install(
     package_uris: List[str] = typer.Argument(
@@ -30,7 +31,6 @@ def install(
     ),
 ):
     try:
-        trace_if_enabled("hub/install")
         from guardrails.hub.install import install_multiple
 
         def confirm():

guardrails/cli/hub/list.py

@@ -3,14 +3,14 @@
 
 from guardrails.cli.hub.hub import hub_command
 from guardrails.cli.hub.utils import get_site_packages_location
-from guardrails.cli.telemetry import trace_if_enabled
+from guardrails.telemetry.hub_tracing import trace
 from .console import console
 
 
+@trace(name="guardrails-cli/hub/list", is_parent=True)
 @hub_command.command(name="list")
 def list():
     """List all installed validators."""
-    trace_if_enabled("hub/list")
     site_packages = get_site_packages_location()
     hub_init_file = os.path.join(site_packages, "guardrails", "hub", "__init__.py")
 

guardrails/cli/hub/submit.py

@@ -8,9 +8,10 @@
 from guardrails.cli.hub.hub import hub_command
 from guardrails.cli.logger import LEVELS, logger
 from guardrails.cli.server.hub_client import HttpError, post_validator_submit
-from guardrails.cli.telemetry import trace_if_enabled
+from guardrails.telemetry.hub_tracing import trace
 
 
+@trace(name="guardrails-cli/hub/submit", is_parent=True)
 @hub_command.command(name="submit")
 def submit(
     package_name: str = typer.Argument(help="The package name for your validator."),
@@ -21,7 +22,6 @@ def submit(
     """Submit a validator to the Guardrails AI team for review and
     publishing."""
     try:
-        trace_if_enabled("hub/submit")
         if not filepath or filepath == "./{package_name}.py":
             filepath = f"./{package_name}.py"
 

guardrails/cli/hub/uninstall.py

@@ -13,7 +13,7 @@
 from guardrails.cli.hub.utils import get_site_packages_location
 from guardrails.cli.hub.utils import get_org_and_package_dirs
 from guardrails.cli.hub.utils import get_hub_directory
-from guardrails.cli.telemetry import trace_if_enabled
+from guardrails.telemetry.hub_tracing import trace
 
 from .console import console
 
@@ -74,14 +74,14 @@ def uninstall_hub_module(manifest: Manifest, site_packages: str):
         sys.exit(1)
 
 
+@trace(name="guardrails-cli/hub/uninstall", is_parent=True)
 @hub_command.command()
 def uninstall(
     package_uri: str = typer.Argument(
         help="URI to the package to uninstall. Example: hub://guardrails/regex_match."
     ),
 ):
     """Uninstall a validator from the Hub."""
-    trace_if_enabled("hub/uninstall")
     if not package_uri.startswith("hub://"):
         logger.error("Invalid URI!")
         sys.exit(1)

guardrails/cli/validate.py

@@ -5,7 +5,7 @@
 
 from guardrails import Guard
 from guardrails.cli.guardrails import guardrails
-from guardrails.cli.telemetry import trace_if_enabled
+from guardrails.telemetry.hub_tracing import trace
 
 
 def validate_llm_output(rail: str, llm_output: str) -> Union[str, Dict, List, None]:
@@ -15,6 +15,7 @@ def validate_llm_output(rail: str, llm_output: str) -> Union[str, Dict, List, No
     return result.validated_output
 
 
+@trace(name="guardrails-cli/validate", is_parent=True)
 @guardrails.command()
 def validate(
     rail: str = typer.Argument(
@@ -29,7 +30,6 @@ def validate(
     ),
 ):
     """Validate the output of an LLM against a `rail` spec."""
-    trace_if_enabled("validate")
     result = validate_llm_output(rail, llm_output)
     # Result is a dictionary, log it to a file
     print(result)