Merge branch 'main' into langchain-str-response-fix

Author: mergify[bot]

tests/cross_agent/test_docker_container_id.py

@@ -15,7 +15,6 @@
 import json
 import os
 
-import mock
 import pytest
 
 import newrelic.common.utilization as u

tests/cross_agent/test_docker_container_id_v2.py

@@ -15,7 +15,6 @@
 import json
 import os
 
-import mock
 import pytest
 
 import newrelic.common.utilization as u

tests/mlmodel_langchain/test_chain.py

@@ -14,6 +14,7 @@
 
 import asyncio
 import uuid
+from unittest.mock import patch
 
 import langchain
 import langchain_core
@@ -22,7 +23,6 @@
 from langchain.chains.combine_documents import create_stuff_documents_chain
 from langchain.chains.openai_functions import create_structured_output_chain, create_structured_output_runnable
 from langchain_community.vectorstores.faiss import FAISS
-from mock import patch
 from testing_support.fixtures import reset_core_stats_engine, validate_attributes
 from testing_support.ml_testing_utils import (
     disabled_ai_monitoring_record_content_settings,

tests/mlmodel_langchain/test_tool.py

@@ -15,12 +15,12 @@
 import asyncio
 import copy
 import uuid
+from unittest.mock import patch
 
 import langchain
 import pydantic_core
 import pytest
 from langchain.tools import tool
-from mock import patch
 from testing_support.fixtures import reset_core_stats_engine, validate_attributes
 from testing_support.ml_testing_utils import (
     disabled_ai_monitoring_record_content_settings,

tox.ini

@@ -251,7 +251,6 @@ deps =
     component_tastypie-tastypielatest: django<4.1
     component_tastypie-tastypielatest: asgiref<3.7.1  # asgiref==3.7.1 only suppport Python 3.10+
     coroutines_asyncio-{py37,py38,py39,py310,py311,py312,py313}: uvloop
-    cross_agent: mock==1.0.1
     cross_agent: requests
     datastore_asyncpg: asyncpg
     datastore_aiomcache: aiomcache