From fce9322d2e8c85f342010821ee8c1a833f3d7d3c Mon Sep 17 00:00:00 2001 From: Bagatur <22008038+baskaryan@users.noreply.github.com> Date: Tue, 10 Sep 2024 15:48:02 -0700 Subject: [PATCH] core[patch]: use pydantic.v1 in old tracer code (#26290) Thank you for contributing to LangChain! - [ ] **PR title**: "package: description" - Where "package" is whichever of langchain, community, core, experimental, etc. is being modified. Use "docs: ..." for purely docs changes, "templates: ..." for template changes, "infra: ..." for CI changes. - Example: "community: add foobar LLM" - [ ] **PR message**: ***Delete this entire checklist*** and replace with - **Description:** a description of the change - **Issue:** the issue # it fixes, if applicable - **Dependencies:** any dependencies required for this change - **Twitter handle:** if your PR gets announced, and you'd like a mention, we'll gladly shout you out! - [ ] **Add tests and docs**: If you're adding a new integration, please include 1. a test for the integration, preferably unit tests that do not rely on network access, 2. an example notebook showing its use. It lives in `docs/docs/integrations` directory. - [ ] **Lint and test**: Run `make format`, `make lint` and `make test` from the root of the package(s) you've modified. See contribution guidelines for more: https://python.langchain.com/docs/contributing/ Additional guidelines: - Make sure optional dependencies are imported within a function. - Please do not add dependencies to pyproject.toml files (even optional ones) unless they are required for unit tests. - Most PRs should not touch more than one package. - Changes should be backwards compatible. - If you are adding something to community, do not re-import it in langchain. If no one reviews your PR within a few days, please @-mention one of baskaryan, efriis, eyurtsev, ccurme, vbarda, hwchase17. --- libs/core/langchain_core/tracers/schemas.py | 32 +++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/core/langchain_core/tracers/schemas.py b/libs/core/langchain_core/tracers/schemas.py index 4a54588357c..5f6c8ed8c6b 100644 --- a/libs/core/langchain_core/tracers/schemas.py +++ b/libs/core/langchain_core/tracers/schemas.py @@ -10,9 +10,11 @@ from uuid import UUID from langsmith.schemas import RunBase as BaseRunV2 from langsmith.schemas import RunTypeEnum as RunTypeEnumDep from pydantic import PydanticDeprecationWarning +from pydantic.v1 import BaseModel as BaseModelV1 +from pydantic.v1 import Field as FieldV1 +from pydantic.v1 import root_validator from langchain_core._api import deprecated -from langchain_core.pydantic_v1 import BaseModel, Field, root_validator @deprecated("0.1.0", alternative="Use string instead.", removal="1.0") @@ -28,10 +30,10 @@ def RunTypeEnum() -> Type[RunTypeEnumDep]: @deprecated("0.1.0", removal="1.0") -class TracerSessionV1Base(BaseModel): +class TracerSessionV1Base(BaseModelV1): """Base class for TracerSessionV1.""" - start_time: datetime.datetime = Field(default_factory=datetime.datetime.utcnow) + start_time: datetime.datetime = FieldV1(default_factory=datetime.datetime.utcnow) name: Optional[str] = None extra: Optional[Dict[str, Any]] = None @@ -63,13 +65,13 @@ class TracerSession(TracerSessionBase): @deprecated("0.1.0", alternative="Run", removal="1.0") -class BaseRun(BaseModel): +class BaseRun(BaseModelV1): """Base class for Run.""" uuid: str parent_uuid: Optional[str] = None - start_time: datetime.datetime = Field(default_factory=datetime.datetime.utcnow) - end_time: datetime.datetime = Field(default_factory=datetime.datetime.utcnow) + start_time: datetime.datetime = FieldV1(default_factory=datetime.datetime.utcnow) + end_time: datetime.datetime = FieldV1(default_factory=datetime.datetime.utcnow) extra: Optional[Dict[str, Any]] = None execution_order: int child_execution_order: int @@ -93,9 +95,9 @@ class ChainRun(BaseRun): inputs: Dict[str, Any] outputs: Optional[Dict[str, Any]] = None - child_llm_runs: List[LLMRun] = Field(default_factory=list) - child_chain_runs: List[ChainRun] = Field(default_factory=list) - child_tool_runs: List[ToolRun] = Field(default_factory=list) + child_llm_runs: List[LLMRun] = FieldV1(default_factory=list) + child_chain_runs: List[ChainRun] = FieldV1(default_factory=list) + child_tool_runs: List[ToolRun] = FieldV1(default_factory=list) @deprecated("0.1.0", alternative="Run", removal="1.0") @@ -105,9 +107,9 @@ class ToolRun(BaseRun): tool_input: str output: Optional[str] = None action: str - child_llm_runs: List[LLMRun] = Field(default_factory=list) - child_chain_runs: List[ChainRun] = Field(default_factory=list) - child_tool_runs: List[ToolRun] = Field(default_factory=list) + child_llm_runs: List[LLMRun] = FieldV1(default_factory=list) + child_chain_runs: List[ChainRun] = FieldV1(default_factory=list) + child_tool_runs: List[ToolRun] = FieldV1(default_factory=list) # Begin V2 API Schemas @@ -124,9 +126,9 @@ class Run(BaseRunV2): dotted_order: The dotted order. """ - child_runs: List[Run] = Field(default_factory=list) - tags: Optional[List[str]] = Field(default_factory=list) - events: List[Dict[str, Any]] = Field(default_factory=list) + child_runs: List[Run] = FieldV1(default_factory=list) + tags: Optional[List[str]] = FieldV1(default_factory=list) + events: List[Dict[str, Any]] = FieldV1(default_factory=list) trace_id: Optional[UUID] = None dotted_order: Optional[str] = None