Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9bfaf04
Merge pull request #17 from JustInternetAI/Development
justinmadison Jun 24, 2025
4caabd4
fix small bug in merging
Jun 24, 2025
22adc0e
Including pycache in gitignore and fixing issue with tracking change …
graceannmad Jun 24, 2025
05826ad
More capitilization changes and readme updates
graceannmad Jun 24, 2025
c497cdb
Editing readme
graceannmad Jun 24, 2025
16dfc1d
Another readme change
graceannmad Jun 24, 2025
53631ad
More formatting
graceannmad Jun 24, 2025
923d06f
Remove old version of the folder
graceannmad Jun 24, 2025
7abc1e8
Merge pull request #19 from JustInternetAI/Chloe
chllein Jun 25, 2025
5054098
Merge branch 'Development' into Grace
graceannmad Jun 25, 2025
93f04c4
Merge pull request #20 from JustInternetAI/Grace
graceannmad Jun 25, 2025
cec7aea
Fixing weird bug in docker-compose
graceannmad Jun 25, 2025
e8e62e7
Tasks set up for BBC and NYT
graceannmad Jun 25, 2025
7c0e5ce
Merge pull request #21 from JustInternetAI/Chloe
chllein Jun 26, 2025
5ed3d01
Updating docker file to include mongo
graceannmad Jun 26, 2025
cd1651f
Merge pull request #22 from JustInternetAI/Development
graceannmad Jun 26, 2025
820c6f3
Adding requirements
graceannmad Jun 26, 2025
6dcdebd
Merge pull request #23 from JustInternetAI/Grace
graceannmad Jun 26, 2025
fb00e1f
Merge branch 'Justin' into Development
justinmadison Jun 26, 2025
7a2b1eb
mongodb up and running now, class structure for rss feed readers impl…
graceannmad Jun 26, 2025
8e135c6
Merge pull request #25 from JustInternetAI/Grace
graceannmad Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
celerybeat-schedule.*
src/celerybeat-schedule.*
feed*.json
.DS_Store
.DS_Store

# Ignore all __pycache__ directories at any level
**/__pycache__/

# Ignore all compiled Python files
*.pyc
*.pyo
*.pyd

#Ignore saved data
data/*
242 changes: 0 additions & 242 deletions bbc_world.xml

This file was deleted.

27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,36 @@ services:
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
- mongo_data:/data/db
depends_on:
- redis
- mongo
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "worker", "--loglevel=info"] #the lowercase j is actually so important

celery_beat:
build:
context: .
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
depends_on:
- redis
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "beat", "--loglevel=info"] #the lowercase j is actually so important

mongo:
image: mongo:latest
container_name: mongo
restart: unless-stopped
environment:
MONGO_INITDB_ROOT_USERNAME: myuser
MONGO_INITDB_ROOT_PASSWORD: mypassword
ports:
- "27017:27017"
volumes:
- mongo_data:/data/db
- .:/workspace:cached

volumes:
mongo_data:
16 changes: 13 additions & 3 deletions readme.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
cd justinsight


## Setting up Celery Beat:
## Setting up Celery Beat
- On MacOS
- run: docker compose up --build
- OR for running in the background: docker compose up -d
Expand All@@ -34,5 +34,15 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
- use EC2 section of entrypoint.sh
- to shut down celery: docker compose down

*When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps"
to find the ID.
Note: When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps" to find the ID.

## How to Create and Schedule a Task
1) Create a method for your task wherever you are working on it that can be called and complete the task. It should be in a package (ie there should be an \_\_init\_\_.py file in the same folder as the file you are working on).
2) Go to src/justinsight/tasks.py and create a new task following the format of the sample task. Remember to add an import statement if one is needed.
3) Go to src/justinsight/celery.py and schedule a new task after the comment showing where to schedule them. The new task can follow the same format as those above

"sample-task-name": {
"task": "justinsight.tasks.your_task_name",
"schedule": x, #where x is the number of seconds between when the task should happen
"args": (), #potential arguments for your task
},
7 changes: 6 additions & 1 deletion requirements.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
celery[redis]
beautifulsoup4
celery[redis]
feedparser
playwright
pymongo
requests
Binary file removedsrc/ingest/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/ingest/__pycache__/bbc_rss.cpython-310.pyc
Binary file not shown.
52 changes: 52 additions & 0 deletions src/ingest/base_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import datetime
import feedparser
import hashlib
import re
from src.ingest.save_to_database import save_entry

class BaseIngestor:
RSS_URL = None #will be set by the subclasses

def slugify(self, text):
# Convert title to a filesystem-friendly slug
text = text.lower()
text = re.sub(r'[^a-z0-9]+', '-', text)
return text.strip('-')

def format_date(self, entry):
# Extract and format the published date
try:
dt = datetime.datetime(*entry.published_parsed[:6])
return dt.strftime("%Y-%m-%d")
except:
return "unknown-date"

def fetch_full_text(self, url):
raise NotImplementedError(
"Subclass must implement fetch_full_text()"
)

def generate_entry_hash(self, entry):
hash_input = f"{entry.title}{entry.link}{entry.get('published', '')}"
return hashlib.sha256(hash_input.encode('utf-8')).hexdigest()

def format_entry(self, entry):
title_slug = self.slugify(entry.title)
date_str = self.format_date(entry)
full_text = self.fetch_full_text(entry.link)

data = {
"title": entry.title,
"link": entry.link,
"published": entry.get("published", ""),
"summary": entry.get("summary", ""),
"full_text": full_text,
"id": self.generate_entry_hash(entry)
}
return data

def check_and_save_new_entries(self):
feed = feedparser.parse(self.RSS_URL)

for entry in feed.entries:
save_entry(self.format_entry(entry))
15 changes: 15 additions & 0 deletions src/ingest/bbc_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
from bs4 import BeautifulSoup
import requests
from src.ingest.base_ingestor import BaseIngestor

class BBCIngestor(BaseIngestor):
RSS_URL = "http://feeds.bbci.co.uk/news/world/rss.xml"

def fetch_full_text(self, article_url):
response = requests.get(self.RSS_URL)
soup = BeautifulSoup(response.content, 'html.parser')

article = soup.find('article')

if article:
return(article.get_text())
18 changes: 18 additions & 0 deletions src/ingest/save_to_database.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
from pymongo import MongoClient

# Include username, password, and authentication database
client = MongoClient("mongodb://myuser:mypassword@mongo:27017/justinsightdb?authSource=admin")

# Get (or create) a database
db = client["justinsightdb"]

# Get (or create) a collection
collection = db["articles"]

def save_entry(entry):
#check if the entry has already been saved and if it has not then save it
entry_hash = entry["id"]
if collection.count_documents({"id": entry_hash}) == 0:
collection.insert_one(entry)
else:
print(f"{entry['title']} already in use!")
Binary file removedsrc/justInsight/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/celery.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/tasks.cpython-310.pyc
Binary file not shown.
18 changes: 0 additions & 18 deletions src/justInsight/celery.py

This file was deleted.

9 changes: 0 additions & 9 deletions src/justInsight/tasks.py

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions src/justinsight/celery.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
# celery.py
from celery import Celery

app = Celery(
"justinsight",
broker="redis://redis:6379/0",
backend="redis://redis:6379/0",
include=["justinsight.tasks"],
)

# Optional beat schedule
app.conf.beat_schedule = {
# "sample-task-every-5-seconds": {
# "task": "justinsight.tasks.sample_task",
# "schedule": 5.0,
# "args": (),
# },

"check-BBCfeed-every-5-minutes": {
"task": "justinsight.tasks.bbcLogger_task",
"schedule": 5.0,
"args": (),
},

# "check-NYTfeed-every-5-minutes": {
# "task": "justinsight.tasks.nytLogger_task",
# "schedule": 300.0,
# "args": (),
# },

#schedule more tasks here
}
23 changes: 23 additions & 0 deletions src/justinsight/tasks.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
# tasks.py
from celery import shared_task
from ingest.bbc_ingestor import BBCIngestor


@shared_task
def sample_task():
print("Sample task!")
return "done!"

@shared_task
def bbcLogger_task():
# Create an instance of the class
ingestor = BBCIngestor()
ingestor.check_and_save_new_entries() # this will invoke the inherited logic
return "BBC RSS Feed checked."

@shared_task
def nytLogger_task():
check_and_save_nyt()
return "NYT RSS Feed checked."

#Add more tasks here in the format of the one above
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all \x3Cpre>\x3Ccode> blocks (function() { function addCopyButtons() { document.querySelectorAll('pre code').forEach(function(codeBlock) { if (codeBlock.parentElement.hasAttribute('data-copy-added')) return; codeBlock.parentElement.setAttribute('data-copy-added', 'true'); var btn = document.createElement('button'); btn.textContent = 'Copy'; btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;'; btn.onmouseover = function() { this.style.opacity = '1'; }; btn.onmouseout = function() { this.style.opacity = '0.7'; }; btn.onclick = function() { navigator.clipboard.writeText(codeBlock.textContent).then(function() { btn.textContent = 'Copied!'; setTimeout(function() { btn.textContent = 'Copy'; }, 1500); }); }; codeBlock.parentElement.style.position = 'relative'; codeBlock.parentElement.appendChild(btn); }); } addCopyButtons(); // Re-run on dynamic content var observer = new MutationObserver(addCopyButtons); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + ' Development by chllein · Pull Request #27 · JustInternetAI/JustInsight · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9bfaf04
Merge pull request #17 from JustInternetAI/Development
justinmadison Jun 24, 2025
4caabd4
fix small bug in merging
Jun 24, 2025
22adc0e
Including pycache in gitignore and fixing issue with tracking change …
graceannmad Jun 24, 2025
05826ad
More capitilization changes and readme updates
graceannmad Jun 24, 2025
c497cdb
Editing readme
graceannmad Jun 24, 2025
16dfc1d
Another readme change
graceannmad Jun 24, 2025
53631ad
More formatting
graceannmad Jun 24, 2025
923d06f
Remove old version of the folder
graceannmad Jun 24, 2025
7abc1e8
Merge pull request #19 from JustInternetAI/Chloe
chllein Jun 25, 2025
5054098
Merge branch 'Development' into Grace
graceannmad Jun 25, 2025
93f04c4
Merge pull request #20 from JustInternetAI/Grace
graceannmad Jun 25, 2025
cec7aea
Fixing weird bug in docker-compose
graceannmad Jun 25, 2025
e8e62e7
Tasks set up for BBC and NYT
graceannmad Jun 25, 2025
7c0e5ce
Merge pull request #21 from JustInternetAI/Chloe
chllein Jun 26, 2025
5ed3d01
Updating docker file to include mongo
graceannmad Jun 26, 2025
cd1651f
Merge pull request #22 from JustInternetAI/Development
graceannmad Jun 26, 2025
820c6f3
Adding requirements
graceannmad Jun 26, 2025
6dcdebd
Merge pull request #23 from JustInternetAI/Grace
graceannmad Jun 26, 2025
fb00e1f
Merge branch 'Justin' into Development
justinmadison Jun 26, 2025
7a2b1eb
mongodb up and running now, class structure for rss feed readers impl…
graceannmad Jun 26, 2025
8e135c6
Merge pull request #25 from JustInternetAI/Grace
graceannmad Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
celerybeat-schedule.*
src/celerybeat-schedule.*
feed*.json
.DS_Store
.DS_Store

# Ignore all __pycache__ directories at any level
**/__pycache__/

# Ignore all compiled Python files
*.pyc
*.pyo
*.pyd

#Ignore saved data
data/*
242 changes: 0 additions & 242 deletions bbc_world.xml

This file was deleted.

27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,36 @@ services:
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
- mongo_data:/data/db
depends_on:
- redis
- mongo
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "worker", "--loglevel=info"] #the lowercase j is actually so important

celery_beat:
build:
context: .
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
depends_on:
- redis
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "beat", "--loglevel=info"] #the lowercase j is actually so important

mongo:
image: mongo:latest
container_name: mongo
restart: unless-stopped
environment:
MONGO_INITDB_ROOT_USERNAME: myuser
MONGO_INITDB_ROOT_PASSWORD: mypassword
ports:
- "27017:27017"
volumes:
- mongo_data:/data/db
- .:/workspace:cached

volumes:
mongo_data:
16 changes: 13 additions & 3 deletions readme.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
cd justinsight


## Setting up Celery Beat:
## Setting up Celery Beat
- On MacOS
- run: docker compose up --build
- OR for running in the background: docker compose up -d
Expand All@@ -34,5 +34,15 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
- use EC2 section of entrypoint.sh
- to shut down celery: docker compose down

*When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps"
to find the ID.
Note: When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps" to find the ID.

## How to Create and Schedule a Task
1) Create a method for your task wherever you are working on it that can be called and complete the task. It should be in a package (ie there should be an \_\_init\_\_.py file in the same folder as the file you are working on).
2) Go to src/justinsight/tasks.py and create a new task following the format of the sample task. Remember to add an import statement if one is needed.
3) Go to src/justinsight/celery.py and schedule a new task after the comment showing where to schedule them. The new task can follow the same format as those above

"sample-task-name": {
"task": "justinsight.tasks.your_task_name",
"schedule": x, #where x is the number of seconds between when the task should happen
"args": (), #potential arguments for your task
},
7 changes: 6 additions & 1 deletion requirements.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
celery[redis]
beautifulsoup4
celery[redis]
feedparser
playwright
pymongo
requests
Binary file removedsrc/ingest/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/ingest/__pycache__/bbc_rss.cpython-310.pyc
Binary file not shown.
52 changes: 52 additions & 0 deletions src/ingest/base_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import datetime
import feedparser
import hashlib
import re
from src.ingest.save_to_database import save_entry

class BaseIngestor:
RSS_URL = None #will be set by the subclasses

def slugify(self, text):
# Convert title to a filesystem-friendly slug
text = text.lower()
text = re.sub(r'[^a-z0-9]+', '-', text)
return text.strip('-')

def format_date(self, entry):
# Extract and format the published date
try:
dt = datetime.datetime(*entry.published_parsed[:6])
return dt.strftime("%Y-%m-%d")
except:
return "unknown-date"

def fetch_full_text(self, url):
raise NotImplementedError(
"Subclass must implement fetch_full_text()"
)

def generate_entry_hash(self, entry):
hash_input = f"{entry.title}{entry.link}{entry.get('published', '')}"
return hashlib.sha256(hash_input.encode('utf-8')).hexdigest()

def format_entry(self, entry):
title_slug = self.slugify(entry.title)
date_str = self.format_date(entry)
full_text = self.fetch_full_text(entry.link)

data = {
"title": entry.title,
"link": entry.link,
"published": entry.get("published", ""),
"summary": entry.get("summary", ""),
"full_text": full_text,
"id": self.generate_entry_hash(entry)
}
return data

def check_and_save_new_entries(self):
feed = feedparser.parse(self.RSS_URL)

for entry in feed.entries:
save_entry(self.format_entry(entry))
15 changes: 15 additions & 0 deletions src/ingest/bbc_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
from bs4 import BeautifulSoup
import requests
from src.ingest.base_ingestor import BaseIngestor

class BBCIngestor(BaseIngestor):
RSS_URL = "http://feeds.bbci.co.uk/news/world/rss.xml"

def fetch_full_text(self, article_url):
response = requests.get(self.RSS_URL)
soup = BeautifulSoup(response.content, 'html.parser')

article = soup.find('article')

if article:
return(article.get_text())
18 changes: 18 additions & 0 deletions src/ingest/save_to_database.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
from pymongo import MongoClient

# Include username, password, and authentication database
client = MongoClient("mongodb://myuser:mypassword@mongo:27017/justinsightdb?authSource=admin")

# Get (or create) a database
db = client["justinsightdb"]

# Get (or create) a collection
collection = db["articles"]

def save_entry(entry):
#check if the entry has already been saved and if it has not then save it
entry_hash = entry["id"]
if collection.count_documents({"id": entry_hash}) == 0:
collection.insert_one(entry)
else:
print(f"{entry['title']} already in use!")
Binary file removedsrc/justInsight/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/celery.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/tasks.cpython-310.pyc
Binary file not shown.
18 changes: 0 additions & 18 deletions src/justInsight/celery.py

This file was deleted.

9 changes: 0 additions & 9 deletions src/justInsight/tasks.py

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions src/justinsight/celery.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
# celery.py
from celery import Celery

app = Celery(
"justinsight",
broker="redis://redis:6379/0",
backend="redis://redis:6379/0",
include=["justinsight.tasks"],
)

# Optional beat schedule
app.conf.beat_schedule = {
# "sample-task-every-5-seconds": {
# "task": "justinsight.tasks.sample_task",
# "schedule": 5.0,
# "args": (),
# },

"check-BBCfeed-every-5-minutes": {
"task": "justinsight.tasks.bbcLogger_task",
"schedule": 5.0,
"args": (),
},

# "check-NYTfeed-every-5-minutes": {
# "task": "justinsight.tasks.nytLogger_task",
# "schedule": 300.0,
# "args": (),
# },

#schedule more tasks here
}
23 changes: 23 additions & 0 deletions src/justinsight/tasks.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
# tasks.py
from celery import shared_task
from ingest.bbc_ingestor import BBCIngestor


@shared_task
def sample_task():
print("Sample task!")
return "done!"

@shared_task
def bbcLogger_task():
# Create an instance of the class
ingestor = BBCIngestor()
ingestor.check_and_save_new_entries() # this will invoke the inherited logic
return "BBC RSS Feed checked."

@shared_task
def nytLogger_task():
check_and_save_nyt()
return "NYT RSS Feed checked."

#Add more tasks here in the format of the one above
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Development by chllein · Pull Request #27 · JustInternetAI/JustInsight · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9bfaf04
Merge pull request #17 from JustInternetAI/Development
justinmadison Jun 24, 2025
4caabd4
fix small bug in merging
Jun 24, 2025
22adc0e
Including pycache in gitignore and fixing issue with tracking change …
graceannmad Jun 24, 2025
05826ad
More capitilization changes and readme updates
graceannmad Jun 24, 2025
c497cdb
Editing readme
graceannmad Jun 24, 2025
16dfc1d
Another readme change
graceannmad Jun 24, 2025
53631ad
More formatting
graceannmad Jun 24, 2025
923d06f
Remove old version of the folder
graceannmad Jun 24, 2025
7abc1e8
Merge pull request #19 from JustInternetAI/Chloe
chllein Jun 25, 2025
5054098
Merge branch 'Development' into Grace
graceannmad Jun 25, 2025
93f04c4
Merge pull request #20 from JustInternetAI/Grace
graceannmad Jun 25, 2025
cec7aea
Fixing weird bug in docker-compose
graceannmad Jun 25, 2025
e8e62e7
Tasks set up for BBC and NYT
graceannmad Jun 25, 2025
7c0e5ce
Merge pull request #21 from JustInternetAI/Chloe
chllein Jun 26, 2025
5ed3d01
Updating docker file to include mongo
graceannmad Jun 26, 2025
cd1651f
Merge pull request #22 from JustInternetAI/Development
graceannmad Jun 26, 2025
820c6f3
Adding requirements
graceannmad Jun 26, 2025
6dcdebd
Merge pull request #23 from JustInternetAI/Grace
graceannmad Jun 26, 2025
fb00e1f
Merge branch 'Justin' into Development
justinmadison Jun 26, 2025
7a2b1eb
mongodb up and running now, class structure for rss feed readers impl…
graceannmad Jun 26, 2025
8e135c6
Merge pull request #25 from JustInternetAI/Grace
graceannmad Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
celerybeat-schedule.*
src/celerybeat-schedule.*
feed*.json
.DS_Store
.DS_Store

# Ignore all __pycache__ directories at any level
**/__pycache__/

# Ignore all compiled Python files
*.pyc
*.pyo
*.pyd

#Ignore saved data
data/*
242 changes: 0 additions & 242 deletions bbc_world.xml

This file was deleted.

27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,36 @@ services:
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
- mongo_data:/data/db
depends_on:
- redis
- mongo
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "worker", "--loglevel=info"] #the lowercase j is actually so important

celery_beat:
build:
context: .
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
depends_on:
- redis
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "beat", "--loglevel=info"] #the lowercase j is actually so important

mongo:
image: mongo:latest
container_name: mongo
restart: unless-stopped
environment:
MONGO_INITDB_ROOT_USERNAME: myuser
MONGO_INITDB_ROOT_PASSWORD: mypassword
ports:
- "27017:27017"
volumes:
- mongo_data:/data/db
- .:/workspace:cached

volumes:
mongo_data:
16 changes: 13 additions & 3 deletions readme.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
cd justinsight


## Setting up Celery Beat:
## Setting up Celery Beat
- On MacOS
- run: docker compose up --build
- OR for running in the background: docker compose up -d
Expand All@@ -34,5 +34,15 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
- use EC2 section of entrypoint.sh
- to shut down celery: docker compose down

*When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps"
to find the ID.
Note: When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps" to find the ID.

## How to Create and Schedule a Task
1) Create a method for your task wherever you are working on it that can be called and complete the task. It should be in a package (ie there should be an \_\_init\_\_.py file in the same folder as the file you are working on).
2) Go to src/justinsight/tasks.py and create a new task following the format of the sample task. Remember to add an import statement if one is needed.
3) Go to src/justinsight/celery.py and schedule a new task after the comment showing where to schedule them. The new task can follow the same format as those above

"sample-task-name": {
"task": "justinsight.tasks.your_task_name",
"schedule": x, #where x is the number of seconds between when the task should happen
"args": (), #potential arguments for your task
},
7 changes: 6 additions & 1 deletion requirements.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
celery[redis]
beautifulsoup4
celery[redis]
feedparser
playwright
pymongo
requests
Binary file removedsrc/ingest/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/ingest/__pycache__/bbc_rss.cpython-310.pyc
Binary file not shown.
52 changes: 52 additions & 0 deletions src/ingest/base_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import datetime
import feedparser
import hashlib
import re
from src.ingest.save_to_database import save_entry

class BaseIngestor:
RSS_URL = None #will be set by the subclasses

def slugify(self, text):
# Convert title to a filesystem-friendly slug
text = text.lower()
text = re.sub(r'[^a-z0-9]+', '-', text)
return text.strip('-')

def format_date(self, entry):
# Extract and format the published date
try:
dt = datetime.datetime(*entry.published_parsed[:6])
return dt.strftime("%Y-%m-%d")
except:
return "unknown-date"

def fetch_full_text(self, url):
raise NotImplementedError(
"Subclass must implement fetch_full_text()"
)

def generate_entry_hash(self, entry):
hash_input = f"{entry.title}{entry.link}{entry.get('published', '')}"
return hashlib.sha256(hash_input.encode('utf-8')).hexdigest()

def format_entry(self, entry):
title_slug = self.slugify(entry.title)
date_str = self.format_date(entry)
full_text = self.fetch_full_text(entry.link)

data = {
"title": entry.title,
"link": entry.link,
"published": entry.get("published", ""),
"summary": entry.get("summary", ""),
"full_text": full_text,
"id": self.generate_entry_hash(entry)
}
return data

def check_and_save_new_entries(self):
feed = feedparser.parse(self.RSS_URL)

for entry in feed.entries:
save_entry(self.format_entry(entry))
15 changes: 15 additions & 0 deletions src/ingest/bbc_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
from bs4 import BeautifulSoup
import requests
from src.ingest.base_ingestor import BaseIngestor

class BBCIngestor(BaseIngestor):
RSS_URL = "http://feeds.bbci.co.uk/news/world/rss.xml"

def fetch_full_text(self, article_url):
response = requests.get(self.RSS_URL)
soup = BeautifulSoup(response.content, 'html.parser')

article = soup.find('article')

if article:
return(article.get_text())
18 changes: 18 additions & 0 deletions src/ingest/save_to_database.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
from pymongo import MongoClient

# Include username, password, and authentication database
client = MongoClient("mongodb://myuser:mypassword@mongo:27017/justinsightdb?authSource=admin")

# Get (or create) a database
db = client["justinsightdb"]

# Get (or create) a collection
collection = db["articles"]

def save_entry(entry):
#check if the entry has already been saved and if it has not then save it
entry_hash = entry["id"]
if collection.count_documents({"id": entry_hash}) == 0:
collection.insert_one(entry)
else:
print(f"{entry['title']} already in use!")
Binary file removedsrc/justInsight/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/celery.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/tasks.cpython-310.pyc
Binary file not shown.
18 changes: 0 additions & 18 deletions src/justInsight/celery.py

This file was deleted.

9 changes: 0 additions & 9 deletions src/justInsight/tasks.py

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions src/justinsight/celery.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
# celery.py
from celery import Celery

app = Celery(
"justinsight",
broker="redis://redis:6379/0",
backend="redis://redis:6379/0",
include=["justinsight.tasks"],
)

# Optional beat schedule
app.conf.beat_schedule = {
# "sample-task-every-5-seconds": {
# "task": "justinsight.tasks.sample_task",
# "schedule": 5.0,
# "args": (),
# },

"check-BBCfeed-every-5-minutes": {
"task": "justinsight.tasks.bbcLogger_task",
"schedule": 5.0,
"args": (),
},

# "check-NYTfeed-every-5-minutes": {
# "task": "justinsight.tasks.nytLogger_task",
# "schedule": 300.0,
# "args": (),
# },

#schedule more tasks here
}
23 changes: 23 additions & 0 deletions src/justinsight/tasks.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
# tasks.py
from celery import shared_task
from ingest.bbc_ingestor import BBCIngestor


@shared_task
def sample_task():
print("Sample task!")
return "done!"

@shared_task
def bbcLogger_task():
# Create an instance of the class
ingestor = BBCIngestor()
ingestor.check_and_save_new_entries() # this will invoke the inherited logic
return "BBC RSS Feed checked."

@shared_task
def nytLogger_task():
check_and_save_nyt()
return "NYT RSS Feed checked."

#Add more tasks here in the format of the one above
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Development by chllein · Pull Request #27 · JustInternetAI/JustInsight · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9bfaf04
Merge pull request #17 from JustInternetAI/Development
justinmadison Jun 24, 2025
4caabd4
fix small bug in merging
Jun 24, 2025
22adc0e
Including pycache in gitignore and fixing issue with tracking change …
graceannmad Jun 24, 2025
05826ad
More capitilization changes and readme updates
graceannmad Jun 24, 2025
c497cdb
Editing readme
graceannmad Jun 24, 2025
16dfc1d
Another readme change
graceannmad Jun 24, 2025
53631ad
More formatting
graceannmad Jun 24, 2025
923d06f
Remove old version of the folder
graceannmad Jun 24, 2025
7abc1e8
Merge pull request #19 from JustInternetAI/Chloe
chllein Jun 25, 2025
5054098
Merge branch 'Development' into Grace
graceannmad Jun 25, 2025
93f04c4
Merge pull request #20 from JustInternetAI/Grace
graceannmad Jun 25, 2025
cec7aea
Fixing weird bug in docker-compose
graceannmad Jun 25, 2025
e8e62e7
Tasks set up for BBC and NYT
graceannmad Jun 25, 2025
7c0e5ce
Merge pull request #21 from JustInternetAI/Chloe
chllein Jun 26, 2025
5ed3d01
Updating docker file to include mongo
graceannmad Jun 26, 2025
cd1651f
Merge pull request #22 from JustInternetAI/Development
graceannmad Jun 26, 2025
820c6f3
Adding requirements
graceannmad Jun 26, 2025
6dcdebd
Merge pull request #23 from JustInternetAI/Grace
graceannmad Jun 26, 2025
fb00e1f
Merge branch 'Justin' into Development
justinmadison Jun 26, 2025
7a2b1eb
mongodb up and running now, class structure for rss feed readers impl…
graceannmad Jun 26, 2025
8e135c6
Merge pull request #25 from JustInternetAI/Grace
graceannmad Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
celerybeat-schedule.*
src/celerybeat-schedule.*
feed*.json
.DS_Store
.DS_Store

# Ignore all __pycache__ directories at any level
**/__pycache__/

# Ignore all compiled Python files
*.pyc
*.pyo
*.pyd

#Ignore saved data
data/*
242 changes: 0 additions & 242 deletions bbc_world.xml

This file was deleted.

27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,36 @@ services:
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
- mongo_data:/data/db
depends_on:
- redis
- mongo
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "worker", "--loglevel=info"] #the lowercase j is actually so important

celery_beat:
build:
context: .
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
depends_on:
- redis
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "beat", "--loglevel=info"] #the lowercase j is actually so important

mongo:
image: mongo:latest
container_name: mongo
restart: unless-stopped
environment:
MONGO_INITDB_ROOT_USERNAME: myuser
MONGO_INITDB_ROOT_PASSWORD: mypassword
ports:
- "27017:27017"
volumes:
- mongo_data:/data/db
- .:/workspace:cached

volumes:
mongo_data:
16 changes: 13 additions & 3 deletions readme.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
cd justinsight


## Setting up Celery Beat:
## Setting up Celery Beat
- On MacOS
- run: docker compose up --build
- OR for running in the background: docker compose up -d
Expand All@@ -34,5 +34,15 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
- use EC2 section of entrypoint.sh
- to shut down celery: docker compose down

*When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps"
to find the ID.
Note: When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps" to find the ID.

## How to Create and Schedule a Task
1) Create a method for your task wherever you are working on it that can be called and complete the task. It should be in a package (ie there should be an \_\_init\_\_.py file in the same folder as the file you are working on).
2) Go to src/justinsight/tasks.py and create a new task following the format of the sample task. Remember to add an import statement if one is needed.
3) Go to src/justinsight/celery.py and schedule a new task after the comment showing where to schedule them. The new task can follow the same format as those above

"sample-task-name": {
"task": "justinsight.tasks.your_task_name",
"schedule": x, #where x is the number of seconds between when the task should happen
"args": (), #potential arguments for your task
},
7 changes: 6 additions & 1 deletion requirements.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
celery[redis]
beautifulsoup4
celery[redis]
feedparser
playwright
pymongo
requests
Binary file removedsrc/ingest/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/ingest/__pycache__/bbc_rss.cpython-310.pyc
Binary file not shown.
52 changes: 52 additions & 0 deletions src/ingest/base_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import datetime
import feedparser
import hashlib
import re
from src.ingest.save_to_database import save_entry

class BaseIngestor:
RSS_URL = None #will be set by the subclasses

def slugify(self, text):
# Convert title to a filesystem-friendly slug
text = text.lower()
text = re.sub(r'[^a-z0-9]+', '-', text)
return text.strip('-')

def format_date(self, entry):
# Extract and format the published date
try:
dt = datetime.datetime(*entry.published_parsed[:6])
return dt.strftime("%Y-%m-%d")
except:
return "unknown-date"

def fetch_full_text(self, url):
raise NotImplementedError(
"Subclass must implement fetch_full_text()"
)

def generate_entry_hash(self, entry):
hash_input = f"{entry.title}{entry.link}{entry.get('published', '')}"
return hashlib.sha256(hash_input.encode('utf-8')).hexdigest()

def format_entry(self, entry):
title_slug = self.slugify(entry.title)
date_str = self.format_date(entry)
full_text = self.fetch_full_text(entry.link)

data = {
"title": entry.title,
"link": entry.link,
"published": entry.get("published", ""),
"summary": entry.get("summary", ""),
"full_text": full_text,
"id": self.generate_entry_hash(entry)
}
return data

def check_and_save_new_entries(self):
feed = feedparser.parse(self.RSS_URL)

for entry in feed.entries:
save_entry(self.format_entry(entry))
15 changes: 15 additions & 0 deletions src/ingest/bbc_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
from bs4 import BeautifulSoup
import requests
from src.ingest.base_ingestor import BaseIngestor

class BBCIngestor(BaseIngestor):
RSS_URL = "http://feeds.bbci.co.uk/news/world/rss.xml"

def fetch_full_text(self, article_url):
response = requests.get(self.RSS_URL)
soup = BeautifulSoup(response.content, 'html.parser')

article = soup.find('article')

if article:
return(article.get_text())
18 changes: 18 additions & 0 deletions src/ingest/save_to_database.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
from pymongo import MongoClient

# Include username, password, and authentication database
client = MongoClient("mongodb://myuser:mypassword@mongo:27017/justinsightdb?authSource=admin")

# Get (or create) a database
db = client["justinsightdb"]

# Get (or create) a collection
collection = db["articles"]

def save_entry(entry):
#check if the entry has already been saved and if it has not then save it
entry_hash = entry["id"]
if collection.count_documents({"id": entry_hash}) == 0:
collection.insert_one(entry)
else:
print(f"{entry['title']} already in use!")
Binary file removedsrc/justInsight/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/celery.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/tasks.cpython-310.pyc
Binary file not shown.
18 changes: 0 additions & 18 deletions src/justInsight/celery.py

This file was deleted.

9 changes: 0 additions & 9 deletions src/justInsight/tasks.py

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions src/justinsight/celery.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
# celery.py
from celery import Celery

app = Celery(
"justinsight",
broker="redis://redis:6379/0",
backend="redis://redis:6379/0",
include=["justinsight.tasks"],
)

# Optional beat schedule
app.conf.beat_schedule = {
# "sample-task-every-5-seconds": {
# "task": "justinsight.tasks.sample_task",
# "schedule": 5.0,
# "args": (),
# },

"check-BBCfeed-every-5-minutes": {
"task": "justinsight.tasks.bbcLogger_task",
"schedule": 5.0,
"args": (),
},

# "check-NYTfeed-every-5-minutes": {
# "task": "justinsight.tasks.nytLogger_task",
# "schedule": 300.0,
# "args": (),
# },

#schedule more tasks here
}
23 changes: 23 additions & 0 deletions src/justinsight/tasks.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
# tasks.py
from celery import shared_task
from ingest.bbc_ingestor import BBCIngestor


@shared_task
def sample_task():
print("Sample task!")
return "done!"

@shared_task
def bbcLogger_task():
# Create an instance of the class
ingestor = BBCIngestor()
ingestor.check_and_save_new_entries() # this will invoke the inherited logic
return "BBC RSS Feed checked."

@shared_task
def nytLogger_task():
check_and_save_nyt()
return "NYT RSS Feed checked."

#Add more tasks here in the format of the one above
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Development by chllein · Pull Request #27 · JustInternetAI/JustInsight · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9bfaf04
Merge pull request #17 from JustInternetAI/Development
justinmadison Jun 24, 2025
4caabd4
fix small bug in merging
Jun 24, 2025
22adc0e
Including pycache in gitignore and fixing issue with tracking change …
graceannmad Jun 24, 2025
05826ad
More capitilization changes and readme updates
graceannmad Jun 24, 2025
c497cdb
Editing readme
graceannmad Jun 24, 2025
16dfc1d
Another readme change
graceannmad Jun 24, 2025
53631ad
More formatting
graceannmad Jun 24, 2025
923d06f
Remove old version of the folder
graceannmad Jun 24, 2025
7abc1e8
Merge pull request #19 from JustInternetAI/Chloe
chllein Jun 25, 2025
5054098
Merge branch 'Development' into Grace
graceannmad Jun 25, 2025
93f04c4
Merge pull request #20 from JustInternetAI/Grace
graceannmad Jun 25, 2025
cec7aea
Fixing weird bug in docker-compose
graceannmad Jun 25, 2025
e8e62e7
Tasks set up for BBC and NYT
graceannmad Jun 25, 2025
7c0e5ce
Merge pull request #21 from JustInternetAI/Chloe
chllein Jun 26, 2025
5ed3d01
Updating docker file to include mongo
graceannmad Jun 26, 2025
cd1651f
Merge pull request #22 from JustInternetAI/Development
graceannmad Jun 26, 2025
820c6f3
Adding requirements
graceannmad Jun 26, 2025
6dcdebd
Merge pull request #23 from JustInternetAI/Grace
graceannmad Jun 26, 2025
fb00e1f
Merge branch 'Justin' into Development
justinmadison Jun 26, 2025
7a2b1eb
mongodb up and running now, class structure for rss feed readers impl…
graceannmad Jun 26, 2025
8e135c6
Merge pull request #25 from JustInternetAI/Grace
graceannmad Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
celerybeat-schedule.*
src/celerybeat-schedule.*
feed*.json
.DS_Store
.DS_Store

# Ignore all __pycache__ directories at any level
**/__pycache__/

# Ignore all compiled Python files
*.pyc
*.pyo
*.pyd

#Ignore saved data
data/*
242 changes: 0 additions & 242 deletions bbc_world.xml

This file was deleted.

27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,36 @@ services:
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
- mongo_data:/data/db
depends_on:
- redis
- mongo
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "worker", "--loglevel=info"] #the lowercase j is actually so important

celery_beat:
build:
context: .
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
depends_on:
- redis
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "beat", "--loglevel=info"] #the lowercase j is actually so important

mongo:
image: mongo:latest
container_name: mongo
restart: unless-stopped
environment:
MONGO_INITDB_ROOT_USERNAME: myuser
MONGO_INITDB_ROOT_PASSWORD: mypassword
ports:
- "27017:27017"
volumes:
- mongo_data:/data/db
- .:/workspace:cached

volumes:
mongo_data:
16 changes: 13 additions & 3 deletions readme.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
cd justinsight


## Setting up Celery Beat:
## Setting up Celery Beat
- On MacOS
- run: docker compose up --build
- OR for running in the background: docker compose up -d
Expand All@@ -34,5 +34,15 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
- use EC2 section of entrypoint.sh
- to shut down celery: docker compose down

*When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps"
to find the ID.
Note: When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps" to find the ID.

## How to Create and Schedule a Task
1) Create a method for your task wherever you are working on it that can be called and complete the task. It should be in a package (ie there should be an \_\_init\_\_.py file in the same folder as the file you are working on).
2) Go to src/justinsight/tasks.py and create a new task following the format of the sample task. Remember to add an import statement if one is needed.
3) Go to src/justinsight/celery.py and schedule a new task after the comment showing where to schedule them. The new task can follow the same format as those above

"sample-task-name": {
"task": "justinsight.tasks.your_task_name",
"schedule": x, #where x is the number of seconds between when the task should happen
"args": (), #potential arguments for your task
},
7 changes: 6 additions & 1 deletion requirements.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
celery[redis]
beautifulsoup4
celery[redis]
feedparser
playwright
pymongo
requests
Binary file removedsrc/ingest/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/ingest/__pycache__/bbc_rss.cpython-310.pyc
Binary file not shown.
52 changes: 52 additions & 0 deletions src/ingest/base_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import datetime
import feedparser
import hashlib
import re
from src.ingest.save_to_database import save_entry

class BaseIngestor:
RSS_URL = None #will be set by the subclasses

def slugify(self, text):
# Convert title to a filesystem-friendly slug
text = text.lower()
text = re.sub(r'[^a-z0-9]+', '-', text)
return text.strip('-')

def format_date(self, entry):
# Extract and format the published date
try:
dt = datetime.datetime(*entry.published_parsed[:6])
return dt.strftime("%Y-%m-%d")
except:
return "unknown-date"

def fetch_full_text(self, url):
raise NotImplementedError(
"Subclass must implement fetch_full_text()"
)

def generate_entry_hash(self, entry):
hash_input = f"{entry.title}{entry.link}{entry.get('published', '')}"
return hashlib.sha256(hash_input.encode('utf-8')).hexdigest()

def format_entry(self, entry):
title_slug = self.slugify(entry.title)
date_str = self.format_date(entry)
full_text = self.fetch_full_text(entry.link)

data = {
"title": entry.title,
"link": entry.link,
"published": entry.get("published", ""),
"summary": entry.get("summary", ""),
"full_text": full_text,
"id": self.generate_entry_hash(entry)
}
return data

def check_and_save_new_entries(self):
feed = feedparser.parse(self.RSS_URL)

for entry in feed.entries:
save_entry(self.format_entry(entry))
15 changes: 15 additions & 0 deletions src/ingest/bbc_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
from bs4 import BeautifulSoup
import requests
from src.ingest.base_ingestor import BaseIngestor

class BBCIngestor(BaseIngestor):
RSS_URL = "http://feeds.bbci.co.uk/news/world/rss.xml"

def fetch_full_text(self, article_url):
response = requests.get(self.RSS_URL)
soup = BeautifulSoup(response.content, 'html.parser')

article = soup.find('article')

if article:
return(article.get_text())
18 changes: 18 additions & 0 deletions src/ingest/save_to_database.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
from pymongo import MongoClient

# Include username, password, and authentication database
client = MongoClient("mongodb://myuser:mypassword@mongo:27017/justinsightdb?authSource=admin")

# Get (or create) a database
db = client["justinsightdb"]

# Get (or create) a collection
collection = db["articles"]

def save_entry(entry):
#check if the entry has already been saved and if it has not then save it
entry_hash = entry["id"]
if collection.count_documents({"id": entry_hash}) == 0:
collection.insert_one(entry)
else:
print(f"{entry['title']} already in use!")
Binary file removedsrc/justInsight/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/celery.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/tasks.cpython-310.pyc
Binary file not shown.
18 changes: 0 additions & 18 deletions src/justInsight/celery.py

This file was deleted.

9 changes: 0 additions & 9 deletions src/justInsight/tasks.py

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions src/justinsight/celery.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
# celery.py
from celery import Celery

app = Celery(
"justinsight",
broker="redis://redis:6379/0",
backend="redis://redis:6379/0",
include=["justinsight.tasks"],
)

# Optional beat schedule
app.conf.beat_schedule = {
# "sample-task-every-5-seconds": {
# "task": "justinsight.tasks.sample_task",
# "schedule": 5.0,
# "args": (),
# },

"check-BBCfeed-every-5-minutes": {
"task": "justinsight.tasks.bbcLogger_task",
"schedule": 5.0,
"args": (),
},

# "check-NYTfeed-every-5-minutes": {
# "task": "justinsight.tasks.nytLogger_task",
# "schedule": 300.0,
# "args": (),
# },

#schedule more tasks here
}
23 changes: 23 additions & 0 deletions src/justinsight/tasks.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
# tasks.py
from celery import shared_task
from ingest.bbc_ingestor import BBCIngestor


@shared_task
def sample_task():
print("Sample task!")
return "done!"

@shared_task
def bbcLogger_task():
# Create an instance of the class
ingestor = BBCIngestor()
ingestor.check_and_save_new_entries() # this will invoke the inherited logic
return "BBC RSS Feed checked."

@shared_task
def nytLogger_task():
check_and_save_nyt()
return "NYT RSS Feed checked."

#Add more tasks here in the format of the one above
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Development by chllein · Pull Request #27 · JustInternetAI/JustInsight · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9bfaf04
Merge pull request #17 from JustInternetAI/Development
justinmadison Jun 24, 2025
4caabd4
fix small bug in merging
Jun 24, 2025
22adc0e
Including pycache in gitignore and fixing issue with tracking change …
graceannmad Jun 24, 2025
05826ad
More capitilization changes and readme updates
graceannmad Jun 24, 2025
c497cdb
Editing readme
graceannmad Jun 24, 2025
16dfc1d
Another readme change
graceannmad Jun 24, 2025
53631ad
More formatting
graceannmad Jun 24, 2025
923d06f
Remove old version of the folder
graceannmad Jun 24, 2025
7abc1e8
Merge pull request #19 from JustInternetAI/Chloe
chllein Jun 25, 2025
5054098
Merge branch 'Development' into Grace
graceannmad Jun 25, 2025
93f04c4
Merge pull request #20 from JustInternetAI/Grace
graceannmad Jun 25, 2025
cec7aea
Fixing weird bug in docker-compose
graceannmad Jun 25, 2025
e8e62e7
Tasks set up for BBC and NYT
graceannmad Jun 25, 2025
7c0e5ce
Merge pull request #21 from JustInternetAI/Chloe
chllein Jun 26, 2025
5ed3d01
Updating docker file to include mongo
graceannmad Jun 26, 2025
cd1651f
Merge pull request #22 from JustInternetAI/Development
graceannmad Jun 26, 2025
820c6f3
Adding requirements
graceannmad Jun 26, 2025
6dcdebd
Merge pull request #23 from JustInternetAI/Grace
graceannmad Jun 26, 2025
fb00e1f
Merge branch 'Justin' into Development
justinmadison Jun 26, 2025
7a2b1eb
mongodb up and running now, class structure for rss feed readers impl…
graceannmad Jun 26, 2025
8e135c6
Merge pull request #25 from JustInternetAI/Grace
graceannmad Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
celerybeat-schedule.*
src/celerybeat-schedule.*
feed*.json
.DS_Store
.DS_Store

# Ignore all __pycache__ directories at any level
**/__pycache__/

# Ignore all compiled Python files
*.pyc
*.pyo
*.pyd

#Ignore saved data
data/*
242 changes: 0 additions & 242 deletions bbc_world.xml

This file was deleted.

27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,36 @@ services:
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
- mongo_data:/data/db
depends_on:
- redis
- mongo
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "worker", "--loglevel=info"] #the lowercase j is actually so important

celery_beat:
build:
context: .
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
depends_on:
- redis
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "beat", "--loglevel=info"] #the lowercase j is actually so important

mongo:
image: mongo:latest
container_name: mongo
restart: unless-stopped
environment:
MONGO_INITDB_ROOT_USERNAME: myuser
MONGO_INITDB_ROOT_PASSWORD: mypassword
ports:
- "27017:27017"
volumes:
- mongo_data:/data/db
- .:/workspace:cached

volumes:
mongo_data:
16 changes: 13 additions & 3 deletions readme.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
cd justinsight


## Setting up Celery Beat:
## Setting up Celery Beat
- On MacOS
- run: docker compose up --build
- OR for running in the background: docker compose up -d
Expand All@@ -34,5 +34,15 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
- use EC2 section of entrypoint.sh
- to shut down celery: docker compose down

*When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps"
to find the ID.
Note: When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps" to find the ID.

## How to Create and Schedule a Task
1) Create a method for your task wherever you are working on it that can be called and complete the task. It should be in a package (ie there should be an \_\_init\_\_.py file in the same folder as the file you are working on).
2) Go to src/justinsight/tasks.py and create a new task following the format of the sample task. Remember to add an import statement if one is needed.
3) Go to src/justinsight/celery.py and schedule a new task after the comment showing where to schedule them. The new task can follow the same format as those above

"sample-task-name": {
"task": "justinsight.tasks.your_task_name",
"schedule": x, #where x is the number of seconds between when the task should happen
"args": (), #potential arguments for your task
},
7 changes: 6 additions & 1 deletion requirements.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
celery[redis]
beautifulsoup4
celery[redis]
feedparser
playwright
pymongo
requests
Binary file removedsrc/ingest/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/ingest/__pycache__/bbc_rss.cpython-310.pyc
Binary file not shown.
52 changes: 52 additions & 0 deletions src/ingest/base_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import datetime
import feedparser
import hashlib
import re
from src.ingest.save_to_database import save_entry

class BaseIngestor:
RSS_URL = None #will be set by the subclasses

def slugify(self, text):
# Convert title to a filesystem-friendly slug
text = text.lower()
text = re.sub(r'[^a-z0-9]+', '-', text)
return text.strip('-')

def format_date(self, entry):
# Extract and format the published date
try:
dt = datetime.datetime(*entry.published_parsed[:6])
return dt.strftime("%Y-%m-%d")
except:
return "unknown-date"

def fetch_full_text(self, url):
raise NotImplementedError(
"Subclass must implement fetch_full_text()"
)

def generate_entry_hash(self, entry):
hash_input = f"{entry.title}{entry.link}{entry.get('published', '')}"
return hashlib.sha256(hash_input.encode('utf-8')).hexdigest()

def format_entry(self, entry):
title_slug = self.slugify(entry.title)
date_str = self.format_date(entry)
full_text = self.fetch_full_text(entry.link)

data = {
"title": entry.title,
"link": entry.link,
"published": entry.get("published", ""),
"summary": entry.get("summary", ""),
"full_text": full_text,
"id": self.generate_entry_hash(entry)
}
return data

def check_and_save_new_entries(self):
feed = feedparser.parse(self.RSS_URL)

for entry in feed.entries:
save_entry(self.format_entry(entry))
15 changes: 15 additions & 0 deletions src/ingest/bbc_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
from bs4 import BeautifulSoup
import requests
from src.ingest.base_ingestor import BaseIngestor

class BBCIngestor(BaseIngestor):
RSS_URL = "http://feeds.bbci.co.uk/news/world/rss.xml"

def fetch_full_text(self, article_url):
response = requests.get(self.RSS_URL)
soup = BeautifulSoup(response.content, 'html.parser')

article = soup.find('article')

if article:
return(article.get_text())
18 changes: 18 additions & 0 deletions src/ingest/save_to_database.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
from pymongo import MongoClient

# Include username, password, and authentication database
client = MongoClient("mongodb://myuser:mypassword@mongo:27017/justinsightdb?authSource=admin")

# Get (or create) a database
db = client["justinsightdb"]

# Get (or create) a collection
collection = db["articles"]

def save_entry(entry):
#check if the entry has already been saved and if it has not then save it
entry_hash = entry["id"]
if collection.count_documents({"id": entry_hash}) == 0:
collection.insert_one(entry)
else:
print(f"{entry['title']} already in use!")
Binary file removedsrc/justInsight/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/celery.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/tasks.cpython-310.pyc
Binary file not shown.
18 changes: 0 additions & 18 deletions src/justInsight/celery.py

This file was deleted.

9 changes: 0 additions & 9 deletions src/justInsight/tasks.py

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions src/justinsight/celery.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
# celery.py
from celery import Celery

app = Celery(
"justinsight",
broker="redis://redis:6379/0",
backend="redis://redis:6379/0",
include=["justinsight.tasks"],
)

# Optional beat schedule
app.conf.beat_schedule = {
# "sample-task-every-5-seconds": {
# "task": "justinsight.tasks.sample_task",
# "schedule": 5.0,
# "args": (),
# },

"check-BBCfeed-every-5-minutes": {
"task": "justinsight.tasks.bbcLogger_task",
"schedule": 5.0,
"args": (),
},

# "check-NYTfeed-every-5-minutes": {
# "task": "justinsight.tasks.nytLogger_task",
# "schedule": 300.0,
# "args": (),
# },

#schedule more tasks here
}
23 changes: 23 additions & 0 deletions src/justinsight/tasks.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
# tasks.py
from celery import shared_task
from ingest.bbc_ingestor import BBCIngestor


@shared_task
def sample_task():
print("Sample task!")
return "done!"

@shared_task
def bbcLogger_task():
# Create an instance of the class
ingestor = BBCIngestor()
ingestor.check_and_save_new_entries() # this will invoke the inherited logic
return "BBC RSS Feed checked."

@shared_task
def nytLogger_task():
check_and_save_nyt()
return "NYT RSS Feed checked."

#Add more tasks here in the format of the one above
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Development by chllein · Pull Request #27 · JustInternetAI/JustInsight · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9bfaf04
Merge pull request #17 from JustInternetAI/Development
justinmadison Jun 24, 2025
4caabd4
fix small bug in merging
Jun 24, 2025
22adc0e
Including pycache in gitignore and fixing issue with tracking change …
graceannmad Jun 24, 2025
05826ad
More capitilization changes and readme updates
graceannmad Jun 24, 2025
c497cdb
Editing readme
graceannmad Jun 24, 2025
16dfc1d
Another readme change
graceannmad Jun 24, 2025
53631ad
More formatting
graceannmad Jun 24, 2025
923d06f
Remove old version of the folder
graceannmad Jun 24, 2025
7abc1e8
Merge pull request #19 from JustInternetAI/Chloe
chllein Jun 25, 2025
5054098
Merge branch 'Development' into Grace
graceannmad Jun 25, 2025
93f04c4
Merge pull request #20 from JustInternetAI/Grace
graceannmad Jun 25, 2025
cec7aea
Fixing weird bug in docker-compose
graceannmad Jun 25, 2025
e8e62e7
Tasks set up for BBC and NYT
graceannmad Jun 25, 2025
7c0e5ce
Merge pull request #21 from JustInternetAI/Chloe
chllein Jun 26, 2025
5ed3d01
Updating docker file to include mongo
graceannmad Jun 26, 2025
cd1651f
Merge pull request #22 from JustInternetAI/Development
graceannmad Jun 26, 2025
820c6f3
Adding requirements
graceannmad Jun 26, 2025
6dcdebd
Merge pull request #23 from JustInternetAI/Grace
graceannmad Jun 26, 2025
fb00e1f
Merge branch 'Justin' into Development
justinmadison Jun 26, 2025
7a2b1eb
mongodb up and running now, class structure for rss feed readers impl…
graceannmad Jun 26, 2025
8e135c6
Merge pull request #25 from JustInternetAI/Grace
graceannmad Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
celerybeat-schedule.*
src/celerybeat-schedule.*
feed*.json
.DS_Store
.DS_Store

# Ignore all __pycache__ directories at any level
**/__pycache__/

# Ignore all compiled Python files
*.pyc
*.pyo
*.pyd

#Ignore saved data
data/*
242 changes: 0 additions & 242 deletions bbc_world.xml

This file was deleted.

27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,36 @@ services:
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
- mongo_data:/data/db
depends_on:
- redis
- mongo
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "worker", "--loglevel=info"] #the lowercase j is actually so important

celery_beat:
build:
context: .
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
depends_on:
- redis
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "beat", "--loglevel=info"] #the lowercase j is actually so important

mongo:
image: mongo:latest
container_name: mongo
restart: unless-stopped
environment:
MONGO_INITDB_ROOT_USERNAME: myuser
MONGO_INITDB_ROOT_PASSWORD: mypassword
ports:
- "27017:27017"
volumes:
- mongo_data:/data/db
- .:/workspace:cached

volumes:
mongo_data:
16 changes: 13 additions & 3 deletions readme.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
cd justinsight


## Setting up Celery Beat:
## Setting up Celery Beat
- On MacOS
- run: docker compose up --build
- OR for running in the background: docker compose up -d
Expand All@@ -34,5 +34,15 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
- use EC2 section of entrypoint.sh
- to shut down celery: docker compose down

*When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps"
to find the ID.
Note: When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps" to find the ID.

## How to Create and Schedule a Task
1) Create a method for your task wherever you are working on it that can be called and complete the task. It should be in a package (ie there should be an \_\_init\_\_.py file in the same folder as the file you are working on).
2) Go to src/justinsight/tasks.py and create a new task following the format of the sample task. Remember to add an import statement if one is needed.
3) Go to src/justinsight/celery.py and schedule a new task after the comment showing where to schedule them. The new task can follow the same format as those above

"sample-task-name": {
"task": "justinsight.tasks.your_task_name",
"schedule": x, #where x is the number of seconds between when the task should happen
"args": (), #potential arguments for your task
},
7 changes: 6 additions & 1 deletion requirements.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
celery[redis]
beautifulsoup4
celery[redis]
feedparser
playwright
pymongo
requests
Binary file removedsrc/ingest/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/ingest/__pycache__/bbc_rss.cpython-310.pyc
Binary file not shown.
52 changes: 52 additions & 0 deletions src/ingest/base_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import datetime
import feedparser
import hashlib
import re
from src.ingest.save_to_database import save_entry

class BaseIngestor:
RSS_URL = None #will be set by the subclasses

def slugify(self, text):
# Convert title to a filesystem-friendly slug
text = text.lower()
text = re.sub(r'[^a-z0-9]+', '-', text)
return text.strip('-')

def format_date(self, entry):
# Extract and format the published date
try:
dt = datetime.datetime(*entry.published_parsed[:6])
return dt.strftime("%Y-%m-%d")
except:
return "unknown-date"

def fetch_full_text(self, url):
raise NotImplementedError(
"Subclass must implement fetch_full_text()"
)

def generate_entry_hash(self, entry):
hash_input = f"{entry.title}{entry.link}{entry.get('published', '')}"
return hashlib.sha256(hash_input.encode('utf-8')).hexdigest()

def format_entry(self, entry):
title_slug = self.slugify(entry.title)
date_str = self.format_date(entry)
full_text = self.fetch_full_text(entry.link)

data = {
"title": entry.title,
"link": entry.link,
"published": entry.get("published", ""),
"summary": entry.get("summary", ""),
"full_text": full_text,
"id": self.generate_entry_hash(entry)
}
return data

def check_and_save_new_entries(self):
feed = feedparser.parse(self.RSS_URL)

for entry in feed.entries:
save_entry(self.format_entry(entry))
15 changes: 15 additions & 0 deletions src/ingest/bbc_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
from bs4 import BeautifulSoup
import requests
from src.ingest.base_ingestor import BaseIngestor

class BBCIngestor(BaseIngestor):
RSS_URL = "http://feeds.bbci.co.uk/news/world/rss.xml"

def fetch_full_text(self, article_url):
response = requests.get(self.RSS_URL)
soup = BeautifulSoup(response.content, 'html.parser')

article = soup.find('article')

if article:
return(article.get_text())
18 changes: 18 additions & 0 deletions src/ingest/save_to_database.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
from pymongo import MongoClient

# Include username, password, and authentication database
client = MongoClient("mongodb://myuser:mypassword@mongo:27017/justinsightdb?authSource=admin")

# Get (or create) a database
db = client["justinsightdb"]

# Get (or create) a collection
collection = db["articles"]

def save_entry(entry):
#check if the entry has already been saved and if it has not then save it
entry_hash = entry["id"]
if collection.count_documents({"id": entry_hash}) == 0:
collection.insert_one(entry)
else:
print(f"{entry['title']} already in use!")
Binary file removedsrc/justInsight/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/celery.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/tasks.cpython-310.pyc
Binary file not shown.
18 changes: 0 additions & 18 deletions src/justInsight/celery.py

This file was deleted.

9 changes: 0 additions & 9 deletions src/justInsight/tasks.py

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions src/justinsight/celery.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
# celery.py
from celery import Celery

app = Celery(
"justinsight",
broker="redis://redis:6379/0",
backend="redis://redis:6379/0",
include=["justinsight.tasks"],
)

# Optional beat schedule
app.conf.beat_schedule = {
# "sample-task-every-5-seconds": {
# "task": "justinsight.tasks.sample_task",
# "schedule": 5.0,
# "args": (),
# },

"check-BBCfeed-every-5-minutes": {
"task": "justinsight.tasks.bbcLogger_task",
"schedule": 5.0,
"args": (),
},

# "check-NYTfeed-every-5-minutes": {
# "task": "justinsight.tasks.nytLogger_task",
# "schedule": 300.0,
# "args": (),
# },

#schedule more tasks here
}
23 changes: 23 additions & 0 deletions src/justinsight/tasks.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
# tasks.py
from celery import shared_task
from ingest.bbc_ingestor import BBCIngestor


@shared_task
def sample_task():
print("Sample task!")
return "done!"

@shared_task
def bbcLogger_task():
# Create an instance of the class
ingestor = BBCIngestor()
ingestor.check_and_save_new_entries() # this will invoke the inherited logic
return "BBC RSS Feed checked."

@shared_task
def nytLogger_task():
check_and_save_nyt()
return "NYT RSS Feed checked."

#Add more tasks here in the format of the one above
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Development by chllein · Pull Request #27 · JustInternetAI/JustInsight · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9bfaf04
Merge pull request #17 from JustInternetAI/Development
justinmadison Jun 24, 2025
4caabd4
fix small bug in merging
Jun 24, 2025
22adc0e
Including pycache in gitignore and fixing issue with tracking change …
graceannmad Jun 24, 2025
05826ad
More capitilization changes and readme updates
graceannmad Jun 24, 2025
c497cdb
Editing readme
graceannmad Jun 24, 2025
16dfc1d
Another readme change
graceannmad Jun 24, 2025
53631ad
More formatting
graceannmad Jun 24, 2025
923d06f
Remove old version of the folder
graceannmad Jun 24, 2025
7abc1e8
Merge pull request #19 from JustInternetAI/Chloe
chllein Jun 25, 2025
5054098
Merge branch 'Development' into Grace
graceannmad Jun 25, 2025
93f04c4
Merge pull request #20 from JustInternetAI/Grace
graceannmad Jun 25, 2025
cec7aea
Fixing weird bug in docker-compose
graceannmad Jun 25, 2025
e8e62e7
Tasks set up for BBC and NYT
graceannmad Jun 25, 2025
7c0e5ce
Merge pull request #21 from JustInternetAI/Chloe
chllein Jun 26, 2025
5ed3d01
Updating docker file to include mongo
graceannmad Jun 26, 2025
cd1651f
Merge pull request #22 from JustInternetAI/Development
graceannmad Jun 26, 2025
820c6f3
Adding requirements
graceannmad Jun 26, 2025
6dcdebd
Merge pull request #23 from JustInternetAI/Grace
graceannmad Jun 26, 2025
fb00e1f
Merge branch 'Justin' into Development
justinmadison Jun 26, 2025
7a2b1eb
mongodb up and running now, class structure for rss feed readers impl…
graceannmad Jun 26, 2025
8e135c6
Merge pull request #25 from JustInternetAI/Grace
graceannmad Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
celerybeat-schedule.*
src/celerybeat-schedule.*
feed*.json
.DS_Store
.DS_Store

# Ignore all __pycache__ directories at any level
**/__pycache__/

# Ignore all compiled Python files
*.pyc
*.pyo
*.pyd

#Ignore saved data
data/*
242 changes: 0 additions & 242 deletions bbc_world.xml

This file was deleted.

27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,36 @@ services:
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
- mongo_data:/data/db
depends_on:
- redis
- mongo
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "worker", "--loglevel=info"] #the lowercase j is actually so important

celery_beat:
build:
context: .
dockerfile: .docker/Dockerfile
volumes:
- .:/workspace:cached
depends_on:
- redis
#entrypoint: ["/usr/local/bin/entrypoint.sh"]
command: ["celery", "-A", justinsight.celery, "beat", "--loglevel=info"] #the lowercase j is actually so important

mongo:
image: mongo:latest
container_name: mongo
restart: unless-stopped
environment:
MONGO_INITDB_ROOT_USERNAME: myuser
MONGO_INITDB_ROOT_PASSWORD: mypassword
ports:
- "27017:27017"
volumes:
- mongo_data:/data/db
- .:/workspace:cached

volumes:
mongo_data:
16 changes: 13 additions & 3 deletions readme.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
cd justinsight


## Setting up Celery Beat:
## Setting up Celery Beat
- On MacOS
- run: docker compose up --build
- OR for running in the background: docker compose up -d
Expand All@@ -34,5 +34,15 @@ A lightweight, news intelligence service for ingesting free news sources, taggin
- use EC2 section of entrypoint.sh
- to shut down celery: docker compose down

*When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps"
to find the ID.
Note: When running in background you can use "docker logs <container_name_or_id>" to see the log and "docker ps" to find the ID.

## How to Create and Schedule a Task
1) Create a method for your task wherever you are working on it that can be called and complete the task. It should be in a package (ie there should be an \_\_init\_\_.py file in the same folder as the file you are working on).
2) Go to src/justinsight/tasks.py and create a new task following the format of the sample task. Remember to add an import statement if one is needed.
3) Go to src/justinsight/celery.py and schedule a new task after the comment showing where to schedule them. The new task can follow the same format as those above

"sample-task-name": {
"task": "justinsight.tasks.your_task_name",
"schedule": x, #where x is the number of seconds between when the task should happen
"args": (), #potential arguments for your task
},
7 changes: 6 additions & 1 deletion requirements.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
celery[redis]
beautifulsoup4
celery[redis]
feedparser
playwright
pymongo
requests
Binary file removedsrc/ingest/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/ingest/__pycache__/bbc_rss.cpython-310.pyc
Binary file not shown.
52 changes: 52 additions & 0 deletions src/ingest/base_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import datetime
import feedparser
import hashlib
import re
from src.ingest.save_to_database import save_entry

class BaseIngestor:
RSS_URL = None #will be set by the subclasses

def slugify(self, text):
# Convert title to a filesystem-friendly slug
text = text.lower()
text = re.sub(r'[^a-z0-9]+', '-', text)
return text.strip('-')

def format_date(self, entry):
# Extract and format the published date
try:
dt = datetime.datetime(*entry.published_parsed[:6])
return dt.strftime("%Y-%m-%d")
except:
return "unknown-date"

def fetch_full_text(self, url):
raise NotImplementedError(
"Subclass must implement fetch_full_text()"
)

def generate_entry_hash(self, entry):
hash_input = f"{entry.title}{entry.link}{entry.get('published', '')}"
return hashlib.sha256(hash_input.encode('utf-8')).hexdigest()

def format_entry(self, entry):
title_slug = self.slugify(entry.title)
date_str = self.format_date(entry)
full_text = self.fetch_full_text(entry.link)

data = {
"title": entry.title,
"link": entry.link,
"published": entry.get("published", ""),
"summary": entry.get("summary", ""),
"full_text": full_text,
"id": self.generate_entry_hash(entry)
}
return data

def check_and_save_new_entries(self):
feed = feedparser.parse(self.RSS_URL)

for entry in feed.entries:
save_entry(self.format_entry(entry))
15 changes: 15 additions & 0 deletions src/ingest/bbc_ingestor.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
from bs4 import BeautifulSoup
import requests
from src.ingest.base_ingestor import BaseIngestor

class BBCIngestor(BaseIngestor):
RSS_URL = "http://feeds.bbci.co.uk/news/world/rss.xml"

def fetch_full_text(self, article_url):
response = requests.get(self.RSS_URL)
soup = BeautifulSoup(response.content, 'html.parser')

article = soup.find('article')

if article:
return(article.get_text())
18 changes: 18 additions & 0 deletions src/ingest/save_to_database.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
from pymongo import MongoClient

# Include username, password, and authentication database
client = MongoClient("mongodb://myuser:mypassword@mongo:27017/justinsightdb?authSource=admin")

# Get (or create) a database
db = client["justinsightdb"]

# Get (or create) a collection
collection = db["articles"]

def save_entry(entry):
#check if the entry has already been saved and if it has not then save it
entry_hash = entry["id"]
if collection.count_documents({"id": entry_hash}) == 0:
collection.insert_one(entry)
else:
print(f"{entry['title']} already in use!")
Binary file removedsrc/justInsight/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/celery.cpython-310.pyc
Binary file not shown.
Binary file removedsrc/justInsight/__pycache__/tasks.cpython-310.pyc
Binary file not shown.
18 changes: 0 additions & 18 deletions src/justInsight/celery.py

This file was deleted.

9 changes: 0 additions & 9 deletions src/justInsight/tasks.py

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions src/justinsight/celery.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
# celery.py
from celery import Celery

app = Celery(
"justinsight",
broker="redis://redis:6379/0",
backend="redis://redis:6379/0",
include=["justinsight.tasks"],
)

# Optional beat schedule
app.conf.beat_schedule = {
# "sample-task-every-5-seconds": {
# "task": "justinsight.tasks.sample_task",
# "schedule": 5.0,
# "args": (),
# },

"check-BBCfeed-every-5-minutes": {
"task": "justinsight.tasks.bbcLogger_task",
"schedule": 5.0,
"args": (),
},

# "check-NYTfeed-every-5-minutes": {
# "task": "justinsight.tasks.nytLogger_task",
# "schedule": 300.0,
# "args": (),
# },

#schedule more tasks here
}
23 changes: 23 additions & 0 deletions src/justinsight/tasks.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
# tasks.py
from celery import shared_task
from ingest.bbc_ingestor import BBCIngestor


@shared_task
def sample_task():
print("Sample task!")
return "done!"

@shared_task
def bbcLogger_task():
# Create an instance of the class
ingestor = BBCIngestor()
ingestor.check_and_save_new_entries() # this will invoke the inherited logic
return "BBC RSS Feed checked."

@shared_task
def nytLogger_task():
check_and_save_nyt()
return "NYT RSS Feed checked."

#Add more tasks here in the format of the one above