Merge branch 'main' into package-manager

Author: manisha841

.github/workflows/code_coverage.yml

@@ -0,0 +1,26 @@
+name: "Code Coverage"
+
+on: [push, pull_request]
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+    - name: Install dependencies
+      run: |
+        pip install -r requirements.txt
+    - name: Run pytest with coverage
+      run: |
+        pytest --cov=./ --cov-report=xml
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        file: ./coverage.xml
+        flags: unittests
+        name: codecov-umbrella
+        fail_ci_if_error: false

.github/workflows/code_security.yml

@@ -0,0 +1,23 @@
+name: "Code Security"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    - cron: '0 5 * * 1'
+
+jobs:
+  CodeQL:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: python
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/code_styling.yml

@@ -0,0 +1,19 @@
+name: "Code Styling"
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+    - name: Install dependencies
+      run: |
+        pip install ruff
+    - name: Run ruff linter
+      run: |
+        ruff check .

app.py

@@ -55,6 +55,7 @@
 
     calculate = st.sidebar.button("Calculate Centers", type="primary", use_container_width=True)
 
+school_df = None
 # Tabs
 tab1, tab2, tab3, tab4, tab5 = st.tabs([
     "School Center",
@@ -73,7 +74,9 @@
 # Show data in Tabs as soon as the files are uploaded
 if schools_file:
     df = pd.read_csv(schools_file, sep="\t")
+    school_df = df
     tab3.dataframe(df)
+    
 else:
     tab3.info("Upload data to view it.", icon="ℹ️")
 
@@ -193,9 +196,37 @@ def save_file_to_temp(file_obj):
                         icon=folium.Icon(color="red")
                     )
                 )
+                
+            # Initialize an empty dictionary to store school coordinates
+            filtered_schools = {}  
+              
+            if school_df is not None:
+              
+              for index, row in school_df.iterrows():                       
+               scode = row['scode']
+               school_lat = row['lat']
+               school_long = row['long']
+ 
+               if scode in filtered_df['scode'].values:
+                  filtered_schools.setdefault(scode, []).append((school_lat, school_long))
+                 
+              for index, school in filtered_df.iterrows():
+               lat_long_list = filtered_schools.get(school['scode'], [])
+             
+               for school_lat, school_long in lat_long_list:
+                if school_lat is not None and school_long is not None:
+                 fg.add_child(
+                 folium.Marker(
+                    location=[school_lat, school_long],
+                    popup=f"{school['school'].title()}\nAllocation: {school['allocation']}",
+                    tooltip=f"{school['school']}",
+                    icon=folium.Icon(color="blue")
+                 )
+                )
+                 
             m.add_child(fg)
             with tab1:
-                st_folium( m, width=1200, height=400 )
+                st_folium( m, width=1200, height=400)
 
         tab1.divider()
         tab1.subheader('All Data')

school_center.py

@@ -101,17 +101,17 @@ def read_tsv(file_path: str) -> List[Dict[str, str]]:
             reader = csv.DictReader(file, delimiter='\t')
             for row in reader:
                 data.append(dict(row))
-    except FileNotFoundError:
-        logger.error(f"File '{file_path}' not found.")
+    except FileNotFoundError as e:
+        logger.error(f"File '{file_path} : {e}' not found.")
         sys.exit(1)
-    except PermissionError:
-        logger.error(f"Permission denied while accessing file '{file_path}'.")
+    except PermissionError as e:
+        logger.error(f"Permission denied while accessing file '{file_path}' : {e}.")
         sys.exit(1)
-    except IOError:
-        logger.error(f"Error opening or reading file: {file_path}")
+    except IOError as e:
+        logger.error(f"Error opening or reading file: '{file_path}' : {e}")
         sys.exit(1)
     except Exception as e:
-        logger.error(f"An unexpected error occurred while reading file '{file_path}': {e}")
+        logger.error(f"An unexpected error occurred while reading file '{file_path}' : {e}")
         sys.exit(1)
     return data
 
@@ -133,14 +133,14 @@ def read_prefs(file_path: str) -> Dict[str, Dict[str, int]]:
                         prefs[row['scode']][row['cscode']] = int(row['pref'])
                 else:
                     prefs[row['scode']] = {row['cscode']: int(row['pref'])}
-    except FileNotFoundError:
-        logger.error(f"File '{file_path}' not found.")
+    except FileNotFoundError as e:
+        logger.error(f"File '{file_path} :{e}' not found.")
         sys.exit(1)
-    except PermissionError:
-        logger.error(f"Permission denied while accessing file '{file_path}'.")
+    except PermissionError as e:
+        logger.error(f"Permission denied while accessing file '{file_path}:{e}'.")
         sys.exit(1)
-    except IOError:
-        logger.error(f"Error opening or reading file: {file_path}")
+    except IOError as e:
+        logger.error(f"Error opening or reading file: {file_path} :{e}")
         sys.exit(1)
     except Exception as e:
         logger.error(f"An unexpected error occurred while reading file '{file_path}': {e}")