Connect to dynamic simulation API with full parameters

pom.xml

@@ -90,6 +90,8 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- overrides of imports -->
+
             <!-- imports -->
             <dependency>
                 <groupId>org.gridsuite</groupId>
@@ -98,13 +100,16 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <!-- project specific dependencies -->
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
+        <!-- Compilation dependencies -->
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-network-store-iidm-impl</artifactId>
+            <artifactId>powsybl-iidm-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -132,15 +137,15 @@
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-dynawaltz</artifactId>
+            <artifactId>powsybl-dynamic-simulation-dsl</artifactId>
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-dynawaltz-dsl</artifactId>
+            <artifactId>powsybl-dynawaltz</artifactId>
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-dynamic-simulation-dsl</artifactId>
+            <artifactId>powsybl-dynawaltz-dsl</artifactId>
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
@@ -189,6 +194,12 @@
             <version>${h2database.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-commons</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-config-test</artifactId>

src/main/java/com/powsybl/dynamicsimulation/groovy/GroovyCurvesSupplier.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2020, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+package com.powsybl.dynamicsimulation.groovy;
+
+import com.powsybl.dsl.ExpressionDslLoader;
+import com.powsybl.dsl.GroovyScripts;
+import com.powsybl.dynamicsimulation.Curve;
+import com.powsybl.dynamicsimulation.CurvesSupplier;
+import com.powsybl.iidm.network.Network;
+import groovy.lang.Binding;
+import groovy.lang.GroovyCodeSource;
+import groovy.lang.GroovyShell;
+import org.codehaus.groovy.control.CompilerConfiguration;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * TODO: remove and use core one when switching to 5.1.0
+ * @author Mathieu Bague <[email protected]>
+ */
+public class GroovyCurvesSupplier implements CurvesSupplier {
+
+    private final GroovyCodeSource codeSource;
+
+    private final List<CurveGroovyExtension> extensions;
+
+    public GroovyCurvesSupplier(InputStream is, List<CurveGroovyExtension> extensions) {
+        this.codeSource = GroovyScripts.load(is);
+        this.extensions = Objects.requireNonNull(extensions);
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public List<Curve> get(Network network) {
+        List<Curve> curves = new ArrayList<>();
+
+        Binding binding = new Binding();
+        binding.setVariable("network", network);
+
+        ExpressionDslLoader.prepareClosures(binding);
+        extensions.forEach(e -> e.load(binding, curves::add));
+
+        GroovyShell shell = new GroovyShell(binding, new CompilerConfiguration());
+        shell.evaluate(codeSource);
+
+        return curves;
+    }
+}

src/main/java/com/powsybl/dynamicsimulation/groovy/GroovyEventModelsSupplier.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2020, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+package com.powsybl.dynamicsimulation.groovy;
+
+import com.powsybl.dsl.ExpressionDslLoader;
+import com.powsybl.dsl.GroovyScripts;
+import com.powsybl.dynamicsimulation.EventModel;
+import com.powsybl.dynamicsimulation.EventModelsSupplier;
+import com.powsybl.iidm.network.Network;
+import groovy.lang.Binding;
+import groovy.lang.GroovyCodeSource;
+import groovy.lang.GroovyShell;
+import org.codehaus.groovy.control.CompilerConfiguration;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * TODO: remove and use core one when switching to 5.1.0
+ * @author Marcos de Miguel <demiguelm at aia.es>
+ */
+public class GroovyEventModelsSupplier implements EventModelsSupplier {
+
+    private final GroovyCodeSource codeSource;
+
+    private final List<EventModelGroovyExtension> extensions;
+
+    public GroovyEventModelsSupplier(InputStream is, List<EventModelGroovyExtension> extensions) {
+        this.codeSource = GroovyScripts.load(is);
+        this.extensions = Objects.requireNonNull(extensions);
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public List<EventModel> get(Network network) {
+        List<EventModel> eventModels = new ArrayList<>();
+
+        Binding binding = new Binding();
+        binding.setVariable("network", network);
+
+        ExpressionDslLoader.prepareClosures(binding);
+        extensions.forEach(e -> e.load(binding, eventModels::add));
+
+        GroovyShell shell = new GroovyShell(binding, new CompilerConfiguration());
+        shell.evaluate(codeSource);
+
+        return eventModels;
+    }
+}

src/main/java/org/gridsuite/ds/server/DynamicSimulationApi.java

@@ -10,10 +10,10 @@
  * @author Abdelsalem Hedhili <abdelsalem.hedhili at rte-france.com>
  */
 
-final class DynamicSimulationApi {
+public final class DynamicSimulationApi {
 
     private DynamicSimulationApi() {
     }
 
-    static final String API_VERSION = "v1";
+    public static final String API_VERSION = "v1";
 }

src/main/java/org/gridsuite/ds/server/DynamicSimulationSwaggerConfig.java → src/main/java/org/gridsuite/ds/server/config/SwaggerConfig.java

@@ -1,21 +1,22 @@
-/**
- * Copyright (c) 2021, RTE (http://www.rte-france.com)
+/*
+ * Copyright (c) 2021-2022, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.ds.server;
+package org.gridsuite.ds.server.config;
 
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
+import org.gridsuite.ds.server.DynamicSimulationApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * @author Abdelsalem Hedhili <abdelsalem.hedhili at rte-france.com>
  */
 @Configuration
-public class DynamicSimulationSwaggerConfig {
+public class SwaggerConfig {
 
     @Bean
     public OpenAPI createOpenApi() {

src/main/java/org/gridsuite/ds/server/DynamicSimulationController.java → src/main/java/org/gridsuite/ds/server/controller/DynamicSimulationController.java

@@ -4,30 +4,31 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.ds.server;
+package org.gridsuite.ds.server.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.gridsuite.ds.server.dto.DynamicSimulationStatus;
 import org.gridsuite.ds.server.service.DynamicSimulationService;
 import org.springframework.boot.context.properties.bind.DefaultValue;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.codec.multipart.FilePart;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;
 
 import java.util.UUID;
 
-import static org.springframework.http.MediaType.*;
+import static org.gridsuite.ds.server.DynamicSimulationApi.API_VERSION;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
  * @author Abdelsalem Hedhili <abdelsalem.hedhili at rte-france.com>
  */
 @RestController
-@RequestMapping(value = "/" + DynamicSimulationApi.API_VERSION)
+@RequestMapping(value = "/" + API_VERSION)
 @Tag(name = "Dynamic simulation server")
 public class DynamicSimulationController {
 
@@ -44,17 +45,28 @@ public ResponseEntity<Mono<UUID>> run(@PathVariable("networkUuid") UUID networkU
                                           @RequestParam(name = "variantId", required = false) String variantId,
                                           @DefaultValue("0") @RequestParam("startTime") int startTime,
                                           @RequestParam("stopTime") int stopTime,
-                                          @RequestPart("dynamicModel") FilePart dynamicModel) {
-        Mono<UUID> resultUuid = dynamicSimulationService.runAndSaveResult(networkUuid, variantId, startTime, stopTime, dynamicModel);
+                                          @RequestParam("mappingName") String mappingName,
+                                          @RequestParam(name = "receiver", required = false) String receiver) {
+        Mono<UUID> resultUuid = dynamicSimulationService.runAndSaveResult(receiver, networkUuid, variantId, startTime, stopTime, mappingName);
         return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(resultUuid);
     }
 
-    @GetMapping(value = "/results/{resultUuid}", produces = "application/json")
+    @GetMapping(value = "/results/{resultUuid}/timeseries", produces = "application/json")
     @Operation(summary = "Get a dynamic simulation result from the database")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The dynamic simulation result"),
         @ApiResponse(responseCode = "404", description = "Dynamic simulation result has not been found")})
-    public Mono<ResponseEntity<Boolean>> getResult(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid) {
-        Mono<Boolean> result = dynamicSimulationService.getResult(resultUuid);
+    public Mono<ResponseEntity<UUID>> getTimeSeriesResult(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid) {
+        Mono<UUID> result = dynamicSimulationService.getTimeSeriesId(resultUuid);
+        return result.map(r -> ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(r))
+                .defaultIfEmpty(ResponseEntity.notFound().build());
+    }
+
+    @GetMapping(value = "/results/{resultUuid}/timeline", produces = "application/json")
+    @Operation(summary = "Get a dynamic simulation result from the database")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The dynamic simulation result"),
+        @ApiResponse(responseCode = "404", description = "Dynamic simulation result has not been found")})
+    public Mono<ResponseEntity<UUID>> getTimeLineResult(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid) {
+        Mono<UUID> result = dynamicSimulationService.getTimeLineId(resultUuid);
         return result.map(r -> ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(r))
                 .defaultIfEmpty(ResponseEntity.notFound().build());
     }
@@ -63,8 +75,8 @@ public Mono<ResponseEntity<Boolean>> getResult(@Parameter(description = "Result
     @Operation(summary = "Get the dynamic simulation status from the database")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The dynamic simulation status"),
         @ApiResponse(responseCode = "404", description = "Dynamic simulation status has not been found")})
-    public Mono<ResponseEntity<String>> getStatus(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid) {
-        Mono<String> result = dynamicSimulationService.getStatus(resultUuid);
+    public Mono<ResponseEntity<DynamicSimulationStatus>> getStatus(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid) {
+        Mono<DynamicSimulationStatus> result = dynamicSimulationService.getStatus(resultUuid);
         return result.map(r -> ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(r))
                 .defaultIfEmpty(ResponseEntity.notFound().build());
     }
@@ -85,4 +97,12 @@ public ResponseEntity<Mono<Void>> deleteResults() {
         return ResponseEntity.ok().body(result);
     }
 
+    @PutMapping(value = "/results/{resultUuid}/stop", produces = APPLICATION_JSON_VALUE)
+    @Operation(summary = "Stop a dynamic simulation computation")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The dynamic simulation has been stopped")})
+    public ResponseEntity<Mono<Void>> stop(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid,
+                                           @Parameter(description = "Result receiver") @RequestParam(name = "receiver", required = false) String receiver) {
+        Mono<Void> result = dynamicSimulationService.stop(receiver, resultUuid);
+        return ResponseEntity.ok().body(result);
+    }
 }

src/main/java/org/gridsuite/ds/server/dto/DynamicSimulationStatus.java

@@ -10,6 +10,8 @@
  * @author Abdelsalem Hedhili <abdelsalem.hedhili at rte-france.com>
  */
 public enum DynamicSimulationStatus {
+    NOT_DONE,
     RUNNING,
-    COMPLETED
+    CONVERGED,
+    DIVERGED
 }

src/main/java/org/gridsuite/ds/server/dto/dynamicmapping/Script.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2022, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.ds.server.dto.dynamicmapping;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author Thang PHAM <quyet-thang.pham at rte-france.com>
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+public class Script {
+
+    private String name;
+
+    // name of the original mapping
+    private String parentName;
+
+    private String script;
+
+    private Date createdDate;
+
+    private String parametersFile;
+
+}

src/main/java/org/gridsuite/ds/server/dto/timeseries/TimeSeriesGroupInfos.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.ds.server.dto.timeseries;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.UUID;
+
+/**
+ * @author Thang PHAM <quyet-thang.pham at rte-france.com>
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+public class TimeSeriesGroupInfos {
+
+    private UUID id;
+}

src/main/java/org/gridsuite/ds/server/repository/AbstractManuallyAssignedIdentifierEntity.java → src/main/java/org/gridsuite/ds/server/model/AbstractManuallyAssignedIdentifierEntity.java

@@ -4,7 +4,7 @@
   License, v. 2.0. If a copy of the MPL was not distributed with this
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.ds.server.repository;
+package org.gridsuite.ds.server.model;
 
 import org.springframework.data.domain.Persistable;