Skip to content

Make GCS optional for transfer elevation cache and cleanup #608

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
jeremyzilar wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Make GCS optional for transfer elevation cache and cleanup #608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions transfers/well_transfer_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from sqlalchemy.orm import Session

from db import GeologicFormation, Location
from services.gcs_helper import get_storage_bucket
from services.gcs_helper import GCS_BUCKET_NAME, get_storage_bucket
from services.util import (
get_state_from_point,
get_county_from_point,
Expand Down Expand Up @@ -156,13 +156,17 @@ def get_or_create_geologic_formation(


def get_cached_elevations() -> dict:
if not GCS_BUCKET_NAME:
return {}
bucket = get_storage_bucket()
log_filename = "transfer_data/cached_elevations.json"
blob = bucket.blob(log_filename)
return download_blob_json(blob, default={})


def dump_cached_elevations(lut: dict):
if not GCS_BUCKET_NAME:
return
bucket = get_storage_bucket()
log_filename = "transfer_data/cached_elevations.json"
blob = bucket.blob(log_filename)
Expand All @@ -174,17 +178,19 @@ def cleanup_locations(session):
n = len(locations)
lut = {}

bucket = get_storage_bucket()
log_filename = "transfer_data/location_cleanup.json"
blob = bucket.blob(log_filename)
if blob.exists():
lut = download_blob_json(blob, default={})
if GCS_BUCKET_NAME:
bucket = get_storage_bucket()
log_filename = "transfer_data/location_cleanup.json"
blob = bucket.blob(log_filename)
if blob.exists():
lut = download_blob_json(blob, default={})

updates = []
for i, location in enumerate(locations):
if i and not i % 100:
logger.info(f"Processing row {i} of {n}. dumping lut to {log_filename}")
upload_blob_json(blob, lut)
logger.info(f"Processing row {i} of {n}")
if GCS_BUCKET_NAME:
upload_blob_json(blob, lut)
session.bulk_update_mappings(Location, updates)
session.commit()
updates = []
Expand Down Expand Up @@ -222,7 +228,8 @@ def cleanup_locations(session):
f"={quad_name}"
)

upload_blob_json(blob, lut)
if GCS_BUCKET_NAME:
upload_blob_json(blob, lut)
if updates:
session.bulk_update_mappings(Location, updates)
session.commit()
Expand Down
Loading