From 53f2594cdd6b371305f3fe673cbfb2bda20a038c Mon Sep 17 00:00:00 2001
From: phil <phil.blav@hanji.info>
Date: Sun, 5 May 2024 16:50:00 +0200
Subject: [PATCH] Fix store live to redis defis  Remove workaround for live df
 column names Fix scheduler import

---
 src/gisaf/redis_tools.py |  2 +-
 src/gisaf/registry.py    | 16 ++++++++--------
 src/gisaf/scheduler.py   |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gisaf/redis_tools.py b/src/gisaf/redis_tools.py
index d9be0ac..279e875 100644
--- a/src/gisaf/redis_tools.py
+++ b/src/gisaf/redis_tools.py
@@ -217,7 +217,7 @@ class Store:
             'store': store_name,
             'z_index': z_index,
             'count': len(gdf),
-            'mapbox_type': mapbox_type,
+            'type': mapbox_type,
             'gis_type': gis_type,
             'symbol': symbol,
             'name': live_name,
diff --git a/src/gisaf/registry.py b/src/gisaf/registry.py
index 288e3e7..0c9e896 100644
--- a/src/gisaf/registry.py
+++ b/src/gisaf/registry.py
@@ -676,14 +676,14 @@ class ModelRegistry:
         ## dataframes are concat
         ## TODO: standardize names across the whole workflow,
         ## then remove the rename below:
-        df_live.rename(
-            columns={
-                'live': 'is_live',
-                'zIndex': 'z_index',
-                'gisType': 'gis_type',
-                'viewableRole': 'viewable_role',
-            }, inplace=True
-        )
+#        df_live.rename(
+#            columns={
+#                'live': 'is_live',
+#                'zIndex': 'z_index',
+#                'gisType': 'gis_type',
+#                'viewableRole': 'viewable_role',
+#            }, inplace=True
+#        )
         ## Add columns
         df_live['auto_import'] = False
         df_live['base_gis_type'] = df_live['gis_type']
diff --git a/src/gisaf/scheduler.py b/src/gisaf/scheduler.py
index 58a3d88..3c43b83 100755
--- a/src/gisaf/scheduler.py
+++ b/src/gisaf/scheduler.py
@@ -21,7 +21,7 @@ from apscheduler.triggers.cron import CronTrigger
 from apscheduler.triggers.interval import IntervalTrigger
 from apscheduler.triggers.date import DateTrigger
 
-from gisaf.ipynb_tools import Gisaf
+# from gisaf.ipynb_tools import Gisaf
 
 formatter = logging.Formatter(
     "%(asctime)s:%(levelname)s:%(name)s:%(message)s",
@@ -73,7 +73,7 @@ class JobBaseClass:
 
 
 class JobScheduler:
-    gs: Gisaf
+    # gs: Gisaf
     jobs: dict[str, Any]
     tasks: dict[str, Any]
     wss: dict[str, Any]