From 545d63fdf9f43b487578a8596e6a02c33fb320f1 Mon Sep 17 00:00:00 2001
From: Maarten Plieger <maarten.plieger@knmi.nl>
Date: Mon, 2 Sep 2024 11:25:16 +0200
Subject: [PATCH 1/2] Testing data explorer

---
 Docker/docker-compose.yml      | 18 ++++++++++++++++--
 Docker/nginx-adaguc/nginx.conf |  6 ++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml
index cab93ee1..c40e5a88 100755
--- a/Docker/docker-compose.yml
+++ b/Docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.1"
-
 services:
   adaguc-viewer:
     image: openearth/adaguc-viewer
@@ -19,6 +17,22 @@ services:
       options:
         max-size: "200k"
         max-file: "10"
+  adaguc-data-explorer:
+    image: openearth/adaguc-data-explorer
+    container_name: adaguc-data-explorer
+    hostname: adaguc-data-explorer
+    networks:
+      - adaguc-network
+    environment:
+      - "ADAGUC_AUTOWMS_ENDPOINT=${EXTERNALADDRESS}/autowms?"
+    env_file:
+      - .env
+    restart: unless-stopped
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "200k"
+        max-file: "10"
   adaguc-server:
     image: openearth/adaguc-server
     # build: ..
diff --git a/Docker/nginx-adaguc/nginx.conf b/Docker/nginx-adaguc/nginx.conf
index 2b9941a3..6f0ad35c 100644
--- a/Docker/nginx-adaguc/nginx.conf
+++ b/Docker/nginx-adaguc/nginx.conf
@@ -46,6 +46,12 @@ http {
             proxy_pass http://adaguc-viewer:80/adaguc-viewer/;
         }
 
+        # Adaguc Data Explorer
+        location /explorer/ {
+            proxy_pass http://adaguc-data-explorer:80/;
+        }
+
+
         # Adaguc-server endpoints
         location /wms {
             proxy_pass http://adaguc-server:8080/wms;

From 3290b60626d79c5fc2d2cc51f44afccd28046f90 Mon Sep 17 00:00:00 2001
From: Lukas Phaf <lukas.phaf@knmi.nl>
Date: Wed, 25 Sep 2024 15:19:10 +0200
Subject: [PATCH 2/2] Change brotli quality for Redis cache to 4, as the
 default quality of 11 is extremely slow.

---
 python/lib/adaguc/runAdaguc.py                             | 2 +-
 python/python_fastapi_server/routers/caching_middleware.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/lib/adaguc/runAdaguc.py b/python/lib/adaguc/runAdaguc.py
index a14c6f30..a20957ed 100644
--- a/python/lib/adaguc/runAdaguc.py
+++ b/python/lib/adaguc/runAdaguc.py
@@ -307,7 +307,7 @@ async def response_to_cache(redis_pool, key, headers: str, data):
             entrytime
             + f"{len(cacheable_headers_json):06d}".encode("utf-8")
             + cacheable_headers_json
-            + brotli.compress(data.getvalue()),
+            + brotli.compress(data.getvalue(), quality=4),
             ex=ttl,
         )
         await redis_client.aclose()
diff --git a/python/python_fastapi_server/routers/caching_middleware.py b/python/python_fastapi_server/routers/caching_middleware.py
index 0c18de12..11b7c21e 100644
--- a/python/python_fastapi_server/routers/caching_middleware.py
+++ b/python/python_fastapi_server/routers/caching_middleware.py
@@ -51,7 +51,7 @@ async def response_to_cache(redis_pool, request, headers, data, ex: int):
     entrytime = f"{calendar.timegm(datetime.utcnow().utctimetuple()):10d}".encode(
         "utf-8"
     )
-    compressed_data = brotli.compress(data)
+    compressed_data = brotli.compress(data, quality=4)
     if len(compressed_data) < MAX_SIZE_FOR_CACHING:
         redis_client = redis.Redis(connection_pool=redis_pool)
         await redis_client.set(
@@ -59,7 +59,7 @@ async def response_to_cache(redis_pool, request, headers, data, ex: int):
             entrytime
             + f"{len(headers_json):06d}".encode("utf-8")
             + headers_json
-            + brotli.compress(data),
+            + compressed_data,
             ex=ex,
         )
         await redis_client.aclose()