Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(langchain): improve callbacks #1317

Closed
wants to merge 9 commits into from
Closed

fix(langchain): improve callbacks #1317

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d42951f
Frist try
tibor-reiss Jun 16, 2024
79cc01c
Trials with run_id
tibor-reiss Jun 18, 2024
3407b65
Code review
tibor-reiss Jun 22, 2024
ec21773
Add more classes
tibor-reiss Jun 22, 2024
52e1cff
Fix test
tibor-reiss Jun 23, 2024
4f7d45e
Merge branch 'main' into langchain-callbacks-revisited
nirga Jun 27, 2024
27024dd
Code review - use parent_run_id to demote from workflow to task
tibor-reiss Jun 29, 2024
5fa7689
Do not pass kind to the constructor
tibor-reiss Jun 29, 2024
b2a1929
Add heuristic for naming chains
tibor-reiss Jun 30, 2024
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
88 changes: 21 additions & 67 deletions ...entelemetry-instrumentation-langchain/opentelemetry/instrumentation/langchain/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
from opentelemetry.instrumentation.utils import unwrap

from opentelemetry.instrumentation.langchain.task_wrapper import (
task_wrapper,
atask_wrapper,
)
from opentelemetry.instrumentation.langchain.task_wrapper import task_wrapper
from opentelemetry.instrumentation.langchain.workflow_wrapper import (
workflow_wrapper,
aworkflow_wrapper,
Expand All @@ -22,10 +19,6 @@
llm_wrapper,
allm_wrapper,
)
from opentelemetry.instrumentation.langchain.custom_chat_wrapper import (
chat_wrapper,
achat_wrapper,
)
from opentelemetry.instrumentation.langchain.version import __version__

from opentelemetry.semconv.ai import TraceloopSpanKindValues
Expand All @@ -41,25 +34,31 @@
"package": "langchain.chains.base",
"class": "Chain",
"is_callback": True,
"kind": TraceloopSpanKindValues.TASK.value,
"kind": TraceloopSpanKindValues.WORKFLOW.value,
},
{
"package": "langchain.chains.llm",
"class": "LLMChain",
"package": "langchain.schema.runnable",
"class": "RunnableSequence",
"is_callback": True,
"kind": TraceloopSpanKindValues.WORKFLOW.value,
},
{
"package": "langchain.prompts.base",
"class": "BasePromptTemplate",
"is_callback": True,
"kind": TraceloopSpanKindValues.TASK.value,
},
{
"package": "langchain.chains.combine_documents.stuff",
"class": "StuffDocumentsChain",
"package": "langchain.chat_models.base",
"class": "BaseChatModel",
"is_callback": True,
"kind": TraceloopSpanKindValues.TASK.value,
},
{
"package": "langchain.chains",
"class": "SequentialChain",
"package": "langchain.schema",
"class": "BaseOutputParser",
"is_callback": True,
"kind": TraceloopSpanKindValues.WORKFLOW.value,
"kind": TraceloopSpanKindValues.TASK.value,
},
{
"package": "langchain.agents",
Expand Down Expand Up @@ -91,56 +90,6 @@
"span_name": "retrieval_qa.workflow",
"wrapper": aworkflow_wrapper,
},
{
"package": "langchain.prompts.base",
"object": "BasePromptTemplate",
"method": "invoke",
"wrapper": task_wrapper,
},
{
"package": "langchain.prompts.base",
"object": "BasePromptTemplate",
"method": "ainvoke",
"wrapper": atask_wrapper,
},
{
"package": "langchain.chat_models.base",
"object": "BaseChatModel",
"method": "generate",
"wrapper": chat_wrapper,
},
{
"package": "langchain.chat_models.base",
"object": "BaseChatModel",
"method": "agenerate",
"wrapper": achat_wrapper,
},
{
"package": "langchain.schema",
"object": "BaseOutputParser",
"method": "invoke",
"wrapper": task_wrapper,
},
{
"package": "langchain.schema",
"object": "BaseOutputParser",
"method": "ainvoke",
"wrapper": atask_wrapper,
},
{
"package": "langchain.schema.runnable",
"object": "RunnableSequence",
"method": "invoke",
"span_name": "langchain.workflow",
"wrapper": workflow_wrapper,
},
{
"package": "langchain.schema.runnable",
"object": "RunnableSequence",
"method": "ainvoke",
"span_name": "langchain.workflow",
"wrapper": aworkflow_wrapper,
},
{
"package": "langchain_core.language_models.llms",
"object": "LLM",
Expand Down Expand Up @@ -177,7 +126,12 @@ def _instrument(self, **kwargs):
wrap_class = wrapped_method.get("class")
wrap_function_wrapper(
wrap_package,
f"{wrap_class}.__init__",
f"{wrap_class}.invoke",
callback_wrapper(tracer, wrapped_method),
)
wrap_function_wrapper(
wrap_package,
f"{wrap_class}.ainvoke",
callback_wrapper(tracer, wrapped_method),
)
else:
Expand Down
Loading