Add LangChain 1.x support

libs/oci/langchain_oci/chat_models/oci_data_science.py

@@ -31,7 +31,12 @@
     agenerate_from_stream,
     generate_from_stream,
 )
-from langchain_core.messages import AIMessageChunk, BaseMessage, BaseMessageChunk
+from langchain_core.messages import (
+    AIMessage,
+    AIMessageChunk,
+    BaseMessage,
+    BaseMessageChunk,
+)
 from langchain_core.output_parsers import (
     JsonOutputParser,
     PydanticOutputParser,
@@ -765,10 +770,14 @@ def _process_response(self, response_json: dict) -> ChatResult:
 
     def bind_tools(
         self,
-        tools: Sequence[Union[Dict[str, Any], Type[BaseModel], Callable, BaseTool]],
+        tools: Sequence[Union[Dict[str, Any], type, Callable, BaseTool]],
+        *,
+        tool_choice: Optional[str] = None,
         **kwargs: Any,
-    ) -> Runnable[LanguageModelInput, BaseMessage]:
+    ) -> Runnable[LanguageModelInput, AIMessage]:
         formatted_tools = [convert_to_openai_tool(tool) for tool in tools]
+        if tool_choice is not None:
+            kwargs["tool_choice"] = tool_choice
         return super().bind(tools=formatted_tools, **kwargs)
 
 

libs/oci/langchain_oci/chat_models/oci_generative_ai.py

@@ -1236,14 +1236,14 @@ def _prepare_request(
 
     def bind_tools(
         self,
-        tools: Sequence[Union[Dict[str, Any], Type[BaseModel], Callable, BaseTool]],
+        tools: Sequence[Union[Dict[str, Any], type, Callable, BaseTool]],
         *,
         tool_choice: Optional[
             Union[dict, str, Literal["auto", "none", "required", "any"], bool]
         ] = None,
         parallel_tool_calls: Optional[bool] = None,
         **kwargs: Any,
-    ) -> Runnable[LanguageModelInput, BaseMessage]:
+    ) -> Runnable[LanguageModelInput, AIMessage]:
         """Bind tool-like objects to this chat model.
 
         Assumes model is compatible with Meta's tool-calling API.

libs/oci/pyproject.toml

@@ -4,16 +4,16 @@ version = "0.2.0"
 description = "An integration package connecting OCI and LangChain"
 readme = "README.md"
 license = "UPL-1.0"
-requires-python = ">=3.9,<4.0"
+requires-python = ">=3.10,<4.0"
 dependencies = [
-    "langchain-core>=0.3.78,<1.0.0",
-    "langchain>=0.3.20,<1.0.0",
+    "langchain-core>=1.1.0,<2.0.0",
+    "langchain>=1.0.0,<2.0.0",
     "oci>=2.161.0",
     "pydantic>=2,<3",
     "aiohttp>=3.12.14",
     "openai>=2.6.1",
     "oci-openai>=1.0.0",
-    "langchain-openai>=0.3.35",
+    "langchain-openai>=1.0.0,<2.0.0",
 ]
 
 [project.urls]
@@ -27,18 +27,18 @@ package-mode = true
 optional = true
 
 [tool.poetry.group.test.dependencies]
-pytest = "^7.4.3"
+pytest = "^8.0.0"
 pytest-cov = "^4.1.0"
 syrupy = "^4.0.2"
 pytest-asyncio = "^0.23.2"
 pytest-watcher = "^0.3.4"
-langchain-tests = "^0.3.12"
+langchain-tests = "^1.0.0"
 pytest-socket = "^0.7.0"
 pytest-mock = "^3.15.0"
-pytest-httpx = "^0.28.0"
+pytest-httpx = ">=0.30.0"
 responses = "^0.25.8"
-langgraph = "^0.2.0"
-langchain-openai = "^0.3.35"
+langgraph = "^1.0.0"
+langchain-openai = "^1.0.0"
 
 
 [tool.poetry.group.codespell]
@@ -51,7 +51,7 @@ codespell = "^2.2.6"
 optional = true
 
 [tool.poetry.group.test_integration.dependencies]
-langgraph = "^0.2.0"
+langgraph = "^1.0.0"
 
 [tool.poetry.group.lint]
 optional = true