Skip to content

Commit

Permalink
Merge pull request #56 from CBIIT/CRDCDH-2348-00-pgu
Browse files Browse the repository at this point in the history
CRDCDH 2348
  • Loading branch information
n2iw authored Feb 13, 2025
2 parents c62fe9a + bb6e5a4 commit 92d9d37
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
4 changes: 3 additions & 1 deletion src/common/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,6 @@

S3_START= "s3://"
FROM_S3 = "from_s3"
TEMP_DOWNLOAD_DIR = "tmp/download"
TEMP_DOWNLOAD_DIR = "tmp/download"

CLI_VERSION = "3.2"
9 changes: 5 additions & 4 deletions src/uploader.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
#The entry point of the cli, it control the workflows based on the upload type, file or metadata.
#############################
import os
import sys

from bento.common.utils import get_logger, LOG_PREFIX, get_time_stamp
from common.constants import UPLOAD_TYPE, S3_BUCKET, FILE_NAME_DEFAULT, FILE_SIZE_DEFAULT, BATCH_STATUS, \
from common.constants import UPLOAD_TYPE, S3_BUCKET, FILE_NAME_DEFAULT, BATCH_STATUS, \
BATCH_BUCKET, BATCH, BATCH_ID, FILE_PREFIX, TEMP_CREDENTIAL, SUCCEEDED, ERRORS, BATCH_CREATED, BATCH_UPDATED, \
FILE_PATH, SKIPPED, FILE_ID_FIELD, TYPE_FILE
FILE_PATH, SKIPPED, TYPE_FILE, CLI_VERSION
from common.graphql_client import APIInvoker
from common.utils import dump_dict_to_tsv, get_exception_msg
from upload_config import Config
Expand All @@ -21,7 +20,9 @@

log = get_logger('FileLoader')
# public function to received args and dispatch to different modules for different uploading types, file or metadata
def controller():
def controller():
# print cli version
print(f"v{CLI_VERSION}")
#step 1: process args, configuration file
config = Config()
if not config.validate():
Expand Down

0 comments on commit 92d9d37

Please sign in to comment.