Skip to content

fix: Change location of the proto-generated python code #2422

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

Closed
achals wants to merge 4 commits into from
Closed

fix: Change location of the proto-generated python code #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55d15aa
fix: Change the python proto structure to generate code in the main f…
achals Mar 17, 2022
9412651
remove import
achals Mar 18, 2022
6bc63d5
fix import
achals Mar 20, 2022
f011855
fix import in aws.py
achals Mar 20, 2022
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ dmypy.json

# Protos
sdk/python/docs/html
sdk/python/feast/protos/
sdk/python/feast/proto_*/
sdk/go/protos/
go/protos/

Expand Down
2 changes: 1 addition & 1 deletion protos/feast/core/DataFormat.proto → protos/feast/proto_core/DataFormat.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


syntax = "proto3";
package feast.core;
package feast.proto_core;

option go_package = "github.com/feast-dev/feast/go/protos/feast/core";
option java_outer_classname = "DataFormatProto";
Expand Down
8 changes: 4 additions & 4 deletions protos/feast/core/DataSource.proto → protos/feast/proto_core/DataSource.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@


syntax = "proto3";
package feast.core;
package feast.proto_core;

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

import "feast/core/DataFormat.proto";
import "feast/types/Value.proto";
import "feast/proto_core/DataFormat.proto";
import "feast/proto_types/Value.proto";

// Defines a Data Source that can be used source Feature data
// Next available id: 22
Expand Down Expand Up @@ -166,7 +166,7 @@ message DataSource {
message RequestDataOptions {
reserved 1;
// Mapping of feature name to type
map<string, feast.types.ValueType.Enum> schema = 2;
map<string, feast.proto_types.ValueType.Enum> schema = 2;
}

// DataSource options.
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/core/DatastoreTable.proto → protos/feast/proto_core/DatastoreTable.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

syntax = "proto3";

package feast.core;
package feast.proto_core;
option java_package = "feast.proto.core";
option java_outer_classname = "DatastoreTableProto";
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/core/DynamoDBTable.proto → protos/feast/proto_core/DynamoDBTable.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

syntax = "proto3";

package feast.core;
package feast.proto_core;
option java_package = "feast.proto.core";
option java_outer_classname = "DynamoDBTableProto";
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";
Expand Down
6 changes: 3 additions & 3 deletions protos/feast/core/Entity.proto → protos/feast/proto_core/Entity.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

syntax = "proto3";

package feast.core;
package feast.proto_core;
option java_package = "feast.proto.core";
option java_outer_classname = "EntityProto";
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";

import "feast/types/Value.proto";
import "feast/proto_types/Value.proto";
import "google/protobuf/timestamp.proto";

message Entity {
Expand All @@ -39,7 +39,7 @@ message EntitySpecV2 {
string project = 9;

// Type of the entity.
feast.types.ValueType.Enum value_type = 2;
feast.proto_types.ValueType.Enum value_type = 2;

// Description of the entity.
string description = 3;
Expand Down
6 changes: 3 additions & 3 deletions protos/feast/core/Feature.proto → protos/feast/proto_core/Feature.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
//

syntax = "proto3";
package feast.core;
package feast.proto_core;


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

import "feast/types/Value.proto";
import "feast/proto_types/Value.proto";

message FeatureSpecV2 {
// Name of the feature. Not updatable.
string name = 1;

// Value type of the feature. Not updatable.
feast.types.ValueType.Enum value_type = 2;
feast.proto_types.ValueType.Enum value_type = 2;

// Labels for user defined metadata on a feature
map<string,string> labels = 3;
Expand Down
4 changes: 2 additions & 2 deletions protos/feast/core/FeatureService.proto → protos/feast/proto_core/FeatureService.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
syntax = "proto3";
package feast.core;
package feast.proto_core;

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

import "google/protobuf/timestamp.proto";
import "feast/core/FeatureViewProjection.proto";
import "feast/proto_core/FeatureViewProjection.proto";

message FeatureService {
// User-specified specifications of this feature service.
Expand Down
6 changes: 3 additions & 3 deletions protos/feast/core/FeatureTable.proto → protos/feast/proto_core/FeatureTable.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


syntax = "proto3";
package feast.core;
package feast.proto_core;


option go_package = "github.com/feast-dev/feast/go/protos/feast/core";
Expand All @@ -25,8 +25,8 @@ option java_package = "feast.proto.core";

import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
import "feast/core/DataSource.proto";
import "feast/core/Feature.proto";
import "feast/proto_core/DataSource.proto";
import "feast/proto_core/Feature.proto";

message FeatureTable {
// User-specified specifications of this feature table.
Expand Down
6 changes: 3 additions & 3 deletions protos/feast/core/FeatureView.proto → protos/feast/proto_core/FeatureView.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@


syntax = "proto3";
package feast.core;
package feast.proto_core;

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

import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
import "feast/core/DataSource.proto";
import "feast/core/Feature.proto";
import "feast/proto_core/DataSource.proto";
import "feast/proto_core/Feature.proto";

message FeatureView {
// User-specified specifications of this feature view.
Expand Down
4 changes: 2 additions & 2 deletions ...os/feast/core/FeatureViewProjection.proto → ...st/proto_core/FeatureViewProjection.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
syntax = "proto3";
package feast.core;
package feast.proto_core;

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

import "feast/core/Feature.proto";
import "feast/proto_core/Feature.proto";


// A projection to be applied on top of a FeatureView.
Expand Down
8 changes: 4 additions & 4 deletions protos/feast/core/InfraObject.proto → protos/feast/proto_core/InfraObject.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

syntax = "proto3";

package feast.core;
package feast.proto_core;
option java_package = "feast.proto.core";
option java_outer_classname = "InfraObjectProto";
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";

import "feast/core/DatastoreTable.proto";
import "feast/core/DynamoDBTable.proto";
import "feast/core/SqliteTable.proto";
import "feast/proto_core/DatastoreTable.proto";
import "feast/proto_core/DynamoDBTable.proto";
import "feast/proto_core/SqliteTable.proto";

// Represents a set of infrastructure objects managed by Feast
message Infra {
Expand Down
10 changes: 5 additions & 5 deletions protos/feast/core/OnDemandFeatureView.proto → ...east/proto_core/OnDemandFeatureView.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@


syntax = "proto3";
package feast.core;
package feast.proto_core;

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

import "google/protobuf/timestamp.proto";
import "feast/core/FeatureView.proto";
import "feast/core/FeatureViewProjection.proto";
import "feast/core/Feature.proto";
import "feast/core/DataSource.proto";
import "feast/proto_core/FeatureView.proto";
import "feast/proto_core/FeatureViewProjection.proto";
import "feast/proto_core/Feature.proto";
import "feast/proto_core/DataSource.proto";

message OnDemandFeatureView {
// User-specified specifications of this feature view.
Expand Down
20 changes: 10 additions & 10 deletions protos/feast/core/Registry.proto → protos/feast/proto_core/Registry.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@

syntax = "proto3";

package feast.core;
package feast.proto_core;
option java_package = "feast.proto.core";
option java_outer_classname = "RegistryProto";
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";

import "feast/core/Entity.proto";
import "feast/core/FeatureService.proto";
import "feast/core/FeatureTable.proto";
import "feast/core/FeatureView.proto";
import "feast/core/InfraObject.proto";
import "feast/core/OnDemandFeatureView.proto";
import "feast/core/RequestFeatureView.proto";
import "feast/core/DataSource.proto";
import "feast/core/SavedDataset.proto";
import "feast/proto_core/Entity.proto";
import "feast/proto_core/FeatureService.proto";
import "feast/proto_core/FeatureTable.proto";
import "feast/proto_core/FeatureView.proto";
import "feast/proto_core/InfraObject.proto";
import "feast/proto_core/OnDemandFeatureView.proto";
import "feast/proto_core/RequestFeatureView.proto";
import "feast/proto_core/DataSource.proto";
import "feast/proto_core/SavedDataset.proto";
import "google/protobuf/timestamp.proto";

// Next id: 13
Expand Down
4 changes: 2 additions & 2 deletions protos/feast/core/RequestFeatureView.proto → ...feast/proto_core/RequestFeatureView.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@


syntax = "proto3";
package feast.core;
package feast.proto_core;

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

import "feast/core/DataSource.proto";
import "feast/proto_core/DataSource.proto";

message RequestFeatureView {
// User-specified specifications of this feature view.
Expand Down
6 changes: 3 additions & 3 deletions protos/feast/core/SavedDataset.proto → protos/feast/proto_core/SavedDataset.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

syntax = "proto3";

package feast.core;
package feast.proto_core;
option java_package = "feast.proto.core";
option java_outer_classname = "SavedDatasetProto";
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";

import "google/protobuf/timestamp.proto";
import "feast/core/DataSource.proto";
import "feast/core/FeatureService.proto";
import "feast/proto_core/DataSource.proto";
import "feast/proto_core/FeatureService.proto";

message SavedDatasetSpec {
// Name of the dataset. Must be unique since it's possible to overwrite dataset by name
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/core/SqliteTable.proto → protos/feast/proto_core/SqliteTable.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

syntax = "proto3";

package feast.core;
package feast.proto_core;
option java_package = "feast.proto.core";
option java_outer_classname = "SqliteTableProto";
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/core/Store.proto → protos/feast/proto_core/Store.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//

syntax = "proto3";
package feast.core;
package feast.proto_core;

option java_package = "feast.proto.core";
option java_outer_classname = "StoreProto";
Expand Down
4 changes: 2 additions & 2 deletions protos/feast/core/ValidationProfile.proto → .../feast/proto_core/ValidationProfile.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

syntax = "proto3";

package feast.core;
package feast.proto_core;
option java_package = "feast.proto.core";
option java_outer_classname = "ValidationProfile";
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";

import "feast/core/SavedDataset.proto";
import "feast/proto_core/SavedDataset.proto";

message GEValidationProfiler {
message UserDefinedProfiler {
Expand Down
12 changes: 6 additions & 6 deletions protos/feast/serving/Connector.proto → protos/feast/proto_serving/Connector.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
syntax = "proto3";

package grpc.connector;
package feast.proto_serving;

import "google/protobuf/timestamp.proto";
import "feast/types/Value.proto";
import "feast/types/EntityKey.proto";
import "feast/serving/ServingService.proto";
import "feast/proto_types/Value.proto";
import "feast/proto_types/EntityKey.proto";
import "feast/proto_serving/ServingService.proto";

option go_package = "github.com/feast-dev/feast/go/protos/feast/serving";

message ConnectorFeature {
feast.serving.FeatureReferenceV2 reference = 1;
google.protobuf.Timestamp timestamp = 2;
feast.types.Value value = 3;
feast.proto_types.Value value = 3;
}

message ConnectorFeatureList {
Expand All @@ -24,7 +24,7 @@ service OnlineStore {
}

message OnlineReadRequest {
repeated feast.types.EntityKey entityKeys = 1;
repeated feast.proto_types.EntityKey entityKeys = 1;
string view = 2;
repeated string features = 3;
}
Expand Down
10 changes: 5 additions & 5 deletions protos/feast/serving/ServingService.proto → .../feast/proto_serving/ServingService.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ syntax = "proto3";
package feast.serving;

import "google/protobuf/timestamp.proto";
import "feast/types/Value.proto";
import "feast/proto_types/Value.proto";

option java_package = "feast.proto.serving";
option java_outer_classname = "ServingAPIProto";
Expand Down Expand Up @@ -68,7 +68,7 @@ message GetOnlineFeaturesRequestV2 {
google.protobuf.Timestamp timestamp = 1;

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

Expand All @@ -84,13 +84,13 @@ message GetOnlineFeaturesRequest {
}
// The entity data is specified in a columnar format
// A map of entity name -> list of values
map<string, feast.types.RepeatedValue> entities = 3;
map<string, feast.proto_types.RepeatedValue> entities = 3;
bool full_feature_names = 4;

// Context for OnDemand Feature Transformation
// (was moved to dedicated parameter to avoid unnecessary separation logic on serving side)
// A map of variable name -> list of values
map<string, feast.types.RepeatedValue> request_context = 5;
map<string, feast.proto_types.RepeatedValue> request_context = 5;
}

message GetOnlineFeaturesResponse {
Expand All @@ -101,7 +101,7 @@ message GetOnlineFeaturesResponse {
repeated FeatureVector results = 2;

message FeatureVector {
repeated feast.types.Value values = 1;
repeated feast.proto_types.Value values = 1;
repeated FieldStatus statuses = 2;
repeated google.protobuf.Timestamp event_timestamps = 3;
}
Expand Down
0 ...feast/serving/TransformationService.proto → ...proto_serving/TransformationService.proto
View file
Open in desktop
File renamed without changes.
Loading