Skip to content

Remove sqlitedict from requirements and import guard #460

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

Merged
merged 3 commits into from
Apr 18, 2025
Merged

Remove sqlitedict from requirements and import guard #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ff8c92
Import guard sqlitedict
thomasdhc Apr 18, 2025
4df979a
Format changes
thomasdhc Apr 18, 2025
fb73c68
Fix var setting
thomasdhc Apr 18, 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
16 changes: 14 additions & 2 deletions launcher_scripts/nemo_launcher/collections/eval_harness/lm_eval/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,16 @@
import numpy as np
import spacy
from lm_eval.metrics import mean, weighted_mean, weighted_perplexity
from sqlitedict import SqliteDict

try:
from sqlitedict import SqliteDict

HAS_SQLITEDICT = True
except ImportError:
print(
"Eval harness with sqlitedict is deprecated. Sqlitedict has known vulnerability GHSA-g4r7-86gm-pgqc"
)
HAS_SQLITEDICT = False


def _SPACY_NLP(*args, **kwargs):
Expand Down Expand Up @@ -607,7 +616,10 @@ def __init__(self, lm, cache_db):
self.cache_db = cache_db
if os.path.dirname(cache_db):
os.makedirs(os.path.dirname(cache_db), exist_ok=True)
self.dbdict = SqliteDict(cache_db, autocommit=True)
if HAS_SQLITEDICT:
self.dbdict = SqliteDict(cache_db, autocommit=True)
Copy link

@chtruong814 chtruong814 Apr 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It honestly probably won't matter but probably best to set self.dbdict to None sqlite dict does not exist. It looks like in the above CacheHook it's a noopt if dbdict is None.

Copy link
Collaborator Author

@thomasdhc thomasdhc Apr 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good suggestion, I've introduced an else statement

else:
self.dbdict = None

# add hook to lm
lm.set_cache_hook(self.get_cache_hook())
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ pytablewriter==0.58.0
requests==2.26.0
tqdm==4.62.3
zstandard==0.15.2
sqlitedict
hera
pydantic
kubeflow-training>=1.8
Expand Down