bugfix: concepts n

app.py

@@ -26,15 +26,15 @@ from io import BytesIO
 logger = logging.getLogger(__name__)
 
 # Local
-# from dotenv import load_dotenv
-# load_dotenv()
+from dotenv import load_dotenv
+load_dotenv()
 
 
 # Main app logic
 def main():
     # Temporarily set authentication to True for testing
     if 'authenticated' not in st.session_state:
-        st.session_state['authenticated'] = False
+        st.session_state['authenticated'] = True
 
     if st.session_state['authenticated']:
         # Remove login success message for testing
@@ -183,15 +183,15 @@ def main():
 
 
     # Comment out for testing
-    else:
-        username = st.text_input("Username")
-        password = st.text_input("Password", type="password")
-        if st.button("Login"):
-            if validate_login(username, password):
-                st.session_state['authenticated'] = True
-                st.rerun()
-            else:
-                st.error("Incorrect username or password")
+    # else:
+    #     username = st.text_input("Username")
+    #     password = st.text_input("Password", type="password")
+    #     if st.button("Login"):
+    #         if validate_login(username, password):
+    #             st.session_state['authenticated'] = True
+    #             st.rerun()
+    #         else:
+    #             st.error("Incorrect username or password")
 
 
 

modules/org_count.py

@@ -139,7 +139,3 @@ def standardize_organization_names(df):
         
     return df
 
-# Example usage:
-if __name__ == "__main__":
-    df = pd.read_csv('sandbox/maf_orgs.csv')
-    df = standardize_organization_names(df)

modules/utils.py

@@ -311,12 +311,15 @@ def process_data(uploaded_file, sens_level):
         else 'ERROR', axis=1)
     
     # Reorder columns in final dataframe
-    column_order = ['id', 'scope_txt', 'tech_txt', 'fin_txt', 'maf_funding', 'cont_public', 
+    column_order = ['id', 'organization', 'org_renamed', 'concept_count', 'scope_txt', 'tech_txt', 'fin_txt', 'maf_funding', 'cont_public', 
                     'cont_private', 'cont_other', 'scope_lab1', 'scope_lab2', 'tech_lab1', 
                     'tech_lab3', 'fin_lab2', 'ADAPMIT_SCOPE', 'ADAPMIT_TECH', 'ADAPMIT', 'SECTOR1', 
                     'SECTOR2', 'LANG', 'lev_total', 'lev_gt_0', 'lev_maf_%', 'lev_maf_scale',
                     'word_length_check', 'pred_score', 'pred_action']
-    df = df[column_order]
+    
+    # Only include columns that exist in the DataFrame
+    final_columns = [col for col in column_order if col in df.columns]
+    df = df[final_columns]
 
     return df