Modify oracledb pyproject for updated standard and fix get_min_versions (#72)

* modify oracledb pyproject for updated standard and fix get_min_versions

* update poetry.lock to reflect the latest pyproject.toml change

* add min version test in CI

* fix tomllib error with python3.9

* fix dep version for langchain

Author: YouNeedCryDear

.github/scripts/get_min_versions.py

@@ -1,9 +1,13 @@
 import sys
 
-import tomllib
 from packaging.version import parse as parse_version
 import re
 
+try:
+    import tomllib
+except ModuleNotFoundError:
+    import pip._vendor.tomli as tomllib
+
 MIN_VERSION_LIBS = ["langchain-core"]
 
 
@@ -34,8 +38,34 @@ def get_min_version_from_toml(toml_path: str):
     with open(toml_path, "rb") as file:
         toml_data = tomllib.load(file)
 
-    # Get the dependencies from tool.poetry.dependencies
-    dependencies = toml_data["tool"]["poetry"]["dependencies"]
+    # Get the dependencies from [project] section (PEP 621 format)
+    if "project" not in toml_data or "dependencies" not in toml_data["project"]:
+        raise ValueError("Could not find dependencies in [project] section")
+
+    dependencies_list = toml_data["project"]["dependencies"]
+
+    # Parse dependencies list into a dictionary
+    # Format: "package-name>=x.x.x,<y.y.y" or "package-name>=x.x.x; python_version < '3.10'"
+    dependencies = {}
+    for dep in dependencies_list:
+        # Remove environment markers (everything after semicolon)
+        dep_without_marker = dep.split(";")[0].strip()
+
+        # Extract package name and version spec
+        match = re.match(r"^([a-zA-Z0-9_-]+)(.*)$", dep_without_marker)
+        if match:
+            pkg_name = match.group(1)
+            version_spec = match.group(2)
+
+            # If this package already exists, collect both version specs
+            if pkg_name in dependencies:
+                # Store as a list to handle multiple version constraints
+                if isinstance(dependencies[pkg_name], list):
+                    dependencies[pkg_name].append(version_spec)
+                else:
+                    dependencies[pkg_name] = [dependencies[pkg_name], version_spec]
+            else:
+                dependencies[pkg_name] = version_spec
 
     # Initialize a dictionary to store the minimum versions
     min_versions = {}
@@ -44,23 +74,22 @@ def get_min_version_from_toml(toml_path: str):
     for lib in MIN_VERSION_LIBS:
         # Check if the lib is present in the dependencies
         if lib in dependencies:
-            # Get the version string or list
+            # Get the version string(s)
             version_spec = dependencies[lib]
 
             # Handle list format (multiple version constraints for different Python versions)
             if isinstance(version_spec, list):
                 # Extract all version strings from the list and find the minimum
                 versions = []
                 for spec in version_spec:
-                    if isinstance(spec, dict) and "version" in spec:
-                        versions.append(get_min_version(spec["version"]))
+                    if spec:
+                        versions.append(get_min_version(spec))
 
                 # If we found versions, use the minimum one
                 if versions:
-                    # Parse all versions and select the minimum
                     min_version = min(versions, key=parse_version)
                     min_versions[lib] = min_version
-            elif isinstance(version_spec, str):
+            elif isinstance(version_spec, str) and version_spec:
                 # Handle simple string format
                 min_version = get_min_version(version_spec)
                 min_versions[lib] = min_version

.github/workflows/_test.yml

@@ -49,6 +49,24 @@ jobs:
         run: |
           make test
 
+      - name: Get minimum versions
+        working-directory: ${{ inputs.working-directory }}
+        id: min-version
+        run: |
+          poetry run pip install packaging
+          min_versions="$(poetry run python $GITHUB_WORKSPACE/.github/scripts/get_min_versions.py pyproject.toml)"
+          echo "min-versions=$min_versions" >> "$GITHUB_OUTPUT"
+          echo "min-versions=$min_versions"
+
+      - name: Run unit tests with minimum dependency versions
+        if: ${{ steps.min-version.outputs.min-versions != '' }}
+        env:
+          MIN_VERSIONS: ${{ steps.min-version.outputs.min-versions }}
+        run: |
+          poetry run pip install $MIN_VERSIONS
+          make tests
+        working-directory: ${{ inputs.working-directory }}
+
       - name: Ensure the tests did not create any additional files
         shell: bash
         run: |

libs/oci/poetry.lock

@@ -6,7 +6,7 @@ readme = "README.md"
 license = "UPL-1.0"
 requires-python = ">=3.9,<4.0"
 dependencies = [
-    "langchain-core>=0.3.20,<1.0.0",
+    "langchain-core>=0.3.78,<1.0.0",
     "langchain>=0.3.20,<1.0.0",
     "oci>=2.161.0",
     "pydantic>=2,<3",

libs/oci/pyproject.toml

@@ -1,25 +1,25 @@
-[tool.poetry]
+[project]
 name = "langchain-oracledb"
 version = "1.1.0"
 description = "An integration package connecting Oracle Database and LangChain"
-authors = []
 readme = "README.md"
-repository = "https://github.com/oracle/langchain-oracle"
-license = "UPL"
+license = "UPL-1.0"
+requires-python = ">=3.9,<4.0"
+dependencies = [
+    "langchain-core>=0.3.15,<1.0.0; python_version < '3.10'",
+    "langchain-core>=1.0.0,<2.0.0; python_version >= '3.10'",
+    "langchain-community>=0.3.0",
+    "oracledb>=2.2.0",
+    "pydantic>=2,<3",
+    "numpy>=1.21,<3",
+]
 
-[tool.poetry.urls]
+[project.urls]
 "Source Code" = "https://github.com/oracle/langchain-oracle/tree/main/libs/oracledb"
+Repository = "https://github.com/oracle/langchain-oracle"
 
-[tool.poetry.dependencies]
-python = ">=3.9,<4.0"
-langchain-core = [
- { version = "^0.3.15", python = "<3.10" },
- { version = "^1.0.0", python = ">=3.10" }
-]
-langchain-community = ">=0.3.0"
-oracledb = ">=2.2.0"
-pydantic = ">=2,<3"
-numpy = ">=1.21,<3"
+[tool.poetry]
+package-mode = true
 
 [tool.poetry.group.test]
 optional = true
@@ -32,8 +32,8 @@ pytest-asyncio = "^0.23.2"
 pytest-watcher = "^0.3.4"
 sentence-transformers = "^5.0.0"
 langchain-tests = [
- { version = "^0.3.21", python = "<3.10" },
- { version = "^1.0.0", python = ">=3.10" }
+    { version = "^0.3.21", python = "<3.10" },
+    { version = "^1.0.0", python = ">=3.10" }
 ]
 
 [tool.poetry.group.codespell]
@@ -64,6 +64,9 @@ optional = true
 
 [tool.ruff]
 
+[tool.ruff.format]
+docstring-code-format = true
+
 [tool.ruff.lint]
 select = [
   "E",    # pycodestyle
@@ -75,9 +78,6 @@ ignore = [
   "COM812",  # Messes with the formatter
 ]
 
-[tool.ruff.format]
-docstring-code-format = true
-
 [tool.mypy]
 plugins = ["pydantic.mypy"]
 check_untyped_defs = true