Merge branch 'main' into renovate/all

Author: holtskinner

.coveragerc

@@ -22,7 +22,7 @@ omit =
   google/cloud/__init__.py
 
 [report]
-fail_under = 99
+fail_under = 98
 show_missing = True
 exclude_lines =
     # Re-enable the standard pragma

.github/workflows/unittest.yml

@@ -58,4 +58,4 @@ jobs:
       run: |
         find .coverage-results -type f -name '*.zip' -exec unzip {} \;
         coverage combine .coverage-results/**/.coverage*
-        coverage report --show-missing --fail-under=99
+        coverage report --show-missing --fail-under=98

google/cloud/documentai_toolbox/utilities/gcs_utilities.py

@@ -142,6 +142,10 @@ def get_blob(
     if not re.match(constants.FILE_CHECK_REGEX, gcs_uri):
         raise ValueError("gcs_uri must link to a single file.")
 
+    # google-cloud-storage >= 3.0.0
+    if hasattr(storage.Blob, "from_uri"):
+        return storage.Blob.from_uri(gcs_uri, _get_storage_client(module=module))
+
     return storage.Blob.from_string(gcs_uri, _get_storage_client(module=module))
 
 

owlbot.py

@@ -30,7 +30,7 @@
     unit_test_python_versions=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"],
     system_test_python_versions=["3.9", "3.14"],
     default_python_version="3.13",
-    cov_level=99,
+    cov_level=98,
     intersphinx_dependencies={
         "pandas": "https://pandas.pydata.org/pandas-docs/stable/"
     },

tests/unit/test_gcs_utilities.py

@@ -579,3 +579,50 @@ def test_get_blobs_with_no_input():
         match="You must provide either `gcs_uri` or both `gcs_bucket_name` and `gcs_prefix`.",
     ):
         gcs_utilities.get_blobs()
+
+
+@mock.patch("google.cloud.documentai_toolbox.utilities.gcs_utilities.storage")
+def test_get_blobs_with_gcs_uri(mock_storage):
+    client = mock_storage.Client.return_value
+    gcs_uri = "gs://test-bucket/test-directory/1/"
+
+    gcs_utilities.get_blobs(gcs_uri=gcs_uri)
+
+    mock_storage.Client.assert_called_once()
+    client.list_blobs.assert_called_once_with("test-bucket", prefix="test-directory/1/")
+
+
+def test_get_blobs_with_file_type_error():
+    with pytest.raises(ValueError, match="gcs_prefix cannot contain file types"):
+        gcs_utilities.get_blobs(gcs_bucket_name="test-bucket", gcs_prefix="test.json")
+
+
+def test_get_blob_invalid_uri():
+    with pytest.raises(ValueError, match="gcs_uri must link to a single file."):
+        gcs_utilities.get_blob("gs://test-bucket/prefix/")
+
+
+@mock.patch("google.cloud.documentai_toolbox.utilities.gcs_utilities.storage")
+def test_get_blob_from_uri(mock_storage):
+    gcs_uri = "gs://test-bucket/test.json"
+
+    # Mock storage.Blob.from_uri to exist
+    mock_storage.Blob.from_uri.return_value = mock.Mock(spec=storage.blob.Blob)
+
+    gcs_utilities.get_blob(gcs_uri=gcs_uri)
+
+    mock_storage.Blob.from_uri.assert_called_once()
+
+
+@mock.patch("google.cloud.documentai_toolbox.utilities.gcs_utilities.storage")
+def test_get_blob_from_string(mock_storage):
+    gcs_uri = "gs://test-bucket/test.json"
+
+    # Mock storage.Blob to NOT have from_uri
+    del mock_storage.Blob.from_uri
+
+    mock_storage.Blob.from_string.return_value = mock.Mock(spec=storage.blob.Blob)
+
+    gcs_utilities.get_blob(gcs_uri=gcs_uri)
+
+    mock_storage.Blob.from_string.assert_called_once()