Merge pull request #192 from natcap/hotfix/clip-upload

Fix clipping service upload path

Author: phargogh

clipping-service/app/app.py

@@ -55,9 +55,9 @@
 SOURCE_LOGGER.setLevel(logging.DEBUG)
 GOOGLE_STORAGE_URL = 'https://storage.googleapis.com'
 TRUSTED_BUCKET = f'{GOOGLE_STORAGE_URL}/natcap-data-cache'
-TARGET_BUCKET_PATH = 'jupyter-app-temp-storage/clipped'
-TARGET_FILE_BUCKET = f'gs://{TARGET_BUCKET_PATH}'
-TARGET_BUCKET_URL = f'{GOOGLE_STORAGE_URL}/{TARGET_BUCKET_PATH}'
+TARGET_FILE_BUCKET = 'gs://jupyter-app-temp-storage'
+TARGET_BUCKET_SUBDIR = 'clipped'
+TARGET_BUCKET_URL = f'{GOOGLE_STORAGE_URL}/jupyter-app-temp-storage/{TARGET_BUCKET_SUBDIR}'
 WORKSPACE_DIR = os.environ.get('WORKSPACE_DIR', os.getcwd())
 app.logger.info("WORKSPACE_DIR: %s", WORKSPACE_DIR)
 pygeoprocessing.geoprocessing._LOGGING_PERIOD = 1.0
@@ -363,7 +363,7 @@ def clip():
         bucketname = re.sub('^gs://', '', TARGET_FILE_BUCKET)
         storage_client = storage.Client()
         bucket = storage_client.bucket(bucketname)
-        blob = bucket.blob(bucket_filename)
+        blob = bucket.blob(f"{TARGET_BUCKET_SUBDIR}/{bucket_filename}")
         blob.upload_from_filename(target_file_path)
     except Exception:
         app.logger.exception("Falling back to cmdline gsutil")