From 3b8e0752709a111f4986658fd435ffa342da68c0 Mon Sep 17 00:00:00 2001
From: rexruan <dafengyuxue@gmail.com>
Date: Mon, 26 Aug 2024 23:12:27 +0200
Subject: [PATCH] Fix metadata

- comment out database deployment
---
 SWEGRAM_BACKEND          |  2 +-
 docker-compose.yml       |  2 +-
 run.sh                   | 17 ++++++++---------
 server/lib/fetch_data.py | 12 ++++++++++++
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/SWEGRAM_BACKEND b/SWEGRAM_BACKEND
index 1464c52..ece61c6 100644
--- a/SWEGRAM_BACKEND
+++ b/SWEGRAM_BACKEND
@@ -1 +1 @@
-1.0.5
\ No newline at end of file
+1.0.6
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index baa4c53..97f544d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - database
 
   backend:
-    image: rex0046/swegram-backend:1.0.5 # Image needs to be built with network
+    image: rex0046/swegram-backend:1.0.6 # Image needs to be built with network
     container_name: swegram-backend-fastapi
     restart: always
     environment:
diff --git a/run.sh b/run.sh
index 40d9228..6713f8a 100755
--- a/run.sh
+++ b/run.sh
@@ -3,24 +3,23 @@
 deploy_all=false
 deploy_backend=false
 deploy_frontend=false
-deploy_database=false
+# deploy_database=false
 
 print_usage() {
     echo "Usage: $0 [-a] [-b] [-d] [-f] [-h]" >&2;
     echo "options:
         -a Deploy all containers
         -b Deploy backend container
-        -d Deploy database container
         -f Build and Deploy frontend container
         -h this help message"
     exit 1;
 }
 
-while getopts ":abdfh" OPTION; do
+while getopts ":abfh" OPTION; do
     case "$OPTION" in
         a) deploy_all=true;;
         b) deploy_backend=true;;
-        d) deploy_database=true;; 
+        # d) deploy_database=true;; 
         f) deploy_frontend=true;;
         h)  print_usage;;
         \?) echo "$0: Error: Invalid option: -${OPTARG}" >&2; exit 1;;
@@ -31,7 +30,7 @@ shift "$(($OPTIND -1))"
 
 echo "all: $deploy_all"
 echo "backend: $deploy_backend"
-echo "database: $deploy_database"
+# echo "database: $deploy_database"
 echo "frontend: $deploy_frontend"
 
 if $deploy_all; then
@@ -76,9 +75,9 @@ else
         docker compose --profile frontend up -d --build
     fi
 
-    if $deploy_database; then
-        docker compose --profile database down || true
-        docker compose --profile database up -d
-    fi
+    # if $deploy_database; then
+    #     docker compose --profile database down || true
+    #     docker compose --profile database up -d
+    # fi
 fi
 
diff --git a/server/lib/fetch_data.py b/server/lib/fetch_data.py
index e98d5f9..4b6106c 100644
--- a/server/lib/fetch_data.py
+++ b/server/lib/fetch_data.py
@@ -18,6 +18,17 @@ def _update_metadata(metadata: Dict[str, Any], texts: List[Text]) -> Dict[str, A
     value = 1
     text_ids = [t.id for t in texts]
     texts_with_metadata = set()
+    if not metadata:
+        for text in texts:
+            if text.labels:
+                for label, _value in text.labels.items():
+                    if label not in metadata:
+                        metadata[label] = {_value: [(text.id, text.filename)]}
+                    elif _value not in metadata[label]:
+                        metadata[label][_value] = [(text.id, text.filename)]
+                    else:
+                        metadata[label][_value].append((text.id, text.filename))
+
     if metadata:
         for label, value_dict in metadata.items():
             has_values = [False] * len(value_dict.keys())
@@ -44,6 +55,7 @@ def _update_metadata(metadata: Dict[str, Any], texts: List[Text]) -> Dict[str, A
 
 def fetch_data(metadata: Any, texts: List[Text]) -> Dict[str, Any]:
     """Reset data for frontend"""
+
     return {
         "text_ids": _fetch_text_ids_and_filenames(texts),
         "selected_text_ids": _fetch_selected_text_ids(texts),