geocif 0.1.49__tar.gz → 0.1.50__tar.gz

{geocif-0.1.49/geocif.egg-info → geocif-0.1.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.49
+Version: 0.1.50
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.1.49 → geocif-0.1.50}/geocif/analysis.py

@@ -163,6 +163,7 @@ class Geoanalysis:
 
         df_metrics = self._compute_metrics(df)
         df_metrics = self._process_metrics(df_metrics)
+
         self._plot_metrics(df_metrics)
 
         df_regional_metrics_by_year = self._compute_regional_metrics(
@@ -183,6 +184,11 @@ class Geoanalysis:
         return df_metrics, df_regional_metrics, df_national_yield
 
     def _clean_data(self):
+        # Hack exclude 2012 if country == "illinois"
+        if self.country == "illinois":
+            self.df_analysis = self.df_analysis[
+                self.df_analysis["Harvest Year"] != 2012
+            ]
         # Remove rows with missing values in Observed Yield (tn per ha)
         return self.df_analysis.dropna(subset=["Observed Yield (tn per ha)"])
 
@@ -196,11 +202,12 @@ class Geoanalysis:
             .reset_index()
         )
 
-        return df_metrics.pivot_table(
-            index=["Country", "Model", "Harvest Year", "Stage Name", "Stage Range"],
-            columns="level_5",
-            values=0,
-        ).reset_index()
+        #return df_metrics.pivot_table(
+        #    index=["Country", "Model", "Harvest Year", "Stage Name", "Stage Range"],
+        #    columns="level_5",
+        #    values=0,
+        #).reset_index()
+        return df_metrics
 
     def _process_metrics(self, df_metrics):
         # Assign each unique Stage Name a unique integer identifier

{geocif-0.1.49 → geocif-0.1.50}/geocif/geocif.py

@@ -82,6 +82,13 @@ class Geocif:
         self.today_full = self._date.format("MMMM_DD_YYYY_HH_mm")
 
         self.df_forecast = pd.DataFrame()
+        """
+        ====================================================================
+                                        Config file: Logging
+        ====================================================================
+        """
+        self.log_level = self.parser.get("LOGGING", "log_level")
+
         """
         ====================================================================
                                 Config file: Default
@@ -875,12 +882,15 @@ class Geocif:
                     group.columns.str.contains(self.stage_info["Stage_ID"])
                 ].tolist()
 
-                group = group[
-                    self.fixed_columns
-                    + [self.target]
-                    + self.statistics_columns
-                    + all_columns
-                ]
+                try:
+                    group = group[
+                        self.fixed_columns
+                        + [self.target]
+                        + self.statistics_columns
+                        + all_columns
+                    ]
+                except:
+                    continue
                 # rename all_columns to self.stage_info["CEI"]
                 group.rename(
                     columns={
@@ -1144,7 +1154,7 @@ class Geocif:
             self.do_xai = False
             self.estimate_ci = False
             self.estimate_ci_for_all = False
-            self.check_yield_trend = False
+            self.check_yield_trend = True
             self.cluster_strategy = "single"
             self.select_cei_by = "Index"
             self.use_cumulative_features = True
@@ -1325,7 +1335,7 @@ def loop_execute(inputs):
     )
 
     with PyCallGraph(output=graphviz, config=config):
-        country, crop, season, model, logger, parser = inputs
+        country, crop, season, model, logger, parser, index = inputs
 
         logger.info("=====================================================")
         logger.info(f"\tStarting GEOCIF: {country} {crop} {season} {model}")
@@ -1334,8 +1344,10 @@ def loop_execute(inputs):
         obj = Geocif(logger=logger, parser=parser)
         obj.read_data(country, crop, season)
 
-        # Store config file in database
-        output.config_to_db(obj.db_path, obj.parser, obj.today)
+        # Store config file in database, only execute this for
+        # the first iteration of the loop
+        if index == 0:
+            output.config_to_db(obj.db_path, obj.parser, obj.today)
 
         # Setup metadata and run ML code
         obj.setup(season, model)
@@ -1380,7 +1392,7 @@ def execute_models(inputs, logger, parser):
     do_parallel = parser.getboolean("DEFAULT", "do_parallel")
 
     # Add logger and parser to each element in inputs
-    inputs = [item + [logger, parser] for item in inputs]
+    inputs = [item + [logger, parser, idx] for idx, item in enumerate(inputs)]
 
     if do_parallel:
         cpu_count = int(mp.cpu_count() * 0.3)

{geocif-0.1.49 → geocif-0.1.50}/geocif/logger.py

@@ -71,8 +71,29 @@ class Logger:
         self.logger.error(msg)
 
 
+def get_logging_level(level):
+    """
+
+    Args:
+        level:
+
+    Returns:
+
+    """
+    if level == "DEBUG":
+        return logging.DEBUG
+    elif level == "INFO":
+        return logging.INFO
+    elif level == "WARNING":
+        return logging.WARNING
+    elif level == "ERROR":
+        return logging.ERROR
+    else:
+        return logging.INFO
+
+
 def setup_logger_parser(
-    path_config_file, name_project="geocif", name_file="ml", level=logging.DEBUG
+    path_config_file, name_project="geocif", name_file="ml"
 ):
     """
 
@@ -87,6 +108,8 @@ def setup_logger_parser(
     """
     parser = read_config(path_config_file)
     dir_log = parser.get("PATHS", "dir_log")
+    level = parser.get("LOGGING", "log_level")
+    level = get_logging_level(level)
 
     logger = Logger(
         dir_log=dir_log,

{geocif-0.1.49 → geocif-0.1.50/geocif.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.49
+Version: 0.1.50
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.1.49 → geocif-0.1.50}/setup.py

@@ -50,6 +50,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://ritviksahajpal.github.io/yield_forecasting/",
-    version="0.1.49",
+    version="0.1.50",
     zip_safe=False,
 )