From 973ea7462288ca3987009655e1abd06557bdd288 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 11 Sep 2023 11:40:26 +0200
Subject: [PATCH] Model: Move Model.DB into Model.Tools.PamhyrDB.
---
src/Model/BoundaryCondition/BoundaryCondition.py | 2 +-
src/Model/BoundaryCondition/BoundaryConditionList.py | 1 -
src/Model/Friction/Friction.py | 2 +-
src/Model/Friction/FrictionList.py | 2 +-
src/Model/Geometry/PointXYZ.py | 2 +-
src/Model/Geometry/ProfileXYZ.py | 2 +-
src/Model/Geometry/Reach.py | 2 +-
src/Model/InitialConditions/InitialConditions.py | 2 +-
src/Model/InitialConditions/InitialConditionsDict.py | 1 -
src/Model/LateralContribution/LateralContribution.py | 2 +-
src/Model/LateralContribution/LateralContributionList.py | 1 -
src/Model/River.py | 2 +-
src/Model/SedimentLayer/SedimentLayer.py | 2 +-
src/Model/SedimentLayer/SedimentLayerList.py | 1 -
src/Model/SolverParameters/SolverParametersList.py | 3 +--
src/Model/Stricklers/Stricklers.py | 2 +-
src/Model/Stricklers/StricklersList.py | 1 -
src/Model/Study.py | 2 +-
src/Model/{DB.py => Tools/PamhyrDB.py} | 2 +-
src/Model/Tools/PamhyrDict.py | 2 +-
src/Model/Tools/PamhyrList.py | 2 +-
21 files changed, 16 insertions(+), 22 deletions(-)
rename src/Model/{DB.py => Tools/PamhyrDB.py} (98%)
diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py
index d6abb6c9..d90c6478 100644
--- a/src/Model/BoundaryCondition/BoundaryCondition.py
+++ b/src/Model/BoundaryCondition/BoundaryCondition.py
@@ -20,7 +20,7 @@ import logging
from tools import trace, timer, old_pamhyr_date_to_timestamp
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
from Model.Except import NotImplementedMethodeError
logger = logging.getLogger()
diff --git a/src/Model/BoundaryCondition/BoundaryConditionList.py b/src/Model/BoundaryCondition/BoundaryConditionList.py
index d4ffc6bf..eb612d9f 100644
--- a/src/Model/BoundaryCondition/BoundaryConditionList.py
+++ b/src/Model/BoundaryCondition/BoundaryConditionList.py
@@ -19,7 +19,6 @@
from copy import copy
from tools import trace, timer
-from Model.DB import SQLSubModel
from Model.Tools.PamhyrList import PamhyrModelListWithTab
from Model.Except import NotImplementedMethodeError
diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py
index 18167a86..2ebd2b4e 100644
--- a/src/Model/Friction/Friction.py
+++ b/src/Model/Friction/Friction.py
@@ -18,7 +18,7 @@
from tools import trace, timer
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
class Friction(SQLSubModel):
def __init__(self, name:str = "", status = None):
diff --git a/src/Model/Friction/FrictionList.py b/src/Model/Friction/FrictionList.py
index 0db5e86f..215f96dd 100644
--- a/src/Model/Friction/FrictionList.py
+++ b/src/Model/Friction/FrictionList.py
@@ -21,7 +21,7 @@ import logging
from copy import copy
from tools import trace, timer
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
from Model.Tools.PamhyrList import PamhyrModelList
from Model.Friction.Friction import Friction
diff --git a/src/Model/Geometry/PointXYZ.py b/src/Model/Geometry/PointXYZ.py
index 19695c77..a8f19c8b 100644
--- a/src/Model/Geometry/PointXYZ.py
+++ b/src/Model/Geometry/PointXYZ.py
@@ -19,7 +19,7 @@
from math import dist
import numpy as np
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
from Model.Geometry.Point import Point
class PointXYZ(Point, SQLSubModel):
diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py
index e818eabc..0652d1f3 100644
--- a/src/Model/Geometry/ProfileXYZ.py
+++ b/src/Model/Geometry/ProfileXYZ.py
@@ -21,7 +21,7 @@ from typing import List
from tools import timer
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
from Model.Except import ClipboardFormatError
from Model.Geometry.Profile import Profile
from Model.Geometry.PointXYZ import PointXYZ
diff --git a/src/Model/Geometry/Reach.py b/src/Model/Geometry/Reach.py
index 0ddf06d8..0c641478 100644
--- a/src/Model/Geometry/Reach.py
+++ b/src/Model/Geometry/Reach.py
@@ -27,7 +27,7 @@ from functools import reduce
from tools import flatten, timer, trace
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
from Model.Geometry.Profile import Profile
from Model.Geometry.ProfileXYZ import ProfileXYZ
diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py
index 3bf747b0..2c50d10c 100644
--- a/src/Model/InitialConditions/InitialConditions.py
+++ b/src/Model/InitialConditions/InitialConditions.py
@@ -20,7 +20,7 @@ from copy import copy, deepcopy
from tools import trace, timer
from functools import reduce
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
class Data(SQLSubModel):
def __init__(self, name:str = "",
diff --git a/src/Model/InitialConditions/InitialConditionsDict.py b/src/Model/InitialConditions/InitialConditionsDict.py
index c3b7d7c6..40fdca49 100644
--- a/src/Model/InitialConditions/InitialConditionsDict.py
+++ b/src/Model/InitialConditions/InitialConditionsDict.py
@@ -19,7 +19,6 @@
from copy import copy
from tools import trace, timer
-from Model.DB import SQLSubModel
from Model.Tools.PamhyrDict import PamhyrModelDict
from Model.InitialConditions.InitialConditions import InitialConditions
diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py
index 38cbada4..727cf21b 100644
--- a/src/Model/LateralContribution/LateralContribution.py
+++ b/src/Model/LateralContribution/LateralContribution.py
@@ -20,7 +20,7 @@ import logging
from tools import trace, timer, old_pamhyr_date_to_timestamp
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
from Model.Except import NotImplementedMethodeError
logger = logging.getLogger()
diff --git a/src/Model/LateralContribution/LateralContributionList.py b/src/Model/LateralContribution/LateralContributionList.py
index 6622a94f..8d0ba37d 100644
--- a/src/Model/LateralContribution/LateralContributionList.py
+++ b/src/Model/LateralContribution/LateralContributionList.py
@@ -19,7 +19,6 @@
from copy import copy
from tools import trace, timer
-from Model.DB import SQLSubModel
from Model.Tools.PamhyrList import PamhyrModelListWithTab
from Model.Except import NotImplementedMethodeError
diff --git a/src/Model/River.py b/src/Model/River.py
index 77daf43a..d5dccb9e 100644
--- a/src/Model/River.py
+++ b/src/Model/River.py
@@ -18,7 +18,7 @@
from tools import flatten
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
from Model.Network.Node import Node
from Model.Network.Edge import Edge
diff --git a/src/Model/SedimentLayer/SedimentLayer.py b/src/Model/SedimentLayer/SedimentLayer.py
index 638212c8..1438dfa7 100644
--- a/src/Model/SedimentLayer/SedimentLayer.py
+++ b/src/Model/SedimentLayer/SedimentLayer.py
@@ -2,7 +2,7 @@
from tools import trace, timer
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
from Model.Except import NotImplementedMethodeError
class Layer(SQLSubModel):
diff --git a/src/Model/SedimentLayer/SedimentLayerList.py b/src/Model/SedimentLayer/SedimentLayerList.py
index e9025e01..53a1a8fd 100644
--- a/src/Model/SedimentLayer/SedimentLayerList.py
+++ b/src/Model/SedimentLayer/SedimentLayerList.py
@@ -2,7 +2,6 @@
from tools import trace, timer
-from Model.DB import SQLSubModel
from Model.Except import NotImplementedMethodeError
from Model.Tools.PamhyrList import PamhyrModelList
from Model.SedimentLayer.SedimentLayer import SedimentLayer
diff --git a/src/Model/SolverParameters/SolverParametersList.py b/src/Model/SolverParameters/SolverParametersList.py
index bff87d69..ce7ade98 100644
--- a/src/Model/SolverParameters/SolverParametersList.py
+++ b/src/Model/SolverParameters/SolverParametersList.py
@@ -21,7 +21,6 @@ from tools import trace, timer
from Solver.Solvers import solver_type_list
from Model.Tools.PamhyrList import PamhyrModelList
-from Model.DB import SQLSubModel
class Parameter():
def __init__(self,
@@ -105,7 +104,7 @@ class SolverParametersList(PamhyrModelList):
solvers = execute("SELECT DISTINCT solver FROM solver_parameter")
for solver in solvers:
- if solver is not "mage8":
+ if solver != "mage8":
continue
data = execute("SELECT ind, name, value " +
diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py
index baa484fa..302862db 100644
--- a/src/Model/Stricklers/Stricklers.py
+++ b/src/Model/Stricklers/Stricklers.py
@@ -18,7 +18,7 @@
from tools import trace, timer
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
class Stricklers(SQLSubModel):
_id_cnt = 0
diff --git a/src/Model/Stricklers/StricklersList.py b/src/Model/Stricklers/StricklersList.py
index 640c110c..b000c07e 100644
--- a/src/Model/Stricklers/StricklersList.py
+++ b/src/Model/Stricklers/StricklersList.py
@@ -18,7 +18,6 @@
from tools import trace, timer
-from Model.DB import SQLSubModel
from Model.Saved import SavedStatus
from Model.Tools.PamhyrList import PamhyrModelList
from Model.Stricklers.Stricklers import Stricklers
diff --git a/src/Model/Study.py b/src/Model/Study.py
index 774a03d1..f022a195 100644
--- a/src/Model/Study.py
+++ b/src/Model/Study.py
@@ -23,7 +23,7 @@ from datetime import datetime
from tools import timer, timestamp
-from Model.DB import SQLModel
+from Model.Tools.PamhyrDB import SQLModel
from Model.Saved import SavedStatus
from Model.Serializable import Serializable
from Model.Except import NotImplementedMethodeError
diff --git a/src/Model/DB.py b/src/Model/Tools/PamhyrDB.py
similarity index 98%
rename from src/Model/DB.py
rename to src/Model/Tools/PamhyrDB.py
index ef7d729d..73174f94 100644
--- a/src/Model/DB.py
+++ b/src/Model/Tools/PamhyrDB.py
@@ -1,4 +1,4 @@
-# DB.py -- Pamhyr abstract model database classes
+# PamhyrDB.py -- Pamhyr abstract model database classes
# Copyright (C) 2023 INRAE
#
# This program is free software: you can redistribute it and/or modify
diff --git a/src/Model/Tools/PamhyrDict.py b/src/Model/Tools/PamhyrDict.py
index 0c1cc536..aa2d3be3 100644
--- a/src/Model/Tools/PamhyrDict.py
+++ b/src/Model/Tools/PamhyrDict.py
@@ -21,7 +21,7 @@ import logging
from copy import copy
from tools import trace, timer
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
logger = logging.getLogger()
diff --git a/src/Model/Tools/PamhyrList.py b/src/Model/Tools/PamhyrList.py
index 8807c149..4129a7d8 100644
--- a/src/Model/Tools/PamhyrList.py
+++ b/src/Model/Tools/PamhyrList.py
@@ -21,7 +21,7 @@ import logging
from copy import copy
from tools import trace, timer
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
logger = logging.getLogger()
--
GitLab