Factor in changes in directory structure for v1.3.9

Author: lrafeei

tests/mlmodel_langchain/test_chain.py

@@ -38,18 +38,29 @@
 from newrelic.common.object_names import callable_name
 
 try:
-    from langchain_classic.chains import create_retrieval_chain
+    from langchain_classic.chains.retrieval 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
+    # Before Langchain v1.3.9
+    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:
+        # Before Langchain v1.0.0
+        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
 
 
 chat_completion_recorded_events_invoke_langchain_error = [

tox.ini

@@ -469,6 +469,7 @@ deps =
     mlmodel_langchain: langchain-core
     mlmodel_langchain: langchain-community
     mlmodel_langchain: langchain-openai
+    mlmodel_langchain: langchain-classic
     mlmodel_langchain: aiohttp<3.14.0
     mlmodel_langchain: langgraph
     mlmodel_langchain: pypdf