diff --git a/.gitignore b/.gitignore index 5cd8d218856..5b8b3fa89b7 100644 --- a/.gitignore +++ b/.gitignore @@ -184,7 +184,7 @@ dmypy.json # Protos sdk/python/docs/html -sdk/python/feast/protos/ +sdk/python/feast/proto_*/ sdk/go/protos/ go/protos/ diff --git a/protos/feast/core/DataFormat.proto b/protos/feast/proto_core/DataFormat.proto similarity index 98% rename from protos/feast/core/DataFormat.proto rename to protos/feast/proto_core/DataFormat.proto index 9fd01e865c2..a0d5f4735c9 100644 --- a/protos/feast/core/DataFormat.proto +++ b/protos/feast/proto_core/DataFormat.proto @@ -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"; diff --git a/protos/feast/core/DataSource.proto b/protos/feast/proto_core/DataSource.proto similarity index 97% rename from protos/feast/core/DataSource.proto rename to protos/feast/proto_core/DataSource.proto index e954733195a..624b266d16e 100644 --- a/protos/feast/core/DataSource.proto +++ b/protos/feast/proto_core/DataSource.proto @@ -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 @@ -166,7 +166,7 @@ message DataSource { message RequestDataOptions { reserved 1; // Mapping of feature name to type - map schema = 2; + map schema = 2; } // DataSource options. diff --git a/protos/feast/core/DatastoreTable.proto b/protos/feast/proto_core/DatastoreTable.proto similarity index 97% rename from protos/feast/core/DatastoreTable.proto rename to protos/feast/proto_core/DatastoreTable.proto index 4246a6ae6e7..ab43a1db961 100644 --- a/protos/feast/core/DatastoreTable.proto +++ b/protos/feast/proto_core/DatastoreTable.proto @@ -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"; diff --git a/protos/feast/core/DynamoDBTable.proto b/protos/feast/proto_core/DynamoDBTable.proto similarity index 97% rename from protos/feast/core/DynamoDBTable.proto rename to protos/feast/proto_core/DynamoDBTable.proto index 4e5c8714e84..d5fa73d29e7 100644 --- a/protos/feast/core/DynamoDBTable.proto +++ b/protos/feast/proto_core/DynamoDBTable.proto @@ -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"; diff --git a/protos/feast/core/Entity.proto b/protos/feast/proto_core/Entity.proto similarity index 93% rename from protos/feast/core/Entity.proto rename to protos/feast/proto_core/Entity.proto index d8d8bedc5eb..47d22d34b6b 100644 --- a/protos/feast/core/Entity.proto +++ b/protos/feast/proto_core/Entity.proto @@ -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 { @@ -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; diff --git a/protos/feast/core/Feature.proto b/protos/feast/proto_core/Feature.proto similarity index 89% rename from protos/feast/core/Feature.proto rename to protos/feast/proto_core/Feature.proto index a96423bfbde..159132acd4c 100644 --- a/protos/feast/core/Feature.proto +++ b/protos/feast/proto_core/Feature.proto @@ -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 labels = 3; diff --git a/protos/feast/core/FeatureService.proto b/protos/feast/proto_core/FeatureService.proto similarity index 93% rename from protos/feast/core/FeatureService.proto rename to protos/feast/proto_core/FeatureService.proto index 2295677583a..d1d9ecd6ca3 100644 --- a/protos/feast/core/FeatureService.proto +++ b/protos/feast/proto_core/FeatureService.proto @@ -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. diff --git a/protos/feast/core/FeatureTable.proto b/protos/feast/proto_core/FeatureTable.proto similarity index 96% rename from protos/feast/core/FeatureTable.proto rename to protos/feast/proto_core/FeatureTable.proto index 4054db58aed..347cc2668ff 100644 --- a/protos/feast/core/FeatureTable.proto +++ b/protos/feast/proto_core/FeatureTable.proto @@ -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"; @@ -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. diff --git a/protos/feast/core/FeatureView.proto b/protos/feast/proto_core/FeatureView.proto similarity index 96% rename from protos/feast/core/FeatureView.proto rename to protos/feast/proto_core/FeatureView.proto index 60cf5d28d32..d5f4cc31d2d 100644 --- a/protos/feast/core/FeatureView.proto +++ b/protos/feast/proto_core/FeatureView.proto @@ -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 = "FeatureViewProto"; @@ -24,8 +24,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 FeatureView { // User-specified specifications of this feature view. diff --git a/protos/feast/core/FeatureViewProjection.proto b/protos/feast/proto_core/FeatureViewProjection.proto similarity index 91% rename from protos/feast/core/FeatureViewProjection.proto rename to protos/feast/proto_core/FeatureViewProjection.proto index 36d17632e7d..effa4b80db7 100644 --- a/protos/feast/core/FeatureViewProjection.proto +++ b/protos/feast/proto_core/FeatureViewProjection.proto @@ -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. diff --git a/protos/feast/core/InfraObject.proto b/protos/feast/proto_core/InfraObject.proto similarity index 90% rename from protos/feast/core/InfraObject.proto rename to protos/feast/proto_core/InfraObject.proto index 35204015173..1db482b443e 100644 --- a/protos/feast/core/InfraObject.proto +++ b/protos/feast/proto_core/InfraObject.proto @@ -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 { diff --git a/protos/feast/core/OnDemandFeatureView.proto b/protos/feast/proto_core/OnDemandFeatureView.proto similarity index 90% rename from protos/feast/core/OnDemandFeatureView.proto rename to protos/feast/proto_core/OnDemandFeatureView.proto index 5c373ab6f65..a8e87b89235 100644 --- a/protos/feast/core/OnDemandFeatureView.proto +++ b/protos/feast/proto_core/OnDemandFeatureView.proto @@ -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. diff --git a/protos/feast/core/Registry.proto b/protos/feast/proto_core/Registry.proto similarity index 77% rename from protos/feast/core/Registry.proto rename to protos/feast/proto_core/Registry.proto index 1978f41064a..b8fddd5c804 100644 --- a/protos/feast/core/Registry.proto +++ b/protos/feast/proto_core/Registry.proto @@ -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 diff --git a/protos/feast/core/RequestFeatureView.proto b/protos/feast/proto_core/RequestFeatureView.proto similarity index 94% rename from protos/feast/core/RequestFeatureView.proto rename to protos/feast/proto_core/RequestFeatureView.proto index 541ad788dc7..7c3eaf327b1 100644 --- a/protos/feast/core/RequestFeatureView.proto +++ b/protos/feast/proto_core/RequestFeatureView.proto @@ -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. diff --git a/protos/feast/core/SavedDataset.proto b/protos/feast/proto_core/SavedDataset.proto similarity index 95% rename from protos/feast/core/SavedDataset.proto rename to protos/feast/proto_core/SavedDataset.proto index fd8fdecde06..6f0814eaf22 100644 --- a/protos/feast/core/SavedDataset.proto +++ b/protos/feast/proto_core/SavedDataset.proto @@ -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 diff --git a/protos/feast/core/SqliteTable.proto b/protos/feast/proto_core/SqliteTable.proto similarity index 97% rename from protos/feast/core/SqliteTable.proto rename to protos/feast/proto_core/SqliteTable.proto index 8665be840ae..ce765b6a205 100644 --- a/protos/feast/core/SqliteTable.proto +++ b/protos/feast/proto_core/SqliteTable.proto @@ -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"; diff --git a/protos/feast/core/Store.proto b/protos/feast/proto_core/Store.proto similarity index 99% rename from protos/feast/core/Store.proto rename to protos/feast/proto_core/Store.proto index c92a526354d..abd8193eab4 100644 --- a/protos/feast/core/Store.proto +++ b/protos/feast/proto_core/Store.proto @@ -15,7 +15,7 @@ // syntax = "proto3"; -package feast.core; +package feast.proto_core; option java_package = "feast.proto.core"; option java_outer_classname = "StoreProto"; diff --git a/protos/feast/core/ValidationProfile.proto b/protos/feast/proto_core/ValidationProfile.proto similarity index 94% rename from protos/feast/core/ValidationProfile.proto rename to protos/feast/proto_core/ValidationProfile.proto index 673a792fdf8..f971ff41d12 100644 --- a/protos/feast/core/ValidationProfile.proto +++ b/protos/feast/proto_core/ValidationProfile.proto @@ -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 { diff --git a/protos/feast/serving/Connector.proto b/protos/feast/proto_serving/Connector.proto similarity index 69% rename from protos/feast/serving/Connector.proto rename to protos/feast/proto_serving/Connector.proto index 4e4ec51774d..ca63d6cbbe4 100644 --- a/protos/feast/serving/Connector.proto +++ b/protos/feast/proto_serving/Connector.proto @@ -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 { @@ -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; } diff --git a/protos/feast/serving/ServingService.proto b/protos/feast/proto_serving/ServingService.proto similarity index 93% rename from protos/feast/serving/ServingService.proto rename to protos/feast/proto_serving/ServingService.proto index a940b725025..0d0b1ec90bb 100644 --- a/protos/feast/serving/ServingService.proto +++ b/protos/feast/proto_serving/ServingService.proto @@ -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"; @@ -68,7 +68,7 @@ message GetOnlineFeaturesRequestV2 { google.protobuf.Timestamp timestamp = 1; // Map containing mapping of entity name to entity value. - map fields = 2; + map fields = 2; } } @@ -84,13 +84,13 @@ message GetOnlineFeaturesRequest { } // The entity data is specified in a columnar format // A map of entity name -> list of values - map entities = 3; + map 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 request_context = 5; + map request_context = 5; } message GetOnlineFeaturesResponse { @@ -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; } diff --git a/protos/feast/serving/TransformationService.proto b/protos/feast/proto_serving/TransformationService.proto similarity index 100% rename from protos/feast/serving/TransformationService.proto rename to protos/feast/proto_serving/TransformationService.proto diff --git a/protos/feast/storage/Redis.proto b/protos/feast/proto_storage/Redis.proto similarity index 90% rename from protos/feast/storage/Redis.proto rename to protos/feast/proto_storage/Redis.proto index c89e0b6b2fa..d84447f1fd5 100644 --- a/protos/feast/storage/Redis.proto +++ b/protos/feast/proto_storage/Redis.proto @@ -16,7 +16,7 @@ syntax = "proto3"; -import "feast/types/Value.proto"; +import "feast/proto_types/Value.proto"; package feast.storage; @@ -29,5 +29,5 @@ message RedisKeyV2 { repeated string entity_names = 2; - repeated feast.types.Value entity_values = 3; + repeated feast.proto_types.Value entity_values = 3; } diff --git a/protos/feast/types/EntityKey.proto b/protos/feast/proto_types/EntityKey.proto similarity index 87% rename from protos/feast/types/EntityKey.proto rename to protos/feast/proto_types/EntityKey.proto index d7eebf25d03..0b0202644da 100644 --- a/protos/feast/types/EntityKey.proto +++ b/protos/feast/proto_types/EntityKey.proto @@ -16,9 +16,9 @@ syntax = "proto3"; -import "feast/types/Value.proto"; +import "feast/proto_types/Value.proto"; -package feast.types; +package feast.proto_types; option java_package = "feast.proto.types"; option java_outer_classname = "EntityKeyProto"; @@ -26,5 +26,5 @@ option go_package = "github.com/feast-dev/feast/go/protos/feast/types"; message EntityKey { repeated string join_keys = 1; - repeated feast.types.Value entity_values = 2; + repeated feast.proto_types.Value entity_values = 2; } diff --git a/protos/feast/types/Field.proto b/protos/feast/proto_types/Field.proto similarity index 88% rename from protos/feast/types/Field.proto rename to protos/feast/proto_types/Field.proto index 57c53b3b6c5..ef40383e7d9 100644 --- a/protos/feast/types/Field.proto +++ b/protos/feast/proto_types/Field.proto @@ -16,9 +16,9 @@ syntax = "proto3"; -import "feast/types/Value.proto"; +import "feast/proto_types/Value.proto"; -package feast.types; +package feast.proto_types; option java_package = "feast.proto.types"; option java_outer_classname = "FieldProto"; @@ -26,5 +26,5 @@ option go_package = "github.com/feast-dev/feast/go/protos/feast/types"; message Field { string name = 1; - feast.types.Value value = 2; + feast.proto_types.Value value = 2; } diff --git a/protos/feast/types/Value.proto b/protos/feast/proto_types/Value.proto similarity index 98% rename from protos/feast/types/Value.proto rename to protos/feast/proto_types/Value.proto index b273fecfeae..ace297a5242 100644 --- a/protos/feast/types/Value.proto +++ b/protos/feast/proto_types/Value.proto @@ -16,7 +16,7 @@ syntax = "proto3"; -package feast.types; +package feast.proto_types; option java_package = "feast.proto.types"; option java_outer_classname = "ValueProto"; diff --git a/sdk/python/docs/source/feast.protos.feast.core.rst b/sdk/python/docs/source/feast.protos.feast.core.rst index ce25dda21f7..b91fe14379c 100644 --- a/sdk/python/docs/source/feast.protos.feast.core.rst +++ b/sdk/python/docs/source/feast.protos.feast.core.rst @@ -1,149 +1,149 @@ -feast.protos.feast.core package +feast.protos.feast.proto_core package =============================== Submodules ---------- -feast.protos.feast.core.CoreService\_pb2 module +feast.protos.feast.proto_core.CoreService\_pb2 module ----------------------------------------------- -.. automodule:: feast.protos.feast.core.CoreService_pb2 +.. automodule:: feast.protos.feast.proto_core.CoreService_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.CoreService\_pb2\_grpc module +feast.protos.feast.proto_core.CoreService\_pb2\_grpc module ----------------------------------------------------- -.. automodule:: feast.protos.feast.core.CoreService_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.CoreService_pb2_grpc :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.DataFormat\_pb2 module +feast.protos.feast.proto_core.DataFormat\_pb2 module ---------------------------------------------- -.. automodule:: feast.protos.feast.core.DataFormat_pb2 +.. automodule:: feast.protos.feast.proto_core.DataFormat_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.DataFormat\_pb2\_grpc module +feast.protos.feast.proto_core.DataFormat\_pb2\_grpc module ---------------------------------------------------- -.. automodule:: feast.protos.feast.core.DataFormat_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.DataFormat_pb2_grpc :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.DataSource\_pb2 module +feast.protos.feast.proto_core.DataSource\_pb2 module ---------------------------------------------- -.. automodule:: feast.protos.feast.core.DataSource_pb2 +.. automodule:: feast.protos.feast.proto_core.DataSource_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.DataSource\_pb2\_grpc module +feast.protos.feast.proto_core.DataSource\_pb2\_grpc module ---------------------------------------------------- -.. automodule:: feast.protos.feast.core.DataSource_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.DataSource_pb2_grpc :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.Entity\_pb2 module +feast.protos.feast.proto_core.Entity\_pb2 module ------------------------------------------ -.. automodule:: feast.protos.feast.core.Entity_pb2 +.. automodule:: feast.protos.feast.proto_core.Entity_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.Entity\_pb2\_grpc module +feast.protos.feast.proto_core.Entity\_pb2\_grpc module ------------------------------------------------ -.. automodule:: feast.protos.feast.core.Entity_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.Entity_pb2_grpc :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.FeatureTable\_pb2 module +feast.protos.feast.proto_core.FeatureTable\_pb2 module ------------------------------------------------ -.. automodule:: feast.protos.feast.core.FeatureTable_pb2 +.. automodule:: feast.protos.feast.proto_core.FeatureTable_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.FeatureTable\_pb2\_grpc module +feast.protos.feast.proto_core.FeatureTable\_pb2\_grpc module ------------------------------------------------------ -.. automodule:: feast.protos.feast.core.FeatureTable_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.FeatureTable_pb2_grpc :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.FeatureView\_pb2 module +feast.protos.feast.proto_core.FeatureView\_pb2 module ----------------------------------------------- -.. automodule:: feast.protos.feast.core.FeatureView_pb2 +.. automodule:: feast.protos.feast.proto_core.FeatureView_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.FeatureView\_pb2\_grpc module +feast.protos.feast.proto_core.FeatureView\_pb2\_grpc module ----------------------------------------------------- -.. automodule:: feast.protos.feast.core.FeatureView_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.FeatureView_pb2_grpc :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.Feature\_pb2 module +feast.protos.feast.proto_core.Feature\_pb2 module ------------------------------------------- -.. automodule:: feast.protos.feast.core.Feature_pb2 +.. automodule:: feast.protos.feast.proto_core.Feature_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.Feature\_pb2\_grpc module +feast.protos.feast.proto_core.Feature\_pb2\_grpc module ------------------------------------------------- -.. automodule:: feast.protos.feast.core.Feature_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.Feature_pb2_grpc :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.Registry\_pb2 module +feast.protos.feast.proto_core.Registry\_pb2 module -------------------------------------------- -.. automodule:: feast.protos.feast.core.Registry_pb2 +.. automodule:: feast.protos.feast.proto_core.Registry_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.Registry\_pb2\_grpc module +feast.protos.feast.proto_core.Registry\_pb2\_grpc module -------------------------------------------------- -.. automodule:: feast.protos.feast.core.Registry_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.Registry_pb2_grpc :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.Store\_pb2 module +feast.protos.feast.proto_core.Store\_pb2 module ----------------------------------------- -.. automodule:: feast.protos.feast.core.Store_pb2 +.. automodule:: feast.protos.feast.proto_core.Store_pb2 :members: :undoc-members: :show-inheritance: -feast.protos.feast.core.Store\_pb2\_grpc module +feast.protos.feast.proto_core.Store\_pb2\_grpc module ----------------------------------------------- -.. automodule:: feast.protos.feast.core.Store_pb2_grpc +.. automodule:: feast.protos.feast.proto_core.Store_pb2_grpc :members: :undoc-members: :show-inheritance: @@ -151,7 +151,7 @@ feast.protos.feast.core.Store\_pb2\_grpc module Module contents --------------- -.. automodule:: feast.protos.feast.core +.. automodule:: feast.protos.feast.proto_core :members: :undoc-members: :show-inheritance: diff --git a/sdk/python/docs/source/feast.protos.feast.rst b/sdk/python/docs/source/feast.protos.feast.rst index f519165db8e..daf91f87e89 100644 --- a/sdk/python/docs/source/feast.protos.feast.rst +++ b/sdk/python/docs/source/feast.protos.feast.rst @@ -7,7 +7,7 @@ Subpackages .. toctree:: :maxdepth: 4 - feast.protos.feast.core + feast.protos.feast.proto_core feast.protos.feast.serving feast.protos.feast.storage feast.protos.feast.types diff --git a/sdk/python/feast/data_format.py b/sdk/python/feast/data_format.py index b6c7bf94e92..c3374b798a1 100644 --- a/sdk/python/feast/data_format.py +++ b/sdk/python/feast/data_format.py @@ -15,8 +15,8 @@ from abc import ABC, abstractmethod -from feast.protos.feast.core.DataFormat_pb2 import FileFormat as FileFormatProto -from feast.protos.feast.core.DataFormat_pb2 import StreamFormat as StreamFormatProto +from feast.proto_core.DataFormat_pb2 import FileFormat as FileFormatProto +from feast.proto_core.DataFormat_pb2 import StreamFormat as StreamFormatProto class FileFormat(ABC): diff --git a/sdk/python/feast/data_source.py b/sdk/python/feast/data_source.py index 15ce0c23773..fafea941bad 100644 --- a/sdk/python/feast/data_source.py +++ b/sdk/python/feast/data_source.py @@ -19,9 +19,9 @@ from feast import type_map from feast.data_format import StreamFormat -from feast.protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto +from feast.proto_core.DataSource_pb2 import DataSource as DataSourceProto from feast.repo_config import RepoConfig, get_data_source_class_from_type -from feast.value_type import ValueType +from feast.value_type import ValueType, value_type_to_proto_value_type class SourceType(enum.Enum): @@ -419,7 +419,7 @@ def from_proto(data_source: DataSourceProto): def to_proto(self) -> DataSourceProto: schema_pb = {} for key, value in self.schema.items(): - schema_pb[key] = value.value + schema_pb[key] = value_type_to_proto_value_type(value) options = DataSourceProto.RequestDataOptions(schema=schema_pb) data_source_proto = DataSourceProto( name=self.name, diff --git a/sdk/python/feast/diff/infra_diff.py b/sdk/python/feast/diff/infra_diff.py index a09eaf39ebe..b780148e047 100644 --- a/sdk/python/feast/diff/infra_diff.py +++ b/sdk/python/feast/diff/infra_diff.py @@ -8,14 +8,10 @@ SQLITE_INFRA_OBJECT_CLASS_TYPE, InfraObject, ) -from feast.protos.feast.core.DatastoreTable_pb2 import ( - DatastoreTable as DatastoreTableProto, -) -from feast.protos.feast.core.DynamoDBTable_pb2 import ( - DynamoDBTable as DynamoDBTableProto, -) -from feast.protos.feast.core.InfraObject_pb2 import Infra as InfraProto -from feast.protos.feast.core.SqliteTable_pb2 import SqliteTable as SqliteTableProto +from feast.proto_core.DatastoreTable_pb2 import DatastoreTable as DatastoreTableProto +from feast.proto_core.DynamoDBTable_pb2 import DynamoDBTable as DynamoDBTableProto +from feast.proto_core.InfraObject_pb2 import Infra as InfraProto +from feast.proto_core.SqliteTable_pb2 import SqliteTable as SqliteTableProto InfraObjectProto = TypeVar( "InfraObjectProto", DatastoreTableProto, DynamoDBTableProto, SqliteTableProto diff --git a/sdk/python/feast/diff/registry_diff.py b/sdk/python/feast/diff/registry_diff.py index 4558a149a5c..667709927de 100644 --- a/sdk/python/feast/diff/registry_diff.py +++ b/sdk/python/feast/diff/registry_diff.py @@ -8,16 +8,14 @@ from feast.feast_object import FeastObject, FeastObjectSpecProto from feast.feature_service import FeatureService from feast.feature_view import DUMMY_ENTITY_NAME -from feast.protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto -from feast.protos.feast.core.Entity_pb2 import Entity as EntityProto -from feast.protos.feast.core.FeatureService_pb2 import ( - FeatureService as FeatureServiceProto, -) -from feast.protos.feast.core.FeatureView_pb2 import FeatureView as FeatureViewProto -from feast.protos.feast.core.OnDemandFeatureView_pb2 import ( +from feast.proto_core.DataSource_pb2 import DataSource as DataSourceProto +from feast.proto_core.Entity_pb2 import Entity as EntityProto +from feast.proto_core.FeatureService_pb2 import FeatureService as FeatureServiceProto +from feast.proto_core.FeatureView_pb2 import FeatureView as FeatureViewProto +from feast.proto_core.OnDemandFeatureView_pb2 import ( OnDemandFeatureView as OnDemandFeatureViewProto, ) -from feast.protos.feast.core.RequestFeatureView_pb2 import ( +from feast.proto_core.RequestFeatureView_pb2 import ( RequestFeatureView as RequestFeatureViewProto, ) from feast.registry import FEAST_OBJECT_TYPES, FeastObjectType, Registry diff --git a/sdk/python/feast/dqm/profilers/ge_profiler.py b/sdk/python/feast/dqm/profilers/ge_profiler.py index f1780754de3..e7f0c246d84 100644 --- a/sdk/python/feast/dqm/profilers/ge_profiler.py +++ b/sdk/python/feast/dqm/profilers/ge_profiler.py @@ -15,10 +15,10 @@ ValidationError, ValidationReport, ) -from feast.protos.feast.core.ValidationProfile_pb2 import ( +from feast.proto_core.ValidationProfile_pb2 import ( GEValidationProfile as GEValidationProfileProto, ) -from feast.protos.feast.core.ValidationProfile_pb2 import ( +from feast.proto_core.ValidationProfile_pb2 import ( GEValidationProfiler as GEValidationProfilerProto, ) diff --git a/sdk/python/feast/entity.py b/sdk/python/feast/entity.py index efac8c17dab..c584f28b4a8 100644 --- a/sdk/python/feast/entity.py +++ b/sdk/python/feast/entity.py @@ -17,11 +17,11 @@ from google.protobuf.json_format import MessageToJson -from feast.protos.feast.core.Entity_pb2 import Entity as EntityProto -from feast.protos.feast.core.Entity_pb2 import EntityMeta as EntityMetaProto -from feast.protos.feast.core.Entity_pb2 import EntitySpecV2 as EntitySpecProto +from feast.proto_core.Entity_pb2 import Entity as EntityProto +from feast.proto_core.Entity_pb2 import EntityMeta as EntityMetaProto +from feast.proto_core.Entity_pb2 import EntitySpecV2 as EntitySpecProto from feast.usage import log_exceptions -from feast.value_type import ValueType +from feast.value_type import ValueType, value_type_to_proto_value_type warnings.simplefilter("once", DeprecationWarning) @@ -166,7 +166,7 @@ def to_proto(self) -> EntityProto: spec = EntitySpecProto( name=self.name, - value_type=self.value_type.value, + value_type=value_type_to_proto_value_type(self.value_type), join_key=self.join_key, description=self.description, tags=self.tags, diff --git a/sdk/python/feast/feast_object.py b/sdk/python/feast/feast_object.py index 4ffd693c44f..cc1f1fdd0c3 100644 --- a/sdk/python/feast/feast_object.py +++ b/sdk/python/feast/feast_object.py @@ -5,12 +5,12 @@ from .feature_service import FeatureService from .feature_view import FeatureView from .on_demand_feature_view import OnDemandFeatureView -from .protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto -from .protos.feast.core.Entity_pb2 import EntitySpecV2 -from .protos.feast.core.FeatureService_pb2 import FeatureServiceSpec -from .protos.feast.core.FeatureView_pb2 import FeatureViewSpec -from .protos.feast.core.OnDemandFeatureView_pb2 import OnDemandFeatureViewSpec -from .protos.feast.core.RequestFeatureView_pb2 import RequestFeatureViewSpec +from .proto_core.DataSource_pb2 import DataSource as DataSourceProto +from .proto_core.Entity_pb2 import EntitySpecV2 +from .proto_core.FeatureService_pb2 import FeatureServiceSpec +from .proto_core.FeatureView_pb2 import FeatureViewSpec +from .proto_core.OnDemandFeatureView_pb2 import OnDemandFeatureViewSpec +from .proto_core.RequestFeatureView_pb2 import RequestFeatureViewSpec from .request_feature_view import RequestFeatureView # Convenience type representing all Feast objects diff --git a/sdk/python/feast/feature.py b/sdk/python/feast/feature.py index b37e0f562b2..21e865c732c 100644 --- a/sdk/python/feast/feature.py +++ b/sdk/python/feast/feature.py @@ -14,8 +14,8 @@ from typing import Dict, Optional -from feast.protos.feast.core.Feature_pb2 import FeatureSpecV2 as FeatureSpecProto -from feast.protos.feast.types import Value_pb2 as ValueTypeProto +from feast.proto_core.Feature_pb2 import FeatureSpecV2 as FeatureSpecProto +from feast.proto_types import Value_pb2 as ValueTypeProto from feast.value_type import ValueType diff --git a/sdk/python/feast/feature_server.py b/sdk/python/feast/feature_server.py index 585075843a6..453606cbc8e 100644 --- a/sdk/python/feast/feature_server.py +++ b/sdk/python/feast/feature_server.py @@ -8,7 +8,7 @@ import feast from feast import proto_json -from feast.protos.feast.serving.ServingService_pb2 import GetOnlineFeaturesRequest +from feast.proto_serving.ServingService_pb2 import GetOnlineFeaturesRequest def get_app(store: "feast.FeatureStore"): diff --git a/sdk/python/feast/feature_service.py b/sdk/python/feast/feature_service.py index 40030b34ceb..75d92b88ae0 100644 --- a/sdk/python/feast/feature_service.py +++ b/sdk/python/feast/feature_service.py @@ -7,13 +7,11 @@ from feast.feature_view import FeatureView from feast.feature_view_projection import FeatureViewProjection from feast.on_demand_feature_view import OnDemandFeatureView -from feast.protos.feast.core.FeatureService_pb2 import ( - FeatureService as FeatureServiceProto, -) -from feast.protos.feast.core.FeatureService_pb2 import ( +from feast.proto_core.FeatureService_pb2 import FeatureService as FeatureServiceProto +from feast.proto_core.FeatureService_pb2 import ( FeatureServiceMeta as FeatureServiceMetaProto, ) -from feast.protos.feast.core.FeatureService_pb2 import ( +from feast.proto_core.FeatureService_pb2 import ( FeatureServiceSpec as FeatureServiceSpecProto, ) from feast.usage import log_exceptions diff --git a/sdk/python/feast/feature_store.py b/sdk/python/feast/feature_store.py index 4fb6129722a..d2683b98511 100644 --- a/sdk/python/feast/feature_store.py +++ b/sdk/python/feast/feature_store.py @@ -70,13 +70,13 @@ from feast.infra.provider import Provider, RetrievalJob, get_provider from feast.on_demand_feature_view import OnDemandFeatureView from feast.online_response import OnlineResponse -from feast.protos.feast.core.InfraObject_pb2 import Infra as InfraProto -from feast.protos.feast.serving.ServingService_pb2 import ( +from feast.proto_core.InfraObject_pb2 import Infra as InfraProto +from feast.proto_serving.ServingService_pb2 import ( FieldStatus, GetOnlineFeaturesResponse, ) -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import RepeatedValue, Value +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import RepeatedValue, Value from feast.registry import Registry from feast.repo_config import RepoConfig, load_repo_config from feast.repo_contents import RepoContents diff --git a/sdk/python/feast/feature_view.py b/sdk/python/feast/feature_view.py index 2c1d0675d4a..8df4606f2fd 100644 --- a/sdk/python/feast/feature_view.py +++ b/sdk/python/feast/feature_view.py @@ -24,14 +24,10 @@ from feast.entity import Entity from feast.feature import Feature from feast.feature_view_projection import FeatureViewProjection -from feast.protos.feast.core.FeatureView_pb2 import FeatureView as FeatureViewProto -from feast.protos.feast.core.FeatureView_pb2 import ( - FeatureViewMeta as FeatureViewMetaProto, -) -from feast.protos.feast.core.FeatureView_pb2 import ( - FeatureViewSpec as FeatureViewSpecProto, -) -from feast.protos.feast.core.FeatureView_pb2 import ( +from feast.proto_core.FeatureView_pb2 import FeatureView as FeatureViewProto +from feast.proto_core.FeatureView_pb2 import FeatureViewMeta as FeatureViewMetaProto +from feast.proto_core.FeatureView_pb2 import FeatureViewSpec as FeatureViewSpecProto +from feast.proto_core.FeatureView_pb2 import ( MaterializationInterval as MaterializationIntervalProto, ) from feast.usage import log_exceptions diff --git a/sdk/python/feast/feature_view_projection.py b/sdk/python/feast/feature_view_projection.py index 04d923122c5..89675424e8a 100644 --- a/sdk/python/feast/feature_view_projection.py +++ b/sdk/python/feast/feature_view_projection.py @@ -3,7 +3,7 @@ from attr import dataclass from feast.feature import Feature -from feast.protos.feast.core.FeatureViewProjection_pb2 import ( +from feast.proto_core.FeatureViewProjection_pb2 import ( FeatureViewProjection as FeatureViewProjectionProto, ) diff --git a/sdk/python/feast/go_server.py b/sdk/python/feast/go_server.py index 1fcbab61f08..a6a21ec8726 100644 --- a/sdk/python/feast/go_server.py +++ b/sdk/python/feast/go_server.py @@ -33,11 +33,11 @@ from feast.feature_service import FeatureService from feast.flags_helper import is_test from feast.online_response import OnlineResponse -from feast.protos.feast.serving.ServingService_pb2 import ( +from feast.proto_serving.ServingService_pb2 import ( GetFeastServingInfoRequest, GetOnlineFeaturesRequest, ) -from feast.protos.feast.serving.ServingService_pb2_grpc import ServingServiceStub +from feast.proto_serving.ServingService_pb2_grpc import ServingServiceStub from feast.repo_config import RepoConfig from feast.type_map import python_values_to_proto_values diff --git a/sdk/python/feast/infra/aws.py b/sdk/python/feast/infra/aws.py index b7cc61de0e5..2aa59e09279 100644 --- a/sdk/python/feast/infra/aws.py +++ b/sdk/python/feast/infra/aws.py @@ -34,7 +34,7 @@ from feast.infra.feature_servers.aws_lambda.config import AwsLambdaFeatureServerConfig from feast.infra.passthrough_provider import PassthroughProvider from feast.infra.utils import aws_utils -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto from feast.registry import get_registry_store_class_from_scheme from feast.registry_store import RegistryStore from feast.repo_config import RegistryConfig diff --git a/sdk/python/feast/infra/gcp.py b/sdk/python/feast/infra/gcp.py index 257ae38d02c..a69cd126187 100644 --- a/sdk/python/feast/infra/gcp.py +++ b/sdk/python/feast/infra/gcp.py @@ -5,7 +5,7 @@ from urllib.parse import urlparse from feast.infra.passthrough_provider import PassthroughProvider -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto from feast.registry_store import RegistryStore from feast.repo_config import RegistryConfig from feast.usage import log_exceptions_and_usage diff --git a/sdk/python/feast/infra/infra_object.py b/sdk/python/feast/infra/infra_object.py index 91770e64e5d..36f219f8731 100644 --- a/sdk/python/feast/infra/infra_object.py +++ b/sdk/python/feast/infra/infra_object.py @@ -17,15 +17,11 @@ from feast.errors import FeastInvalidInfraObjectType from feast.importer import import_class -from feast.protos.feast.core.DatastoreTable_pb2 import ( - DatastoreTable as DatastoreTableProto, -) -from feast.protos.feast.core.DynamoDBTable_pb2 import ( - DynamoDBTable as DynamoDBTableProto, -) -from feast.protos.feast.core.InfraObject_pb2 import Infra as InfraProto -from feast.protos.feast.core.InfraObject_pb2 import InfraObject as InfraObjectProto -from feast.protos.feast.core.SqliteTable_pb2 import SqliteTable as SqliteTableProto +from feast.proto_core.DatastoreTable_pb2 import DatastoreTable as DatastoreTableProto +from feast.proto_core.DynamoDBTable_pb2 import DynamoDBTable as DynamoDBTableProto +from feast.proto_core.InfraObject_pb2 import Infra as InfraProto +from feast.proto_core.InfraObject_pb2 import InfraObject as InfraObjectProto +from feast.proto_core.SqliteTable_pb2 import SqliteTable as SqliteTableProto DATASTORE_INFRA_OBJECT_CLASS_TYPE = "feast.infra.online_stores.datastore.DatastoreTable" DYNAMODB_INFRA_OBJECT_CLASS_TYPE = "feast.infra.online_stores.dynamodb.DynamoDBTable" diff --git a/sdk/python/feast/infra/key_encoding_utils.py b/sdk/python/feast/infra/key_encoding_utils.py index 8333610473b..d4c78af435d 100644 --- a/sdk/python/feast/infra/key_encoding_utils.py +++ b/sdk/python/feast/infra/key_encoding_utils.py @@ -1,9 +1,9 @@ import struct from typing import List, Tuple -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto -from feast.protos.feast.types.Value_pb2 import ValueType +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto +from feast.proto_types.Value_pb2 import ValueType def _serialize_val(value_type, v: ValueProto) -> Tuple[bytes, int]: diff --git a/sdk/python/feast/infra/local.py b/sdk/python/feast/infra/local.py index 7249d247a22..7b5af916532 100644 --- a/sdk/python/feast/infra/local.py +++ b/sdk/python/feast/infra/local.py @@ -5,7 +5,7 @@ from feast.infra.infra_object import Infra, InfraObject from feast.infra.passthrough_provider import PassthroughProvider -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto from feast.registry_store import RegistryStore from feast.repo_config import RegistryConfig, RepoConfig from feast.usage import log_exceptions_and_usage diff --git a/sdk/python/feast/infra/offline_stores/bigquery_source.py b/sdk/python/feast/infra/offline_stores/bigquery_source.py index 92b6939fc3a..3d5503d925f 100644 --- a/sdk/python/feast/infra/offline_stores/bigquery_source.py +++ b/sdk/python/feast/infra/offline_stores/bigquery_source.py @@ -4,8 +4,8 @@ from feast import type_map from feast.data_source import DataSource from feast.errors import DataSourceNotFoundException -from feast.protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto -from feast.protos.feast.core.SavedDataset_pb2 import ( +from feast.proto_core.DataSource_pb2 import DataSource as DataSourceProto +from feast.proto_core.SavedDataset_pb2 import ( SavedDatasetStorage as SavedDatasetStorageProto, ) from feast.repo_config import RepoConfig diff --git a/sdk/python/feast/infra/offline_stores/contrib/spark_offline_store/spark_source.py b/sdk/python/feast/infra/offline_stores/contrib/spark_offline_store/spark_source.py index 3ffdf6eda0c..26b7e57b035 100644 --- a/sdk/python/feast/infra/offline_stores/contrib/spark_offline_store/spark_source.py +++ b/sdk/python/feast/infra/offline_stores/contrib/spark_offline_store/spark_source.py @@ -10,8 +10,8 @@ from feast.data_source import DataSource from feast.errors import DataSourceNoNameException from feast.infra.offline_stores.offline_utils import get_temp_entity_table_name -from feast.protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto -from feast.protos.feast.core.SavedDataset_pb2 import ( +from feast.proto_core.DataSource_pb2 import DataSource as DataSourceProto +from feast.proto_core.SavedDataset_pb2 import ( SavedDatasetStorage as SavedDatasetStorageProto, ) from feast.repo_config import RepoConfig diff --git a/sdk/python/feast/infra/offline_stores/file_source.py b/sdk/python/feast/infra/offline_stores/file_source.py index 756ec2a65e0..1847e6c05e7 100644 --- a/sdk/python/feast/infra/offline_stores/file_source.py +++ b/sdk/python/feast/infra/offline_stores/file_source.py @@ -7,8 +7,8 @@ from feast import type_map from feast.data_format import FileFormat, ParquetFormat from feast.data_source import DataSource -from feast.protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto -from feast.protos.feast.core.SavedDataset_pb2 import ( +from feast.proto_core.DataSource_pb2 import DataSource as DataSourceProto +from feast.proto_core.SavedDataset_pb2 import ( SavedDatasetStorage as SavedDatasetStorageProto, ) from feast.repo_config import RepoConfig diff --git a/sdk/python/feast/infra/offline_stores/redshift_source.py b/sdk/python/feast/infra/offline_stores/redshift_source.py index 8573396aca4..dc4b077da02 100644 --- a/sdk/python/feast/infra/offline_stores/redshift_source.py +++ b/sdk/python/feast/infra/offline_stores/redshift_source.py @@ -4,8 +4,8 @@ from feast import type_map from feast.data_source import DataSource from feast.errors import DataSourceNotFoundException, RedshiftCredentialsError -from feast.protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto -from feast.protos.feast.core.SavedDataset_pb2 import ( +from feast.proto_core.DataSource_pb2 import DataSource as DataSourceProto +from feast.proto_core.SavedDataset_pb2 import ( SavedDatasetStorage as SavedDatasetStorageProto, ) from feast.repo_config import RepoConfig diff --git a/sdk/python/feast/infra/offline_stores/snowflake_source.py b/sdk/python/feast/infra/offline_stores/snowflake_source.py index 6ca5df7d6fd..e731723a0da 100644 --- a/sdk/python/feast/infra/offline_stores/snowflake_source.py +++ b/sdk/python/feast/infra/offline_stores/snowflake_source.py @@ -3,8 +3,8 @@ from feast import type_map from feast.data_source import DataSource -from feast.protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto -from feast.protos.feast.core.SavedDataset_pb2 import ( +from feast.proto_core.DataSource_pb2 import DataSource as DataSourceProto +from feast.proto_core.SavedDataset_pb2 import ( SavedDatasetStorage as SavedDatasetStorageProto, ) from feast.repo_config import RepoConfig diff --git a/sdk/python/feast/infra/online_stores/datastore.py b/sdk/python/feast/infra/online_stores/datastore.py index e7621ab88f8..d9f162418ec 100644 --- a/sdk/python/feast/infra/online_stores/datastore.py +++ b/sdk/python/feast/infra/online_stores/datastore.py @@ -28,12 +28,10 @@ from feast.infra.infra_object import DATASTORE_INFRA_OBJECT_CLASS_TYPE, InfraObject from feast.infra.online_stores.helpers import compute_entity_id from feast.infra.online_stores.online_store import OnlineStore -from feast.protos.feast.core.DatastoreTable_pb2 import ( - DatastoreTable as DatastoreTableProto, -) -from feast.protos.feast.core.InfraObject_pb2 import InfraObject as InfraObjectProto -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_core.DatastoreTable_pb2 import DatastoreTable as DatastoreTableProto +from feast.proto_core.InfraObject_pb2 import InfraObject as InfraObjectProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.repo_config import FeastConfigBaseModel, RepoConfig from feast.usage import log_exceptions_and_usage, tracing_span diff --git a/sdk/python/feast/infra/online_stores/dynamodb.py b/sdk/python/feast/infra/online_stores/dynamodb.py index e7627131523..97d80dffb7a 100644 --- a/sdk/python/feast/infra/online_stores/dynamodb.py +++ b/sdk/python/feast/infra/online_stores/dynamodb.py @@ -22,12 +22,10 @@ from feast.infra.infra_object import DYNAMODB_INFRA_OBJECT_CLASS_TYPE, InfraObject from feast.infra.online_stores.helpers import compute_entity_id from feast.infra.online_stores.online_store import OnlineStore -from feast.protos.feast.core.DynamoDBTable_pb2 import ( - DynamoDBTable as DynamoDBTableProto, -) -from feast.protos.feast.core.InfraObject_pb2 import InfraObject as InfraObjectProto -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_core.DynamoDBTable_pb2 import DynamoDBTable as DynamoDBTableProto +from feast.proto_core.InfraObject_pb2 import InfraObject as InfraObjectProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.repo_config import FeastConfigBaseModel, RepoConfig from feast.usage import log_exceptions_and_usage, tracing_span diff --git a/sdk/python/feast/infra/online_stores/helpers.py b/sdk/python/feast/infra/online_stores/helpers.py index b206c08b7c4..f7fd91f0f76 100644 --- a/sdk/python/feast/infra/online_stores/helpers.py +++ b/sdk/python/feast/infra/online_stores/helpers.py @@ -9,7 +9,7 @@ serialize_entity_key_prefix, ) from feast.infra.online_stores.online_store import OnlineStore -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto def get_online_store_from_config(online_store_config: Any) -> OnlineStore: diff --git a/sdk/python/feast/infra/online_stores/online_store.py b/sdk/python/feast/infra/online_stores/online_store.py index 1f177996dea..499d11abb40 100644 --- a/sdk/python/feast/infra/online_stores/online_store.py +++ b/sdk/python/feast/infra/online_stores/online_store.py @@ -19,9 +19,9 @@ from feast import Entity from feast.feature_view import FeatureView from feast.infra.infra_object import InfraObject -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.repo_config import RepoConfig diff --git a/sdk/python/feast/infra/online_stores/redis.py b/sdk/python/feast/infra/online_stores/redis.py index a2e8e27d807..816951ed4b8 100644 --- a/sdk/python/feast/infra/online_stores/redis.py +++ b/sdk/python/feast/infra/online_stores/redis.py @@ -35,8 +35,8 @@ from feast import Entity, FeatureView, RepoConfig, utils from feast.infra.online_stores.helpers import _mmh3, _redis_key, _redis_key_prefix from feast.infra.online_stores.online_store import OnlineStore -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.repo_config import FeastConfigBaseModel from feast.usage import log_exceptions_and_usage, tracing_span diff --git a/sdk/python/feast/infra/online_stores/sqlite.py b/sdk/python/feast/infra/online_stores/sqlite.py index e65aab4e7be..b6ab03ff9d7 100644 --- a/sdk/python/feast/infra/online_stores/sqlite.py +++ b/sdk/python/feast/infra/online_stores/sqlite.py @@ -26,11 +26,11 @@ from feast.infra.infra_object import SQLITE_INFRA_OBJECT_CLASS_TYPE, InfraObject from feast.infra.key_encoding_utils import serialize_entity_key from feast.infra.online_stores.online_store import OnlineStore -from feast.protos.feast.core.InfraObject_pb2 import InfraObject as InfraObjectProto -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto -from feast.protos.feast.core.SqliteTable_pb2 import SqliteTable as SqliteTableProto -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_core.InfraObject_pb2 import InfraObject as InfraObjectProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto +from feast.proto_core.SqliteTable_pb2 import SqliteTable as SqliteTableProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.repo_config import FeastConfigBaseModel, RepoConfig from feast.usage import log_exceptions_and_usage, tracing_span from feast.utils import to_naive_utc diff --git a/sdk/python/feast/infra/passthrough_provider.py b/sdk/python/feast/infra/passthrough_provider.py index 3468b9dc927..c6fe72f63b8 100644 --- a/sdk/python/feast/infra/passthrough_provider.py +++ b/sdk/python/feast/infra/passthrough_provider.py @@ -16,8 +16,8 @@ _get_column_names, _run_field_mapping, ) -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.registry import Registry from feast.repo_config import RepoConfig from feast.saved_dataset import SavedDataset diff --git a/sdk/python/feast/infra/provider.py b/sdk/python/feast/infra/provider.py index b3f10292423..8b61daac587 100644 --- a/sdk/python/feast/infra/provider.py +++ b/sdk/python/feast/infra/provider.py @@ -16,9 +16,9 @@ from feast.infra.infra_object import Infra from feast.infra.offline_stores.offline_store import RetrievalJob from feast.on_demand_feature_view import OnDemandFeatureView -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.registry import Registry from feast.repo_config import RepoConfig from feast.saved_dataset import SavedDataset diff --git a/sdk/python/feast/on_demand_feature_view.py b/sdk/python/feast/on_demand_feature_view.py index 04b7f33cc66..ec0d4a38d04 100644 --- a/sdk/python/feast/on_demand_feature_view.py +++ b/sdk/python/feast/on_demand_feature_view.py @@ -12,15 +12,15 @@ from feast.feature import Feature from feast.feature_view import FeatureView from feast.feature_view_projection import FeatureViewProjection -from feast.protos.feast.core.OnDemandFeatureView_pb2 import ( +from feast.proto_core.OnDemandFeatureView_pb2 import ( OnDemandFeatureView as OnDemandFeatureViewProto, ) -from feast.protos.feast.core.OnDemandFeatureView_pb2 import ( +from feast.proto_core.OnDemandFeatureView_pb2 import ( OnDemandFeatureViewMeta, OnDemandFeatureViewSpec, OnDemandInput, ) -from feast.protos.feast.core.OnDemandFeatureView_pb2 import ( +from feast.proto_core.OnDemandFeatureView_pb2 import ( UserDefinedFunction as UserDefinedFunctionProto, ) from feast.type_map import ( diff --git a/sdk/python/feast/online_response.py b/sdk/python/feast/online_response.py index f01bd510be9..b3791c9ddc0 100644 --- a/sdk/python/feast/online_response.py +++ b/sdk/python/feast/online_response.py @@ -17,7 +17,7 @@ import pandas as pd from feast.feature_view import DUMMY_ENTITY_ID -from feast.protos.feast.serving.ServingService_pb2 import GetOnlineFeaturesResponse +from feast.proto_serving.ServingService_pb2 import GetOnlineFeaturesResponse from feast.type_map import feast_value_type_to_python_type TIMESTAMP_POSTFIX: str = "__ts" diff --git a/sdk/python/feast/proto_json.py b/sdk/python/feast/proto_json.py index 549d7b6d148..dc73c185038 100644 --- a/sdk/python/feast/proto_json.py +++ b/sdk/python/feast/proto_json.py @@ -8,8 +8,8 @@ _Printer, ) -from feast.protos.feast.serving.ServingService_pb2 import FeatureList -from feast.protos.feast.types.Value_pb2 import RepeatedValue, Value +from feast.proto_serving.ServingService_pb2 import FeatureList +from feast.proto_types.Value_pb2 import RepeatedValue, Value ProtoMessage = Any JsonObject = Any diff --git a/sdk/python/feast/registry.py b/sdk/python/feast/registry.py index cb1261d8c93..7b0dd67d528 100644 --- a/sdk/python/feast/registry.py +++ b/sdk/python/feast/registry.py @@ -44,7 +44,7 @@ from feast.importer import import_class from feast.infra.infra_object import Infra from feast.on_demand_feature_view import OnDemandFeatureView -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto from feast.registry_store import NoopRegistryStore from feast.repo_config import RegistryConfig from feast.repo_contents import RepoContents diff --git a/sdk/python/feast/registry_store.py b/sdk/python/feast/registry_store.py index c42a55cd9d2..8ebaf4e3323 100644 --- a/sdk/python/feast/registry_store.py +++ b/sdk/python/feast/registry_store.py @@ -1,6 +1,6 @@ from abc import ABC, abstractmethod -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto class RegistryStore(ABC): diff --git a/sdk/python/feast/repo_contents.py b/sdk/python/feast/repo_contents.py index b59adc34db4..fa12912931a 100644 --- a/sdk/python/feast/repo_contents.py +++ b/sdk/python/feast/repo_contents.py @@ -18,7 +18,7 @@ from feast.feature_service import FeatureService from feast.feature_view import FeatureView from feast.on_demand_feature_view import OnDemandFeatureView -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto from feast.request_feature_view import RequestFeatureView diff --git a/sdk/python/feast/request_feature_view.py b/sdk/python/feast/request_feature_view.py index 5d716f2f8d2..a4f13d7cf0b 100644 --- a/sdk/python/feast/request_feature_view.py +++ b/sdk/python/feast/request_feature_view.py @@ -5,10 +5,10 @@ from feast.data_source import RequestDataSource from feast.feature import Feature from feast.feature_view_projection import FeatureViewProjection -from feast.protos.feast.core.RequestFeatureView_pb2 import ( +from feast.proto_core.RequestFeatureView_pb2 import ( RequestFeatureView as RequestFeatureViewProto, ) -from feast.protos.feast.core.RequestFeatureView_pb2 import RequestFeatureViewSpec +from feast.proto_core.RequestFeatureView_pb2 import RequestFeatureViewSpec from feast.usage import log_exceptions diff --git a/sdk/python/feast/saved_dataset.py b/sdk/python/feast/saved_dataset.py index 7a05a9ca221..b07fd59459e 100644 --- a/sdk/python/feast/saved_dataset.py +++ b/sdk/python/feast/saved_dataset.py @@ -8,9 +8,9 @@ from feast.data_source import DataSource from feast.dqm.profilers.profiler import Profile, Profiler -from feast.protos.feast.core.SavedDataset_pb2 import SavedDataset as SavedDatasetProto -from feast.protos.feast.core.SavedDataset_pb2 import SavedDatasetMeta, SavedDatasetSpec -from feast.protos.feast.core.SavedDataset_pb2 import ( +from feast.proto_core.SavedDataset_pb2 import SavedDataset as SavedDatasetProto +from feast.proto_core.SavedDataset_pb2 import SavedDatasetMeta, SavedDatasetSpec +from feast.proto_core.SavedDataset_pb2 import ( SavedDatasetStorage as SavedDatasetStorageProto, ) diff --git a/sdk/python/feast/transformation_server.py b/sdk/python/feast/transformation_server.py index 83f4af749e3..1a542492aee 100644 --- a/sdk/python/feast/transformation_server.py +++ b/sdk/python/feast/transformation_server.py @@ -8,14 +8,14 @@ from feast.errors import OnDemandFeatureViewNotFoundException from feast.feature_store import FeatureStore -from feast.protos.feast.serving.TransformationService_pb2 import ( +from feast.proto_serving.TransformationService_pb2 import ( DESCRIPTOR, TRANSFORMATION_SERVICE_TYPE_PYTHON, GetTransformationServiceInfoResponse, TransformFeaturesResponse, ValueType, ) -from feast.protos.feast.serving.TransformationService_pb2_grpc import ( +from feast.proto_serving.TransformationService_pb2_grpc import ( TransformationServiceServicer, add_TransformationServiceServicer_to_server, ) diff --git a/sdk/python/feast/type_map.py b/sdk/python/feast/type_map.py index 713b952d092..79a917e8445 100644 --- a/sdk/python/feast/type_map.py +++ b/sdk/python/feast/type_map.py @@ -34,7 +34,7 @@ import pyarrow from google.protobuf.timestamp_pb2 import Timestamp -from feast.protos.feast.types.Value_pb2 import ( +from feast.proto_types.Value_pb2 import ( BoolList, BytesList, DoubleList, @@ -43,7 +43,7 @@ Int64List, StringList, ) -from feast.protos.feast.types.Value_pb2 import Value as ProtoValue +from feast.proto_types.Value_pb2 import Value as ProtoValue from feast.value_type import ListType, ValueType diff --git a/sdk/python/feast/value_type.py b/sdk/python/feast/value_type.py index 1904baf7bbb..41e4b85ce58 100644 --- a/sdk/python/feast/value_type.py +++ b/sdk/python/feast/value_type.py @@ -14,7 +14,7 @@ import enum from typing import Type, Union -from feast.protos.feast.types.Value_pb2 import ( +from feast.proto_types.Value_pb2 import ( BoolList, BytesList, DoubleList, @@ -23,6 +23,17 @@ Int64List, StringList, ) +from feast.proto_types.Value_pb2 import ValueType as ProtoValueType + +ListType = Union[ + Type[BoolList], + Type[BytesList], + Type[DoubleList], + Type[FloatList], + Type[Int32List], + Type[Int64List], + Type[StringList], +] class ValueType(enum.Enum): @@ -50,12 +61,26 @@ class ValueType(enum.Enum): NULL = 19 -ListType = Union[ - Type[BoolList], - Type[BytesList], - Type[DoubleList], - Type[FloatList], - Type[Int32List], - Type[Int64List], - Type[StringList], -] +_value_type_proto_value_type_mapping = { + ValueType.BYTES: ProtoValueType.BYTES, + ValueType.STRING: ProtoValueType.STRING, + ValueType.INT32: ProtoValueType.INT32, + ValueType.INT64: ProtoValueType.INT64, + ValueType.DOUBLE: ProtoValueType.DOUBLE, + ValueType.FLOAT: ProtoValueType.FLOAT, + ValueType.BOOL: ProtoValueType.BOOL, + ValueType.UNIX_TIMESTAMP: ProtoValueType.UNIX_TIMESTAMP, + ValueType.BYTES_LIST: ProtoValueType.BYTES_LIST, + ValueType.STRING_LIST: ProtoValueType.STRING_LIST, + ValueType.INT32_LIST: ProtoValueType.INT32_LIST, + ValueType.INT64_LIST: ProtoValueType.INT64_LIST, + ValueType.DOUBLE_LIST: ProtoValueType.DOUBLE_LIST, + ValueType.FLOAT_LIST: ProtoValueType.FLOAT_LIST, + ValueType.BOOL_LIST: ProtoValueType.BOOL_LIST, + ValueType.NULL: ProtoValueType.NULL, +} + + +def value_type_to_proto_value_type(value_type: ValueType,): + return _value_type_proto_value_type_mapping[value_type] + pass diff --git a/sdk/python/pyproject.toml b/sdk/python/pyproject.toml index 93727dc5689..7adce95d285 100644 --- a/sdk/python/pyproject.toml +++ b/sdk/python/pyproject.toml @@ -2,22 +2,4 @@ line-length = 88 target-version = ['py37'] include = '\.pyi?$' -exclude = ''' -( - /( - \.eggs # exclude a few common directories in the - | \.git # root of the project - | \.hg - | \.mypy_cache - | \.tox - | \.venv - | _build - | buck-out - | build - | dist - | pb2.py - | \.pyi - | protos - )/ -) -''' +exclude = '.*proto_.*' diff --git a/sdk/python/setup.cfg b/sdk/python/setup.cfg index ae8fe14ba16..17f1038cd06 100644 --- a/sdk/python/setup.cfg +++ b/sdk/python/setup.cfg @@ -1,19 +1,21 @@ [isort] +profile=black multi_line_output=3 include_trailing_comma=True force_grid_wrap=0 use_parentheses=True line_length=88 -skip=feast/protos +skip=feast/proto_.* known_first_party=feast,feast_serving_server,feast_core_server default_section=THIRDPARTY +skip_glob=feast/proto_* [flake8] ignore = E203, E266, E501, W503 max-line-length = 88 max-complexity = 20 select = B,C,E,F,W,T4 -exclude = .git,__pycache__,docs/conf.py,dist,feast/protos +exclude = .git,__pycache__,docs/conf.py,dist,feast/proto_*, [mypy] files=feast,test diff --git a/sdk/python/setup.py b/sdk/python/setup.py index 351f32b71b1..99c1d3e7ce8 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -172,7 +172,7 @@ else: use_scm_version = None -PROTO_SUBDIRS = ["core", "serving", "types", "storage"] +PROTO_SUBDIRS = ["proto_core", "proto_serving", "proto_types", "proto_storage"] class BuildPythonProtosCommand(Command): @@ -187,7 +187,7 @@ def initialize_options(self): ] # find_executable("protoc") self.proto_folder = os.path.join(repo_root, "protos") self.python_folder = os.path.join( - os.path.dirname(__file__) or os.getcwd(), "feast/protos" + os.path.dirname(__file__) or os.getcwd() ) self.sub_folders = PROTO_SUBDIRS diff --git a/sdk/python/tests/foo_provider.py b/sdk/python/tests/foo_provider.py index 1d4ce7d6cb6..c0a2aaddc93 100644 --- a/sdk/python/tests/foo_provider.py +++ b/sdk/python/tests/foo_provider.py @@ -7,8 +7,8 @@ from feast import Entity, FeatureView, RepoConfig from feast.infra.offline_stores.offline_store import RetrievalJob from feast.infra.provider import Provider -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.registry import Registry from feast.saved_dataset import SavedDataset diff --git a/sdk/python/tests/foo_registry_store.py b/sdk/python/tests/foo_registry_store.py index 31fb653e9b8..e63a35451fe 100644 --- a/sdk/python/tests/foo_registry_store.py +++ b/sdk/python/tests/foo_registry_store.py @@ -1,6 +1,6 @@ from pathlib import Path -from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto +from feast.proto_core.Registry_pb2 import Registry as RegistryProto from feast.registry_store import RegistryStore from feast.repo_config import RegistryConfig diff --git a/sdk/python/tests/integration/online_store/test_online_retrieval.py b/sdk/python/tests/integration/online_store/test_online_retrieval.py index 265fedd2826..e27b5373a31 100644 --- a/sdk/python/tests/integration/online_store/test_online_retrieval.py +++ b/sdk/python/tests/integration/online_store/test_online_retrieval.py @@ -8,8 +8,8 @@ from feast import FeatureStore, RepoConfig from feast.errors import FeatureViewNotFoundException -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto from feast.repo_config import RegistryConfig from tests.utils.cli_utils import CliRunner, get_example_repo diff --git a/sdk/python/tests/integration/registration/test_feature_store.py b/sdk/python/tests/integration/registration/test_feature_store.py index d5496a6de75..002fe6499b8 100644 --- a/sdk/python/tests/integration/registration/test_feature_store.py +++ b/sdk/python/tests/integration/registration/test_feature_store.py @@ -27,7 +27,7 @@ from feast.infra.offline_stores.file import FileOfflineStoreConfig from feast.infra.online_stores.dynamodb import DynamoDBOnlineStoreConfig from feast.infra.online_stores.sqlite import SqliteOnlineStoreConfig -from feast.protos.feast.types import Value_pb2 as ValueProto +from feast.proto_types import Value_pb2 as ValueProto from feast.repo_config import RepoConfig from feast.value_type import ValueType from tests.utils.data_source_utils import ( diff --git a/sdk/python/tests/integration/registration/test_registry.py b/sdk/python/tests/integration/registration/test_registry.py index 535497634d4..f9ab0430562 100644 --- a/sdk/python/tests/integration/registration/test_registry.py +++ b/sdk/python/tests/integration/registration/test_registry.py @@ -25,7 +25,7 @@ from feast.feature import Feature from feast.feature_view import FeatureView from feast.on_demand_feature_view import RequestDataSource, on_demand_feature_view -from feast.protos.feast.types import Value_pb2 as ValueProto +from feast.proto_types import Value_pb2 as ValueProto from feast.registry import Registry from feast.repo_config import RegistryConfig from feast.value_type import ValueType diff --git a/sdk/python/tests/unit/diff/test_infra_diff.py b/sdk/python/tests/unit/diff/test_infra_diff.py index 8e3d5b765f0..d44cf058ecc 100644 --- a/sdk/python/tests/unit/diff/test_infra_diff.py +++ b/sdk/python/tests/unit/diff/test_infra_diff.py @@ -8,7 +8,7 @@ from feast.diff.property_diff import TransitionType from feast.infra.online_stores.datastore import DatastoreTable from feast.infra.online_stores.dynamodb import DynamoDBTable -from feast.protos.feast.core.InfraObject_pb2 import Infra as InfraProto +from feast.proto_core.InfraObject_pb2 import Infra as InfraProto def test_tag_infra_proto_objects_for_keep_delete_add(): diff --git a/sdk/python/tests/unit/test_proto_json.py b/sdk/python/tests/unit/test_proto_json.py index 6bfdbbbf91b..3682a29365f 100644 --- a/sdk/python/tests/unit/test_proto_json.py +++ b/sdk/python/tests/unit/test_proto_json.py @@ -3,11 +3,11 @@ from google.protobuf.json_format import MessageToDict, Parse from feast import proto_json -from feast.protos.feast.serving.ServingService_pb2 import ( +from feast.proto_serving.ServingService_pb2 import ( FeatureList, GetOnlineFeaturesResponse, ) -from feast.protos.feast.types.Value_pb2 import RepeatedValue +from feast.proto_types.Value_pb2 import RepeatedValue FeatureVector = GetOnlineFeaturesResponse.FeatureVector diff --git a/sdk/python/tests/unit/test_unit_feature_store.py b/sdk/python/tests/unit/test_unit_feature_store.py index 6f9dd6acb08..34e03b854a5 100644 --- a/sdk/python/tests/unit/test_unit_feature_store.py +++ b/sdk/python/tests/unit/test_unit_feature_store.py @@ -2,7 +2,7 @@ from typing import Dict, List from feast import FeatureStore -from feast.protos.feast.types.Value_pb2 import Value +from feast.proto_types.Value_pb2 import Value @dataclass diff --git a/sdk/python/tests/utils/online_read_write_test.py b/sdk/python/tests/utils/online_read_write_test.py index 34ff7c7d3fa..328d6d40649 100644 --- a/sdk/python/tests/utils/online_read_write_test.py +++ b/sdk/python/tests/utils/online_read_write_test.py @@ -2,8 +2,8 @@ from typing import Optional from feast.feature_store import FeatureStore -from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto -from feast.protos.feast.types.Value_pb2 import Value as ValueProto +from feast.proto_types.EntityKey_pb2 import EntityKey as EntityKeyProto +from feast.proto_types.Value_pb2 import Value as ValueProto def basic_rw_test(