diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index 6dcbfcda110..bf0c1e0454f 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -219,11 +219,7 @@ jobs: # Replace all dashes in the package name with underscores, # since that's how Python imports packages with dashes in the name. - if [ "$PKG_NAME" == "langchain-tests" ]; then - IMPORT_NAME="langchain_standard_tests" - else - IMPORT_NAME="$(echo "$PKG_NAME" | sed s/-/_/g)" - fi + IMPORT_NAME="$(echo "$PKG_NAME" | sed s/-/_/g)" poetry run python -c "import $IMPORT_NAME; print(dir($IMPORT_NAME))" diff --git a/docs/docs/contributing/how_to/integrations/standard_tests.ipynb b/docs/docs/contributing/how_to/integrations/standard_tests.ipynb index c741a760773..ace79d53130 100644 --- a/docs/docs/contributing/how_to/integrations/standard_tests.ipynb +++ b/docs/docs/contributing/how_to/integrations/standard_tests.ipynb @@ -15,16 +15,10 @@ "First, let's install 2 dependencies:\n", "\n", "- `langchain-core` will define the interfaces we want to import to define our custom tool.\n", - "- `langchain-tests==0.3.0` will provide the standard tests we want to use.\n", + "- `langchain-tests==0.3.2` will provide the standard tests we want to use.\n", "\n", ":::note\n", "\n", - "The `langchain-tests` package contains the module `langchain_standard_tests`. This name\n", - "mistmatch is due to this package historically being called `langchain_standard_tests` and\n", - "the name not being available on PyPi. This will either be reconciled by our \n", - "[PEP 541 request](https://github.com/pypi/support/issues/5062) (we welcome upvotes!), \n", - "or in a new release of `langchain-tests`.\n", - "\n", "Because added tests in new versions of `langchain-tests` will always break your CI/CD pipelines, we recommend pinning the \n", "version of `langchain-tests==0.3.0` to avoid unexpected changes.\n", "\n", @@ -91,8 +85,8 @@ "\n", "There are 2 namespaces in the `langchain-tests` package: \n", "\n", - "- unit tests (`langchain_standard_tests.unit_tests`): designed to be used to test the tool in isolation and without access to external services\n", - "- integration tests (`langchain_standard_tests.integration_tests`): designed to be used to test the tool with access to external services (in particular, the external service that the tool is designed to interact with).\n", + "- unit tests (`langchain_tests.unit_tests`): designed to be used to test the tool in isolation and without access to external services\n", + "- integration tests (`langchain_tests.integration_tests`): designed to be used to test the tool with access to external services (in particular, the external service that the tool is designed to interact with).\n", "\n", ":::note\n", "\n", @@ -122,7 +116,7 @@ "from typing import Type\n", "\n", "from langchain_parrot_link.tools import ParrotMultiplyTool\n", - "from langchain_standard_tests.unit_tests import ToolsUnitTests\n", + "from langchain_tests.unit_tests import ToolsUnitTests\n", "\n", "\n", "class TestParrotMultiplyToolUnit(ToolsUnitTests):\n", @@ -156,7 +150,7 @@ "from typing import Type\n", "\n", "from langchain_parrot_link.tools import ParrotMultiplyTool\n", - "from langchain_standard_tests.integration_tests import ToolsIntegrationTests\n", + "from langchain_tests.integration_tests import ToolsIntegrationTests\n", "\n", "\n", "class TestParrotMultiplyToolIntegration(ToolsIntegrationTests):\n", @@ -217,7 +211,7 @@ "from typing import Tuple, Type\n", "\n", "from langchain_parrot_link.chat_models import ChatParrotLink\n", - "from langchain_standard_tests.unit_tests import ChatModelUnitTests\n", + "from langchain_tests.unit_tests import ChatModelUnitTests\n", "\n", "\n", "class TestChatParrotLinkUnit(ChatModelUnitTests):\n", @@ -236,7 +230,7 @@ "from typing import Type\n", "\n", "from langchain_parrot_link.chat_models import ChatParrotLink\n", - "from langchain_standard_tests.integration_tests import ChatModelIntegrationTests\n", + "from langchain_tests.integration_tests import ChatModelIntegrationTests\n", "\n", "\n", "class TestChatParrotLinkIntegration(ChatModelIntegrationTests):\n", diff --git a/libs/community/tests/integration_tests/chat_models/test_litellm_standard.py b/libs/community/tests/integration_tests/chat_models/test_litellm_standard.py index 972617617bd..5e87e3ac8a0 100644 --- a/libs/community/tests/integration_tests/chat_models/test_litellm_standard.py +++ b/libs/community/tests/integration_tests/chat_models/test_litellm_standard.py @@ -4,7 +4,7 @@ from typing import Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from langchain_community.chat_models.litellm import ChatLiteLLM diff --git a/libs/community/tests/integration_tests/chat_models/test_moonshot.py b/libs/community/tests/integration_tests/chat_models/test_moonshot.py index 68d9f43b5d8..de4725cfa6c 100644 --- a/libs/community/tests/integration_tests/chat_models/test_moonshot.py +++ b/libs/community/tests/integration_tests/chat_models/test_moonshot.py @@ -4,7 +4,7 @@ from typing import Type, cast import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from pydantic import SecretStr from langchain_community.chat_models.moonshot import MoonshotChat diff --git a/libs/community/tests/integration_tests/storage/test_mongodb.py b/libs/community/tests/integration_tests/storage/test_mongodb.py index 850e4f73c2b..82aa4b76057 100644 --- a/libs/community/tests/integration_tests/storage/test_mongodb.py +++ b/libs/community/tests/integration_tests/storage/test_mongodb.py @@ -2,7 +2,7 @@ from typing import Generator, Tuple import pytest from langchain_core.documents import Document -from langchain_standard_tests.integration_tests.base_store import BaseStoreSyncTests +from langchain_tests.integration_tests.base_store import BaseStoreSyncTests from langchain_community.storage.mongodb import MongoDBByteStore, MongoDBStore diff --git a/libs/community/tests/integration_tests/vectorstores/test_aperturedb.py b/libs/community/tests/integration_tests/vectorstores/test_aperturedb.py index 9e5f370d7d4..15d65de90b1 100644 --- a/libs/community/tests/integration_tests/vectorstores/test_aperturedb.py +++ b/libs/community/tests/integration_tests/vectorstores/test_aperturedb.py @@ -3,7 +3,7 @@ import uuid import pytest -from langchain_standard_tests.integration_tests.vectorstores import ( +from langchain_tests.integration_tests.vectorstores import ( AsyncReadWriteTestSuite, ReadWriteTestSuite, ) diff --git a/libs/community/tests/unit_tests/chat_models/test_cloudflare_workersai.py b/libs/community/tests/unit_tests/chat_models/test_cloudflare_workersai.py index 940616048de..0f0fabe3cd1 100644 --- a/libs/community/tests/unit_tests/chat_models/test_cloudflare_workersai.py +++ b/libs/community/tests/unit_tests/chat_models/test_cloudflare_workersai.py @@ -11,7 +11,7 @@ from langchain_core.messages import ( SystemMessage, ToolMessage, ) -from langchain_standard_tests.unit_tests import ChatModelUnitTests +from langchain_tests.unit_tests import ChatModelUnitTests from langchain_community.chat_models.cloudflare_workersai import ( ChatCloudflareWorkersAI, diff --git a/libs/community/tests/unit_tests/chat_models/test_litellm.py b/libs/community/tests/unit_tests/chat_models/test_litellm.py index 583c53d64bd..1d11fe5bd3f 100644 --- a/libs/community/tests/unit_tests/chat_models/test_litellm.py +++ b/libs/community/tests/unit_tests/chat_models/test_litellm.py @@ -4,7 +4,7 @@ from typing import Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests import ChatModelUnitTests +from langchain_tests.unit_tests import ChatModelUnitTests from langchain_community.chat_models.litellm import ChatLiteLLM diff --git a/libs/community/tests/unit_tests/vectorstores/test_inmemory.py b/libs/community/tests/unit_tests/vectorstores/test_inmemory.py index 6facca3429b..b650cda14fd 100644 --- a/libs/community/tests/unit_tests/vectorstores/test_inmemory.py +++ b/libs/community/tests/unit_tests/vectorstores/test_inmemory.py @@ -3,7 +3,7 @@ from typing import Any import pytest from langchain_core.documents import Document -from langchain_standard_tests.integration_tests.vectorstores import ( +from langchain_tests.integration_tests.vectorstores import ( AsyncReadWriteTestSuite, ReadWriteTestSuite, ) diff --git a/libs/core/tests/unit_tests/indexing/test_in_memory_indexer.py b/libs/core/tests/unit_tests/indexing/test_in_memory_indexer.py index 6ddeefc6233..58ee2514644 100644 --- a/libs/core/tests/unit_tests/indexing/test_in_memory_indexer.py +++ b/libs/core/tests/unit_tests/indexing/test_in_memory_indexer.py @@ -3,7 +3,7 @@ from collections.abc import AsyncGenerator, Generator import pytest -from langchain_standard_tests.integration_tests.indexer import ( +from langchain_tests.integration_tests.indexer import ( AsyncDocumentIndexTestSuite, DocumentIndexerTestSuite, ) diff --git a/libs/core/tests/unit_tests/stores/test_in_memory.py b/libs/core/tests/unit_tests/stores/test_in_memory.py index 3c5f810b1fc..1ae91db4a38 100644 --- a/libs/core/tests/unit_tests/stores/test_in_memory.py +++ b/libs/core/tests/unit_tests/stores/test_in_memory.py @@ -1,5 +1,5 @@ import pytest -from langchain_standard_tests.integration_tests.base_store import ( +from langchain_tests.integration_tests.base_store import ( BaseStoreAsyncTests, BaseStoreSyncTests, ) diff --git a/libs/core/tests/unit_tests/vectorstores/test_in_memory.py b/libs/core/tests/unit_tests/vectorstores/test_in_memory.py index 1ab61868826..34764f99c10 100644 --- a/libs/core/tests/unit_tests/vectorstores/test_in_memory.py +++ b/libs/core/tests/unit_tests/vectorstores/test_in_memory.py @@ -2,7 +2,7 @@ from pathlib import Path from unittest.mock import AsyncMock, Mock import pytest -from langchain_standard_tests.integration_tests.vectorstores import ( +from langchain_tests.integration_tests.vectorstores import ( AsyncReadWriteTestSuite, ReadWriteTestSuite, ) diff --git a/libs/langchain/tests/integration_tests/chat_models/test_base.py b/libs/langchain/tests/integration_tests/chat_models/test_base.py index efed6e1d522..baee018999c 100644 --- a/libs/langchain/tests/integration_tests/chat_models/test_base.py +++ b/libs/langchain/tests/integration_tests/chat_models/test_base.py @@ -5,7 +5,7 @@ from langchain_core.language_models import BaseChatModel from langchain_core.messages import AIMessage from langchain_core.prompts import ChatPromptTemplate from langchain_core.runnables import RunnableConfig -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from pydantic import BaseModel from langchain.chat_models import init_chat_model diff --git a/libs/partners/anthropic/tests/integration_tests/test_standard.py b/libs/partners/anthropic/tests/integration_tests/test_standard.py index 241588f32a3..dc69c1dda40 100644 --- a/libs/partners/anthropic/tests/integration_tests/test_standard.py +++ b/libs/partners/anthropic/tests/integration_tests/test_standard.py @@ -5,7 +5,7 @@ from typing import Dict, List, Literal, Type, cast from langchain_core.language_models import BaseChatModel from langchain_core.messages import AIMessage -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from langchain_anthropic import ChatAnthropic diff --git a/libs/partners/anthropic/tests/unit_tests/test_standard.py b/libs/partners/anthropic/tests/unit_tests/test_standard.py index 7976dcb2bc9..7879e2995bb 100644 --- a/libs/partners/anthropic/tests/unit_tests/test_standard.py +++ b/libs/partners/anthropic/tests/unit_tests/test_standard.py @@ -3,7 +3,7 @@ from typing import Type from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests import ChatModelUnitTests +from langchain_tests.unit_tests import ChatModelUnitTests from langchain_anthropic import ChatAnthropic diff --git a/libs/partners/fireworks/tests/integration_tests/test_standard.py b/libs/partners/fireworks/tests/integration_tests/test_standard.py index cfefb2445e6..692dcb40cf3 100644 --- a/libs/partners/fireworks/tests/integration_tests/test_standard.py +++ b/libs/partners/fireworks/tests/integration_tests/test_standard.py @@ -4,7 +4,7 @@ from typing import Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.integration_tests import ( # type: ignore[import-not-found] +from langchain_tests.integration_tests import ( # type: ignore[import-not-found] ChatModelIntegrationTests, # type: ignore[import-not-found] ) diff --git a/libs/partners/fireworks/tests/unit_tests/test_embeddings_standard.py b/libs/partners/fireworks/tests/unit_tests/test_embeddings_standard.py index ea8d16f92d0..44b6197a391 100644 --- a/libs/partners/fireworks/tests/unit_tests/test_embeddings_standard.py +++ b/libs/partners/fireworks/tests/unit_tests/test_embeddings_standard.py @@ -3,7 +3,7 @@ from typing import Tuple, Type from langchain_core.embeddings import Embeddings -from langchain_standard_tests.unit_tests.embeddings import EmbeddingsUnitTests +from langchain_tests.unit_tests.embeddings import EmbeddingsUnitTests from langchain_fireworks import FireworksEmbeddings diff --git a/libs/partners/fireworks/tests/unit_tests/test_standard.py b/libs/partners/fireworks/tests/unit_tests/test_standard.py index 61d0d152ba8..4f444897154 100644 --- a/libs/partners/fireworks/tests/unit_tests/test_standard.py +++ b/libs/partners/fireworks/tests/unit_tests/test_standard.py @@ -3,7 +3,7 @@ from typing import Tuple, Type from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests import ( # type: ignore[import-not-found] +from langchain_tests.unit_tests import ( # type: ignore[import-not-found] ChatModelUnitTests, # type: ignore[import-not-found] ) diff --git a/libs/partners/groq/tests/integration_tests/test_chat_models.py b/libs/partners/groq/tests/integration_tests/test_chat_models.py index 1b2cf05b542..a672de34bc5 100644 --- a/libs/partners/groq/tests/integration_tests/test_chat_models.py +++ b/libs/partners/groq/tests/integration_tests/test_chat_models.py @@ -395,7 +395,7 @@ def test_json_mode_structured_output() -> None: def test_tool_calling_no_arguments() -> None: - # Note: this is a variant of a test in langchain_standard_tests + # Note: this is a variant of a test in langchain_tests # that as of 2024-08-19 fails with "Failed to call a function. Please # adjust your prompt." when `tool_choice="any"` is specified, but # passes when `tool_choice` is not specified. diff --git a/libs/partners/groq/tests/integration_tests/test_standard.py b/libs/partners/groq/tests/integration_tests/test_standard.py index d34257b4c52..3870ae953f6 100644 --- a/libs/partners/groq/tests/integration_tests/test_standard.py +++ b/libs/partners/groq/tests/integration_tests/test_standard.py @@ -5,7 +5,7 @@ from typing import Optional, Type import pytest from langchain_core.language_models import BaseChatModel from langchain_core.rate_limiters import InMemoryRateLimiter -from langchain_standard_tests.integration_tests import ( +from langchain_tests.integration_tests import ( ChatModelIntegrationTests, ) diff --git a/libs/partners/groq/tests/unit_tests/test_standard.py b/libs/partners/groq/tests/unit_tests/test_standard.py index 939d817499e..e4df2916f30 100644 --- a/libs/partners/groq/tests/unit_tests/test_standard.py +++ b/libs/partners/groq/tests/unit_tests/test_standard.py @@ -3,7 +3,7 @@ from typing import Type from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests.chat_models import ( +from langchain_tests.unit_tests.chat_models import ( ChatModelUnitTests, ) diff --git a/libs/partners/huggingface/tests/integration_tests/test_embeddings_standard.py b/libs/partners/huggingface/tests/integration_tests/test_embeddings_standard.py index 4f5cefcbdff..a878bea8cfa 100644 --- a/libs/partners/huggingface/tests/integration_tests/test_embeddings_standard.py +++ b/libs/partners/huggingface/tests/integration_tests/test_embeddings_standard.py @@ -2,7 +2,7 @@ from typing import Type -from langchain_standard_tests.integration_tests import EmbeddingsIntegrationTests +from langchain_tests.integration_tests import EmbeddingsIntegrationTests from langchain_huggingface.embeddings import ( HuggingFaceEmbeddings, diff --git a/libs/partners/huggingface/tests/integration_tests/test_standard.py b/libs/partners/huggingface/tests/integration_tests/test_standard.py index 34392e979f4..682a4c625ee 100644 --- a/libs/partners/huggingface/tests/integration_tests/test_standard.py +++ b/libs/partners/huggingface/tests/integration_tests/test_standard.py @@ -4,7 +4,7 @@ from typing import Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from langchain_huggingface import ChatHuggingFace, HuggingFaceEndpoint diff --git a/libs/partners/mistralai/tests/integration_tests/test_standard.py b/libs/partners/mistralai/tests/integration_tests/test_standard.py index cea6399ee4c..822f2284abc 100644 --- a/libs/partners/mistralai/tests/integration_tests/test_standard.py +++ b/libs/partners/mistralai/tests/integration_tests/test_standard.py @@ -3,7 +3,7 @@ from typing import Optional, Type from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.integration_tests import ( # type: ignore[import-not-found] +from langchain_tests.integration_tests import ( # type: ignore[import-not-found] ChatModelIntegrationTests, # type: ignore[import-not-found] ) diff --git a/libs/partners/mistralai/tests/unit_tests/test_standard.py b/libs/partners/mistralai/tests/unit_tests/test_standard.py index 408a6e5a6b9..fde82de2d50 100644 --- a/libs/partners/mistralai/tests/unit_tests/test_standard.py +++ b/libs/partners/mistralai/tests/unit_tests/test_standard.py @@ -3,7 +3,7 @@ from typing import Type from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests import ( # type: ignore[import-not-found] +from langchain_tests.unit_tests import ( # type: ignore[import-not-found] ChatModelUnitTests, # type: ignore[import-not-found] ) diff --git a/libs/partners/ollama/tests/integration_tests/test_chat_models.py b/libs/partners/ollama/tests/integration_tests/test_chat_models.py index 10ffcb39d27..9133106cae7 100644 --- a/libs/partners/ollama/tests/integration_tests/test_chat_models.py +++ b/libs/partners/ollama/tests/integration_tests/test_chat_models.py @@ -4,7 +4,7 @@ from typing import Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from langchain_ollama.chat_models import ChatOllama diff --git a/libs/partners/ollama/tests/integration_tests/test_embeddings.py b/libs/partners/ollama/tests/integration_tests/test_embeddings.py index 26722362e6b..0953510c901 100644 --- a/libs/partners/ollama/tests/integration_tests/test_embeddings.py +++ b/libs/partners/ollama/tests/integration_tests/test_embeddings.py @@ -2,7 +2,7 @@ from typing import Type -from langchain_standard_tests.integration_tests import EmbeddingsIntegrationTests +from langchain_tests.integration_tests import EmbeddingsIntegrationTests from langchain_ollama.embeddings import OllamaEmbeddings diff --git a/libs/partners/ollama/tests/unit_tests/test_chat_models.py b/libs/partners/ollama/tests/unit_tests/test_chat_models.py index d0869143104..850e3423e0b 100644 --- a/libs/partners/ollama/tests/unit_tests/test_chat_models.py +++ b/libs/partners/ollama/tests/unit_tests/test_chat_models.py @@ -2,7 +2,7 @@ from typing import Dict, Type -from langchain_standard_tests.unit_tests import ChatModelUnitTests +from langchain_tests.unit_tests import ChatModelUnitTests from langchain_ollama.chat_models import ChatOllama diff --git a/libs/partners/openai/tests/integration_tests/chat_models/test_azure_standard.py b/libs/partners/openai/tests/integration_tests/chat_models/test_azure_standard.py index c99bfb1126e..fff0599963c 100644 --- a/libs/partners/openai/tests/integration_tests/chat_models/test_azure_standard.py +++ b/libs/partners/openai/tests/integration_tests/chat_models/test_azure_standard.py @@ -5,7 +5,7 @@ from typing import Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from langchain_openai import AzureChatOpenAI diff --git a/libs/partners/openai/tests/integration_tests/chat_models/test_base.py b/libs/partners/openai/tests/integration_tests/chat_models/test_base.py index 858ab1e4b43..cbee0d70418 100644 --- a/libs/partners/openai/tests/integration_tests/chat_models/test_base.py +++ b/libs/partners/openai/tests/integration_tests/chat_models/test_base.py @@ -22,10 +22,8 @@ from langchain_core.messages import ( ) from langchain_core.outputs import ChatGeneration, ChatResult, LLMResult from langchain_core.prompts import ChatPromptTemplate -from langchain_standard_tests.integration_tests.chat_models import ( - _validate_tool_call_message, -) -from langchain_standard_tests.integration_tests.chat_models import ( +from langchain_tests.integration_tests.chat_models import _validate_tool_call_message +from langchain_tests.integration_tests.chat_models import ( magic_function as invalid_magic_function, ) from pydantic import BaseModel, Field @@ -1022,7 +1020,8 @@ def test_audio_input_modality() -> None: def test_prediction_tokens() -> None: - code = dedent(""" + code = dedent( + """ /// /// Represents a user with a first name, last name, and username. /// @@ -1043,7 +1042,8 @@ def test_prediction_tokens() -> None: /// public string Username { get; set; } } - """) + """ + ) llm = ChatOpenAI(model="gpt-4o") query = ( diff --git a/libs/partners/openai/tests/integration_tests/chat_models/test_base_standard.py b/libs/partners/openai/tests/integration_tests/chat_models/test_base_standard.py index b021603aace..890e7026808 100644 --- a/libs/partners/openai/tests/integration_tests/chat_models/test_base_standard.py +++ b/libs/partners/openai/tests/integration_tests/chat_models/test_base_standard.py @@ -5,7 +5,7 @@ from typing import Dict, List, Literal, Type, cast from langchain_core.language_models import BaseChatModel from langchain_core.messages import AIMessage -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from langchain_openai import ChatOpenAI diff --git a/libs/partners/openai/tests/unit_tests/chat_models/test_azure_standard.py b/libs/partners/openai/tests/unit_tests/chat_models/test_azure_standard.py index 465c1dc0c22..3d1faa97db4 100644 --- a/libs/partners/openai/tests/unit_tests/chat_models/test_azure_standard.py +++ b/libs/partners/openai/tests/unit_tests/chat_models/test_azure_standard.py @@ -4,7 +4,7 @@ from typing import Tuple, Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests import ChatModelUnitTests +from langchain_tests.unit_tests import ChatModelUnitTests from langchain_openai import AzureChatOpenAI diff --git a/libs/partners/openai/tests/unit_tests/chat_models/test_base_standard.py b/libs/partners/openai/tests/unit_tests/chat_models/test_base_standard.py index 8049da874cb..d24ddd1e71f 100644 --- a/libs/partners/openai/tests/unit_tests/chat_models/test_base_standard.py +++ b/libs/partners/openai/tests/unit_tests/chat_models/test_base_standard.py @@ -3,7 +3,7 @@ from typing import Tuple, Type from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests import ChatModelUnitTests +from langchain_tests.unit_tests import ChatModelUnitTests from langchain_openai import ChatOpenAI diff --git a/libs/partners/openai/tests/unit_tests/embeddings/test_azure_standard.py b/libs/partners/openai/tests/unit_tests/embeddings/test_azure_standard.py index b5f1591c476..a972fe5e385 100644 --- a/libs/partners/openai/tests/unit_tests/embeddings/test_azure_standard.py +++ b/libs/partners/openai/tests/unit_tests/embeddings/test_azure_standard.py @@ -1,7 +1,7 @@ from typing import Tuple, Type from langchain_core.embeddings import Embeddings -from langchain_standard_tests.unit_tests.embeddings import EmbeddingsUnitTests +from langchain_tests.unit_tests.embeddings import EmbeddingsUnitTests from langchain_openai import AzureOpenAIEmbeddings diff --git a/libs/partners/openai/tests/unit_tests/embeddings/test_base_standard.py b/libs/partners/openai/tests/unit_tests/embeddings/test_base_standard.py index b265e5600eb..b1b2f2d368f 100644 --- a/libs/partners/openai/tests/unit_tests/embeddings/test_base_standard.py +++ b/libs/partners/openai/tests/unit_tests/embeddings/test_base_standard.py @@ -3,7 +3,7 @@ from typing import Tuple, Type from langchain_core.embeddings import Embeddings -from langchain_standard_tests.unit_tests.embeddings import EmbeddingsUnitTests +from langchain_tests.unit_tests.embeddings import EmbeddingsUnitTests from langchain_openai import OpenAIEmbeddings diff --git a/libs/partners/xai/tests/integration_tests/test_chat_models_standard.py b/libs/partners/xai/tests/integration_tests/test_chat_models_standard.py index c686f7e1948..1152fe44946 100644 --- a/libs/partners/xai/tests/integration_tests/test_chat_models_standard.py +++ b/libs/partners/xai/tests/integration_tests/test_chat_models_standard.py @@ -5,7 +5,7 @@ from typing import Optional, Type import pytest # type: ignore[import-not-found] from langchain_core.language_models import BaseChatModel from langchain_core.rate_limiters import InMemoryRateLimiter -from langchain_standard_tests.integration_tests import ( # type: ignore[import-not-found] +from langchain_tests.integration_tests import ( # type: ignore[import-not-found] ChatModelIntegrationTests, # type: ignore[import-not-found] ) diff --git a/libs/partners/xai/tests/unit_tests/test_chat_models_standard.py b/libs/partners/xai/tests/unit_tests/test_chat_models_standard.py index a0d6a5170a8..a70718f3224 100644 --- a/libs/partners/xai/tests/unit_tests/test_chat_models_standard.py +++ b/libs/partners/xai/tests/unit_tests/test_chat_models_standard.py @@ -3,7 +3,7 @@ from typing import Tuple, Type from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests import ( # type: ignore[import-not-found] +from langchain_tests.unit_tests import ( # type: ignore[import-not-found] ChatModelUnitTests, # type: ignore[import-not-found] ) diff --git a/libs/standard-tests/Makefile b/libs/standard-tests/Makefile index a48f80928b9..5283db9a9dc 100644 --- a/libs/standard-tests/Makefile +++ b/libs/standard-tests/Makefile @@ -25,7 +25,7 @@ PYTHON_FILES=. MYPY_CACHE=.mypy_cache lint format: PYTHON_FILES=. lint_diff format_diff: PYTHON_FILES=$(shell git diff --relative=libs/standard-tests --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$') -lint_package: PYTHON_FILES=langchain_standard_tests +lint_package: PYTHON_FILES=langchain_tests lint_tests: PYTHON_FILES=tests lint_tests: MYPY_CACHE=.mypy_cache_test @@ -44,7 +44,7 @@ spell_check: spell_fix: poetry run codespell --toml pyproject.toml -w -check_imports: $(shell find langchain_standard_tests -name '*.py') +check_imports: $(shell find langchain_tests -name '*.py') poetry run python ./scripts/check_imports.py $^ ###################### diff --git a/libs/standard-tests/README.md b/libs/standard-tests/README.md index 0060203a1e2..029a9bafb76 100644 --- a/libs/standard-tests/README.md +++ b/libs/standard-tests/README.md @@ -40,7 +40,7 @@ from typing import Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.unit_tests import ChatModelUnitTests +from langchain_tests.unit_tests import ChatModelUnitTests from langchain_parrot_chain import ChatParrotChain @@ -60,7 +60,7 @@ from typing import Type import pytest from langchain_core.language_models import BaseChatModel -from langchain_standard_tests.integration_tests import ChatModelIntegrationTests +from langchain_tests.integration_tests import ChatModelIntegrationTests from langchain_parrot_chain import ChatParrotChain diff --git a/libs/standard-tests/langchain_standard_tests/__init__.py b/libs/standard-tests/langchain_tests/__init__.py similarity index 100% rename from libs/standard-tests/langchain_standard_tests/__init__.py rename to libs/standard-tests/langchain_tests/__init__.py diff --git a/libs/standard-tests/langchain_standard_tests/base.py b/libs/standard-tests/langchain_tests/base.py similarity index 96% rename from libs/standard-tests/langchain_standard_tests/base.py rename to libs/standard-tests/langchain_tests/base.py index e9f71802737..f2b7ca1f7e9 100644 --- a/libs/standard-tests/langchain_standard_tests/base.py +++ b/libs/standard-tests/langchain_tests/base.py @@ -13,7 +13,7 @@ class BaseStandardTests(ABC): def explore_bases(cls: Type) -> None: nonlocal comparison_class for base in cls.__bases__: - if base.__module__.startswith("langchain_standard_tests."): + if base.__module__.startswith("langchain_tests."): if comparison_class is None: comparison_class = base else: diff --git a/libs/standard-tests/langchain_standard_tests/integration_tests/__init__.py b/libs/standard-tests/langchain_tests/integration_tests/__init__.py similarity index 90% rename from libs/standard-tests/langchain_standard_tests/integration_tests/__init__.py rename to libs/standard-tests/langchain_tests/integration_tests/__init__.py index ec26de72a4a..67ccb38f29e 100644 --- a/libs/standard-tests/langchain_standard_tests/integration_tests/__init__.py +++ b/libs/standard-tests/langchain_tests/integration_tests/__init__.py @@ -14,9 +14,7 @@ modules = [ ] for module in modules: - pytest.register_assert_rewrite( - f"langchain_standard_tests.integration_tests.{module}" - ) + pytest.register_assert_rewrite(f"langchain_tests.integration_tests.{module}") from .base_store import BaseStoreAsyncTests, BaseStoreSyncTests from .cache import AsyncCacheTestSuite, SyncCacheTestSuite diff --git a/libs/standard-tests/langchain_standard_tests/integration_tests/base_store.py b/libs/standard-tests/langchain_tests/integration_tests/base_store.py similarity index 99% rename from libs/standard-tests/langchain_standard_tests/integration_tests/base_store.py rename to libs/standard-tests/langchain_tests/integration_tests/base_store.py index e4b461d9822..cc5fab8bcf7 100644 --- a/libs/standard-tests/langchain_standard_tests/integration_tests/base_store.py +++ b/libs/standard-tests/langchain_tests/integration_tests/base_store.py @@ -4,7 +4,7 @@ from typing import AsyncGenerator, Generator, Generic, Tuple, TypeVar import pytest from langchain_core.stores import BaseStore -from langchain_standard_tests.base import BaseStandardTests +from langchain_tests.base import BaseStandardTests V = TypeVar("V") diff --git a/libs/standard-tests/langchain_standard_tests/integration_tests/cache.py b/libs/standard-tests/langchain_tests/integration_tests/cache.py similarity index 99% rename from libs/standard-tests/langchain_standard_tests/integration_tests/cache.py rename to libs/standard-tests/langchain_tests/integration_tests/cache.py index 7d1359f5154..7087da8ea07 100644 --- a/libs/standard-tests/langchain_standard_tests/integration_tests/cache.py +++ b/libs/standard-tests/langchain_tests/integration_tests/cache.py @@ -4,7 +4,7 @@ import pytest from langchain_core.caches import BaseCache from langchain_core.outputs import Generation -from langchain_standard_tests.base import BaseStandardTests +from langchain_tests.base import BaseStandardTests class SyncCacheTestSuite(BaseStandardTests): diff --git a/libs/standard-tests/langchain_standard_tests/integration_tests/chat_models.py b/libs/standard-tests/langchain_tests/integration_tests/chat_models.py similarity index 99% rename from libs/standard-tests/langchain_standard_tests/integration_tests/chat_models.py rename to libs/standard-tests/langchain_tests/integration_tests/chat_models.py index 9eea91aebbe..f0ac13d4614 100644 --- a/libs/standard-tests/langchain_standard_tests/integration_tests/chat_models.py +++ b/libs/standard-tests/langchain_tests/integration_tests/chat_models.py @@ -21,11 +21,11 @@ from pydantic import BaseModel, Field from pydantic.v1 import BaseModel as BaseModelV1 from pydantic.v1 import Field as FieldV1 -from langchain_standard_tests.unit_tests.chat_models import ( +from langchain_tests.unit_tests.chat_models import ( ChatModelTests, my_adder_tool, ) -from langchain_standard_tests.utils.pydantic import PYDANTIC_MAJOR_VERSION +from langchain_tests.utils.pydantic import PYDANTIC_MAJOR_VERSION class MagicFunctionSchema(BaseModel): diff --git a/libs/standard-tests/langchain_standard_tests/integration_tests/embeddings.py b/libs/standard-tests/langchain_tests/integration_tests/embeddings.py similarity index 96% rename from libs/standard-tests/langchain_standard_tests/integration_tests/embeddings.py rename to libs/standard-tests/langchain_tests/integration_tests/embeddings.py index 1de2aece780..7e3689d0f54 100644 --- a/libs/standard-tests/langchain_standard_tests/integration_tests/embeddings.py +++ b/libs/standard-tests/langchain_tests/integration_tests/embeddings.py @@ -2,7 +2,7 @@ from typing import List from langchain_core.embeddings import Embeddings -from langchain_standard_tests.unit_tests.embeddings import EmbeddingsTests +from langchain_tests.unit_tests.embeddings import EmbeddingsTests class EmbeddingsIntegrationTests(EmbeddingsTests): diff --git a/libs/standard-tests/langchain_standard_tests/integration_tests/indexer.py b/libs/standard-tests/langchain_tests/integration_tests/indexer.py similarity index 100% rename from libs/standard-tests/langchain_standard_tests/integration_tests/indexer.py rename to libs/standard-tests/langchain_tests/integration_tests/indexer.py diff --git a/libs/standard-tests/langchain_standard_tests/integration_tests/tools.py b/libs/standard-tests/langchain_tests/integration_tests/tools.py similarity index 97% rename from libs/standard-tests/langchain_standard_tests/integration_tests/tools.py rename to libs/standard-tests/langchain_tests/integration_tests/tools.py index ad854c3b1d4..2609a87c845 100644 --- a/libs/standard-tests/langchain_standard_tests/integration_tests/tools.py +++ b/libs/standard-tests/langchain_tests/integration_tests/tools.py @@ -1,7 +1,7 @@ from langchain_core.messages import ToolCall from langchain_core.tools import BaseTool -from langchain_standard_tests.unit_tests.tools import ToolsTests +from langchain_tests.unit_tests.tools import ToolsTests class ToolsIntegrationTests(ToolsTests): diff --git a/libs/standard-tests/langchain_standard_tests/integration_tests/vectorstores.py b/libs/standard-tests/langchain_tests/integration_tests/vectorstores.py similarity index 99% rename from libs/standard-tests/langchain_standard_tests/integration_tests/vectorstores.py rename to libs/standard-tests/langchain_tests/integration_tests/vectorstores.py index d7735cfdd2b..08b0358dcfb 100644 --- a/libs/standard-tests/langchain_standard_tests/integration_tests/vectorstores.py +++ b/libs/standard-tests/langchain_tests/integration_tests/vectorstores.py @@ -7,7 +7,7 @@ from langchain_core.documents import Document from langchain_core.embeddings.fake import DeterministicFakeEmbedding, Embeddings from langchain_core.vectorstores import VectorStore -from langchain_standard_tests.base import BaseStandardTests +from langchain_tests.base import BaseStandardTests # Arbitrarily chosen. Using a small embedding size # so tests are faster and easier to debug. diff --git a/libs/standard-tests/langchain_standard_tests/py.typed b/libs/standard-tests/langchain_tests/py.typed similarity index 100% rename from libs/standard-tests/langchain_standard_tests/py.typed rename to libs/standard-tests/langchain_tests/py.typed diff --git a/libs/standard-tests/langchain_standard_tests/unit_tests/__init__.py b/libs/standard-tests/langchain_tests/unit_tests/__init__.py similarity index 86% rename from libs/standard-tests/langchain_standard_tests/unit_tests/__init__.py rename to libs/standard-tests/langchain_tests/unit_tests/__init__.py index df94c79ae61..ee4a1700eda 100644 --- a/libs/standard-tests/langchain_standard_tests/unit_tests/__init__.py +++ b/libs/standard-tests/langchain_tests/unit_tests/__init__.py @@ -11,7 +11,7 @@ modules = [ ] for module in modules: - pytest.register_assert_rewrite(f"langchain_standard_tests.unit_tests.{module}") + pytest.register_assert_rewrite(f"langchain_tests.unit_tests.{module}") from .chat_models import ChatModelUnitTests from .embeddings import EmbeddingsUnitTests diff --git a/libs/standard-tests/langchain_standard_tests/unit_tests/chat_models.py b/libs/standard-tests/langchain_tests/unit_tests/chat_models.py similarity index 98% rename from libs/standard-tests/langchain_standard_tests/unit_tests/chat_models.py rename to libs/standard-tests/langchain_tests/unit_tests/chat_models.py index 9bde7fbf3e1..f5e5fe54f6e 100644 --- a/libs/standard-tests/langchain_standard_tests/unit_tests/chat_models.py +++ b/libs/standard-tests/langchain_tests/unit_tests/chat_models.py @@ -22,8 +22,8 @@ from pydantic.v1 import ( ) from syrupy import SnapshotAssertion -from langchain_standard_tests.base import BaseStandardTests -from langchain_standard_tests.utils.pydantic import PYDANTIC_MAJOR_VERSION +from langchain_tests.base import BaseStandardTests +from langchain_tests.utils.pydantic import PYDANTIC_MAJOR_VERSION class Person(BaseModel): # Used by some dependent tests. Should be deprecated. diff --git a/libs/standard-tests/langchain_standard_tests/unit_tests/embeddings.py b/libs/standard-tests/langchain_tests/unit_tests/embeddings.py similarity index 96% rename from libs/standard-tests/langchain_standard_tests/unit_tests/embeddings.py rename to libs/standard-tests/langchain_tests/unit_tests/embeddings.py index 39c6e941c5d..da7b7851384 100644 --- a/libs/standard-tests/langchain_standard_tests/unit_tests/embeddings.py +++ b/libs/standard-tests/langchain_tests/unit_tests/embeddings.py @@ -7,7 +7,7 @@ import pytest from langchain_core.embeddings import Embeddings from pydantic import SecretStr -from langchain_standard_tests.base import BaseStandardTests +from langchain_tests.base import BaseStandardTests class EmbeddingsTests(BaseStandardTests): diff --git a/libs/standard-tests/langchain_standard_tests/unit_tests/tools.py b/libs/standard-tests/langchain_tests/unit_tests/tools.py similarity index 97% rename from libs/standard-tests/langchain_standard_tests/unit_tests/tools.py rename to libs/standard-tests/langchain_tests/unit_tests/tools.py index 0decc51230f..b92cb4f5263 100644 --- a/libs/standard-tests/langchain_standard_tests/unit_tests/tools.py +++ b/libs/standard-tests/langchain_tests/unit_tests/tools.py @@ -7,7 +7,7 @@ import pytest from langchain_core.tools import BaseTool from pydantic import SecretStr -from langchain_standard_tests.base import BaseStandardTests +from langchain_tests.base import BaseStandardTests class ToolsTests(BaseStandardTests): diff --git a/libs/standard-tests/langchain_standard_tests/utils/__init__.py b/libs/standard-tests/langchain_tests/utils/__init__.py similarity index 100% rename from libs/standard-tests/langchain_standard_tests/utils/__init__.py rename to libs/standard-tests/langchain_tests/utils/__init__.py diff --git a/libs/standard-tests/langchain_standard_tests/utils/pydantic.py b/libs/standard-tests/langchain_tests/utils/pydantic.py similarity index 100% rename from libs/standard-tests/langchain_standard_tests/utils/pydantic.py rename to libs/standard-tests/langchain_tests/utils/pydantic.py diff --git a/libs/standard-tests/pyproject.toml b/libs/standard-tests/pyproject.toml index 8b1098c0003..238d90b1029 100644 --- a/libs/standard-tests/pyproject.toml +++ b/libs/standard-tests/pyproject.toml @@ -4,8 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "langchain-tests" -packages = [{ include = "langchain_standard_tests" }] -version = "0.3.1" +version = "0.3.2" description = "Standard tests for LangChain implementations" authors = ["Erick Friis "] readme = "README.md" diff --git a/libs/standard-tests/tests/unit_tests/test_in_memory_base_store.py b/libs/standard-tests/tests/unit_tests/test_in_memory_base_store.py index 5171c14c162..35ad6674bc5 100644 --- a/libs/standard-tests/tests/unit_tests/test_in_memory_base_store.py +++ b/libs/standard-tests/tests/unit_tests/test_in_memory_base_store.py @@ -5,7 +5,7 @@ from typing import Tuple import pytest from langchain_core.stores import InMemoryStore -from langchain_standard_tests.integration_tests.base_store import ( +from langchain_tests.integration_tests.base_store import ( BaseStoreAsyncTests, BaseStoreSyncTests, ) diff --git a/libs/standard-tests/tests/unit_tests/test_in_memory_cache.py b/libs/standard-tests/tests/unit_tests/test_in_memory_cache.py index 4f67a876490..6c1a1647ade 100644 --- a/libs/standard-tests/tests/unit_tests/test_in_memory_cache.py +++ b/libs/standard-tests/tests/unit_tests/test_in_memory_cache.py @@ -1,7 +1,7 @@ import pytest from langchain_core.caches import InMemoryCache -from langchain_standard_tests.integration_tests.cache import ( +from langchain_tests.integration_tests.cache import ( AsyncCacheTestSuite, SyncCacheTestSuite, ) diff --git a/libs/standard-tests/tests/unit_tests/test_in_memory_vectorstore.py b/libs/standard-tests/tests/unit_tests/test_in_memory_vectorstore.py index d1becb40c9e..8a3bf5d0a32 100644 --- a/libs/standard-tests/tests/unit_tests/test_in_memory_vectorstore.py +++ b/libs/standard-tests/tests/unit_tests/test_in_memory_vectorstore.py @@ -4,7 +4,7 @@ from langchain_core.vectorstores import ( VectorStore, ) -from langchain_standard_tests.integration_tests.vectorstores import ( +from langchain_tests.integration_tests.vectorstores import ( AsyncReadWriteTestSuite, ReadWriteTestSuite, )