Updated with master

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: ..

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;

python/lib/adaguc/runAdaguc.py

@@ -314,7 +314,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(), quality = 4),
+            + brotli.compress(data.getvalue(), quality=4),
             ex=ttl,
         )
         await redis_client.aclose()

python/python_fastapi_server/routers/caching_middleware.py

@@ -52,7 +52,7 @@ async def response_to_cache(redis_pool, request, headers, data, ex: int):
         "utf-8"
     )
     compressed_data = brotli.compress(data, quality=4)
-    if len(data) < MAX_SIZE_FOR_CACHING:
+    if len(compressed_data) < MAX_SIZE_FOR_CACHING:
         redis_client = redis.Redis(connection_pool=redis_pool)
         await redis_client.set(
             key,