philorg/gisaf-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages 6 Wiki Activity Actions

Fix store live to redis defis

Browse source 
Remove workaround for live df column names
Fix scheduler import
This commit is contained in:
phil 2024-05-05 16:50:00 +02:00
parent dedb01b712
commit 53f2594cdd
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gisaf/redis_tools.py
View file

@ -217,7 +217,7 @@ class Store:
'store': store_name, 'store': store_name,
'z_index': z_index, 'z_index': z_index,
'count': len(gdf), 'count': len(gdf),
'mapbox_type': mapbox_type, 'type': mapbox_type,
'gis_type': gis_type, 'gis_type': gis_type,
'symbol': symbol, 'symbol': symbol,
'name': live_name, 'name': live_name,

16
src/gisaf/registry.py
View file

@ -676,14 +676,14 @@ class ModelRegistry:
## dataframes are concat ## dataframes are concat
## TODO: standardize names across the whole workflow, ## TODO: standardize names across the whole workflow,
## then remove the rename below: ## then remove the rename below:
df_live.rename( # df_live.rename(
columns={ # columns={
'live': 'is_live', # 'live': 'is_live',
'zIndex': 'z_index', # 'zIndex': 'z_index',
'gisType': 'gis_type', # 'gisType': 'gis_type',
'viewableRole': 'viewable_role', # 'viewableRole': 'viewable_role',
}, inplace=True # }, inplace=True
) # )
## Add columns ## Add columns
df_live['auto_import'] = False df_live['auto_import'] = False
df_live['base_gis_type'] = df_live['gis_type'] df_live['base_gis_type'] = df_live['gis_type']

4
src/gisaf/scheduler.py
View file

@ -21,7 +21,7 @@ from apscheduler.triggers.cron import CronTrigger
from apscheduler.triggers.interval import IntervalTrigger from apscheduler.triggers.interval import IntervalTrigger
from apscheduler.triggers.date import DateTrigger from apscheduler.triggers.date import DateTrigger
from gisaf.ipynb_tools import Gisaf # from gisaf.ipynb_tools import Gisaf
formatter = logging.Formatter( formatter = logging.Formatter(
"%(asctime)s:%(levelname)s:%(name)s:%(message)s", "%(asctime)s:%(levelname)s:%(name)s:%(message)s",
@ -73,7 +73,7 @@ class JobBaseClass:
class JobScheduler: class JobScheduler:
gs: Gisaf # gs: Gisaf
jobs: dict[str, Any] jobs: dict[str, Any]
tasks: dict[str, Any] tasks: dict[str, Any]
wss: dict[str, Any] wss: dict[str, Any]