Fixed imports from same dir/module

src/digimarks/bookmarks_service.py

@@ -8,15 +8,15 @@ from urllib.parse import urlparse, urlunparse
 
 import bs4
 import httpx
+import tags_service
+import utils
+from exceptions import BookmarkNotFound
 from extract_favicon import from_html
 from fastapi import Query, Request
+from models import Bookmark, Visibility
 from pydantic import AnyUrl
 from sqlmodel import select
 
-from src.digimarks import tags_service, utils
-from src.digimarks.exceptions import BookmarkNotFound
-from src.digimarks.models import Bookmark, Visibility
-
 DIGIMARKS_USER_AGENT = 'digimarks/2.0.0-dev'
 
 logger = logging.getLogger('digimarks')

src/digimarks/main.py

@@ -6,12 +6,16 @@ from contextlib import asynccontextmanager
 from datetime import UTC, datetime
 from typing import Annotated
 
+import bookmarks_service
 import httpx
+import tags_service
+from exceptions import BookmarkNotFound
 from fastapi import Depends, FastAPI, HTTPException, Query, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
+from models import DEFAULT_THEME, Bookmark, User, Visibility
 from pydantic import DirectoryPath, FilePath
 from pydantic_settings import BaseSettings
 from sqlalchemy.ext.asyncio import create_async_engine
@@ -19,10 +23,6 @@ from sqlalchemy.orm import sessionmaker
 from sqlmodel import desc, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from src.digimarks import bookmarks_service, tags_service
-from src.digimarks.exceptions import BookmarkNotFound
-from src.digimarks.models import DEFAULT_THEME, Bookmark, User, Visibility
-
 DIGIMARKS_VERSION = '2.0.0a1'
 
 

src/digimarks/tags_service.py

@@ -1,10 +1,9 @@
 """Helper functions for tags used with Bookmark models."""
 
+from models import Bookmark, Visibility
 from sqlalchemy import Sequence
 from sqlmodel import select
 
-from src.digimarks.models import Bookmark, Visibility
-
 
 def i_filter_false(predicate, iterable):
     """Filter an iterable if predicate returns True.