Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion core/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ def init_lexicon():
term_dict["definition"],
term_dict["category"],
)
except DatabaseError:
except DatabaseError as e:
print(
f"Failed to add term {term_dict['term']}: {term_dict['definition']} error: {e}"
)

session.rollback()


Expand Down
63 changes: 30 additions & 33 deletions services/lexicon.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,39 +25,36 @@ def add_lexicon_term(
Add a term to the lexicon with its definition and category.

"""
with session.no_autoflush:
if isinstance(category, str):
sql = select(Category).where(Category.name == category)
dbcategory = session.scalars(sql).one_or_none()
if dbcategory is None:
# Create a new category if it does not exist
dbcategory = Category(name=category)
session.add(dbcategory)
session.commit()
session.flush()
else:
dbcategory = session.get(Category, category)

# Check if the term already exists
sql = select(Lexicon).where(Lexicon.term == term)
existing_term = session.scalars(sql).one_or_none()
if existing_term is not None:
return existing_term

term = Lexicon(term=term, definition=definition)
session.add(term)

if dbcategory is not None:
link = TermCategoryAssociation()

link.category = dbcategory
link.term = term

session.add(link)

session.commit()

return term
if isinstance(category, str):
sql = select(Category).where(Category.name == category)
dbcategory = session.scalars(sql).one_or_none()
if dbcategory is None:
# Create a new category if it does not exist
dbcategory = Category(name=category)
session.add(dbcategory)
session.commit()
session.flush()
else:
dbcategory = session.get(Category, category)

# Check if the term already exists
sql = select(Lexicon).where(Lexicon.term == term)
dbterm = session.scalars(sql).one_or_none()
if dbterm is None:
dbterm = Lexicon(term=term, definition=definition)
session.add(dbterm)

if dbcategory is not None:
link = TermCategoryAssociation()

link.category = dbcategory
link.term = dbterm

session.add(link)

session.commit()

return dbterm


# ============= EOF =============================================
Loading