Import changes.

  - ad0a895d0f208738529b4abd1d2038d3a21939c4

GitOrigin-RevId: ad0a895d0f208738529b4abd1d2038d3a21939c4

Author: Aalyria Technologies, Inc

api/model/v1/model.proto

@@ -59,6 +59,15 @@ service Model {
   rpc DeleteRelationship(DeleteRelationshipRequest)
       returns (google.protobuf.Empty) {}
 
+  // Upsert (create-or-replace) every nmts.Entity and nmts.Relationship in a
+  // Fragment in a single atomic transaction that is validated exactly once.
+  //
+  // Existing entities are fully replaced (an entity's kind may not change).
+  // A relationship that already exists (same a/kind/z) is a no-op. The whole
+  // fragment is applied atomically: on any validation or write error, nothing
+  // is committed.
+  rpc UpsertFragment(UpsertFragmentRequest) returns (UpsertFragmentResponse) {}
+
   // Retrieve an nmts.Entity
   //
   // Returns a gRPC NotFound error if an Entity with the supplied Id
@@ -121,3 +130,13 @@ message ListRelationshipsRequest {
 message ListRelationshipsResponse {
   repeated nmts.v1.Relationship relationships = 1;
 }
+
+message UpsertFragmentRequest {
+  nmts.v1.Fragment fragment = 1;
+}
+
+message UpsertFragmentResponse {
+  int32 entities_created = 1;
+  int32 entities_updated = 2;
+  int32 relationships_created = 3;
+}

tools/nbictl/grpcurl_test.go

@@ -158,6 +158,7 @@ func TestGrpcurl_list(t *testing.T) {
 		"aalyria.spacetime.api.model.v1.Model.ListEntities",
 		"aalyria.spacetime.api.model.v1.Model.ListRelationships",
 		"aalyria.spacetime.api.model.v1.Model.UpdateEntity",
+		"aalyria.spacetime.api.model.v1.Model.UpsertFragment",
 	))
 }
 

tools/nbictl/model.go

@@ -219,7 +219,6 @@ func ModelDeleteRelationship(appCtx *cli.Context) error {
 	return err
 }
 
-// TODO: turn these into one atomic RPC call in the modelfe.
 func ModelUpsertFragment(appCtx *cli.Context) error {
 	marshaller, err := marshallerForFormat(appCtx.String("format"))
 	if err != nil {
@@ -241,26 +240,11 @@ func ModelUpsertFragment(appCtx *cli.Context) error {
 	defer conn.Close()
 	modelClient := modelpb.NewModelClient(conn)
 
-	for _, nmtsEntity := range nmtsFragment.GetEntity() {
-		_, err = modelClient.CreateEntity(
-			appCtx.Context,
-			&modelpb.CreateEntityRequest{
-				Entity: nmtsEntity,
-			})
-		if err != nil {
-			return err
-		}
-	}
-
-	for _, nmtsRelationship := range nmtsFragment.GetRelationship() {
-		_, err = modelClient.CreateRelationship(
-			appCtx.Context,
-			&modelpb.CreateRelationshipRequest{
-				Relationship: nmtsRelationship,
-			})
-		if err != nil {
-			return err
-		}
+	if _, err := modelClient.UpsertFragment(
+		appCtx.Context,
+		&modelpb.UpsertFragmentRequest{Fragment: nmtsFragment},
+	); err != nil {
+		return err
 	}
 
 	fmt.Fprintln(appCtx.App.ErrWriter, "# OK")