Fix a circular reference issue between users and the auth service

src/infra/users.py

@@ -6,7 +6,8 @@ from sqlalchemy import String, VARCHAR, Engine, select
 from sqlalchemy.orm import mapped_column, Mapped, Session
 from argon2 import PasswordHasher
 from src.infra.db import Base
-from src.services.users import UserRepo, UserDTO, User
+from src.services.users.data import UserDTO, User
+from src.services.users.repo import UserRepo
 
 
 class UserModel(Base):

src/main.py

@@ -4,7 +4,7 @@ from src.services.router import Router
 from src.services.notifications import NotificationService, get_notification_service
 from src.services.email import EmailService, get_email_service
 from src.services.auth import AuthService
-from src.services.users import UserService
+from src.services.users.service import UserService
 from dataclasses import dataclass
 from src.infra.db import get_database
 from src.infra.users import UserRepoImpl

src/services/auth.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass, asdict
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
 import jwt
 
-from src.services.users import User
+from src.services.users.data import User
 from src.config.auth import Auth as AuthConfig
 
 JWT = str

src/services/users/__init__.py

@@ -1,5 +0,0 @@
-from .data import User, UserProfile, UserDTO, SignupError, LoginError
-from .service import UserService
-from .repo import UserRepo
-
-__all__ = ['User', 'UserProfile', 'UserDTO', 'SignupError', 'LoginError', 'UserService', 'UserRepo']