move hub telemetry to avoid circular dependency in cli

CalebCourier · CalebCourier · commit ec6a56450640 · 2024-09-19T09:43:25.000-05:00
diff --git a/guardrails/async_guard.py b/guardrails/async_guard.py
@@ -37,7 +37,7 @@
     set_tracer,
     set_tracer_context,
 )
-from guardrails.telemetry.hub_tracing import async_trace
+from guardrails.hub_telemetry.hub_tracing import async_trace
 from guardrails.types.pydantic import ModelOrListOfModels
 from guardrails.types.validator import UseManyValidatorSpec, UseValidatorSpec
 from guardrails.telemetry import trace_async_guard_execution, wrap_with_otel_context
diff --git a/guardrails/cli/create.py b/guardrails/cli/create.py
@@ -10,7 +10,7 @@
 
 from guardrails.cli.guardrails import guardrails as gr_cli
 from guardrails.cli.hub.template import get_template
-from guardrails.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 
 console = Console()
 
diff --git a/guardrails/cli/hub/create_validator.py b/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.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 
 validator_template = Template(
     """
diff --git a/guardrails/cli/hub/install.py b/guardrails/cli/hub/install.py
@@ -5,7 +5,7 @@
 
 from guardrails.cli.hub.hub import hub_command
 from guardrails.cli.logger import logger
-from guardrails.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 
 
 @trace(name="guardrails-cli/hub/install", is_parent=True)
diff --git a/guardrails/cli/hub/list.py b/guardrails/cli/hub/list.py
@@ -3,7 +3,7 @@
 
 from guardrails.cli.hub.hub import hub_command
 from guardrails.cli.hub.utils import get_site_packages_location
-from guardrails.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 from .console import console
 
 
diff --git a/guardrails/cli/hub/submit.py b/guardrails/cli/hub/submit.py
@@ -8,7 +8,7 @@
 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.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 
 
 @trace(name="guardrails-cli/hub/submit", is_parent=True)
diff --git a/guardrails/cli/hub/uninstall.py b/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.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 
 from .console import console
 
diff --git a/guardrails/cli/validate.py b/guardrails/cli/validate.py
@@ -5,7 +5,7 @@
 
 from guardrails import Guard
 from guardrails.cli.guardrails import guardrails
-from guardrails.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 
 
 def validate_llm_output(rail: str, llm_output: str) -> Union[str, Dict, List, None]:
diff --git a/guardrails/guard.py b/guardrails/guard.py
@@ -64,7 +64,7 @@
     set_tracer,
     set_tracer_context,
 )
-from guardrails.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 from guardrails.types.on_fail import OnFailAction
 from guardrails.types.pydantic import ModelOrListOfModels
 from guardrails.utils.naming_utils import random_id
diff --git a/guardrails/hub_telemetry/__init__.py b/guardrails/hub_telemetry/__init__.py
diff --git a/guardrails/hub_telemetry/hub_tracing.py b/guardrails/hub_telemetry/hub_tracing.py
diff --git a/guardrails/run/async_runner.py b/guardrails/run/async_runner.py
@@ -15,7 +15,7 @@
 from guardrails.run.runner import Runner
 from guardrails.run.utils import msg_history_source, msg_history_string
 from guardrails.schema.validator import schema_validation
-from guardrails.telemetry.hub_tracing import async_trace
+from guardrails.hub_telemetry.hub_tracing import async_trace
 from guardrails.types.inputs import MessageHistory
 from guardrails.types.pydantic import ModelOrListOfModels
 from guardrails.types.validator import ValidatorMap
diff --git a/guardrails/run/async_stream_runner.py b/guardrails/run/async_stream_runner.py
@@ -27,7 +27,7 @@
 from guardrails.run import StreamRunner
 from guardrails.run.async_runner import AsyncRunner
 from guardrails.telemetry import trace_async_stream_step
-from guardrails.telemetry.hub_tracing import async_trace_stream
+from guardrails.hub_telemetry.hub_tracing import async_trace_stream
 
 
 class AsyncStreamRunner(AsyncRunner, StreamRunner):
diff --git a/guardrails/run/runner.py b/guardrails/run/runner.py
@@ -19,7 +19,7 @@
 from guardrails.run.utils import msg_history_source, msg_history_string
 from guardrails.schema.rail_schema import json_schema_to_rail_output
 from guardrails.schema.validator import schema_validation
-from guardrails.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 from guardrails.types import ModelOrListOfModels, ValidatorMap, MessageHistory
 from guardrails.utils.exception_utils import UserFacingException
 from guardrails.utils.hub_telemetry_utils import HubTelemetry
diff --git a/guardrails/run/stream_runner.py b/guardrails/run/stream_runner.py
@@ -12,7 +12,7 @@
 )
 from guardrails.prompt import Instructions, Prompt
 from guardrails.run.runner import Runner
-from guardrails.telemetry.hub_tracing import trace_stream
+from guardrails.hub_telemetry.hub_tracing import trace_stream
 from guardrails.utils.parsing_utils import (
     coerce_types,
     parse_llm_output,
diff --git a/guardrails/validator_base.py b/guardrails/validator_base.py
@@ -27,7 +27,7 @@
 from guardrails.hub_token.token import VALIDATOR_HUB_SERVICE, get_jwt_token
 from guardrails.logger import logger
 from guardrails.remote_inference import remote_inference
-from guardrails.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 from guardrails.types.on_fail import OnFailAction
 from guardrails.utils.safe_get import safe_get
 from guardrails.utils.hub_telemetry_utils import HubTelemetry
diff --git a/guardrails/validator_service/async_validator_service.py b/guardrails/validator_service/async_validator_service.py
@@ -9,7 +9,7 @@
     PassResult,
     ValidationResult,
 )
-from guardrails.telemetry.hub_tracing import async_trace
+from guardrails.hub_telemetry.hub_tracing import async_trace
 from guardrails.telemetry.validator_tracing import trace_async_validator
 from guardrails.types import ValidatorMap, OnFailAction
 from guardrails.classes.validation.validator_logs import ValidatorLogs
diff --git a/guardrails/validator_service/validator_service_base.py b/guardrails/validator_service/validator_service_base.py
@@ -12,7 +12,7 @@
 )
 from guardrails.errors import ValidationError
 from guardrails.merge import merge
-from guardrails.telemetry.hub_tracing import trace
+from guardrails.hub_telemetry.hub_tracing import trace
 from guardrails.types import OnFailAction
 from guardrails.classes.validation.validator_logs import ValidatorLogs
 from guardrails.actions.reask import FieldReAsk

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`set_tracer,`
`38`	`38`	`set_tracer_context,`
`39`	`39`	`)`
`40`		`-from guardrails.telemetry.hub_tracing import async_trace`
	`40`	`+from guardrails.hub_telemetry.hub_tracing import async_trace`
`41`	`41`	`from guardrails.types.pydantic import ModelOrListOfModels`
`42`	`42`	`from guardrails.types.validator import UseManyValidatorSpec, UseValidatorSpec`
`43`	`43`	`from guardrails.telemetry import trace_async_guard_execution, wrap_with_otel_context`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`set_tracer,`
`65`	`65`	`set_tracer_context,`
`66`	`66`	`)`
`67`		`-from guardrails.telemetry.hub_tracing import trace`
	`67`	`+from guardrails.hub_telemetry.hub_tracing import trace`
`68`	`68`	`from guardrails.types.on_fail import OnFailAction`
`69`	`69`	`from guardrails.types.pydantic import ModelOrListOfModels`
`70`	`70`	`from guardrails.utils.naming_utils import random_id`