updated service description

Author: ponachte

cli/src/create-service.ts

@@ -3,6 +3,7 @@ import { DataFactory } from "rdf-data-factory";
 import { Writer } from "n3";
 import { config, updateConfig } from "./config.js";
 import { AggregatorConfig } from "./config.template.js";
+import { format } from "path";
 
 const df = new DataFactory();
 
@@ -62,37 +63,36 @@ async function parseServiceRequest(
   tf: string,
   params: Record<string, string>
 ): Promise<string> {
-
   const writer = new Writer({
+    format: "turtle",
     prefixes: {
       trans: `${config.server.host}${config.server.tf}#`,
       fno: "https://w3id.org/function/ontology#",
+      fnoc: "https://w3id.org/function/vocabulary/composition#",
       rdf: "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
       xsd: "http://www.w3.org/2001/XMLSchema#",
+      agg: "https://spec.knows.idlab.ugent.be/aggregator-protocol/latest/#"
     }
   });
 
-  const execution = df.namedNode(`${agg.id}/${name}`);
+  const service = df.namedNode(`${agg.id}/${name}`);
+  const fnoc = (local: string) => df.namedNode(`https://w3id.org/function/vocabulary/composition#${local}`);
+  const aggNs = (local: string) => df.namedNode(`https://spec.knows.idlab.ugent.be/aggregator-protocol/latest/#${local}`);
 
-  writer.addQuad(
-    execution,
-    df.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-    df.namedNode("https://w3id.org/function/ontology#Execution")
+  const paramBindings = Object.entries(params).map(([key, value]) =>
+    writer.blank([
+      { predicate: fnoc("boundToTerm"),   object: df.literal(value) },
+      { predicate: fnoc("boundParameter"), object: df.namedNode(`${config.server.host}${config.server.tf}#${key}`) },
+    ])
   );
 
-  writer.addQuad(
-    execution,
-    df.namedNode("https://w3id.org/function/ontology#executes"),
-    df.namedNode(`${config.server.host}${config.server.tf}#${tf}`)
-  );
+  const application = writer.blank([
+    { predicate: fnoc("applies"), object: df.namedNode(`${config.server.host}${config.server.tf}#${tf}`) },
+    ...paramBindings.map(binding => ({ predicate: fnoc("parameterBinding"), object: binding })),
+  ]);
 
-  for (const [key, value] of Object.entries(params)) {
-    writer.addQuad(
-      execution,
-      df.namedNode(`${config.server.host}${config.server.tf}#${key}`),
-      df.literal(value)
-    );
-  }
+  writer.addQuad(service, df.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"), aggNs("Service"));
+  writer.addQuad(service, aggNs("applies"), application);
 
   return new Promise((resolve, reject) => {
     writer.end((error, result) => {

containers/aggregator/config/service_collection.go

@@ -89,7 +89,7 @@ func (collec *ServiceCollection) getServices(w http.ResponseWriter, _ *http.Requ
 
 	serviceList := []string{}
 	for _, service := range collec.services {
-		serviceList = append(serviceList, service.URI)
+		serviceList = append(serviceList, service.FullPath)
 	}
 
 	response := map[string][]string{
@@ -137,7 +137,7 @@ func generateServiceETag(repr []byte) string {
 func (collec *ServiceCollection) headService(w http.ResponseWriter, _ *http.Request, service model.Service) {
 	logrus.WithFields(logrus.Fields{"service_id": service.InstanceID}).Debug("Request HEAD for service")
 
-	repr, err := service.FnORepresentation()
+	repr, err := service.Description.FnORepresentation()
 	if err != nil {
 		logrus.WithError(err).Error("Failed to generate service FnO representation")
 		http.Error(w, "Internal server error", http.StatusInternalServerError)
@@ -154,7 +154,7 @@ func (collec *ServiceCollection) headService(w http.ResponseWriter, _ *http.Requ
 func (collec *ServiceCollection) getService(w http.ResponseWriter, _ *http.Request, service model.Service) {
 	logrus.WithFields(logrus.Fields{"service_id": service.InstanceID}).Info("Request GET for service")
 
-	repr, err := service.FnORepresentation()
+	repr, err := service.Description.FnORepresentation()
 	if err != nil {
 		logrus.WithError(err).Error("Failed to generate service FnO representation")
 		http.Error(w, "Internal server error", http.StatusInternalServerError)
@@ -199,7 +199,7 @@ func (collec *ServiceCollection) postService(w http.ResponseWriter, r *http.Requ
 	}
 
 	// Extraxt service Path and Id
-	servicePath, serviceId, err := services.ValidServiceUri(service.URI)
+	aggPath, serviceId, err := services.ValidServicePath(service.FullPath)
 	if err != nil {
 		http.Error(w, fmt.Sprintf("Invalid execution URI: %v", err), http.StatusBadRequest)
 		return
@@ -214,13 +214,9 @@ func (collec *ServiceCollection) postService(w http.ResponseWriter, r *http.Requ
 	}
 	collec.servicesMu.Unlock()
 
-	service.Path = servicePath
+	service.AggPath = aggPath
 	service.InstanceID = serviceId
 	service.NamespaceID = serviceId + "-" + model.ID
-	service.Outputs = make(map[string]string)
-	for pred := range service.Application.Transformation.OutputMapping {
-		service.Outputs[pred] = service.Application.Transformation.Base + pred
-	}
 
 	// Create service
 	err = services.DeployAggregatorService(service)
@@ -244,7 +240,7 @@ func (collec *ServiceCollection) postService(w http.ResponseWriter, r *http.Requ
 	collec.servicesMu.Unlock()
 
 	// Create service endpoint
-	err = collec.HandleFunc(servicePath, collec.HandleServiceEndpoint, []model.Scope{model.Read, model.Delete})
+	err = collec.HandleFunc(aggPath, collec.HandleServiceEndpoint, []model.Scope{model.Read, model.Delete})
 	if err != nil {
 		logrus.WithError(err).Errorf("Error registering handler for service %s", serviceId)
 		http.Error(w, "Failed to create service from request", http.StatusInternalServerError)
@@ -253,7 +249,7 @@ func (collec *ServiceCollection) postService(w http.ResponseWriter, r *http.Requ
 
 	// Create output endpoints
 	for pred := range service.Application.Transformation.OutputMapping {
-		path := servicePath + "/" + pred
+		path := aggPath + "/" + pred
 		predUri := service.Application.Transformation.Base + pred
 		outputUri, exists := service.Application.Transformation.Predicates[predUri]
 		if !exists {
@@ -273,7 +269,8 @@ func (collec *ServiceCollection) postService(w http.ResponseWriter, r *http.Requ
 	// Return service information
 	w.Header().Set("Content-Type", "text/turtle")
 
-	repr, err := service.FnORepresentation()
+	service.InitDescription()
+	repr, err := service.Description.FnORepresentation()
 	if err != nil {
 		logrus.WithError(err).Error("Failed to generate service FnO representation")
 		http.Error(w, "Failed to serialize response", http.StatusInternalServerError)

containers/aggregator/go.mod

@@ -5,7 +5,7 @@ go 1.23.0
 toolchain go1.23.8
 
 require (
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/google/uuid v1.6.0
 	github.com/sirupsen/logrus v1.9.3
 	golang.org/x/net v0.38.0 // indirect
 	k8s.io/api v0.32.3