From 5525fff1fe24851c6ffcbe2dc88f8f6581783f30 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Tue, 30 Jul 2024 09:00:51 +0200
Subject: [PATCH] pamhyr: Fix pep8.

---
 src/Model/Friction/Friction.py                       |  4 +++-
 src/Model/InitialConditions/InitialConditions.py     |  2 +-
 src/Model/LateralContribution/LateralContribution.py | 10 ++++++++--
 src/Model/Reservoir/Reservoir.py                     |  5 ++---
 src/Model/River.py                                   |  3 ++-
 src/Model/Scenario.py                                |  3 +--
 src/Model/SedimentLayer/SedimentLayer.py             |  2 +-
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py
index 09d8d225..d26c424d 100644
--- a/src/Model/Friction/Friction.py
+++ b/src/Model/Friction/Friction.py
@@ -75,6 +75,7 @@ class Friction(SQLSubModel):
             cls._db_update_to_0_1_0(execute, data)
 
         return cls._update_submodel(execute, version, data)
+
     @classmethod
     def _db_update_to_0_1_0(cls, execute, data):
         table = "friction"
@@ -125,7 +126,8 @@ class Friction(SQLSubModel):
             if int(begin_strickler_pid) != -1:
                 begin_strickler = next(
                     filter(
-                        lambda s: s.pamhyr_id == begin_strickler_pid, stricklers
+                        lambda s: s.pamhyr_id == begin_strickler_pid,
+                        stricklers
                     )
                 )
 
diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py
index ddbc2c66..3fc150d8 100644
--- a/src/Model/InitialConditions/InitialConditions.py
+++ b/src/Model/InitialConditions/InitialConditions.py
@@ -59,7 +59,7 @@ class Data(SQLSubModel):
     @classmethod
     def _db_create(cls, execute, ext=""):
         execute(f"""
-          CREATE TABLE initial_conditions(
+          CREATE TABLE initial_conditions{ext} (
             {cls.create_db_add_pamhyr_id()},
             ind INTEGER NOT NULL,
             name TEXT NOT NULL,
diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py
index b54741e2..5a924d4c 100644
--- a/src/Model/LateralContribution/LateralContribution.py
+++ b/src/Model/LateralContribution/LateralContribution.py
@@ -251,7 +251,8 @@ class LateralContribution(SQLSubModel):
         tab = data["tab"]
 
         table = execute(
-            "SELECT pamhyr_id, name, type, reach, begin_section, end_section " +
+            "SELECT pamhyr_id, name, type, " +
+            "reach, begin_section, end_section " +
             f"FROM lateral_contribution WHERE tab = '{tab}'"
         )
 
@@ -268,7 +269,12 @@ class LateralContribution(SQLSubModel):
             lc._end_section = None
 
             if row[3] != -1:
-                lc.reach = next(filter(lambda e: e.id == row[3], data["edges"]))
+                lc.reach = next(
+                    filter(
+                        lambda e: e.id == row[3],
+                        data["edges"]
+                    )
+                )
                 lc._begin_section = lc.reach.profile(row[4])
                 lc._end_section = lc.reach.profile(row[5])
 
diff --git a/src/Model/Reservoir/Reservoir.py b/src/Model/Reservoir/Reservoir.py
index 7ee924e2..a31f87fc 100644
--- a/src/Model/Reservoir/Reservoir.py
+++ b/src/Model/Reservoir/Reservoir.py
@@ -23,6 +23,7 @@ from Model.Scenario import Scenario
 
 logger = logging.getLogger()
 
+
 class Data(SQLSubModel):
     _sub_classes = []
 
@@ -121,12 +122,11 @@ class Data(SQLSubModel):
             "reservoir_data " +
             "(pamhyr_id, ind, elevation, surface, reservoir) " +
             "VALUES (" +
-            f"{pid}, {ind}, '{elevation}', {surface}, "+
+            f"{pid}, {ind}, '{elevation}', {surface}, " +
             f"{reservoir._pamhyr_id}" +
             ")"
         )
 
-
     def __getitem__(self, key):
         return self._data[key]
 
@@ -175,7 +175,6 @@ class Reservoir(SQLSubModel):
 
         return cls._update_submodel(execute, version, data)
 
-
     @classmethod
     def _db_update_to_0_1_0(cls, execute, data):
         table = "reservoir"
diff --git a/src/Model/River.py b/src/Model/River.py
index 5bdb29c9..e658ea76 100644
--- a/src/Model/River.py
+++ b/src/Model/River.py
@@ -123,7 +123,8 @@ class RiverNode(Node, SQLSubModel):
 
     def _db_save(self, execute, data=None):
         execute(
-            "INSERT OR REPLACE INTO river_node(pamhyr_id, name, x, y) VALUES (" +
+            "INSERT OR REPLACE INTO river_node(pamhyr_id, name, x, y) " +
+            "VALUES (" +
             f"{self._pamhyr_id}, " +
             f"'{self._db_format(self.name)}', " +
             f"{self.x}, {self.y}" +
diff --git a/src/Model/Scenario.py b/src/Model/Scenario.py
index dcbb4e82..d7cba13c 100644
--- a/src/Model/Scenario.py
+++ b/src/Model/Scenario.py
@@ -145,7 +145,7 @@ class Scenario(SQLSubModel):
         if self.parent is not None:
             parent = self.parent._id
 
-        sql = (
+        execute(
             "INSERT OR REPLACE INTO " +
             "scenario(id, name, description, revision, parent_id) " +
             "VALUES (" +
@@ -156,7 +156,6 @@ class Scenario(SQLSubModel):
             f"{parent}" +
             ")"
         )
-        execute(sql)
 
         return True
 
diff --git a/src/Model/SedimentLayer/SedimentLayer.py b/src/Model/SedimentLayer/SedimentLayer.py
index 3e137e3b..7cff798d 100644
--- a/src/Model/SedimentLayer/SedimentLayer.py
+++ b/src/Model/SedimentLayer/SedimentLayer.py
@@ -242,7 +242,7 @@ class SedimentLayer(SQLSubModel):
     @property
     def name(self):
         if self._name == "":
-            return f"SL{self.id + 1}"
+            return f"SL #{self.pamhyr_id}"
 
         return self._name