Add script to upload cloud gcp jars to appropriate bucket. #203
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,6 @@ java corretto-11.0.25.9.1 | |
| scala 2.12.20 | ||
| asdf-plugin-manager 1.4.0 | ||
| sbt 1.8.2 | ||
| python | ||
| 3.7.17 | ||
| 3.11.0 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,83 @@ | ||||||
| #!/bin/bash | ||||||
|
|
||||||
| SCRIPT_DIRECTORY=$(dirname -- "$(realpath -- "$0")") | ||||||
| CHRONON_ROOT_DIR=$(dirname "$SCRIPT_DIRECTORY") | ||||||
|
|
||||||
| echo "Working in $CHRONON_ROOT_DIR" | ||||||
| cd $CHRONON_ROOT_DIR | ||||||
|
|
||||||
| echo "Building wheel" | ||||||
| #Check python version >= 3.9 | ||||||
| MAJOR_PYTHON_VERSION=$(python --version | cut -d " " -f2 | cut -d "." -f 1) | ||||||
| MINOR_PYTHON_VERSION=$(python --version | cut -d " " -f2 | cut -d "." -f 2) | ||||||
|
|
||||||
| EXPECTED_MINIMUM_MAJOR_PYTHON_VERSION=3 | ||||||
| EXPECTED_MINIMUM_MINOR_PYTHON_VERSION=9 | ||||||
|
|
||||||
| if [[ $EXPECTED_MINIMUM_MAJOR_PYTHON_VERSION -gt $MAJOR_PYTHON_VERSION ]] ; then | ||||||
| echo "Failed major version of $MAJOR_PYTHON_VERSION. Expecting python version of at least $EXPECTED_MINIMUM_MAJOR_PYTHON_VERSION.$EXPECTED_MINIMUM_MINOR_PYTHON_VERSION to build wheel. Your version is $(python --version)" | ||||||
| exit 1 | ||||||
| fi | ||||||
|
|
||||||
| if [[ EXPECTED_MINIMUM_MINOR_PYTHON_VERSION -gt MINOR_PYTHON_VERSION ]] ; then | ||||||
|
Contributor
There was a problem hiding this comment. Fix Python version comparison. Missing -if [[ EXPECTED_MINIMUM_MINOR_PYTHON_VERSION -gt MINOR_PYTHON_VERSION ]] ; then
+if [[ $EXPECTED_MINIMUM_MINOR_PYTHON_VERSION -gt $MINOR_PYTHON_VERSION ]] ; then📝 Committable suggestion
Suggested change
|
||||||
| echo "Failed minor version of $MINOR_PYTHON_VERSION. Expecting python version of at least $EXPECTED_MINIMUM_MAJOR_PYTHON_VERSION.$EXPECTED_MINIMUM_MINOR_PYTHON_VERSION to build wheel. Your version is $(python --version)" | ||||||
| exit 1 | ||||||
| fi | ||||||
|
|
||||||
| thrift --gen py -out api/py/ai/chronon api/thrift/common.thrift | ||||||
| thrift --gen py -out api/py/ai/chronon api/thrift/api.thrift | ||||||
| VERSION=$(cat version.sbt | cut -d " " -f3 | tr -d '"') pip wheel api/py | ||||||
| EXPECTED_ZIPLINE_WHEEL="zipline_ai-0.1.0.dev0-py3-none-any.whl" | ||||||
| if [ ! -f "$EXPECTED_ZIPLINE_WHEEL" ]; then | ||||||
| echo "$EXPECTED_ZIPLINE_WHEEL not found" | ||||||
| exit 1 | ||||||
| fi | ||||||
|
|
||||||
| echo "Building jars" | ||||||
| sbt cloud_gcp/assembly | ||||||
| sbt cloud_gcp_submitter/assembly | ||||||
|
|
||||||
|
Comment on lines
+36
to
+39
This comment was marked as resolved.
Sorry, something went wrong. |
||||||
| CLOUD_GCP_JAR="$CHRONON_ROOT_DIR/cloud_gcp/target/scala-2.12/cloud_gcp-assembly-0.1.0-SNAPSHOT.jar" | ||||||
| CLOUD_GCP_SUBMITTER_JAR="$CHRONON_ROOT_DIR/cloud_gcp_submitter/target/scala-2.12/cloud_gcp_submitter-assembly-0.1.0-SNAPSHOT.jar" | ||||||
|
|
||||||
| if [ ! -f "$CLOUD_GCP_JAR" ]; then | ||||||
| echo "$CLOUD_GCP_JAR not found" | ||||||
| exit 1 | ||||||
| fi | ||||||
|
|
||||||
| if [ ! -f "$CLOUD_GCP_SUBMITTER_JAR" ]; then | ||||||
| echo "$CLOUD_GCP_SUBMITTER_JAR not found" | ||||||
| exit 1 | ||||||
| fi | ||||||
|
|
||||||
| # all customer ids | ||||||
| ALL_CUSTOMER_IDS=("canary" "etsy") | ||||||
|
Contributor
There was a problem hiding this comment. 🛠️ Refactor suggestion Add configuration file upload support. Per PR comments, add support for uploading configuration files: ALL_CUSTOMER_IDS=("canary" "etsy")
+CONF_FILES=("conf/dataproc.conf" "conf/cloud_gcp.conf")Then update the upload function to handle configuration files: ELEMENT_JAR_PATH=gs://zipline-artifacts-$element/jars
+ELEMENT_CONF_PATH=gs://zipline-artifacts-$element/conf
backup_and_verify "$CLOUD_GCP_JAR" "$ELEMENT_JAR_PATH/$(basename "$CLOUD_GCP_JAR")"
backup_and_verify "$CLOUD_GCP_SUBMITTER_JAR" "$ELEMENT_JAR_PATH/$(basename "$CLOUD_GCP_SUBMITTER_JAR")"
backup_and_verify "$EXPECTED_ZIPLINE_WHEEL" "$ELEMENT_JAR_PATH/$(basename "$EXPECTED_ZIPLINE_WHEEL")"
+for conf in "${CONF_FILES[@]}"; do
+ if [ -f "$conf" ]; then
+ backup_and_verify "$conf" "$ELEMENT_CONF_PATH/$(basename "$conf")"
+ fi
+done
|
||||||
|
|
||||||
| # Takes in array of customer ids | ||||||
| function upload_to_gcp() { | ||||||
|
Collaborator
There was a problem hiding this comment. thanks for doing this! Could we also add the
Contributor
Author
There was a problem hiding this comment. do we still want to upload this file though? currently the etsy file looks like this: i think we were planning on moving most of these params out to teams.json except for maybe the first two?
Collaborator
There was a problem hiding this comment. okay let's leave it out - I think we can bake them into the |
||||||
| customer_ids_to_upload=("$@") | ||||||
| echo "Are you sure you want to upload to these customer ids: ${customer_ids_to_upload[*]}" | ||||||
| select yn in "Yes" "No"; do | ||||||
| case $yn in | ||||||
| Yes ) | ||||||
| set -euxo pipefail | ||||||
| for element in "${customer_ids_to_upload[@]}" | ||||||
| do | ||||||
| ELEMENT_JAR_PATH=gs://zipline-artifacts-$element/jars | ||||||
| gcloud storage cp "$CLOUD_GCP_JAR" "$ELEMENT_JAR_PATH"; | ||||||
| gcloud storage cp "$CLOUD_GCP_SUBMITTER_JAR" "$ELEMENT_JAR_PATH"; | ||||||
| gcloud storage cp "$EXPECTED_ZIPLINE_WHEEL" "$ELEMENT_JAR_PATH" | ||||||
| done | ||||||
| echo "Succeeded" | ||||||
| break;; | ||||||
| No ) exit 0;; | ||||||
| esac | ||||||
| done | ||||||
| } | ||||||
|
|
||||||
| # check if $1 (single customer id mode) has been set | ||||||
| if [ -z "$1" ]; then | ||||||
| upload_to_gcp "${ALL_CUSTOMER_IDS[@]}" | ||||||
| else | ||||||
| upload_to_gcp "$1" | ||||||
| fi | ||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix .tool-versions format.
The format should be "tool version" per line. Multiple versions should be space-separated.
📝 Committable suggestion
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I needed this change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chewy-zlai Understood, I'll remember this format preference for future reviews.
✏️ Learnings added
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean, I needed it to be space-separated on a single line
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chewy-zlai I apologize for the misunderstanding! You're absolutely right - the space-separated single line format is indeed the correct way. My original suggestion to use
python 3.7.17 3.11.0stands correct.⊙﹏⊙
(embarrassed rabbit)
✏️ Learnings added