From 6b4dd9c0a91bc3db91309934b4c0682d3455f15e Mon Sep 17 00:00:00 2001
From: msramalho <19508417+msramalho@users.noreply.github.com>
Date: Sat, 25 Feb 2023 13:19:42 +0100
Subject: [PATCH] redis fixes

---
 .gitignore              | 1 +
 docker-compose.yml      | 6 +++++-
 redis/config/.gitkeep   | 0
 redis/config/redis.conf | 0
 src/main.py             | 6 +++---
 5 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 redis/config/.gitkeep
 create mode 100644 redis/config/redis.conf

diff --git a/.gitignore b/.gitignore
index fb6e773..abf4544 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@ __pycache
 .pytest_cach
 .env
 *.db
+redis/data/*
 #temp
 tests
diff --git a/docker-compose.yml b/docker-compose.yml
index 6e4d45b..c8e2d82 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,6 +31,10 @@ services:
 
   redis:
     image: redis:6-alpine
+    command: redis-server /conf/redis.conf
+    volumes:
+      - "./redis/data:/data"
+      - "./redis/config:/conf"
     restart: always
     # DEV ONLY
     ports:
@@ -39,7 +43,7 @@ services:
   dashboard:
     build: ./src
     restart: always
-    command:  flower --app=worker.celery --port=5555 --broker=redis://redis:6379/0
+    command:  flower --app=worker.celery --port=5555 --broker=redis://redis:6379/0 --basic_auth=${FLOWER_USERNAME}:${FLOWER_PASSWORD}
     ports:
       - 5556:5555
     environment:
diff --git a/redis/config/.gitkeep b/redis/config/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/redis/config/redis.conf b/redis/config/redis.conf
new file mode 100644
index 0000000..e69de29
diff --git a/src/main.py b/src/main.py
index e0195c4..2237e5b 100644
--- a/src/main.py
+++ b/src/main.py
@@ -58,8 +58,8 @@ def get_status(task_id, access_token:str):
         "task_result": task_result.result
     }
     try:
-        json_result = jsonable_encoder(result)
-        # json_result = jsonable_encoder(result, custom_encoder=pydantic_encoder) # causes error
+        json_result = jsonable_encoder(result, exclude_unset=True)
+        # json_result = jsonable_encoder(result, custom_encoder={"pydantic_encoder": pydantic_encoder}) # causes error
         return JSONResponse(json_result)
     except Exception as e:
         logger.error(e)
@@ -75,7 +75,7 @@ def get_status(task_id, access_token:str):
 
 @app.get("/")
 def home():
-    return JSONResponse({"message": "Hello"})
+    return JSONResponse({"status": "good", "version": "0.1.0"})
 
 @app.on_event("startup")
 async def on_startup():