Skip to content

Deduplicate example notebooks #456

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

Merged
feast-ci-bot merged 2 commits into from
Feb 2, 2020
Merged

Deduplicate example notebooks #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f6fe3c
Deduplicate example notebooks
woop Feb 2, 2020
d3562bb
Merge docker-compose.yml for both batch and online serving.
woop Feb 2, 2020
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
256 changes: 191 additions & 65 deletions examples/basic/basic.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions infra/docker-compose/.env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
# General
COMPOSE_PROJECT_NAME=feast

FEAST_VERSION=latest

# Feast Core
FEAST_CORE_IMAGE=gcr.io/kf-feast/feast-core
FEAST_CORE_CONFIG=direct-runner
FEAST_CORE_GCP_SERVICE_ACCOUNT_KEY=placeholder
FEAST_CORE_CONFIG=direct-runner.yml
FEAST_CORE_GCP_SERVICE_ACCOUNT_KEY=placeholder.json

# Feast Serving
FEAST_SERVING_IMAGE=gcr.io/kf-feast/feast-serving
FEAST_ONLINE_SERVING_CONFIG=online-serving
FEAST_ONLINE_STORE_CONFIG=redis-store
FEAST_BATCH_SERVING_CONFIG=batch-serving
FEAST_BATCH_STORE_CONFIG=bq-store
FEAST_BATCH_SERVING_GCP_SERVICE_ACCOUNT_KEY=placeholder
FEAST_JOB_STAGING_LOCATION=gs://your-gcp-project/bucket
FEAST_ONLINE_SERVING_CONFIG=online-serving.yml
FEAST_ONLINE_STORE_CONFIG=redis-store.yml
FEAST_BATCH_SERVING_CONFIG=batch-serving.yml
FEAST_BATCH_STORE_CONFIG=bq-store.yml
FEAST_BATCH_SERVING_GCP_SERVICE_ACCOUNT_KEY=placeholder.json
FEAST_JOB_STAGING_LOCATION=gs://your-gcs-bucket/staging

FEAST_JUPYTER_IMAGE=gcr.io/kf-feast/feast-jupyter
FEAST_JUPYTER_GCP_SERVICE_ACCOUNT_KEY=placeholder
# Jupyter
FEAST_JUPYTER_GCP_SERVICE_ACCOUNT_KEY=placeholder.json

25 changes: 0 additions & 25 deletions infra/docker-compose/docker-compose.batch.yml
View file
Open in desktop

This file was deleted.

38 changes: 30 additions & 8 deletions infra/docker-compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ services:
core:
image: ${FEAST_CORE_IMAGE}:${FEAST_VERSION}
volumes:
- ./core/${FEAST_CORE_CONFIG}.yml:/etc/feast/application.yml
- ./gcp-service-accounts/${FEAST_CORE_GCP_SERVICE_ACCOUNT_KEY}.json:/etc/gcloud/service-accounts/key.json
- ./core/${FEAST_CORE_CONFIG}:/etc/feast/application.yml
- ./gcp-service-accounts/${FEAST_CORE_GCP_SERVICE_ACCOUNT_KEY}:/etc/gcloud/service-accounts/key.json
environment:
DB_HOST: db
GOOGLE_APPLICATION_CREDENTIALS: /etc/gcloud/service-accounts/key.json
Expand All @@ -24,8 +24,8 @@ services:
online-serving:
image: ${FEAST_SERVING_IMAGE}:${FEAST_VERSION}
volumes:
- ./serving/${FEAST_ONLINE_SERVING_CONFIG}.yml:/etc/feast/application.yml
- ./serving/${FEAST_ONLINE_STORE_CONFIG}.yml:/etc/feast/store.yml
- ./serving/${FEAST_ONLINE_SERVING_CONFIG}:/etc/feast/application.yml
- ./serving/${FEAST_ONLINE_STORE_CONFIG}:/etc/feast/store.yml
depends_on:
- core
- redis
Expand All @@ -38,12 +38,34 @@ services:
- /opt/feast/feast-serving.jar
- --spring.config.location=classpath:/application.yml,file:/etc/feast/application.yml

batch-serving:
image: ${FEAST_SERVING_IMAGE}:${FEAST_VERSION}
volumes:
- ./serving/${FEAST_BATCH_SERVING_CONFIG}:/etc/feast/application.yml
- ./serving/${FEAST_BATCH_STORE_CONFIG}:/etc/feast/store.yml
- ./gcp-service-accounts/${FEAST_BATCH_SERVING_GCP_SERVICE_ACCOUNT_KEY}:/etc/gcloud/service-accounts/key.json
depends_on:
- core
- redis
ports:
- 6567:6567
restart: on-failure
environment:
GOOGLE_APPLICATION_CREDENTIALS: /etc/gcloud/service-accounts/key.json
FEAST_JOB_STAGING_LOCATION: ${FEAST_JOB_STAGING_LOCATION}
command:
- "java"
- "-Xms1024m"
- "-Xmx1024m"
- "-jar"
- "/opt/feast/feast-serving.jar"
- "--spring.config.location=classpath:/application.yml,file:/etc/feast/application.yml"

jupyter:
image: ${FEAST_JUPYTER_IMAGE}:${FEAST_VERSION}
image: jupyter/datascience-notebook:latest
volumes:
- ./jupyter/notebooks:/home/jovyan/feast-notebooks
- ./jupyter/features:/home/jovyan/features
- ./gcp-service-accounts/${FEAST_JUPYTER_GCP_SERVICE_ACCOUNT_KEY}.json:/etc/gcloud/service-accounts/key.json
- ../../:/home/jovyan/feast
- ./gcp-service-accounts/${FEAST_JUPYTER_GCP_SERVICE_ACCOUNT_KEY}:/etc/gcloud/service-accounts/key.json
depends_on:
- core
- online-serving
Expand Down
11 changes: 0 additions & 11 deletions infra/docker-compose/jupyter/features/cust_trans_fs.yaml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions infra/docker-compose/jupyter/features/cust_trans_fs_updated.yaml
View file
Open in desktop

This file was deleted.

Loading