artifact.proto: Add the project name to the build dependency information

We also need to store the project name of dependencies in
the proto in order to reconstruct the graph.

This also means that we must include the project name of the
dependencies in the cache key, otherwise the proto and the
cache keys may fall out of sync.

10 files changed, 346 insertions, 338 deletions

diff --git a/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py
index 86a269682..ac42b7b0c 100644
--- a/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py
+++ b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py
@@ -2190,326 +2190,326 @@ DESCRIPTOR.message_types_by_name['RequestMetadata'] = _REQUESTMETADATA
 DESCRIPTOR.enum_types_by_name['DigestFunction'] = _DIGESTFUNCTION
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Action = _reflection.GeneratedProtocolMessageType('Action', (_message.Message,), dict(
-  DESCRIPTOR = _ACTION,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+Action = _reflection.GeneratedProtocolMessageType('Action', (_message.Message,), {
+  'DESCRIPTOR' : _ACTION,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.Action)
-  ))
+  })
 _sym_db.RegisterMessage(Action)
 
-Command = _reflection.GeneratedProtocolMessageType('Command', (_message.Message,), dict(
+Command = _reflection.GeneratedProtocolMessageType('Command', (_message.Message,), {
 
-  EnvironmentVariable = _reflection.GeneratedProtocolMessageType('EnvironmentVariable', (_message.Message,), dict(
-    DESCRIPTOR = _COMMAND_ENVIRONMENTVARIABLE,
-    __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'EnvironmentVariable' : _reflection.GeneratedProtocolMessageType('EnvironmentVariable', (_message.Message,), {
+    'DESCRIPTOR' : _COMMAND_ENVIRONMENTVARIABLE,
+    '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
     # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.Command.EnvironmentVariable)
-    ))
+    })
   ,
-  DESCRIPTOR = _COMMAND,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'DESCRIPTOR' : _COMMAND,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.Command)
-  ))
+  })
 _sym_db.RegisterMessage(Command)
 _sym_db.RegisterMessage(Command.EnvironmentVariable)
 
-Platform = _reflection.GeneratedProtocolMessageType('Platform', (_message.Message,), dict(
+Platform = _reflection.GeneratedProtocolMessageType('Platform', (_message.Message,), {
 
-  Property = _reflection.GeneratedProtocolMessageType('Property', (_message.Message,), dict(
-    DESCRIPTOR = _PLATFORM_PROPERTY,
-    __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'Property' : _reflection.GeneratedProtocolMessageType('Property', (_message.Message,), {
+    'DESCRIPTOR' : _PLATFORM_PROPERTY,
+    '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
     # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.Platform.Property)
-    ))
+    })
   ,
-  DESCRIPTOR = _PLATFORM,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'DESCRIPTOR' : _PLATFORM,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.Platform)
-  ))
+  })
 _sym_db.RegisterMessage(Platform)
 _sym_db.RegisterMessage(Platform.Property)
 
-Directory = _reflection.GeneratedProtocolMessageType('Directory', (_message.Message,), dict(
-  DESCRIPTOR = _DIRECTORY,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+Directory = _reflection.GeneratedProtocolMessageType('Directory', (_message.Message,), {
+  'DESCRIPTOR' : _DIRECTORY,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.Directory)
-  ))
+  })
 _sym_db.RegisterMessage(Directory)
 
-FileNode = _reflection.GeneratedProtocolMessageType('FileNode', (_message.Message,), dict(
-  DESCRIPTOR = _FILENODE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+FileNode = _reflection.GeneratedProtocolMessageType('FileNode', (_message.Message,), {
+  'DESCRIPTOR' : _FILENODE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.FileNode)
-  ))
+  })
 _sym_db.RegisterMessage(FileNode)
 
-DirectoryNode = _reflection.GeneratedProtocolMessageType('DirectoryNode', (_message.Message,), dict(
-  DESCRIPTOR = _DIRECTORYNODE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+DirectoryNode = _reflection.GeneratedProtocolMessageType('DirectoryNode', (_message.Message,), {
+  'DESCRIPTOR' : _DIRECTORYNODE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.DirectoryNode)
-  ))
+  })
 _sym_db.RegisterMessage(DirectoryNode)
 
-SymlinkNode = _reflection.GeneratedProtocolMessageType('SymlinkNode', (_message.Message,), dict(
-  DESCRIPTOR = _SYMLINKNODE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+SymlinkNode = _reflection.GeneratedProtocolMessageType('SymlinkNode', (_message.Message,), {
+  'DESCRIPTOR' : _SYMLINKNODE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.SymlinkNode)
-  ))
+  })
 _sym_db.RegisterMessage(SymlinkNode)
 
-Digest = _reflection.GeneratedProtocolMessageType('Digest', (_message.Message,), dict(
-  DESCRIPTOR = _DIGEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+Digest = _reflection.GeneratedProtocolMessageType('Digest', (_message.Message,), {
+  'DESCRIPTOR' : _DIGEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.Digest)
-  ))
+  })
 _sym_db.RegisterMessage(Digest)
 
-ExecutedActionMetadata = _reflection.GeneratedProtocolMessageType('ExecutedActionMetadata', (_message.Message,), dict(
-  DESCRIPTOR = _EXECUTEDACTIONMETADATA,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ExecutedActionMetadata = _reflection.GeneratedProtocolMessageType('ExecutedActionMetadata', (_message.Message,), {
+  'DESCRIPTOR' : _EXECUTEDACTIONMETADATA,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ExecutedActionMetadata)
-  ))
+  })
 _sym_db.RegisterMessage(ExecutedActionMetadata)
 
-ActionResult = _reflection.GeneratedProtocolMessageType('ActionResult', (_message.Message,), dict(
-  DESCRIPTOR = _ACTIONRESULT,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ActionResult = _reflection.GeneratedProtocolMessageType('ActionResult', (_message.Message,), {
+  'DESCRIPTOR' : _ACTIONRESULT,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ActionResult)
-  ))
+  })
 _sym_db.RegisterMessage(ActionResult)
 
-OutputFile = _reflection.GeneratedProtocolMessageType('OutputFile', (_message.Message,), dict(
-  DESCRIPTOR = _OUTPUTFILE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+OutputFile = _reflection.GeneratedProtocolMessageType('OutputFile', (_message.Message,), {
+  'DESCRIPTOR' : _OUTPUTFILE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.OutputFile)
-  ))
+  })
 _sym_db.RegisterMessage(OutputFile)
 
-Tree = _reflection.GeneratedProtocolMessageType('Tree', (_message.Message,), dict(
-  DESCRIPTOR = _TREE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+Tree = _reflection.GeneratedProtocolMessageType('Tree', (_message.Message,), {
+  'DESCRIPTOR' : _TREE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.Tree)
-  ))
+  })
 _sym_db.RegisterMessage(Tree)
 
-OutputDirectory = _reflection.GeneratedProtocolMessageType('OutputDirectory', (_message.Message,), dict(
-  DESCRIPTOR = _OUTPUTDIRECTORY,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+OutputDirectory = _reflection.GeneratedProtocolMessageType('OutputDirectory', (_message.Message,), {
+  'DESCRIPTOR' : _OUTPUTDIRECTORY,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.OutputDirectory)
-  ))
+  })
 _sym_db.RegisterMessage(OutputDirectory)
 
-ExecutionPolicy = _reflection.GeneratedProtocolMessageType('ExecutionPolicy', (_message.Message,), dict(
-  DESCRIPTOR = _EXECUTIONPOLICY,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ExecutionPolicy = _reflection.GeneratedProtocolMessageType('ExecutionPolicy', (_message.Message,), {
+  'DESCRIPTOR' : _EXECUTIONPOLICY,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ExecutionPolicy)
-  ))
+  })
 _sym_db.RegisterMessage(ExecutionPolicy)
 
-ResultsCachePolicy = _reflection.GeneratedProtocolMessageType('ResultsCachePolicy', (_message.Message,), dict(
-  DESCRIPTOR = _RESULTSCACHEPOLICY,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ResultsCachePolicy = _reflection.GeneratedProtocolMessageType('ResultsCachePolicy', (_message.Message,), {
+  'DESCRIPTOR' : _RESULTSCACHEPOLICY,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ResultsCachePolicy)
-  ))
+  })
 _sym_db.RegisterMessage(ResultsCachePolicy)
 
-ExecuteRequest = _reflection.GeneratedProtocolMessageType('ExecuteRequest', (_message.Message,), dict(
-  DESCRIPTOR = _EXECUTEREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ExecuteRequest = _reflection.GeneratedProtocolMessageType('ExecuteRequest', (_message.Message,), {
+  'DESCRIPTOR' : _EXECUTEREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ExecuteRequest)
-  ))
+  })
 _sym_db.RegisterMessage(ExecuteRequest)
 
-LogFile = _reflection.GeneratedProtocolMessageType('LogFile', (_message.Message,), dict(
-  DESCRIPTOR = _LOGFILE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+LogFile = _reflection.GeneratedProtocolMessageType('LogFile', (_message.Message,), {
+  'DESCRIPTOR' : _LOGFILE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.LogFile)
-  ))
+  })
 _sym_db.RegisterMessage(LogFile)
 
-ExecuteResponse = _reflection.GeneratedProtocolMessageType('ExecuteResponse', (_message.Message,), dict(
+ExecuteResponse = _reflection.GeneratedProtocolMessageType('ExecuteResponse', (_message.Message,), {
 
-  ServerLogsEntry = _reflection.GeneratedProtocolMessageType('ServerLogsEntry', (_message.Message,), dict(
-    DESCRIPTOR = _EXECUTERESPONSE_SERVERLOGSENTRY,
-    __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'ServerLogsEntry' : _reflection.GeneratedProtocolMessageType('ServerLogsEntry', (_message.Message,), {
+    'DESCRIPTOR' : _EXECUTERESPONSE_SERVERLOGSENTRY,
+    '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
     # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ExecuteResponse.ServerLogsEntry)
-    ))
+    })
   ,
-  DESCRIPTOR = _EXECUTERESPONSE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'DESCRIPTOR' : _EXECUTERESPONSE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ExecuteResponse)
-  ))
+  })
 _sym_db.RegisterMessage(ExecuteResponse)
 _sym_db.RegisterMessage(ExecuteResponse.ServerLogsEntry)
 
-ExecuteOperationMetadata = _reflection.GeneratedProtocolMessageType('ExecuteOperationMetadata', (_message.Message,), dict(
-  DESCRIPTOR = _EXECUTEOPERATIONMETADATA,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ExecuteOperationMetadata = _reflection.GeneratedProtocolMessageType('ExecuteOperationMetadata', (_message.Message,), {
+  'DESCRIPTOR' : _EXECUTEOPERATIONMETADATA,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ExecuteOperationMetadata)
-  ))
+  })
 _sym_db.RegisterMessage(ExecuteOperationMetadata)
 
-WaitExecutionRequest = _reflection.GeneratedProtocolMessageType('WaitExecutionRequest', (_message.Message,), dict(
-  DESCRIPTOR = _WAITEXECUTIONREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+WaitExecutionRequest = _reflection.GeneratedProtocolMessageType('WaitExecutionRequest', (_message.Message,), {
+  'DESCRIPTOR' : _WAITEXECUTIONREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.WaitExecutionRequest)
-  ))
+  })
 _sym_db.RegisterMessage(WaitExecutionRequest)
 
-GetActionResultRequest = _reflection.GeneratedProtocolMessageType('GetActionResultRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETACTIONRESULTREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+GetActionResultRequest = _reflection.GeneratedProtocolMessageType('GetActionResultRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETACTIONRESULTREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.GetActionResultRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetActionResultRequest)
 
-UpdateActionResultRequest = _reflection.GeneratedProtocolMessageType('UpdateActionResultRequest', (_message.Message,), dict(
-  DESCRIPTOR = _UPDATEACTIONRESULTREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+UpdateActionResultRequest = _reflection.GeneratedProtocolMessageType('UpdateActionResultRequest', (_message.Message,), {
+  'DESCRIPTOR' : _UPDATEACTIONRESULTREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.UpdateActionResultRequest)
-  ))
+  })
 _sym_db.RegisterMessage(UpdateActionResultRequest)
 
-FindMissingBlobsRequest = _reflection.GeneratedProtocolMessageType('FindMissingBlobsRequest', (_message.Message,), dict(
-  DESCRIPTOR = _FINDMISSINGBLOBSREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+FindMissingBlobsRequest = _reflection.GeneratedProtocolMessageType('FindMissingBlobsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _FINDMISSINGBLOBSREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.FindMissingBlobsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(FindMissingBlobsRequest)
 
-FindMissingBlobsResponse = _reflection.GeneratedProtocolMessageType('FindMissingBlobsResponse', (_message.Message,), dict(
-  DESCRIPTOR = _FINDMISSINGBLOBSRESPONSE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+FindMissingBlobsResponse = _reflection.GeneratedProtocolMessageType('FindMissingBlobsResponse', (_message.Message,), {
+  'DESCRIPTOR' : _FINDMISSINGBLOBSRESPONSE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.FindMissingBlobsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(FindMissingBlobsResponse)
 
-BatchUpdateBlobsRequest = _reflection.GeneratedProtocolMessageType('BatchUpdateBlobsRequest', (_message.Message,), dict(
+BatchUpdateBlobsRequest = _reflection.GeneratedProtocolMessageType('BatchUpdateBlobsRequest', (_message.Message,), {
 
-  Request = _reflection.GeneratedProtocolMessageType('Request', (_message.Message,), dict(
-    DESCRIPTOR = _BATCHUPDATEBLOBSREQUEST_REQUEST,
-    __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'Request' : _reflection.GeneratedProtocolMessageType('Request', (_message.Message,), {
+    'DESCRIPTOR' : _BATCHUPDATEBLOBSREQUEST_REQUEST,
+    '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
     # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.BatchUpdateBlobsRequest.Request)
-    ))
+    })
   ,
-  DESCRIPTOR = _BATCHUPDATEBLOBSREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'DESCRIPTOR' : _BATCHUPDATEBLOBSREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.BatchUpdateBlobsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(BatchUpdateBlobsRequest)
 _sym_db.RegisterMessage(BatchUpdateBlobsRequest.Request)
 
-BatchUpdateBlobsResponse = _reflection.GeneratedProtocolMessageType('BatchUpdateBlobsResponse', (_message.Message,), dict(
+BatchUpdateBlobsResponse = _reflection.GeneratedProtocolMessageType('BatchUpdateBlobsResponse', (_message.Message,), {
 
-  Response = _reflection.GeneratedProtocolMessageType('Response', (_message.Message,), dict(
-    DESCRIPTOR = _BATCHUPDATEBLOBSRESPONSE_RESPONSE,
-    __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'Response' : _reflection.GeneratedProtocolMessageType('Response', (_message.Message,), {
+    'DESCRIPTOR' : _BATCHUPDATEBLOBSRESPONSE_RESPONSE,
+    '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
     # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.BatchUpdateBlobsResponse.Response)
-    ))
+    })
   ,
-  DESCRIPTOR = _BATCHUPDATEBLOBSRESPONSE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'DESCRIPTOR' : _BATCHUPDATEBLOBSRESPONSE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.BatchUpdateBlobsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(BatchUpdateBlobsResponse)
 _sym_db.RegisterMessage(BatchUpdateBlobsResponse.Response)
 
-BatchReadBlobsRequest = _reflection.GeneratedProtocolMessageType('BatchReadBlobsRequest', (_message.Message,), dict(
-  DESCRIPTOR = _BATCHREADBLOBSREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+BatchReadBlobsRequest = _reflection.GeneratedProtocolMessageType('BatchReadBlobsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _BATCHREADBLOBSREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.BatchReadBlobsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(BatchReadBlobsRequest)
 
-BatchReadBlobsResponse = _reflection.GeneratedProtocolMessageType('BatchReadBlobsResponse', (_message.Message,), dict(
+BatchReadBlobsResponse = _reflection.GeneratedProtocolMessageType('BatchReadBlobsResponse', (_message.Message,), {
 
-  Response = _reflection.GeneratedProtocolMessageType('Response', (_message.Message,), dict(
-    DESCRIPTOR = _BATCHREADBLOBSRESPONSE_RESPONSE,
-    __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'Response' : _reflection.GeneratedProtocolMessageType('Response', (_message.Message,), {
+    'DESCRIPTOR' : _BATCHREADBLOBSRESPONSE_RESPONSE,
+    '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
     # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.BatchReadBlobsResponse.Response)
-    ))
+    })
   ,
-  DESCRIPTOR = _BATCHREADBLOBSRESPONSE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'DESCRIPTOR' : _BATCHREADBLOBSRESPONSE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.BatchReadBlobsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(BatchReadBlobsResponse)
 _sym_db.RegisterMessage(BatchReadBlobsResponse.Response)
 
-GetTreeRequest = _reflection.GeneratedProtocolMessageType('GetTreeRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETTREEREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+GetTreeRequest = _reflection.GeneratedProtocolMessageType('GetTreeRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETTREEREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.GetTreeRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetTreeRequest)
 
-GetTreeResponse = _reflection.GeneratedProtocolMessageType('GetTreeResponse', (_message.Message,), dict(
-  DESCRIPTOR = _GETTREERESPONSE,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+GetTreeResponse = _reflection.GeneratedProtocolMessageType('GetTreeResponse', (_message.Message,), {
+  'DESCRIPTOR' : _GETTREERESPONSE,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.GetTreeResponse)
-  ))
+  })
 _sym_db.RegisterMessage(GetTreeResponse)
 
-GetCapabilitiesRequest = _reflection.GeneratedProtocolMessageType('GetCapabilitiesRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETCAPABILITIESREQUEST,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+GetCapabilitiesRequest = _reflection.GeneratedProtocolMessageType('GetCapabilitiesRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETCAPABILITIESREQUEST,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.GetCapabilitiesRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetCapabilitiesRequest)
 
-ServerCapabilities = _reflection.GeneratedProtocolMessageType('ServerCapabilities', (_message.Message,), dict(
-  DESCRIPTOR = _SERVERCAPABILITIES,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ServerCapabilities = _reflection.GeneratedProtocolMessageType('ServerCapabilities', (_message.Message,), {
+  'DESCRIPTOR' : _SERVERCAPABILITIES,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ServerCapabilities)
-  ))
+  })
 _sym_db.RegisterMessage(ServerCapabilities)
 
-ActionCacheUpdateCapabilities = _reflection.GeneratedProtocolMessageType('ActionCacheUpdateCapabilities', (_message.Message,), dict(
-  DESCRIPTOR = _ACTIONCACHEUPDATECAPABILITIES,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ActionCacheUpdateCapabilities = _reflection.GeneratedProtocolMessageType('ActionCacheUpdateCapabilities', (_message.Message,), {
+  'DESCRIPTOR' : _ACTIONCACHEUPDATECAPABILITIES,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ActionCacheUpdateCapabilities)
-  ))
+  })
 _sym_db.RegisterMessage(ActionCacheUpdateCapabilities)
 
-PriorityCapabilities = _reflection.GeneratedProtocolMessageType('PriorityCapabilities', (_message.Message,), dict(
+PriorityCapabilities = _reflection.GeneratedProtocolMessageType('PriorityCapabilities', (_message.Message,), {
 
-  PriorityRange = _reflection.GeneratedProtocolMessageType('PriorityRange', (_message.Message,), dict(
-    DESCRIPTOR = _PRIORITYCAPABILITIES_PRIORITYRANGE,
-    __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'PriorityRange' : _reflection.GeneratedProtocolMessageType('PriorityRange', (_message.Message,), {
+    'DESCRIPTOR' : _PRIORITYCAPABILITIES_PRIORITYRANGE,
+    '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
     # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.PriorityCapabilities.PriorityRange)
-    ))
+    })
   ,
-  DESCRIPTOR = _PRIORITYCAPABILITIES,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+  'DESCRIPTOR' : _PRIORITYCAPABILITIES,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.PriorityCapabilities)
-  ))
+  })
 _sym_db.RegisterMessage(PriorityCapabilities)
 _sym_db.RegisterMessage(PriorityCapabilities.PriorityRange)
 
-CacheCapabilities = _reflection.GeneratedProtocolMessageType('CacheCapabilities', (_message.Message,), dict(
-  DESCRIPTOR = _CACHECAPABILITIES,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+CacheCapabilities = _reflection.GeneratedProtocolMessageType('CacheCapabilities', (_message.Message,), {
+  'DESCRIPTOR' : _CACHECAPABILITIES,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.CacheCapabilities)
-  ))
+  })
 _sym_db.RegisterMessage(CacheCapabilities)
 
-ExecutionCapabilities = _reflection.GeneratedProtocolMessageType('ExecutionCapabilities', (_message.Message,), dict(
-  DESCRIPTOR = _EXECUTIONCAPABILITIES,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ExecutionCapabilities = _reflection.GeneratedProtocolMessageType('ExecutionCapabilities', (_message.Message,), {
+  'DESCRIPTOR' : _EXECUTIONCAPABILITIES,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ExecutionCapabilities)
-  ))
+  })
 _sym_db.RegisterMessage(ExecutionCapabilities)
 
-ToolDetails = _reflection.GeneratedProtocolMessageType('ToolDetails', (_message.Message,), dict(
-  DESCRIPTOR = _TOOLDETAILS,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+ToolDetails = _reflection.GeneratedProtocolMessageType('ToolDetails', (_message.Message,), {
+  'DESCRIPTOR' : _TOOLDETAILS,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.ToolDetails)
-  ))
+  })
 _sym_db.RegisterMessage(ToolDetails)
 
-RequestMetadata = _reflection.GeneratedProtocolMessageType('RequestMetadata', (_message.Message,), dict(
-  DESCRIPTOR = _REQUESTMETADATA,
-  __module__ = 'build.bazel.remote.execution.v2.remote_execution_pb2'
+RequestMetadata = _reflection.GeneratedProtocolMessageType('RequestMetadata', (_message.Message,), {
+  'DESCRIPTOR' : _REQUESTMETADATA,
+  '__module__' : 'build.bazel.remote.execution.v2.remote_execution_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.remote.execution.v2.RequestMetadata)
-  ))
+  })
 _sym_db.RegisterMessage(RequestMetadata)
 
 
diff --git a/src/buildstream/_protos/build/bazel/semver/semver_pb2.py b/src/buildstream/_protos/build/bazel/semver/semver_pb2.py
index ab87a0470..5712099ca 100644
--- a/src/buildstream/_protos/build/bazel/semver/semver_pb2.py
+++ b/src/buildstream/_protos/build/bazel/semver/semver_pb2.py
@@ -80,11 +80,11 @@ _SEMVER = _descriptor.Descriptor(
 DESCRIPTOR.message_types_by_name['SemVer'] = _SEMVER
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-SemVer = _reflection.GeneratedProtocolMessageType('SemVer', (_message.Message,), dict(
-  DESCRIPTOR = _SEMVER,
-  __module__ = 'build.bazel.semver.semver_pb2'
+SemVer = _reflection.GeneratedProtocolMessageType('SemVer', (_message.Message,), {
+  'DESCRIPTOR' : _SEMVER,
+  '__module__' : 'build.bazel.semver.semver_pb2'
   # @@protoc_insertion_point(class_scope:build.bazel.semver.SemVer)
-  ))
+  })
 _sym_db.RegisterMessage(SemVer)
 
 
diff --git a/src/buildstream/_protos/buildstream/v2/artifact.proto b/src/buildstream/_protos/buildstream/v2/artifact.proto
index d28c8e88e..ead792e15 100644
--- a/src/buildstream/_protos/buildstream/v2/artifact.proto
+++ b/src/buildstream/_protos/buildstream/v2/artifact.proto
@@ -54,9 +54,10 @@ message Artifact {
 
   // Information about the build dependencies
   message Dependency {
-    string element_name = 1;
-    string cache_key = 2;
-    bool was_workspaced = 3;
+    string project_name = 1;
+    string element_name = 2;
+    string cache_key = 3;
+    bool was_workspaced = 4;
   };
   repeated Dependency build_deps = 9;
 
diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py
index da642ca1c..6ea9c4e10 100644
--- a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py
+++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py
@@ -22,7 +22,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   package='buildstream.v2',
   syntax='proto3',
   serialized_options=None,
-  serialized_pb=_b('\n\x1d\x62uildstream/v2/artifact.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"\xde\x04\n\x08\x41rtifact\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x15\n\rbuild_success\x18\x02 \x01(\x08\x12\x13\n\x0b\x62uild_error\x18\x03 \x01(\t\x12\x1b\n\x13\x62uild_error_details\x18\x04 \x01(\t\x12\x12\n\nstrong_key\x18\x05 \x01(\t\x12\x10\n\x08weak_key\x18\x06 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x07 \x01(\x08\x12\x36\n\x05\x66iles\x18\x08 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12\x37\n\nbuild_deps\x18\t \x03(\x0b\x32#.buildstream.v2.Artifact.Dependency\x12<\n\x0bpublic_data\x18\n \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12.\n\x04logs\x18\x0b \x03(\x0b\x32 .buildstream.v2.Artifact.LogFile\x12:\n\tbuildtree\x18\x0c \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x1aM\n\nDependency\x12\x14\n\x0c\x65lement_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x03 \x01(\x08\x1aP\n\x07LogFile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x37\n\x06\x64igest\x18\x02 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\">\n\x12GetArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\"m\n\x15UpdateArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\x12*\n\x08\x61rtifact\x18\x03 \x01(\x0b\x32\x18.buildstream.v2.Artifact2\xb5\x01\n\x0f\x41rtifactService\x12M\n\x0bGetArtifact\x12\".buildstream.v2.GetArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x12S\n\x0eUpdateArtifact\x12%.buildstream.v2.UpdateArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x62\x06proto3')
+  serialized_pb=_b('\n\x1d\x62uildstream/v2/artifact.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"\xf4\x04\n\x08\x41rtifact\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x15\n\rbuild_success\x18\x02 \x01(\x08\x12\x13\n\x0b\x62uild_error\x18\x03 \x01(\t\x12\x1b\n\x13\x62uild_error_details\x18\x04 \x01(\t\x12\x12\n\nstrong_key\x18\x05 \x01(\t\x12\x10\n\x08weak_key\x18\x06 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x07 \x01(\x08\x12\x36\n\x05\x66iles\x18\x08 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12\x37\n\nbuild_deps\x18\t \x03(\x0b\x32#.buildstream.v2.Artifact.Dependency\x12<\n\x0bpublic_data\x18\n \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12.\n\x04logs\x18\x0b \x03(\x0b\x32 .buildstream.v2.Artifact.LogFile\x12:\n\tbuildtree\x18\x0c \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x1a\x63\n\nDependency\x12\x14\n\x0cproject_name\x18\x01 \x01(\t\x12\x14\n\x0c\x65lement_name\x18\x02 \x01(\t\x12\x11\n\tcache_key\x18\x03 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x04 \x01(\x08\x1aP\n\x07LogFile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x37\n\x06\x64igest\x18\x02 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\">\n\x12GetArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\"m\n\x15UpdateArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\x12*\n\x08\x61rtifact\x18\x03 \x01(\x0b\x32\x18.buildstream.v2.Artifact2\xb5\x01\n\x0f\x41rtifactService\x12M\n\x0bGetArtifact\x12\".buildstream.v2.GetArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x12S\n\x0eUpdateArtifact\x12%.buildstream.v2.UpdateArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x62\x06proto3')
   ,
   dependencies=[build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2.DESCRIPTOR,google_dot_api_dot_annotations__pb2.DESCRIPTOR,])
 
@@ -37,22 +37,29 @@ _ARTIFACT_DEPENDENCY = _descriptor.Descriptor(
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='element_name', full_name='buildstream.v2.Artifact.Dependency.element_name', index=0,
+      name='project_name', full_name='buildstream.v2.Artifact.Dependency.project_name', index=0,
       number=1, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='cache_key', full_name='buildstream.v2.Artifact.Dependency.cache_key', index=1,
+      name='element_name', full_name='buildstream.v2.Artifact.Dependency.element_name', index=1,
       number=2, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='was_workspaced', full_name='buildstream.v2.Artifact.Dependency.was_workspaced', index=2,
-      number=3, type=8, cpp_type=7, label=1,
+      name='cache_key', full_name='buildstream.v2.Artifact.Dependency.cache_key', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='was_workspaced', full_name='buildstream.v2.Artifact.Dependency.was_workspaced', index=3,
+      number=4, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
@@ -70,7 +77,7 @@ _ARTIFACT_DEPENDENCY = _descriptor.Descriptor(
   oneofs=[
   ],
   serialized_start=583,
-  serialized_end=660,
+  serialized_end=682,
 )
 
 _ARTIFACT_LOGFILE = _descriptor.Descriptor(
@@ -106,8 +113,8 @@ _ARTIFACT_LOGFILE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=662,
-  serialized_end=742,
+  serialized_start=684,
+  serialized_end=764,
 )
 
 _ARTIFACT = _descriptor.Descriptor(
@@ -214,7 +221,7 @@ _ARTIFACT = _descriptor.Descriptor(
   oneofs=[
   ],
   serialized_start=136,
-  serialized_end=742,
+  serialized_end=764,
 )
 
 
@@ -251,8 +258,8 @@ _GETARTIFACTREQUEST = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=744,
-  serialized_end=806,
+  serialized_start=766,
+  serialized_end=828,
 )
 
 
@@ -296,8 +303,8 @@ _UPDATEARTIFACTREQUEST = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=808,
-  serialized_end=917,
+  serialized_start=830,
+  serialized_end=939,
 )
 
 _ARTIFACT_DEPENDENCY.containing_type = _ARTIFACT
@@ -314,41 +321,41 @@ DESCRIPTOR.message_types_by_name['GetArtifactRequest'] = _GETARTIFACTREQUEST
 DESCRIPTOR.message_types_by_name['UpdateArtifactRequest'] = _UPDATEARTIFACTREQUEST
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Artifact = _reflection.GeneratedProtocolMessageType('Artifact', (_message.Message,), dict(
+Artifact = _reflection.GeneratedProtocolMessageType('Artifact', (_message.Message,), {
 
-  Dependency = _reflection.GeneratedProtocolMessageType('Dependency', (_message.Message,), dict(
-    DESCRIPTOR = _ARTIFACT_DEPENDENCY,
-    __module__ = 'buildstream.v2.artifact_pb2'
+  'Dependency' : _reflection.GeneratedProtocolMessageType('Dependency', (_message.Message,), {
+    'DESCRIPTOR' : _ARTIFACT_DEPENDENCY,
+    '__module__' : 'buildstream.v2.artifact_pb2'
     # @@protoc_insertion_point(class_scope:buildstream.v2.Artifact.Dependency)
-    ))
+    })
   ,
 
-  LogFile = _reflection.GeneratedProtocolMessageType('LogFile', (_message.Message,), dict(
-    DESCRIPTOR = _ARTIFACT_LOGFILE,
-    __module__ = 'buildstream.v2.artifact_pb2'
+  'LogFile' : _reflection.GeneratedProtocolMessageType('LogFile', (_message.Message,), {
+    'DESCRIPTOR' : _ARTIFACT_LOGFILE,
+    '__module__' : 'buildstream.v2.artifact_pb2'
     # @@protoc_insertion_point(class_scope:buildstream.v2.Artifact.LogFile)
-    ))
+    })
   ,
-  DESCRIPTOR = _ARTIFACT,
-  __module__ = 'buildstream.v2.artifact_pb2'
+  'DESCRIPTOR' : _ARTIFACT,
+  '__module__' : 'buildstream.v2.artifact_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.Artifact)
-  ))
+  })
 _sym_db.RegisterMessage(Artifact)
 _sym_db.RegisterMessage(Artifact.Dependency)
 _sym_db.RegisterMessage(Artifact.LogFile)
 
-GetArtifactRequest = _reflection.GeneratedProtocolMessageType('GetArtifactRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETARTIFACTREQUEST,
-  __module__ = 'buildstream.v2.artifact_pb2'
+GetArtifactRequest = _reflection.GeneratedProtocolMessageType('GetArtifactRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETARTIFACTREQUEST,
+  '__module__' : 'buildstream.v2.artifact_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.GetArtifactRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetArtifactRequest)
 
-UpdateArtifactRequest = _reflection.GeneratedProtocolMessageType('UpdateArtifactRequest', (_message.Message,), dict(
-  DESCRIPTOR = _UPDATEARTIFACTREQUEST,
-  __module__ = 'buildstream.v2.artifact_pb2'
+UpdateArtifactRequest = _reflection.GeneratedProtocolMessageType('UpdateArtifactRequest', (_message.Message,), {
+  'DESCRIPTOR' : _UPDATEARTIFACTREQUEST,
+  '__module__' : 'buildstream.v2.artifact_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateArtifactRequest)
-  ))
+  })
 _sym_db.RegisterMessage(UpdateArtifactRequest)
 
 
@@ -359,8 +366,8 @@ _ARTIFACTSERVICE = _descriptor.ServiceDescriptor(
   file=DESCRIPTOR,
   index=0,
   serialized_options=None,
-  serialized_start=920,
-  serialized_end=1101,
+  serialized_start=942,
+  serialized_end=1123,
   methods=[
   _descriptor.MethodDescriptor(
     name='GetArtifact',
diff --git a/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py b/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
index 877cd3011..0b6243a4d 100644
--- a/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
+++ b/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
@@ -375,74 +375,74 @@ DESCRIPTOR.message_types_by_name['SourceCapabilities'] = _SOURCECAPABILITIES
 DESCRIPTOR.message_types_by_name['ServerCapabilities'] = _SERVERCAPABILITIES
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-GetReferenceRequest = _reflection.GeneratedProtocolMessageType('GetReferenceRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETREFERENCEREQUEST,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+GetReferenceRequest = _reflection.GeneratedProtocolMessageType('GetReferenceRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETREFERENCEREQUEST,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.GetReferenceRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetReferenceRequest)
 
-GetReferenceResponse = _reflection.GeneratedProtocolMessageType('GetReferenceResponse', (_message.Message,), dict(
-  DESCRIPTOR = _GETREFERENCERESPONSE,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+GetReferenceResponse = _reflection.GeneratedProtocolMessageType('GetReferenceResponse', (_message.Message,), {
+  'DESCRIPTOR' : _GETREFERENCERESPONSE,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.GetReferenceResponse)
-  ))
+  })
 _sym_db.RegisterMessage(GetReferenceResponse)
 
-UpdateReferenceRequest = _reflection.GeneratedProtocolMessageType('UpdateReferenceRequest', (_message.Message,), dict(
-  DESCRIPTOR = _UPDATEREFERENCEREQUEST,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+UpdateReferenceRequest = _reflection.GeneratedProtocolMessageType('UpdateReferenceRequest', (_message.Message,), {
+  'DESCRIPTOR' : _UPDATEREFERENCEREQUEST,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateReferenceRequest)
-  ))
+  })
 _sym_db.RegisterMessage(UpdateReferenceRequest)
 
-UpdateReferenceResponse = _reflection.GeneratedProtocolMessageType('UpdateReferenceResponse', (_message.Message,), dict(
-  DESCRIPTOR = _UPDATEREFERENCERESPONSE,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+UpdateReferenceResponse = _reflection.GeneratedProtocolMessageType('UpdateReferenceResponse', (_message.Message,), {
+  'DESCRIPTOR' : _UPDATEREFERENCERESPONSE,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateReferenceResponse)
-  ))
+  })
 _sym_db.RegisterMessage(UpdateReferenceResponse)
 
-StatusRequest = _reflection.GeneratedProtocolMessageType('StatusRequest', (_message.Message,), dict(
-  DESCRIPTOR = _STATUSREQUEST,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+StatusRequest = _reflection.GeneratedProtocolMessageType('StatusRequest', (_message.Message,), {
+  'DESCRIPTOR' : _STATUSREQUEST,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.StatusRequest)
-  ))
+  })
 _sym_db.RegisterMessage(StatusRequest)
 
-StatusResponse = _reflection.GeneratedProtocolMessageType('StatusResponse', (_message.Message,), dict(
-  DESCRIPTOR = _STATUSRESPONSE,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+StatusResponse = _reflection.GeneratedProtocolMessageType('StatusResponse', (_message.Message,), {
+  'DESCRIPTOR' : _STATUSRESPONSE,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.StatusResponse)
-  ))
+  })
 _sym_db.RegisterMessage(StatusResponse)
 
-GetCapabilitiesRequest = _reflection.GeneratedProtocolMessageType('GetCapabilitiesRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETCAPABILITIESREQUEST,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+GetCapabilitiesRequest = _reflection.GeneratedProtocolMessageType('GetCapabilitiesRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETCAPABILITIESREQUEST,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.GetCapabilitiesRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetCapabilitiesRequest)
 
-ArtifactCapabilities = _reflection.GeneratedProtocolMessageType('ArtifactCapabilities', (_message.Message,), dict(
-  DESCRIPTOR = _ARTIFACTCAPABILITIES,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+ArtifactCapabilities = _reflection.GeneratedProtocolMessageType('ArtifactCapabilities', (_message.Message,), {
+  'DESCRIPTOR' : _ARTIFACTCAPABILITIES,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.ArtifactCapabilities)
-  ))
+  })
 _sym_db.RegisterMessage(ArtifactCapabilities)
 
-SourceCapabilities = _reflection.GeneratedProtocolMessageType('SourceCapabilities', (_message.Message,), dict(
-  DESCRIPTOR = _SOURCECAPABILITIES,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+SourceCapabilities = _reflection.GeneratedProtocolMessageType('SourceCapabilities', (_message.Message,), {
+  'DESCRIPTOR' : _SOURCECAPABILITIES,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.SourceCapabilities)
-  ))
+  })
 _sym_db.RegisterMessage(SourceCapabilities)
 
-ServerCapabilities = _reflection.GeneratedProtocolMessageType('ServerCapabilities', (_message.Message,), dict(
-  DESCRIPTOR = _SERVERCAPABILITIES,
-  __module__ = 'buildstream.v2.buildstream_pb2'
+ServerCapabilities = _reflection.GeneratedProtocolMessageType('ServerCapabilities', (_message.Message,), {
+  'DESCRIPTOR' : _SERVERCAPABILITIES,
+  '__module__' : 'buildstream.v2.buildstream_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.ServerCapabilities)
-  ))
+  })
 _sym_db.RegisterMessage(ServerCapabilities)
 
 
diff --git a/src/buildstream/_protos/buildstream/v2/source_pb2.py b/src/buildstream/_protos/buildstream/v2/source_pb2.py
index c91dee0e9..80ecb20e0 100644
--- a/src/buildstream/_protos/buildstream/v2/source_pb2.py
+++ b/src/buildstream/_protos/buildstream/v2/source_pb2.py
@@ -156,25 +156,25 @@ DESCRIPTOR.message_types_by_name['GetSourceRequest'] = _GETSOURCEREQUEST
 DESCRIPTOR.message_types_by_name['UpdateSourceRequest'] = _UPDATESOURCEREQUEST
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Source = _reflection.GeneratedProtocolMessageType('Source', (_message.Message,), dict(
-  DESCRIPTOR = _SOURCE,
-  __module__ = 'buildstream.v2.source_pb2'
+Source = _reflection.GeneratedProtocolMessageType('Source', (_message.Message,), {
+  'DESCRIPTOR' : _SOURCE,
+  '__module__' : 'buildstream.v2.source_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.Source)
-  ))
+  })
 _sym_db.RegisterMessage(Source)
 
-GetSourceRequest = _reflection.GeneratedProtocolMessageType('GetSourceRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETSOURCEREQUEST,
-  __module__ = 'buildstream.v2.source_pb2'
+GetSourceRequest = _reflection.GeneratedProtocolMessageType('GetSourceRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETSOURCEREQUEST,
+  '__module__' : 'buildstream.v2.source_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.GetSourceRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetSourceRequest)
 
-UpdateSourceRequest = _reflection.GeneratedProtocolMessageType('UpdateSourceRequest', (_message.Message,), dict(
-  DESCRIPTOR = _UPDATESOURCEREQUEST,
-  __module__ = 'buildstream.v2.source_pb2'
+UpdateSourceRequest = _reflection.GeneratedProtocolMessageType('UpdateSourceRequest', (_message.Message,), {
+  'DESCRIPTOR' : _UPDATESOURCEREQUEST,
+  '__module__' : 'buildstream.v2.source_pb2'
   # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateSourceRequest)
-  ))
+  })
 _sym_db.RegisterMessage(UpdateSourceRequest)
 
 
diff --git a/src/buildstream/_protos/google/api/http_pb2.py b/src/buildstream/_protos/google/api/http_pb2.py
index fa896d46e..601b12a08 100644
--- a/src/buildstream/_protos/google/api/http_pb2.py
+++ b/src/buildstream/_protos/google/api/http_pb2.py
@@ -217,25 +217,25 @@ DESCRIPTOR.message_types_by_name['HttpRule'] = _HTTPRULE
 DESCRIPTOR.message_types_by_name['CustomHttpPattern'] = _CUSTOMHTTPPATTERN
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Http = _reflection.GeneratedProtocolMessageType('Http', (_message.Message,), dict(
-  DESCRIPTOR = _HTTP,
-  __module__ = 'google.api.http_pb2'
+Http = _reflection.GeneratedProtocolMessageType('Http', (_message.Message,), {
+  'DESCRIPTOR' : _HTTP,
+  '__module__' : 'google.api.http_pb2'
   # @@protoc_insertion_point(class_scope:google.api.Http)
-  ))
+  })
 _sym_db.RegisterMessage(Http)
 
-HttpRule = _reflection.GeneratedProtocolMessageType('HttpRule', (_message.Message,), dict(
-  DESCRIPTOR = _HTTPRULE,
-  __module__ = 'google.api.http_pb2'
+HttpRule = _reflection.GeneratedProtocolMessageType('HttpRule', (_message.Message,), {
+  'DESCRIPTOR' : _HTTPRULE,
+  '__module__' : 'google.api.http_pb2'
   # @@protoc_insertion_point(class_scope:google.api.HttpRule)
-  ))
+  })
 _sym_db.RegisterMessage(HttpRule)
 
-CustomHttpPattern = _reflection.GeneratedProtocolMessageType('CustomHttpPattern', (_message.Message,), dict(
-  DESCRIPTOR = _CUSTOMHTTPPATTERN,
-  __module__ = 'google.api.http_pb2'
+CustomHttpPattern = _reflection.GeneratedProtocolMessageType('CustomHttpPattern', (_message.Message,), {
+  'DESCRIPTOR' : _CUSTOMHTTPPATTERN,
+  '__module__' : 'google.api.http_pb2'
   # @@protoc_insertion_point(class_scope:google.api.CustomHttpPattern)
-  ))
+  })
 _sym_db.RegisterMessage(CustomHttpPattern)
 
 
diff --git a/src/buildstream/_protos/google/bytestream/bytestream_pb2.py b/src/buildstream/_protos/google/bytestream/bytestream_pb2.py
index 474ab3fde..c8787c7ac 100644
--- a/src/buildstream/_protos/google/bytestream/bytestream_pb2.py
+++ b/src/buildstream/_protos/google/bytestream/bytestream_pb2.py
@@ -264,46 +264,46 @@ DESCRIPTOR.message_types_by_name['QueryWriteStatusRequest'] = _QUERYWRITESTATUSR
 DESCRIPTOR.message_types_by_name['QueryWriteStatusResponse'] = _QUERYWRITESTATUSRESPONSE
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-ReadRequest = _reflection.GeneratedProtocolMessageType('ReadRequest', (_message.Message,), dict(
-  DESCRIPTOR = _READREQUEST,
-  __module__ = 'google.bytestream.bytestream_pb2'
+ReadRequest = _reflection.GeneratedProtocolMessageType('ReadRequest', (_message.Message,), {
+  'DESCRIPTOR' : _READREQUEST,
+  '__module__' : 'google.bytestream.bytestream_pb2'
   # @@protoc_insertion_point(class_scope:google.bytestream.ReadRequest)
-  ))
+  })
 _sym_db.RegisterMessage(ReadRequest)
 
-ReadResponse = _reflection.GeneratedProtocolMessageType('ReadResponse', (_message.Message,), dict(
-  DESCRIPTOR = _READRESPONSE,
-  __module__ = 'google.bytestream.bytestream_pb2'
+ReadResponse = _reflection.GeneratedProtocolMessageType('ReadResponse', (_message.Message,), {
+  'DESCRIPTOR' : _READRESPONSE,
+  '__module__' : 'google.bytestream.bytestream_pb2'
   # @@protoc_insertion_point(class_scope:google.bytestream.ReadResponse)
-  ))
+  })
 _sym_db.RegisterMessage(ReadResponse)
 
-WriteRequest = _reflection.GeneratedProtocolMessageType('WriteRequest', (_message.Message,), dict(
-  DESCRIPTOR = _WRITEREQUEST,
-  __module__ = 'google.bytestream.bytestream_pb2'
+WriteRequest = _reflection.GeneratedProtocolMessageType('WriteRequest', (_message.Message,), {
+  'DESCRIPTOR' : _WRITEREQUEST,
+  '__module__' : 'google.bytestream.bytestream_pb2'
   # @@protoc_insertion_point(class_scope:google.bytestream.WriteRequest)
-  ))
+  })
 _sym_db.RegisterMessage(WriteRequest)
 
-WriteResponse = _reflection.GeneratedProtocolMessageType('WriteResponse', (_message.Message,), dict(
-  DESCRIPTOR = _WRITERESPONSE,
-  __module__ = 'google.bytestream.bytestream_pb2'
+WriteResponse = _reflection.GeneratedProtocolMessageType('WriteResponse', (_message.Message,), {
+  'DESCRIPTOR' : _WRITERESPONSE,
+  '__module__' : 'google.bytestream.bytestream_pb2'
   # @@protoc_insertion_point(class_scope:google.bytestream.WriteResponse)
-  ))
+  })
 _sym_db.RegisterMessage(WriteResponse)
 
-QueryWriteStatusRequest = _reflection.GeneratedProtocolMessageType('QueryWriteStatusRequest', (_message.Message,), dict(
-  DESCRIPTOR = _QUERYWRITESTATUSREQUEST,
-  __module__ = 'google.bytestream.bytestream_pb2'
+QueryWriteStatusRequest = _reflection.GeneratedProtocolMessageType('QueryWriteStatusRequest', (_message.Message,), {
+  'DESCRIPTOR' : _QUERYWRITESTATUSREQUEST,
+  '__module__' : 'google.bytestream.bytestream_pb2'
   # @@protoc_insertion_point(class_scope:google.bytestream.QueryWriteStatusRequest)
-  ))
+  })
 _sym_db.RegisterMessage(QueryWriteStatusRequest)
 
-QueryWriteStatusResponse = _reflection.GeneratedProtocolMessageType('QueryWriteStatusResponse', (_message.Message,), dict(
-  DESCRIPTOR = _QUERYWRITESTATUSRESPONSE,
-  __module__ = 'google.bytestream.bytestream_pb2'
+QueryWriteStatusResponse = _reflection.GeneratedProtocolMessageType('QueryWriteStatusResponse', (_message.Message,), {
+  'DESCRIPTOR' : _QUERYWRITESTATUSRESPONSE,
+  '__module__' : 'google.bytestream.bytestream_pb2'
   # @@protoc_insertion_point(class_scope:google.bytestream.QueryWriteStatusResponse)
-  ))
+  })
 _sym_db.RegisterMessage(QueryWriteStatusResponse)
 
 
diff --git a/src/buildstream/_protos/google/longrunning/operations_pb2.py b/src/buildstream/_protos/google/longrunning/operations_pb2.py
index de961b038..01bd129b2 100644
--- a/src/buildstream/_protos/google/longrunning/operations_pb2.py
+++ b/src/buildstream/_protos/google/longrunning/operations_pb2.py
@@ -293,46 +293,46 @@ DESCRIPTOR.message_types_by_name['CancelOperationRequest'] = _CANCELOPERATIONREQ
 DESCRIPTOR.message_types_by_name['DeleteOperationRequest'] = _DELETEOPERATIONREQUEST
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Operation = _reflection.GeneratedProtocolMessageType('Operation', (_message.Message,), dict(
-  DESCRIPTOR = _OPERATION,
-  __module__ = 'google.longrunning.operations_pb2'
+Operation = _reflection.GeneratedProtocolMessageType('Operation', (_message.Message,), {
+  'DESCRIPTOR' : _OPERATION,
+  '__module__' : 'google.longrunning.operations_pb2'
   # @@protoc_insertion_point(class_scope:google.longrunning.Operation)
-  ))
+  })
 _sym_db.RegisterMessage(Operation)
 
-GetOperationRequest = _reflection.GeneratedProtocolMessageType('GetOperationRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETOPERATIONREQUEST,
-  __module__ = 'google.longrunning.operations_pb2'
+GetOperationRequest = _reflection.GeneratedProtocolMessageType('GetOperationRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETOPERATIONREQUEST,
+  '__module__' : 'google.longrunning.operations_pb2'
   # @@protoc_insertion_point(class_scope:google.longrunning.GetOperationRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetOperationRequest)
 
-ListOperationsRequest = _reflection.GeneratedProtocolMessageType('ListOperationsRequest', (_message.Message,), dict(
-  DESCRIPTOR = _LISTOPERATIONSREQUEST,
-  __module__ = 'google.longrunning.operations_pb2'
+ListOperationsRequest = _reflection.GeneratedProtocolMessageType('ListOperationsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _LISTOPERATIONSREQUEST,
+  '__module__' : 'google.longrunning.operations_pb2'
   # @@protoc_insertion_point(class_scope:google.longrunning.ListOperationsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(ListOperationsRequest)
 
-ListOperationsResponse = _reflection.GeneratedProtocolMessageType('ListOperationsResponse', (_message.Message,), dict(
-  DESCRIPTOR = _LISTOPERATIONSRESPONSE,
-  __module__ = 'google.longrunning.operations_pb2'
+ListOperationsResponse = _reflection.GeneratedProtocolMessageType('ListOperationsResponse', (_message.Message,), {
+  'DESCRIPTOR' : _LISTOPERATIONSRESPONSE,
+  '__module__' : 'google.longrunning.operations_pb2'
   # @@protoc_insertion_point(class_scope:google.longrunning.ListOperationsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(ListOperationsResponse)
 
-CancelOperationRequest = _reflection.GeneratedProtocolMessageType('CancelOperationRequest', (_message.Message,), dict(
-  DESCRIPTOR = _CANCELOPERATIONREQUEST,
-  __module__ = 'google.longrunning.operations_pb2'
+CancelOperationRequest = _reflection.GeneratedProtocolMessageType('CancelOperationRequest', (_message.Message,), {
+  'DESCRIPTOR' : _CANCELOPERATIONREQUEST,
+  '__module__' : 'google.longrunning.operations_pb2'
   # @@protoc_insertion_point(class_scope:google.longrunning.CancelOperationRequest)
-  ))
+  })
 _sym_db.RegisterMessage(CancelOperationRequest)
 
-DeleteOperationRequest = _reflection.GeneratedProtocolMessageType('DeleteOperationRequest', (_message.Message,), dict(
-  DESCRIPTOR = _DELETEOPERATIONREQUEST,
-  __module__ = 'google.longrunning.operations_pb2'
+DeleteOperationRequest = _reflection.GeneratedProtocolMessageType('DeleteOperationRequest', (_message.Message,), {
+  'DESCRIPTOR' : _DELETEOPERATIONREQUEST,
+  '__module__' : 'google.longrunning.operations_pb2'
   # @@protoc_insertion_point(class_scope:google.longrunning.DeleteOperationRequest)
-  ))
+  })
 _sym_db.RegisterMessage(DeleteOperationRequest)
 
 
diff --git a/src/buildstream/_protos/google/rpc/status_pb2.py b/src/buildstream/_protos/google/rpc/status_pb2.py
index a7d8f9acc..7b353aec6 100644
--- a/src/buildstream/_protos/google/rpc/status_pb2.py
+++ b/src/buildstream/_protos/google/rpc/status_pb2.py
@@ -76,11 +76,11 @@ _STATUS.fields_by_name['details'].message_type = google_dot_protobuf_dot_any__pb
 DESCRIPTOR.message_types_by_name['Status'] = _STATUS
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), dict(
-  DESCRIPTOR = _STATUS,
-  __module__ = 'google.rpc.status_pb2'
+Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), {
+  'DESCRIPTOR' : _STATUS,
+  '__module__' : 'google.rpc.status_pb2'
   # @@protoc_insertion_point(class_scope:google.rpc.Status)
-  ))
+  })
 _sym_db.RegisterMessage(Status)