langchain-ollama 0.1.2__tar.gz → 0.2.0__tar.gz

{langchain_ollama-0.1.2 → langchain_ollama-0.2.0}/PKG-INFO

@@ -1,17 +1,17 @@
 Metadata-Version: 2.1
 Name: langchain-ollama
-Version: 0.1.2
+Version: 0.2.0
 Summary: An integration package connecting Ollama and LangChain
 Home-page: https://github.com/langchain-ai/langchain
 License: MIT
-Requires-Python: >=3.8.1,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: langchain-core (==0.2.36)
+Requires-Dist: langchain-core (>=0.3.0,<0.4.0)
 Requires-Dist: ollama (>=0.3.0,<1)
 Project-URL: Repository, https://github.com/langchain-ai/langchain
 Project-URL: Release Notes, https://github.com/langchain-ai/langchain/releases?q=tag%3A%22langchain-ollama%3D%3D0%22&expanded=true

{langchain_ollama-0.1.2 → langchain_ollama-0.2.0}/langchain_ollama/chat_models.py

@@ -35,11 +35,12 @@ from langchain_core.messages import (
 from langchain_core.messages.ai import UsageMetadata
 from langchain_core.messages.tool import tool_call
 from langchain_core.outputs import ChatGeneration, ChatGenerationChunk, ChatResult
-from langchain_core.pydantic_v1 import Field, root_validator
 from langchain_core.runnables import Runnable
 from langchain_core.tools import BaseTool
 from langchain_core.utils.function_calling import convert_to_openai_tool
 from ollama import AsyncClient, Client, Message, Options
+from pydantic import PrivateAttr, model_validator
+from typing_extensions import Self
 
 
 def _get_usage_metadata_from_generation_info(
@@ -91,7 +92,9 @@ def _lc_tool_call_to_openai_tool_call(tool_call: ToolCall) -> dict:
 class ChatOllama(BaseChatModel):
     """Ollama chat model integration.
 
-    Setup:
+    .. dropdown:: Setup
+        :open:
+
         Install ``langchain-ollama`` and download any models you want to use from ollama.
 
         .. code-block:: bash
@@ -225,7 +228,7 @@ class ChatOllama(BaseChatModel):
         .. code-block:: python
 
             from langchain_ollama import ChatOllama
-            from langchain_core.pydantic_v1 import BaseModel, Field
+            from pydantic import BaseModel, Field
 
             class Multiply(BaseModel):
                 a: int = Field(..., description="First integer")
@@ -328,12 +331,12 @@ class ChatOllama(BaseChatModel):
     For a full list of the params, see [this link](https://pydoc.dev/httpx/latest/httpx.Client.html)
     """
 
-    _client: Client = Field(default=None)
+    _client: Client = PrivateAttr(default=None)
     """
     The client to use for making requests.
     """
 
-    _async_client: AsyncClient = Field(default=None)
+    _async_client: AsyncClient = PrivateAttr(default=None)
     """
     The async client to use for making requests.
     """
@@ -364,14 +367,13 @@ class ChatOllama(BaseChatModel):
             "keep_alive": self.keep_alive,
         }
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def _set_clients(cls, values: dict) -> dict:
+    @model_validator(mode="after")
+    def _set_clients(self) -> Self:
         """Set clients to use for ollama."""
-        values["_client"] = Client(host=values["base_url"], **values["client_kwargs"])
-        values["_async_client"] = AsyncClient(
-            host=values["base_url"], **values["client_kwargs"]
-        )
-        return values
+        client_kwargs = self.client_kwargs or {}
+        self._client = Client(host=self.base_url, **client_kwargs)
+        self._async_client = AsyncClient(host=self.base_url, **client_kwargs)
+        return self
 
     def _convert_messages_to_ollama_messages(
         self, messages: List[BaseMessage]

{langchain_ollama-0.1.2 → langchain_ollama-0.2.0}/langchain_ollama/embeddings.py

@@ -4,8 +4,14 @@ from typing import (
 )
 
 from langchain_core.embeddings import Embeddings
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
 from ollama import AsyncClient, Client
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    PrivateAttr,
+    model_validator,
+)
+from typing_extensions import Self
 
 
 class OllamaEmbeddings(BaseModel, Embeddings):
@@ -126,29 +132,27 @@ class OllamaEmbeddings(BaseModel, Embeddings):
     For a full list of the params, see [this link](https://pydoc.dev/httpx/latest/httpx.Client.html)
     """
 
-    _client: Client = Field(default=None)
+    _client: Client = PrivateAttr(default=None)
     """
     The client to use for making requests.
     """
 
-    _async_client: AsyncClient = Field(default=None)
+    _async_client: AsyncClient = PrivateAttr(default=None)
     """
     The async client to use for making requests.
     """
 
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = "forbid"
+    model_config = ConfigDict(
+        extra="forbid",
+    )
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def _set_clients(cls, values: dict) -> dict:
+    @model_validator(mode="after")
+    def _set_clients(self) -> Self:
         """Set clients to use for ollama."""
-        values["_client"] = Client(host=values["base_url"], **values["client_kwargs"])
-        values["_async_client"] = AsyncClient(
-            host=values["base_url"], **values["client_kwargs"]
-        )
-        return values
+        client_kwargs = self.client_kwargs or {}
+        self._client = Client(host=self.base_url, **client_kwargs)
+        self._async_client = AsyncClient(host=self.base_url, **client_kwargs)
+        return self
 
     def embed_documents(self, texts: List[str]) -> List[List[float]]:
         """Embed search docs."""

{langchain_ollama-0.1.2 → langchain_ollama-0.2.0}/langchain_ollama/llms.py

@@ -18,8 +18,9 @@ from langchain_core.callbacks import (
 )
 from langchain_core.language_models import BaseLLM, LangSmithParams
 from langchain_core.outputs import GenerationChunk, LLMResult
-from langchain_core.pydantic_v1 import Field, root_validator
 from ollama import AsyncClient, Client, Options
+from pydantic import PrivateAttr, model_validator
+from typing_extensions import Self
 
 
 class OllamaLLM(BaseLLM):
@@ -115,12 +116,12 @@ class OllamaLLM(BaseLLM):
     For a full list of the params, see [this link](https://pydoc.dev/httpx/latest/httpx.Client.html)
     """
 
-    _client: Client = Field(default=None)
+    _client: Client = PrivateAttr(default=None)
     """
     The client to use for making requests.
     """
 
-    _async_client: AsyncClient = Field(default=None)
+    _async_client: AsyncClient = PrivateAttr(default=None)
     """
     The async client to use for making requests.
     """
@@ -164,14 +165,13 @@ class OllamaLLM(BaseLLM):
             params["ls_max_tokens"] = max_tokens
         return params
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def _set_clients(cls, values: dict) -> dict:
+    @model_validator(mode="after")
+    def _set_clients(self) -> Self:
         """Set clients to use for ollama."""
-        values["_client"] = Client(host=values["base_url"], **values["client_kwargs"])
-        values["_async_client"] = AsyncClient(
-            host=values["base_url"], **values["client_kwargs"]
-        )
-        return values
+        client_kwargs = self.client_kwargs or {}
+        self._client = Client(host=self.base_url, **client_kwargs)
+        self._async_client = AsyncClient(host=self.base_url, **client_kwargs)
+        return self
 
     async def _acreate_generate_stream(
         self,

{langchain_ollama-0.1.2 → langchain_ollama-0.2.0}/pyproject.toml

@@ -1,91 +1,86 @@
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
 [tool.poetry]
 name = "langchain-ollama"
-version = "0.1.2"
+version = "0.2.0"
 description = "An integration package connecting Ollama and LangChain"
 authors = []
 readme = "README.md"
 repository = "https://github.com/langchain-ai/langchain"
 license = "MIT"
 
+[tool.mypy]
+disallow_untyped_defs = "True"
+
 [tool.poetry.urls]
 "Source Code" = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/ollama"
 "Release Notes" = "https://github.com/langchain-ai/langchain/releases?q=tag%3A%22langchain-ollama%3D%3D0%22&expanded=true"
 
 [tool.poetry.dependencies]
-python = ">=3.8.1,<4.0"
+python = ">=3.9,<4.0"
 ollama = ">=0.3.0,<1"
-langchain-core = "0.2.36"
+langchain-core = "^0.3.0"
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "T201"]
+
+[tool.coverage.run]
+omit = ["tests/*"]
+
+[tool.pytest.ini_options]
+addopts = "--snapshot-warn-unused --strict-markers --strict-config --durations=5"
+markers = [
+    "compile: mark placeholder test used to compile integration tests without running them",
+]
+asyncio_mode = "auto"
 
 [tool.poetry.group.test]
 optional = true
 
+[tool.poetry.group.codespell]
+optional = true
+
+[tool.poetry.group.test_integration]
+optional = true
+
+[tool.poetry.group.lint]
+optional = true
+
+[tool.poetry.group.dev]
+optional = true
+
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.3"
 pytest-asyncio = "^0.23.2"
 syrupy = "^4.0.2"
 pytest-socket = "^0.7.0"
-langchain-core = { path = "../../core", develop = true }
-langchain-standard-tests = { path = "../../standard-tests", develop = true }
-
-[tool.poetry.group.codespell]
-optional = true
+pytest-watcher = "^0.3.4"
 
 [tool.poetry.group.codespell.dependencies]
 codespell = "^2.2.6"
 
-[tool.poetry.group.test_integration]
-optional = true
-
 [tool.poetry.group.test_integration.dependencies]
 
-[tool.poetry.group.lint]
-optional = true
-
 [tool.poetry.group.lint.dependencies]
 ruff = "^0.1.8"
 
 [tool.poetry.group.typing.dependencies]
 mypy = "^1.7.1"
-langchain-core = { path = "../../core", develop = true }
 
-[tool.poetry.group.dev]
-optional = true
+[tool.poetry.group.test.dependencies.langchain-core]
+path = "../../core"
+develop = true
 
-[tool.poetry.group.dev.dependencies]
-langchain-core = { path = "../../core", develop = true }
+[tool.poetry.group.test.dependencies.langchain-standard-tests]
+path = "../../standard-tests"
+develop = true
 
-[tool.ruff.lint]
-select = [
-  "E",    # pycodestyle
-  "F",    # pyflakes
-  "I",    # isort
-  "T201", # print
-]
+[tool.poetry.group.typing.dependencies.langchain-core]
+path = "../../core"
+develop = true
 
-[tool.mypy]
-disallow_untyped_defs = "True"
-
-[tool.coverage.run]
-omit = ["tests/*"]
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.pytest.ini_options]
-# --strict-markers will raise errors on unknown marks.
-# https://docs.pytest.org/en/7.1.x/how-to/mark.html#raising-errors-on-unknown-marks
-#
-# https://docs.pytest.org/en/7.1.x/reference/reference.html
-# --strict-config       any warnings encountered while parsing the `pytest`
-#                       section of the configuration file raise errors.
-#
-# https://github.com/tophat/syrupy
-# --snapshot-warn-unused    Prints a warning on unused snapshots rather than fail the test suite.
-addopts = "--snapshot-warn-unused --strict-markers --strict-config --durations=5"
-# Registering custom markers.
-# https://docs.pytest.org/en/7.1.x/example/markers.html#registering-markers
-markers = [
-  "compile: mark placeholder test used to compile integration tests without running them",
-]
-asyncio_mode = "auto"
+[tool.poetry.group.dev.dependencies.langchain-core]
+path = "../../core"
+develop = true