Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
4d717b1
Merge branch 'development' into release
karthikscale3 Apr 24, 2024
0233826
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Apr 28, 2024
7f4e951
Merge branch 'development' into release
karthikscale3 Apr 28, 2024
81a6ca0
Merge
karthikscale3 Jun 13, 2024
0c19f77
Merge branch 'development' into release
karthikscale3 Jun 13, 2024
c3a6ccf
remove logs
karthikscale3 Jun 13, 2024
a99cf10
remove requirements
karthikscale3 Jun 13, 2024
1379b27
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jun 17, 2024
dae04e7
Merge branch 'development' into release
karthikscale3 Jun 17, 2024
129e927
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jun 24, 2024
16e67f9
Merge branch 'development' into release
karthikscale3 Jun 24, 2024
e604e93
Bump version
karthikscale3 Jun 24, 2024
7e00473
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jun 24, 2024
6ac71aa
Merge branch 'development' into release
karthikscale3 Jun 24, 2024
c39bf01
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jun 24, 2024
f89e38c
Merge branch 'development' into release
karthikscale3 Jun 24, 2024
e95e743
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jul 19, 2024
c62e803
Squash
karthikscale3 Jul 25, 2024
d7fd3fb
Merge
karthikscale3 Jul 25, 2024
c4ea507
Merge branch 'development' into release
karthikscale3 Jul 25, 2024
4c74fd8
Merge
karthikscale3 Jul 31, 2024
9a83e20
Merge branch 'development' into release
karthikscale3 Jul 31, 2024
09d5631
Merge
karthikscale3 Aug 3, 2024
508e72b
Merge
karthikscale3 Aug 3, 2024
ad44fa3
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Aug 13, 2024
ad168b3
Merge branch 'development' into release
karthikscale3 Aug 13, 2024
6876f92
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Aug 30, 2024
630169a
Merge branch 'development' into release
karthikscale3 Aug 30, 2024
0e1aae3
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Sep 1, 2024
c266698
Merge branch 'development' into release
karthikscale3 Sep 1, 2024
5b9895f
merge
karthikscale3 Sep 4, 2024
04fd825
Merge branch 'development' into release
karthikscale3 Sep 4, 2024
510e4b8
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Sep 6, 2024
e63bee2
Merge branch 'development' into release
karthikscale3 Sep 6, 2024
9741a3e
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Sep 8, 2024
4f7f3c4
Merge branch 'development' into release
karthikscale3 Sep 8, 2024
32fac05
merge
karthikscale3 Sep 11, 2024
4920395
Merge branch 'development' into release
karthikscale3 Sep 11, 2024
2e8956d
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Sep 11, 2024
372ae29
Merge branch 'development' into release
karthikscale3 Sep 11, 2024
da82f72
bump version
karthikscale3 Sep 26, 2024
ef0332f
Merge branch 'development' into release
karthikscale3 Sep 26, 2024
105749c
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Oct 8, 2024
0f99827
Merge branch 'development' into release
karthikscale3 Oct 8, 2024
b52fce7
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Oct 8, 2024
ddaf4b5
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Oct 10, 2024
54cddc8
Merge branch 'development' into release
karthikscale3 Oct 10, 2024
ced0a31
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Oct 16, 2024
4e22bde
Merge branch 'development' into release
karthikscale3 Oct 16, 2024
135bdc7
bump version
karthikscale3 Oct 18, 2024
6b0a460
Merge branch 'development' into release
karthikscale3 Oct 22, 2024
7824c39
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Oct 22, 2024
109990a
minor
karthikscale3 Oct 22, 2024
2e9befb
version
karthikscale3 Oct 31, 2024
21cdc08
Merge branch 'development' into release
karthikscale3 Oct 31, 2024
7959744
Merge branch 'development' into release
karthikscale3 Oct 31, 2024
aa3dc2f
switch to http exporter
karthikscale3 Oct 31, 2024
4e22e16
Include setuptools to deps
karthikscale3 Nov 15, 2024
a7b34ab
Merge branch 'development' into release
karthikscale3 Nov 15, 2024
736fb60
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Nov 19, 2024
41c58e8
Merge branch 'development' into release
karthikscale3 Nov 19, 2024
129f764
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Nov 25, 2024
f7188c5
Merge branch 'development' into release
karthikscale3 Nov 25, 2024
d43358a
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Dec 1, 2024
fa7b13b
Merge branch 'development' into release
karthikscale3 Dec 1, 2024
fab8619
merge
karthikscale3 Dec 10, 2024
5649f0a
Merge branch 'development' into release
karthikscale3 Dec 10, 2024
0274620
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jan 20, 2025
0897cc7
Merge branch 'development' into release
karthikscale3 Jan 20, 2025
8eee1e1
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jan 20, 2025
8cc7f7c
Merge branch 'development' into release
karthikscale3 Jan 20, 2025
d6b6531
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jan 20, 2025
30b6e00
Merge branch 'development' into release
karthikscale3 Jan 20, 2025
1d7362a
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jan 22, 2025
36ba737
Merge branch 'development' into release
karthikscale3 Jan 22, 2025
d9bcdb4
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jan 27, 2025
a5f3da6
Merge branch 'development' into release
karthikscale3 Jan 27, 2025
b856e03
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Jan 27, 2025
5f14b58
Merge branch 'development' into release
karthikscale3 Jan 27, 2025
fd9baed
merge
karthikscale3 Feb 6, 2025
ece9c97
Merge branch 'development' into release
karthikscale3 Feb 6, 2025
cd1a481
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Feb 7, 2025
a3730af
Merge branch 'development' into release
karthikscale3 Feb 7, 2025
5453a92
merge
karthikscale3 Mar 5, 2025
5d65fb3
Merge branch 'development' into release
karthikscale3 Mar 5, 2025
0661c29
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Mar 12, 2025
a51cff1
Merge branch 'development' into release
karthikscale3 Mar 12, 2025
73df116
Make openai agents dep optional (#501)
karthikscale3 Mar 13, 2025
0a3a4a6
Merge branch 'main' of github.com:Scale3-Labs/langtrace-python-sdk in…
karthikscale3 Mar 13, 2025
d1695ac
Merge branch 'development' into release
karthikscale3 Mar 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions src/langtrace_python_sdk/instrumentation/openai_agents/patch.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import json
from typing import Any, Callable, List

from agents.exceptions import (InputGuardrailTripwireTriggered,
OutputGuardrailTripwireTriggered)
from agents.run import Runner
from importlib_metadata import version as v
from langtrace.trace_attributes import FrameworkSpanAttributes, SpanAttributes
from opentelemetry import baggage, trace
Expand All @@ -18,6 +15,29 @@
set_usage_attributes)


# Define dummy classes to use when imports fail
class DummyRunner:
pass


class DummyException(Exception):
pass


# Try importing from openai-agents package
try:
from agents.exceptions import (InputGuardrailTripwireTriggered,
OutputGuardrailTripwireTriggered)
from agents.run import Runner
OPENAI_AGENTS_AVAILABLE = True
except ImportError:
# Define dummy classes if imports fail
InputGuardrailTripwireTriggered = DummyException
OutputGuardrailTripwireTriggered = DummyException
Runner = DummyRunner
OPENAI_AGENTS_AVAILABLE = False


def extract_agent_details(agent_or_handoff):
"""Extract relevant details from an agent/handoff and its handoffs."""
try:
Expand Down Expand Up @@ -70,6 +90,10 @@ def extract_handoff_details(handoff):

def get_handoffs(version: str, tracer: Tracer) -> Callable:
"""Wrap the `prompt` method of the `TLM` class to trace it."""
if not OPENAI_AGENTS_AVAILABLE:
def noop_traced_method(wrapped: Callable, instance: Any, args: List[Any], kwargs: Any) -> Any:
return wrapped(*args, **kwargs)
return noop_traced_method

def traced_method(
wrapped: Callable,
Expand Down Expand Up @@ -117,7 +141,8 @@ def traced_method(
attributes = FrameworkSpanAttributes(**span_attributes)

with tracer.start_as_current_span(
name=f"openai_agents.available_handoffs", kind=SpanKind.CLIENT
name="openai_agents.available_handoffs",
kind=SpanKind.CLIENT
) as span:
try:
set_span_attributes(span, attributes)
Expand Down Expand Up @@ -157,12 +182,11 @@ def traced_method(
pass # Silently fail if error recording fails
raise # Re-raise the original error since it's from the wrapped function

except Exception as outer_err:
# If anything fails in our instrumentation wrapper, catch it and return control to the wrapped function
except Exception:
try:
return wrapped(*args, **kwargs)
except Exception as wrapped_err:
raise wrapped_err # Only raise errors from the wrapped function
raise wrapped_err

return traced_method

Expand Down Expand Up @@ -328,6 +352,10 @@ def extract_run_config(config):

def get_new_response(version: str, tracer: Tracer) -> Callable:
"""Wrap the _get_new_response method to trace inputs and outputs."""
if not OPENAI_AGENTS_AVAILABLE:
async def noop_traced_method(wrapped: Callable, instance: Any, args: List[Any], kwargs: Any) -> Any:
return await wrapped(*args, **kwargs)
return noop_traced_method

async def traced_method(
wrapped: Callable,
Expand Down Expand Up @@ -524,7 +552,7 @@ async def traced_method(

raise

except Exception as outer_err:
except Exception: # Remove outer_err since it's unused
try:
return await wrapped(*args, **kwargs)
except Exception as wrapped_err:
Expand Down
2 changes: 1 addition & 1 deletion src/langtrace_python_sdk/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.8.5"
__version__ = "3.8.6"
Loading