Adding Aggrid- 1st trial

app.py

@@ -3,10 +3,10 @@ import streamlit as st
 st.set_page_config(
     page_title="NPO DB Query",
     page_icon="💻",
-    layout="centered",
+    layout="wide",
     initial_sidebar_state="expanded",
     menu_items={
-        "About": "**📡 NPO DB Query v0.2.2**",
+        "About": "**📡 NPO DB Query v0.2.3**",
     },
 )
 

apps/database_page.py

@@ -2,6 +2,7 @@ import time
 from datetime import datetime
 
 import streamlit as st
+from st_aggrid import AgGrid, ColumnsAutoSizeMode
 
 from apps.dump_analysis import dump_analysis_space
 from queries.process_all_db import process_all_tech_db, process_all_tech_db_with_stats
@@ -99,7 +100,9 @@ col1, col2, col3, col4 = st.columns(4)
 col5, col6, col7, col8 = st.columns(4)
 if uploaded_file is not None:
     # UtilsVars.file_path = uploaded_file
+
     try:
+
         execute_checks_sheets_exist(uploaded_file)
         if (
             Technology.gsm == False
@@ -111,7 +114,7 @@ if uploaded_file is not None:
         ):
             st.error(
                 """
-                     Uploaded file does not contain required sheets for any technology.
+                    Uploaded file does not contain required sheets for any technology.
                     "gsm": ["BTS", "BCF", "TRX","MAL"],
                     "wcdma": ["WCEL", "WBTS", "WNCEL"],
                     "lte": ["LNBTS", "LNCEL", "LNCEL_FDD", "LNCEL_TDD"],
@@ -187,11 +190,29 @@ if uploaded_file is not None:
                         process_neighbors_data_to_excel, "NEI"
                     ),
                 )
+
     except Exception as e:
         st.error(f"Error: {e}")
 
 
 ######################## ANALYTICS AND STATS ####################################
+@st.fragment
+def table_data():
+    if UtilsVars.all_db_dfs_names != []:
+        selected_table = st.selectbox("Choose Data", UtilsVars.all_db_dfs_names)
+        table_df = UtilsVars.all_db_dfs[
+            UtilsVars.all_db_dfs_names.index(selected_table)
+        ]
+        st.write(f"### {selected_table} Data")
+        AgGrid(
+            table_df,
+            fit_columns_on_grid_load=True,
+            theme="streamlit",
+            enable_enterprise_modules=True,
+            filter=True,
+            # columns_auto_size_mode=ColumnsAutoSizeMode.FIT_CONTENTS,
+        )
+
 
 if uploaded_file is not None:
     if DumpType.full_dump == True:
@@ -216,4 +237,8 @@ if uploaded_file is not None:
                 uploaded_file,
                 #    regions
             )
-            dump_analysis_space()
+            tab1, tab2 = st.tabs(["🗃 Data", "📈 Chart"])
+            with tab1:
+                table_data()
+            with tab2:
+                dump_analysis_space()

apps/dump_analysis.py

@@ -20,6 +20,7 @@ def dump_analysis_space():
     st.title("ANALYTICS DATA")
 
     ####################### GSM ANALYTICS DATA #######################################
+
     st.subheader(":blue[GSM ANALYTICS DATA]")
 
     (

queries/process_all_db.py

@@ -8,6 +8,10 @@ from utils.utils_vars import UtilsVars
 
 def all_dbs(filepath: str):
     UtilsVars.all_db_dfs.clear()
+    UtilsVars.all_db_dfs_names.clear()
+    UtilsVars.gsm_dfs.clear()
+    UtilsVars.wcdma_dfs.clear()
+    UtilsVars.lte_dfs.clear()
     combined_gsm_database(filepath)
     process_wcdma_data(filepath)
     process_lte_data(filepath),
@@ -23,10 +27,16 @@ def process_all_tech_db(filepath: str):
     )
 
 
-def process_all_tech_db_with_stats(filepath: str):
+def process_all_tech_db_with_stats(
+    filepath: str,
+    #    region_list: list
+):
     all_dbs(filepath)
     gsm_analaysis(filepath)
-    wcdma_analaysis(filepath)
+    wcdma_analaysis(
+        filepath,
+        # region_list
+    )
     lte_fdd_analaysis(filepath)
     lte_tdd_analaysis(filepath)
     UtilsVars.final_all_database = convert_dfs(

queries/process_gsm.py

@@ -169,6 +169,8 @@ def combined_gsm_database(file_path: str):
     trx_df = process_trx_with_bts_name(file_path)
 
     UtilsVars.all_db_dfs.extend([gsm_df, mal_df, trx_df])
+    UtilsVars.gsm_dfs.extend([gsm_df, mal_df, trx_df])
+    UtilsVars.all_db_dfs_names.extend(["GSM", "MAL", "TRX"])
     return [gsm_df, mal_df, trx_df]
 
 
@@ -187,9 +189,11 @@ def process_gsm_data_to_excel(file_path: str):
 
 
 def gsm_analaysis(file_path: str):
-    gsm_df = process_gsm_data(file_path)
-    trx_df = process_trx_with_bts_name(file_path)
+    # gsm_df = process_gsm_data(file_path)
+    # trx_df = process_trx_with_bts_name(file_path)
 
+    gsm_df: pd.DataFrame = UtilsVars.gsm_dfs[0]
+    trx_df: pd.DataFrame = UtilsVars.gsm_dfs[2]
     # df to count number of site per bsc
     df_site_per_bsc = gsm_df[["BSC", "code"]]
     df_site_per_bsc = df_site_per_bsc.drop_duplicates(subset=["code"], keep="first")

queries/process_lte.py

@@ -203,6 +203,8 @@ def process_lte_data(file_path: str):
     # save_dataframe(df_fdd_final, "fdd")
     # save_dataframe(df_tdd_final, "tdd")
     UtilsVars.all_db_dfs.extend([df_fdd_final, df_tdd_final])
+    UtilsVars.lte_dfs.extend([df_fdd_final, df_tdd_final])
+    UtilsVars.all_db_dfs_names.extend(["LTE_FDD", "LTE_TDD"])
 
     return [df_fdd_final, df_tdd_final]
     # add the fdd and tdd to the list
@@ -219,7 +221,8 @@ def process_lte_data_to_excel(file_path: str):
 
 
 def lte_fdd_analaysis(file_path: str):
-    df_fdd = process_lte_data(file_path)[0]
+    # df_fdd = process_lte_data(file_path)[0]
+    df_fdd: pd.DataFrame = UtilsVars.lte_dfs[0]
 
     LteFddAnalysisData.total_number_of_lncel = len(df_fdd["ID_LNCEL"].unique())
     LteFddAnalysisData.total_number_of_site = len(df_fdd["code"].unique())
@@ -238,7 +241,8 @@ def lte_fdd_analaysis(file_path: str):
 
 
 def lte_tdd_analaysis(file_path: str):
-    df_tdd = process_lte_data(file_path)[1]
+    # df_tdd = process_lte_data(file_path)[1]
+    df_tdd: pd.DataFrame = UtilsVars.lte_dfs[1]
 
     LteTddAnalysisData.total_number_of_lncel = len(df_tdd["ID_LNCEL"].unique())
     LteTddAnalysisData.total_number_of_site = len(df_tdd["code"].unique())

queries/process_mrbts.py

@@ -27,6 +27,7 @@ def process_mrbts_data(file_path: str) -> pd.DataFrame:
     df_mrbts = df_mrbts[["MRBTS", "CODE", "name", "btsName"]]
 
     UtilsVars.all_db_dfs.append(df_mrbts)
+    UtilsVars.all_db_dfs_names.append("MRBTS")
     return df_mrbts
 
 

queries/process_wcdma.py

@@ -162,6 +162,8 @@ def process_wcdma_data(file_path: str):
     # save_dataframe(df_wncel, "wncel")
     # df_3g = save_dataframe(df_3g, "3G")
     UtilsVars.all_db_dfs.append(df_3g)
+    UtilsVars.wcdma_dfs.append(df_3g)
+    UtilsVars.all_db_dfs_names.append("WCDMA")
 
     # UtilsVars.final_wcdma_database = convert_dfs([df_3g], ["WCDMA"])
     return df_3g
@@ -194,7 +196,8 @@ def wcdma_analaysis(
     Args:
         filepath (str): The path to the file.
     """
-    wcdma_df = process_wcdma_data(filepath)
+    # wcdma_df = process_wcdma_data(filepath)
+    wcdma_df: pd.DataFrame = UtilsVars.wcdma_dfs[0]
 
     # filter per list of regions
     # wcdma_df = wcdma_df.loc[wcdma_df["Region"].isin(region_list)]

test.py

@@ -0,0 +1,48 @@
+import os
+
+import pandas as pd
+import pytest
+
+from queries.process_all_db import (
+    all_dbs,
+    process_all_tech_db,
+    process_all_tech_db_with_stats,
+)
+from utils.utils_vars import UtilsVars
+
+
+class TestProcessAllDB:
+    def setup_method(self):
+        UtilsVars.all_db_dfs = []
+        UtilsVars.final_all_database = None
+
+    def test_all_dbs(self):
+        filepath = r"C:\Users\David\Documents\PROJECTS\2023\PROJET 2023\DUMP\DUMP\NOVEMBRE\20241127_21145_27112024_Dump.xml.gz.xlsb"
+        all_dbs(filepath)
+        assert len(UtilsVars.all_db_dfs) == 7
+        assert isinstance(UtilsVars.all_db_dfs[0], pd.DataFrame)
+
+    def test_process_all_tech_db(self):
+        filepath = r"C:\Users\David\Documents\PROJECTS\2023\PROJET 2023\DUMP\DUMP\NOVEMBRE\20241127_21145_27112024_Dump.xml.gz.xlsb"
+        process_all_tech_db(filepath)
+        assert UtilsVars.final_all_database is not None
+
+    def test_process_all_tech_db_with_stats(self):
+        filepath = r"C:\Users\David\Documents\PROJECTS\2023\PROJET 2023\DUMP\DUMP\NOVEMBRE\20241127_21145_27112024_Dump.xml.gz.xlsb"
+        process_all_tech_db_with_stats(filepath)
+        assert UtilsVars.final_all_database is not None
+
+    # def test_all_dbs_empty_file(self):
+    #     filepath = r"C:\Users\HP\Desktop\LTE\PROJET 2023\DUMP\2024\SEPTEMBRE\empty.xlsb"
+    #     all_dbs(filepath)
+    #     assert len(UtilsVars.all_db_dfs) == 0
+
+    # def test_process_all_tech_db_empty_file(self):
+    #     filepath = r"C:\Users\HP\Desktop\LTE\PROJET 2023\DUMP\2024\SEPTEMBRE\empty.xlsb"
+    #     process_all_tech_db(filepath)
+    #     assert UtilsVars.final_all_database is None
+
+    # def test_process_all_tech_db_with_stats_empty_file(self):
+    #     filepath = r"C:\Users\HP\Desktop\LTE\PROJET 2023\DUMP\2024\SEPTEMBRE\empty.xlsb"
+    #     process_all_tech_db_with_stats(filepath)
+    #     assert UtilsVars.final_all_database is None

utils/utils_vars.py

@@ -53,7 +53,11 @@ class UtilsVars:
     final_trx_database = ""
     final_mrbts_database = ""
     final_mal_database = ""
+    gsm_dfs = []
+    wcdma_dfs = []
+    lte_dfs = []
     all_db_dfs = []
+    all_db_dfs_names = []
     final_all_database = None
     neighbors_database = ""
     file_path = ""