调整 epanet 从 services 迁到 infra

app/algorithms/simulations.py

@@ -9,7 +9,7 @@ from app.algorithms.api_ex.run_simulation import (
     run_simulation_ex,
     from_clock_to_seconds_2,
 )
-from app.services.epanet.epanet import Output
+from app.infra.epanet.epanet import Output
 from app.services.scheme_management import store_scheme_info
 from app.services.tjnetwork import *
 

app/native/wndb/s34_sa_cal.py

@@ -75,7 +75,7 @@ from .database import *
 from .s0_base import get_node_links, get_link_nodes
 
 sys.path.append('..')
-from epanet.epanet import run_project
+from app.infra.epanet.epanet import run_project
 
 def _calculate_service_area(name: str, inp, time_index: int = 0) -> dict[str, list[str]]:
     sources : dict[str, list[str]] = {}

app/services/simulation.py

@@ -10,7 +10,7 @@ import pytz
 import requests
 import time
 import shutil
-from app.services.epanet.epanet import Output
+from app.infra.epanet.epanet import Output
 from typing import Optional, Tuple
 import app.infra.db.influxdb.api as influxdb_api
 import typing

app/services/simulation_ops.py

@@ -5,7 +5,7 @@ from math import pi
 import pytz
 
 from app.algorithms.api_ex.run_simulation import run_simulation_ex
-from app.services.epanet.epanet import Output
+from app.infra.epanet.epanet import Output
 from app.services.tjnetwork import *
 
 

app/services/tjnetwork.py

@@ -1,7 +1,7 @@
 from typing import Any
 import app.native.wndb as api
 from app.native.wndb.s36_wda_cal import *
-import app.services.epanet as epanet
+import app.infra.epanet as epanet
 
 
 ############################################################

scripts/online_Analysis.py

@@ -3,7 +3,7 @@ from app.services.tjnetwork import *
 from app.native.wndb.project import copy_project
 from app.algorithms.api_ex.run_simulation import run_simulation_ex, from_clock_to_seconds_2
 from math import sqrt, pi
-from app.services.epanet.epanet import Output
+from app.infra.epanet.epanet import Output
 import json
 from datetime import datetime
 import time