chore(ollama): switch to ty

Author: mdrxy

libs/partners/ollama/Makefile

@@ -37,24 +37,21 @@ integration_test:
 
 # Define a variable for Python and notebook files.
 PYTHON_FILES=.
-MYPY_CACHE=.mypy_cache
 lint format: PYTHON_FILES=.
 lint_diff format_diff: PYTHON_FILES=$(shell git diff --relative=libs/partners/ollama --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$')
 lint_package: PYTHON_FILES=langchain_ollama
 lint_tests: PYTHON_FILES=tests
-lint_tests: MYPY_CACHE=.mypy_cache_test
 UV_RUN_LINT = uv run --all-groups
-UV_RUN_TYPE = uv run --all-groups
 lint_package lint_tests: UV_RUN_LINT = uv run --group lint
 
 lint lint_diff lint_package lint_tests:
 	./scripts/lint_imports.sh
 	[ "$(PYTHON_FILES)" = "" ] || $(UV_RUN_LINT) ruff check $(PYTHON_FILES)
 	[ "$(PYTHON_FILES)" = "" ] || $(UV_RUN_LINT) ruff format $(PYTHON_FILES) --diff
-	[ "$(PYTHON_FILES)" = "" ] || mkdir -p $(MYPY_CACHE) && $(UV_RUN_TYPE) mypy $(PYTHON_FILES) --cache-dir $(MYPY_CACHE)
+	$(MAKE) type
 
 type:
-	mkdir -p $(MYPY_CACHE) && $(UV_RUN_TYPE) mypy $(PYTHON_FILES) --cache-dir $(MYPY_CACHE)
+	uv run --all-groups ty check langchain_ollama
 
 format format_diff:
 	[ "$(PYTHON_FILES)" = "" ] || $(UV_RUN_LINT) ruff format $(PYTHON_FILES)

libs/partners/ollama/langchain_ollama/__init__.py

@@ -15,13 +15,14 @@
 
 from importlib import metadata
 from importlib.metadata import PackageNotFoundError
+from typing import NoReturn
 
 from langchain_ollama.chat_models import ChatOllama
 from langchain_ollama.embeddings import OllamaEmbeddings
 from langchain_ollama.llms import OllamaLLM
 
 
-def _raise_package_not_found_error() -> None:
+def _raise_package_not_found_error() -> NoReturn:
     raise PackageNotFoundError
 
 

libs/partners/ollama/langchain_ollama/chat_models.py

@@ -1539,7 +1539,7 @@ class AnswerWithJustification(BaseModel):
             )
             if is_pydantic_schema:
                 output_parser: Runnable = PydanticToolsParser(
-                    tools=[schema],  # type: ignore[list-item]
+                    tools=[schema],  # ty: ignore[invalid-argument-type]
                     first_tool_only=True,
                 )
             else:
@@ -1555,7 +1555,7 @@ class AnswerWithJustification(BaseModel):
                 },
             )
             output_parser = (
-                PydanticOutputParser(pydantic_object=schema)  # type: ignore[arg-type]
+                PydanticOutputParser(pydantic_object=schema)  # ty: ignore[invalid-argument-type]
                 if is_pydantic_schema
                 else JsonOutputParser()
             )
@@ -1579,7 +1579,7 @@ class AnswerWithJustification(BaseModel):
                         "schema": schema,
                     },
                 )
-                output_parser = PydanticOutputParser(pydantic_object=schema)  # type: ignore[arg-type]
+                output_parser = PydanticOutputParser(pydantic_object=schema)
             else:
                 if is_typeddict(schema):
                     response_format = convert_to_json_schema(schema)

libs/partners/ollama/langchain_ollama/llms.py

@@ -475,7 +475,7 @@ def _generate(
                 **kwargs,
             )
             generations.append([final_chunk])
-        return LLMResult(generations=generations)  # type: ignore[arg-type]
+        return LLMResult(generations=generations)
 
     async def _agenerate(
         self,
@@ -494,7 +494,7 @@ async def _agenerate(
                 **kwargs,
             )
             generations.append([final_chunk])
-        return LLMResult(generations=generations)  # type: ignore[arg-type]
+        return LLMResult(generations=generations)
 
     def _stream(
         self,

libs/partners/ollama/pyproject.toml

@@ -51,7 +51,7 @@ test_integration = []
 lint = ["ruff>=0.13.1,<0.14.0"]
 dev = ["langchain-core"]
 typing = [
-    "mypy>=1.17.1,<2.0.0",
+    "ty>=0.0.1,<1.0.0",
     "langchain-core"
 ]
 
@@ -62,9 +62,6 @@ constraint-dependencies = ["pygments>=2.20.0"]
 langchain-core = { path = "../../core", editable = true }
 langchain-tests = { path = "../../standard-tests", editable = true }
 
-[tool.mypy]
-disallow_untyped_defs = "True"
-
 [tool.ruff.format]
 docstring-code-format = true
 docstring-code-line-length = 100