Better module naming for the model functions

src/digimarks/bookmarks_service.py

@@ -8,7 +8,7 @@ from extract_favicon import from_html
 from fastapi import Request
 from pydantic import AnyUrl
 
-from src.digimarks import tags_helpers
+from src.digimarks import tags_service
 from src.digimarks.models import Bookmark
 
 DIGIMARKS_USER_AGENT = 'digimarks/2.0.0-dev'
@@ -75,4 +75,4 @@ def update_bookmark_with_info(bookmark: Bookmark, request: Request, strip_params
         bookmark.url = AnyUrl(strip_url_params(str(bookmark.url)))
 
     # Sort and deduplicate tags
-    tags_helpers.set_tags(bookmark, bookmark.tags)
+    tags_service.set_tags(bookmark, bookmark.tags)

src/digimarks/main.py

@@ -18,7 +18,7 @@ from sqlalchemy.orm import sessionmaker
 from sqlmodel import desc, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from src.digimarks import bookmarks_helpers, tags_helpers, utils
+from src.digimarks import bookmarks_service, tags_service, utils
 from src.digimarks.models import DEFAULT_THEME, Bookmark, User, Visibility
 
 DIGIMARKS_VERSION = '2.0.0a1'
@@ -199,7 +199,7 @@ async def autocomplete_bookmark(
     bookmark.user_key = user_key
 
     # Auto-fill title, fix tags etc.
-    bookmarks_helpers.update_bookmark_with_info(bookmark, request, strip_params)
+    bookmarks_service.update_bookmark_with_info(bookmark, request, strip_params)
 
     url_hash = utils.generate_hash(str(bookmark.url))
     result = await session.exec(
@@ -228,7 +228,7 @@ async def add_bookmark(
     bookmark.user_key = user_key
 
     # Auto-fill title, fix tags etc.
-    bookmarks_helpers.update_bookmark_with_info(bookmark, request, strip_params)
+    bookmarks_service.update_bookmark_with_info(bookmark, request, strip_params)
     bookmark.url_hash = utils.generate_hash(str(bookmark.url))
 
     session.add(bookmark)
@@ -264,7 +264,7 @@ async def update_bookmark(
     bookmark_db.sqlmodel_update(bookmark_data)
 
     # Autofill title, fix tags, etc. where (still) needed
-    bookmarks_helpers.update_bookmark_with_info(bookmark, request, strip_params)
+    bookmarks_service.update_bookmark_with_info(bookmark, request, strip_params)
 
     session.add(bookmark_db)
     await session.commit()
@@ -332,7 +332,7 @@ async def list_tags_for_user(
     tags = []
     for bookmark in bookmarks:
         tags += bookmark.tag_list
-    return tags_helpers.clean_tags(tags)
+    return tags_service.clean_tags(tags)
 
 
 @app.get('/api/v1/{user_key}/tags/{tag_key}')
@@ -343,7 +343,7 @@ async def list_bookmarks_for_tag_for_user(
     """List all tags in use by the user."""
     result = await session.exec(select(Bookmark).where(Bookmark.user_key == user_key))
     bookmarks = result.all()
-    return tags_helpers.list_tags_for_bookmarks(bookmarks)
+    return tags_service.list_tags_for_bookmarks(bookmarks)
 
 
 @app.get('/{user_key}', response_class=HTMLResponse)