Skip to content

Commit 9b6b2e5

Browse files
hmstepanekmergify[bot]
hmstepanek
and
mergify[bot]
authored
Change Langhchain->LangChain per agent spec (#1176)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent f7efc7d commit 9b6b2e5

File tree

5 files changed

+112
-112
lines changed

5 files changed

+112
-112
lines changed

‎newrelic/hooks/mlmodel_langchain.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ async def wrap_asimilarity_search(wrapped, instance, args, kwargs):
156156
if not settings.ai_monitoring.enabled:
157157
return await wrapped(*args, **kwargs)
158158

159-
transaction.add_ml_model_info("Langchain", LANGCHAIN_VERSION)
159+
transaction.add_ml_model_info("LangChain", LANGCHAIN_VERSION)
160160
transaction._add_agent_attribute("llm", True)
161161

162162
search_id = str(uuid.uuid4())
163163

164-
ft = FunctionTrace(name=wrapped.__name__, group="Llm/vectorstore/Langchain")
164+
ft = FunctionTrace(name=wrapped.__name__, group="Llm/vectorstore/LangChain")
165165
ft.__enter__()
166166
linking_metadata = get_trace_linking_metadata()
167167
try:
@@ -193,12 +193,12 @@ def wrap_similarity_search(wrapped, instance, args, kwargs):
193193
if not settings.ai_monitoring.enabled:
194194
return wrapped(*args, **kwargs)
195195

196-
transaction.add_ml_model_info("Langchain", LANGCHAIN_VERSION)
196+
transaction.add_ml_model_info("LangChain", LANGCHAIN_VERSION)
197197
transaction._add_agent_attribute("llm", True)
198198

199199
search_id = str(uuid.uuid4())
200200

201-
ft = FunctionTrace(name=wrapped.__name__, group="Llm/vectorstore/Langchain")
201+
ft = FunctionTrace(name=wrapped.__name__, group="Llm/vectorstore/LangChain")
202202
ft.__enter__()
203203
linking_metadata = get_trace_linking_metadata()
204204
try:
@@ -277,14 +277,14 @@ def wrap_tool_sync_run(wrapped, instance, args, kwargs):
277277
return wrapped(*args, **kwargs)
278278

279279
# Framework metric also used for entity tagging in the UI
280-
transaction.add_ml_model_info("Langchain", LANGCHAIN_VERSION)
280+
transaction.add_ml_model_info("LangChain", LANGCHAIN_VERSION)
281281
transaction._add_agent_attribute("llm", True)
282282

283283
tool_id, metadata, tags, tool_input, tool_name, tool_description, run_args = _capture_tool_info(
284284
instance, wrapped, args, kwargs
285285
)
286286

287-
ft = FunctionTrace(name=wrapped.__name__, group="Llm/tool/Langchain")
287+
ft = FunctionTrace(name=wrapped.__name__, group="Llm/tool/LangChain")
288288
ft.__enter__()
289289
linking_metadata = get_trace_linking_metadata()
290290
try:
@@ -334,14 +334,14 @@ async def wrap_tool_async_run(wrapped, instance, args, kwargs):
334334
return await wrapped(*args, **kwargs)
335335

336336
# Framework metric also used for entity tagging in the UI
337-
transaction.add_ml_model_info("Langchain", LANGCHAIN_VERSION)
337+
transaction.add_ml_model_info("LangChain", LANGCHAIN_VERSION)
338338
transaction._add_agent_attribute("llm", True)
339339

340340
tool_id, metadata, tags, tool_input, tool_name, tool_description, run_args = _capture_tool_info(
341341
instance, wrapped, args, kwargs
342342
)
343343

344-
ft = FunctionTrace(name=wrapped.__name__, group="Llm/tool/Langchain")
344+
ft = FunctionTrace(name=wrapped.__name__, group="Llm/tool/LangChain")
345345
ft.__enter__()
346346
linking_metadata = get_trace_linking_metadata()
347347
try:
@@ -536,7 +536,7 @@ async def wrap_chain_async_run(wrapped, instance, args, kwargs):
536536
return await wrapped(*args, **kwargs)
537537

538538
# Framework metric also used for entity tagging in the UI
539-
transaction.add_ml_model_info("Langchain", LANGCHAIN_VERSION)
539+
transaction.add_ml_model_info("LangChain", LANGCHAIN_VERSION)
540540
transaction._add_agent_attribute("llm", True)
541541

542542
run_args = bind_args(wrapped, args, kwargs)
@@ -546,7 +546,7 @@ async def wrap_chain_async_run(wrapped, instance, args, kwargs):
546546
# The trace group will reflect from where it has started.
547547
# The AgentExecutor class has an attribute "agent" that does
548548
# not exist within the Chain class
549-
group_name = "Llm/agent/Langchain" if hasattr(instance, "agent") else "Llm/chain/Langchain"
549+
group_name = "Llm/agent/LangChain" if hasattr(instance, "agent") else "Llm/chain/LangChain"
550550
ft = FunctionTrace(name=wrapped.__name__, group=group_name)
551551
ft.__enter__()
552552
linking_metadata = get_trace_linking_metadata()
@@ -584,7 +584,7 @@ def wrap_chain_sync_run(wrapped, instance, args, kwargs):
584584
return wrapped(*args, **kwargs)
585585

586586
# Framework metric also used for entity tagging in the UI
587-
transaction.add_ml_model_info("Langchain", LANGCHAIN_VERSION)
587+
transaction.add_ml_model_info("LangChain", LANGCHAIN_VERSION)
588588
transaction._add_agent_attribute("llm", True)
589589

590590
run_args = bind_args(wrapped, args, kwargs)
@@ -594,7 +594,7 @@ def wrap_chain_sync_run(wrapped, instance, args, kwargs):
594594
# The trace group will reflect from where it has started.
595595
# The AgentExecutor class has an attribute "agent" that does
596596
# not exist within the Chain class
597-
group_name = "Llm/agent/Langchain" if hasattr(instance, "agent") else "Llm/chain/Langchain"
597+
group_name = "Llm/agent/LangChain" if hasattr(instance, "agent") else "Llm/chain/LangChain"
598598
ft = FunctionTrace(name=wrapped.__name__, group=group_name)
599599
ft.__enter__()
600600
linking_metadata = get_trace_linking_metadata()

‎tests/mlmodel_langchain/test_agent.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ def prompt():
5959
@reset_core_stats_engine()
6060
@validate_transaction_metrics(
6161
name="test_agent:test_sync_agent",
62-
scoped_metrics=[("Llm/agent/Langchain/invoke", 1)],
63-
rollup_metrics=[("Llm/agent/Langchain/invoke", 1)],
62+
scoped_metrics=[("Llm/agent/LangChain/invoke", 1)],
63+
rollup_metrics=[("Llm/agent/LangChain/invoke", 1)],
6464
custom_metrics=[
65-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
65+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
6666
],
6767
background_task=True,
6868
)
@@ -78,10 +78,10 @@ def test_sync_agent(chat_openai_client, tools, prompt):
7878
@reset_core_stats_engine()
7979
@validate_transaction_metrics(
8080
name="test_agent:test_async_agent",
81-
scoped_metrics=[("Llm/agent/Langchain/ainvoke", 1)],
82-
rollup_metrics=[("Llm/agent/Langchain/ainvoke", 1)],
81+
scoped_metrics=[("Llm/agent/LangChain/ainvoke", 1)],
82+
rollup_metrics=[("Llm/agent/LangChain/ainvoke", 1)],
8383
custom_metrics=[
84-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
84+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
8585
],
8686
background_task=True,
8787
)

‎tests/mlmodel_langchain/test_chain.py‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -480,10 +480,10 @@
480480
@validate_custom_event_count(count=7)
481481
@validate_transaction_metrics(
482482
name="test_chain:test_langchain_chain_list_response",
483-
scoped_metrics=[("Llm/chain/Langchain/invoke", 1)],
484-
rollup_metrics=[("Llm/chain/Langchain/invoke", 1)],
483+
scoped_metrics=[("Llm/chain/LangChain/invoke", 1)],
484+
rollup_metrics=[("Llm/chain/LangChain/invoke", 1)],
485485
custom_metrics=[
486-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
486+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
487487
],
488488
background_task=True,
489489
)
@@ -608,10 +608,10 @@ def test_langchain_chain(
608608
@validate_custom_event_count(count=8)
609609
@validate_transaction_metrics(
610610
name="test_chain:test_langchain_chain.<locals>._test",
611-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
612-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
611+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
612+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
613613
custom_metrics=[
614-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
614+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
615615
],
616616
background_task=True,
617617
)
@@ -682,10 +682,10 @@ def test_langchain_chain_no_content(
682682
@validate_custom_event_count(count=8)
683683
@validate_transaction_metrics(
684684
name="test_chain:test_langchain_chain_no_content.<locals>._test",
685-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
686-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
685+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
686+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
687687
custom_metrics=[
688-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
688+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
689689
],
690690
background_task=True,
691691
)
@@ -781,10 +781,10 @@ def test_langchain_chain_error_in_openai(
781781
@validate_custom_event_count(count=6)
782782
@validate_transaction_metrics(
783783
name="test_chain:test_langchain_chain_error_in_openai.<locals>._test",
784-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
785-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
784+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
785+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
786786
custom_metrics=[
787-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
787+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
788788
],
789789
background_task=True,
790790
)
@@ -858,10 +858,10 @@ def test_langchain_chain_error_in_langchain(
858858
@validate_custom_event_count(count=2)
859859
@validate_transaction_metrics(
860860
name="test_chain:test_langchain_chain_error_in_langchain.<locals>._test",
861-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
862-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
861+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
862+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
863863
custom_metrics=[
864-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
864+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
865865
],
866866
background_task=True,
867867
)
@@ -936,10 +936,10 @@ def test_langchain_chain_error_in_langchain_no_content(
936936
@validate_custom_event_count(count=2)
937937
@validate_transaction_metrics(
938938
name="test_chain:test_langchain_chain_error_in_langchain_no_content.<locals>._test",
939-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
940-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
939+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
940+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
941941
custom_metrics=[
942-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
942+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
943943
],
944944
background_task=True,
945945
)
@@ -1005,10 +1005,10 @@ def test_langchain_chain_ai_monitoring_disabled(
10051005
@validate_custom_event_count(count=7)
10061006
@validate_transaction_metrics(
10071007
name="test_chain:test_async_langchain_chain_list_response",
1008-
scoped_metrics=[("Llm/chain/Langchain/ainvoke", 1)],
1009-
rollup_metrics=[("Llm/chain/Langchain/ainvoke", 1)],
1008+
scoped_metrics=[("Llm/chain/LangChain/ainvoke", 1)],
1009+
rollup_metrics=[("Llm/chain/LangChain/ainvoke", 1)],
10101010
custom_metrics=[
1011-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
1011+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
10121012
],
10131013
background_task=True,
10141014
)
@@ -1050,10 +1050,10 @@ def test_async_langchain_chain_list_response(
10501050
@validate_custom_event_count(count=7)
10511051
@validate_transaction_metrics(
10521052
name="test_chain:test_async_langchain_chain_list_response_no_content",
1053-
scoped_metrics=[("Llm/chain/Langchain/ainvoke", 1)],
1054-
rollup_metrics=[("Llm/chain/Langchain/ainvoke", 1)],
1053+
scoped_metrics=[("Llm/chain/LangChain/ainvoke", 1)],
1054+
rollup_metrics=[("Llm/chain/LangChain/ainvoke", 1)],
10551055
custom_metrics=[
1056-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
1056+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
10571057
],
10581058
background_task=True,
10591059
)
@@ -1186,10 +1186,10 @@ def test_async_langchain_chain(
11861186
@validate_custom_event_count(count=8)
11871187
@validate_transaction_metrics(
11881188
name="test_chain:test_async_langchain_chain.<locals>._test",
1189-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
1190-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
1189+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
1190+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
11911191
custom_metrics=[
1192-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
1192+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
11931193
],
11941194
background_task=True,
11951195
)
@@ -1285,10 +1285,10 @@ def test_async_langchain_chain_error_in_openai(
12851285
@validate_custom_event_count(count=6)
12861286
@validate_transaction_metrics(
12871287
name="test_chain:test_async_langchain_chain_error_in_openai.<locals>._test",
1288-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
1289-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
1288+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
1289+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
12901290
custom_metrics=[
1291-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
1291+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
12921292
],
12931293
background_task=True,
12941294
)
@@ -1361,10 +1361,10 @@ def test_async_langchain_chain_error_in_langchain(
13611361
@validate_custom_event_count(count=2)
13621362
@validate_transaction_metrics(
13631363
name="test_chain:test_async_langchain_chain_error_in_langchain.<locals>._test",
1364-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
1365-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
1364+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
1365+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
13661366
custom_metrics=[
1367-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
1367+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
13681368
],
13691369
background_task=True,
13701370
)
@@ -1438,10 +1438,10 @@ def test_async_langchain_chain_error_in_langchain_no_content(
14381438
@validate_custom_event_count(count=2)
14391439
@validate_transaction_metrics(
14401440
name="test_chain:test_async_langchain_chain_error_in_langchain_no_content.<locals>._test",
1441-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
1442-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 1)],
1441+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
1442+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 1)],
14431443
custom_metrics=[
1444-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
1444+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
14451445
],
14461446
background_task=True,
14471447
)
@@ -1541,10 +1541,10 @@ def test_multiple_async_langchain_chain(
15411541
@validate_custom_event_count(count=16)
15421542
@validate_transaction_metrics(
15431543
name="test_chain:test_multiple_async_langchain_chain.<locals>._test",
1544-
scoped_metrics=[("Llm/chain/Langchain/%s" % call_function, 2)],
1545-
rollup_metrics=[("Llm/chain/Langchain/%s" % call_function, 2)],
1544+
scoped_metrics=[("Llm/chain/LangChain/%s" % call_function, 2)],
1545+
rollup_metrics=[("Llm/chain/LangChain/%s" % call_function, 2)],
15461546
custom_metrics=[
1547-
("Supportability/Python/ML/Langchain/%s" % langchain.__version__, 1),
1547+
("Supportability/Python/ML/LangChain/%s" % langchain.__version__, 1),
15481548
],
15491549
background_task=True,
15501550
)

0 commit comments

Comments
 (0)