geocif 0.2.53__tar.gz → 0.2.55__tar.gz

{geocif-0.2.53/geocif.egg-info → geocif-0.2.55}/PKG-INFO

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

{geocif-0.2.53 → geocif-0.2.55}/geocif/analysis.py

@@ -142,7 +142,7 @@ class Geoanalysis:
             try:
                 df = pd.read_sql_query(sql, con)
             except sqlite3.Error:
-                self.logger.exception("failed reading %s", self.table)
+                self.logger.error("failed reading %s", self.table)
                 self.df_analysis = pd.DataFrame()
                 return
 
@@ -561,7 +561,7 @@ class Geoanalysis:
                 self.logger.info("Using configuration table: %s", latest)
                 self.df_config = pd.read_sql_query(f"SELECT * FROM {latest}", con)
         except Exception:
-            self.logger.exception("Failed to fetch configuration")
+            self.logger.error("Failed to fetch configuration")
 
     def setup(self) -> None:
         self.dict_config: dict[str, dict] = {}

{geocif-0.2.53 → geocif-0.2.55}/geocif/geocif.py

@@ -296,12 +296,26 @@ class Geocif:
                         cat_features=self.cat_features,
                         verbose=False,
                     )
-                elif self.model_name in ["ngboost", "oblique", "tabpfn"]:
+                elif self.model_name in ["tabpfn"]:
                     X_train = X_train.drop(
                         columns=[
                             item for item in self.cat_features if item != "Harvest Year"
                         ]
                     )
+                    # Identify the column indices for cat_features in X_train
+                    if self.cat_features is None:
+                        cat_feature_indices = []
+                    cat_feature_indices = [X_train.columns.get_loc(col) for col in self.cat_features if
+                        col in X_train.columns]
+
+                    self.model.fit(X_train, self.y_train, categorical_feature_indices=cat_feature_indices)
+                elif self.model_name in ["ngboost", "oblique"]:
+                    X_train = X_train.drop(
+                        columns=[
+                            item for item in self.cat_features if item != "Harvest Year"
+                        ]
+                    )
+
                     self.model.fit(X_train, self.y_train)
                 elif self.model_name == "ydf":
                     # Combine X_train and y_train

{geocif-0.2.53 → geocif-0.2.55}/geocif/ml/trainers.py

@@ -308,8 +308,9 @@ def auto_train(
                 cat_feature_indices = []
             cat_feature_indices = [X_train.columns.get_loc(col) for col in cat_features if
                 col in X_train.columns]
+
             model = AutoTabPFNRegressor(max_time=600,
-                                        categorical_feature_indices=cat_feature_indices,
+                                        #categorical_feature_indices=cat_feature_indices,
                                         ignore_pretraining_limits=True)
         elif model_name == "ngboost":
             if model_type == "REGRESSION":

{geocif-0.2.53 → geocif-0.2.55/geocif.egg-info}/PKG-INFO

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

{geocif-0.2.53 → geocif-0.2.55}/setup.py

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