Skip to content
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.

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

Create empty Job Service #1059

Merged
merged 2 commits into from
Oct 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
docs
!docs/coverage
charts
env
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ build-java-no-tests:
# Python SDK

install-python-ci-dependencies:
pip install -r sdk/python/requirements-ci.txt
pip install --no-cache-dir -r sdk/python/requirements-ci.txt

compile-protos-python: install-python-ci-dependencies
@$(foreach dir,$(PROTO_TYPE_SUBDIRS),cd ${ROOT_DIR}/protos; python -m grpc_tools.protoc -I. --python_out=../sdk/python/ --mypy_out=../sdk/python/ feast/$(dir)/*.proto;)
Expand Down Expand Up @@ -121,15 +121,19 @@ build-push-docker:
@$(MAKE) push-serving-docker registry=$(REGISTRY) version=$(VERSION)
@$(MAKE) push-ci-docker registry=$(REGISTRY) version=$(VERSION)
@$(MAKE) push-jobcontroller-docker registry=$(REGISTRY) version=$(VERSION)
@$(MAKE) push-jobservice-docker registry=$(REGISTRY) version=$(VERSION)

build-docker: build-core-docker build-serving-docker build-ci-docker build-jobcontroller-docker
build-docker: build-core-docker build-serving-docker build-ci-docker build-jobcontroller-docker build-jobservice-docker

push-core-docker:
docker push $(REGISTRY)/feast-core:$(VERSION)

push-jobcontroller-docker:
docker push $(REGISTRY)/feast-jobcontroller:$(VERSION)

push-jobservice-docker:
docker push $(REGISTRY)/feast-jobservice:$(VERSION)

push-serving-docker:
docker push $(REGISTRY)/feast-serving:$(VERSION)

Expand All @@ -142,6 +146,9 @@ push-jupyter-docker:
build-core-docker:
docker build -t $(REGISTRY)/feast-core:$(VERSION) -f infra/docker/core/Dockerfile .

build-jobservice-docker:
docker build -t $(REGISTRY)/feast-jobservice:$(VERSION) -f infra/docker/jobservice/Dockerfile .

build-jobcontroller-docker:
docker build -t $(REGISTRY)/feast-jobcontroller:$(VERSION) -f infra/docker/jobcontroller/Dockerfile .

Expand Down Expand Up @@ -200,4 +207,4 @@ lint-versions:
# Performance

test-load:
./infra/scripts/test-load.sh $(GIT_SHA)
./infra/scripts/test-load.sh $(GIT_SHA)
21 changes: 21 additions & 0 deletions infra/docker/jobservice/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM python:3.7-slim-buster

USER root
WORKDIR /feast

COPY sdk/python sdk/python
COPY Makefile Makefile
COPY protos protos

# Install make
RUN apt-get update && apt-get -y install make git

# Install Python dependencies
RUN make compile-protos-python

# Install Feast SDK
COPY .git .git
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why we copy git into the docker file?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like git is used by sdk/python/setup.py here https://github.com/feast-dev/feast/blob/master/sdk/python/setup.py#L52. If I remove this line docker build step errors out.

Also I copied this mostly from the jupyter dockerfile, which contains the similar build step. We could improve docker build files by removing the dependency on git (seems like it's only used to copy the readme file from the git repo root), but I think that's probably better handled by another PR.

COPY README.md README.md
RUN pip install -e sdk/python -U

CMD ["feast", "server"]
197 changes: 197 additions & 0 deletions protos/feast/core/JobService.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
//
// Copyright 2018 The Feast Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";
package feast.core;

option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core";
option java_outer_classname = "JobServiceProto";
option java_package = "feast.proto.core";

import "google/protobuf/timestamp.proto";
import "feast/core/DataSource.proto";
import "feast/serving/ServingService.proto";

service JobService {
// Start job to ingest data from offline store into online store
rpc StartOfflineToOnlineIngestionJob (StartOfflineToOnlineIngestionJobRequest) returns (StartOfflineToOnlineIngestionJobResponse);

// Produce a training dataset, return a job id that will provide a file reference
rpc GetHistoricalFeatures (GetHistoricalFeaturesRequest) returns (GetHistoricalFeaturesResponse);

// Start job to ingest data from stream into online store
rpc StartStreamToOnlineIngestionJob (StartStreamToOnlineIngestionJobRequest) returns (StartStreamToOnlineIngestionJobResponse);

// List all types of jobs
rpc ListJobs (ListJobsRequest) returns (ListJobsResponse);

// Stop a single job
rpc StopJob (StopJobRequest) returns (StopJobResponse);

// Get details of a single job
rpc GetJob (GetJobRequest) returns (GetJobResponse);
}


enum JobType {
INVALID_JOB = 0;
OFFLINE_TO_ONLINE_JOB = 1;
STREAM_TO_ONLINE_JOB = 2;
EXPORT_JOB = 4;
}

enum JobStatus {
JOB_STATUS_INVALID = 0;
// The Job has be registered and waiting to get scheduled to run
JOB_STATUS_PENDING = 1;
// The Job is currently processing its task
JOB_STATUS_RUNNING = 2;
// The Job has successfully completed its task
JOB_STATUS_DONE = 3;
// The Job has encountered an error while processing its task
JOB_STATUS_ERROR = 4;
}

message Job {
// Identifier of the Job
string id = 1;
// External Identifier of the Job assigned by the Spark executor
string external_id = 2;
// Type of the Job
JobType type = 3;
// Current job status
JobStatus status = 4;
// Timestamp on when the job was is created
google.protobuf.Timestamp created_timestamp = 5;
// Timestamp on when the job has stopped.
google.protobuf.Timestamp stop_timestamp = 6;

message ExportJobMeta {
// Glob of the exported files that should be retrieved to reconstruct
// the dataframe with retrieved features.
repeated string file_glob = 1;
// The Historical Features request that triggered this export job
GetHistoricalFeaturesRequest request = 2;
}

message OfflineToOnlineMeta {
// Reference to the Feature Table being populated by this job
string project = 1;
string table_name = 2;
}

message StreamToOnlineMeta {
// Reference to the Feature Table being populated by this job
string project = 1;
string table_name = 2;
}

// JobType specific metadata on the job
oneof meta {
ExportJobMeta export = 7;
OfflineToOnlineMeta offline_to_online = 8;
StreamToOnlineMeta stream_to_online = 9;
}
}

// Ingest data from offline store into online store
message StartOfflineToOnlineIngestionJobRequest {
// Feature table to ingest
string project = 1;
string table_name = 2;

// Start of time range for source data from offline store
google.protobuf.Timestamp start_date = 3;

// End of time range for source data from offline store
google.protobuf.Timestamp end_date = 4;
}

message StartOfflineToOnlineIngestionJobResponse {
// Job ID assigned by Feast
string id = 1;
}

message GetHistoricalFeaturesRequest {
// List of features that are being retrieved
repeated feast.serving.FeatureReferenceV2 features = 1;

// Batch DataSource that can be used to obtain entity values for historical retrieval.
// For each entity value, a feature value will be retrieved for that value/timestamp
// Only 'BATCH_*' source types are supported.
// Currently only BATCH_FILE source type is supported.
DataSource entities_source = 2;

// Optional field to specify project name override. If specified, uses the
// given project for retrieval. Overrides the projects specified in
// Feature References if both are specified.
string project = 3;

// Specifies the path in a bucket to write the exported feature data files
// Export to AWS S3 - s3://path/to/features
// Export to GCP GCS - gs://path/to/features
string destination_path = 4;
}

message GetHistoricalFeaturesResponse {
// Export Job with ID assigned by Feast
string id = 1;
}

message StartStreamToOnlineIngestionJobRequest {
// Feature table to ingest
string project = 1;
string table_name = 2;
}

message StartStreamToOnlineIngestionJobResponse {
// Job ID assigned by Feast
string id = 1;
}

message ListJobsRequest {
Filter filter = 1;
message Filter {
// Filter jobs by job type
JobType type = 1;
// Filter jobs by current job status
JobStatus status = 2;
}
}

message ListJobsResponse {
repeated Job jobs = 1;
}

message GetJobRequest {
string job_id = 1;
}

message GetJobResponse {
Job job = 1;
}

message RestartJobRequest {
string job_id = 1;
}

message RestartJobResponse {}

message StopJobRequest{
string job_id = 1;
}

message StopJobResponse {}
23 changes: 11 additions & 12 deletions protos/feast/serving/ServingService.proto
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ message FeatureReference {
message FeatureReferenceV2 {
// Name of the Feature Table to retrieve the feature from.
string feature_table = 1;

// Name of the Feature to retrieve the feature from.
string name = 2;
}
Expand Down Expand Up @@ -120,27 +120,26 @@ message GetOnlineFeaturesRequest {
message GetOnlineFeaturesRequestV2 {
// List of features that are being retrieved
repeated FeatureReferenceV2 features = 4;

// List of entity rows, containing entity id and timestamp data.
// Used during retrieval of feature rows and for joining feature
// rows into a final dataset
repeated EntityRow entity_rows = 2;

// Optional field to specify project name override. If specified, uses the
// given project for retrieval. Overrides the projects specified in
// Feature References if both are specified.
string project = 5;

message EntityRow {
// Request timestamp of this row. This value will be used,
// together with maxAge, to determine feature staleness.
google.protobuf.Timestamp timestamp = 1;
// Map containing mapping of entity name to entity value.
map<string,feast.types.Value> fields = 2;
// Request timestamp of this row. This value will be used,
// together with maxAge, to determine feature staleness.
google.protobuf.Timestamp timestamp = 1;

// Map containing mapping of entity name to entity value.
map<string,feast.types.Value> fields = 2;
}
}

}

message GetBatchFeaturesRequest {
// List of features that are being retrieved
Expand Down
1 change: 0 additions & 1 deletion sdk/go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require (
github.com/golang/protobuf v1.4.2
github.com/google/go-cmp v0.5.1
github.com/opentracing/opentracing-go v1.1.0
github.com/stretchr/testify v1.4.0 // indirect
go.opencensus.io v0.22.4
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
google.golang.org/api v0.30.0
Expand Down
10 changes: 10 additions & 0 deletions sdk/python/feast/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@
from feast.constants import CONFIG_SPARK_LAUNCHER
from feast.entity import Entity
from feast.feature_table import FeatureTable
from feast.job_service import start_job_service
from feast.loaders.yaml import yaml_loader

_logger = logging.getLogger(__name__)

_common_options = [
click.option("--core-url", help="Set Feast core URL to connect to"),
click.option("--serving-url", help="Set Feast serving URL to connect to"),
click.option("--job-service-url", help="Set Feast job service URL to connect to"),
]


Expand Down Expand Up @@ -491,5 +493,13 @@ def get_historical_features(features: str, entity_df_path: str, destination: str
print(job.get_output_file_uri())


@cli.command(name="server")
def server():
"""
Start Feast Job Service
"""
start_job_service()


if __name__ == "__main__":
cli()
Loading