Skip to content

fix: Update storage.Blob.from_string() to from_uri() #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

fix: Update storage.Blob.from_string() to from_uri() #385

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61414e0
fix: Update `storage.Blob.from_string()` to `from_uri()`
holtskinner Mar 14, 2025
6d16a7d
Run different methods depending on package version
holtskinner Mar 14, 2025
701d552
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 14, 2025
cb38843
Update google/cloud/documentai_toolbox/utilities/gcs_utilities.py
holtskinner Mar 14, 2025
8d136c2
Update google/cloud/documentai_toolbox/utilities/gcs_utilities.py
holtskinner Mar 14, 2025
e5a326f
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 14, 2025
9aad6cd
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 14, 2025
23d621c
Merge branch 'storage-update' of https://github.com/googleapis/python…
gcf-owl-bot[bot] Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion google/cloud/documentai_toolbox/utilities/gcs_utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# limitations under the License.
#
"""Google Cloud Storage utilities."""
import importlib.metadata
import os
import re
from typing import Dict, List, Optional, Tuple
Expand Down Expand Up @@ -142,7 +143,18 @@ def get_blob(
if not re.match(constants.FILE_CHECK_REGEX, gcs_uri):
raise ValueError("gcs_uri must link to a single file.")

return storage.Blob.from_string(gcs_uri, _get_storage_client(module=module))
try:
version = importlib.metadata.version("google-cloud-storage")
except importlib.metadata.PackageNotFoundError:
raise ImportError("google-cloud-storage is not installed.")

client = _get_storage_client(module=module)

major, _, _ = map(int, version.split("."))
if major < 3:
return storage.Blob.from_string(gcs_uri, client)
else:
return storage.Blob.from_uri(gcs_uri, client)


def split_gcs_uri(gcs_uri: str) -> Tuple[str, str]:
Expand Down
Loading