From 7d25194585a06b82a6f12fe3d7b10caeddd5aa9a Mon Sep 17 00:00:00 2001
From: Bobby Noelte <b0661n0e17e@gmail.com>
Date: Sun, 6 Oct 2024 12:34:48 +0200
Subject: [PATCH] Adapt python sources to new package directory structure.

Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
---
 src/akkudoktoreos/class_optimize.py     | 16 ++++++----------
 src/akkudoktoreos/visualize.py          |  2 +-
 src/akkudoktoreosserver/flask_server.py | 17 +++++++----------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/akkudoktoreos/class_optimize.py b/src/akkudoktoreos/class_optimize.py
index 34b7515..d864c4b 100644
--- a/src/akkudoktoreos/class_optimize.py
+++ b/src/akkudoktoreos/class_optimize.py
@@ -1,19 +1,15 @@
-import os
 import random
-import sys
 from typing import Any, Dict, List, Optional, Tuple
 
 import numpy as np
 from deap import algorithms, base, creator, tools
 
-from modules.class_akku import PVAkku
-from modules.class_ems import EnergieManagementSystem
-from modules.class_haushaltsgeraet import Haushaltsgeraet
-from modules.class_inverter import Wechselrichter
-from modules.visualize import visualisiere_ergebnisse
-
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from config import moegliche_ladestroeme_in_prozent
+from akkudoktoreos.class_akku import PVAkku
+from akkudoktoreos.class_ems import EnergieManagementSystem
+from akkudoktoreos.class_haushaltsgeraet import Haushaltsgeraet
+from akkudoktoreos.class_inverter import Wechselrichter
+from akkudoktoreos.config import moegliche_ladestroeme_in_prozent
+from akkudoktoreos.visualize import visualisiere_ergebnisse
 
 
 def isfloat(num: Any) -> bool:
diff --git a/src/akkudoktoreos/visualize.py b/src/akkudoktoreos/visualize.py
index 6b1d63f..727cce4 100644
--- a/src/akkudoktoreos/visualize.py
+++ b/src/akkudoktoreos/visualize.py
@@ -6,7 +6,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 from matplotlib.backends.backend_pdf import PdfPages
 
-from modules.class_sommerzeit import ist_dst_wechsel
+from akkudoktoreos.class_sommerzeit import ist_dst_wechsel
 
 matplotlib.use("Agg")
 
diff --git a/src/akkudoktoreosserver/flask_server.py b/src/akkudoktoreosserver/flask_server.py
index a7f34d5..0edf053 100755
--- a/src/akkudoktoreosserver/flask_server.py
+++ b/src/akkudoktoreosserver/flask_server.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 import os
-import sys
 from datetime import datetime
 
 import matplotlib
@@ -12,15 +11,13 @@ matplotlib.use("Agg")
 import pandas as pd
 from flask import Flask, jsonify, redirect, request, send_from_directory, url_for
 
-from modules.class_load import LoadForecast
-from modules.class_load_container import Gesamtlast
-from modules.class_load_corrector import LoadPredictionAdjuster
-from modules.class_optimize import isfloat, optimization_problem
-from modules.class_pv_forecast import PVForecast
-from modules.class_strompreis import HourlyElectricityPriceForecast
-
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from config import get_start_enddate, optimization_hours, prediction_hours
+from akkudoktoreos.class_load import LoadForecast
+from akkudoktoreos.class_load_container import Gesamtlast
+from akkudoktoreos.class_load_corrector import LoadPredictionAdjuster
+from akkudoktoreos.class_optimize import isfloat, optimization_problem
+from akkudoktoreos.class_pv_forecast import PVForecast
+from akkudoktoreos.class_strompreis import HourlyElectricityPriceForecast
+from akkudoktoreos.config import get_start_enddate, optimization_hours, prediction_hours
 
 app = Flask(__name__)