Fix links and add features

Signed-off-by: Drasko Draskovic <drasko.draskovic@gmail.com>

.github/workflows/checkproto.yaml

@@ -29,12 +29,12 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22.x
+          go-version: 1.21.x
 
       - name: Set up protoc
         run: |
           PROTOC_VERSION=25.3
-          PROTOC_GEN_VERSION=v1.33.0
+          PROTOC_GEN_VERSION=v1.31.0
           PROTOC_GRPC_VERSION=v1.3.0
 
           # Download and install protoc

.github/workflows/hal.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.x
+        go-version: 1.21.x
         cache-dependency-path: "go.sum"
 
     - name: Checkout cocos

.github/workflows/main.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22.x
+          go-version: 1.21.x
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3

.gitignore

@@ -6,5 +6,3 @@ cmd/manager/iso
 cmd/manager/tmp
 
 .cov
-
-*.pem

Makefile

@@ -1,6 +1,5 @@
 BUILD_DIR = build
 SERVICES = manager agent cli
-PLATFORM_INFO = platform_info
 CGO_ENABLED ?= 0
 GOARCH ?= amd64
 VERSION ?= $(shell git describe --abbrev=0 --tags --always)
@@ -18,16 +17,13 @@ define compile_service
 	-o ${BUILD_DIR}/cocos-$(1) cmd/$(1)/main.go
 endef
 
-.PHONY: all $(SERVICES) $(PLATFORM_INFO)
+.PHONY: all $(SERVICES)
 
 all: $(SERVICES)
 
 $(SERVICES):
 	$(call compile_service,$(@))
 
-$(PLATFORM_INFO):
-	$(MAKE) -C ./scripts/platform_info
-
 protoc:
 	protoc -I. --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative agent/agent.proto
 	protoc -I. --go_out=./pkg --go_opt=paths=source_relative --go-grpc_out=./pkg --go-grpc_opt=paths=source_relative manager/manager.proto

README.md

@@ -7,7 +7,7 @@ based on the [Confidential Computing][cc] and [Trusted Execution Environments (T
 </p>
 
 With Cocos AI it becomes possible to run AI/ML workloads on combined datasets from multiple organizations
-while guaranteeing the privacy and security of the data and the algorithm.
+while guaranteeing the privacy and security of the data and the algorithms.
 Data is always encrypted, protected by hardware secure enclaves (Trusted Execution Environments),
 attested via secure remote attestation protocols, and invisible to cloud processors or any other
 3rd party to which computation is offloaded.
@@ -26,28 +26,20 @@ Cocos AI is implementing the following features:
 
 ## Usage
 
-Clone the repo and create binaries:
+The quickest way to start using Cocos is via the CLI. The latest version can be downloaded from the [official releases page][rel].
+
+It can also be built and used from the project's root directory:
 
 ```bash
-git clone git@github.com:ultravioletrs/cocos.git
-make
+make cli
+./build/cocos-cli version
 ```
 
-This will create 3 binaries:
-```bash
-ls build/
-# cocos-agent  cocos-cli  cocos-manager
-```
-
-- Manager can be deployed on the AMD SEV-SNP host
-- Agent can be built into [EOS][eos]-based HAL
-- CLI can be used to communicate to remote Agent.
+Additional details on using the CLI can be found in the [CLI documentation][cli].
 
 ## Documentation
 
-Project documentation is hosted at [Cocos AI official docs page][docs].
-
-Documentation is generated from the [docs repository](https://github.com/ultravioletrs/docs).
+Official documentation is hosted at [Cocos official docs page][docs]. Documentation is auto-generated, checkout the instructions on [official docs repository](https://github.com/ultravioletrs/docs).
 
 ## License
 Cocos AI is published under permissive open-source [Apache-2.0](LICENSE) license.
@@ -58,4 +50,3 @@ Cocos AI is published under permissive open-source [Apache-2.0](LICENSE) license
 [tee]: https://en.wikipedia.org/wiki/Trusted_execution_environment
 [docs]: https://docs.cocos.ultraviolet.rs
 [cli]: https://docs.cocos.ultraviolet.rs/cli
-[eos]: https://github.com/ultravioletrs/eos

agent/README.md

@@ -15,6 +15,7 @@ The service is configured using the environment variables from the following tab
 | AGENT_GRPC_SERVER_KEY         | Path to gRPC server key in pem format                  | ""                             |
 | AGENT_GRPC_SERVER_CA_CERTS    | Path to gRPC server CA certificate                     | ""                             |
 | AGENT_GRPC_CLIENT_CA_CERTS    | Path to gRPC client CA certificate                     | ""                             |
+| COCOS_NOTIFICATION_SERVER_URL | Server to receive notification events from agent.      | http:/localhost:9000           |
 
 
 ## Deployment

agent/agent.pb.go

@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.33.0
+// 	protoc-gen-go v1.31.0
 // 	protoc        v4.25.3
 // source: agent/agent.proto
 
@@ -29,6 +29,8 @@ type AlgoRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	Algorithm []byte `protobuf:"bytes,1,opt,name=algorithm,proto3" json:"algorithm,omitempty"`
+	Provider  string `protobuf:"bytes,2,opt,name=provider,proto3" json:"provider,omitempty"`
+	Id        string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
 }
 
 func (x *AlgoRequest) Reset() {
@@ -70,6 +72,20 @@ func (x *AlgoRequest) GetAlgorithm() []byte {
 	return nil
 }
 
+func (x *AlgoRequest) GetProvider() string {
+	if x != nil {
+		return x.Provider
+	}
+	return ""
+}
+
+func (x *AlgoRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
 type AlgoResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -113,7 +129,9 @@ type DataRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Dataset []byte `protobuf:"bytes,1,opt,name=dataset,proto3" json:"dataset,omitempty"`
+	Dataset  []byte `protobuf:"bytes,1,opt,name=dataset,proto3" json:"dataset,omitempty"`
+	Provider string `protobuf:"bytes,2,opt,name=provider,proto3" json:"provider,omitempty"`
+	Id       string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
 }
 
 func (x *DataRequest) Reset() {
@@ -155,6 +173,20 @@ func (x *DataRequest) GetDataset() []byte {
 	return nil
 }
 
+func (x *DataRequest) GetProvider() string {
+	if x != nil {
+		return x.Provider
+	}
+	return ""
+}
+
+func (x *DataRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
 type DataResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -197,6 +229,8 @@ type ResultRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Consumer string `protobuf:"bytes,1,opt,name=consumer,proto3" json:"consumer,omitempty"`
 }
 
 func (x *ResultRequest) Reset() {
@@ -231,6 +265,13 @@ func (*ResultRequest) Descriptor() ([]byte, []int) {
 	return file_agent_agent_proto_rawDescGZIP(), []int{4}
 }
 
+func (x *ResultRequest) GetConsumer() string {
+	if x != nil {
+		return x.Consumer
+	}
+	return ""
+}
+
 type ResultResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -376,32 +417,39 @@ var File_agent_agent_proto protoreflect.FileDescriptor
 
 var file_agent_agent_proto_rawDesc = []byte{
 	0x0a, 0x11, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x22, 0x2b, 0x0a, 0x0b, 0x41, 0x6c,
+	0x6f, 0x74, 0x6f, 0x12, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x22, 0x57, 0x0a, 0x0b, 0x41, 0x6c,
 	0x67, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x6c, 0x67,
 	0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x61, 0x6c,
-	0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x6c, 0x67, 0x6f, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x0a, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74,
-	0x22, 0x0e, 0x0a, 0x0c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x0f, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x22, 0x24, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x22, 0x35, 0x0a, 0x12, 0x41, 0x74, 0x74, 0x65, 0x73,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a,
-	0x0b, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x44, 0x61, 0x74, 0x61, 0x22, 0x29,
-	0x0a, 0x13, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x32, 0xf9, 0x01, 0x0a, 0x0c, 0x41, 0x67,
-	0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x33, 0x0a, 0x04, 0x41, 0x6c,
-	0x67, 0x6f, 0x12, 0x12, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x6c, 0x67, 0x6f, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41,
-	0x6c, 0x67, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x12,
-	0x33, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
-	0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x28, 0x01, 0x12, 0x37, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14,
+	0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x02, 0x69, 0x64, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x6c, 0x67, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x53, 0x0a, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x07, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08,
+	0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x0e, 0x0a, 0x0c, 0x44, 0x61, 0x74, 0x61,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2b, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6d, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6d, 0x65, 0x72, 0x22, 0x24, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x22, 0x35, 0x0a, 0x12, 0x41,
+	0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x61,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x44, 0x61,
+	0x74, 0x61, 0x22, 0x29, 0x0a, 0x13, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x32, 0xf5, 0x01,
+	0x0a, 0x0c, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x31,
+	0x0a, 0x04, 0x41, 0x6c, 0x67, 0x6f, 0x12, 0x12, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41,
+	0x6c, 0x67, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x2e, 0x41, 0x6c, 0x67, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x31, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x2e, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x37, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14,
 	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x65, 0x73,
 	0x75, 0x6c, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x46, 0x0a,

agent/agent.proto

@@ -8,25 +8,30 @@ package agent;
 option go_package = "./agent";
 
 service AgentService {
-  rpc Algo(stream AlgoRequest) returns (AlgoResponse) {}
-  rpc Data(stream DataRequest) returns (DataResponse) {}
+  rpc Algo(AlgoRequest) returns (AlgoResponse) {}
+  rpc Data(DataRequest) returns (DataResponse) {}
   rpc Result(ResultRequest) returns (ResultResponse) {}
   rpc Attestation(AttestationRequest) returns (AttestationResponse) {}
 }
 
 message AlgoRequest {
   bytes algorithm = 1;
+  string provider = 2;
+  string id = 3;
 }
 
 message AlgoResponse {}
 
 message DataRequest {
   bytes dataset = 1;
+  string provider = 2;
+  string id = 3;
 }
 
 message DataResponse {}
 
 message ResultRequest {
+  string consumer = 1;
 }
 
 message ResultResponse {

agent/agent_grpc.pb.go

@@ -32,8 +32,8 @@ const (
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type AgentServiceClient interface {
-	Algo(ctx context.Context, opts ...grpc.CallOption) (AgentService_AlgoClient, error)
-	Data(ctx context.Context, opts ...grpc.CallOption) (AgentService_DataClient, error)
+	Algo(ctx context.Context, in *AlgoRequest, opts ...grpc.CallOption) (*AlgoResponse, error)
+	Data(ctx context.Context, in *DataRequest, opts ...grpc.CallOption) (*DataResponse, error)
 	Result(ctx context.Context, in *ResultRequest, opts ...grpc.CallOption) (*ResultResponse, error)
 	Attestation(ctx context.Context, in *AttestationRequest, opts ...grpc.CallOption) (*AttestationResponse, error)
 }
@@ -46,72 +46,22 @@ func NewAgentServiceClient(cc grpc.ClientConnInterface) AgentServiceClient {
 	return &agentServiceClient{cc}
 }
 
-func (c *agentServiceClient) Algo(ctx context.Context, opts ...grpc.CallOption) (AgentService_AlgoClient, error) {
-	stream, err := c.cc.NewStream(ctx, &AgentService_ServiceDesc.Streams[0], AgentService_Algo_FullMethodName, opts...)
+func (c *agentServiceClient) Algo(ctx context.Context, in *AlgoRequest, opts ...grpc.CallOption) (*AlgoResponse, error) {
+	out := new(AlgoResponse)
+	err := c.cc.Invoke(ctx, AgentService_Algo_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &agentServiceAlgoClient{stream}
-	return x, nil
+	return out, nil
 }
 
-type AgentService_AlgoClient interface {
-	Send(*AlgoRequest) error
-	CloseAndRecv() (*AlgoResponse, error)
-	grpc.ClientStream
-}
-
-type agentServiceAlgoClient struct {
-	grpc.ClientStream
-}
-
-func (x *agentServiceAlgoClient) Send(m *AlgoRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *agentServiceAlgoClient) CloseAndRecv() (*AlgoResponse, error) {
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	m := new(AlgoResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *agentServiceClient) Data(ctx context.Context, opts ...grpc.CallOption) (AgentService_DataClient, error) {
-	stream, err := c.cc.NewStream(ctx, &AgentService_ServiceDesc.Streams[1], AgentService_Data_FullMethodName, opts...)
+func (c *agentServiceClient) Data(ctx context.Context, in *DataRequest, opts ...grpc.CallOption) (*DataResponse, error) {
+	out := new(DataResponse)
+	err := c.cc.Invoke(ctx, AgentService_Data_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &agentServiceDataClient{stream}
-	return x, nil
-}
-
-type AgentService_DataClient interface {
-	Send(*DataRequest) error
-	CloseAndRecv() (*DataResponse, error)
-	grpc.ClientStream
-}
-
-type agentServiceDataClient struct {
-	grpc.ClientStream
-}
-
-func (x *agentServiceDataClient) Send(m *DataRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *agentServiceDataClient) CloseAndRecv() (*DataResponse, error) {
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	m := new(DataResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
+	return out, nil
 }
 
 func (c *agentServiceClient) Result(ctx context.Context, in *ResultRequest, opts ...grpc.CallOption) (*ResultResponse, error) {
@@ -136,8 +86,8 @@ func (c *agentServiceClient) Attestation(ctx context.Context, in *AttestationReq
 // All implementations must embed UnimplementedAgentServiceServer
 // for forward compatibility
 type AgentServiceServer interface {
-	Algo(AgentService_AlgoServer) error
-	Data(AgentService_DataServer) error
+	Algo(context.Context, *AlgoRequest) (*AlgoResponse, error)
+	Data(context.Context, *DataRequest) (*DataResponse, error)
 	Result(context.Context, *ResultRequest) (*ResultResponse, error)
 	Attestation(context.Context, *AttestationRequest) (*AttestationResponse, error)
 	mustEmbedUnimplementedAgentServiceServer()
@@ -147,11 +97,11 @@ type AgentServiceServer interface {
 type UnimplementedAgentServiceServer struct {
 }
 
-func (UnimplementedAgentServiceServer) Algo(AgentService_AlgoServer) error {
-	return status.Errorf(codes.Unimplemented, "method Algo not implemented")
+func (UnimplementedAgentServiceServer) Algo(context.Context, *AlgoRequest) (*AlgoResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Algo not implemented")
 }
-func (UnimplementedAgentServiceServer) Data(AgentService_DataServer) error {
-	return status.Errorf(codes.Unimplemented, "method Data not implemented")
+func (UnimplementedAgentServiceServer) Data(context.Context, *DataRequest) (*DataResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Data not implemented")
 }
 func (UnimplementedAgentServiceServer) Result(context.Context, *ResultRequest) (*ResultResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Result not implemented")
@@ -172,56 +122,40 @@ func RegisterAgentServiceServer(s grpc.ServiceRegistrar, srv AgentServiceServer)
 	s.RegisterService(&AgentService_ServiceDesc, srv)
 }
 
-func _AgentService_Algo_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(AgentServiceServer).Algo(&agentServiceAlgoServer{stream})
-}
-
-type AgentService_AlgoServer interface {
-	SendAndClose(*AlgoResponse) error
-	Recv() (*AlgoRequest, error)
-	grpc.ServerStream
-}
-
-type agentServiceAlgoServer struct {
-	grpc.ServerStream
-}
-
-func (x *agentServiceAlgoServer) SendAndClose(m *AlgoResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *agentServiceAlgoServer) Recv() (*AlgoRequest, error) {
-	m := new(AlgoRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
+func _AgentService_Algo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AlgoRequest)
+	if err := dec(in); err != nil {
 		return nil, err
 	}
-	return m, nil
+	if interceptor == nil {
+		return srv.(AgentServiceServer).Algo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AgentService_Algo_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AgentServiceServer).Algo(ctx, req.(*AlgoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _AgentService_Data_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(AgentServiceServer).Data(&agentServiceDataServer{stream})
-}
-
-type AgentService_DataServer interface {
-	SendAndClose(*DataResponse) error
-	Recv() (*DataRequest, error)
-	grpc.ServerStream
-}
-
-type agentServiceDataServer struct {
-	grpc.ServerStream
-}
-
-func (x *agentServiceDataServer) SendAndClose(m *DataResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *agentServiceDataServer) Recv() (*DataRequest, error) {
-	m := new(DataRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
+func _AgentService_Data_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DataRequest)
+	if err := dec(in); err != nil {
 		return nil, err
 	}
-	return m, nil
+	if interceptor == nil {
+		return srv.(AgentServiceServer).Data(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AgentService_Data_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AgentServiceServer).Data(ctx, req.(*DataRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
 func _AgentService_Result_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -267,6 +201,14 @@ var AgentService_ServiceDesc = grpc.ServiceDesc{
 	ServiceName: "agent.AgentService",
 	HandlerType: (*AgentServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Algo",
+			Handler:    _AgentService_Algo_Handler,
+		},
+		{
+			MethodName: "Data",
+			Handler:    _AgentService_Data_Handler,
+		},
 		{
 			MethodName: "Result",
 			Handler:    _AgentService_Result_Handler,
@@ -276,17 +218,6 @@ var AgentService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _AgentService_Attestation_Handler,
 		},
 	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "Algo",
-			Handler:       _AgentService_Algo_Handler,
-			ClientStreams: true,
-		},
-		{
-			StreamName:    "Data",
-			Handler:       _AgentService_Data_Handler,
-			ClientStreams: true,
-		},
-	},
+	Streams:  []grpc.StreamDesc{},
 	Metadata: "agent/agent.proto",
 }

agent/api/grpc/client.go

@@ -0,0 +1,218 @@
+// Copyright (c) Ultraviolet
+// SPDX-License-Identifier: Apache-2.0
+package grpc
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/go-kit/kit/endpoint"
+	kitgrpc "github.com/go-kit/kit/transport/grpc"
+	"github.com/ultravioletrs/cocos/agent"
+	"google.golang.org/grpc"
+)
+
+const svcName = "agent.AgentService"
+
+type grpcClient struct {
+	algo        endpoint.Endpoint
+	data        endpoint.Endpoint
+	result      endpoint.Endpoint
+	attestation endpoint.Endpoint
+	timeout     time.Duration
+}
+
+// NewClient returns new gRPC client instance.
+func NewClient(conn *grpc.ClientConn, timeout time.Duration) agent.AgentServiceClient {
+	return &grpcClient{
+		algo: kitgrpc.NewClient(
+			conn,
+			svcName,
+			"Algo",
+			encodeAlgoRequest,
+			decodeAlgoResponse,
+			agent.AlgoResponse{},
+		).Endpoint(),
+		data: kitgrpc.NewClient(
+			conn,
+			svcName,
+			"Data",
+			encodeDataRequest,
+			decodeDataResponse,
+			agent.DataResponse{},
+		).Endpoint(),
+		result: kitgrpc.NewClient(
+			conn,
+			svcName,
+			"Result",
+			encodeResultRequest,
+			decodeResultResponse,
+			agent.ResultResponse{},
+		).Endpoint(),
+		attestation: kitgrpc.NewClient(
+			conn,
+			svcName,
+			"Attestation",
+			encodeAttestationRequest,
+			decodeAttestationResponse,
+			agent.AttestationResponse{},
+		).Endpoint(),
+		timeout: timeout,
+	}
+}
+
+// encodeAlgoRequest is a transport/grpc.EncodeRequestFunc that
+// converts a user-domain algoReq to a gRPC request.
+func encodeAlgoRequest(_ context.Context, request interface{}) (interface{}, error) {
+	req, ok := request.(*algoReq)
+	if !ok {
+		return nil, fmt.Errorf("invalid request type: %T", request)
+	}
+
+	return &agent.AlgoRequest{
+		Algorithm: req.Algorithm,
+		Provider:  req.Provider,
+		Id:        req.Id,
+	}, nil
+}
+
+// decodeAlgoResponse is a transport/grpc.DecodeResponseFunc that
+// converts a gRPC AlgoResponse to a user-domain response.
+func decodeAlgoResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) {
+	_, ok := grpcResponse.(*agent.AlgoResponse)
+	if !ok {
+		return nil, fmt.Errorf("invalid response type: %T", grpcResponse)
+	}
+
+	return algoRes{}, nil
+}
+
+// encodeDataRequest is a transport/grpc.EncodeRequestFunc that
+// converts a user-domain dataReq to a gRPC request.
+func encodeDataRequest(_ context.Context, request interface{}) (interface{}, error) {
+	req, ok := request.(*dataReq)
+	if !ok {
+		return nil, fmt.Errorf("invalid request type: %T", request)
+	}
+
+	return &agent.DataRequest{
+		Dataset:  req.Dataset,
+		Provider: req.Provider,
+		Id:       req.Id,
+	}, nil
+}
+
+// decodeDataResponse is a transport/grpc.DecodeResponseFunc that
+// converts a gRPC DataResponse to a user-domain response.
+func decodeDataResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) {
+	_, ok := grpcResponse.(*agent.DataResponse)
+	if !ok {
+		return nil, fmt.Errorf("invalid response type: %T", grpcResponse)
+	}
+
+	return dataRes{}, nil
+}
+
+// encodeResultRequest is a transport/grpc.EncodeRequestFunc that
+// converts a user-domain resultReq to a gRPC request.
+func encodeResultRequest(_ context.Context, request interface{}) (interface{}, error) {
+	req, ok := request.(*resultReq)
+	if !ok {
+		return nil, fmt.Errorf("invalid request type: %T", request)
+	}
+
+	return &agent.ResultRequest{
+		Consumer: req.Consumer,
+	}, nil
+}
+
+// decodeResultResponse is a transport/grpc.DecodeResponseFunc that
+// converts a gRPC ResultResponse to a user-domain response.
+func decodeResultResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) {
+	response, ok := grpcResponse.(*agent.ResultResponse)
+	if !ok {
+		return nil, fmt.Errorf("invalid response type: %T", grpcResponse)
+	}
+
+	return resultRes{
+		File: response.File,
+	}, nil
+}
+
+// encodeAttestationRequest is a transport/grpc.EncodeRequestFunc that
+// converts a user-domain attestationReq to a gRPC request.
+func encodeAttestationRequest(_ context.Context, request interface{}) (interface{}, error) {
+	req, ok := request.(*attestationReq)
+	if !ok {
+		return nil, fmt.Errorf("invalid request type: %T", request)
+	}
+	return &agent.AttestationRequest{ReportData: req.ReportData[:]}, nil
+}
+
+// decodeAttestationResponse is a transport/grpc.DecodeResponseFunc that
+// converts a gRPC AttestationResponse to a user-domain response.
+func decodeAttestationResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) {
+	response, ok := grpcResponse.(*agent.AttestationResponse)
+	if !ok {
+		return nil, fmt.Errorf("invalid response type: %T", grpcResponse)
+	}
+
+	return attestationRes{
+		File: response.File,
+	}, nil
+}
+
+// Algo implements the Algo method of the agent.AgentServiceClient interface.
+func (c grpcClient) Algo(ctx context.Context, request *agent.AlgoRequest, _ ...grpc.CallOption) (*agent.AlgoResponse, error) {
+	ctx, cancel := context.WithTimeout(ctx, c.timeout)
+	defer cancel()
+
+	_, err := c.algo(ctx, &algoReq{Algorithm: request.Algorithm, Provider: request.Provider, Id: request.Id})
+	if err != nil {
+		return nil, err
+	}
+
+	return &agent.AlgoResponse{}, nil
+}
+
+// Data implements the Data method of the agent.AgentServiceClient interface.
+func (c grpcClient) Data(ctx context.Context, request *agent.DataRequest, _ ...grpc.CallOption) (*agent.DataResponse, error) {
+	ctx, cancel := context.WithTimeout(ctx, c.timeout)
+	defer cancel()
+
+	_, err := c.data(ctx, &dataReq{Dataset: request.Dataset, Provider: request.Provider, Id: request.Id})
+	if err != nil {
+		return nil, err
+	}
+
+	return &agent.DataResponse{}, nil
+}
+
+// Result implements the Result method of the agent.AgentServiceClient interface.
+func (c grpcClient) Result(ctx context.Context, request *agent.ResultRequest, _ ...grpc.CallOption) (*agent.ResultResponse, error) {
+	ctx, cancel := context.WithTimeout(ctx, c.timeout)
+	defer cancel()
+
+	res, err := c.result(ctx, &resultReq{Consumer: request.Consumer})
+	if err != nil {
+		return nil, err
+	}
+
+	resultRes := res.(resultRes)
+	return &agent.ResultResponse{File: resultRes.File}, nil
+}
+
+// Result implements the Result method of the agent.AgentServiceClient interface.
+func (c grpcClient) Attestation(ctx context.Context, request *agent.AttestationRequest, _ ...grpc.CallOption) (*agent.AttestationResponse, error) {
+	ctx, cancel := context.WithTimeout(ctx, c.timeout)
+	defer cancel()
+
+	res, err := c.attestation(ctx, &attestationReq{ReportData: [agent.ReportDataSize]byte(request.ReportData)})
+	if err != nil {
+		return nil, err
+	}
+
+	attestationRes := res.(attestationRes)
+	return &agent.AttestationResponse{File: attestationRes.File}, nil
+}

agent/api/grpc/endpoint.go

@@ -17,7 +17,7 @@ func algoEndpoint(svc agent.Service) endpoint.Endpoint {
 			return algoRes{}, err
 		}
 
-		algo := agent.Algorithm{Algorithm: req.Algorithm}
+		algo := agent.Algorithm{Algorithm: req.Algorithm, Provider: req.Provider, ID: req.Id}
 
 		err := svc.Algo(ctx, algo)
 		if err != nil {
@@ -36,7 +36,7 @@ func dataEndpoint(svc agent.Service) endpoint.Endpoint {
 			return dataRes{}, err
 		}
 
-		dataset := agent.Dataset{Dataset: req.Dataset}
+		dataset := agent.Dataset{Dataset: req.Dataset, Provider: req.Provider, ID: req.Id}
 
 		err := svc.Data(ctx, dataset)
 		if err != nil {
@@ -54,7 +54,7 @@ func resultEndpoint(svc agent.Service) endpoint.Endpoint {
 		if err := req.validate(); err != nil {
 			return resultRes{}, err
 		}
-		file, err := svc.Result(ctx)
+		file, err := svc.Result(ctx, req.Consumer)
 		if err != nil {
 			return resultRes{}, err
 		}

agent/api/grpc/requests.go

@@ -8,27 +8,45 @@ import (
 
 type algoReq struct {
 	Algorithm []byte `protobuf:"bytes,1,opt,name=algorithm,proto3" json:"algorithm,omitempty"`
+	Provider  string `protobuf:"bytes,2,opt,name=provider,proto3" json:"provider,omitempty"`
+	Id        string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
 }
 
 func (req algoReq) validate() error {
 	if len(req.Algorithm) == 0 {
 		return errors.New("algorithm binary is required")
 	}
+	if req.Id == "" {
+		return errors.New("malformed entity")
+	}
+	if req.Provider == "" {
+		return errors.New("malformed entity")
+	}
 	return nil
 }
 
 type dataReq struct {
-	Dataset []byte `protobuf:"bytes,1,opt,name=dataset,proto3" json:"dataset,omitempty"`
+	Dataset  []byte `protobuf:"bytes,1,opt,name=dataset,proto3" json:"dataset,omitempty"`
+	Provider string `protobuf:"bytes,2,opt,name=provider,proto3" json:"provider,omitempty"`
+	Id       string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
 }
 
 func (req dataReq) validate() error {
 	if len(req.Dataset) == 0 {
 		return errors.New("dataset CSV file is required")
 	}
+	if req.Id == "" {
+		return errors.New("malformed entity")
+	}
+	if req.Provider == "" {
+		return errors.New("malformed entity")
+	}
 	return nil
 }
 
-type resultReq struct{}
+type resultReq struct {
+	Consumer string `protobuf:"bytes,1,opt,name=consumer,proto3" json:"consumer,omitempty"`
+}
 
 func (req resultReq) validate() error {
 	// No request parameters to validate, so no validation logic needed

agent/api/grpc/server.go

@@ -5,16 +5,11 @@ package grpc
 import (
 	"context"
 	"errors"
-	"io"
 
 	"github.com/go-kit/kit/transport/grpc"
 	"github.com/ultravioletrs/cocos/agent"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
-var _ agent.AgentServiceServer = (*grpcServer)(nil)
-
 type grpcServer struct {
 	algo        grpc.Handler
 	data        grpc.Handler
@@ -54,6 +49,8 @@ func decodeAlgoRequest(_ context.Context, grpcReq interface{}) (interface{}, err
 
 	return algoReq{
 		Algorithm: req.Algorithm,
+		Provider:  req.Provider,
+		Id:        req.Id,
 	}, nil
 }
 
@@ -65,7 +62,9 @@ func decodeDataRequest(_ context.Context, grpcReq interface{}) (interface{}, err
 	req := grpcReq.(*agent.DataRequest)
 
 	return dataReq{
-		Dataset: req.Dataset,
+		Dataset:  req.Dataset,
+		Provider: req.Provider,
+		Id:       req.Id,
 	}, nil
 }
 
@@ -74,7 +73,8 @@ func encodeDataResponse(_ context.Context, response interface{}) (interface{}, e
 }
 
 func decodeResultRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	return resultReq{}, nil
+	req := grpcReq.(*agent.ResultRequest)
+	return resultReq{Consumer: req.Consumer}, nil
 }
 
 func encodeResultResponse(_ context.Context, response interface{}) (interface{}, error) {
@@ -99,46 +99,22 @@ func encodeAttestationResponse(_ context.Context, response interface{}) (interfa
 	}, nil
 }
 
-// Algo implements agent.AgentServiceServer.
-func (s *grpcServer) Algo(stream agent.AgentService_AlgoServer) error {
-	var algoFile []byte
-	for {
-		algoChunk, err := stream.Recv()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return status.Error(codes.Internal, err.Error())
-		}
-		algoFile = append(algoFile, algoChunk.Algorithm...)
-	}
-	_, res, err := s.algo.ServeGRPC(stream.Context(), &agent.AlgoRequest{Algorithm: algoFile})
+func (s *grpcServer) Algo(ctx context.Context, req *agent.AlgoRequest) (*agent.AlgoResponse, error) {
+	_, res, err := s.algo.ServeGRPC(ctx, req)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	ar := res.(*agent.AlgoResponse)
-	return stream.SendAndClose(ar)
+	return ar, nil
 }
 
-// Data implements agent.AgentServiceServer.
-func (s *grpcServer) Data(stream agent.AgentService_DataServer) error {
-	var dataFile []byte
-	for {
-		dataChunk, err := stream.Recv()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return status.Error(codes.Internal, err.Error())
-		}
-		dataFile = append(dataFile, dataChunk.Dataset...)
-	}
-	_, res, err := s.data.ServeGRPC(stream.Context(), &agent.DataRequest{Dataset: dataFile})
+func (s *grpcServer) Data(ctx context.Context, req *agent.DataRequest) (*agent.DataResponse, error) {
+	_, res, err := s.data.ServeGRPC(ctx, req)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	ar := res.(*agent.DataResponse)
-	return stream.SendAndClose(ar)
+	dr := res.(*agent.DataResponse)
+	return dr, nil
 }
 
 func (s *grpcServer) Result(ctx context.Context, req *agent.ResultRequest) (*agent.ResultResponse, error) {

agent/api/logging.go

@@ -53,7 +53,7 @@ func (lm *loggingMiddleware) Data(ctx context.Context, dataset agent.Dataset) (e
 	return lm.svc.Data(ctx, dataset)
 }
 
-func (lm *loggingMiddleware) Result(ctx context.Context) (response []byte, err error) {
+func (lm *loggingMiddleware) Result(ctx context.Context, consumer string) (response []byte, err error) {
 	defer func(begin time.Time) {
 		message := fmt.Sprintf("Method Result took %s to complete", time.Since(begin))
 		if err != nil {
@@ -63,7 +63,7 @@ func (lm *loggingMiddleware) Result(ctx context.Context) (response []byte, err e
 		lm.logger.Info(fmt.Sprintf("%s without errors", message))
 	}(time.Now())
 
-	return lm.svc.Result(ctx)
+	return lm.svc.Result(ctx, consumer)
 }
 
 func (lm *loggingMiddleware) Attestation(ctx context.Context, reportData [agent.ReportDataSize]byte) (response []byte, err error) {

agent/api/metrics.go

@@ -50,13 +50,13 @@ func (ms *metricsMiddleware) Data(ctx context.Context, dataset agent.Dataset) er
 	return ms.svc.Data(ctx, dataset)
 }
 
-func (ms *metricsMiddleware) Result(ctx context.Context) ([]byte, error) {
+func (ms *metricsMiddleware) Result(ctx context.Context, consumer string) ([]byte, error) {
 	defer func(begin time.Time) {
 		ms.counter.With("method", "result").Add(1)
 		ms.latency.With("method", "result").Observe(time.Since(begin).Seconds())
 	}(time.Now())
 
-	return ms.svc.Result(ctx)
+	return ms.svc.Result(ctx, consumer)
 }
 
 func (ms *metricsMiddleware) Attestation(ctx context.Context, reportData [agent.ReportDataSize]byte) ([]byte, error) {

agent/auth/auth.go

@@ -1,180 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-
-package auth
-
-import (
-	"context"
-	"crypto"
-	"crypto/rsa"
-	"crypto/sha256"
-	"crypto/x509"
-	"encoding/base64"
-	"errors"
-
-	"github.com/ultravioletrs/cocos/agent"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/status"
-)
-
-type UserRole string
-
-const (
-	UserMetadataKey                = "user-id"
-	SignatureMetadataKey           = "signature"
-	ConsumerRole          UserRole = "consumer"
-	DataProviderRole      UserRole = "data-provider"
-	AlgorithmProviderRole UserRole = "algorithm-provider"
-)
-
-var errNotRSAPublicKey = errors.New("not an RSA public key")
-
-type wrappedServerStream struct {
-	grpc.ServerStream
-	ctx context.Context
-}
-
-func (s *wrappedServerStream) Context() context.Context {
-	return s.ctx
-}
-
-type Service struct {
-	resultConsumers   []*rsa.PublicKey
-	datasetProviders  []*rsa.PublicKey
-	algorithmProvider *rsa.PublicKey
-}
-
-func New(manifest agent.Computation) (*Service, error) {
-	s := &Service{}
-	for _, rc := range manifest.ResultConsumers {
-		pubKey, err := x509.ParsePKIXPublicKey(rc.UserKey)
-		if err != nil {
-			return nil, err
-		}
-
-		rsaPubKey, ok := pubKey.(*rsa.PublicKey)
-		if !ok {
-			return nil, errNotRSAPublicKey
-		}
-
-		s.resultConsumers = append(s.resultConsumers, rsaPubKey)
-	}
-
-	for _, dp := range manifest.Datasets {
-		pubKey, err := x509.ParsePKIXPublicKey(dp.UserKey)
-		if err != nil {
-			return nil, err
-		}
-
-		rsaPubKey, ok := pubKey.(*rsa.PublicKey)
-		if !ok {
-			return nil, errNotRSAPublicKey
-		}
-
-		s.datasetProviders = append(s.datasetProviders, rsaPubKey)
-	}
-
-	pubKey, err := x509.ParsePKIXPublicKey(manifest.Algorithm.UserKey)
-	if err != nil {
-		return nil, err
-	}
-
-	rsaPubKey, ok := pubKey.(*rsa.PublicKey)
-	if !ok {
-		return nil, errNotRSAPublicKey
-	}
-
-	s.algorithmProvider = rsaPubKey
-	return s, nil
-}
-
-func (s *Service) AuthStreamInterceptor() grpc.StreamServerInterceptor {
-	return func(srv interface{}, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
-		switch info.FullMethod {
-		case agent.AgentService_Algo_FullMethodName:
-			md, ok := metadata.FromIncomingContext(stream.Context())
-			if !ok {
-				return status.Errorf(codes.Unauthenticated, "missing metadata")
-			}
-			signature, err := extractSignature(md)
-			if err != nil {
-				return status.Errorf(codes.Unauthenticated, "invalid metadata")
-			}
-			isValid, err := verifySignature(AlgorithmProviderRole, signature, s.algorithmProvider)
-			if err != nil || !isValid {
-				return status.Errorf(codes.Unauthenticated, "signature verification failed")
-			}
-		case agent.AgentService_Data_FullMethodName:
-			md, ok := metadata.FromIncomingContext(stream.Context())
-			if !ok {
-				return status.Errorf(codes.Unauthenticated, "missing metadata")
-			}
-			signature, err := extractSignature(md)
-			if err != nil {
-				return status.Errorf(codes.Unauthenticated, "invalid metadata")
-			}
-			for index, dp := range s.datasetProviders {
-				isValid, err := verifySignature(DataProviderRole, signature, dp)
-				if err == nil || isValid {
-					ctx := agent.IndexToContext(stream.Context(), index)
-					wrapped := &wrappedServerStream{ServerStream: stream, ctx: ctx}
-					return handler(srv, wrapped)
-				}
-			}
-			return status.Errorf(codes.Unauthenticated, "signature verification failed")
-		default:
-			return handler(srv, stream)
-		}
-		return handler(srv, stream)
-	}
-}
-
-func (s *Service) AuthUnaryInterceptor() grpc.UnaryServerInterceptor {
-	return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
-		switch info.FullMethod {
-		case agent.AgentService_Result_FullMethodName:
-			md, ok := metadata.FromIncomingContext(ctx)
-			if !ok {
-				return nil, status.Errorf(codes.Unauthenticated, "missing metadata")
-			}
-			signature, err := extractSignature(md)
-			if err != nil {
-				return nil, status.Errorf(codes.Unauthenticated, "invalid metadata")
-			}
-			for index, rc := range s.resultConsumers {
-				isValid, err := verifySignature(ConsumerRole, signature, rc)
-				if err == nil || isValid {
-					ctx := agent.IndexToContext(ctx, index)
-					return handler(ctx, req)
-				}
-			}
-			return nil, status.Errorf(codes.Unauthenticated, "signature verification failed")
-		default:
-			return handler(ctx, req)
-		}
-	}
-}
-
-func extractSignature(md metadata.MD) (string, error) {
-	signature := md.Get(SignatureMetadataKey)
-	if len(signature) != 1 {
-		return "", status.Errorf(codes.Unauthenticated, "invalid metadata")
-	}
-
-	return signature[0], nil
-}
-
-func verifySignature(role UserRole, signature string, publicKey *rsa.PublicKey) (bool, error) {
-	hash := sha256.Sum256([]byte(role))
-	sigByte, err := base64.StdEncoding.DecodeString(signature)
-	if err != nil {
-		return false, err
-	}
-
-	if err := rsa.VerifyPKCS1v15(publicKey, crypto.SHA256, hash[:], sigByte); err != nil {
-		return false, err
-	}
-	return true, nil
-}

agent/computations.go

@@ -3,12 +3,15 @@
 package agent
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
+	"reflect"
 )
 
-var _ fmt.Stringer = (*Datasets)(nil)
+var (
+	_ fmt.Stringer = (*Datasets)(nil)
+	_ fmt.Stringer = (*Algorithms)(nil)
+)
 
 type AgentConfig struct {
 	LogLevel     string `json:"log_level"`
@@ -18,21 +21,16 @@ type AgentConfig struct {
 	KeyFile      string `json:"server_key"`
 	ServerCAFile string `json:"server_ca_file"`
 	ClientCAFile string `json:"client_ca_file"`
-	AttestedTls  bool   `json:"attested_tls"`
 }
 
 type Computation struct {
-	ID              string           `json:"id,omitempty"`
-	Name            string           `json:"name,omitempty"`
-	Description     string           `json:"description,omitempty"`
-	Datasets        Datasets         `json:"datasets,omitempty"`
-	Algorithm       Algorithm        `json:"algorithm,omitempty"`
-	ResultConsumers []ResultConsumer `json:"result_consumers,omitempty"`
-	AgentConfig     AgentConfig      `json:"agent_config,omitempty"`
-}
-
-type ResultConsumer struct {
-	UserKey []byte `json:"user_key,omitempty"`
+	ID              string      `json:"id,omitempty"`
+	Name            string      `json:"name,omitempty"`
+	Description     string      `json:"description,omitempty"`
+	Datasets        Datasets    `json:"datasets,omitempty"`
+	Algorithms      Algorithms  `json:"algorithms,omitempty"`
+	ResultConsumers []string    `json:"result_consumers,omitempty"`
+	AgentConfig     AgentConfig `json:"agent_config,omitempty"`
 }
 
 func (d *Datasets) String() string {
@@ -43,10 +41,19 @@ func (d *Datasets) String() string {
 	return string(dat)
 }
 
+func (a *Algorithms) String() string {
+	dat, err := json.Marshal(a)
+	if err != nil {
+		return ""
+	}
+	return string(dat)
+}
+
 type Dataset struct {
-	Dataset []byte   `json:"-"`
-	Hash    [32]byte `json:"hash,omitempty"`
-	UserKey []byte   `json:"user_key,omitempty"`
+	Dataset  []byte   `json:"-"`
+	Hash     [32]byte `json:"hash,omitempty"`
+	Provider string   `json:"provider,omitempty"`
+	ID       string   `json:"id,omitempty"`
 }
 
 type Datasets []Dataset
@@ -54,16 +61,22 @@ type Datasets []Dataset
 type Algorithm struct {
 	Algorithm []byte   `json:"-"`
 	Hash      [32]byte `json:"hash,omitempty"`
-	UserKey   []byte   `json:"user_key,omitempty"`
+	Provider  string   `json:"provider,omitempty"`
+	ID        string   `json:"id,omitempty"`
 }
 
-type ManifestIndexKey struct{}
+type Algorithms []Algorithm
 
-func IndexToContext(ctx context.Context, index int) context.Context {
-	return context.WithValue(ctx, ManifestIndexKey{}, index)
-}
-
-func IndexFromContext(ctx context.Context) (int, bool) {
-	index, ok := ctx.Value(ManifestIndexKey{}).(int)
-	return index, ok
+func containsID(slice interface{}, id string) int {
+	rangeOnMe := reflect.ValueOf(slice)
+	for i := 0; i < rangeOnMe.Len(); i++ {
+		s := rangeOnMe.Index(i)
+		f := s.FieldByName("ID")
+		if f.IsValid() {
+			if f.Interface() == id {
+				return i
+			}
+		}
+	}
+	return -1
 }

agent/service.go

@@ -4,13 +4,11 @@
 package agent
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"log/slog"
-	"os"
 	"os/exec"
 	"slices"
 
@@ -22,12 +20,8 @@ import (
 
 var _ Service = (*agentService)(nil)
 
-const (
-	// ReportDataSize is the size of the report data expected by the attestation service.
-	ReportDataSize     = 64
-	socketPath         = "unix_socket"
-	algoFilePermission = 0o700
-)
+// ReportDataSize is the size of the report data expected by the attestation service.
+const ReportDataSize = 64
 
 var (
 	// ErrMalformedEntity indicates malformed entity specification (e.g.
@@ -37,7 +31,11 @@ var (
 	// when accessing a protected resource.
 	ErrUnauthorizedAccess = errors.New("missing or invalid credentials provided")
 	// errUndeclaredAlgorithm indicates algorithm was not declared in computation manifest.
+	errUndeclaredAlgorithm = errors.New("algorithm not declared in computation manifest")
+	// errUndeclaredAlgorithm indicates algorithm was not declared in computation manifest.
 	errUndeclaredDataset = errors.New("dataset not declared in computation manifest")
+	// errProviderMissmatch algorithm/dataset provider does not match computation manifest.
+	errProviderMissmatch = errors.New("provider does not match declaration on manifest")
 	// errAllManifestItemsReceived indicates no new computation manifest items expected.
 	errAllManifestItemsReceived = errors.New("all expected manifest Items have been received")
 	// errUndeclaredConsumer indicates the consumer requesting results in not declared in computation manifest.
@@ -55,20 +53,25 @@ var (
 type Service interface {
 	Algo(ctx context.Context, algorithm Algorithm) error
 	Data(ctx context.Context, dataset Dataset) error
-	Result(ctx context.Context) ([]byte, error)
+	Result(ctx context.Context, consumer string) ([]byte, error)
 	Attestation(ctx context.Context, reportData [ReportDataSize]byte) ([]byte, error)
 }
 
 type agentService struct {
 	computation Computation    // Holds the current computation request details.
-	algorithm   string         // Filepath to the algorithm received for the computation.
-	datasets    []string       // Filepath to the datasets received for the computation.
+	algorithms  [][]byte       // Stores the algorithms received for the computation.
+	datasets    [][]byte       // Stores the datasets received for the computation.
 	result      []byte         // Stores the result of the computation.
 	sm          *StateMachine  // Manages the state transitions of the agent service.
 	runError    error          // Stores any error encountered during the computation run.
 	eventSvc    events.Service // Service for publishing events related to computation.
 }
 
+const (
+	socketPath = "unix_socket"
+	pyRuntime  = "python3"
+)
+
 var _ Service = (*agentService)(nil)
 
 // New instantiates the agent service implementation.
@@ -77,57 +80,49 @@ func New(ctx context.Context, logger *slog.Logger, eventSvc events.Service, cmp
 		sm:       NewStateMachine(logger),
 		eventSvc: eventSvc,
 	}
-
 	go svc.sm.Start(ctx)
 	svc.sm.SendEvent(start)
 	svc.sm.StateFunctions[idle] = svc.publishEvent("in-progress", json.RawMessage{})
-	svc.sm.StateFunctions[receivingManifest] = svc.publishEvent("in-progress", json.RawMessage{})
-	svc.sm.StateFunctions[receivingAlgorithm] = svc.publishEvent("in-progress", json.RawMessage{})
+	svc.sm.StateFunctions[receivingManifests] = svc.publishEvent("in-progress", json.RawMessage{})
+	svc.sm.StateFunctions[receivingAlgorithms] = svc.publishEvent("in-progress", json.RawMessage{})
 	svc.sm.StateFunctions[receivingData] = svc.publishEvent("in-progress", json.RawMessage{})
 	svc.sm.StateFunctions[resultsReady] = svc.publishEvent("in-progress", json.RawMessage{})
 	svc.sm.StateFunctions[complete] = svc.publishEvent("in-progress", json.RawMessage{})
 	svc.sm.StateFunctions[running] = svc.runComputation
 
 	svc.computation = cmp
-	svc.sm.SendEvent(manifestReceived)
+	svc.sm.SendEvent(manifestsReceived)
 	return svc
 }
 
 func (as *agentService) Algo(ctx context.Context, algorithm Algorithm) error {
-	if as.sm.GetState() != receivingAlgorithm {
+	if as.sm.GetState() != receivingAlgorithms {
 		return errStateNotReady
 	}
-	if as.algorithm != "" {
+	if len(as.computation.Algorithms) == 0 {
 		return errAllManifestItemsReceived
 	}
 
 	hash := sha3.Sum256(algorithm.Algorithm)
 
-	if hash != as.computation.Algorithm.Hash {
-		return errHashMismatch
+	index := containsID(as.computation.Algorithms, algorithm.ID)
+	switch index {
+	case -1:
+		return errUndeclaredAlgorithm
+	default:
+		if as.computation.Algorithms[index].Provider != algorithm.Provider {
+			return errProviderMissmatch
+		}
+		if hash != as.computation.Algorithms[index].Hash {
+			return errHashMismatch
+		}
+		as.computation.Algorithms = slices.Delete(as.computation.Algorithms, index, index+1)
 	}
 
-	f, err := os.CreateTemp("", "algorithm")
-	if err != nil {
-		return fmt.Errorf("error creating algorithm file: %v", err)
-	}
+	as.algorithms = append(as.algorithms, algorithm.Algorithm)
 
-	if _, err := f.Write(algorithm.Algorithm); err != nil {
-		return fmt.Errorf("error writing algorithm to file: %v", err)
-	}
-
-	if err := os.Chmod(f.Name(), algoFilePermission); err != nil {
-		return fmt.Errorf("error changing file permissions: %v", err)
-	}
-
-	if err := f.Close(); err != nil {
-		return fmt.Errorf("error closing file: %v", err)
-	}
-
-	as.algorithm = f.Name()
-
-	if as.algorithm != "" {
-		as.sm.SendEvent(algorithmReceived)
+	if len(as.computation.Algorithms) == 0 {
+		as.sm.SendEvent(algorithmsReceived)
 	}
 
 	return nil
@@ -143,29 +138,21 @@ func (as *agentService) Data(ctx context.Context, dataset Dataset) error {
 
 	hash := sha3.Sum256(dataset.Dataset)
 
-	index, ok := IndexFromContext(ctx)
-	if !ok {
+	index := containsID(as.computation.Datasets, dataset.ID)
+	switch index {
+	case -1:
 		return errUndeclaredDataset
+	default:
+		if as.computation.Datasets[index].Provider != dataset.Provider {
+			return errProviderMissmatch
+		}
+		if hash != as.computation.Datasets[index].Hash {
+			return errHashMismatch
+		}
+		as.computation.Datasets = slices.Delete(as.computation.Datasets, index, index+1)
 	}
 
-	if hash != as.computation.Datasets[index].Hash {
-		return errHashMismatch
-	}
-	as.computation.Datasets = slices.Delete(as.computation.Datasets, index, index+1)
-
-	f, err := os.CreateTemp("", fmt.Sprintf("dataset-%d", index))
-	if err != nil {
-		return fmt.Errorf("error creating dataset file: %v", err)
-	}
-
-	if _, err := f.Write(dataset.Dataset); err != nil {
-		return fmt.Errorf("error writing dataset to file: %v", err)
-	}
-	if err := f.Close(); err != nil {
-		return fmt.Errorf("error closing file: %v", err)
-	}
-
-	as.datasets = append(as.datasets, f.Name())
+	as.datasets = append(as.datasets, dataset.Dataset)
 
 	if len(as.computation.Datasets) == 0 {
 		as.sm.SendEvent(dataReceived)
@@ -174,18 +161,20 @@ func (as *agentService) Data(ctx context.Context, dataset Dataset) error {
 	return nil
 }
 
-func (as *agentService) Result(ctx context.Context) ([]byte, error) {
+func (as *agentService) Result(ctx context.Context, consumer string) ([]byte, error) {
 	if as.sm.GetState() != resultsReady {
 		return []byte{}, errResultsNotReady
 	}
 	if len(as.computation.ResultConsumers) == 0 {
 		return []byte{}, errAllManifestItemsReceived
 	}
-	index, ok := IndexFromContext(ctx)
-	if !ok {
+	index := slices.Index(as.computation.ResultConsumers, consumer)
+	switch index {
+	case -1:
 		return []byte{}, errUndeclaredConsumer
+	default:
+		as.computation.ResultConsumers = slices.Delete(as.computation.ResultConsumers, index, index+1)
 	}
-	as.computation.ResultConsumers = slices.Delete(as.computation.ResultConsumers, index, index+1)
 
 	if len(as.computation.ResultConsumers) == 0 {
 		as.sm.SendEvent(resultsConsumed)
@@ -212,10 +201,9 @@ func (as *agentService) runComputation() {
 	as.sm.logger.Debug("computation run started")
 	defer as.sm.SendEvent(runComplete)
 	as.publishEvent("in-progress", json.RawMessage{})()
-	result, err := as.run(as.algorithm, as.datasets)
+	result, err := run(as.algorithms[0], as.datasets[0])
 	if err != nil {
 		as.runError = err
-		as.sm.logger.Warn(fmt.Sprintf("computation failed with error: %s", err.Error()))
 		as.publishEvent("failed", json.RawMessage{})()
 		return
 	}
@@ -231,13 +219,7 @@ func (as *agentService) publishEvent(status string, details json.RawMessage) fun
 	}
 }
 
-func (as *agentService) run(algoFile string, dataFiles []string) ([]byte, error) {
-	defer os.Remove(algoFile)
-	defer func() {
-		for _, file := range dataFiles {
-			os.Remove(file)
-		}
-	}()
+func run(algoContent, dataContent []byte) ([]byte, error) {
 	listener, err := socket.StartUnixSocketServer(socketPath)
 	if err != nil {
 		return nil, fmt.Errorf("error creating stdout pipe: %v", err)
@@ -250,27 +232,23 @@ func (as *agentService) run(algoFile string, dataFiles []string) ([]byte, error)
 
 	var result []byte
 
-	var outStd, outErr bytes.Buffer
-
 	go socket.AcceptConnection(listener, dataChannel, errorChannel)
 
-	args := append([]string{socketPath}, dataFiles...)
-	cmd := exec.Command(algoFile, args...)
-	cmd.Stderr = &outErr
-	cmd.Stdout = &outStd
+	// Construct the Python script content with CSV data as a command-line argument
+	script := string(algoContent)
+	data := string(dataContent)
+	cmd := exec.Command(pyRuntime, "-c", script, data, socketPath)
 
 	if err := cmd.Start(); err != nil {
-		return nil, fmt.Errorf("error starting algorithm: %v", err)
+		return nil, fmt.Errorf("error starting Python script: %v", err)
 	}
 
 	if err := cmd.Wait(); err != nil {
-		as.sm.logger.Debug(outErr.String())
-		return nil, fmt.Errorf("algorithm execution error: %v", err)
+		return nil, fmt.Errorf("python script execution error: %v", err)
 	}
 
 	select {
 	case result = <-dataChannel:
-		as.sm.logger.Debug(outStd.String())
 		return result, nil
 	case err = <-errorChannel:
 		return nil, fmt.Errorf("error receiving data: %v", err)

agent/state.go

@@ -14,8 +14,8 @@ type state int
 
 const (
 	idle state = iota
-	receivingManifest
-	receivingAlgorithm
+	receivingManifests
+	receivingAlgorithms
 	receivingData
 	running
 	resultsReady
@@ -26,8 +26,8 @@ type event int
 
 const (
 	start event = iota
-	manifestReceived
-	algorithmReceived
+	manifestsReceived
+	algorithmsReceived
 	dataReceived
 	runComplete
 	resultsConsumed
@@ -56,13 +56,13 @@ func NewStateMachine(logger *slog.Logger) *StateMachine {
 	}
 
 	sm.Transitions[idle] = make(map[event]state)
-	sm.Transitions[idle][start] = receivingManifest
+	sm.Transitions[idle][start] = receivingManifests
 
-	sm.Transitions[receivingManifest] = make(map[event]state)
-	sm.Transitions[receivingManifest][manifestReceived] = receivingAlgorithm
+	sm.Transitions[receivingManifests] = make(map[event]state)
+	sm.Transitions[receivingManifests][manifestsReceived] = receivingAlgorithms
 
-	sm.Transitions[receivingAlgorithm] = make(map[event]state)
-	sm.Transitions[receivingAlgorithm][algorithmReceived] = receivingData
+	sm.Transitions[receivingAlgorithms] = make(map[event]state)
+	sm.Transitions[receivingAlgorithms][algorithmsReceived] = receivingData
 
 	sm.Transitions[receivingData] = make(map[event]state)
 	sm.Transitions[receivingData][dataReceived] = running

agent/state_string.go

@@ -9,17 +9,17 @@ func _() {
 	// Re-run the stringer command to generate them again.
 	var x [1]struct{}
 	_ = x[idle-0]
-	_ = x[receivingManifest-1]
-	_ = x[receivingAlgorithm-2]
+	_ = x[receivingManifests-1]
+	_ = x[receivingAlgorithms-2]
 	_ = x[receivingData-3]
 	_ = x[running-4]
 	_ = x[resultsReady-5]
 	_ = x[complete-6]
 }
 
-const _state_name = "idlereceivingManifestreceivingAlgorithmreceivingDatarunningresultsReadycomplete"
+const _state_name = "idlereceivingManifestsreceivingAlgorithmsreceivingDatarunningresultsReadycomplete"
 
-var _state_index = [...]uint8{0, 4, 21, 39, 52, 59, 71, 79}
+var _state_index = [...]uint8{0, 4, 22, 41, 54, 61, 73, 81}
 
 func (i state) String() string {
 	if i < 0 || i >= state(len(_state_index)-1) {

agent/state_test.go

@@ -16,9 +16,9 @@ func TestStateMachineTransitions(t *testing.T) {
 		event     event
 		expected  state
 	}{
-		{idle, start, receivingManifest},
-		{receivingManifest, manifestReceived, receivingAlgorithm},
-		{receivingAlgorithm, algorithmReceived, receivingData},
+		{idle, start, receivingManifests},
+		{receivingManifests, manifestsReceived, receivingAlgorithms},
+		{receivingAlgorithms, algorithmsReceived, receivingData},
 		{receivingData, dataReceived, running},
 		{running, runComplete, resultsReady},
 		{resultsReady, resultsConsumed, complete},

cli/README.md

@@ -1,6 +1,6 @@
 # Agent CLI
 
-This repository contains the command-line interface (CLI) tool for interacting with the Agent and manager service. The CLI allows you to perform various tasks such as running computations, uploading algorithm and datasets, and retrieving results.
+This repository contains the command-line interface (CLI) tool for interacting with the Agent and manager service. The CLI allows you to perform various tasks such as running computations, uploading algorithms and datasets, and retrieving results.
 
 ## Build
 
@@ -12,6 +12,14 @@ make cli
 
 ## Usage
 
+#### Run Computation
+
+To run a computation, use the following command:
+
+```bash
+./build/cocos-cli manager run --computation '{"name": "my-computation"}'
+```
+
 #### Get attestation
 Retrieves attestation information from the SEV guest and saves it to a file.
 To retrieve attestation from agent, use the following command:
@@ -62,7 +70,7 @@ To validate and verify attestation from agent, use the following command:
 To upload an algorithm, use the following command:
 
 ```bash
-./build/cocos-cli agent algo /path/to/algorithm <private_key_file_path>
+./build/cocos-cli agent algo /path/to/algorithm
 ```
 
 #### Upload Dataset
@@ -70,7 +78,7 @@ To upload an algorithm, use the following command:
 To upload a dataset, use the following command:
 
 ```bash
-./build/cocos-cli agent data /path/to/dataset.csv <private_key_file_path>
+./build/cocos-cli agent data /path/to/dataset.csv
 ```
 
 #### Retrieve result
@@ -78,5 +86,5 @@ To upload a dataset, use the following command:
 To retrieve the computation result, use the following command:
 
 ```bash
-./build/cocos-cli agent result <private_key_file_path>
+./build/cocos-cli agent result
 ```

cli/algorithms.go

@@ -3,8 +3,6 @@
 package cli
 
 import (
-	"crypto/x509"
-	"encoding/pem"
 	"log"
 	"os"
 
@@ -12,12 +10,12 @@ import (
 	"github.com/ultravioletrs/cocos/agent"
 )
 
-func (cli *CLI) NewAlgorithmCmd() *cobra.Command {
+func (cli *CLI) NewAlgorithmsCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "algo",
 		Short:   "Upload an algorithm binary",
-		Example: "algo <algo_file> <private_key_file_path>",
-		Args:    cobra.ExactArgs(2),
+		Example: "algo <algo_file> <id> <provider>",
+		Args:    cobra.ExactArgs(3),
 		Run: func(cmd *cobra.Command, args []string) {
 			algorithmFile := args[0]
 
@@ -30,22 +28,12 @@ func (cli *CLI) NewAlgorithmCmd() *cobra.Command {
 
 			algoReq := agent.Algorithm{
 				Algorithm: algorithm,
+				ID:        args[1],
+				Provider:  args[2],
 			}
 
-			privKeyFile, err := os.ReadFile(args[1])
-			if err != nil {
-				log.Fatalf("Error reading private key file: %v", err)
-			}
-
-			pemBlock, _ := pem.Decode(privKeyFile)
-
-			privKey, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes)
-			if err != nil {
-				log.Fatalf("Error parsing private key: %v", err)
-			}
-
-			if err := cli.agentSDK.Algo(cmd.Context(), algoReq, privKey); err != nil {
-				log.Fatalf("Error uploading algorithm with error: %v", err)
+			if err := cli.agentSDK.Algo(cmd.Context(), algoReq); err != nil {
+				log.Fatalf("Error uploading algorithm with ID %s and provider %s: %v", algoReq.ID, algoReq.Provider, err)
 			}
 
 			log.Println("Successfully uploaded algorithm")

cli/datasets.go

@@ -3,8 +3,6 @@
 package cli
 
 import (
-	"crypto/x509"
-	"encoding/pem"
 	"log"
 	"os"
 
@@ -16,8 +14,8 @@ func (cli *CLI) NewDatasetsCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "data",
 		Short:   "Upload a dataset CSV file",
-		Example: "data <dataset.csv> <private_key_file_path>",
-		Args:    cobra.ExactArgs(2),
+		Example: "data <dataset.csv> <id> <provider>",
+		Args:    cobra.ExactArgs(3),
 		Run: func(cmd *cobra.Command, args []string) {
 			datasetFile := args[0]
 
@@ -29,22 +27,12 @@ func (cli *CLI) NewDatasetsCmd() *cobra.Command {
 			}
 
 			dataReq := agent.Dataset{
-				Dataset: dataset,
+				Dataset:  dataset,
+				ID:       args[1],
+				Provider: args[2],
 			}
 
-			privKeyFile, err := os.ReadFile(args[1])
-			if err != nil {
-				log.Fatalf("Error reading private key file: %v", err)
-			}
-
-			pemBlock, _ := pem.Decode(privKeyFile)
-
-			privKey, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes)
-			if err != nil {
-				log.Fatalf("Error parsing private key: %v", err)
-			}
-
-			if err := cli.agentSDK.Data(cmd.Context(), dataReq, privKey); err != nil {
+			if err := cli.agentSDK.Data(cmd.Context(), dataReq); err != nil {
 				log.Fatalf("Error uploading dataset: %v", err)
 			}
 

cli/file_hash.go

@@ -1,35 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-package cli
-
-import (
-	"encoding/hex"
-	"log"
-	"os"
-
-	"github.com/spf13/cobra"
-	"golang.org/x/crypto/sha3"
-)
-
-func (cli *CLI) NewFileHashCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:     "file-hash",
-		Short:   "Compute the sha3-256 hash of a file",
-		Example: "file-hash <file>",
-		Args:    cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			fileName := args[0]
-
-			file, err := os.ReadFile(fileName)
-			if err != nil {
-				log.Fatalf("Error reading dataset file: %v", err)
-			}
-
-			hashBytes := sha3.Sum256(file)
-
-			hash := hex.EncodeToString(hashBytes[:])
-
-			log.Println("Hash of file:", hash)
-		},
-	}
-}

cli/keys.go

@@ -1,68 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-package cli
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/pem"
-	"log"
-	"os"
-
-	"github.com/spf13/cobra"
-)
-
-const (
-	keyBitSize     = 4096
-	privateKeyType = "RSA PRIVATE KEY"
-	publicKeyType  = "PUBLIC KEY"
-	publicKeyFile  = "public.pem"
-	privateKeyFile = "private.pem"
-)
-
-func (cli *CLI) NewKeysCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "keys",
-		Short: "Generate a new public/private key pair",
-		Run: func(cmd *cobra.Command, args []string) {
-			privKey, err := rsa.GenerateKey(rand.Reader, keyBitSize)
-			if err != nil {
-				log.Fatalf("Error generating public key: %v", err)
-			}
-
-			pubKey, err := x509.MarshalPKIXPublicKey(&privKey.PublicKey)
-			if err != nil {
-				log.Fatalf("Error marshalling public key: %v", err)
-			}
-
-			privFile, err := os.Create(privateKeyFile)
-			if err != nil {
-				log.Fatalf("Error creating private key file: %v", err)
-			}
-			defer privFile.Close()
-
-			if err := pem.Encode(privFile, &pem.Block{
-				Type:  privateKeyType,
-				Bytes: x509.MarshalPKCS1PrivateKey(privKey),
-			}); err != nil {
-				log.Fatalf("Error encoding private key: %v", err)
-			}
-
-			pubFile, err := os.Create(publicKeyFile)
-			if err != nil {
-				log.Fatalf("Error creating public key file: %v", err)
-			}
-			defer pubFile.Close()
-
-			if err := pem.Encode(pubFile, &pem.Block{
-				Type:  publicKeyType,
-				Bytes: pubKey,
-			}); err != nil {
-				log.Fatalf("Error encoding public key: %v", err)
-			}
-
-			log.Println("Successfully generated public/private key pair")
-		},
-	}
-}

cli/measurement.go

@@ -1,62 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-package cli
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"log"
-	"os"
-
-	"github.com/google/go-sev-guest/proto/check"
-	"github.com/spf13/cobra"
-)
-
-const filePermision = 0o755
-
-type AttestationConfiguration struct {
-	SNPPolicy   *check.Policy      `json:"snp_policy,omitempty"`
-	RootOFTrust *check.RootOfTrust `json:"root_of_trust,omitempty"`
-}
-
-func (cli *CLI) NewAddMeasurementCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:     "measurement",
-		Short:   "Add measurement to the platform info file. The value should be in base64. The second parameter is platform_info.json file",
-		Example: "measurement <measurement> <platform_info.json>",
-		Args:    cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			measurement, err := base64.StdEncoding.DecodeString(args[0])
-			if err != nil {
-				log.Fatalf("Error could not decode base64: %v", err)
-			}
-
-			attestationConfiguration := AttestationConfiguration{}
-
-			manifest, err := os.OpenFile(args[1], os.O_RDWR, filePermision)
-			if err != nil {
-				log.Fatalf("Error opening the platform information file: %v", err)
-			}
-			defer manifest.Close()
-
-			decoder := json.NewDecoder(manifest)
-			err = decoder.Decode(&attestationConfiguration)
-			if err != nil {
-				log.Fatalf("Error decoding the platform information file: %v", err)
-			}
-
-			attestationConfiguration.SNPPolicy.Measurement = measurement
-			if err = manifest.Truncate(0); err != nil {
-				log.Fatalf("Error could not truncate platform information JSON file: %v", err)
-			}
-
-			fileJson, err := json.MarshalIndent(attestationConfiguration, "", " ")
-			if err != nil {
-				log.Fatalf("Error marshaling the platform information JSON: %v", err)
-			}
-			if err = os.WriteFile(manifest.Name(), fileJson, filePermision); err != nil {
-				log.Fatalf("Error writing into platform information JSON file: %v", err)
-			}
-		},
-	}
-}

cli/result.go

@@ -3,8 +3,6 @@
 package cli
 
 import (
-	"crypto/x509"
-	"encoding/pem"
 	"log"
 	"os"
 
@@ -15,26 +13,13 @@ const resultFilePath = "result.bin"
 
 func (cli *CLI) NewResultsCmd() *cobra.Command {
 	return &cobra.Command{
-		Use:     "result",
-		Short:   "Retrieve computation result file",
-		Example: "result <private_key_file_path>",
-		Args:    cobra.ExactArgs(1),
+		Use:   "result",
+		Short: "Retrieve computation result file",
+		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			log.Println("Retrieving computation result file")
 
-			privKeyFile, err := os.ReadFile(args[0])
-			if err != nil {
-				log.Fatalf("Error reading private key file: %v", err)
-			}
-
-			pemBlock, _ := pem.Decode(privKeyFile)
-
-			privKey, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes)
-			if err != nil {
-				log.Fatalf("Error parsing private key: %v", err)
-			}
-
-			result, err := cli.agentSDK.Result(cmd.Context(), privKey)
+			result, err := cli.agentSDK.Result(cmd.Context(), args[0])
 			if err != nil {
 				log.Fatalf("Error retrieving computation result: %v", err)
 			}

cli/sdk.go

@@ -2,13 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 package cli
 
-import "github.com/ultravioletrs/cocos/pkg/sdk"
+import (
+	"github.com/ultravioletrs/cocos/agent"
+)
 
 type CLI struct {
-	agentSDK sdk.SDK
+	agentSDK agent.Service
 }
 
-func New(agentSDK sdk.SDK) *CLI {
+func New(agentSDK agent.Service) *CLI {
 	return &CLI{
 		agentSDK: agentSDK,
 	}

cmd/agent/main.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"log/slog"
 
@@ -14,7 +13,6 @@ import (
 	"github.com/ultravioletrs/cocos/agent"
 	"github.com/ultravioletrs/cocos/agent/api"
 	agentgrpc "github.com/ultravioletrs/cocos/agent/api/grpc"
-	"github.com/ultravioletrs/cocos/agent/auth"
 	"github.com/ultravioletrs/cocos/agent/events"
 	"github.com/ultravioletrs/cocos/internal"
 	agentlogger "github.com/ultravioletrs/cocos/internal/logger"
@@ -55,7 +53,7 @@ func main() {
 
 	eventSvc, err := events.New(svcName, cfg.ID, manager.ManagerVsockPort)
 	if err != nil {
-		logger.Error(fmt.Sprintf("failed to create events service %s", err.Error()))
+		log.Printf("failed to create events service %s", err.Error())
 		return
 	}
 	defer eventSvc.Close()
@@ -68,20 +66,13 @@ func main() {
 		KeyFile:      cfg.AgentConfig.KeyFile,
 		ServerCAFile: cfg.AgentConfig.ServerCAFile,
 		ClientCAFile: cfg.AgentConfig.ClientCAFile,
-		AttestedTLS:  cfg.AgentConfig.AttestedTls,
 	}
 
 	registerAgentServiceServer := func(srv *grpc.Server) {
 		reflection.Register(srv)
 		agent.RegisterAgentServiceServer(srv, agentgrpc.NewServer(svc))
 	}
-
-	authSvc, err := auth.New(cfg)
-	if err != nil {
-		logger.Error(fmt.Sprintf("failed to create auth service %s", err.Error()))
-		return
-	}
-	gs := grpcserver.New(ctx, cancel, svcName, grpcServerConfig, registerAgentServiceServer, logger, svc, authSvc)
+	gs := grpcserver.New(ctx, cancel, svcName, grpcServerConfig, registerAgentServiceServer, logger)
 
 	g.Go(func() error {
 		return gs.Start()
@@ -117,24 +108,15 @@ func readConfig() (agent.Computation, error) {
 		return agent.Computation{}, err
 	}
 	defer conn.Close()
-
-	var buffer []byte
-	for {
-		chunk := make([]byte, 1024)
-		n, err := conn.Read(chunk)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			return agent.Computation{}, err
-		}
-		buffer = append(buffer, chunk[:n]...)
+	b := make([]byte, 1024)
+	n, err := conn.Read(b)
+	if err != nil {
+		return agent.Computation{}, err
 	}
-
 	ac := agent.Computation{
 		AgentConfig: agent.AgentConfig{},
 	}
-	if err := json.Unmarshal(buffer, &ac); err != nil {
+	if err := json.Unmarshal(b[:n], &ac); err != nil {
 		return agent.Computation{}, err
 	}
 	if ac.AgentConfig.LogLevel == "" {

cmd/cli/main.go

@@ -24,7 +24,7 @@ const (
 )
 
 type config struct {
-	LogLevel string `env:"AGENT_LOG_LEVEL" envDefault:"info"`
+	LogLevel string `env:"AGENT_LOG_LEVEL"               envDefault:"info"`
 }
 
 func main() {
@@ -84,14 +84,11 @@ func main() {
 	}
 
 	// Agent Commands
-	rootCmd.AddCommand(cliSVC.NewAlgorithmCmd())
+	rootCmd.AddCommand(cliSVC.NewAlgorithmsCmd())
 	rootCmd.AddCommand(cliSVC.NewDatasetsCmd())
 	rootCmd.AddCommand(cliSVC.NewResultsCmd())
 	attestaionCmd := cliSVC.NewAttestationCmd()
 	rootCmd.AddCommand(attestaionCmd)
-	rootCmd.AddCommand(cliSVC.NewFileHashCmd())
-	rootCmd.AddCommand(cliSVC.NewAddMeasurementCmd())
-	rootCmd.AddCommand(cliSVC.NewKeysCmd())
 
 	// Attestation commands
 	attestaionCmd.AddCommand(cliSVC.NewGetAttestationCmd())

cmd/manager/main.go

@@ -35,13 +35,13 @@ const (
 )
 
 type config struct {
-	LogLevel   string `env:"MANAGER_LOG_LEVEL"          envDefault:"info"`
-	JaegerURL  string `env:"COCOS_JAEGER_URL"           envDefault:"http://localhost:14268/api/traces"`
-	InstanceID string `env:"MANAGER_INSTANCE_ID"        envDefault:""`
+	LogLevel   string `env:"MANAGER_LOG_LEVEL"        envDefault:"info"`
+	JaegerURL  string `env:"COCOS_JAEGER_URL"         envDefault:"http://localhost:14268/api/traces"`
+	InstanceID string `env:"MANAGER_INSTANCE_ID"      envDefault:""`
 }
 
 func main() {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx := context.Background()
 	g, ctx := errgroup.WithContext(ctx)
 
 	var cfg config
@@ -110,7 +110,7 @@ func main() {
 	mc := managerapi.NewClient(pc, svc, eventsChan)
 
 	g.Go(func() error {
-		return mc.Process(ctx, cancel)
+		return mc.Process(ctx)
 	})
 
 	if err := g.Wait(); err != nil {

go.mod

@@ -1,6 +1,6 @@
 module github.com/ultravioletrs/cocos
 
-go 1.22.0
+go 1.21.6
 
 require (
 	github.com/absmach/magistrala v0.0.0-20240119191055-d95283d31472

hal/linux/configs/cocos_defconfig

@@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Cocos"
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_INIT_SYSTEMD=y
-BR2_SYSTEM_BIN_SH_BASH=y
 
 # Filesystem
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -43,3 +42,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 # host-qemu for gitlab testing
 BR2_PACKAGE_HOST_QEMU=y
 BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
+
+# Python
+BR2_PACKAGE_PYTHON3=y
+BR2_PACKAGE_PYTHON_PIP=y

hal/linux/package/agent/Config.in

@@ -3,6 +3,6 @@ config BR2_PACKAGE_AGENT
 	default y
 	help
 	  Confidential Computing Agent is a state machine capable of
-	  receiving datasets and algorithm, running computations, and 
+	  receiving data and algorithms, running computations, and 
 	  fetching the attestation report from within the 
 	  Confidential VM.

hal/linux/package/agent/agent.mk

@@ -12,15 +12,14 @@ define AGENT_BUILD_CMDS
 endef
 
 define AGENT_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0750 $(@D)/build/cocos-agent $(TARGET_DIR)/bin
+	$(INSTALL) -D -m 0755 $(@D)/build/cocos-agent $(TARGET_DIR)/bin
 	mkdir -p $(TARGET_DIR)/var/log/cocos
 	mkdir -p $(TARGET_DIR)/cocos/
 endef
 
 define AGENT_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 0640 $(@D)/init/systemd/cocos-agent.service $(TARGET_DIR)/usr/lib/systemd/system/cocos-agent.service
-	$(INSTALL) -D -m 0750 $(@D)/init/systemd/cocos_network_setup.sh $(TARGET_DIR)/cocos/cocos_network_setup.sh
-	$(INSTALL) -D -m 0750 $(@D)/init/systemd/agent_start_script.sh $(TARGET_DIR)/cocos/agent_start_script.sh
+	$(INSTALL) -D -m 0644 $(@D)/init/systemd/cocos-agent.service $(TARGET_DIR)/usr/lib/systemd/system/cocos-agent.service
+	$(INSTALL) -D -m 0755 $(@D)/init/systemd/agent_start_script.sh $(TARGET_DIR)/cocos/agent_start_script.sh
 endef
 
 $(eval $(golang-package))

init/systemd/agent_start_script.sh

@@ -1,16 +1,21 @@
 #!/bin/sh
 
-NUM_OF_PERMITED_IFACE=1
+# The variable ETH_IFACE contains the name the systemd gave to the network interface. 
+# The systemd configures the name based on the QEMU parameters. 
+# The parts of the name enp0s2 mean:
+#  et - ethernet card. It means this is the ethernet interface.
+#  p - means that the interface is connected to a PCI bus.
+#  0 - the interface is connected to bus 0.
+#  s2 -the interface is connected to slot 2.
 
-NUM_OF_IFACE=$(ip route | grep -Eo 'dev [a-z0-9]+' | awk '{ print $2 }' | sort | uniq | wc -l)
+# The variable ETH_IFACE value must match the name configured through QEMU parameters for the network device. 
+# The bus number and slot number are configured through QEMU device parameters, parameters
+# addr (for slot number), and bus (for bus number).
+ETH_IFACE=enp0s2
 
-if [ $NUM_OF_IFACE -gt $NUM_OF_PERMITED_IFACE ]; then
-    echo "More then one network interface in the VM"
-    exit 1
-fi
-
-DEFAULT_IFACE=$(route | grep '^default' | grep -o '[^ ]*$')
-AGENT_GRPC_HOST=$(ip -4 addr show $DEFAULT_IFACE | grep inet | awk '{print $2}' | cut -d/ -f1)
+ip link set dev $ETH_IFACE up
+dhclient $ETH_IFACE
+AGENT_GRPC_HOST=$(ip -4 addr show $ETH_IFACE | grep inet | awk '{print $2}' | cut -d/ -f1)
 
 export AGENT_GRPC_HOST
 

init/systemd/cocos-agent.service

@@ -9,7 +9,6 @@ StandardError=file:/var/log/cocos/agent.stderr
 Environment=AGENT_GRPC_PORT=7002
 Environment=AGENT_LOG_LEVEL=info
 
-ExecStartPre=/cocos/cocos_network_setup.sh
 ExecStart=/cocos/agent_start_script.sh
 
 [Install]

init/systemd/cocos_network_setup.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# IFACES are all network interfaces excluding lo (LOOPBACK) and sit interfaces 
-IFACES=$(ip link show | grep -vE 'LOOPBACK|sit*' | awk -F': ' '{print $2}')
-
-# This for loop brings up all network interfaces in IFACES and dhclient obtains an IP address for the every interface
-for IFACE in $IFACES; do
-    STATE=$(ip link show $IFACE | grep DOWN)
-    if [ -n "$STATE" ]; then
-        ip link set $IFACE up
-    fi
-
-    IP_ADDR=$(ip addr show $IFACE | grep 'inet ')
-    if [ -z "$IP_ADDR" ]; then
-        dhclient $IFACE
-    fi
-done

internal/server/grpc/grpc.go

@@ -5,57 +5,36 @@ package grpc
 
 import (
 	"context"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
 	"crypto/tls"
 	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"encoding/pem"
 	"fmt"
 	"log/slog"
-	"math/big"
 	"net"
 	"os"
 	"time"
 
-	"github.com/ultravioletrs/cocos/agent"
-	"github.com/ultravioletrs/cocos/agent/auth"
 	"github.com/ultravioletrs/cocos/internal/server"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
-	"golang.org/x/crypto/sha3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 )
 
 const (
-	stopWaitTime  = 5 * time.Second
-	organization  = "Ultraviolet"
-	country       = "Serbia"
-	province      = ""
-	locality      = "Belgrade"
-	streetAddress = "Bulevar Arsenija Carnojevica 103"
-	postalCode    = "11000"
-	notAfterYear  = 1
-	notAfterMonth = 0
-	notAfterDay   = 0
+	stopWaitTime = 5 * time.Second
 )
 
 type Server struct {
 	server.BaseServer
 	server          *grpc.Server
 	registerService serviceRegister
-	agent           agent.Service
-	authSvc         *auth.Service
 }
 
 type serviceRegister func(srv *grpc.Server)
 
 var _ server.Server = (*Server)(nil)
 
-func New(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, registerService serviceRegister, logger *slog.Logger, agentSvc agent.Service, authSvc *auth.Service) server.Server {
+func New(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, registerService serviceRegister, logger *slog.Logger) server.Server {
 	listenFullAddress := fmt.Sprintf("%s:%s", config.Host, config.Port)
 	return &Server{
 		BaseServer: server.BaseServer{
@@ -67,8 +46,6 @@ func New(ctx context.Context, cancel context.CancelFunc, name string, config ser
 			Logger:  logger,
 		},
 		registerService: registerService,
-		agent:           agentSvc,
-		authSvc:         authSvc,
 	}
 }
 
@@ -78,11 +55,6 @@ func (s *Server) Start() error {
 		grpc.StatsHandler(otelgrpc.NewServerHandler()),
 	}
 
-	if s.authSvc != nil {
-		grpcServerOptions = append(grpcServerOptions, grpc.UnaryInterceptor(s.authSvc.AuthUnaryInterceptor()))
-		grpcServerOptions = append(grpcServerOptions, grpc.StreamInterceptor(s.authSvc.AuthStreamInterceptor()))
-	}
-
 	listener, err := net.Listen("tcp", s.Address)
 	if err != nil {
 		return fmt.Errorf("failed to listen on port %s: %w", s.Address, err)
@@ -90,24 +62,6 @@ func (s *Server) Start() error {
 	creds := grpc.Creds(insecure.NewCredentials())
 
 	switch {
-	case s.Config.AttestedTLS:
-		certificateBytes, privateKeyBytes, err := generateCertificatesForATLS(s.agent)
-		if err != nil {
-			return fmt.Errorf("failed to create certificate: %w", err)
-		}
-
-		certificate, err := tls.X509KeyPair(certificateBytes, privateKeyBytes)
-		if err != nil {
-			return fmt.Errorf("falied due to invalid key pair: %w", err)
-		}
-
-		tlsConfig := &tls.Config{
-			ClientAuth:   tls.NoClientCert,
-			Certificates: []tls.Certificate{certificate},
-		}
-
-		creds = grpc.Creds(credentials.NewTLS(tlsConfig))
-		s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with Attested TLS", s.Name, s.Address))
 	case s.Config.CertFile != "" || s.Config.KeyFile != "":
 		certificate, err := loadX509KeyPair(s.Config.CertFile, s.Config.KeyFile)
 		if err != nil {
@@ -225,68 +179,3 @@ func loadX509KeyPair(certfile, keyfile string) (tls.Certificate, error) {
 	}
 	return tls.X509KeyPair(cert, key)
 }
-
-func generateCertificatesForATLS(svc agent.Service) ([]byte, []byte, error) {
-	curve := elliptic.P256()
-	privateKey, err := ecdsa.GenerateKey(curve, rand.Reader)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to generate private/public key: %w", err)
-	}
-
-	publicKeyBytes, err := x509.MarshalPKIXPublicKey(&privateKey.PublicKey)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to marshal the public key: %w", err)
-	}
-
-	// The Attestation Report will be added as an X.509 certificate extension
-	attestationReport, err := svc.Attestation(context.Background(), sha3.Sum512(publicKeyBytes))
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to fetch the attestation report: %w", err)
-	}
-
-	certTemplate := &x509.Certificate{
-		SerialNumber: big.NewInt(202403311),
-		Subject: pkix.Name{
-			Organization:  []string{organization},
-			Country:       []string{country},
-			Province:      []string{province},
-			Locality:      []string{locality},
-			StreetAddress: []string{streetAddress},
-			PostalCode:    []string{postalCode},
-		},
-		NotBefore:             time.Now(),
-		NotAfter:              time.Now().AddDate(notAfterYear, notAfterMonth, notAfterDay),
-		KeyUsage:              x509.KeyUsageDigitalSignature,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		BasicConstraintsValid: true,
-		ExtraExtensions: []pkix.Extension{
-			{
-				Id:       asn1.ObjectIdentifier{1, 2, 3, 4, 5, 6},
-				Critical: false,
-				Value:    attestationReport,
-			},
-		},
-	}
-
-	certDERBytes, err := x509.CreateCertificate(rand.Reader, certTemplate, certTemplate, &privateKey.PublicKey, privateKey)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to create certificate: %w", err)
-	}
-
-	certBytes := pem.EncodeToMemory(&pem.Block{
-		Type:  "CERTIFICATE",
-		Bytes: certDERBytes,
-	})
-
-	privateKeyBytes, err := x509.MarshalPKCS8PrivateKey(privateKey)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to marshal the private key: %w", err)
-	}
-
-	keyBytes := pem.EncodeToMemory(&pem.Block{
-		Type:  "PRIVATE KEY",
-		Bytes: privateKeyBytes,
-	})
-
-	return certBytes, keyBytes, nil
-}

internal/server/server.go

@@ -17,13 +17,12 @@ type Server interface {
 }
 
 type Config struct {
-	Host         string `env:"HOST"               envDefault:""`
-	Port         string `env:"PORT"               envDefault:""`
-	CertFile     string `env:"SERVER_CERT"        envDefault:""`
-	KeyFile      string `env:"SERVER_KEY"         envDefault:""`
-	ServerCAFile string `env:"SERVER_CA_CERTS"    envDefault:""`
-	ClientCAFile string `env:"CLIENT_CA_CERTS"    envDefault:""`
-	AttestedTLS  bool   `env:"ATTESTED_TLS"       envDefault:"false"`
+	Host         string `env:"HOST"            envDefault:""`
+	Port         string `env:"PORT"            envDefault:""`
+	CertFile     string `env:"SERVER_CERT"     envDefault:""`
+	KeyFile      string `env:"SERVER_KEY"      envDefault:""`
+	ServerCAFile string `env:"SERVER_CA_CERTS" envDefault:""`
+	ClientCAFile string `env:"CLIENT_CA_CERTS" envDefault:""`
 }
 
 type BaseServer struct {

manager/README.md

@@ -176,8 +176,6 @@ MANAGER_QEMU_SEV_CBITPOS=51 \
 
 The kernel hash feature might not work with the current build of OVMF and QEMU. If so, build the host kernel, QEMU, and OVMF from the [AMD SEV GitHub](https://github.com/AMDESE/AMDSEV/tree/snp-latest) repository.
 
-To build the OVMF with the kernel hash capability, we must build the AmdSev package of OVMF. The result of the build should be a single `OVMF.fd` file (unlike the regular two OVFM files). The OVMF package is located at `OvmfPkg/AmdSev/AmdSevX64.dsc`.
-
 To enable [AMD SEV-SNP](https://www.amd.com/en/developer/sev.html) support, start manager like this 
 
 ```sh
@@ -187,7 +185,7 @@ MANAGER_QEMU_ENABLE_SEV=false \
 MANAGER_QEMU_ENABLE_SEV_SNP=true \
 MANAGER_QEMU_SEV_CBITPOS=51 \
 MANAGER_QEMU_BIN_PATH=<path to QEMU binary> \
-MANAGER_QEMU_QEMU_OVMF_CODE_FILE=<path to OVMF.fd Amd Sev built package> \
+MANAGER_QEMU_QEMU_OVMF_CODE_FILE=<path to OVMF Amd Sev built package> \
 ./build/cocos-manager
 ```
 
@@ -205,10 +203,10 @@ MANAGER_QEMU_KERNEL_HASH=true \
 
 ### Verifying VM launch
 
-NB: To verify that the manager successfully launched the VM, you need to open three terminals on the same machine. In one terminal, you need to launch the computations server by executing (with the environment variables of choice):
+NB: To verify that the manager successfully launched the VM, you need to open three terminals on the same machine. In one terminal, you need to launch the Manager test server by executing (with the environment variables of choice):
 
 ```bash
-go run ./test/computations/main.go <dataset path> <algo path>
+go run ./test/manager-server/main.go
 ```
 
 and in the second the manager by executing (with the environment variables of choice):
@@ -217,7 +215,7 @@ and in the second the manager by executing (with the environment variables of ch
 go run ./cmd/manager/main.go
 ```
 
-Ensure that the Manager can connect to the Manager test server by setting the MANAGER_GRPC_PORT with the port value of the Manager test server. In the last terminal, you can run the verification commands.
+Ensure that the Manager can connect to the Manager test server by setting the MANAGER_GRPC_PORT with the port value of the Manager test server. The Manager test server is listening on the default value of the MANAGER_GRPC_PORT. In the last one, you can run the verification commands.
 
 To verify that the manager launched the VM successfully, run the following command:
 

manager/api/grpc/client.go

@@ -4,15 +4,12 @@ package grpc
 
 import (
 	"context"
-	"errors"
 
 	"github.com/ultravioletrs/cocos/manager"
 	pkgmanager "github.com/ultravioletrs/cocos/pkg/manager"
 	"golang.org/x/sync/errgroup"
 )
 
-var errTerminationFromServer = errors.New("server requested client termination")
-
 type ManagerClient struct {
 	stream    pkgmanager.ManagerService_ProcessClient
 	svc       manager.Service
@@ -28,7 +25,7 @@ func NewClient(stream pkgmanager.ManagerService_ProcessClient, svc manager.Servi
 	}
 }
 
-func (client ManagerClient) Process(ctx context.Context, cancel context.CancelFunc) error {
+func (client ManagerClient) Process(ctx context.Context) error {
 	eg, ctx := errgroup.WithContext(ctx)
 
 	eg.Go(func() error {
@@ -37,34 +34,24 @@ func (client ManagerClient) Process(ctx context.Context, cancel context.CancelFu
 			if err != nil {
 				return err
 			}
-			switch mes := req.Message.(type) {
-			case *pkgmanager.ServerStreamMessage_RunReq:
-				port, err := client.svc.Run(ctx, mes.RunReq)
-				if err != nil {
-					return err
-				}
-				runRes := &pkgmanager.ClientStreamMessage_RunRes{RunRes: &pkgmanager.RunResponse{AgentPort: port, ComputationId: mes.RunReq.Id}}
-				if err := client.stream.Send(&pkgmanager.ClientStreamMessage{Message: runRes}); err != nil {
-					return err
-				}
-			case *pkgmanager.ServerStreamMessage_TerminateReq:
-				cancel()
-				return errors.Join(errTerminationFromServer, errors.New(mes.TerminateReq.Message))
+			port, err := client.svc.Run(ctx, req)
+			if err != nil {
+				return err
+			}
+			runRes := &pkgmanager.ClientStreamMessage_RunRes{RunRes: &pkgmanager.RunResponse{AgentPort: port, ComputationId: req.Id}}
+			if err := client.stream.Send(&pkgmanager.ClientStreamMessage{Message: runRes}); err != nil {
+				return err
 			}
 		}
 	})
 
 	eg.Go(func() error {
-		for {
-			select {
-			case <-ctx.Done():
-				return nil
-			case mes := <-client.responses:
-				if err := client.stream.Send(mes); err != nil {
-					return err
-				}
+		for mes := range client.responses {
+			if err := client.stream.Send(mes); err != nil {
+				return err
 			}
 		}
+		return nil
 	})
 
 	return eg.Wait()

manager/api/grpc/server.go

@@ -3,39 +3,40 @@
 package grpc
 
 import (
+	"context"
+
 	"github.com/ultravioletrs/cocos/pkg/manager"
 	"golang.org/x/sync/errgroup"
-	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/peer"
 )
 
-var _ manager.ManagerServiceServer = (*grpcServer)(nil)
-
 type grpcServer struct {
 	manager.UnimplementedManagerServiceServer
 	incoming chan *manager.ClientStreamMessage
 	svc      Service
+	ctx      context.Context
 }
 
 type Service interface {
-	Run(ipAddress string, runReqChan chan *manager.ServerStreamMessage, authInfo credentials.AuthInfo)
+	Run(ipAddress string, runReqChan chan *manager.ComputationRunReq)
 }
 
 // NewServer returns new AuthServiceServer instance.
-func NewServer(incoming chan *manager.ClientStreamMessage, svc Service) manager.ManagerServiceServer {
+func NewServer(ctx context.Context, incoming chan *manager.ClientStreamMessage, svc Service) manager.ManagerServiceServer {
 	return &grpcServer{
 		incoming: incoming,
 		svc:      svc,
+		ctx:      ctx,
 	}
 }
 
 func (s *grpcServer) Process(stream manager.ManagerService_ProcessServer) error {
-	runReqChan := make(chan *manager.ServerStreamMessage)
+	runReqChan := make(chan *manager.ComputationRunReq)
 	client, ok := peer.FromContext(stream.Context())
 	if ok {
-		go s.svc.Run(client.Addr.String(), runReqChan, client.AuthInfo)
+		go s.svc.Run(client.Addr.String(), runReqChan)
 	}
-	eg, ctx := errgroup.WithContext(stream.Context())
+	eg, _ := errgroup.WithContext(s.ctx)
 
 	eg.Go(func() error {
 		for {
@@ -49,16 +50,12 @@ func (s *grpcServer) Process(stream manager.ManagerService_ProcessServer) error
 	})
 
 	eg.Go(func() error {
-		for {
-			select {
-			case <-ctx.Done():
-				return nil
-			case req := <-runReqChan:
-				if err := stream.Send(req); err != nil {
-					return err
-				}
+		for runReq := range runReqChan {
+			if err := stream.Send(runReq); err != nil {
+				return err
 			}
 		}
+		return nil
 	})
 	return eg.Wait()
 }

manager/manager.proto

@@ -10,11 +10,7 @@ package manager;
 option go_package = "./manager";
 
 service ManagerService {
-  rpc Process(stream ClientStreamMessage) returns (stream ServerStreamMessage) {}
-}
-
-message Terminate {
-  string message = 1;
+  rpc Process(stream ClientStreamMessage) returns (stream ComputationRunReq) {}
 }
 
 message RunResponse{
@@ -46,35 +42,26 @@ message ClientStreamMessage {
   }
 }
 
-message ServerStreamMessage {
-  oneof message {
-    ComputationRunReq runReq = 1;
-    Terminate terminateReq = 2;
-  }
-}
-
 message ComputationRunReq {
   string id = 1;
   string name = 2;
   string description = 3;
   repeated Dataset datasets = 4;
-  Algorithm algorithm = 5;
-  repeated ResultConsumer result_consumers = 6;
+  repeated Algorithm algorithms = 5;
+  repeated string result_consumers = 6;
   AgentConfig agent_config = 7;
 }
 
-message ResultConsumer {
-  bytes userKey = 1;
-}
-
 message Dataset {
-  bytes hash = 1; // should be sha3.Sum256, 32 byte length.
-  bytes userKey = 2;
+  string provider = 1;
+  string id = 2;
+  bytes hash = 3; // should be sha3.Sum256, 32 byte length.
 }
 
 message Algorithm {
-  bytes hash = 1; // should be sha3.Sum256, 32 byte length.
-  bytes userKey = 2;
+  string provider = 1;
+  string id = 2;
+  bytes hash = 3; // should be sha3.Sum256, 32 byte length.
 }
 
 message AgentConfig {
@@ -85,6 +72,4 @@ message AgentConfig {
   string client_ca_file = 5;
   string server_ca_file = 6;
   string log_level = 7;
-  bool   attested_tls = 8;
 }
-

manager/qemu/config.go

@@ -55,7 +55,7 @@ type SevConfig struct {
 type VSockConfig struct {
 	ID       string `env:"VSOCK_ID"        envDefault:"vhost-vsock-pci0"`
 	GuestCID int    `env:"VSOCK_GUEST_CID" envDefault:"3"`
-	Vnc      int    `env:"VSOCK_VNC"       envDefault:"0"`
+	vnc      int    `env:"VSOCK_VNC"       envDefault:"0"`
 }
 
 type Config struct {
@@ -157,7 +157,7 @@ func constructQemuArgs(config Config) []string {
 			config.VirtioNetPciConfig.ROMFile))
 
 	args = append(args, "-device", fmt.Sprintf("vhost-vsock-pci,id=%s,guest-cid=%d", config.VSockConfig.ID, config.VSockConfig.GuestCID))
-	args = append(args, "-vnc", fmt.Sprintf(":%d", config.Vnc))
+	args = append(args, "-vnc", fmt.Sprintf(":%d", config.vnc))
 
 	if config.EnableSEVSNP {
 		args = append(args, "-object",

manager/qemu/qemu.go

@@ -18,7 +18,7 @@ const (
 )
 
 func CreateVM(ctx context.Context, cfg Config) (*exec.Cmd, error) {
-	// Create unique emu device identifiers
+	// Create unique emu device identifiers.
 	id, err := uuid.NewV4()
 	if err != nil {
 		return &exec.Cmd{}, err
@@ -27,20 +27,18 @@ func CreateVM(ctx context.Context, cfg Config) (*exec.Cmd, error) {
 	qemuCfg.NetDevConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.NetDevConfig.ID, id)
 	qemuCfg.SevConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.SevConfig.ID, id)
 
-	if !cfg.KernelHash {
-		// Copy firmware vars file
-		srcFile := qemuCfg.OVMFVarsConfig.File
-		dstFile := fmt.Sprintf("%s/%s-%s.fd", cfg.TmpFileLoc, firmwareVars, id)
-		err = internal.CopyFile(srcFile, dstFile)
-		if err != nil {
-			return &exec.Cmd{}, err
-		}
-		qemuCfg.OVMFVarsConfig.File = dstFile
+	// Copy firmware vars file.
+	srcFile := qemuCfg.OVMFVarsConfig.File
+	dstFile := fmt.Sprintf("%s/%s-%s.fd", cfg.TmpFileLoc, firmwareVars, id)
+	err = internal.CopyFile(srcFile, dstFile)
+	if err != nil {
+		return &exec.Cmd{}, err
 	}
+	qemuCfg.OVMFVarsConfig.File = dstFile
 
-	// Copy img files
-	srcFile := qemuCfg.DiskImgConfig.KernelFile
-	dstFile := fmt.Sprintf("%s/%s-%s", cfg.TmpFileLoc, KernelFile, id)
+	// Copy img files.
+	srcFile = qemuCfg.DiskImgConfig.KernelFile
+	dstFile = fmt.Sprintf("%s/%s-%s", cfg.TmpFileLoc, KernelFile, id)
 	err = internal.CopyFile(srcFile, dstFile)
 	if err != nil {
 		return &exec.Cmd{}, err

manager/service.go

@@ -70,9 +70,10 @@ func New(qemuCfg qemu.Config, logger *slog.Logger, eventsChan chan *manager.Clie
 func (ms *managerService) Run(ctx context.Context, c *manager.ComputationRunReq) (string, error) {
 	ms.publishEvent("vm-provision", c.Id, "starting", json.RawMessage{})
 	ac := agent.Computation{
-		ID:          c.Id,
-		Name:        c.Name,
-		Description: c.Description,
+		ID:              c.Id,
+		Name:            c.Name,
+		Description:     c.Description,
+		ResultConsumers: c.ResultConsumers,
 		AgentConfig: agent.AgentConfig{
 			Port:         c.AgentConfig.Port,
 			Host:         c.AgentConfig.Host,
@@ -83,18 +84,19 @@ func (ms *managerService) Run(ctx context.Context, c *manager.ComputationRunReq)
 			LogLevel:     c.AgentConfig.LogLevel,
 		},
 	}
-	ac.Algorithm = agent.Algorithm{Hash: [hashLength]byte(c.Algorithm.Hash), UserKey: c.Algorithm.UserKey}
-
+	for _, algo := range c.Algorithms {
+		if len(algo.Hash) != hashLength {
+			ms.publishEvent("vm-provision", c.Id, "failed", json.RawMessage{})
+			return "", errInvalidHashLength
+		}
+		ac.Algorithms = append(ac.Algorithms, agent.Algorithm{ID: algo.Id, Provider: algo.Provider, Hash: [hashLength]byte(algo.Hash)})
+	}
 	for _, data := range c.Datasets {
 		if len(data.Hash) != hashLength {
 			ms.publishEvent("vm-provision", c.Id, "failed", json.RawMessage{})
 			return "", errInvalidHashLength
 		}
-		ac.Datasets = append(ac.Datasets, agent.Dataset{Hash: [hashLength]byte(data.Hash), UserKey: data.UserKey})
-	}
-
-	for _, rc := range c.ResultConsumers {
-		ac.ResultConsumers = append(ac.ResultConsumers, agent.ResultConsumer{UserKey: rc.UserKey})
+		ac.Datasets = append(ac.Datasets, agent.Dataset{ID: data.Id, Provider: data.Provider, Hash: [hashLength]byte(data.Hash)})
 	}
 
 	agentPort, err := getFreePort()
@@ -119,7 +121,6 @@ func (ms *managerService) Run(ctx context.Context, c *manager.ComputationRunReq)
 		return "", err
 	}
 	ms.qemuCfg.VSockConfig.GuestCID++
-	ms.qemuCfg.VSockConfig.Vnc++
 
 	ms.publishEvent("vm-provision", c.Id, "complete", json.RawMessage{})
 	return fmt.Sprint(ms.qemuCfg.HostFwdAgent), nil

pkg/clients/grpc/agent/agent.go

@@ -4,6 +4,7 @@ package agent
 
 import (
 	"github.com/ultravioletrs/cocos/agent"
+	agentapi "github.com/ultravioletrs/cocos/agent/api/grpc"
 	"github.com/ultravioletrs/cocos/pkg/clients/grpc"
 )
 
@@ -14,5 +15,5 @@ func NewAgentClient(cfg grpc.Config) (grpc.Client, agent.AgentServiceClient, err
 		return nil, nil, err
 	}
 
-	return client, agent.NewAgentServiceClient(client.Connection()), nil
+	return client, agentapi.NewClient(client.Connection(), cfg.Timeout), nil
 }

pkg/clients/grpc/connect.go

@@ -5,20 +5,12 @@ package grpc
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"encoding/asn1"
-	"encoding/json"
 	"fmt"
 	"os"
 	"time"
 
 	"github.com/absmach/magistrala/pkg/errors"
-	"github.com/google/go-sev-guest/abi"
-	"github.com/google/go-sev-guest/proto/check"
-	"github.com/google/go-sev-guest/validate"
-	"github.com/google/go-sev-guest/verify"
-	"github.com/google/go-sev-guest/verify/trust"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
-	"golang.org/x/crypto/sha3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
@@ -33,22 +25,8 @@ const (
 )
 
 var (
-	errGrpcConnect      = errors.New("failed to connect to grpc server")
-	errGrpcClose        = errors.New("failed to close grpc connection")
-	errManifestOpen     = errors.New("failed to open Manifest")
-	errManifestMissing  = errors.New("failed due to missing Manifest")
-	errManifestDecode   = errors.New("failed to decode Manifest json")
-	errCertificateParse = errors.New("failed to parse x509 certificate")
-	errAttVerification  = errors.New("attestation verification failed")
-	errAttValidation    = errors.New("attestation validation failed")
-	errCustomExtension  = errors.New("failed due to missing custom extension")
-)
-
-var (
-	customSEVSNPExtensionOID = asn1.ObjectIdentifier{1, 2, 3, 4, 5, 6}
-	attestationConfiguration = AttestationConfiguration{}
-	timeout                  = time.Minute * 2
-	maxTryDelay              = time.Second * 30
+	errGrpcConnect = errors.New("failed to connect to grpc server")
+	errGrpcClose   = errors.New("failed to close grpc connection")
 )
 
 type Config struct {
@@ -57,13 +35,6 @@ type Config struct {
 	ServerCAFile string        `env:"SERVER_CA_CERTS" envDefault:""`
 	URL          string        `env:"URL"             envDefault:"localhost:7001"`
 	Timeout      time.Duration `env:"TIMEOUT"         envDefault:"60s"`
-	AttestedTLS  bool          `env:"ATTESTED_TLS"    envDefault:"false"`
-	Manifest     string        `env:"MANIFEST"        envDefault:""`
-}
-
-type AttestationConfiguration struct {
-	SNPPolicy   *check.Policy      `json:"snp_policy,omitempty"`
-	RootOFTrust *check.RootOfTrust `json:"root_of_trust,omitempty"`
 }
 
 type Client interface {
@@ -131,47 +102,34 @@ func connect(cfg Config) (*grpc.ClientConn, security, error) {
 	secure := withoutTLS
 	tc := insecure.NewCredentials()
 
-	if cfg.AttestedTLS {
-		err := readManifest(cfg)
+	if cfg.ServerCAFile != "" {
+		tlsConfig := &tls.Config{}
+
+		// Loading root ca certificates file
+		rootCA, err := os.ReadFile(cfg.ServerCAFile)
 		if err != nil {
-			return nil, secure, fmt.Errorf("failed to read Manifest %w", err)
+			return nil, secure, fmt.Errorf("failed to load root ca file: %w", err)
+		}
+		if len(rootCA) > 0 {
+			capool := x509.NewCertPool()
+			if !capool.AppendCertsFromPEM(rootCA) {
+				return nil, secure, fmt.Errorf("failed to append root ca to tls.Config")
+			}
+			tlsConfig.RootCAs = capool
+			secure = withTLS
 		}
 
-		tlsConfig := &tls.Config{
-			InsecureSkipVerify:    true,
-			VerifyPeerCertificate: verifyAttestationReportTLS,
-		}
-		tc = credentials.NewTLS(tlsConfig)
-	} else {
-		if cfg.ServerCAFile != "" {
-			tlsConfig := &tls.Config{}
-
-			// Loading root ca certificates file
-			rootCA, err := os.ReadFile(cfg.ServerCAFile)
+		// Loading mtls certificates file
+		if cfg.ClientCert != "" || cfg.ClientKey != "" {
+			certificate, err := tls.LoadX509KeyPair(cfg.ClientCert, cfg.ClientKey)
 			if err != nil {
-				return nil, secure, fmt.Errorf("failed to load root ca file: %w", err)
+				return nil, secure, fmt.Errorf("failed to client certificate and key %w", err)
 			}
-			if len(rootCA) > 0 {
-				capool := x509.NewCertPool()
-				if !capool.AppendCertsFromPEM(rootCA) {
-					return nil, secure, fmt.Errorf("failed to append root ca to tls.Config")
-				}
-				tlsConfig.RootCAs = capool
-				secure = withTLS
-			}
-
-			// Loading mTLS certificates file
-			if cfg.ClientCert != "" || cfg.ClientKey != "" {
-				certificate, err := tls.LoadX509KeyPair(cfg.ClientCert, cfg.ClientKey)
-				if err != nil {
-					return nil, secure, fmt.Errorf("failed to client certificate and key %w", err)
-				}
-				tlsConfig.Certificates = []tls.Certificate{certificate}
-				secure = withmTLS
-			}
-
-			tc = credentials.NewTLS(tlsConfig)
+			tlsConfig.Certificates = []tls.Certificate{certificate}
+			secure = withmTLS
 		}
+
+		tc = credentials.NewTLS(tlsConfig)
 	}
 
 	opts = append(opts, grpc.WithTransportCredentials(tc))
@@ -182,99 +140,3 @@ func connect(cfg Config) (*grpc.ClientConn, security, error) {
 	}
 	return conn, secure, nil
 }
-
-func readManifest(cfg Config) error {
-	if cfg.Manifest != "" {
-		manifest, err := os.Open(cfg.Manifest)
-		if err != nil {
-			return errors.Wrap(errManifestOpen, err)
-		}
-		defer manifest.Close()
-
-		decoder := json.NewDecoder(manifest)
-		err = decoder.Decode(&attestationConfiguration)
-		if err != nil {
-			return errors.Wrap(errManifestDecode, err)
-		}
-
-		return nil
-	}
-
-	return errManifestMissing
-}
-
-func verifyAttestationReportTLS(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
-	cert, err := x509.ParseCertificate(rawCerts[0])
-	if err != nil {
-		return errors.Wrap(errCertificateParse, err)
-	}
-
-	for _, ext := range cert.Extensions {
-		if ext.Id.Equal(customSEVSNPExtensionOID) {
-			// Check if the certificate is self-signed
-			err := checkIfCertificateSelfSigned(cert)
-			if err != nil {
-				return errors.Wrap(errAttVerification, err)
-			}
-
-			publicKeyBytes, err := x509.MarshalPKIXPublicKey(cert.PublicKey)
-			if err != nil {
-				return errors.Wrap(errAttVerification, err)
-			}
-
-			expectedReportData := sha3.Sum512(publicKeyBytes)
-			attestationConfiguration.SNPPolicy.ReportData = expectedReportData[:]
-
-			// Attestation verification and validation
-			sopts, err := verify.RootOfTrustToOptions(attestationConfiguration.RootOFTrust)
-			if err != nil {
-				return errors.Wrap(errAttVerification, err)
-			}
-
-			sopts.Product = attestationConfiguration.SNPPolicy.Product
-			sopts.Getter = &trust.RetryHTTPSGetter{
-				Timeout:       timeout,
-				MaxRetryDelay: maxTryDelay,
-				Getter:        &trust.SimpleHTTPSGetter{},
-			}
-
-			attestationPB, err := abi.ReportCertsToProto(ext.Value)
-			if err != nil {
-				return errors.Wrap(errAttVerification, err)
-			}
-
-			if err = verify.SnpAttestation(attestationPB, sopts); err != nil {
-				return errors.Wrap(errAttVerification, err)
-			}
-
-			opts, err := validate.PolicyToOptions(attestationConfiguration.SNPPolicy)
-			if err != nil {
-				return errors.Wrap(errAttVerification, err)
-			}
-
-			if err = validate.SnpAttestation(attestationPB, opts); err != nil {
-				return errors.Wrap(errAttValidation, err)
-			}
-
-			return nil
-		}
-	}
-
-	return errCustomExtension
-}
-
-func checkIfCertificateSelfSigned(cert *x509.Certificate) error {
-	certPool := x509.NewCertPool()
-	certPool.AddCert(cert)
-
-	opts := x509.VerifyOptions{
-		Roots:       certPool,
-		CurrentTime: time.Now(),
-	}
-
-	if _, err := cert.Verify(opts); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/manager/manager.pb.go

@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.33.0
+// 	protoc-gen-go v1.31.0
 // 	protoc        v4.25.3
 // source: manager/manager.proto
 
@@ -24,53 +24,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type Terminate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
-}
-
-func (x *Terminate) Reset() {
-	*x = Terminate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Terminate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Terminate) ProtoMessage() {}
-
-func (x *Terminate) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Terminate.ProtoReflect.Descriptor instead.
-func (*Terminate) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Terminate) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
 type RunResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -83,7 +36,7 @@ type RunResponse struct {
 func (x *RunResponse) Reset() {
 	*x = RunResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[1]
+		mi := &file_manager_manager_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -96,7 +49,7 @@ func (x *RunResponse) String() string {
 func (*RunResponse) ProtoMessage() {}
 
 func (x *RunResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[1]
+	mi := &file_manager_manager_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -109,7 +62,7 @@ func (x *RunResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RunResponse.ProtoReflect.Descriptor instead.
 func (*RunResponse) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{1}
+	return file_manager_manager_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *RunResponse) GetAgentPort() string {
@@ -142,7 +95,7 @@ type AgentEvent struct {
 func (x *AgentEvent) Reset() {
 	*x = AgentEvent{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[2]
+		mi := &file_manager_manager_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -155,7 +108,7 @@ func (x *AgentEvent) String() string {
 func (*AgentEvent) ProtoMessage() {}
 
 func (x *AgentEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[2]
+	mi := &file_manager_manager_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -168,7 +121,7 @@ func (x *AgentEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AgentEvent.ProtoReflect.Descriptor instead.
 func (*AgentEvent) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{2}
+	return file_manager_manager_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *AgentEvent) GetEventType() string {
@@ -227,7 +180,7 @@ type AgentLog struct {
 func (x *AgentLog) Reset() {
 	*x = AgentLog{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[3]
+		mi := &file_manager_manager_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -240,7 +193,7 @@ func (x *AgentLog) String() string {
 func (*AgentLog) ProtoMessage() {}
 
 func (x *AgentLog) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[3]
+	mi := &file_manager_manager_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -253,7 +206,7 @@ func (x *AgentLog) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AgentLog.ProtoReflect.Descriptor instead.
 func (*AgentLog) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{3}
+	return file_manager_manager_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *AgentLog) GetMessage() string {
@@ -300,7 +253,7 @@ type ClientStreamMessage struct {
 func (x *ClientStreamMessage) Reset() {
 	*x = ClientStreamMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[4]
+		mi := &file_manager_manager_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -313,7 +266,7 @@ func (x *ClientStreamMessage) String() string {
 func (*ClientStreamMessage) ProtoMessage() {}
 
 func (x *ClientStreamMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[4]
+	mi := &file_manager_manager_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -326,7 +279,7 @@ func (x *ClientStreamMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ClientStreamMessage.ProtoReflect.Descriptor instead.
 func (*ClientStreamMessage) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{4}
+	return file_manager_manager_proto_rawDescGZIP(), []int{3}
 }
 
 func (m *ClientStreamMessage) GetMessage() isClientStreamMessage_Message {
@@ -379,105 +332,24 @@ func (*ClientStreamMessage_AgentEvent) isClientStreamMessage_Message() {}
 
 func (*ClientStreamMessage_RunRes) isClientStreamMessage_Message() {}
 
-type ServerStreamMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Message:
-	//
-	//	*ServerStreamMessage_RunReq
-	//	*ServerStreamMessage_TerminateReq
-	Message isServerStreamMessage_Message `protobuf_oneof:"message"`
-}
-
-func (x *ServerStreamMessage) Reset() {
-	*x = ServerStreamMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServerStreamMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServerStreamMessage) ProtoMessage() {}
-
-func (x *ServerStreamMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServerStreamMessage.ProtoReflect.Descriptor instead.
-func (*ServerStreamMessage) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{5}
-}
-
-func (m *ServerStreamMessage) GetMessage() isServerStreamMessage_Message {
-	if m != nil {
-		return m.Message
-	}
-	return nil
-}
-
-func (x *ServerStreamMessage) GetRunReq() *ComputationRunReq {
-	if x, ok := x.GetMessage().(*ServerStreamMessage_RunReq); ok {
-		return x.RunReq
-	}
-	return nil
-}
-
-func (x *ServerStreamMessage) GetTerminateReq() *Terminate {
-	if x, ok := x.GetMessage().(*ServerStreamMessage_TerminateReq); ok {
-		return x.TerminateReq
-	}
-	return nil
-}
-
-type isServerStreamMessage_Message interface {
-	isServerStreamMessage_Message()
-}
-
-type ServerStreamMessage_RunReq struct {
-	RunReq *ComputationRunReq `protobuf:"bytes,1,opt,name=runReq,proto3,oneof"`
-}
-
-type ServerStreamMessage_TerminateReq struct {
-	TerminateReq *Terminate `protobuf:"bytes,2,opt,name=terminateReq,proto3,oneof"`
-}
-
-func (*ServerStreamMessage_RunReq) isServerStreamMessage_Message() {}
-
-func (*ServerStreamMessage_TerminateReq) isServerStreamMessage_Message() {}
-
 type ComputationRunReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id              string            `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name            string            `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Description     string            `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
-	Datasets        []*Dataset        `protobuf:"bytes,4,rep,name=datasets,proto3" json:"datasets,omitempty"`
-	Algorithm       *Algorithm        `protobuf:"bytes,5,opt,name=algorithm,proto3" json:"algorithm,omitempty"`
-	ResultConsumers []*ResultConsumer `protobuf:"bytes,6,rep,name=result_consumers,json=resultConsumers,proto3" json:"result_consumers,omitempty"`
-	AgentConfig     *AgentConfig      `protobuf:"bytes,7,opt,name=agent_config,json=agentConfig,proto3" json:"agent_config,omitempty"`
+	Id              string       `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Name            string       `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Description     string       `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	Datasets        []*Dataset   `protobuf:"bytes,4,rep,name=datasets,proto3" json:"datasets,omitempty"`
+	Algorithms      []*Algorithm `protobuf:"bytes,5,rep,name=algorithms,proto3" json:"algorithms,omitempty"`
+	ResultConsumers []string     `protobuf:"bytes,6,rep,name=result_consumers,json=resultConsumers,proto3" json:"result_consumers,omitempty"`
+	AgentConfig     *AgentConfig `protobuf:"bytes,7,opt,name=agent_config,json=agentConfig,proto3" json:"agent_config,omitempty"`
 }
 
 func (x *ComputationRunReq) Reset() {
 	*x = ComputationRunReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[6]
+		mi := &file_manager_manager_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -490,7 +362,7 @@ func (x *ComputationRunReq) String() string {
 func (*ComputationRunReq) ProtoMessage() {}
 
 func (x *ComputationRunReq) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[6]
+	mi := &file_manager_manager_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -503,7 +375,7 @@ func (x *ComputationRunReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComputationRunReq.ProtoReflect.Descriptor instead.
 func (*ComputationRunReq) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{6}
+	return file_manager_manager_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *ComputationRunReq) GetId() string {
@@ -534,14 +406,14 @@ func (x *ComputationRunReq) GetDatasets() []*Dataset {
 	return nil
 }
 
-func (x *ComputationRunReq) GetAlgorithm() *Algorithm {
+func (x *ComputationRunReq) GetAlgorithms() []*Algorithm {
 	if x != nil {
-		return x.Algorithm
+		return x.Algorithms
 	}
 	return nil
 }
 
-func (x *ComputationRunReq) GetResultConsumers() []*ResultConsumer {
+func (x *ComputationRunReq) GetResultConsumers() []string {
 	if x != nil {
 		return x.ResultConsumers
 	}
@@ -555,66 +427,20 @@ func (x *ComputationRunReq) GetAgentConfig() *AgentConfig {
 	return nil
 }
 
-type ResultConsumer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserKey []byte `protobuf:"bytes,1,opt,name=userKey,proto3" json:"userKey,omitempty"`
-}
-
-func (x *ResultConsumer) Reset() {
-	*x = ResultConsumer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ResultConsumer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ResultConsumer) ProtoMessage() {}
-
-func (x *ResultConsumer) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ResultConsumer.ProtoReflect.Descriptor instead.
-func (*ResultConsumer) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *ResultConsumer) GetUserKey() []byte {
-	if x != nil {
-		return x.UserKey
-	}
-	return nil
-}
-
 type Dataset struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Hash    []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` // should be sha3.Sum256, 32 byte length.
-	UserKey []byte `protobuf:"bytes,2,opt,name=userKey,proto3" json:"userKey,omitempty"`
+	Provider string `protobuf:"bytes,1,opt,name=provider,proto3" json:"provider,omitempty"`
+	Id       string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	Hash     []byte `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash,omitempty"` // should be sha3.Sum256, 32 byte length.
 }
 
 func (x *Dataset) Reset() {
 	*x = Dataset{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[8]
+		mi := &file_manager_manager_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -627,7 +453,7 @@ func (x *Dataset) String() string {
 func (*Dataset) ProtoMessage() {}
 
 func (x *Dataset) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[8]
+	mi := &file_manager_manager_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -640,7 +466,21 @@ func (x *Dataset) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Dataset.ProtoReflect.Descriptor instead.
 func (*Dataset) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{8}
+	return file_manager_manager_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *Dataset) GetProvider() string {
+	if x != nil {
+		return x.Provider
+	}
+	return ""
+}
+
+func (x *Dataset) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
 }
 
 func (x *Dataset) GetHash() []byte {
@@ -650,26 +490,20 @@ func (x *Dataset) GetHash() []byte {
 	return nil
 }
 
-func (x *Dataset) GetUserKey() []byte {
-	if x != nil {
-		return x.UserKey
-	}
-	return nil
-}
-
 type Algorithm struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Hash    []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` // should be sha3.Sum256, 32 byte length.
-	UserKey []byte `protobuf:"bytes,2,opt,name=userKey,proto3" json:"userKey,omitempty"`
+	Provider string `protobuf:"bytes,1,opt,name=provider,proto3" json:"provider,omitempty"`
+	Id       string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	Hash     []byte `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash,omitempty"` // should be sha3.Sum256, 32 byte length.
 }
 
 func (x *Algorithm) Reset() {
 	*x = Algorithm{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[9]
+		mi := &file_manager_manager_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -682,7 +516,7 @@ func (x *Algorithm) String() string {
 func (*Algorithm) ProtoMessage() {}
 
 func (x *Algorithm) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[9]
+	mi := &file_manager_manager_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -695,7 +529,21 @@ func (x *Algorithm) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Algorithm.ProtoReflect.Descriptor instead.
 func (*Algorithm) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{9}
+	return file_manager_manager_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *Algorithm) GetProvider() string {
+	if x != nil {
+		return x.Provider
+	}
+	return ""
+}
+
+func (x *Algorithm) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
 }
 
 func (x *Algorithm) GetHash() []byte {
@@ -705,13 +553,6 @@ func (x *Algorithm) GetHash() []byte {
 	return nil
 }
 
-func (x *Algorithm) GetUserKey() []byte {
-	if x != nil {
-		return x.UserKey
-	}
-	return nil
-}
-
 type AgentConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -724,13 +565,12 @@ type AgentConfig struct {
 	ClientCaFile string `protobuf:"bytes,5,opt,name=client_ca_file,json=clientCaFile,proto3" json:"client_ca_file,omitempty"`
 	ServerCaFile string `protobuf:"bytes,6,opt,name=server_ca_file,json=serverCaFile,proto3" json:"server_ca_file,omitempty"`
 	LogLevel     string `protobuf:"bytes,7,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"`
-	AttestedTls  bool   `protobuf:"varint,8,opt,name=attested_tls,json=attestedTls,proto3" json:"attested_tls,omitempty"`
 }
 
 func (x *AgentConfig) Reset() {
 	*x = AgentConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_manager_manager_proto_msgTypes[10]
+		mi := &file_manager_manager_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -743,7 +583,7 @@ func (x *AgentConfig) String() string {
 func (*AgentConfig) ProtoMessage() {}
 
 func (x *AgentConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_manager_manager_proto_msgTypes[10]
+	mi := &file_manager_manager_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -756,7 +596,7 @@ func (x *AgentConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AgentConfig.ProtoReflect.Descriptor instead.
 func (*AgentConfig) Descriptor() ([]byte, []int) {
-	return file_manager_manager_proto_rawDescGZIP(), []int{10}
+	return file_manager_manager_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *AgentConfig) GetPort() string {
@@ -808,13 +648,6 @@ func (x *AgentConfig) GetLogLevel() string {
 	return ""
 }
 
-func (x *AgentConfig) GetAttestedTls() bool {
-	if x != nil {
-		return x.AttestedTls
-	}
-	return false
-}
-
 var File_manager_manager_proto protoreflect.FileDescriptor
 
 var file_manager_manager_proto_rawDesc = []byte{
@@ -822,112 +655,96 @@ var file_manager_manager_proto_rawDesc = []byte{
 	0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
 	0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
 	0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0x25, 0x0a, 0x09, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x53, 0x0a, 0x0b, 0x52, 0x75, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
-	0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xde, 0x01,
-	0x0a, 0x0a, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a,
-	0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x38, 0x0a, 0x09, 0x74,
-	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x6f, 0x22, 0x53, 0x0a, 0x0b, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12,
+	0x25, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xde, 0x01, 0x0a, 0x0a, 0x41, 0x67, 0x65, 0x6e, 0x74,
+	0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x76, 0x65, 0x6e, 0x74,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x25,
+	0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12,
+	0x1e, 0x0a, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12,
+	0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x9b, 0x01, 0x0a, 0x08, 0x41, 0x67, 0x65, 0x6e,
+	0x74, 0x4c, 0x6f, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x25,
+	0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x38, 0x0a, 0x09, 0x74,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
 	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63,
-	0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
-	0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x64,
-	0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e,
-	0x61, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x72, 0x69, 0x67,
-	0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x9b,
-	0x01, 0x0a, 0x08, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63,
-	0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05,
-	0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76,
-	0x65, 0x6c, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xbb, 0x01, 0x0a,
-	0x13, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x30, 0x0a, 0x09, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x6f,
-	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
-	0x72, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x48, 0x00, 0x52, 0x08, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x12, 0x36, 0x0a, 0x0b, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f,
-	0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x48, 0x00, 0x52, 0x0a, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f,
-	0x0a, 0x07, 0x72, 0x75, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x14, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x42,
-	0x09, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x90, 0x01, 0x0a, 0x13, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x12, 0x34, 0x0a, 0x06, 0x72, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d,
-	0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x48, 0x00,
-	0x52, 0x06, 0x72, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x38, 0x0a, 0x0c, 0x74, 0x65, 0x72, 0x6d,
-	0x69, 0x6e, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,
-	0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61,
-	0x74, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x52,
-	0x65, 0x71, 0x42, 0x09, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xb6, 0x02,
-	0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6e,
-	0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x0a, 0x08, 0x64, 0x61, 0x74,
-	0x61, 0x73, 0x65, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x08, 0x64,
-	0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x09, 0x61, 0x6c, 0x67, 0x6f, 0x72,
-	0x69, 0x74, 0x68, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x72, 0x2e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x52, 0x09,
-	0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x42, 0x0a, 0x10, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x06, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x52, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x52, 0x0f, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x73, 0x12, 0x37, 0x0a,
-	0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x41, 0x67,
-	0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x2a, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72,
-	0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x4b,
-	0x65, 0x79, 0x22, 0x37, 0x0a, 0x07, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a,
-	0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73,
-	0x68, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x22, 0x39, 0x0a, 0x09, 0x41,
-	0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07,
-	0x75, 0x73, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x75,
-	0x73, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x22, 0xf9, 0x01, 0x0a, 0x0b, 0x41, 0x67, 0x65, 0x6e, 0x74,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f,
-	0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x1b,
-	0x0a, 0x09, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x63, 0x65, 0x72, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6b,
-	0x65, 0x79, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b,
-	0x65, 0x79, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x5f, 0x63, 0x61, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x61, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x24, 0x0a, 0x0e,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x61, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x61, 0x46, 0x69,
-	0x6c, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12,
-	0x21, 0x0a, 0x0c, 0x61, 0x74, 0x74, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x6c, 0x73, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x61, 0x74, 0x74, 0x65, 0x73, 0x74, 0x65, 0x64, 0x54,
-	0x6c, 0x73, 0x32, 0x5d, 0x0a, 0x0e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x12, 0x4b, 0x0a, 0x07, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x12,
-	0x1c, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x1c, 0x2e,
-	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30,
-	0x01, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xbb, 0x01, 0x0a, 0x13, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x30, 0x0a,
+	0x09, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x11, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x41, 0x67, 0x65, 0x6e, 0x74,
+	0x4c, 0x6f, 0x67, 0x48, 0x00, 0x52, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x12,
+	0x36, 0x0a, 0x0b, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x41,
+	0x67, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x07, 0x72, 0x75, 0x6e, 0x5f, 0x72,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00,
+	0x52, 0x06, 0x72, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x22, 0x9f, 0x02, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a,
+	0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x2c, 0x0a, 0x08, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x44, 0x61, 0x74, 0x61,
+	0x73, 0x65, 0x74, 0x52, 0x08, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x12, 0x32, 0x0a,
+	0x0a, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x41, 0x6c, 0x67, 0x6f,
+	0x72, 0x69, 0x74, 0x68, 0x6d, 0x52, 0x0a, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d,
+	0x73, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x72, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x73, 0x12, 0x37, 0x0a, 0x0c,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x41, 0x67, 0x65,
+	0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x49, 0x0a, 0x07, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74,
+	0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68,
+	0x22, 0x4b, 0x0a, 0x09, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a,
+	0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73,
+	0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0xd6, 0x01,
+	0x0a, 0x0b, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a,
+	0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x6f, 0x72,
+	0x74, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x66, 0x69,
+	0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x65, 0x72, 0x74, 0x46, 0x69,
+	0x6c, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x24, 0x0a,
+	0x0e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x61, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x61, 0x46,
+	0x69, 0x6c, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x61,
+	0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x43, 0x61, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67,
+	0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f,
+	0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x32, 0x5b, 0x0a, 0x0e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x49, 0x0a, 0x07, 0x50, 0x72, 0x6f, 0x63,
+	0x65, 0x73, 0x73, 0x12, 0x1c, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x43, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x1a, 0x1a, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x70,
+	0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x00, 0x28,
+	0x01, 0x30, 0x01, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -942,40 +759,34 @@ func file_manager_manager_proto_rawDescGZIP() []byte {
 	return file_manager_manager_proto_rawDescData
 }
 
-var file_manager_manager_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_manager_manager_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_manager_manager_proto_goTypes = []interface{}{
-	(*Terminate)(nil),             // 0: manager.Terminate
-	(*RunResponse)(nil),           // 1: manager.RunResponse
-	(*AgentEvent)(nil),            // 2: manager.AgentEvent
-	(*AgentLog)(nil),              // 3: manager.AgentLog
-	(*ClientStreamMessage)(nil),   // 4: manager.ClientStreamMessage
-	(*ServerStreamMessage)(nil),   // 5: manager.ServerStreamMessage
-	(*ComputationRunReq)(nil),     // 6: manager.ComputationRunReq
-	(*ResultConsumer)(nil),        // 7: manager.ResultConsumer
-	(*Dataset)(nil),               // 8: manager.Dataset
-	(*Algorithm)(nil),             // 9: manager.Algorithm
-	(*AgentConfig)(nil),           // 10: manager.AgentConfig
-	(*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp
+	(*RunResponse)(nil),           // 0: manager.RunResponse
+	(*AgentEvent)(nil),            // 1: manager.AgentEvent
+	(*AgentLog)(nil),              // 2: manager.AgentLog
+	(*ClientStreamMessage)(nil),   // 3: manager.ClientStreamMessage
+	(*ComputationRunReq)(nil),     // 4: manager.ComputationRunReq
+	(*Dataset)(nil),               // 5: manager.Dataset
+	(*Algorithm)(nil),             // 6: manager.Algorithm
+	(*AgentConfig)(nil),           // 7: manager.AgentConfig
+	(*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp
 }
 var file_manager_manager_proto_depIdxs = []int32{
-	11, // 0: manager.AgentEvent.timestamp:type_name -> google.protobuf.Timestamp
-	11, // 1: manager.AgentLog.timestamp:type_name -> google.protobuf.Timestamp
-	3,  // 2: manager.ClientStreamMessage.agent_log:type_name -> manager.AgentLog
-	2,  // 3: manager.ClientStreamMessage.agent_event:type_name -> manager.AgentEvent
-	1,  // 4: manager.ClientStreamMessage.run_res:type_name -> manager.RunResponse
-	6,  // 5: manager.ServerStreamMessage.runReq:type_name -> manager.ComputationRunReq
-	0,  // 6: manager.ServerStreamMessage.terminateReq:type_name -> manager.Terminate
-	8,  // 7: manager.ComputationRunReq.datasets:type_name -> manager.Dataset
-	9,  // 8: manager.ComputationRunReq.algorithm:type_name -> manager.Algorithm
-	7,  // 9: manager.ComputationRunReq.result_consumers:type_name -> manager.ResultConsumer
-	10, // 10: manager.ComputationRunReq.agent_config:type_name -> manager.AgentConfig
-	4,  // 11: manager.ManagerService.Process:input_type -> manager.ClientStreamMessage
-	5,  // 12: manager.ManagerService.Process:output_type -> manager.ServerStreamMessage
-	12, // [12:13] is the sub-list for method output_type
-	11, // [11:12] is the sub-list for method input_type
-	11, // [11:11] is the sub-list for extension type_name
-	11, // [11:11] is the sub-list for extension extendee
-	0,  // [0:11] is the sub-list for field type_name
+	8, // 0: manager.AgentEvent.timestamp:type_name -> google.protobuf.Timestamp
+	8, // 1: manager.AgentLog.timestamp:type_name -> google.protobuf.Timestamp
+	2, // 2: manager.ClientStreamMessage.agent_log:type_name -> manager.AgentLog
+	1, // 3: manager.ClientStreamMessage.agent_event:type_name -> manager.AgentEvent
+	0, // 4: manager.ClientStreamMessage.run_res:type_name -> manager.RunResponse
+	5, // 5: manager.ComputationRunReq.datasets:type_name -> manager.Dataset
+	6, // 6: manager.ComputationRunReq.algorithms:type_name -> manager.Algorithm
+	7, // 7: manager.ComputationRunReq.agent_config:type_name -> manager.AgentConfig
+	3, // 8: manager.ManagerService.Process:input_type -> manager.ClientStreamMessage
+	4, // 9: manager.ManagerService.Process:output_type -> manager.ComputationRunReq
+	9, // [9:10] is the sub-list for method output_type
+	8, // [8:9] is the sub-list for method input_type
+	8, // [8:8] is the sub-list for extension type_name
+	8, // [8:8] is the sub-list for extension extendee
+	0, // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_manager_manager_proto_init() }
@@ -985,18 +796,6 @@ func file_manager_manager_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_manager_manager_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Terminate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_manager_manager_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RunResponse); i {
 			case 0:
 				return &v.state
@@ -1008,7 +807,7 @@ func file_manager_manager_proto_init() {
 				return nil
 			}
 		}
-		file_manager_manager_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_manager_manager_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AgentEvent); i {
 			case 0:
 				return &v.state
@@ -1020,7 +819,7 @@ func file_manager_manager_proto_init() {
 				return nil
 			}
 		}
-		file_manager_manager_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_manager_manager_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AgentLog); i {
 			case 0:
 				return &v.state
@@ -1032,7 +831,7 @@ func file_manager_manager_proto_init() {
 				return nil
 			}
 		}
-		file_manager_manager_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_manager_manager_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ClientStreamMessage); i {
 			case 0:
 				return &v.state
@@ -1044,19 +843,7 @@ func file_manager_manager_proto_init() {
 				return nil
 			}
 		}
-		file_manager_manager_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServerStreamMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_manager_manager_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_manager_manager_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ComputationRunReq); i {
 			case 0:
 				return &v.state
@@ -1068,19 +855,7 @@ func file_manager_manager_proto_init() {
 				return nil
 			}
 		}
-		file_manager_manager_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ResultConsumer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_manager_manager_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_manager_manager_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Dataset); i {
 			case 0:
 				return &v.state
@@ -1092,7 +867,7 @@ func file_manager_manager_proto_init() {
 				return nil
 			}
 		}
-		file_manager_manager_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_manager_manager_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Algorithm); i {
 			case 0:
 				return &v.state
@@ -1104,7 +879,7 @@ func file_manager_manager_proto_init() {
 				return nil
 			}
 		}
-		file_manager_manager_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_manager_manager_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AgentConfig); i {
 			case 0:
 				return &v.state
@@ -1117,22 +892,18 @@ func file_manager_manager_proto_init() {
 			}
 		}
 	}
-	file_manager_manager_proto_msgTypes[4].OneofWrappers = []interface{}{
+	file_manager_manager_proto_msgTypes[3].OneofWrappers = []interface{}{
 		(*ClientStreamMessage_AgentLog)(nil),
 		(*ClientStreamMessage_AgentEvent)(nil),
 		(*ClientStreamMessage_RunRes)(nil),
 	}
-	file_manager_manager_proto_msgTypes[5].OneofWrappers = []interface{}{
-		(*ServerStreamMessage_RunReq)(nil),
-		(*ServerStreamMessage_TerminateReq)(nil),
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_manager_manager_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   11,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

pkg/manager/manager_grpc.pb.go

@@ -51,7 +51,7 @@ func (c *managerServiceClient) Process(ctx context.Context, opts ...grpc.CallOpt
 
 type ManagerService_ProcessClient interface {
 	Send(*ClientStreamMessage) error
-	Recv() (*ServerStreamMessage, error)
+	Recv() (*ComputationRunReq, error)
 	grpc.ClientStream
 }
 
@@ -63,8 +63,8 @@ func (x *managerServiceProcessClient) Send(m *ClientStreamMessage) error {
 	return x.ClientStream.SendMsg(m)
 }
 
-func (x *managerServiceProcessClient) Recv() (*ServerStreamMessage, error) {
-	m := new(ServerStreamMessage)
+func (x *managerServiceProcessClient) Recv() (*ComputationRunReq, error) {
+	m := new(ComputationRunReq)
 	if err := x.ClientStream.RecvMsg(m); err != nil {
 		return nil, err
 	}
@@ -104,7 +104,7 @@ func _ManagerService_Process_Handler(srv interface{}, stream grpc.ServerStream)
 }
 
 type ManagerService_ProcessServer interface {
-	Send(*ServerStreamMessage) error
+	Send(*ComputationRunReq) error
 	Recv() (*ClientStreamMessage, error)
 	grpc.ServerStream
 }
@@ -113,7 +113,7 @@ type managerServiceProcessServer struct {
 	grpc.ServerStream
 }
 
-func (x *managerServiceProcessServer) Send(m *ServerStreamMessage) error {
+func (x *managerServiceProcessServer) Send(m *ComputationRunReq) error {
 	return x.ServerStream.SendMsg(m)
 }
 

pkg/sdk/agent.go

@@ -3,131 +3,63 @@
 package sdk
 
 import (
-	"bytes"
 	"context"
-	"crypto"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha256"
-	"encoding/base64"
-	"io"
 	"log/slog"
 
 	"github.com/ultravioletrs/cocos/agent"
-	"github.com/ultravioletrs/cocos/agent/auth"
-	"google.golang.org/grpc/metadata"
 )
 
-type SDK interface {
-	Algo(ctx context.Context, algorithm agent.Algorithm, privKey *rsa.PrivateKey) error
-	Data(ctx context.Context, dataset agent.Dataset, privKey *rsa.PrivateKey) error
-	Result(ctx context.Context, privKey *rsa.PrivateKey) ([]byte, error)
-	Attestation(ctx context.Context, reportData [size64]byte) ([]byte, error)
-}
+var _ agent.Service = (*agentSDK)(nil)
 
-const (
-	size64     = 64
-	bufferSize = 1024 * 1024
-)
+const size64 = 64
 
 type agentSDK struct {
 	client agent.AgentServiceClient
 	logger *slog.Logger
 }
 
-func NewAgentSDK(log *slog.Logger, agentClient agent.AgentServiceClient) SDK {
+func NewAgentSDK(log *slog.Logger, agentClient agent.AgentServiceClient) *agentSDK {
 	return &agentSDK{
 		client: agentClient,
 		logger: log,
 	}
 }
 
-func (sdk *agentSDK) Algo(ctx context.Context, algorithm agent.Algorithm, privKey *rsa.PrivateKey) error {
-	md, err := generateMetadata(string(auth.AlgorithmProviderRole), privKey)
-	if err != nil {
-		sdk.logger.Error("Failed to generate metadata")
-		return err
+func (sdk *agentSDK) Algo(ctx context.Context, algorithm agent.Algorithm) error {
+	request := &agent.AlgoRequest{
+		Algorithm: algorithm.Algorithm,
+		Provider:  algorithm.Provider,
+		Id:        algorithm.ID,
 	}
 
-	ctx = metadata.NewOutgoingContext(ctx, md)
-	stream, err := sdk.client.Algo(ctx)
-	if err != nil {
+	if _, err := sdk.client.Algo(ctx, request); err != nil {
 		sdk.logger.Error("Failed to call Algo RPC")
 		return err
 	}
-	algoBuffer := bytes.NewBuffer(algorithm.Algorithm)
-
-	buf := make([]byte, bufferSize)
-	for {
-		n, err := algoBuffer.Read(buf)
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		err = stream.Send(&agent.AlgoRequest{Algorithm: buf[:n]})
-		if err != nil {
-			return err
-		}
-	}
-
-	if _, err := stream.CloseAndRecv(); err != nil {
-		return err
-	}
 
 	return nil
 }
 
-func (sdk *agentSDK) Data(ctx context.Context, dataset agent.Dataset, privKey *rsa.PrivateKey) error {
-	md, err := generateMetadata(string(auth.DataProviderRole), privKey)
-	if err != nil {
-		sdk.logger.Error("Failed to generate metadata")
-		return err
+func (sdk *agentSDK) Data(ctx context.Context, dataset agent.Dataset) error {
+	request := &agent.DataRequest{
+		Dataset:  dataset.Dataset,
+		Provider: dataset.Provider,
+		Id:       dataset.ID,
 	}
 
-	ctx = metadata.NewOutgoingContext(ctx, md)
-	stream, err := sdk.client.Data(ctx)
-	if err != nil {
-		sdk.logger.Error("Failed to call Algo RPC")
-		return err
-	}
-	dataBuffer := bytes.NewBuffer(dataset.Dataset)
-
-	buf := make([]byte, bufferSize)
-	for {
-		n, err := dataBuffer.Read(buf)
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		err = stream.Send(&agent.DataRequest{Dataset: buf[:n]})
-		if err != nil {
-			return err
-		}
-	}
-
-	if _, err := stream.CloseAndRecv(); err != nil {
+	if _, err := sdk.client.Data(ctx, request); err != nil {
+		sdk.logger.Error("Failed to call Data RPC")
 		return err
 	}
 
 	return nil
 }
 
-func (sdk *agentSDK) Result(ctx context.Context, privKey *rsa.PrivateKey) ([]byte, error) {
-	request := &agent.ResultRequest{}
-
-	md, err := generateMetadata(string(auth.ConsumerRole), privKey)
-	if err != nil {
-		sdk.logger.Error("Failed to generate metadata")
-		return nil, err
+func (sdk *agentSDK) Result(ctx context.Context, consumer string) ([]byte, error) {
+	request := &agent.ResultRequest{
+		Consumer: consumer,
 	}
 
-	ctx = metadata.NewOutgoingContext(ctx, md)
 	response, err := sdk.client.Result(ctx, request)
 	if err != nil {
 		sdk.logger.Error("Failed to call Result RPC")
@@ -150,25 +82,3 @@ func (sdk *agentSDK) Attestation(ctx context.Context, reportData [size64]byte) (
 
 	return response.File, nil
 }
-
-func signData(userID string, privKey *rsa.PrivateKey) ([]byte, error) {
-	hash := sha256.Sum256([]byte(userID))
-	signature, err := rsa.SignPKCS1v15(rand.Reader, privKey, crypto.SHA256, hash[:])
-	if err != nil {
-		return nil, err
-	}
-
-	return signature, nil
-}
-
-func generateMetadata(userID string, privateKey *rsa.PrivateKey) (metadata.MD, error) {
-	signature, err := signData(userID, privateKey)
-	if err != nil {
-		return nil, err
-	}
-
-	kv := make(map[string]string)
-	kv[auth.UserMetadataKey] = userID
-	kv[auth.SignatureMetadataKey] = base64.StdEncoding.EncodeToString(signature)
-	return metadata.New(kv), nil
-}

scripts/platform_info/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "platform_info"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-clap = { version = "4.0", features = ["derive"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-sev = "3.1.1"
-sysinfo = "0.30.12"
-regex = "1.10.4"

scripts/platform_info/Makefile

@@ -1,14 +0,0 @@
-CARGO = cargo
-TARGET = target
-BUILD_DIR = $(TARGET)/release
-BIN_NAME = platform_info
-
-all: build
-
-build:
-	$(CARGO) build --release
-
-clean:
-	$(CARGO) clean
-
-.PHONY: all build clean

scripts/platform_info/README.md

@@ -1,19 +0,0 @@
-# Rust project for fetching platform info
-This rust project fetches information from the host system needed for validation of the attestation report. It outputs a JSON file that contains the said information.
-The JSON file is in a format that can be used with the [go-sev-guest](https://github.com/google/go-sev-guest) library.
-
-## Usage
-Clone `cocos` repository:
-```bash
-git clone git@github.com:ultravioletrs/cocos.git
-cd ./cocos/scripts/platform_info 
-make
-```
-
-Then run the binary. Keep in mind that you have to specify the policy of the Guest VM:
-```bash
-cd ./target/releas
-
-# Run with option --policy (policy is 64 bit number) 
-./platform_info --policy 196608
-```

scripts/platform_info/src/main.rs

@@ -1,137 +0,0 @@
-use clap::{Arg, Command, value_parser};
-use serde::Serialize;
-use std::fs::File;
-use std::io::Write;
-use sysinfo::System;
-use regex::Regex;
-use sev::firmware::host::*;
-
-const PLATFORM_INFO_JSON : &str = "platform_info.json";
-
-#[derive(Serialize)]
-struct Vmpl {
-    value : u32,
-}
-
-#[derive(Serialize)]
-struct SnpPolicy {
-    policy: u64,
-    family_id: Vec<u8>,
-    image_id: Vec<u8>,
-    vmpl: Vmpl,
-    minimum_tcb: u64,
-    minimum_launch_tcb: u64,
-    require_author_key: bool,
-    measurement: Vec<u8>,
-    host_data: Vec<u8>,
-    report_id_ma: Vec<u8>,
-    chip_id: Vec<u8>,
-    minimum_build: u32,
-    minimum_version: String,
-    permit_provisional_firmware: bool,
-    require_id_block: bool,
-}
-
-#[derive(Serialize)]
-struct RootOfTrust {
-    product: String,
-    check_crl : bool,
-    disallow_network : bool,
-}
-
-#[derive(Serialize)]
-struct Computation {
-    snp_policy: SnpPolicy,
-    root_of_trust: RootOfTrust,
-}
-
-fn get_product_name() -> String {
-    let mut sys = System::new_all();
-    sys.refresh_all();
-    
-    let re = Regex::new(r"EPYC.*7..3.*").unwrap();
-
-    for cpu in sys.cpus() {
-        if re.is_match(cpu.brand()) {
-            return "Milan".to_string()
-        }
-    }
-
-    "Unknown".to_string()
-}
-
-fn get_uint64_from_tcb(tcb_version : &TcbVersion) -> u64 {
-    let microcode = (tcb_version.microcode as u64) << 56;
-    let snp = (tcb_version.snp as u64) << 48;
-    let tee = (tcb_version.tee as u64) << 8;
-    let bootloader = tcb_version.bootloader as u64;
-
-    microcode | snp | tee | bootloader
-}
-
-fn main() {
-    let matches = Command::new("Platform info")
-        .about("Processes command line options and outputs a JSON file for Attestation verification")
-        .arg(Arg::new("policy")
-            .long("policy")
-            .value_name("INT")
-            .help("Sets the policy integer")
-            .required(true)
-            .value_parser(value_parser!(u64)))
-        .get_matches();
-
-    let mut firmware: Firmware = Firmware::open().unwrap();
-    let status: SnpPlatformStatus = firmware.snp_platform_status().unwrap();
-
-    let policy: u64 = *matches.get_one::<u64>("policy").unwrap();
-    let family_id = vec![0];
-    let image_id = vec![0];
-    let vmpl = Vmpl { value: 0};
-    let minimum_tcb = get_uint64_from_tcb(&status.platform_tcb_version);
-    let minimum_launch_tcb = get_uint64_from_tcb(&status.platform_tcb_version);
-    let require_author_key = false;
-    let measurement = vec![0];
-    let host_data = vec![0];
-    let report_id_ma = vec![0];
-    let cpu_id: Identifier = firmware.get_identifier().unwrap();
-    let chip_id: Vec<u8> = cpu_id.0;
-    let minimum_build = status.build_id;
-    let minimum_version = status.version.to_string();
-    let permit_provisional_firmware = false;
-    let require_id_block = false;
-
-    let snp_policy = SnpPolicy {
-        policy,
-        family_id,
-        image_id,
-        vmpl,
-        minimum_tcb,
-        minimum_launch_tcb,
-        require_author_key,
-        measurement,
-        host_data,
-        report_id_ma,
-        chip_id,
-        minimum_build,
-        minimum_version,
-        permit_provisional_firmware,
-        require_id_block,
-    };
-
-    let root_of_trust = RootOfTrust {
-        product : get_product_name(),
-        check_crl : true,
-        disallow_network : false,
-    };
-
-    let computation = Computation {
-        snp_policy,
-        root_of_trust,
-    };
-
-    let json = serde_json::to_string_pretty(&computation).expect("Failed to serialize to JSON");
-    let mut file = File::create(PLATFORM_INFO_JSON).expect("Failed to create file");
-    file.write_all(json.as_bytes()).expect("Failed to write to file");
-
-    println!("Computation JSON has been written to {}", PLATFORM_INFO_JSON);
-}

test/computations/main.go

@@ -4,12 +4,10 @@ package main
 
 import (
 	"context"
-	"encoding/pem"
 	"fmt"
 	"log"
 	"log/slog"
 	"os"
-	"strconv"
 
 	mglog "github.com/absmach/magistrala/logger"
 	"github.com/ultravioletrs/cocos/internal/env"
@@ -20,7 +18,6 @@ import (
 	"golang.org/x/crypto/sha3"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/reflection"
 )
 
@@ -32,17 +29,15 @@ const (
 )
 
 var (
-	algoPath    = "./test/manual/algo/lin_reg.py"
-	dataPath    = "./test/manual/data/iris.csv"
-	attestedTLS = false
-	pubKeyFile  string
+	algoPath = "./test/manual/algo/lin_reg.py"
+	dataPath = "./test/manual/data/iris.csv"
 )
 
 type svc struct {
 	logger *slog.Logger
 }
 
-func (s *svc) Run(ipAdress string, reqChan chan *manager.ServerStreamMessage, auth credentials.AuthInfo) {
+func (s *svc) Run(ipAdress string, reqChan chan *manager.ComputationRunReq) {
 	s.logger.Debug(fmt.Sprintf("received who am on ip address %s", ipAdress))
 	algo, err := os.ReadFile(algoPath)
 	if err != nil {
@@ -54,46 +49,28 @@ func (s *svc) Run(ipAdress string, reqChan chan *manager.ServerStreamMessage, au
 		s.logger.Error(fmt.Sprintf("failed to read data file: %s", err))
 		return
 	}
-	pubKey, err := os.ReadFile(pubKeyFile)
-	if err != nil {
-		s.logger.Error(fmt.Sprintf("failed to read public key file: %s", err))
-		return
-	}
-	pubPem, _ := pem.Decode(pubKey)
 	algoHash := sha3.Sum256(algo)
 	dataHash := sha3.Sum256(data)
-	reqChan <- &manager.ServerStreamMessage{
-		Message: &manager.ServerStreamMessage_RunReq{
-			RunReq: &manager.ComputationRunReq{
-				Id:              "1",
-				Name:            "sample computation",
-				Description:     "sample descrption",
-				Datasets:        []*manager.Dataset{{Hash: dataHash[:], UserKey: pubPem.Bytes}},
-				Algorithm:       &manager.Algorithm{Hash: algoHash[:], UserKey: pubPem.Bytes},
-				ResultConsumers: []*manager.ResultConsumer{{UserKey: pubPem.Bytes}},
-				AgentConfig: &manager.AgentConfig{
-					Port:        "7002",
-					LogLevel:    "debug",
-					AttestedTls: attestedTLS,
-				},
-			},
+	reqChan <- &manager.ComputationRunReq{
+		Id:              "1",
+		Name:            "sample computation",
+		Description:     "sample descrption",
+		Datasets:        []*manager.Dataset{{Id: "1", Provider: "provider1", Hash: dataHash[:]}},
+		Algorithms:      []*manager.Algorithm{{Id: "1", Provider: "provider1", Hash: algoHash[:]}},
+		ResultConsumers: []string{"consumer1"},
+		AgentConfig: &manager.AgentConfig{
+			Port:     "7002",
+			LogLevel: "debug",
 		},
 	}
 }
 
 func main() {
-	if len(os.Args) < 5 {
-		log.Fatalf("usage: %s <data-path> <algo-path> <public-key-path> <attested-tls-bool>", os.Args[0])
+	if len(os.Args) < 3 {
+		log.Fatalf("usage: %s <data-path> <algo-path>", os.Args[0])
 	}
 	dataPath = os.Args[1]
 	algoPath = os.Args[2]
-	pubKeyFile = os.Args[3]
-	attestedTLSParam, err := strconv.ParseBool(os.Args[4])
-	if err != nil {
-		log.Fatalf("usage: %s <data-path> <algo-path> <attested-tls-bool>, <attested-tls-bool> must be a bool value", os.Args[0])
-	}
-	attestedTLS = attestedTLSParam
-
 	ctx, cancel := context.WithCancel(context.Background())
 	g, ctx := errgroup.WithContext(ctx)
 	incomingChan := make(chan *manager.ClientStreamMessage)
@@ -119,7 +96,7 @@ func main() {
 
 	registerAgentServiceServer := func(srv *grpc.Server) {
 		reflection.Register(srv)
-		manager.RegisterManagerServiceServer(srv, managergrpc.NewServer(incomingChan, &svc{logger: logger}))
+		manager.RegisterManagerServiceServer(srv, managergrpc.NewServer(ctx, incomingChan, &svc{logger: logger}))
 	}
 	grpcServerConfig := server.Config{Port: defaultPort}
 	if err := env.Parse(&grpcServerConfig, env.Options{}); err != nil {
@@ -127,7 +104,7 @@ func main() {
 		return
 	}
 
-	gs := grpcserver.New(ctx, cancel, svcName, grpcServerConfig, registerAgentServiceServer, logger, nil, nil)
+	gs := grpcserver.New(ctx, cancel, svcName, grpcServerConfig, registerAgentServiceServer, logger)
 
 	g.Go(func() error {
 		return gs.Start()

test/manual/README.md

@@ -2,53 +2,27 @@
 
 ## CLI
 
-Throughout the tests, we assume that our current working directory is the root of the `cocos` repository, both on the host machine and in the VM.
+Throughout the tests, we assume that our current working directory is the root of the `agent` repository, both on the host machine and in the VM.
 
-### Algorithm requirements
+### Python requirements
 
-Agent accepts the algorithm as a binary that take in two command line arguments.
-```shell
-algorithm-file <unix socket path> <dataset file paths> 
+Do this both on the host machine and in the VM.
+
+```sh
+apt update
+apt install python3-pip
+pip3 install pandas scikit-learn
 ```
 
-The algorithm program should return the results to a socket and an example can be seen in this [file](./algo/lin_reg.py).
-
 ### Agent-CLI interaction
 
 Agent is started automatically in the VM when launched but requires configuration and manifest to be passed by manager. Alternatively you can pass configuration using this [simplified script](./agent-config/main.go)
 
-For attested TLS, you will have to calculate the VM's measurement, which can be done using a tool [sev-snp-measure](https://pypi.org/project/sev-snp-measure/).
-
-```bash
-# Define the path to the OVMF, KERNEL, INITRD and CMD Kernel line arguments.
-OVMF_CODE="/home/cocosai/ovmf/Build/AmdSev/DEBUG_GCC5/FV/OVMF.fd"
-INITRD="/home/cocosai/initramfs.cpio.gz"
-KERNEL="/home/cocosai/bzImage"
-LINE="earlyprintk=serial console=ttyS0"
-
-# Call sev-snp-measure
-sev-snp-measure --mode snp --vcpus 4 --vcpu-type EPYC-v4 --ovmf $OVMF_CODE --kernel $KERNEL --initrd $INITRD --append "$LINE" --output-format base64
-```
+Open console on the host, and run
 
 ```sh
 export AGENT_GRPC_URL=localhost:7002
-
-# For attested TLS, the CLI should also be aware of the VM measurement. To 
-# add the measurement to the .json file that contains the information about 
-# the platform, run CLI with the measurement in base64 format and the path 
-# of the platform_info.json file.:
-go run cmd/cli/main.go measurement '<measurement>' '<platform_info.json>'
-
-# The platform_info.json file can be generated using Rust by running:
-cd scripts/platform_info
-make
-sudo ./target/release/platform_info --policy 196608 # Default value of the policy should be 196608
-# The output file platform_info.json will be generated in the directory from which the executable has been called.
-cd ../..
-
-# For attested TLS, also define the path to the platform_info.json that contains reference values for the fields of the attestation report
-export AGENT_GRPC_MANIFEST=./scripts/platform_info/platform_info.json
-export AGENT_GRPC_ATTESTED_TLS=true
+export MANAGER_GRPC_URL=localhost:7001
 
 # Retieve Attestation
 go run cmd/cli/main.go attestation get '<report_data>'
@@ -57,16 +31,16 @@ go run cmd/cli/main.go attestation get '<report_data>'
 go run cmd/cli/main.go attestation validate '<attesation>' --report_data '<report_data>'
 
 # Run the CLI program with algorithm input
-go run cmd/cli/main.go algo test/manual/algo/lin_reg.bin <private_key_file_path>
-# 2023/09/21 10:43:53 Uploading algorithm binary: test/manual/algo/lin_reg.bin
+go run cmd/cli/main.go algo test/manual/algo/lin_reg.py Algorithm1 AlgorithmProvider1
+# 2023/09/21 10:43:53 Uploading algorithm binary: test/manual/algo/lin_reg.py
 
 # Run the CLI program with dataset input
-go run cmd/cli/main.go data test/manual/data/iris.csv <private_key_file_path>
-go run cmd/cli/main.go data test/manual/data/iris.csv <private_key_file_path>
+go run cmd/cli/main.go data test/manual/data/iris.csv Dataset1 Provider1
+go run cmd/cli/main.go data test/manual/data/iris.csv Dataset2 Provider2
 # 2023/09/21 10:45:25 Uploading dataset CSV: test/manual/data/iris.csv
 
 # Run the CLI program to fetch computation result
-go run cmd/cli/main.go result <private_key_file_path>
+go run cmd/cli/main.go result Consumer1
 # 2023/09/21 10:45:39 Retrieving computation result file
 # 2023/09/21 10:45:40 Computation result retrieved and saved successfully!
 ```

test/manual/agent-config/main.go

@@ -7,62 +7,80 @@ package main
 
 import (
 	"encoding/json"
-	"encoding/pem"
 	"fmt"
 	"log"
-	"os"
-	"strconv"
 
 	"github.com/mdlayher/vsock"
-	"github.com/ultravioletrs/cocos/agent"
-	"github.com/ultravioletrs/cocos/manager"
-	pkgmanager "github.com/ultravioletrs/cocos/pkg/manager"
-	"golang.org/x/crypto/sha3"
+	"github.com/ultravioletrs/cocos/pkg/manager"
 	"google.golang.org/protobuf/proto"
 )
 
+const VsockConfigPort uint32 = 9999
+
+type AgentConfig struct {
+	LogLevel   string `json:"log_level"`
+	InstanceID string `json:"instance_id"`
+	Host       string `json:"host"`
+	Port       string `json:"port"`
+	CertFile   string `json:"cert_file"`
+	KeyFile    string `json:"server_key"`
+}
+
+type Computation struct {
+	ID              string      `json:"id,omitempty"`
+	Name            string      `json:"name,omitempty"`
+	Description     string      `json:"description,omitempty"`
+	Datasets        Datasets    `json:"datasets,omitempty"`
+	Algorithms      Algorithms  `json:"algorithms,omitempty"`
+	ResultConsumers []string    `json:"result_consumers,omitempty"`
+	AgentConfig     AgentConfig `json:"agent_config,omitempty"`
+}
+
+func (d *Datasets) String() string {
+	dat, err := json.Marshal(d)
+	if err != nil {
+		return ""
+	}
+	return string(dat)
+}
+
+func (a *Algorithms) String() string {
+	dat, err := json.Marshal(a)
+	if err != nil {
+		return ""
+	}
+	return string(dat)
+}
+
+type Dataset struct {
+	Dataset  []byte `json:"-"`
+	Provider string `json:"provider,omitempty"`
+	ID       string `json:"id,omitempty"`
+}
+
+type Datasets []Dataset
+
+type Algorithm struct {
+	Algorithm []byte `json:"-"`
+	Provider  string `json:"provider,omitempty"`
+	ID        string `json:"id,omitempty"`
+}
+
+type Algorithms []Algorithm
+
 func main() {
-	if len(os.Args) < 5 {
-		log.Fatalf("usage: %s <data-path> <algo-path> <public-key-path> <attested-tls-bool>", os.Args[0])
-	}
-	dataPath := os.Args[1]
-	algoPath := os.Args[2]
-	pubKeyFile := os.Args[3]
-	attestedTLSParam, err := strconv.ParseBool(os.Args[4])
-	if err != nil {
-		log.Fatalf("usage: %s <data-path> <algo-path> <attested-tls-bool>, <attested-tls-bool> must be a bool value", os.Args[0])
-	}
-	attestedTLS := attestedTLSParam
-
-	algo, err := os.ReadFile(algoPath)
-	if err != nil {
-		log.Fatalf(fmt.Sprintf("failed to read algorithm file: %s", err))
-	}
-	data, err := os.ReadFile(dataPath)
-	if err != nil {
-		log.Fatalf(fmt.Sprintf("failed to read data file: %s", err))
-	}
-	pubKey, err := os.ReadFile(pubKeyFile)
-	if err != nil {
-		log.Fatalf(fmt.Sprintf("failed to read public key file: %s", err))
-	}
-	pubPem, _ := pem.Decode(pubKey)
-	algoHash := sha3.Sum256(algo)
-	dataHash := sha3.Sum256(data)
-
-	l, err := vsock.Listen(manager.ManagerVsockPort, nil)
+	l, err := vsock.Listen(9997, nil)
 	if err != nil {
 		log.Fatal(err)
 	}
-	ac := agent.Computation{
+	ac := Computation{
 		ID:              "123",
-		Datasets:        agent.Datasets{agent.Dataset{Hash: dataHash, UserKey: pubPem.Bytes}},
-		Algorithm:       agent.Algorithm{Hash: algoHash, UserKey: pubPem.Bytes},
-		ResultConsumers: []agent.ResultConsumer{{UserKey: pubPem.Bytes}},
-		AgentConfig: agent.AgentConfig{
-			LogLevel:    "debug",
-			Port:        "7002",
-			AttestedTls: attestedTLS,
+		Datasets:        Datasets{Dataset{ID: "1", Provider: "pr1"}},
+		Algorithms:      Algorithms{Algorithm{ID: "1", Provider: "pr1"}},
+		ResultConsumers: []string{"1"},
+		AgentConfig: AgentConfig{
+			LogLevel: "debug",
+			Port:     "7002",
 		},
 	}
 	fmt.Println(SendAgentConfig(3, ac))
@@ -80,7 +98,7 @@ func main() {
 			continue
 		}
 		conn.Close()
-		var mes pkgmanager.ClientStreamMessage
+		var mes manager.ClientStreamMessage
 		if err := proto.Unmarshal(b[:n], &mes); err != nil {
 			log.Println(err)
 		}
@@ -88,8 +106,8 @@ func main() {
 	}
 }
 
-func SendAgentConfig(cid uint32, ac agent.Computation) error {
-	conn, err := vsock.Dial(cid, manager.VsockConfigPort, nil)
+func SendAgentConfig(cid uint32, ac Computation) error {
+	conn, err := vsock.Dial(cid, VsockConfigPort, nil)
 	if err != nil {
 		return err
 	}
@@ -98,11 +116,6 @@ func SendAgentConfig(cid uint32, ac agent.Computation) error {
 	if err != nil {
 		return err
 	}
-
-	var ac2 agent.Computation
-	if err := json.Unmarshal(payload, &ac2); err != nil {
-		return err
-	}
 	if _, err := conn.Write(payload); err != nil {
 		return err
 	}

test/manual/algo/covid_19/README.md

@@ -1,19 +0,0 @@
-## Algorihm covid19.py
-
-To download dataset first you have to sign in Keggle. https://www.kaggle.com/
-Then follow this documentation. https://github.com/Kaggle/kaggle-api
-
-Go to settings and download API key. Copy it into keggle folder.
-Run divide_save_data.py
-You should have now 3 datasets, named Hospital_1, Hospital_2, Hospital_3
-
-`covid19.py` trains the the model and produces model.
-run :
-`python covid19.py Hospital_1 Hospital_2 Hospital_3 --model model.pth`
-in this example dataset is Hospital_1, Hospital_2, and Hospital_3 and it produces model.pth
-
-`covid.19.py` produced model, and now you should be able to use that model in `predict.py`
-run :
-`python predict.py --model model.pth --image Hospital_2/COVID/images/COVID-3.png`
-in this example you have trained model (model.pth) that runs tests on images (this example is image from Hospital_2 in COVID/images/COVID-3.png)
-

test/manual/algo/covid_19/covid_19.py

@@ -1,190 +0,0 @@
-import os
-import shutil
-import random
-import torch
-import torchvision
-import numpy as np
-import matplotlib.pyplot as plt
-from PIL import Image
-import argparse
-import zipfile
-import socket
-import sys
-import ssl
-
-def prepare_test_set(root_dir, class_names):
-    test_dir = os.path.join(root_dir, 'test')
-    if os.path.isdir(test_dir):
-        shutil.rmtree(test_dir)
-    
-    os.mkdir(test_dir)
-    for class_name in class_names:
-        os.mkdir(os.path.join(test_dir, class_name))
-    
-    for class_name in class_names:
-        images = [x for x in os.listdir(os.path.join(root_dir, class_name, "images")) if x.lower().endswith('png')]
-        selected_images = random.sample(images, 30)
-        for image in selected_images:
-            source_path = os.path.join(root_dir, class_name, "images", image)
-            target_path = os.path.join(test_dir, class_name, image)
-            shutil.copy(source_path, target_path)
-    
-    return test_dir
-
-class ChestXRayDataset(torch.utils.data.Dataset):
-    def __init__(self, image_dirs, transform):
-        def get_images(class_name):
-            images = []
-            for dir_path in image_dirs[class_name]:
-                images += [os.path.join(dir_path, x) for x in os.listdir(dir_path) if x.lower().endswith('png')]
-            print(f'Found {len(images)} {class_name} examples')
-            return images
-
-        self.images = {}
-        self.class_names = ['Normal', 'Viral Pneumonia', 'COVID']
-        for class_name in self.class_names:
-            self.images[class_name] = get_images(class_name)
-        self.transform = transform
-
-    def __len__(self):
-        return sum([len(self.images[class_name]) for class_name in self.class_names])
-
-    def __getitem__(self, index):
-        class_name = random.choice(self.class_names)
-        index = index % len(self.images[class_name])
-        image_path = self.images[class_name][index]
-        image = Image.open(image_path).convert('RGB')
-        return self.transform(image), self.class_names.index(class_name)
-
-def train_and_evaluate_model(dl_train, dl_test, class_names, model_file_name, epochs=1):
-    resnet18 = torchvision.models.resnet18(pretrained=True)
-    resnet18.fc = torch.nn.Linear(in_features=512, out_features=len(class_names))
-    loss_fn = torch.nn.CrossEntropyLoss()
-    optimizer = torch.optim.Adam(resnet18.parameters(), lr=3e-5)
-    print(resnet18)
-
-    print('Starting training..')
-    for e in range(0, epochs):
-        print('=' * 20)
-        print(f'Starting epoch {e + 1}/{epochs}')
-        print('=' * 20)
-        train_loss = 0.
-        val_loss = 0.
-        resnet18.train()  # set model to training phase
-        for train_step, (images, labels) in enumerate(dl_train):
-            optimizer.zero_grad()
-            outputs = resnet18(images)
-            loss = loss_fn(outputs, labels)
-            loss.backward()
-            optimizer.step()
-            train_loss += loss.item()
-            if train_step % 20 == 0:
-                print('Evaluating at step', train_step)
-                accuracy = 0
-                resnet18.eval()  # set model to eval phase
-                for val_step, (images, labels) in enumerate(dl_test):
-                    outputs = resnet18(images)
-                    loss = loss_fn(outputs, labels)
-                    val_loss += loss.item()
-                    _, preds = torch.max(outputs, 1)
-                    accuracy += sum((preds == labels).numpy())
-                val_loss /= (val_step + 1)
-                accuracy = accuracy / len(dl_test.dataset)
-                print(f'Validation Loss: {val_loss:.4f}, Accuracy: {accuracy:.4f}')
-                #show_preds()
-                resnet18.train()
-                if accuracy >= 0.95:
-                    print('Performance condition satisfied, stopping..')
-                    torch.save(resnet18.state_dict(), model_file_name)
-                    return
-        train_loss /= (train_step + 1)
-        print(f'Training Loss: {train_loss:.4f}')
-    print('Training complete..')
-    torch.save(resnet18.state_dict(), model_file_name)
-
-def main():
-    hospitals_zip = []
-    for i, arg in enumerate(sys.argv[2:]):
-        hospitals_zip.append(arg)
-
-    model_file_name = "model.pth"
-
-    class_names = ['Normal', 'Viral Pneumonia', 'COVID']
-
-    # Combine datasets from multiple hospitals
-    train_transform = torchvision.transforms.Compose([
-        torchvision.transforms.Resize(size=(224, 224)),
-        torchvision.transforms.RandomHorizontalFlip(),
-        torchvision.transforms.ToTensor(),
-        torchvision.transforms.Normalize(mean=[0.485, 0.456, 0.406], std=[0.229, 0.224, 0.225])
-    ])
-    test_transform = torchvision.transforms.Compose([
-        torchvision.transforms.Resize(size=(224, 224)),
-        torchvision.transforms.ToTensor(),
-        torchvision.transforms.Normalize([0.485, 0.456, 0.406], [0.229, 0.224, 0.225])
-    ])
-
-    hospital_path = '/tmp/work'
-    if not os.path.isdir(hospital_path):
-        os.mkdir(hospital_path, mode = 0o777)
-    
-    for hospital in hospitals_zip:
-        with zipfile.ZipFile(hospital, 'r') as zip_ref:
-            zip_ref.extractall(hospital_path)
-
-    hospitals = []
-    for hospital in os.listdir(hospital_path):
-        hospitals.append(os.path.join(hospital_path, hospital))    
-
-    # Prepare combined training dataset
-    train_dirs = {class_name: [] for class_name in class_names}
-    for hospital in hospitals:
-        for class_name in class_names:
-            train_dirs[class_name].append(os.path.join(hospital, class_name, 'images'))
-
-    train_image_dirs = {class_name: train_dirs[class_name] for class_name in class_names}
-    train_dataset = ChestXRayDataset(train_image_dirs, train_transform)
-
-    print(f'Total number of training images: {len(train_dataset)}')
-
-    # Prepare test dataset
-    test_dirs = {class_name: [] for class_name in class_names}
-    for hospital in hospitals:
-        test_dir = prepare_test_set(hospital, class_names)
-        for class_name in class_names:
-            test_dirs[class_name].append(os.path.join(test_dir, class_name))
-
-    test_image_dirs = {class_name: test_dirs[class_name] for class_name in class_names}
-    test_dataset = ChestXRayDataset(test_image_dirs, test_transform)
-    
-    batch_size = 6
-    dl_train = torch.utils.data.DataLoader(train_dataset, batch_size=batch_size, shuffle=True)
-    dl_test = torch.utils.data.DataLoader(test_dataset, batch_size=batch_size, shuffle=True)
-    
-    print('Number of training batches:', len(dl_train))
-    print('Number of test batches:', len(dl_test))
-
-    train_and_evaluate_model(dl_train, dl_test, class_names, model_file_name, epochs=1)
-
-    # Define the path for the Unix domain socket
-    socket_path = sys.argv[1]
-
-    # Create a Unix domain socket client
-    client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-
-    try:
-        # Connect to the server
-        client.connect(socket_path)
-
-        # Send the serialized model over the socket
-        with open(model_file_name, 'rb') as f:
-            data = f.read()
-            client.sendall(data)
-
-    finally:
-        # Close the socket
-        client.close()
-
-if __name__ == '__main__':
-    ssl._create_default_https_context = ssl._create_unverified_context
-    main()

test/manual/algo/covid_19/divide_save_data.py

@@ -1,190 +0,0 @@
-import os
-import shutil
-import random
-import torch
-import torchvision
-import numpy as np
-import matplotlib.pyplot as plt
-from PIL import Image
-import argparse
-import zipfile
-import socket
-import sys
-
-def prepare_test_set(root_dir, class_names):
-    test_dir = os.path.join(root_dir, 'test')
-    if os.path.isdir(test_dir):
-        shutil.rmtree(test_dir)
-    
-    os.mkdir(test_dir)
-    for class_name in class_names:
-        os.mkdir(os.path.join(test_dir, class_name))
-    
-    for class_name in class_names:
-        images = [x for x in os.listdir(os.path.join(root_dir, class_name, "images")) if x.lower().endswith('png')]
-        selected_images = random.sample(images, 30)
-        for image in selected_images:
-            source_path = os.path.join(root_dir, class_name, "images", image)
-            target_path = os.path.join(test_dir, class_name, image)
-            shutil.copy(source_path, target_path)
-    
-    return test_dir
-
-class ChestXRayDataset(torch.utils.data.Dataset):
-    def __init__(self, image_dirs, transform):
-        def get_images(class_name):
-            images = []
-            for dir_path in image_dirs[class_name]:
-                images += [os.path.join(dir_path, x) for x in os.listdir(dir_path) if x.lower().endswith('png')]
-            print(f'Found {len(images)} {class_name} examples')
-            return images
-
-        self.images = {}
-        self.class_names = ['Normal', 'Viral Pneumonia', 'COVID']
-        for class_name in self.class_names:
-            self.images[class_name] = get_images(class_name)
-        self.transform = transform
-
-    def __len__(self):
-        return sum([len(self.images[class_name]) for class_name in self.class_names])
-
-    def __getitem__(self, index):
-        class_name = random.choice(self.class_names)
-        index = index % len(self.images[class_name])
-        image_path = self.images[class_name][index]
-        image = Image.open(image_path).convert('RGB')
-        return self.transform(image), self.class_names.index(class_name)
-
-def train_and_evaluate_model(dl_train, dl_test, class_names, model_file_name, epochs=1):
-    resnet18 = torchvision.models.resnet18(pretrained=True)
-    resnet18.fc = torch.nn.Linear(in_features=512, out_features=len(class_names))
-    loss_fn = torch.nn.CrossEntropyLoss()
-    optimizer = torch.optim.Adam(resnet18.parameters(), lr=3e-5)
-    print(resnet18)
-
-    print('Starting training..')
-    for e in range(0, epochs):
-        print('=' * 20)
-        print(f'Starting epoch {e + 1}/{epochs}')
-        print('=' * 20)
-        train_loss = 0.
-        val_loss = 0.
-        resnet18.train()  # set model to training phase
-        for train_step, (images, labels) in enumerate(dl_train):
-            optimizer.zero_grad()
-            outputs = resnet18(images)
-            loss = loss_fn(outputs, labels)
-            loss.backward()
-            optimizer.step()
-            train_loss += loss.item()
-            if train_step % 20 == 0:
-                print('Evaluating at step', train_step)
-                accuracy = 0
-                resnet18.eval()  # set model to eval phase
-                for val_step, (images, labels) in enumerate(dl_test):
-                    outputs = resnet18(images)
-                    loss = loss_fn(outputs, labels)
-                    val_loss += loss.item()
-                    _, preds = torch.max(outputs, 1)
-                    accuracy += sum((preds == labels).numpy())
-                val_loss /= (val_step + 1)
-                accuracy = accuracy / len(dl_test.dataset)
-                print(f'Validation Loss: {val_loss:.4f}, Accuracy: {accuracy:.4f}')
-                #show_preds()
-                resnet18.train()
-                if accuracy >= 0.95:
-                    print('Performance condition satisfied, stopping..')
-                    torch.save(resnet18.state_dict(), model_file_name)
-                    return
-        train_loss /= (train_step + 1)
-        print(f'Training Loss: {train_loss:.4f}')
-    print('Training complete..')
-    torch.save(resnet18.state_dict(), model_file_name)
-
-def main():
-    # parser = argparse.ArgumentParser(description='Process hospital datasets and save the model.')
-    # parser.add_argument('hospitals', metavar='-H', type=str, nargs='+',
-    #                     help='paths to hospital datasets')
-    # parser.add_argument('--model', type=str, required=True,
-    #                     help='name of the output model file')
-    
-    # args = parser.parse_args()
-    hospitals_zip = []
-    for i, arg in enumerate(sys.argv[2:]):
-        hospitals_zip.append(arg)
-
-    # hospitals_zip = args.hospitals
-    model_file_name = "model.pth"
-
-    class_names = ['Normal', 'Viral Pneumonia', 'COVID']
-
-    # Combine datasets from multiple hospitals
-    train_transform = torchvision.transforms.Compose([
-        torchvision.transforms.Resize(size=(224, 224)),
-        torchvision.transforms.RandomHorizontalFlip(),
-        torchvision.transforms.ToTensor(),
-        torchvision.transforms.Normalize(mean=[0.485, 0.456, 0.406], std=[0.229, 0.224, 0.225])
-    ])
-    test_transform = torchvision.transforms.Compose([
-        torchvision.transforms.Resize(size=(224, 224)),
-        torchvision.transforms.ToTensor(),
-        torchvision.transforms.Normalize([0.485, 0.456, 0.406], [0.229, 0.224, 0.225])
-    ])
-
-    hospitals = []
-    for hospital in hospitals_zip:
-        hospitals.append(os.path.basename(os.path.splitext(hospital)[0]))
-        with zipfile.ZipFile(hospital, 'r') as zip_ref:
-            zip_ref.extractall('./')
-
-    # Prepare combined training dataset
-    train_dirs = {class_name: [] for class_name in class_names}
-    for hospital in hospitals:
-        for class_name in class_names:
-            train_dirs[class_name].append(os.path.join(hospital, class_name, 'images'))
-
-    train_image_dirs = {class_name: train_dirs[class_name] for class_name in class_names}
-    train_dataset = ChestXRayDataset(train_image_dirs, train_transform)
-
-    print(f'Total number of training images: {len(train_dataset)}')
-
-    # Prepare test dataset
-    test_dirs = {class_name: [] for class_name in class_names}
-    for hospital in hospitals:
-        test_dir = prepare_test_set(hospital, class_names)
-        for class_name in class_names:
-            test_dirs[class_name].append(os.path.join(test_dir, class_name))
-
-    test_image_dirs = {class_name: test_dirs[class_name] for class_name in class_names}
-    test_dataset = ChestXRayDataset(test_image_dirs, test_transform)
-    
-    batch_size = 6
-    dl_train = torch.utils.data.DataLoader(train_dataset, batch_size=batch_size, shuffle=True)
-    dl_test = torch.utils.data.DataLoader(test_dataset, batch_size=batch_size, shuffle=True)
-    
-    print('Number of training batches:', len(dl_train))
-    print('Number of test batches:', len(dl_test))
-
-    train_and_evaluate_model(dl_train, dl_test, class_names, model_file_name, epochs=1)
-
-    # Define the path for the Unix domain socket
-    socket_path = sys.argv[1]
-
-    # Create a Unix domain socket client
-    client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-
-    try:
-        # Connect to the server
-        client.connect(socket_path)
-
-        # Send the serialized model over the socket
-        with open(model_file_name, 'rb') as f:
-            data = f.read()
-            client.sendall(data)
-
-    finally:
-        # Close the socket
-        client.close()
-
-if __name__ == '__main__':
-    main()

test/manual/algo/covid_19/predict.py

@@ -1,59 +0,0 @@
-import torch
-import torchvision
-import numpy as np
-import matplotlib.pyplot as plt
-from PIL import Image
-import argparse
-
-def load_model(model_path, class_names):
-    model = torchvision.models.resnet18(weights=None)
-    model.fc = torch.nn.Linear(in_features=512, out_features=len(class_names))
-    model.load_state_dict(torch.load(model_path))
-    model.eval()  # Set the model to evaluation mode
-    return model
-
-def preprocess_image(image_path):
-    transform = torchvision.transforms.Compose([
-        torchvision.transforms.Resize(size=(224, 224)),
-        torchvision.transforms.ToTensor(),
-        torchvision.transforms.Normalize(mean=[0.485, 0.456, 0.406], std=[0.229, 0.224, 0.225])
-    ])
-    image = Image.open(image_path).convert('RGB')
-    image = transform(image)
-    image = image.unsqueeze(0)  # Add batch dimension
-    return image
-
-def predict(model, image_path, class_names):
-    image = preprocess_image(image_path)
-    outputs = model(image)
-    _, preds = torch.max(outputs, 1)
-    predicted_class = class_names[preds.item()]
-    return predicted_class
-
-def show_image_with_prediction(image_path, predicted_class):
-    image = Image.open(image_path)
-    plt.imshow(image)
-    plt.title(f'Predicted: {predicted_class}')
-    plt.axis('off')
-    plt.show()
-
-def main():
-    parser = argparse.ArgumentParser(description='Load model and make a prediction.')
-    parser.add_argument('--model', type=str, required=True,
-                        help='path to the model file')
-    parser.add_argument('--image', type=str, required=True,
-                        help='path to the image for prediction')
-    
-    args = parser.parse_args()
-    model_path = args.model
-    image_path = args.image
-
-    class_names = ['Normal', 'Viral Pneumonia', 'COVID']
-
-    model = load_model(model_path, class_names)
-    predicted_class = predict(model, image_path, class_names)
-    print(f'The predicted class for the image is: {predicted_class}')
-    show_image_with_prediction(image_path, predicted_class)
-
-if __name__ == '__main__':
-    main()

test/manual/algo/iris/README.md

@@ -1,17 +0,0 @@
-# Algorithm
-
-Agent accepts binaries programs. To use the python program you need to bundle or compile it.
-In this example we'll use [pyinstaller](https://pypi.org/project/pyinstaller/)
-
-```shell
-pip install pandas scikit-learn
-pip install -U pyinstaller
-pyinstaller --onefile lin_reg.py
-```
-
-Make the binary static:
-
-```shell
-pip install staticx
-staticx <dynamic_binary_file_path> <output_file_path> 
-```

test/manual/algo/lin_reg.py

@@ -6,8 +6,8 @@ import pandas as pd
 from sklearn.model_selection import train_test_split
 from sklearn.linear_model import LogisticRegression
 
-csv_file_path = sys.argv[2]
-iris = pd.read_csv(csv_file_path)
+dataset = sys.argv[1]
+iris = pd.read_csv(io.StringIO(dataset))
 
 # Droping the Species since we only need the measurements
 X = iris.drop(['Species'], axis=1)
@@ -30,7 +30,7 @@ joblib.dump(log_reg, model_buffer)
 model_bytes = model_buffer.getvalue()
 
 # Define the path for the Unix domain socket
-socket_path = sys.argv[1]
+socket_path = sys.argv[2]
 
 # Create a Unix domain socket client
 client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)

test/manual/computation/computation.json

@@ -1,15 +0,0 @@
-{
-  "snp_policy": {
-      "minimum_guest_svn": 0,
-      "policy": 196608,
-      "minimum_tcb": 1,
-      "minimum_version": "1.0",
-      "minimum_launch_tcb": 1,
-      "measurement": [232, 141, 188, 114, 162, 221, 214, 6, 150, 248, 3, 173, 230, 39, 48, 120, 105, 243, 15, 242, 79, 67, 112, 128, 44, 119, 216, 226, 170, 255, 212, 154, 58, 68, 231, 30, 20, 235, 228, 42, 43, 1, 95, 191, 51, 113, 19, 72],
-      "minimum_build": 1
-    },
-  "root_of_trust": {
-      "product": "Milan",
-      "check_crl": true
-  }
-}