diff --git a/libs/partners/anthropic/langchain_anthropic/chat_models.py b/libs/partners/anthropic/langchain_anthropic/chat_models.py index f678772e763..bb6acdfa6d8 100644 --- a/libs/partners/anthropic/langchain_anthropic/chat_models.py +++ b/libs/partners/anthropic/langchain_anthropic/chat_models.py @@ -6,10 +6,10 @@ import copy import json import re import warnings -from collections.abc import AsyncIterator, Iterator, Mapping, Sequence +from collections.abc import AsyncIterator, Callable, Iterator, Mapping, Sequence from functools import cached_property from operator import itemgetter -from typing import Any, Callable, Final, Literal, Optional, Union, cast +from typing import Any, Final, Literal, Optional, Union, cast import anthropic from langchain_core.callbacks import ( diff --git a/libs/partners/anthropic/langchain_anthropic/llms.py b/libs/partners/anthropic/langchain_anthropic/llms.py index b3e953690c6..5132b050a82 100644 --- a/libs/partners/anthropic/langchain_anthropic/llms.py +++ b/libs/partners/anthropic/langchain_anthropic/llms.py @@ -4,8 +4,8 @@ from __future__ import annotations import re import warnings -from collections.abc import AsyncIterator, Iterator, Mapping -from typing import Any, Callable, Optional +from collections.abc import AsyncIterator, Callable, Iterator, Mapping +from typing import Any, Optional import anthropic from langchain_core.callbacks import ( diff --git a/libs/partners/anthropic/pyproject.toml b/libs/partners/anthropic/pyproject.toml index bb461c6d435..14855fff1f0 100644 --- a/libs/partners/anthropic/pyproject.toml +++ b/libs/partners/anthropic/pyproject.toml @@ -55,9 +55,6 @@ langchain-tests = { path = "../../standard-tests", editable = true } disallow_untyped_defs = "True" plugins = ['pydantic.mypy'] -[tool.ruff] -target-version = "py39" - [tool.ruff.format] docstring-code-format = true docstring-code-line-length = 100 diff --git a/libs/partners/anthropic/tests/unit_tests/test_chat_models.py b/libs/partners/anthropic/tests/unit_tests/test_chat_models.py index 043376b05c3..a62c04a1f70 100644 --- a/libs/partners/anthropic/tests/unit_tests/test_chat_models.py +++ b/libs/partners/anthropic/tests/unit_tests/test_chat_models.py @@ -3,7 +3,8 @@ from __future__ import annotations import os -from typing import Any, Callable, Literal, Optional, cast +from collections.abc import Callable +from typing import Any, Literal, Optional, cast from unittest.mock import MagicMock, patch import anthropic diff --git a/libs/partners/huggingface/pyproject.toml b/libs/partners/huggingface/pyproject.toml index 1f97ab1d105..e1c11c3783e 100644 --- a/libs/partners/huggingface/pyproject.toml +++ b/libs/partners/huggingface/pyproject.toml @@ -54,9 +54,6 @@ langchain-tests = { path = "../../standard-tests", editable = true } [tool.mypy] disallow_untyped_defs = "True" -[tool.ruff] -target-version = "py39" - [tool.ruff.format] docstring-code-format = true docstring-code-line-length = 100 diff --git a/libs/partners/openai/langchain_openai/chat_models/azure.py b/libs/partners/openai/langchain_openai/chat_models/azure.py index a103102d51a..5af8583fc91 100644 --- a/libs/partners/openai/langchain_openai/chat_models/azure.py +++ b/libs/partners/openai/langchain_openai/chat_models/azure.py @@ -4,8 +4,8 @@ from __future__ import annotations import logging import os -from collections.abc import AsyncIterator, Awaitable, Iterator -from typing import Any, Callable, Optional, TypeVar, Union +from collections.abc import AsyncIterator, Awaitable, Callable, Iterator +from typing import Any, Literal, Optional, TypeVar, Union import openai from langchain_core.language_models import LanguageModelInput @@ -15,7 +15,7 @@ from langchain_core.runnables import Runnable from langchain_core.utils import from_env, secret_from_env from langchain_core.utils.pydantic import is_basemodel_subclass from pydantic import BaseModel, Field, SecretStr, model_validator -from typing_extensions import Literal, Self +from typing_extensions import Self from langchain_openai.chat_models.base import BaseChatOpenAI @@ -758,7 +758,7 @@ class AzureChatOpenAI(BaseChatOpenAI): "prompt_filter_results" ] for chat_gen, response_choice in zip( - chat_result.generations, response["choices"] + chat_result.generations, response["choices"], strict=False ): chat_gen.generation_info = chat_gen.generation_info or {} chat_gen.generation_info["content_filter_results"] = response_choice.get( diff --git a/libs/partners/openai/langchain_openai/chat_models/base.py b/libs/partners/openai/langchain_openai/chat_models/base.py index f49508e92f0..08b6c91b8bb 100644 --- a/libs/partners/openai/langchain_openai/chat_models/base.py +++ b/libs/partners/openai/langchain_openai/chat_models/base.py @@ -10,7 +10,7 @@ import re import ssl import sys import warnings -from collections.abc import AsyncIterator, Iterator, Mapping, Sequence +from collections.abc import AsyncIterator, Callable, Iterator, Mapping, Sequence from functools import partial from io import BytesIO from json import JSONDecodeError @@ -19,7 +19,6 @@ from operator import itemgetter from typing import ( TYPE_CHECKING, Any, - Callable, Literal, Optional, TypeVar, diff --git a/libs/partners/openai/langchain_openai/embeddings/azure.py b/libs/partners/openai/langchain_openai/embeddings/azure.py index d0783be25f9..f0cb59a2bbe 100644 --- a/libs/partners/openai/langchain_openai/embeddings/azure.py +++ b/libs/partners/openai/langchain_openai/embeddings/azure.py @@ -2,8 +2,8 @@ from __future__ import annotations -from collections.abc import Awaitable -from typing import Callable, Optional, Union, cast +from collections.abc import Awaitable, Callable +from typing import Optional, Union, cast import openai from langchain_core.utils import from_env, secret_from_env diff --git a/libs/partners/openai/langchain_openai/embeddings/base.py b/libs/partners/openai/langchain_openai/embeddings/base.py index 7416a66a980..e4cdd44f78d 100644 --- a/libs/partners/openai/langchain_openai/embeddings/base.py +++ b/libs/partners/openai/langchain_openai/embeddings/base.py @@ -62,9 +62,12 @@ def _process_batched_chunked_embeddings( # average = np.average(_result, axis=0, weights=num_tokens_in_batch[i]) total_weight = sum(num_tokens_in_batch[i]) average = [ - sum(val * weight for val, weight in zip(embedding, num_tokens_in_batch[i])) + sum( + val * weight + for val, weight in zip(embedding, num_tokens_in_batch[i], strict=False) + ) / total_weight - for embedding in zip(*_result) + for embedding in zip(*_result, strict=False) ] # should be same as diff --git a/libs/partners/openai/langchain_openai/llms/azure.py b/libs/partners/openai/langchain_openai/llms/azure.py index 9bc67f9dfd6..bf4c09b68af 100644 --- a/libs/partners/openai/langchain_openai/llms/azure.py +++ b/libs/partners/openai/langchain_openai/llms/azure.py @@ -3,8 +3,8 @@ from __future__ import annotations import logging -from collections.abc import Awaitable, Mapping -from typing import Any, Callable, Optional, Union, cast +from collections.abc import Awaitable, Callable, Mapping +from typing import Any, Optional, Union, cast import openai from langchain_core.language_models import LangSmithParams diff --git a/libs/partners/openai/langchain_openai/tools/custom_tool.py b/libs/partners/openai/langchain_openai/tools/custom_tool.py index af48d39e296..743a9bd21f5 100644 --- a/libs/partners/openai/langchain_openai/tools/custom_tool.py +++ b/libs/partners/openai/langchain_openai/tools/custom_tool.py @@ -1,8 +1,8 @@ """Custom tool decorator for OpenAI custom tools.""" import inspect -from collections.abc import Awaitable -from typing import Any, Callable +from collections.abc import Awaitable, Callable +from typing import Any from langchain_core.tools import tool diff --git a/libs/partners/openai/pyproject.toml b/libs/partners/openai/pyproject.toml index 506d5bf6c44..08e55b1aa93 100644 --- a/libs/partners/openai/pyproject.toml +++ b/libs/partners/openai/pyproject.toml @@ -59,9 +59,6 @@ disallow_untyped_defs = "True" module = "transformers" ignore_missing_imports = true -[tool.ruff] -target-version = "py39" - [tool.ruff.format] docstring-code-format = true