bug fixes in config , coaching

Author: shubhvjain

codegreen_core/utilities/caching.py

@@ -51,6 +51,7 @@ def get_cache_or_update(country, start, deadline, energy_mode="public_data"):
                 return data_object
     else:
         print("caches has no country, calling _pull_data(country, start, deadline)")
+        # print(energy_mode)
         return _pull_data(country, start, deadline, energy_mode)
 
 
@@ -72,21 +73,25 @@ def _pull_data(country, start, end, energy_mode="public_data"):
         else:
             return None
         last_update = datetime.now().timestamp()
-        if forecast_data["data_available"]:
-            last_prediction = forecast_data["data"].iloc[-1]["posix_timestamp"]
-        else:
-            last_prediction = pd.Timestamp(datetime.now(), tz="UTC")
+        #if forecast_data["data_available"]:
+        #    last_prediction = forecast_data["data"].iloc[-1]["startTimeUTC"]
+        #else:
+        #    last_prediction = pd.Timestamp(datetime.now(), tz="UTC")
 
         df = forecast_data["data"]
+        del df["startTime"]  
         df["startTimeUTC"] = pd.to_datetime(df["startTimeUTC"])
         df["startTimeUTC"] = df["startTimeUTC"].dt.strftime("%Y%m%d%H%M").astype("str")
+        last_col = forecast_data["data"].iloc[-1]["startTimeUTC"]
+        last_prediction = int(datetime.strptime(last_col, "%Y%m%d%H%M").timestamp())
         cached_object = {
             "data": df.to_dict(),
             "time_interval": forecast_data["time_interval"],
             "data_available": forecast_data["data_available"],
             "last_updated": int(last_update),
             "last_prediction": int(last_prediction),
         }
+        #print(cached_object)
         cache.set(_get_country_key(country, energy_mode), json.dumps(cached_object))
         return cached_object
 

codegreen_core/utilities/config.py

@@ -5,20 +5,51 @@
 
 class ConfigError(Exception):
     """Custom exception for configuration errors."""
-
     pass
 
 
 class Config:
     config_data = None
     section_name = "codegreen"
-    boolean_keys = {"enable_energy_caching", "enable_time_prediction_logging"}
-    defaults = {
-        "default_energy_mode": "public_data",
-        "enable_energy_caching": False,
-        "enable_time_prediction_logging": False,
-        "energy_redis_path": None,
-    }
+    all_keys = [
+        {
+            "name":"ENTSOE_token",
+            "default": "None",
+            "use":"To fetch data from ENTSOE portal",
+            "boolean":False,
+        },
+        {
+            "name":"default_energy_mode",
+            "default":"public_data",
+            "use":"Determines which type of data to use.",
+            "boolean":False,
+        },
+        {
+            "name":"enable_energy_caching",
+            "default":"False",
+            "use":"To indicate if data used by tools must be cached",
+            "boolean":True,
+        },
+        {
+            "name":"energy_redis_path",
+            "default":"None",
+            "boolean":False,
+            "use":"Path to redis server to cache data.required if enable_energy_caching is enabled "
+        },
+        {
+            "name":"enable_time_prediction_logging",
+            "default":"False",
+            "boolean":True,
+            "use":"To indicate if logs must me saved in a log file  "
+        },
+         {
+            "name":"log_folder_path",
+            "default":" ",
+            "boolean":False,
+            "use":"Path of the folder where logs will be stored"
+        }
+    
+    ]
 
     @classmethod
     def load_config(self, file_path=None):
@@ -41,10 +72,15 @@ def load_config(self, file_path=None):
 
         if self.section_name not in self.config_data:
             self.config_data[self.section_name] = {}
-        for key, default_value in self.defaults.items():
-            if not self.config_data.has_option(self.section_name, key):
-                self.config_data.set(self.section_name, key, str(default_value))
-
+            raise ConfigError("Invalid config file. The config file must have a section called codegreen")
+        
+        for ky in self.all_keys:
+            try :
+                value = self.config_data.get(self.section_name, ky["name"])
+                # print(value)
+            except configparser.NoOptionError:
+                self.config_data.set(self.section_name, ky["name"],ky["default"])
+            
         if self.get("enable_energy_caching") == True:
             if self.get("energy_redis_path") is None:
                 raise ConfigError(
@@ -53,7 +89,7 @@ def load_config(self, file_path=None):
             else:
                 r = redis.from_url(self.get("energy_redis_path"))
                 r.ping()
-        # print(self.config_data["default_energy_mode"])
+                # print("Connection to redis works")
 
     @classmethod
     def get(self, key):
@@ -63,13 +99,11 @@ def get(self, key):
             )
         try:
             value = self.config_data.get(self.section_name, key)
-            if value is None:
-                # if key not in self.defaults:
-                #    raise KeyError(f"No default value provided for key: {key}")
-                value = self.defaults.get(key, None)
-            else:
-                if key in self.boolean_keys:
-                    value = value.lower() == "true"
+            config = next((d for d in self.all_keys if d.get("name") == key), None)
+            if config["boolean"]:
+                return  value.lower() == "true"
             return value
-        except (configparser.NoSectionError, configparser.NoOptionError):
-            return self.defaults.get(key)  # Return default if key is missing
+        except (configparser.NoSectionError, configparser.NoOptionError) as e:
+            print("Config not found")
+            print(key)
+            raise e

tests/dev.py

@@ -0,0 +1,55 @@
+# run this as :  poetry run python -m codegreen_core.tools.test
+
+# import matplotlib
+# # matplotlib.use('TkAgg')  # Or 'Qt5Agg'
+
+# from .carbon_emission import plot_ce_jobs
+# from datetime import datetime 
+# server1 = {
+#     "country":"DE",
+#     "number_core":16,
+#     "memory_gb": 254,
+# }
+# jobs = [
+#     {
+#         "start_time":datetime(2024,11,10),
+#         "runtime_minutes" : 120
+#     }
+# ]
+
+
+# plot_ce_jobs(server1,jobs)
+
+from codegreen_core.tools.loadshift_time import predict_now
+from datetime import datetime, timedelta
+
+cases = [
+  {
+    "country":"DE",
+    "h": 5,
+    "hd": datetime.now()+ timedelta(hours=20) 
+  },
+  {
+    "country":"DE",
+    "h": 4,
+    "hd": datetime.now()+ timedelta(hours=15) 
+  },
+  {
+    "country":"DK",
+    "h": 4,
+    "hd": datetime.now()+ timedelta(hours=15) 
+  },
+  {
+    "country":"FR",
+    "h": 4,
+    "hd": datetime.now()+ timedelta(hours=15) 
+  },
+  {
+    "country":"SE",
+    "h": 4,
+    "hd": datetime.now()+ timedelta(hours=15) 
+  }
+]
+
+for c in cases:
+  print(predict_now(c["country"],c["h"],0,c["hd"]))