fixed importing of packages

Author: viperadnan-git

sonicbit/__init__.py

@@ -3,7 +3,7 @@
 from sonicbit.handlers.token_file import TokenFileHandler
 from sonicbit.sonicbit import SonicBit
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 __all__ = ["SonicBit", "TokenFileHandler"]
 
 logging.basicConfig(

sonicbit/handlers/__init__.py

@@ -0,0 +1,6 @@
+from .token_file import TokenHandler, TokenFileHandler
+
+__all__ = [
+    "TokenHandler",
+    "TokenFileHandler",
+]

sonicbit/handlers/token_file.py

@@ -4,7 +4,7 @@
 from sonicbit.types import AuthResponse
 
 
-class BaseTokenHandler:
+class TokenHandler:
     def __init__(self):
         pass
 
@@ -15,7 +15,7 @@ def read(self, email: str) -> str | None:
         return input(f"Enter {email} sesion: ")
 
 
-class TokenFileHandler(BaseTokenHandler):
+class TokenFileHandler(TokenHandler):
     def __init__(self, path: str = ".sonicbit.cache"):
         self.path = os.path.abspath(path)
         super().__init__()

sonicbit/modules/auth.py

@@ -3,19 +3,20 @@
 from requests import Session, request
 
 from sonicbit.constants import Constants
-from sonicbit.handlers.token_file import BaseTokenHandler, TokenFileHandler
+from sonicbit.handlers.token_file import TokenHandler, TokenFileHandler
+from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import AuthResponse
 
 logger = logging.getLogger(__name__)
 
 
-class Auth:
+class Auth(SonicBitBase):
     def __init__(
         self,
         email: str,
         password: str,
         token: str = None,
-        token_handler: BaseTokenHandler = TokenFileHandler(),
+        token_handler: TokenHandler = TokenFileHandler(),
     ):
         logger.debug("Initializing Auth")
         self.session = Session()
@@ -27,7 +28,7 @@ def __init__(
         self.session.headers.update({"Authorization": f"Bearer {token}"})
 
     def get_token(
-        self, email: str, password: str, token_handler: BaseTokenHandler
+        self, email: str, password: str, token_handler: TokenHandler
     ) -> str:
         logger.debug("Getting token")
         token = token_handler.read(email)

sonicbit/modules/base.py

@@ -1,2 +1,7 @@
+from requests import Session
+
+
 class SonicBitBase:
-    pass
+    """Base class for all SonicBit modules."""
+    
+    session = Session

sonicbit/modules/file.py

@@ -4,15 +4,14 @@
 from requests import Session
 
 from sonicbit.enums import FileCommand
+from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import File as FileType
 from sonicbit.types import FileList, PathInfo
 
 logger = logging.getLogger(__name__)
 
 
-class File:
-    session: Session
-
+class File(SonicBitBase):
     def list_files(self, path: PathInfo = PathInfo.root()) -> FileList:
         logger.debug(f"Listing files in {path.path}")
         params = {

sonicbit/modules/remote_download.py

@@ -4,15 +4,14 @@
 
 from sonicbit.enums import RemoteDownloadCommand
 from sonicbit.error.error import SonicbitError
+from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import RemoteTaskList
 from sonicbit.types.path_info import PathInfo
 
 logger = logging.getLogger(__name__)
 
 
-class RemoteDownload:
-    session: Session
-
+class RemoteDownload(SonicBitBase):
     def add_remote_download(self, url: str, path: PathInfo) -> bool:
         logger.debug(f"Adding remote download {url} to {path.path}")
 

sonicbit/modules/torrent.py

@@ -5,14 +5,13 @@
 
 from sonicbit.enums import TorrentCommand
 from sonicbit.error import SonicbitError
+from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import PathInfo, TorrentDetails, TorrentList
 
 logger = logging.getLogger(__name__)
 
 
-class Torrent:
-    session: Session
-
+class Torrent(SonicBitBase):
     def add_torrent(
         self,
         uri: str | List[str],

sonicbit/modules/user.py

@@ -3,15 +3,14 @@
 from requests import Session
 
 from sonicbit.error.error import SonicbitError
+from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import UserDetails
 from sonicbit.types.storage_details import StorageDetails
 
 logger = logging.getLogger(__name__)
 
 
-class User:
-    session: Session
-
+class User(SonicBitBase):
     def get_user_details(self) -> UserDetails:
         logger.debug("Getting user details")
         response = self.session.post(self.url("/get/user/details"))

sonicbit/sonicbit.py

@@ -1,11 +1,10 @@
 from sonicbit.modules.auth import Auth
-from sonicbit.modules.base import SonicBitBase
 from sonicbit.modules.file import File
 from sonicbit.modules.remote_download import RemoteDownload
 from sonicbit.modules.torrent import Torrent
 from sonicbit.modules.user import User
 
 
-class SonicBit(SonicBitBase, Auth, User, File, Torrent, RemoteDownload):
+class SonicBit(Auth, User, File, Torrent, RemoteDownload):
     def __init__(self, email: str, password: str, token: str = None):
         super().__init__(email, password, token)