Merge branch 'main' of https://github.com/ericahan22/Wat2Do

Author: Tony Qiu

.github/workflows/update-events-data.yml

@@ -77,17 +77,3 @@ jobs:
             backend/scraping/logs/scraping.log
             backend/scraping/apify_raw_results.json
           if-no-files-found: 'ignore'
-
-      - name: Generate static data file
-        id: generate_static
-        working-directory: backend/scraping
-        run: python generate_static_data.py
-
-      - name: Commit and push changes
-        if: steps.generate_static.outcome == 'success'
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git add frontend/src/data/staticData.ts frontend/public/rss.xml
-          git commit -m "chore: update static data from DB" || echo "No changes to commit"
-          git pull --rebase && git push --force

backend/scraping/instagram_feed.py

@@ -309,7 +309,7 @@ def get_apify_input(username=None):
 
     if username:
         usernames = [username]
-        logger.info(f"Scraping @{username}")
+        logger.info(f"Scraping @{username}...")
     else:
         usernames = []
         for url in FULL_URLS:

backend/scraping/logging_config.py

@@ -19,10 +19,10 @@ def setup_logging():
     logging.getLogger("botocore").setLevel(logging.WARNING)
     logging.getLogger("httpcore").setLevel(logging.WARNING)
     logging.getLogger("openai").setLevel(logging.WARNING)
-    logging.getLogger("PIL").setLevel(logging.INFO)
+    logging.getLogger("PIL").setLevel(logging.WARNING)
     logging.getLogger("apify_client").setLevel(logging.WARNING)
 
-    fmt = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    fmt = "%(asctime)s - %(levelname)s - %(message)s"
     handlers = [
         logging.StreamHandler(sys.stdout),
         logging.FileHandler(LOG_FILE, encoding="utf-8"),

backend/scraping/process_single_user.py

@@ -22,7 +22,6 @@ def main():
         logger.error("No TARGET_USERNAME provided.")
         sys.exit(1)
 
-    logger.info(f"Scraping @{target_user}...")
     posts_data = run_apify_scraper(username=target_user)
     if not posts_data:
         logger.warning("No posts found.")
@@ -33,7 +32,6 @@ def main():
 
     try:
         asyncio.run(process_scraped_posts(posts_data, cutoff_date))
-        logger.info("Done.")
     except Exception as e:
         logger.error(f"Error during processing: {e}")
         sys.exit(1)

backend/services/openai_service.py

@@ -189,7 +189,7 @@ def extract_events_from_caption(
         * If both "non-member" / "general admission" and "member" prices appear, use the non-member/general admission numeric price.
         * If only member prices are given and non-member price is absent, use the listed member price.
         * If multiple ticket tiers are listed (e.g., "early bird" and "regular"), use the lowest applicable price (e.g., early bird price).
-        * Parse dollar amounts and return a numeric value (e.g., "$15" -> 15.0). Use null for free events or when no price is mentioned.
+        * Parse dollar amounts and return a numeric value (e.g., "$15" -> 15.0). Use 0 for free events and null for when price is not mentioned.
     - For food: Only set this field if the post says food or drinks will be served, provided, or available for attendees. If specific food or beverage items are mentioned (e.g., "pizza", "bubble tea", "snacks"), list them separated by commas and capitalize ONLY the first item. If the post explicitly says food is provided but does not specify what kind (e.g., "free food", "food provided", "there will be food"), output "Yes!" (exactly). If there is no mention of food or drinks, output an empty string "".
     - For registration: only set to true if there is a clear instruction to register, RSVP, or sign up, otherwise set to false.
     - For description: Make this the caption text word-for-word. If there is no caption text, use the image text.