time added

Author: Chaimaekit

.github/workflows/build.yml

@@ -3,9 +3,9 @@ name: Deploy Scraper and Index to Elastic Cloud
 on:
   push:
     branches:
-      - build
-  schedule:
-    - cron: '*/10 * * * *'
+      - master
+  # schedule:
+  #   - cron: '*/10 * * * *'
 
 jobs:
   deploy:

README.md

@@ -34,7 +34,6 @@ All scraping and indexing are automated using GitHub Actions on a scheduled cron
 | GET | `/stats` | Total events, upcoming, cities, categories |
 | GET | `/trending` | Trending upcoming events |
 | GET | `/recommendations` | Similar events by category and city |
-| GET | `/calendar` | Events grouped by date for a given month |
 | POST | `/favorites/{event_id}` | Add event to favorites |
 | DELETE | `/favorites/{event_id}` | Remove event from favorites |
 | GET | `/favorites` | Get favorite events |

elastic/elastic_script.py

@@ -1,11 +1,10 @@
 from elasticsearch import helpers
-from into_db.connection import get_db_events
 from scrape.casaevents import get_casa_events
 from scrape.eventbrit import get_event_brit
 from scrape.eventsma import get_events_ma
 from scrape.guichet import get_guichet
 import hashlib
-from elastic_client import get_es_client
+from elastic.elastic_client import get_es_client
 import logging
 import os
 from concurrent.futures import ThreadPoolExecutor, as_completed

main.py

@@ -324,47 +324,6 @@ async def get_favorites(user_id: str = Query("guest")):
         return JSONResponse({"error": str(e), "favorites": [], "count": 0}, status_code=500)
 
 
-@app.get("/calendar")
-async def get_calendar_events(month: int = Query(1), year: int = Query(2026)):
-    try:
-        start_date = f"{year}-{month:02d}-01"
-        if month == 12:
-            end_date = f"{year+1}-01-01"
-        else:
-            end_date = f"{year}-{month+1:02d}-01"
-        
-        response = es.search(
-            index="events_index",
-            query={
-                "range": {
-                    "date.startAt": {
-                        "gte": start_date,
-                        "lt": end_date
-                    }
-                }
-            },
-            size=1000
-        )
-        
-        events_by_date = {}
-        for hit in response["hits"]["hits"]:
-            event = hit["_source"]
-            date_key = event.get("date", {}).get("startAt", "").split("T")[0]
-            if date_key:
-                if date_key not in events_by_date:
-                    events_by_date[date_key] = []
-                events_by_date[date_key].append(event)
-        
-        return {
-            "month": month,
-            "year": year,
-            "events": events_by_date
-        }
-        
-    except Exception as e:
-        return JSONResponse({"error": str(e), "events": {}}, status_code=500)
-
-
 @app.get("/recommendations")
 async def get_recommendations(event_id: str = Query("")):
     """Get recommended events based on similar events"""

scrape/casaevents.py

@@ -10,9 +10,7 @@ def get_casa_events():
         response = requests.get("https://casaevents.ma/actualites/")
         soup = BeautifulSoup(response.text, "html.parser")
         results = []
-
-        # Fixed: changed "srcipt" to "script"
-        items = soup.select_one("html > body > div:nth-of-type(3) > script > div:nth-of-type(1) > div > div > div:nth-of-type(2) > div > div > div > div > div > div")
+        items = soup.select_one("html > body > div:nth-of-type(3) > srcipt > div:nth-of-type(1) > div > div > div:nth-of-type(2) > div > div > div > div > div > div")
         if not items:
             print("Warning: Could not find events container in casaevents.ma")
             return results
@@ -24,27 +22,26 @@ def get_casa_events():
                     link = item.find("a")['href']
                     title = item.find("a")['title']
                     img = item.find("img")['src'] if item.find("img") else ""
-                    date = item.find_all("div")[1].find_all("div")[1].text.strip() if len(item.find_all("div")[1].find_all("div")) > 1 else ""
+                    date = item.find_all("div")[1].find_all("div")[1].text.strip() if len(item.find_all("div")[1].find_all("div")) > 1 else None
 
                     resp = requests.get(link)
                     inside_soup = BeautifulSoup(resp.text, "html.parser")
                     desc = inside_soup.select_one("div.post_ctn.clearfix div.entry")
                     categ = inside_soup.select("div.post_ctn.clearfix div.post-info a")
 
-                    if title != "" and date != "":
+                    if title != "" and date is not None:
                         send_event = Events(
                                 id = "",
                                 name = title,
                                 img = img,
                                 description = desc.text.strip() if desc and desc.text else "No description available",
                                 date = {
-                                    "customDate": "",
+                                    "customDate": None,
                                     "startAt": date,
-                                    "endAt": "",
+                                    "endAt": None,
                                 },
                                 city = "Casablanca",
                                 place = "Casablanca",
-                                # Don't geocode with empty string; use city name instead
                                 coordinates = get_event_coords("Casablanca"),
                                 producer = "Casablanca Events & Animation",
                                 category = [name.text.strip() for name in categ if name.get("rel", []) == ['category', 'tag']] or ["Event"],

scrape/eventbrit.py

@@ -4,6 +4,12 @@
 from struct_events.get_coords import get_event_coords
 
 
+
+def concat_datetime(date, time):
+    if date and time:
+        return f"{date} {time}"
+    return date or None
+
 def get_event_brit():
 
     results = []
@@ -51,8 +57,6 @@ def get_event_brit():
         for obj in data.get("events", []):
             place = obj.get("primary_venue", {}).get("address", {}).get("address_1", "")
             city = obj.get("primary_venue", {}).get("address", {}).get("city", "")
-            
-            # Only geocode if city is Casablanca and we have location info
             coords = None
             if city and "casablanca" in city.lower():
                 coords = get_event_coords(place) if place else get_event_coords(city)
@@ -63,9 +67,9 @@ def get_event_brit():
                 img = obj.get("image", {}).get("original", {}).get("url", ""),
                 description = obj.get("summary", "") or "No description available",
                 date = {
-                        "customDate": obj.get("published", ""),
-                        "startAt": obj.get("start_date", "") + obj.get("start_time", ""),
-                        "endAt": obj.get("end_date", "") + obj.get("end_time", ""),
+                        "customDate": obj.get("published", None),
+                        "startAt": concat_datetime(obj.get("start_date", None), obj.get("start_time", None)),
+                        "endAt": concat_datetime(obj.get("end_date", None), obj.get("end_time", None)),
                         },
                 city = city or "Unknown",
                 place = place or "Unknown",

scrape/eventsma.py

@@ -14,8 +14,6 @@ def get_event(data):
 
                 city = event.get("scene", {}).get("city", {}).get("name", "") if event.get("scene", {}) else ""
                 place = str(event.get("scene", {}).get("libelle", "")) +" "+ str(event.get("scene", {}).get("address", "")) if event.get("scene", {}) else ""
-
-                # Only geocode for Casablanca with valid place info
                 coords = None
                 if city and "casablanca" in city.lower():
                     coords = get_event_coords(place) if place and place.strip() else get_event_coords(city)
@@ -26,9 +24,9 @@ def get_event(data):
                     img = event.get("main_image", ""),
                     description = event.get("meta_description", "") or "No description available",
                     date = {
-                        "customDate": event.get("customDate", ""),
-                        "startAt": event.get("date_start", ""),
-                        "endAt": event.get("date_end", ""),
+                        "customDate": event.get("customDate", None),
+                        "startAt": event.get("date_start", None),
+                        "endAt": event.get("date_end", None),
                     },
                     city = city or "Unknown",
                     place = place or "Unknown",

scrape/guichet.py

@@ -49,8 +49,6 @@ def get_guichet():
                 for event in data.get("events", []):
                     city=event.get("city", {}).get("name", "")
                     place=event.get("place", {}).get("name", "")
-                    
-                    # Only geocode for Casablanca with valid place
                     coords = None
                     if city and "casablanca" in city.lower():
                         coords = get_event_coords(place) if place else get_event_coords(city)
@@ -61,9 +59,9 @@ def get_guichet():
                         img=event.get("meta", {}).get("image", ""),
                         description=event.get("meta", {}).get("description", "") or "No description available",
                         date={
-                            "customDate": event.get("customDate", ""),
-                            "startAt": event.get("startAt", ""),
-                            "endAt": event.get("closingTime", ""),
+                            "customDate": event.get("customDate", None),
+                            "startAt": event.get("startAt", None),
+                            "endAt": event.get("closingTime", None),
                         },
                         city=city or "Unknown",
                         place=place or "Unknown",