Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cache_path arg to WebScraperStage #1358

Merged
merged 6 commits into from
Nov 14, 2023
Merged

Add cache_path arg to WebScraperStage #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0cabb7e
make web scraper cache path injectable
cwharris Nov 13, 2023
2224c67
.
cwharris Nov 13, 2023
d742b76
Merge branch 'fea-sherlock' into webscraper-inject
cwharris Nov 13, 2023
51b755d
add documentation
cwharris Nov 14, 2023
21c7fc6
Merge branch 'webscraper-inject' of github.com:cwharris/Morpheus into…
cwharris Nov 14, 2023
a8ce66d
Merge branch 'fea-sherlock' of github.com:nv-morpheus/Morpheus into w…
cwharris Nov 14, 2023
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
16 changes: 12 additions & 4 deletions examples/llm/common/web_scraper_stage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import mrc
import mrc.core.operators as ops
import pandas as pd
import requests
import requests_cache
from bs4 import BeautifulSoup
from langchain.text_splitter import RecursiveCharacterTextSplitter
Expand All @@ -45,9 +46,11 @@ class WebScraperStage(SinglePortStage):
Size in which to split the scraped content
link_column : str, default="link"
Column which contains the links to scrape
cache_path : str, default=None
the path for the response caching system's sqllite database, if None, caching is bypassed
"""

def __init__(self, c: Config, *, chunk_size: int, link_column: str = "link"):
def __init__(self, c: Config, *, chunk_size: int, link_column: str = "link", cache_path: str = None):
super().__init__(c)

self._link_column = link_column
Expand All @@ -61,8 +64,10 @@ def __init__(self, c: Config, *, chunk_size: int, link_column: str = "link"):
chunk_overlap=self._chunk_size // 10,
length_function=len)

self._session = requests_cache.CachedSession(os.path.join("./.cache/http", "RSSDownloadStage.sqlite"),
backend="sqlite")
if cache_path is None:
self._session = requests.Session()
else:
self._session = requests_cache.CachedSession(cache_path, backend="sqlite")

self._session.headers.update({
"User-Agent":
Expand Down Expand Up @@ -152,7 +157,10 @@ def _download_and_split(self, msg: MessageMeta) -> MessageMeta:
row_cp.update({"page_content": text})
final_rows.append(row_cp)

logger.debug("Processed page: '%s'. Cache hit: %s", url, response.from_cache)
if isinstance(response, requests_cache.models.response.CachedResponse):
logger.debug("Processed page: '%s'. Cache hit: %s", url, response.from_cache)
else:
logger.debug("Processed page: '%s'", url)

except ValueError as exc:
logger.error("Error parsing document: %s", exc)
Expand Down
3 changes: 2 additions & 1 deletion examples/llm/vdb_upload/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ def pipeline(num_threads: int,

pipe.add_stage(MonitorStage(config, description="Source rate", unit='pages'))

pipe.add_stage(WebScraperStage(config, chunk_size=model_fea_length))
pipe.add_stage(
WebScraperStage(config, chunk_size=model_fea_length, cache_path="./.cache/http/RSSDownloadStage.sqlite"))

pipe.add_stage(MonitorStage(config, description="Download rate", unit='pages'))

Expand Down