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, )