Migration towards pureconfig

build.gradle

@@ -128,6 +128,8 @@ dependencies {
   implementation 'com.typesafe:config:1.4.3'
   implementation "com.github.carueda:tscfg_2.13:$tscfgVersion"
   implementation "com.github.scopt:scopt_${scalaVersion}:4.1.0" // cmd args parser
+  //TODO: Remove carueda version
+  implementation "com.github.pureconfig:pureconfig_2.13:0.17.4"
 
   // JTS
   implementation ("org.locationtech.jts:jts-core:${jtsVersion}"){

input/samples/vn_simona/vn_simona.conf

@@ -104,8 +104,8 @@ simona.output.thermal = {
 ##################################################################
 # Runtime Configuration // todo refactor as this naming is misleading and partly unneeded
 ##################################################################
-simona.runtime.selected_subgrids = []
-simona.runtime.selected_volt_lvls = []
+simona.runtime.selectedSubgrids = []
+simona.runtime.selectedVoltLvls = []
 
 simona.runtime.participant.load = {
   defaultConfig = {

src/main/scala/edu/ie3/simona/agent/em/EmAgent.scala

@@ -10,7 +10,7 @@ import edu.ie3.datamodel.models.input.EmInput
 import edu.ie3.datamodel.models.result.system.{EmResult, FlexOptionsResult}
 import edu.ie3.simona.agent.participant.data.Data.PrimaryData.ApparentPower
 import edu.ie3.simona.agent.participant.statedata.BaseStateData.FlexControlledData
-import edu.ie3.simona.config.SimonaConfig.EmRuntimeConfig
+import edu.ie3.simona.config.RuntimeConfig.EmRuntimeConfig
 import edu.ie3.simona.event.ResultEvent
 import edu.ie3.simona.event.ResultEvent.{
   FlexOptionsResultEvent,

src/main/scala/edu/ie3/simona/agent/grid/DBFSAlgorithm.scala

@@ -49,7 +49,7 @@ import org.apache.pekko.util.{Timeout => PekkoTimeout}
 import org.slf4j.Logger
 import squants.Each
 
-import java.time.{Duration, ZonedDateTime}
+import java.time.{ZonedDateTime, Duration => JavaDuration}
 import java.util.UUID
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success}
@@ -1161,7 +1161,7 @@ trait DBFSAlgorithm extends PowerFlowSupport with GridResultsSupport {
       sweepValueStore: Option[SweepValueStore],
       nodeToAssetAgents: Map[UUID, Set[ActorRef[ParticipantMessage]]],
       refSystem: RefSystem,
-      askTimeout: Duration,
+      askTimeout: JavaDuration,
   )(implicit
       ctx: ActorContext[GridAgent.Request]
   ): Boolean = {
@@ -1239,11 +1239,12 @@ trait DBFSAlgorithm extends PowerFlowSupport with GridResultsSupport {
       currentSweepNo: Int,
       subGridGateToActorRef: Map[SubGridGate, ActorRef[GridAgent.Request]],
       inferiorGridGates: Seq[SubGridGate],
-      askTimeout: Duration,
+      askTimeout: JavaDuration,
   )(implicit
       ctx: ActorContext[GridAgent.Request]
   ): Boolean = {
-    implicit val timeout: PekkoTimeout = PekkoTimeout.create(askTimeout)
+    implicit val timeout: PekkoTimeout =
+      PekkoTimeout.create(JavaDuration.ofSeconds(askTimeout.toSeconds))
     implicit val ec: ExecutionContext = ctx.executionContext
     implicit val scheduler: Scheduler = ctx.system.scheduler
 
@@ -1310,11 +1311,12 @@ trait DBFSAlgorithm extends PowerFlowSupport with GridResultsSupport {
       currentSweepNo: Int,
       subGridGateToActorRef: Map[SubGridGate, ActorRef[GridAgent.Request]],
       superiorGridGates: Vector[SubGridGate],
-      askTimeout: Duration,
+      askTimeout: JavaDuration,
   )(implicit
       ctx: ActorContext[GridAgent.Request]
   ): Boolean = {
-    implicit val timeout: PekkoTimeout = PekkoTimeout.create(askTimeout)
+    implicit val timeout: PekkoTimeout =
+      PekkoTimeout.create(JavaDuration.ofSeconds(askTimeout.toSeconds))
     implicit val ec: ExecutionContext = ctx.executionContext
     implicit val scheduler: Scheduler = ctx.system.scheduler
 

src/main/scala/edu/ie3/simona/agent/grid/GridAgent.scala

@@ -55,12 +55,10 @@ object GridAgent extends DBFSAlgorithm {
         context.messageAdapter[Activation](msg => WrappedActivation(msg))
 
       // val initialization
-      val resolution: Long = simonaConfig.simona.powerflow.resolution.get(
-        ChronoUnit.SECONDS
-      ) // this determines the agents regular time bin it wants to be triggered e.g one hour
+      val resolution: Long = simonaConfig.powerflow.resolution.toSeconds
 
       val simStartTime: ZonedDateTime = TimeUtil.withDefaults
-        .toZonedDateTime(simonaConfig.simona.time.startDateTime)
+        .toZonedDateTime(simonaConfig.time.startDateTime)
 
       val agentValues = GridAgentConstantData(
         environmentRefs,
@@ -128,10 +126,10 @@ object GridAgent extends DBFSAlgorithm {
         subGridContainer,
         refSystem,
         TimeUtil.withDefaults.toZonedDateTime(
-          constantData.simonaConfig.simona.time.startDateTime
+          constantData.simonaConfig.time.startDateTime
         ),
         TimeUtil.withDefaults.toZonedDateTime(
-          constantData.simonaConfig.simona.time.endDateTime
+          constantData.simonaConfig.time.endDateTime
         ),
         simonaConfig,
       )
@@ -142,9 +140,9 @@ object GridAgent extends DBFSAlgorithm {
           constantData.environmentRefs,
           constantData.simStartTime,
           TimeUtil.withDefaults
-            .toZonedDateTime(constantData.simonaConfig.simona.time.endDateTime),
-          constantData.simonaConfig.simona.runtime.participant,
-          constantData.simonaConfig.simona.output.participant,
+            .toZonedDateTime(constantData.simonaConfig.time.endDateTime),
+          constantData.simonaConfig.runtime.participant,
+          constantData.simonaConfig.output.participant,
           constantData.resolution,
           constantData.listener,
           ctx.log,
@@ -174,11 +172,11 @@ object GridAgent extends DBFSAlgorithm {
         gridAgentInitData.superiorGridNodeUuids,
         gridAgentInitData.inferiorGridGates,
         PowerFlowParams(
-          constantData.simonaConfig.simona.powerflow.maxSweepPowerDeviation,
-          constantData.simonaConfig.simona.powerflow.newtonraphson.epsilon.toVector.sorted,
-          constantData.simonaConfig.simona.powerflow.newtonraphson.iterations,
-          constantData.simonaConfig.simona.powerflow.sweepTimeout,
-          constantData.simonaConfig.simona.powerflow.stopOnFailure,
+          constantData.simonaConfig.powerflow.maxSweepPowerDeviation,
+          constantData.simonaConfig.powerflow.newtonraphson.epsilon.toVector.sorted,
+          constantData.simonaConfig.powerflow.newtonraphson.iterations,
+          constantData.simonaConfig.powerflow.sweepTimeOut,
+          constantData.simonaConfig.powerflow.resolution,
         ),
         SimonaActorNaming.actorName(ctx.self),
       )

src/main/scala/edu/ie3/simona/agent/grid/GridAgentController.scala

@@ -25,8 +25,8 @@ import edu.ie3.simona.agent.participant.pv.PvAgent
 import edu.ie3.simona.agent.participant.statedata.ParticipantStateData.ParticipantInitializeStateData
 import edu.ie3.simona.agent.participant.storage.StorageAgent
 import edu.ie3.simona.agent.participant.wec.WecAgent
-import edu.ie3.simona.config.SimonaConfig
-import edu.ie3.simona.config.SimonaConfig._
+import edu.ie3.simona.config.OutputConfig.ParticipantOutputConfig
+import edu.ie3.simona.config.RuntimeConfig._
 import edu.ie3.simona.event.ResultEvent
 import edu.ie3.simona.event.notifier.NotifierConfig
 import edu.ie3.simona.exceptions.CriticalFailureException
@@ -75,8 +75,8 @@ class GridAgentController(
     environmentRefs: EnvironmentRefs,
     simulationStartDate: ZonedDateTime,
     simulationEndDate: ZonedDateTime,
-    participantsConfig: SimonaConfig.Simona.Runtime.Participant,
-    outputConfig: SimonaConfig.Simona.Output.Participant,
+    participantsConfig: RuntimeParticipantsConfig,
+    outputConfig: ParticipantOutputConfig,
     resolution: Long,
     listener: Iterable[ActorRef[ResultEvent]],
     log: Logger,
@@ -174,8 +174,8 @@ class GridAgentController(
     *   A map from coupling point to set of actor references
     */
   private def buildParticipantToActorRef(
-      participantsConfig: SimonaConfig.Simona.Runtime.Participant,
-      outputConfig: SimonaConfig.Simona.Output.Participant,
+      participantsConfig: RuntimeParticipantsConfig,
+      outputConfig: ParticipantOutputConfig,
       participants: Vector[SystemParticipantInput],
       thermalIslandGridsByBusId: Map[UUID, ThermalGrid],
       environmentRefs: EnvironmentRefs,
@@ -355,7 +355,7 @@ class GridAgentController(
     case input: PvInput =>
       buildPv(
         input,
-        participantConfigUtil.getOrDefault[PvRuntimeConfig](
+        participantConfigUtil.getOrDefault[SimpleRuntimeConfig](
           input.getUuid
         ),
         environmentRefs.primaryServiceProxy,
@@ -370,7 +370,7 @@ class GridAgentController(
     case input: WecInput =>
       buildWec(
         input,
-        participantConfigUtil.getOrDefault[WecRuntimeConfig](
+        participantConfigUtil.getOrDefault[SimpleRuntimeConfig](
           input.getUuid
         ),
         environmentRefs.primaryServiceProxy,
@@ -385,7 +385,7 @@ class GridAgentController(
     case input: EvcsInput =>
       buildEvcs(
         input,
-        participantConfigUtil.getOrDefault[EvcsRuntimeConfig](
+        participantConfigUtil.getOrDefault[SimpleRuntimeConfig](
           input.getUuid
         ),
         environmentRefs.primaryServiceProxy,
@@ -407,7 +407,7 @@ class GridAgentController(
           buildHp(
             hpInput,
             thermalGrid,
-            participantConfigUtil.getOrDefault[HpRuntimeConfig](
+            participantConfigUtil.getOrDefault[SimpleRuntimeConfig](
               hpInput.getUuid
             ),
             environmentRefs.primaryServiceProxy,
@@ -424,7 +424,7 @@ class GridAgentController(
     case input: StorageInput =>
       buildStorage(
         input,
-        participantConfigUtil.getOrDefault[StorageRuntimeConfig](
+        participantConfigUtil.getOrDefault[SimpleRuntimeConfig](
           input.getUuid
         ),
         environmentRefs.primaryServiceProxy,
@@ -587,7 +587,7 @@ class GridAgentController(
     */
   private def buildPv(
       pvInput: PvInput,
-      modelConfiguration: PvRuntimeConfig,
+      modelConfiguration: SimpleRuntimeConfig,
       primaryServiceProxy: ClassicRef,
       weatherService: ClassicRef,
       simulationStartDate: ZonedDateTime,
@@ -647,7 +647,7 @@ class GridAgentController(
     */
   private def buildEvcs(
       evcsInput: EvcsInput,
-      modelConfiguration: EvcsRuntimeConfig,
+      modelConfiguration: SimpleRuntimeConfig,
       primaryServiceProxy: ClassicRef,
       evMovementsService: ClassicRef,
       simulationStartDate: ZonedDateTime,
@@ -707,7 +707,7 @@ class GridAgentController(
   private def buildHp(
       hpInput: HpInput,
       thermalGrid: ThermalGrid,
-      modelConfiguration: HpRuntimeConfig,
+      modelConfiguration: SimpleRuntimeConfig,
       primaryServiceProxy: ClassicRef,
       weatherService: ClassicRef,
       requestVoltageDeviationThreshold: Double,
@@ -765,7 +765,7 @@ class GridAgentController(
     */
   private def buildWec(
       wecInput: WecInput,
-      modelConfiguration: WecRuntimeConfig,
+      modelConfiguration: SimpleRuntimeConfig,
       primaryServiceProxy: ClassicRef,
       weatherService: ClassicRef,
       simulationStartDate: ZonedDateTime,
@@ -823,7 +823,7 @@ class GridAgentController(
     */
   private def buildStorage(
       storageInput: StorageInput,
-      modelConfiguration: SimonaConfig.StorageRuntimeConfig,
+      modelConfiguration: SimpleRuntimeConfig,
       primaryServiceProxy: ClassicRef,
       simulationStartDate: ZonedDateTime,
       simulationEndDate: ZonedDateTime,

src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgent.scala

@@ -33,6 +33,10 @@ import edu.ie3.simona.agent.state.ParticipantAgentState.{
   Calculate,
   HandleInformation,
 }
+import edu.ie3.simona.config.RuntimeConfig.{
+  BaseRuntimeConfig,
+  SimpleRuntimeConfig,
+}
 import edu.ie3.simona.agent.{SimonaAgent, ValueStore}
 import edu.ie3.simona.config.SimonaConfig
 import edu.ie3.simona.event.notifier.NotifierConfig
@@ -47,9 +51,9 @@ import edu.ie3.simona.model.participant.{
 }
 import edu.ie3.simona.ontology.messages.Activation
 import edu.ie3.simona.ontology.messages.flex.FlexibilityMessage.{
+  FlexActivation,
   FlexResponse,
   IssueFlexControl,
-  FlexActivation,
 }
 import edu.ie3.simona.ontology.messages.services.ServiceMessage.RegistrationResponseMessage.RegistrationSuccessfulMessage
 import edu.ie3.simona.ontology.messages.services.ServiceMessage.{
@@ -94,7 +98,7 @@ abstract class ParticipantAgent[
     MS <: ModelState,
     D <: ParticipantStateData[PD],
     I <: SystemParticipantInput,
-    MC <: SimonaConfig.BaseRuntimeConfig,
+    MC <: BaseRuntimeConfig,
     M <: SystemParticipant[CD, PD, MS],
 ](
     scheduler: ActorRef,
@@ -262,7 +266,7 @@ abstract class ParticipantAgent[
           RegistrationSuccessfulMessage(serviceRef, maybeNextDataTick),
           ParticipantInitializingStateData(
             inputModel: InputModelContainer[I],
-            modelConfig: MC,
+            modelConfig: SimpleRuntimeConfig,
             _,
             simulationStartDate,
             simulationEndDate,
@@ -290,7 +294,7 @@ abstract class ParticipantAgent[
           RegistrationResponseMessage.RegistrationFailedMessage(_),
           ParticipantInitializingStateData(
             inputModel: InputModelContainer[I],
-            modelConfig: MC,
+            modelConfig: SimpleRuntimeConfig,
             secondaryDataServices,
             simulationStartDate,
             simulationEndDate,
@@ -509,7 +513,7 @@ abstract class ParticipantAgent[
     */
   def initializeParticipantForPrimaryDataReplay(
       inputModel: InputModelContainer[I],
-      modelConfig: MC,
+      modelConfig: SimpleRuntimeConfig,
       simulationStartDate: ZonedDateTime,
       simulationEndDate: ZonedDateTime,
       resolution: Long,
@@ -546,7 +550,7 @@ abstract class ParticipantAgent[
     */
   def initializeParticipantForModelCalculation(
       inputModel: InputModelContainer[I],
-      modelConfig: MC,
+      modelConfig: SimpleRuntimeConfig,
       services: Iterable[SecondaryDataService[_ <: SecondaryData]],
       simulationStartDate: ZonedDateTime,
       simulationEndDate: ZonedDateTime,

src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala

@@ -49,7 +49,10 @@ import edu.ie3.simona.agent.state.ParticipantAgentState.{
   Calculate,
   HandleInformation,
 }
-import edu.ie3.simona.config.SimonaConfig
+import edu.ie3.simona.config.RuntimeConfig.{
+  BaseRuntimeConfig,
+  SimpleRuntimeConfig,
+}
 import edu.ie3.simona.event.ResultEvent
 import edu.ie3.simona.event.ResultEvent.{
   FlexOptionsResultEvent,
@@ -108,7 +111,7 @@ protected trait ParticipantAgentFundamentals[
     MS <: ModelState,
     D <: ParticipantStateData[PD],
     I <: SystemParticipantInput,
-    MC <: SimonaConfig.BaseRuntimeConfig,
+    MC <: BaseRuntimeConfig,
     M <: SystemParticipant[CD, PD, MS],
 ] extends ServiceRegistration[PD, CD, MS, D, I, MC, M] {
   this: ParticipantAgent[PD, CD, MS, D, I, MC, M] =>
@@ -117,7 +120,7 @@ protected trait ParticipantAgentFundamentals[
 
   override def initializeParticipantForPrimaryDataReplay(
       inputModel: InputModelContainer[I],
-      modelConfig: MC,
+      modelConfig: SimpleRuntimeConfig,
       simulationStartDate: ZonedDateTime,
       simulationEndDate: ZonedDateTime,
       resolution: Long,
@@ -170,7 +173,7 @@ protected trait ParticipantAgentFundamentals[
     */
   private def determineFromOutsideBaseStateData(
       inputModel: InputModelContainer[I],
-      modelConfig: MC,
+      modelConfig: SimpleRuntimeConfig,
       simulationStartDate: ZonedDateTime,
       simulationEndDate: ZonedDateTime,
       resolution: Long,
@@ -222,7 +225,7 @@ protected trait ParticipantAgentFundamentals[
     */
   def buildModel(
       inputModel: InputModelContainer[I],
-      modelConfig: MC,
+      modelConfig: SimpleRuntimeConfig,
       simulationStartDate: ZonedDateTime,
       simulationEndDate: ZonedDateTime,
   ): M
@@ -257,7 +260,7 @@ protected trait ParticipantAgentFundamentals[
     */
   override def initializeParticipantForModelCalculation(
       inputModel: InputModelContainer[I],
-      modelConfig: MC,
+      modelConfig: SimpleRuntimeConfig,
       services: Iterable[SecondaryDataService[_ <: SecondaryData]],
       simulationStartDate: ZonedDateTime,
       simulationEndDate: ZonedDateTime,
@@ -337,7 +340,7 @@ protected trait ParticipantAgentFundamentals[
     */
   def determineModelBaseStateData(
       inputModel: InputModelContainer[I],
-      modelConfig: MC,
+      modelConfig: SimpleRuntimeConfig,
       services: Iterable[SecondaryDataService[_ <: SecondaryData]],
       simulationStartDate: ZonedDateTime,
       simulationEndDate: ZonedDateTime,