Merge pull request #1985 from DrAcula27/dev-env-variable-checks-1976

add support for DEV environment variables

Author: rayneng

.example.env

@@ -1,6 +1,8 @@
-VITE_MAPBOX_TOKEN=REDACTED
-MAPBOX_STREETS_URL=https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/{z}/{x}/{y}
+HUGGINGFACE_LOGIN_TOKEN=REDACTED
 MAPBOX_SATELLITE_URL=https://api.mapbox.com/styles/v1/mapbox/satellite-streets-v11/tiles/{z}/{x}/{y}
+MAPBOX_STREETS_URL=https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/{z}/{x}/{y}
+VITE_ENV=DEV
+VITE_CONTACT_FORM=REDACTED
 VITE_CONTENTFUL_SPACE=REDACTED
 VITE_CONTENTFUL_TOKEN=REDACTED
-HUGGINGFACE_LOGIN_TOKEN=REDACTED
+VITE_MAPBOX_TOKEN=REDACTED

components/contact/ContactForm.jsx

@@ -24,7 +24,7 @@ function ContactForm() {
     <div className={classes.formContainer}>
       {/* Embed the Google Form */}
       <iframe
-        src="https://docs.google.com/forms/d/e/1FAIpQLScrhJY9ezqlKcpYermIImgGKYZ4bP2k1BRAOpuEay-tVXfvdQ/viewform?embedded=true"
+        src={import.meta.env.VITE_CONTACT_FORM}
         className={classes.iframe}
         title="Contact Form"
       >

components/db/DbProvider.jsx

@@ -10,26 +10,26 @@ import Worker from 'web-worker';
 import DbContext from '@db/DbContext';
 import moment from 'moment';
 
+const hf_account = import.meta.env.VITE_ENV === 'DEV' ? '311-Data-Dev' : '311-data';
+
 // List of remote dataset locations used by db.registerFileURL
 const datasets = {
   parquet: {
     // huggingface
-    //* Quick fix - update url when 2025 data available
     hfYtd2025:
-      'https://huggingface.co/datasets/311-data/2024/resolve/main/2024.parquet', // 2025 year-to-date
+      `https://huggingface.co/datasets/${hf_account}/2025/resolve/main/2025.parquet`, // 2025 year-to-date
     hfYtd2024:
-      'https://huggingface.co/datasets/311-data/2024/resolve/main/2024.parquet', // 2024 year-to-date
+      `https://huggingface.co/datasets/${hf_account}/2024/resolve/main/2024.parquet`, // 2024 entire year
     hfYtd2023:
-      'https://huggingface.co/datasets/311-data/2023/resolve/main/2023.parquet', // 2023 entire year
+      `https://huggingface.co/datasets/${hf_account}/2023/resolve/main/2023.parquet`, // 2023 entire year
     hfYtd2022:
-      'https://huggingface.co/datasets/311-data/2022/resolve/main/2022.parquet', // 2022 entire year
+      `https://huggingface.co/datasets/${hf_account}/2022/resolve/main/2022.parquet`, // 2022 entire year
     hfYtd2021:
-      'https://huggingface.co/datasets/311-data/2021/resolve/main/2021.parquet', // 2021 entire year
+      `https://huggingface.co/datasets/${hf_account}/2021/resolve/main/2021.parquet`, // 2021 entire year
     hfYtd2020:
-      'https://huggingface.co/datasets/311-data/2020/resolve/main/2020.parquet', // 2020 entire year
+      `https://huggingface.co/datasets/${hf_account}/2020/resolve/main/2020.parquet`, // 2020 entire year
   },
 };
-
 function DbProvider({ children, startDate }) {
   const [db, setDb] = useState(null);
   const [conn, setConn] = useState(null);
@@ -69,7 +69,7 @@ function DbProvider({ children, startDate }) {
         await newDb.registerFileURL(
           'requests2025.parquet',
           //* Quick fix - change hfYtd2024 to hfYtd2025 when 2025 data available
-          datasets.parquet.hfYtd2024,
+          datasets.parquet.hfYtd2025,
           4, // HTTP = 4. For more options: https://tinyurl.com/DuckDBDataProtocol
         );
 

scripts/updateHfDataset.py

@@ -7,13 +7,24 @@
 from dotenv import load_dotenv
 load_dotenv()
 
+# set environment as 'dev' or 'prod'
+ENV = os.getenv('VITE_ENV').upper()
+
+if ENV == 'DEV':
+    HF_USERNAME = '311-Data-Dev'
+elif ENV == 'PROD':
+    HF_USERNAME = '311-data'
+else:
+  # exit out of the program with an error message
+  print('Incorrect environment variable set for VITE_ENV.')
+  exit(1)
 
 def dlData():
     '''
-    Download the dataset from data.lacity.org
+    Download the current year's dataset from data.lacity.org
     '''
-    url = "https://data.lacity.org/api/views/b7dx-7gc3/rows.csv?accessType=DOWNLOAD"
-    outfile = "2024.csv"
+    url = "https://data.lacity.org/api/views/h73f-gn57/rows.csv?accessType=DOWNLOAD"
+    outfile = "2025.csv"
 
     response = requests.get(url, stream=True)
 
@@ -27,9 +38,9 @@ def hfClean():
     '''
     Clean the dataset by removing problematic string combinations and update timestamp to ISO format
     '''
-    infile = "2024.csv"
-    fixed_filename = "2024-fixed.csv"
-    clean_filename = "2024-clean.parquet"
+    infile = "2025.csv"
+    fixed_filename = "2025-fixed.csv"
+    clean_filename = "2025-clean.parquet"
 
     # List of problmenatic strings to be replaced with ""
     replace_strings = ["VE, 0"]
@@ -58,13 +69,12 @@ def hfUpload():
     '''
     Upload the clean dataset to huggingface.co
     '''
-    local_filename = '2024-clean.parquet'
-    dest_filename = '2024.parquet'
-    username = '311-data'
-    repo_name = '2024'
+    local_filename = '2025-clean.parquet'
+    dest_filename = '2025.parquet'
+    repo_name = '2025'
     repo_type = 'dataset'
 
-    repo_id = f"{username}/{repo_name}"
+    repo_id = f"{HF_USERNAME}/{repo_name}"
     TOKEN = os.getenv('HUGGINGFACE_LOGIN_TOKEN')
 
     login(TOKEN)