From 97a732b24fdb785b65c68c0988aadd5622c7fab5 Mon Sep 17 00:00:00 2001 From: Nicolas Thouvenin Date: Fri, 18 Oct 2024 09:23:03 +0200 Subject: [PATCH 1/4] release ws-data-computer@2.15.1 --- services/data-computer/README.md | 2 +- services/data-computer/package.json | 2 +- services/data-computer/swagger.json | 2 +- services/data-computer/tests.hurl | 2 +- services/data-computer/v1/group-by.ini | 7 +++++++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/services/data-computer/README.md b/services/data-computer/README.md index 78596844..6cb20ed2 100644 --- a/services/data-computer/README.md +++ b/services/data-computer/README.md @@ -1,4 +1,4 @@ -# ws-data-computer@2.15.0 +# ws-data-computer@2.15.1 Le service `data-computer` offre plusieurs services **asynchrones** pour des calculs et de transformations de données simples. diff --git a/services/data-computer/package.json b/services/data-computer/package.json index 65c124f5..65cc8b01 100644 --- a/services/data-computer/package.json +++ b/services/data-computer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "ws-data-computer", - "version": "2.15.0", + "version": "2.15.1", "description": "Calculs sur fichier corpus compressé", "repository": { "type": "git", diff --git a/services/data-computer/swagger.json b/services/data-computer/swagger.json index 910be1e6..84955963 100644 --- a/services/data-computer/swagger.json +++ b/services/data-computer/swagger.json @@ -3,7 +3,7 @@ "info": { "title": "data-computer - Calculs sur fichier corpus compressé", "summary": "Calculs sur un corpus compressé", - "version": "2.15.0", + "version": "2.15.1", "termsOfService": "https://services.istex.fr/", "contact": { "name": "Inist-CNRS", diff --git a/services/data-computer/tests.hurl b/services/data-computer/tests.hurl index 56aa93e4..2f8465f3 100644 --- a/services/data-computer/tests.hurl +++ b/services/data-computer/tests.hurl @@ -106,7 +106,7 @@ delay: 2000 ``` HTTP 200 -[{"id":"#1","value":["#1","#4"]},{"id":"#4","value":["#1","#4"]},{"id":"#2","value":["#2","#5"]},{"id":"#5","value":["#2","#5"]},{"id":"#3","value":["#3"]}] +[{"id":"#1","value":["#4"]},{"id":"#4","value":["#1"]},{"id":"#2","value":["#5"]},{"id":"#5","value":["#2"]},{"id":"#3","value":[]}] # # TODO: ajouter les deux autres routes (v1GraphSegment, v1Lda) diff --git a/services/data-computer/v1/group-by.ini b/services/data-computer/v1/group-by.ini index 5d68b023..bb54b299 100644 --- a/services/data-computer/v1/group-by.ini +++ b/services/data-computer/v1/group-by.ini @@ -84,6 +84,13 @@ value = get('id').last() # Step 2.1.3 (spécifique): On agrège le tout [fork/delegate/aggregate] +# Step 2.1.4 (spécifique): le champ id étant toujours présent dans le champ value on le supprime +[fork/delegate/replace] +path = id +value = get('id') +path = value +value = get('value').xor([self.id]) + [fork/transit] # Step 2.2 (générique): Enregistrer le résultat et signaler que le traitement est fini From 894aa0eaf60a3f8ba762fa5c770b535f343fea3f Mon Sep 17 00:00:00 2001 From: Nicolas Thouvenin Date: Fri, 18 Oct 2024 12:59:47 +0200 Subject: [PATCH 2/4] new port for a new release --- services/data-computer/swagger.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/data-computer/swagger.json b/services/data-computer/swagger.json index 84955963..e3ebc8d5 100644 --- a/services/data-computer/swagger.json +++ b/services/data-computer/swagger.json @@ -15,7 +15,7 @@ "x-comment": "Will be automatically completed by the ezs server." }, { - "url": "http://vptdmjobs.intra.inist.fr:49191/", + "url": "http://vptdmjobs.intra.inist.fr:49195/", "description": "Latest version for production", "x-profil": "Standard" } From c41aea60daad8283f5794d0af7a53838d43ba9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Parmentier?= Date: Mon, 21 Oct 2024 11:20:11 +0200 Subject: [PATCH 3/4] release ws-data-computer@2.16.1 --- services/data-computer/README.md | 2 +- services/data-computer/package.json | 4 ++-- services/data-computer/swagger.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/data-computer/README.md b/services/data-computer/README.md index 35ad6334..87323520 100644 --- a/services/data-computer/README.md +++ b/services/data-computer/README.md @@ -1,4 +1,4 @@ -# ws-data-computer@2.16.0 +# ws-data-computer@2.16.1 Le service `data-computer` offre plusieurs services **asynchrones** pour des calculs et de transformations de données simples. diff --git a/services/data-computer/package.json b/services/data-computer/package.json index b6a7dd28..7f93ffa9 100644 --- a/services/data-computer/package.json +++ b/services/data-computer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "ws-data-computer", - "version": "2.16.0", + "version": "2.16.1", "description": "Calculs sur fichier corpus compressé", "repository": { "type": "git", @@ -32,4 +32,4 @@ "start": "docker run --rm -p 31976:31976 cnrsinist/${npm_package_name}:${npm_package_version}", "publish": "docker push cnrsinist/${npm_package_name}:${npm_package_version}" } -} \ No newline at end of file +} diff --git a/services/data-computer/swagger.json b/services/data-computer/swagger.json index f5962c80..fd703e42 100644 --- a/services/data-computer/swagger.json +++ b/services/data-computer/swagger.json @@ -3,7 +3,7 @@ "info": { "title": "data-computer - Calculs sur fichier corpus compressé", "summary": "Calculs sur un corpus compressé", - "version": "2.16.0", + "version": "2.16.1", "termsOfService": "https://services.istex.fr/", "contact": { "name": "Inist-CNRS", From 85fa3debf02f1cce8d58a668d7eb2e0d742de8ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Parmentier?= Date: Mon, 21 Oct 2024 11:26:22 +0200 Subject: [PATCH 4/4] chore(data-computer): Update port --- package-lock.json | 2 +- services/data-computer/swagger.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34a19ea0..ec81146e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4481,7 +4481,7 @@ }, "services/data-computer": { "name": "ws-data-computer", - "version": "2.16.0", + "version": "2.16.1", "license": "MIT" }, "services/data-termsuite": { diff --git a/services/data-computer/swagger.json b/services/data-computer/swagger.json index fd703e42..761e6784 100644 --- a/services/data-computer/swagger.json +++ b/services/data-computer/swagger.json @@ -15,7 +15,7 @@ "x-comment": "Will be automatically completed by the ezs server." }, { - "url": "http://vptdmjobs.intra.inist.fr:49196/", + "url": "http://vptdmjobs.intra.inist.fr:49197/", "description": "Latest version for production", "x-profil": "Standard" }