Merge pull request #85 from PufferBlow/main

Merge `main` to `dev`

pufferblow_api/api.py → pufferblow/api.py

@@ -12,21 +12,21 @@
 from loguru import logger
 from contextlib import asynccontextmanager
 
-from pufferblow_api import constants
-from pufferblow_api.api_initializer import api_initializer
+from pufferblow import constants
+from pufferblow.api_initializer import api_initializer
 
 # Utils
-from pufferblow_api.src.utils.extract_user_id import extract_user_id
-from pufferblow_api.src.utils.is_able_to_update import is_able_to_update
+from pufferblow.src.utils.extract_user_id import extract_user_id
+from pufferblow.src.utils.is_able_to_update import is_able_to_update
 
 # Models
-from pufferblow_api.src.models.message_model import Message
+from pufferblow.src.models.message_model import Message
 
 # Base
-from pufferblow_api.src.database.tables.declarative_base import Base
+from pufferblow.src.database.tables.declarative_base import Base
 
 # Log messages
-from pufferblow_api.src.logger.msgs import (
+from pufferblow.src.logger.msgs import (
     info,
     errors,
     debug

pufferblow_api/api_initializer.py → pufferblow/api_initializer.py

@@ -1,33 +1,33 @@
 # Encryption/Decryption manager
-from pufferblow_api.src.hasher.hasher import Hasher
+from pufferblow.src.hasher.hasher import Hasher
 
 # Config handler
-from pufferblow_api.src.config.config_handler import ConfigHandler
+from pufferblow.src.config.config_handler import ConfigHandler
 
 # Users manager
-from pufferblow_api.src.user.user_manager import UserManager
+from pufferblow.src.user.user_manager import UserManager
 
 # Authentification token manager
-from pufferblow_api.src.auth.auth_token_manager import AuthTokenManager
+from pufferblow.src.auth.auth_token_manager import AuthTokenManager
 
 # Database
-from pufferblow_api.src.database.database import Database
-from pufferblow_api.src.database.database_handler import DatabaseHandler
+from pufferblow.src.database.database import Database
+from pufferblow.src.database.database_handler import DatabaseHandler
 
 # Channels manager
-from pufferblow_api.src.channels.channels_manager import ChannelsManager
+from pufferblow.src.channels.channels_manager import ChannelsManager
 
 # Messages manager
-from pufferblow_api.src.messages.messages_manager import MessagesManager
+from pufferblow.src.messages.messages_manager import MessagesManager
 
 # WebSockets manager
-from pufferblow_api.src.websocket.websocket_manager import WebSocketsManager
+from pufferblow.src.websocket.websocket_manager import WebSocketsManager
 
 # Models
-from pufferblow_api.src.models.pufferblow_api_config_model import PufferBlowAPIconfig
+from pufferblow.src.models.pufferblow_api_config_model import PufferBlowAPIconfig
 
 # Log messages
-from pufferblow_api.src.logger.msgs import (
+from pufferblow.src.logger.msgs import (
     errors    
 )
 

pufferblow_api/cli.py → pufferblow/cli.py

@@ -5,27 +5,27 @@
 from loguru import logger
 from rich.console import Console
 
-from pufferblow_api.src.logger.logger import (
+from pufferblow.src.logger.logger import (
     InterceptHandler,
     logging,
     StandaloneApplication,
     StubbedGunicornLogger,
     WORKERS,
     JSON_LOGS,
 )
-from pufferblow_api import constants
-from pufferblow_api.api import api
+from pufferblow import constants
+from pufferblow.api import api
 
 # Log messages
-from pufferblow_api.src.logger.msgs import (
+from pufferblow.src.logger.msgs import (
     errors
 )
 
 # Handlers
-from pufferblow_api.src.config.config_handler import ConfigHandler
+from pufferblow.src.config.config_handler import ConfigHandler
 
 # Models
-from pufferblow_api.src.models.pufferblow_api_config_model import PufferBlowAPIconfig
+from pufferblow.src.models.pufferblow_api_config_model import PufferBlowAPIconfig
 
 # Init cli
 cli = typer.Typer()

pufferblow_api/constants.py → pufferblow/constants.py

@@ -10,13 +10,13 @@
 REPO_GITHUB     =   "https://github.com/PufferBlow/pufferblow-api"
 
 BANNER = """
-                  ___  ___            _     _                            _ 
-                 / __)/ __)          | |   | |                          (_)
-     ____  _   _| |__| |__ ____  ____| | _ | | ___  _ _ _ ___ ____ ____  _ 
-    |  _ \| | | |  __)  __) _  )/ ___) || \| |/ _ \| | | (___) _  |  _ \| |
-    | | | | |_| | |  | | ( (/ /| |   | |_) ) | |_| | | | |  ( ( | | | | | |
-    | ||_/ \____|_|  |_|  \____)_|   |____/|_|\___/ \____|   \_||_| ||_/|_|
-    |_|                                                           |_|      
+                  ___  ___            _     _
+                 / __)/ __)          | |   | |
+     ____  _   _| |__| |__ ____  ____| | _ | | ___  _ _ _ 
+    |  _ \| | | |  __)  __) _  )/ ___) || \| |/ _ \| | | |
+    | | | | |_| | |  | | ( (/ /| |   | |_) ) | |_| | | | |
+    | ||_/ \____|_|  |_|  \____)_|   |____/|_|\___/ \____|
+    |_|                                                   
                  Made with [bold red]❤️[reset] by [bold bright_green]'ramsy0dev'[reset]
         - Escape [bold red]surveillance[reset] and gain [bold green]anonymity[reset] -
 """

pufferblow_api/src/auth/auth_token_manager.py → pufferblow/src/auth/auth_token_manager.py

@@ -7,13 +7,13 @@
 from loguru import logger
 
 # Hasher
-from pufferblow_api.src.hasher.hasher import Hasher
+from pufferblow.src.hasher.hasher import Hasher
 
 # Database handler
-from pufferblow_api.src.database.database_handler import DatabaseHandler
+from pufferblow.src.database.database_handler import DatabaseHandler
 
 # Log messages
-from pufferblow_api.src.logger.msgs import (
+from pufferblow.src.logger.msgs import (
     info,
     errors,
     debug

pufferblow_api/src/channels/channels_manager.py → pufferblow/src/channels/channels_manager.py

@@ -4,24 +4,24 @@
 from loguru import logger
 
 # Models
-from pufferblow_api.src.models.user_model import User
-from pufferblow_api.src.models.channel_model import Channel
-from pufferblow_api.src.models.encryption_key_model import EncryptionKey
+from pufferblow.src.models.user_model import User
+from pufferblow.src.models.channel_model import Channel
+from pufferblow.src.models.encryption_key_model import EncryptionKey
 
 # Hasher
-from pufferblow_api.src.hasher.hasher import Hasher
+from pufferblow.src.hasher.hasher import Hasher
 
 # AuthToken manager
-from pufferblow_api.src.auth.auth_token_manager import AuthTokenManager
+from pufferblow.src.auth.auth_token_manager import AuthTokenManager
 
 # Database handler
-from pufferblow_api.src.database.database_handler import DatabaseHandler
+from pufferblow.src.database.database_handler import DatabaseHandler
 
 # Utils
-from pufferblow_api.src.utils.current_date import date_in_gmt
+from pufferblow.src.utils.current_date import date_in_gmt
 
 # Log messages
-from pufferblow_api.src.logger.msgs import (
+from pufferblow.src.logger.msgs import (
     info,
     errors,
     debug

pufferblow_api/src/config/config_handler.py → pufferblow/src/config/config_handler.py

@@ -1,5 +1,5 @@
 import os
-import tomli 
+import tomli
 
 class ConfigHandler(object):
     """ ConfigHandler class handles PufferBlow's API config """
@@ -110,7 +110,7 @@ def is_default_config(self) -> bool:
                 ]
             }
         ]
-        
+
         # Checks if the values of the keys in the default_config file are the same 
         # as the one in the config file that is located locally
         for key in keys:

pufferblow_api/src/database/database.py → pufferblow/src/database/database.py

@@ -1,7 +1,7 @@
 import sqlalchemy
 
 # Models
-from pufferblow_api.src.models.pufferblow_api_config_model import PufferBlowAPIconfig
+from pufferblow.src.models.pufferblow_api_config_model import PufferBlowAPIconfig
 
 class Database(object):
     def __init__(self, supabase_url: str, supabase_key: str, pufferblow_api_config: PufferBlowAPIconfig) -> None:
@@ -20,6 +20,7 @@ def create_database_engine_instance(self) -> sqlalchemy.create_engine:
         Returns:
 
         """
+        # TODO: check if the database is live before return the engine
         database_uri = self._create_database_uri(
             username=self.pufferblow_api_config.USERNAME,
             password=self.pufferblow_api_config.DATABASE_PASSWORD,

pufferblow_api/src/database/database_handler.py → pufferblow/src/database/database_handler.py

@@ -15,30 +15,30 @@
 )
 
 # Encryption manager
-from pufferblow_api.src.hasher.hasher import Hasher
+from pufferblow.src.hasher.hasher import Hasher
 
 # Models
-from pufferblow_api.src.models.salt_model import Salt
-from pufferblow_api.src.models.user_model import User
-from pufferblow_api.src.models.channel_model import Channel
-from pufferblow_api.src.models.message_model import Message
-from pufferblow_api.src.models.encryption_key_model import EncryptionKey
-from pufferblow_api.src.models.pufferblow_api_config_model import PufferBlowAPIconfig
+from pufferblow.src.models.salt_model import Salt
+from pufferblow.src.models.user_model import User
+from pufferblow.src.models.channel_model import Channel
+from pufferblow.src.models.message_model import Message
+from pufferblow.src.models.encryption_key_model import EncryptionKey
+from pufferblow.src.models.pufferblow_api_config_model import PufferBlowAPIconfig
 
 # Utils
-from pufferblow_api.src.utils.current_date import date_in_gmt
+from pufferblow.src.utils.current_date import date_in_gmt
 
 # Tables
-from pufferblow_api.src.database.tables.keys import Keys
-from pufferblow_api.src.database.tables.users import Users
-from pufferblow_api.src.database.tables.salts import Salts
-from pufferblow_api.src.database.tables.channels import Channels
-from pufferblow_api.src.database.tables.messages import Messages
-from pufferblow_api.src.database.tables.auth_tokens import AuthTokens
-from pufferblow_api.src.database.tables.message_read_history import MessageReadHistory
+from pufferblow.src.database.tables.keys import Keys
+from pufferblow.src.database.tables.users import Users
+from pufferblow.src.database.tables.salts import Salts
+from pufferblow.src.database.tables.channels import Channels
+from pufferblow.src.database.tables.messages import Messages
+from pufferblow.src.database.tables.auth_tokens import AuthTokens
+from pufferblow.src.database.tables.message_read_history import MessageReadHistory
 
 # Log messages
-from pufferblow_api.src.logger.msgs import (
+from pufferblow.src.logger.msgs import (
     info,
     errors,
     debug

pufferblow_api/src/database/tables/auth_tokens.py → pufferblow/src/database/tables/auth_tokens.py

@@ -5,7 +5,7 @@
 )
 
 # Decrlarative base class
-from pufferblow_api.src.database.tables.declarative_base import Base
+from pufferblow.src.database.tables.declarative_base import Base
 
 class AuthTokens(Base):
     """ `AuthToken` table """

pufferblow_api/src/database/tables/channels.py → pufferblow/src/database/tables/channels.py

@@ -7,10 +7,10 @@
 )
 
 # Decrlarative base class
-from pufferblow_api.src.database.tables.declarative_base import Base
+from pufferblow.src.database.tables.declarative_base import Base
 
 # Utils
-from pufferblow_api.src.utils.current_date import date_in_gmt
+from pufferblow.src.utils.current_date import date_in_gmt
 
 class Channels(Base):
     """ `Channels` table """

pufferblow_api/src/database/tables/keys.py → pufferblow/src/database/tables/keys.py

@@ -5,10 +5,10 @@
 )
 
 # Decrlarative base class
-from pufferblow_api.src.database.tables.declarative_base import Base
+from pufferblow.src.database.tables.declarative_base import Base
 
 # Utils
-from pufferblow_api.src.utils.current_date import date_in_gmt
+from pufferblow.src.utils.current_date import date_in_gmt
 
 class Keys(Base):
     """ `Keys` table """

pufferblow_api/src/database/tables/message_read_history.py → pufferblow/src/database/tables/message_read_history.py

@@ -6,10 +6,10 @@
 )
 
 # Decrlarative base class
-from pufferblow_api.src.database.tables.declarative_base import Base
+from pufferblow.src.database.tables.declarative_base import Base
 
 # Utils
-from pufferblow_api.src.utils.current_date import date_in_gmt
+from pufferblow.src.utils.current_date import date_in_gmt
 
 class MessageReadHistory(Base):
     """ `message_read_history` table """

pufferblow_api/src/database/tables/messages.py → pufferblow/src/database/tables/messages.py

@@ -5,10 +5,10 @@
 )
 
 # Decrlarative base class
-from pufferblow_api.src.database.tables.declarative_base import Base
+from pufferblow.src.database.tables.declarative_base import Base
 
 # Utils
-from pufferblow_api.src.utils.current_date import date_in_gmt
+from pufferblow.src.utils.current_date import date_in_gmt
 
 class Messages(Base):
     """ `messages` table """

pufferblow_api/src/database/tables/salts.py → pufferblow/src/database/tables/salts.py

@@ -5,10 +5,10 @@
 )
 
 # Decrlarative base class
-from pufferblow_api.src.database.tables.declarative_base import Base
+from pufferblow.src.database.tables.declarative_base import Base
 
 # Utils
-from pufferblow_api.src.utils.current_date import date_in_gmt
+from pufferblow.src.utils.current_date import date_in_gmt
 
 class Salts(Base):
     """ `Salts` table """

pufferblow_api/src/database/tables/users.py → pufferblow/src/database/tables/users.py

@@ -7,10 +7,10 @@
 )
 
 # Decrlarative base class
-from pufferblow_api.src.database.tables.declarative_base import Base
+from pufferblow.src.database.tables.declarative_base import Base
 
 # Utils
-from pufferblow_api.src.utils.current_date import date_in_gmt
+from pufferblow.src.utils.current_date import date_in_gmt
 
 class Users(Base):
     """ Users table """

pufferblow_api/src/hasher/hasher.py → pufferblow/src/hasher/hasher.py

@@ -8,8 +8,8 @@
     unpad
 )
 
-from pufferblow_api.src.models.salt_model import Salt
-from pufferblow_api.src.models.encryption_key_model import EncryptionKey
+from pufferblow.src.models.salt_model import Salt
+from pufferblow.src.models.encryption_key_model import EncryptionKey
 
 class Hasher(object):
     """

pufferblow_api/src/logger/msgs/info.py → pufferblow/src/logger/msgs/info.py

@@ -1,6 +1,6 @@
 
 # Models
-from pufferblow_api.src.models.user_model import User
+from pufferblow.src.models.user_model import User
 
 def INFO_NEW_USER_SIGNUP_SUCCESSFULLY(user: User) -> str:
     msg = f"New user signed up successfully. User ID: '{user.user_id}'"

pufferblow_api/src/messages/messages_manager.py → pufferblow/src/messages/messages_manager.py

@@ -6,17 +6,17 @@
 
 from loguru import logger
 
-from pufferblow_api import constants
-from pufferblow_api.src.hasher.hasher import Hasher
-from pufferblow_api.src.auth.auth_token_manager import AuthTokenManager
-from pufferblow_api.src.database.database_handler import DatabaseHandler
+from pufferblow import constants
+from pufferblow.src.hasher.hasher import Hasher
+from pufferblow.src.auth.auth_token_manager import AuthTokenManager
+from pufferblow.src.database.database_handler import DatabaseHandler
 
 # Tables
-from pufferblow_api.src.database.tables.messages import Messages
+from pufferblow.src.database.tables.messages import Messages
 
 # Models
-from pufferblow_api.src.models.message_model import Message
-from pufferblow_api.src.user.user_manager import UserManager
+from pufferblow.src.models.message_model import Message
+from pufferblow.src.user.user_manager import UserManager
 
 class MessagesManager(object):
     """ Messages manager class """

pufferblow_api/src/models/channel_model.py → pufferblow/src/models/channel_model.py

@@ -1,5 +1,5 @@
 # Channels table
-from pufferblow_api.src.database.tables.channels import Channels
+from pufferblow.src.database.tables.channels import Channels
 
 class Channel(object):
     """ Channel model """