nomic[patch]: ruff fixes and rules (#31922)

* bump ruff deps
* add more thorough ruff rules
* fix said rules
* fix makefile targets

Author: mdrxy

libs/partners/nomic/Makefile

@@ -35,13 +35,13 @@ lint_tests: PYTHON_FILES=tests
 lint_tests: MYPY_CACHE=.mypy_cache_test
 
 lint lint_diff lint_package lint_tests:
-	[ "$(PYTHON_FILES)" = "" ] || uv run --all-groups ruff $(PYTHON_FILES)
+	[ "$(PYTHON_FILES)" = "" ] || uv run --all-groups ruff check $(PYTHON_FILES)
 	[ "$(PYTHON_FILES)" = "" ] || uv run --all-groups ruff format $(PYTHON_FILES) --diff
 	[ "$(PYTHON_FILES)" = "" ] || mkdir -p $(MYPY_CACHE) && uv run --all-groups mypy $(PYTHON_FILES) --cache-dir $(MYPY_CACHE)
 
 format format_diff:
 	[ "$(PYTHON_FILES)" = "" ] || uv run --all-groups ruff format $(PYTHON_FILES)
-	[ "$(PYTHON_FILES)" = "" ] || uv run --all-groups ruff --fix $(PYTHON_FILES)
+	[ "$(PYTHON_FILES)" = "" ] || uv run --all-groups ruff check --fix $(PYTHON_FILES)
 
 spell_check:
 	uv run --all-groups codespell --toml pyproject.toml

libs/partners/nomic/langchain_nomic/embeddings.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 from typing import Literal, Optional, overload
 
@@ -16,6 +18,7 @@ class NomicEmbeddings(Embeddings):
             from langchain_nomic import NomicEmbeddings
 
             model = NomicEmbeddings()
+
     """
 
     @overload
@@ -26,8 +29,7 @@ def __init__(
         nomic_api_key: Optional[str] = ...,
         dimensionality: Optional[int] = ...,
         inference_mode: Literal["remote"] = ...,
-    ):
-        ...
+    ): ...
 
     @overload
     def __init__(
@@ -38,8 +40,7 @@ def __init__(
         dimensionality: Optional[int] = ...,
         inference_mode: Literal["local", "dynamic"],
         device: Optional[str] = ...,
-    ):
-        ...
+    ): ...
 
     @overload
     def __init__(
@@ -50,8 +51,7 @@ def __init__(
         dimensionality: Optional[int] = ...,
         inference_mode: str,
         device: Optional[str] = ...,
-    ):
-        ...
+    ): ...
 
     def __init__(
         self,
@@ -77,6 +77,8 @@ def __init__(
                 ``'cpu'``, ``'gpu'``, ``'nvidia'``, ``'amd'``, or a specific device
                 name. See the docstring for ``GPT4All.__init__`` for more info.
                 Typically defaults to ``'cpu'``. Do not use on macOS.
+            vision_model: The vision model to use for image embeddings.
+
         """
         _api_key = nomic_api_key or os.environ.get("NOMIC_API_KEY")
         if _api_key:
@@ -94,8 +96,8 @@ def embed(self, texts: list[str], *, task_type: str) -> list[list[float]]:
             texts: list of texts to embed
             task_type: the task type to use when embedding. One of ``'search_query'``,
                 ``'search_document'``, ``'classification'``, ``'clustering'``
-        """
 
+        """
         output = embed.text(
             texts=texts,
             model=self.model,
@@ -111,6 +113,7 @@ def embed_documents(self, texts: list[str]) -> list[list[float]]:
 
         Args:
             texts: list of texts to embed as documents
+
         """
         return self.embed(
             texts=texts,
@@ -122,6 +125,7 @@ def embed_query(self, text: str) -> list[float]:
 
         Args:
             text: query text
+
         """
         return self.embed(
             texts=[text],

libs/partners/nomic/pyproject.toml

@@ -45,14 +45,62 @@ target-version = "py39"
 
 [tool.ruff.lint]
 select = [
-    "E",    # pycodestyle
-    "F",    # pyflakes
-    "I",    # isort
-    "T201", # print
-    "UP",   # pyupgrade
-    "S",    # flake8-bandit
+    "A",      # flake8-builtins
+    "B",      # flake8-bugbear
+    "ASYNC",  # flake8-async
+    "C4",     # flake8-comprehensions
+    "COM",    # flake8-commas
+    "D",      # pydocstyle
+    "DOC",    # pydoclint
+    "E",      # pycodestyle error
+    "EM",     # flake8-errmsg
+    "F",      # pyflakes
+    "FA",     # flake8-future-annotations
+    "FBT",    # flake8-boolean-trap
+    "FLY",    # flake8-flynt
+    "I",      # isort
+    "ICN",    # flake8-import-conventions
+    "INT",    # flake8-gettext
+    "ISC",    # isort-comprehensions
+    "PGH",    # pygrep-hooks
+    "PIE",    # flake8-pie
+    "PERF",   # flake8-perf
+    "PYI",    # flake8-pyi
+    "Q",      # flake8-quotes
+    "RET",    # flake8-return
+    "RSE",    # flake8-rst-docstrings
+    "RUF",    # ruff
+    "S",      # flake8-bandit
+    "SLF",    # flake8-self
+    "SLOT",   # flake8-slots
+    "SIM",    # flake8-simplify
+    "T10",    # flake8-debugger
+    "T20",    # flake8-print
+    "TID",    # flake8-tidy-imports
+    "UP",     # pyupgrade
+    "W",      # pycodestyle warning
+    "YTT",    # flake8-2020
 ]
-ignore = [ "UP007", ]
+ignore = [
+    "D100",    # pydocstyle: Missing docstring in public module
+    "D101",    # pydocstyle: Missing docstring in public class
+    "D102",    # pydocstyle: Missing docstring in public method
+    "D103",    # pydocstyle: Missing docstring in public function
+    "D104",    # pydocstyle: Missing docstring in public package
+    "D105",    # pydocstyle: Missing docstring in magic method
+    "D107",    # pydocstyle: Missing docstring in __init__
+    "D203",    # Messes with the formatter
+    "D407",    # pydocstyle: Missing-dashed-underline-after-section
+    "COM812",  # Messes with the formatter
+    "ISC001",  # Messes with the formatter
+    "PERF203", # Rarely useful
+    "S112",    # Rarely useful
+    "RUF012",  # Doesn't play well with Pydantic
+    "SLF001",  # Private member access
+    "UP007",   # pyupgrade: non-pep604-annotation-union
+    "UP045",   # pyupgrade: non-pep604-annotation-optional
+]
+unfixable = ["B028"] # People should intentionally tune the stacklevel
 
 [tool.mypy]
 disallow_untyped_defs = "True"

libs/partners/nomic/tests/integration_tests/test_compile.py

@@ -4,4 +4,3 @@
 @pytest.mark.compile
 def test_placeholder() -> None:
     """Used for compiling integration tests without running any real tests."""
-    pass