Skip to content

Rename proto messages to remove object names #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 21, 2022
Merged

Rename proto messages to remove object names #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e120dd1
Rename proto messages to remove object names
greschd Jun 20, 2022
008c013
Add .proto file for Material
greschd Jun 21, 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 src/ansys/api/acp/v0/base.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package ansys.api.acp.v0; // TO DISCUSS: Should we use a '.base' namespace here?
package ansys.api.acp.v0.base;

message Empty {
}
Expand Down
4 changes: 2 additions & 2 deletions src/ansys/api/acp/v0/control.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
syntax = "proto3";
package ansys.api.acp.v0;
package ansys.api.acp.v0.control;

import "ansys/api/acp/v0/base.proto";

service Control {
rpc ShutdownServer(Empty) returns (Empty);
rpc ShutdownServer(base.Empty) returns (base.Empty);
}
30 changes: 15 additions & 15 deletions src/ansys/api/acp/v0/element_set.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,36 @@ import "ansys/api/acp/v0/base.proto";
import "ansys/api/acp/v0/array_types.proto";
import "ansys/api/acp/v0/enum_types.proto";

message ElementSetProperties {
message Properties {
enum_types.StatusType status = 1;
bool locked = 2;
bool middle_offset = 3;
array_types.IntArray element_labels = 4;
}

message ElementSetInfo {
BasicInfo info = 1;
ElementSetProperties properties = 2;
message ObjectInfo {
base.BasicInfo info = 1;
Properties properties = 2;
}

message ListElementSetsReply {
repeated ElementSetInfo objects = 1;
message ListReply {
repeated ObjectInfo objects = 1;
}

message CreateElementSetRequest {
CollectionPath collection_path = 1;
message CreateRequest {
base.CollectionPath collection_path = 1;
string name = 2;
ElementSetProperties properties = 3;
Properties properties = 3;
}

service ElementSet {
rpc List(ListRequest) returns (ListElementSetsReply);
service ObjectService {
rpc List(base.ListRequest) returns (ListReply);

rpc Get(GetRequest) returns (ElementSetInfo);
rpc Get(base.GetRequest) returns (ObjectInfo);

rpc Put(ElementSetInfo) returns (ElementSetInfo);
rpc Put(ObjectInfo) returns (ObjectInfo);

rpc Delete(DeleteRequest) returns (Empty);
rpc Delete(base.DeleteRequest) returns (base.Empty);

rpc Create(CreateElementSetRequest) returns (ElementSetInfo);
rpc Create(CreateRequest) returns (ObjectInfo);
}
34 changes: 34 additions & 0 deletions src/ansys/api/acp/v0/material.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
syntax = "proto3";
package ansys.api.acp.v0.material;

import "ansys/api/acp/v0/base.proto";

message Properties {
}

message ObjectInfo {
base.BasicInfo info = 1;
Properties properties = 2;
}

message ListReply {
repeated ObjectInfo objects = 1;
}

message CreateRequest {
base.CollectionPath collection_path = 1;
string name = 2;
Properties properties = 3;
}

service ObjectService {
rpc List(base.ListRequest) returns (ListReply);

rpc Get(base.GetRequest) returns (ObjectInfo);

rpc Put(ObjectInfo) returns (ObjectInfo);

rpc Delete(base.DeleteRequest) returns (base.Empty);

rpc Create(CreateRequest) returns (ObjectInfo);
}
38 changes: 19 additions & 19 deletions src/ansys/api/acp/v0/model.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ enum Format {
NASTRAN_BDF = 4;
}

message ModelInfo {
BasicInfo info = 1;
message ObjectInfo {
base.BasicInfo info = 1;
message ModelingProperties {
bool use_nodal_thicknesses = 1;
bool draping_offset_correction = 2;
Expand All @@ -24,11 +24,11 @@ message ModelInfo {
ModelingProperties properties = 2;
}

message LoadModelRequest {
message LoadFromFileRequest {
string path = 1;
}

message LoadFEModelRequest {
message LoadFromFEFileRequest {
string path = 1;
Format format = 2;
enum IgnorableEntity {
Expand All @@ -42,35 +42,35 @@ message LoadFEModelRequest {
bool convert_section_data = 4;
}

message UpdateModelRequest {
ResourcePath resource_path = 1;
message UpdateRequest {
base.ResourcePath resource_path = 1;
bool relations_only = 2;
}

message SaveModelRequest {
ResourcePath resource_path = 1;
message SaveToFileRequest {
base.ResourcePath resource_path = 1;
string path = 2;
bool save_cache = 3;
}

message ListModelsReply {
repeated ModelInfo objects = 1;
message ListReply {
repeated ObjectInfo objects = 1;
}

service Model {
rpc List(ListRequest) returns (ListModelsReply);
service ObjectService {
rpc List(base.ListRequest) returns (ListReply);

rpc Get(GetRequest) returns (ModelInfo);
rpc Get(base.GetRequest) returns (ObjectInfo);

rpc Put(ModelInfo) returns (ModelInfo);
rpc Put(ObjectInfo) returns (ObjectInfo);

rpc Delete(DeleteRequest) returns (Empty);
rpc Delete(base.DeleteRequest) returns (base.Empty);

rpc Update(UpdateModelRequest) returns (ModelInfo); // TODO: return changed entitites (?)
rpc Update(UpdateRequest) returns (ObjectInfo);

rpc LoadFromFile(LoadModelRequest) returns (ModelInfo);
rpc LoadFromFile(LoadFromFileRequest) returns (ObjectInfo);

rpc LoadFromFEFile(LoadFEModelRequest) returns (ModelInfo);
rpc LoadFromFEFile(LoadFromFEFileRequest) returns (ObjectInfo);

rpc SaveToFile(SaveModelRequest) returns (Empty);
rpc SaveToFile(SaveToFileRequest) returns (base.Empty);
}
30 changes: 15 additions & 15 deletions src/ansys/api/acp/v0/modeling_group.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@ package ansys.api.acp.v0.modeling_group;

import "ansys/api/acp/v0/base.proto";

message ModelingGroupProperties {
message Properties {
}

message ModelingGroupInfo {
BasicInfo info = 1;
ModelingGroupProperties properties = 2;
message ObjectInfo {
base.BasicInfo info = 1;
Properties properties = 2;
}

message ListModelingGroupsReply {
repeated ModelingGroupInfo objects = 1;
message ListReply {
repeated ObjectInfo objects = 1;
}

message CreateModelingGroupRequest {
CollectionPath collection_path = 1;
message CreateRequest {
base.CollectionPath collection_path = 1;
string name = 2;
ModelingGroupProperties properties = 3;
Properties properties = 3;
}

service ModelingGroup {
rpc List(ListRequest) returns (ListModelingGroupsReply);
service ObjectService {
rpc List(base.ListRequest) returns (ListReply);

rpc Get(GetRequest) returns (ModelingGroupInfo);
rpc Get(base.GetRequest) returns (ObjectInfo);

rpc Put(ModelingGroupInfo) returns (ModelingGroupInfo);
rpc Put(ObjectInfo) returns (ObjectInfo);

rpc Delete(DeleteRequest) returns (Empty);
rpc Delete(base.DeleteRequest) returns (base.Empty);

rpc Create(CreateModelingGroupRequest) returns (ModelingGroupInfo);
rpc Create(CreateRequest) returns (ObjectInfo);
}
30 changes: 15 additions & 15 deletions src/ansys/api/acp/v0/rosette.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ enum Type {
EDGE_WISE = 4;
}

message RosetteProperties {
message Properties {
enum_types.StatusType status = 1;
bool locked = 2;
Type rosette_type = 3;
Expand All @@ -22,29 +22,29 @@ message RosetteProperties {
array_types.DoubleArray dir2 = 6;
}

message RosetteInfo {
BasicInfo info = 1;
RosetteProperties properties = 2;
message ObjectInfo {
base.BasicInfo info = 1;
Properties properties = 2;
}

message ListRosettesReply {
repeated RosetteInfo objects = 1;
message ListReply {
repeated ObjectInfo objects = 1;
}

message CreateRosetteRequest {
CollectionPath collection_path = 1;
message CreateRequest {
base.CollectionPath collection_path = 1;
string name = 2;
RosetteProperties properties = 3;
Properties properties = 3;
}

service Rosette {
rpc List(ListRequest) returns (ListRosettesReply);
service ObjectService {
rpc List(base.ListRequest) returns (ListReply);

rpc Get(GetRequest) returns (RosetteInfo);
rpc Get(base.GetRequest) returns (ObjectInfo);

rpc Put(RosetteInfo) returns (RosetteInfo);
rpc Put(ObjectInfo) returns (ObjectInfo);

rpc Delete(DeleteRequest) returns (Empty);
rpc Delete(base.DeleteRequest) returns (base.Empty);

rpc Create(CreateRosetteRequest) returns (RosetteInfo);
rpc Create(CreateRequest) returns (ObjectInfo);
}