Improve mypy config (#622)

cbornet · web-flow · commit 8e10a4f1cb8c · 2024-07-30T01:02:41.000+02:00
diff --git a/libs/colbert/pyproject.toml b/libs/colbert/pyproject.toml
@@ -32,21 +32,14 @@ pytest-asyncio = "^0.23.6"
 asyncio_mode = "auto"
 
 [tool.mypy]
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
+strict = true
 follow_imports = "normal"
-ignore_missing_imports = true
-no_implicit_reexport = true
 show_error_codes = true
 show_error_context = true
-strict_equality = true
-strict_optional = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = "colbert.*,cassandra.cluster.*"
+ignore_missing_imports = true
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/libs/colbert/tests/unit_tests/baseline_tensors.py b/libs/colbert/tests/unit_tests/baseline_tensors.py
@@ -1,7 +1,6 @@
 import torch
 
 # fmt: off
-# ruff: noqa: E501
 baseline_tensors = [
     torch.tensor([-0.0855,  0.0171, -0.0917,  0.0023,  0.0630,  0.0211,  0.0054,  0.1178,
          0.0086, -0.1145, -0.0220,  0.0094,  0.0973, -0.2913, -0.1577, -0.1720,
diff --git a/libs/knowledge-graph/pyproject.toml b/libs/knowledge-graph/pyproject.toml
@@ -43,21 +43,14 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.mypy]
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
+strict = true
 follow_imports = "normal"
-ignore_missing_imports = true
-no_implicit_reexport = true
 show_error_codes = true
 show_error_context = true
-strict_equality = true
-strict_optional = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = "testcontainers.*,cassandra.*,graphviz.*"
+ignore_missing_imports = true
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
@@ -138,4 +131,4 @@ select = [
     "D",
     "S101",
     "T20",
-]
+]
diff --git a/libs/knowledge-store/pyproject.toml b/libs/knowledge-store/pyproject.toml
@@ -37,22 +37,15 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.mypy]
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
+strict = true
 follow_imports = "normal"
-ignore_missing_imports = true
-no_implicit_reexport = true
 show_error_codes = true
 show_error_context = true
-strict_equality = true
-strict_optional = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = "simsimd.*,cassandra.*"
+ignore_missing_imports = true
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
-asyncio_mode = "auto"
+asyncio_mode = "auto"
diff --git a/libs/langchain/pyproject.toml b/libs/langchain/pyproject.toml
@@ -44,21 +44,14 @@ pytest-asyncio = "^0.23.6"
 mypy = "^1.11.0"
 
 [tool.mypy]
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
+strict = true
 follow_imports = "normal"
-ignore_missing_imports = true
-no_implicit_reexport = true
 show_error_codes = true
 show_error_context = true
-strict_equality = true
-strict_optional = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = "transformers.*,cassandra.*"
+ignore_missing_imports = true
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
diff --git a/libs/llamaindex/pyproject.toml b/libs/llamaindex/pyproject.toml
@@ -52,21 +52,15 @@ ragstack-ai-tests-utils = { path = "../tests-utils", develop = true }
 ragstack-ai-colbert = { path = "../colbert", develop = true }
 
 [tool.mypy]
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
+strict = true
 follow_imports = "normal"
-ignore_missing_imports = true
-no_implicit_reexport = true
 show_error_codes = true
 show_error_context = true
-strict_equality = true
-strict_optional = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+# TODO: add py.typed to llama-index packages
+module = "llama_index.vector_stores.astra_db.*,llama_index.vector_stores.cassandra.*,cassandra.*"
+ignore_missing_imports = true
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/libs/ragulate/colbert_chunk_size_and_k.py b/libs/ragulate/colbert_chunk_size_and_k.py
@@ -1,4 +1,3 @@
-# ruff: noqa: D103, INP001, T201
 from __future__ import annotations
 
 import logging
diff --git a/libs/ragulate/open_ai_chunk_size_and_k.py b/libs/ragulate/open_ai_chunk_size_and_k.py
@@ -1,4 +1,3 @@
-# ruff: noqa: D103, INP001, T201
 import os
 from typing import Any
 
diff --git a/libs/ragulate/poetry.lock b/libs/ragulate/poetry.lock
diff --git a/libs/ragulate/pyproject.toml b/libs/ragulate/pyproject.toml
@@ -31,13 +31,19 @@ seaborn = "^0.13.2"
 black = "^24.4.2"
 isort = "^5.13.2"
 langchain-astradb = "0.3.3"
-langchain-community = "0.0.38"
-langchain-core = "0.1.52"
-langchain-openai = "0.1.3"
+langchain-community = "^0.2.5"
+langchain-core = "^0.2.9"
+langchain-openai = "^0.1.3"
 pytest = "^8.2.2"
 mypy = "^1.11.0"
 types-pyyaml = "^6.0.1"
 types-aiofiles = "^23.2.0.0"
+types-seaborn = "^0.13.2"
+types-setuptools = "^70.0.0"
+types-tqdm = ">=4.66.0"
+pandas-stubs = ">=2.2.2"
+ragstack-ai-colbert = "^1.0.5"
+ragstack-ai-langchain = "^1.3.0"
 
 [build-system]
 requires = ["poetry-core", "wheel"]
@@ -49,18 +55,12 @@ test_unit = "scripts.test_unit_runner:main"
 test_integration = "scripts.test_integration_runner:main"
 
 [tool.mypy]
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
+strict = true
 follow_imports = "normal"
-ignore_missing_imports = true
-no_implicit_reexport = true
 show_error_codes = true
 show_error_context = true
-strict_equality = true
-strict_optional = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+# TODO: remove ragstack exclusions once packages containing py.typed are published
+module = "trulens_eval.*,plotly.*,cerberus.*,transformers.*,ragstack_colbert.*,ragstack_langchain.*"
+ignore_missing_imports = true
diff --git a/libs/ragulate/ragstack_ragulate/pipelines/query_pipeline.py b/libs/ragulate/ragstack_ragulate/pipelines/query_pipeline.py
@@ -10,7 +10,7 @@
 from trulens_eval import Tru, TruChain
 from trulens_eval.feedback.provider import AzureOpenAI, Huggingface, LLMProvider, OpenAI
 from trulens_eval.schema.feedback import FeedbackMode, FeedbackResultStatus
-from typing_extensions import override
+from typing_extensions import Never, override
 
 from ragstack_ragulate.logging_config import logger
 from ragstack_ragulate.utils import get_tru
@@ -29,7 +29,7 @@ class QueryPipeline(BasePipeline):
 
     _tru: Tru
     _name: str
-    _progress: tqdm
+    _progress: tqdm[Never]
     _queries: dict[str, list[str]]
     _golden_sets: dict[str, list[dict[str, str]]]
     _total_queries: int = 0
diff --git a/libs/tests-utils/pyproject.toml b/libs/tests-utils/pyproject.toml
@@ -20,21 +20,14 @@ pytest = "^7.3.0"
 mypy = "^1.10.0"
 
 [tool.mypy]
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
+strict = true
 follow_imports = "normal"
-ignore_missing_imports = true
-no_implicit_reexport = true
 show_error_codes = true
 show_error_context = true
-strict_equality = true
-strict_optional = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = "testcontainers.*,cassandra.*"
+ignore_missing_imports = true
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/libs/tests-utils/ragstack_tests_utils/cassandra_container.py b/libs/tests-utils/ragstack_tests_utils/cassandra_container.py
@@ -5,7 +5,7 @@
 from typing_extensions import Self
 
 
-class CassandraContainer(DockerContainer):
+class CassandraContainer(DockerContainer):  # type: ignore[misc]
     def __init__(
         self,
         image: str = "docker.io/stargateio/dse-next:4.0.11-b259738f492f",
diff --git a/pyproject.toml b/pyproject.toml
@@ -130,6 +130,14 @@ select = [
     "UP006", # Incompatible with Pydantic v1
     "UP007", # Incompatible with Pydantic v1
 ]
+"libs/ragulate/{colbert,open_ai}_chunk_size_and_k.py" = [
+    "D103",
+    "INP001",
+    "T201",
+]
+"libs/colbert/tests/unit_tests/baseline_tensors.py" = [
+    "E501", # Generated file
+]
 "**/{examples,notebooks,tests,e2e-tests,tests-utils}/*" = [
     "D",
     "S101",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# ruff: noqa: D103, INP001, T201`
`2`	`1`	`from __future__ import annotations`
`3`	`2`
`4`	`3`	`import logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# ruff: noqa: D103, INP001, T201`
`2`	`1`	`import os`
`3`	`2`	`from typing import Any`
`4`	`3`