Relax dependency requirements

Author: Andrei Bratu

poetry.lock

@@ -31,27 +31,28 @@ packages = [
 Repository = 'https://github.com/humanloop/humanloop-python'
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = ">=3.9,<4"
 httpx = ">=0.21.2"
 httpx-sse = "0.4.0"
 pydantic = ">= 1.9.2"
 pydantic-core = "^2.18.2"
 typing_extensions = ">= 4.0.0"
 parse = "^1.20.2"
-opentelemetry-sdk = "<=1.27.0"
-opentelemetry-api = "<=1.27.0"
-opentelemetry-instrumentation-openai = "<=0.33.3"
-opentelemetry-instrumentation-cohere = "<=0.33.3"
-opentelemetry-instrumentation-anthropic = "<=0.33.3"
-opentelemetry-instrumentation-groq = "<=0.33.3"
-opentelemetry-instrumentation-replicate = "<=0.33.3"
+opentelemetry-sdk = ">=1.20.0"
+opentelemetry-api = ">=1.20.0"
+opentelemetry-instrumentation-openai = ">=0.30"
+opentelemetry-instrumentation-cohere = ">=0.30"
+opentelemetry-instrumentation-anthropic = ">=0.30"
+opentelemetry-instrumentation-groq = ">=0.33.11"
+opentelemetry-instrumentation-replicate = ">=0.30"
+opentelemetry-instrumentation-bedrock = ">=0.0.1"
 
 [tool.poetry.group.dev.dependencies]
-parse-type = "^0.6.4"
-anthropic = "^0.37.1"
-groq = "^0.11.0"
-cohere = "^5.11.2"
-replicate = "^1.0.3"
+parse-type = ">=0.6.4"
+anthropic = ">=0.37.1"
+groq = ">=0.11.0"
+cohere = ">=3.0"
+replicate = ">=1.0.3"
 jsonschema = "^4.23.0"
 types-jsonschema = "^4.23.0.20240813"
 mypy = "^1.0.1"
@@ -62,7 +63,7 @@ types-python-dateutil = "^2.9.0.20240316"
 ruff = "^0.5.6"
 python-dotenv = "^1.0.1"
 openai = "^1.52.2"
-pandas = "^2.2.3"
+pandas = ">=1.3.2"
 
 [tool.pytest.ini_options]
 testpaths = [ "tests" ]

pyproject.toml

@@ -1,4 +1,3 @@
-import json
 import logging
 from functools import wraps
 from typing import Any, Callable, Mapping, Optional, Sequence
@@ -64,19 +63,23 @@ def wrapper(*args: Sequence[Any], **kwargs: Mapping[str, Any]) -> Any:
                 # Call the decorated function
                 try:
                     output = func(*args, **kwargs)
-                    output = jsonify_if_not_string(
+                    output_stringified = jsonify_if_not_string(
                         func=func,
                         output=output,
                     )
                     error = None
                 except Exception as e:
                     logger.error(f"Error calling {func.__name__}: {e}")
                     output = None
+                    output_stringified = jsonify_if_not_string(
+                        func=func,
+                        output=None,
+                    )
                     error = str(e)
 
                 flow_log = {
                     "inputs": inputs,
-                    "output": output,
+                    "output": output_stringified,
                     "error": error,
                 }
                 if inputs:

src/humanloop/decorators/flow.py

@@ -54,19 +54,23 @@ def wrapper(*args: Sequence[Any], **kwargs: Mapping[str, Any]) -> Any:
                 # Call the decorated function
                 try:
                     output = func(*args, **kwargs)
-                    output = jsonify_if_not_string(
+                    output_stringified = jsonify_if_not_string(
                         func=func,
                         output=output,
                     )
                     error = None
                 except Exception as e:
                     logger.error(f"Error calling {func.__name__}: {e}")
                     output = None
+                    output_stringified = jsonify_if_not_string(
+                        func=func,
+                        output=output,
+                    )
                     error = str(e)
 
                 prompt_log = {
                     "inputs": args_to_inputs(func, args, kwargs),
-                    "output": output,
+                    "output": output_stringified,
                     "error": error,
                 }
                 write_to_opentelemetry_span(

src/humanloop/decorators/prompt.py

@@ -72,20 +72,24 @@ def wrapper(*args, **kwargs):
                 # Call the decorated function
                 try:
                     output = func(*args, **kwargs)
-                    output = jsonify_if_not_string(
+                    output_stringified = jsonify_if_not_string(
                         func=func,
                         output=output,
                     )
                     error = None
                 except Exception as e:
                     logger.error(f"Error calling {func.__name__}: {e}")
                     output = None
+                    output_stringified = jsonify_if_not_string(
+                        func=func,
+                        output=output,
+                    )
                     error = str(e)
 
                 # Populate known Tool Log attributes
                 tool_log = {
                     "inputs": args_to_inputs(func, args, kwargs),
-                    "output": output,
+                    "output": output_stringified,
                     "error": error,
                 }
 

src/humanloop/decorators/tool.py

@@ -37,6 +37,11 @@ def instrument_provider(provider: TracerProvider):
 
         ReplicateInstrumentor().instrument(tracer_provider=provider)
 
+    if module_is_installed("boto3"):
+        from opentelemetry.instrumentation.bedrock import BedrockInstrumentor
+
+        BedrockInstrumentor().instrument(tracer_provider=provider)
+
 
 class FlowContext(TypedDict):
     trace_id: NotRequired[str]

src/humanloop/otel/__init__.py

@@ -31,12 +31,13 @@ def calculator(operation: str, num1: float, num2: float) -> float:
 
     # WHEN calling the @tool decorated function
     result = calculator(operation="add", num1=1, num2=2)
+    assert result == 3
     # THEN a single span is created and the log and file attributes are correctly set
     spans = exporter.get_finished_spans()
     assert len(spans) == 1
     hl_file: dict[str, Any] = read_from_opentelemetry_span(span=spans[0], key=HUMANLOOP_FILE_KEY)
     hl_log: dict[str, Any] = read_from_opentelemetry_span(span=spans[0], key=HUMANLOOP_LOG_KEY)
-    assert hl_log["output"] == result == 3
+    assert hl_log["output"] == str(result) == "3"
     assert hl_log["inputs"] == {
         "operation": "add",
         "num1": 1,
@@ -408,7 +409,7 @@ def foo_bar(foo: Foo):
             return foo.a + foo.b  # type: ignore
 
     # THEN a ValueError is raised
-    assert exc.value.args[0].startswith("foo_bar: Unsupported type hint")
+    assert exc.value.args[0].startswith("Error parsing signature of @tool annotated function foo_bar")
 
 
 def test_tool_as_higher_order_function(