Repair CI (#1547)

* Fix issue in agent_features with sticky app name

* Fix imports in lanchain tests

* Fix imports in botocore tests

* Add additional hook path for langchain Chain

* Re-enable tests disabled for cryptography

* Re-enable tests disabled for httptools

* Re-enable tests disabled for pydantic-core

* Misc tox edits

* Repair event loop policy with uvloop

* Remove arbitrary pin

* Remove PyPy tests for mcp

* Remove pypy aiobotocore tests

* Disable aiobotocore py314 tests again

Author: TimPansino

newrelic/config.py

@@ -2097,6 +2097,9 @@ def _process_module_builtin_defaults():
     _process_module_definition(
         "langchain.chains.base", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_chains_base"
     )
+    _process_module_definition(
+        "langchain_classic.chains.base", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_chains_base"
+    )
     _process_module_definition(
         "langchain_core.callbacks.manager", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_callbacks_manager"
     )

tests/agent_features/test_agent_control_health_check.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import copy
 import re
 import sys
 import threading
@@ -37,6 +38,20 @@ def get_health_file_contents(tmp_path):
         return contents
 
 
+@pytest.fixture(scope="module", autouse=True)
+def restore_settings_fixture():
+    # Backup settings from before this test file runs
+    original_settings = global_settings()
+    backup = copy.deepcopy(original_settings.__dict__)
+
+    # Run tests
+    yield
+
+    # Restore settings after tests run
+    original_settings.__dict__.clear()
+    original_settings.__dict__.update(backup)
+
+
 @pytest.mark.parametrize("file_uri", ["", "file://", "/test/dir", "foo:/test/dir"])
 def test_invalid_file_directory_supplied(monkeypatch, file_uri):
     # Setup expected env vars to run agent control health check
@@ -247,6 +262,7 @@ def test_max_app_name_status(monkeypatch, tmp_path):
     file_path = tmp_path.as_uri()
     monkeypatch.setenv("NEW_RELIC_AGENT_CONTROL_HEALTH_DELIVERY_LOCATION", file_path)
 
+    # Set app name to exceed maximum allowed configured names
     _reset_configuration_done()
     initialize_agent(app_name="test1;test2;test3;test4")
     # Give time for the scheduler to kick in and write to the health file
@@ -259,7 +275,3 @@ def test_max_app_name_status(monkeypatch, tmp_path):
     assert contents[0] == "healthy: False\n"
     assert contents[1] == "status: The maximum number of configured app names (3) exceeded\n"
     assert contents[4] == "last_error: NR-APM-006\n"
-
-    # Set app name back to original name specific
-    settings = global_settings()
-    settings.app_name = "Python Agent Test (agent_features)"

tests/coroutines_asyncio/test_context_propagation.py

@@ -35,9 +35,18 @@
 try:
     import uvloop
 
-    loop_policies = (None, uvloop.EventLoopPolicy())
+    loop_policies = (pytest.param(None, id="asyncio"), pytest.param(uvloop.EventLoopPolicy(), id="uvloop"))
 except ImportError:
-    loop_policies = (None,)
+    loop_policies = (pytest.param(None, id="asyncio"),)
+
+
+@pytest.fixture(autouse=True)
+def reset_event_loop():
+    from asyncio import set_event_loop, set_event_loop_policy
+
+    # Remove the loop policy to avoid side effects
+    set_event_loop_policy(None)
+    set_event_loop(None)
 
 
 @function_trace("waiter3")
@@ -166,6 +175,7 @@ def test_two_transactions(event_loop, trace):
 
     tasks = []
 
+    asyncio.set_event_loop(event_loop)
     ready = asyncio.Event()
     done = asyncio.Event()
 
@@ -194,11 +204,11 @@ async def await_task():
     if sys.version_info >= (3, 10, 0):
         afut = asyncio.ensure_future(create_coro(), loop=event_loop)
         bfut = asyncio.ensure_future(await_task(), loop=event_loop)
-        event_loop.run_until_complete(asyncio.gather(afut, bfut))
     else:
         afut = asyncio.ensure_future(create_coro())
         bfut = asyncio.ensure_future(await_task())
-        asyncio.get_event_loop().run_until_complete(asyncio.gather(afut, bfut))
+
+    event_loop.run_until_complete(asyncio.gather(afut, bfut))
 
 
 # Sentinel left in cache transaction exited

tests/external_botocore/test_bedrock_chat_completion_via_langchain.py

@@ -57,10 +57,14 @@ def response_streaming(request):
 def exercise_model(bedrock_server, model_id, response_streaming):
     try:
         # These are only available in certain botocore environments.
-        from langchain.chains import ConversationChain
+        from langchain_classic.chains import ConversationChain
         from langchain_community.chat_models import BedrockChat
     except ImportError:
-        pytest.skip(reason="Langchain not installed.")
+        try:
+            from langchain.chains import ConversationChain
+            from langchain_community.chat_models import BedrockChat
+        except ImportError:
+            pytest.skip(reason="Langchain not installed.")
 
     def _exercise_model(prompt):
         bedrock_llm = BedrockChat(model_id=model_id, client=bedrock_server, streaming=response_streaming)

tests/mlmodel_langchain/test_agent.py

@@ -14,15 +14,24 @@
 
 import langchain
 import pytest
-from langchain.agents import AgentExecutor, create_openai_functions_agent
-from langchain.prompts import ChatPromptTemplate
 from langchain.tools import tool
 from langchain_core.prompts import MessagesPlaceholder
 from testing_support.fixtures import reset_core_stats_engine, validate_attributes
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 from newrelic.api.background_task import background_task
 
+# Moved in langchain v1.0.1
+try:
+    from langchain_classic.agents import AgentExecutor, create_openai_functions_agent
+except ImportError:
+    from langchain.agents import AgentExecutor, create_openai_functions_agent
+
+try:
+    from langchain_core.prompts import ChatPromptTemplate
+except Exception:
+    from langchain.prompts import ChatPromptTemplate
+
 
 @pytest.fixture
 def tools():

tests/mlmodel_langchain/test_chain.py

@@ -20,8 +20,6 @@
 import langchain_core
 import openai
 import pytest
-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 testing_support.fixtures import reset_core_stats_engine, validate_attributes
 from testing_support.ml_testing_utils import (
@@ -42,6 +40,20 @@
 from newrelic.api.transaction import add_custom_attribute
 from newrelic.common.object_names import callable_name
 
+try:
+    from langchain_classic.chains import create_retrieval_chain
+    from langchain_classic.chains.combine_documents import create_stuff_documents_chain
+    from langchain_classic.chains.openai_functions import (
+        create_structured_output_chain,
+        create_structured_output_runnable,
+    )
+    from langchain_core.output_parsers import BaseOutputParser
+except ImportError:
+    from langchain.chains import create_retrieval_chain
+    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.schema import BaseOutputParser
+
 _test_openai_chat_completion_messages = (
     {"role": "system", "content": "You are a scientist."},
     {"role": "user", "content": "What is 212 degrees Fahrenheit converted to Celsius?"},
@@ -1678,7 +1690,7 @@ def test_retrieval_chains(set_trace_info, retrieval_chain_prompt, embedding_open
     retriever = vectordb.as_retriever()
     question_answer_chain = create_stuff_documents_chain(llm=chat_openai_client, prompt=retrieval_chain_prompt)
 
-    rag_chain = langchain.chains.create_retrieval_chain(retriever, question_answer_chain)
+    rag_chain = create_retrieval_chain(retriever, question_answer_chain)
     response = rag_chain.invoke({"input": "math"})
 
     assert response
@@ -1746,7 +1758,7 @@ def prompt_openai_error():
 
 @pytest.fixture
 def comma_separated_list_output_parser():
-    class _CommaSeparatedListOutputParser(langchain.schema.BaseOutputParser):
+    class _CommaSeparatedListOutputParser(BaseOutputParser):
         """Parse the output of an LLM call to a comma-separated list."""
 
         def parse(self, text):

tox.ini

@@ -87,14 +87,12 @@ envlist =
     mongodb8-datastore_motor-{py38,py39,py310,py311,py312,py313,py314}-motorlatest,
     mongodb3-datastore_pymongo-{py38,py39,py310,py311,py312}-pymongo03,
     mongodb8-datastore_pymongo-{py38,py39,py310,py311,py312,py313,py314,pypy311}-pymongo04,
-    ; aiomysql tests on PyPy disabled for now due to issues building cryptography
-    mysql-datastore_aiomysql-{py38,py39,py310,py311,py312,py313,py314},
+    mysql-datastore_aiomysql-{py38,py39,py310,py311,py312,py313,py314,pypy311},
     mssql-datastore_pymssql-pymssqllatest-{py39,py310,py311,py312,py313,py314},
     mssql-datastore_pymssql-pymssql020301-py38,
     mysql-datastore_mysql-mysqllatest-{py38,py39,py310,py311,py312,py313,py314},
     mysql-datastore_mysqldb-{py38,py39,py310,py311,py312,py313,py314},
-    ; pymysql tests on PyPy disabled for now due to issues building cryptography
-    mysql-datastore_pymysql-{py38,py39,py310,py311,py312,py313,py314},
+    mysql-datastore_pymysql-{py38,py39,py310,py311,py312,py313,py314,pypy311},
     oracledb-datastore_oracledb-{py39,py310,py311,py312,py313,py314}-oracledblatest,
     oracledb-datastore_oracledb-{py39,py313,py314}-oracledb02,
     oracledb-datastore_oracledb-{py39,py312}-oracledb01,
@@ -116,7 +114,6 @@ envlist =
     ; python-adapter_gunicorn-py314-aiohttp03-gunicornlatest,
     python-adapter_hypercorn-{py38,py39,py310,py311,py312,py313,py314}-hypercornlatest,
     python-adapter_hypercorn-py38-hypercorn{0010,0011,0012,0013},
-    ; mcp tests on PyPy disabled for now due to issues building cryptography
     python-adapter_mcp-{py310,py311,py312,py313,py314},
     python-adapter_uvicorn-{py38,py39,py310,py311,py312,py313,py314}-uvicornlatest,
     python-adapter_uvicorn-py38-uvicorn014,
@@ -132,7 +129,7 @@ envlist =
     python-coroutines_asyncio-{py38,py39,py310,py311,py312,py313,py314,pypy311},
     python-datastore_sqlite-{py38,py39,py310,py311,py312,py313,py314,pypy311},
     python-external_aiobotocore-{py38,py39,py310,py311,py312,py313}-aiobotocorelatest,
-    ;; Package not ready for Python 3.14 or PyPy 3.11 (httptools fails to compile)
+    ;; Package not ready for Python 3.14 (hangs when running)
     ; python-external_aiobotocore-py314-aiobotocorelatest,
     python-external_botocore-{py38,py39,py310,py311,py312,py313,py314}-botocorelatest,
     python-external_botocore-{py311}-botocorelatest-langchain,
@@ -143,7 +140,7 @@ envlist =
     python-external_httplib-{py38,py39,py310,py311,py312,py313,py314,pypy311},
     python-external_httplib2-{py38,py39,py310,py311,py312,py313,py314,pypy311},
     # pyzeebe requires grpcio which does not support pypy
-    python-external_pyzeebe-{py39,py310,py311,py312},
+    python-external_pyzeebe-{py39,py310,py311,py312,py313,py314},
     python-external_requests-{py38,py39,py310,py311,py312,py313,py314,pypy311},
     python-external_urllib3-{py38,py39,py310,py311,py312,py313,py314,pypy311}-urllib3latest,
     python-external_urllib3-{py312,py313,py314,pypy311}-urllib30126,
@@ -170,9 +167,7 @@ envlist =
     python-framework_pyramid-{py38,py39,py310,py311,py312,py313,py314,pypy311}-Pyramidlatest,
     python-framework_pyramid-{py38,py39,py310,py311,py312,py313,py314,pypy311}-cornicelatest,
     python-framework_sanic-py38-sanic2406,
-    python-framework_sanic-{py39,py310,py311,py312,py313}-saniclatest,
-    ;; Package not ready for Python 3.14 or PyPy 3.11 (httptools fails to compile)
-    ; python-framework_sanic-{py314,pypy311}-saniclatest,
+    python-framework_sanic-{py39,py310,py311,py312,py313,py314,pypy311}-saniclatest,
     python-framework_sanic-py38-sanic2290,
     python-framework_starlette-{py310,pypy311}-starlette{0014,0015,0019,0028},
     python-framework_starlette-{py38,py39,py310,py311,py312,py313,py314,pypy311}-starlettelatest,
@@ -184,14 +179,11 @@ envlist =
     python-logger_logging-{py38,py39,py310,py311,py312,py313,py314,pypy311},
     python-logger_loguru-{py38,py39,py310,py311,py312,py313,py314,pypy311}-logurulatest,
     python-logger_structlog-{py38,py39,py310,py311,py312,py313,py314,pypy311}-structloglatest,
-    python-mlmodel_autogen-{py310,py311,py312,py313,py314}-autogen061,
-    python-mlmodel_autogen-{py310,py311,py312,py313,py314}-autogenlatest,
-    ;; Package not ready for PyPy 3.11 (pydantic-core not updated)
-    ; python-mlmodel_autogen-pypy311-autogen061,
-    ; python-mlmodel_autogen-pypy311-autogenlatest,
+    python-mlmodel_autogen-{py310,py311,py312,py313,py314,pypy311}-autogen061,
+    python-mlmodel_autogen-{py310,py311,py312,py313,py314,pypy311}-autogenlatest,
     python-mlmodel_gemini-{py39,py310,py311,py312,py313,py314},
     python-mlmodel_langchain-{py39,py310,py311,py312,py313},
-    ;; Package not ready for Python 3.14 (pydantic not updated)
+    ;; Package not ready for Python 3.14 (type annotations not updated)
     ; python-mlmodel_langchain-py314,
     python-mlmodel_openai-openai0-{py38,py39,py310,py311,py312},
     python-mlmodel_openai-openai107-py312,
@@ -236,7 +228,6 @@ deps =
     adapter_gevent: gevent
     adapter_gevent: urllib3
     adapter_gunicorn-aiohttp03: aiohttp<4.0
-    adapter_gunicorn-aiohttp03-py312: aiohttp==3.9.0rc0
     adapter_gunicorn-gunicorn19: gunicorn<20
     adapter_gunicorn-gunicornlatest: gunicorn
     adapter_hypercorn-hypercornlatest: hypercorn[h3]