diff --git a/.github/scripts/check_diff.py b/.github/scripts/check_diff.py index 6569b9f..02d83be 100644 --- a/.github/scripts/check_diff.py +++ b/.github/scripts/check_diff.py @@ -2,7 +2,7 @@ import sys from typing import Dict -LIB_DIRS = ["libs/oci"] +LIB_DIRS = ["libs/oci", "libs/oracledb"] if __name__ == "__main__": files = sys.argv[1:] diff --git a/libs/oracledb/langchain_oracledb/document_loaders/oracleadb_loader.py b/libs/oracledb/langchain_oracledb/document_loaders/oracleadb_loader.py index c19a3ea..2b7ff3b 100644 --- a/libs/oracledb/langchain_oracledb/document_loaders/oracleadb_loader.py +++ b/libs/oracledb/langchain_oracledb/document_loaders/oracleadb_loader.py @@ -53,7 +53,7 @@ def __init__( :param wallet_password: password of wallet, not required for TLS connections :param metadata: metadata used in document :param parameter: bind variable to use in query - """ + """ # noqa: E501 # Mandatory required arguments. self.query = query self.user = user diff --git a/libs/oracledb/pyproject.toml b/libs/oracledb/pyproject.toml index 597f821..8d499bf 100644 --- a/libs/oracledb/pyproject.toml +++ b/libs/oracledb/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langchain-oracledb" -version = "0.1.0" +version = "1.0.1" description = "An integration package connecting Oracle Database and LangChain" authors = [] readme = "README.md" diff --git a/libs/oracledb/tests/integration_tests/document_loaders/test_oracleds.py b/libs/oracledb/tests/integration_tests/document_loaders/test_oracleds.py index 9697f49..e257457 100644 --- a/libs/oracledb/tests/integration_tests/document_loaders/test_oracleds.py +++ b/libs/oracledb/tests/integration_tests/document_loaders/test_oracleds.py @@ -10,6 +10,9 @@ """ import sys +import oracledb +import pytest + from langchain_oracledb.document_loaders.oracleai import ( OracleDocLoader, OracleTextSplitter, @@ -24,14 +27,17 @@ passwd = "" v_dsn = "" +try: + oracledb.connect(user=uname, password=passwd, dsn=v_dsn) +except Exception as e: + pytest.skip( + allow_module_level=True, + reason=f"Database connection failed: {e}, skipping tests.", + ) + ### Test loader ##### def test_loader_test() -> None: - try: - import oracledb - except ImportError: - return - try: # oracle connection connection = oracledb.connect(user=uname, password=passwd, dsn=v_dsn) @@ -131,11 +137,6 @@ def test_loader_test() -> None: ### Test splitter #### def test_splitter_test() -> None: - try: - import oracledb - except ImportError: - return - try: # oracle connection connection = oracledb.connect(user=uname, password=passwd, dsn=v_dsn) @@ -311,11 +312,6 @@ def test_splitter_test() -> None: #### Test summary #### def test_summary_test() -> None: - try: - import oracledb - except ImportError: - return - try: # oracle connection connection = oracledb.connect(user=uname, password=passwd, dsn=v_dsn) diff --git a/libs/oracledb/tests/integration_tests/test_placeholder.py b/libs/oracledb/tests/integration_tests/test_placeholder.py new file mode 100644 index 0000000..05df087 --- /dev/null +++ b/libs/oracledb/tests/integration_tests/test_placeholder.py @@ -0,0 +1,10 @@ +# Copyright (c) 2025 Oracle and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ + +import pytest + + +@pytest.mark.compile +def test_placeholder() -> None: + """Makes sure no errors raised when no tests selected.""" + pass diff --git a/libs/oracledb/tests/integration_tests/vectorstores/test_oraclevs.py b/libs/oracledb/tests/integration_tests/vectorstores/test_oraclevs.py index 8eb22ca..e194f5f 100644 --- a/libs/oracledb/tests/integration_tests/vectorstores/test_oraclevs.py +++ b/libs/oracledb/tests/integration_tests/vectorstores/test_oraclevs.py @@ -39,6 +39,14 @@ password = "" dsn = "" +try: + oracledb.connect(user=username, password=password, dsn=dsn) +except Exception as e: + pytest.skip( + allow_module_level=True, + reason=f"Database connection failed: {e}, skipping tests.", + ) + ############################ ####### table_exists ####### diff --git a/libs/oracledb/tests/unit_tests/document_loaders/test_oracleadb.py b/libs/oracledb/tests/unit_tests/document_loaders/test_oracleadb.py index bd43fba..38dae73 100644 --- a/libs/oracledb/tests/unit_tests/document_loaders/test_oracleadb.py +++ b/libs/oracledb/tests/unit_tests/document_loaders/test_oracleadb.py @@ -54,7 +54,7 @@ def test_oracle_loader_load(mock_query: MagicMock) -> None: query="Test query", user="Test user", password="Test password", - connection_string="Test connection string", + dsn="Test connection string", metadata=["FIELD1"], )