From bd0f0c8e62b4a7fbfe2f508bbd99be3711a59aec Mon Sep 17 00:00:00 2001
From: ramsy0dev <ramsy0dev@gmail.com>
Date: Wed, 14 Feb 2024 20:31:33 +0000
Subject: [PATCH] change the imports of `pufferblow_api` to just `pufferblow`

---
 {pufferblow_api => pufferblow}/api.py         | 14 ++++----
 .../api_initializer.py                        | 22 ++++++-------
 {pufferblow_api => pufferblow}/cli.py         | 12 +++----
 {pufferblow_api => pufferblow}/constants.py   |  0
 .../src/auth/auth_token_manager.py            |  6 ++--
 .../src/channels/channels_manager.py          | 16 +++++-----
 .../src/config/config_handler.py              |  4 +--
 .../src/config/config_sample.toml             |  0
 .../src/database/database.py                  |  3 +-
 .../src/database/database_handler.py          | 32 +++++++++----------
 .../src/database/tables/auth_tokens.py        |  2 +-
 .../src/database/tables/channels.py           |  4 +--
 .../src/database/tables/declarative_base.py   |  0
 .../src/database/tables/keys.py               |  4 +--
 .../database/tables/message_read_history.py   |  4 +--
 .../src/database/tables/messages.py           |  4 +--
 .../src/database/tables/salts.py              |  4 +--
 .../src/database/tables/users.py              |  4 +--
 .../src/hasher/hasher.py                      |  4 +--
 .../src/logger/logger.py                      |  0
 .../src/logger/msgs/debug.py                  |  0
 .../src/logger/msgs/errors.py                 |  0
 .../src/logger/msgs/info.py                   |  2 +-
 .../src/logger/msgs/warnings.py               |  0
 .../src/messages/messages_manager.py          | 14 ++++----
 .../src/models/channel_model.py               |  2 +-
 .../src/models/conversation_model.py          |  0
 .../src/models/encryption_key_model.py        |  2 +-
 .../src/models/message_model.py               |  2 +-
 .../src/models/message_read_history_model.py  |  2 +-
 .../src/models/pufferblow_api_config_model.py |  0
 .../src/models/salt_model.py                  |  2 +-
 .../src/models/user_model.py                  |  2 +-
 .../src/user/user_manager.py                  | 14 ++++----
 .../src/utils/create_sha256.py                |  0
 .../src/utils/current_date.py                 |  0
 .../src/utils/extract_user_id.py              |  0
 .../src/utils/is_able_to_update.py            |  0
 .../src/websocket/websocket_manager.py        |  0
 .../tests/conftest.py                         |  0
 .../tests/test_01_signup.py                   |  4 +--
 .../tests/test_02_user_profile.py             |  4 +--
 .../tests/test_03_edit_users_profile.py       |  4 +--
 .../tests/test_04_reset_users_auth_token.py   |  4 +--
 .../tests/test_05_list_server_users.py        |  4 +--
 .../tests/test_06_list_server_channels.py     |  4 +--
 46 files changed, 103 insertions(+), 102 deletions(-)
 rename {pufferblow_api => pufferblow}/api.py (96%)
 rename {pufferblow_api => pufferblow}/api_initializer.py (86%)
 rename {pufferblow_api => pufferblow}/cli.py (89%)
 rename {pufferblow_api => pufferblow}/constants.py (100%)
 rename {pufferblow_api => pufferblow}/src/auth/auth_token_manager.py (94%)
 rename {pufferblow_api => pufferblow}/src/channels/channels_manager.py (89%)
 rename {pufferblow_api => pufferblow}/src/config/config_handler.py (99%)
 rename {pufferblow_api => pufferblow}/src/config/config_sample.toml (100%)
 rename {pufferblow_api => pufferblow}/src/database/database.py (93%)
 rename {pufferblow_api => pufferblow}/src/database/database_handler.py (96%)
 rename {pufferblow_api => pufferblow}/src/database/tables/auth_tokens.py (90%)
 rename {pufferblow_api => pufferblow}/src/database/tables/channels.py (86%)
 rename {pufferblow_api => pufferblow}/src/database/tables/declarative_base.py (100%)
 rename {pufferblow_api => pufferblow}/src/database/tables/keys.py (85%)
 rename {pufferblow_api => pufferblow}/src/database/tables/message_read_history.py (85%)
 rename {pufferblow_api => pufferblow}/src/database/tables/messages.py (86%)
 rename {pufferblow_api => pufferblow}/src/database/tables/salts.py (84%)
 rename {pufferblow_api => pufferblow}/src/database/tables/users.py (93%)
 rename {pufferblow_api => pufferblow}/src/hasher/hasher.py (97%)
 rename {pufferblow_api => pufferblow}/src/logger/logger.py (100%)
 rename {pufferblow_api => pufferblow}/src/logger/msgs/debug.py (100%)
 rename {pufferblow_api => pufferblow}/src/logger/msgs/errors.py (100%)
 rename {pufferblow_api => pufferblow}/src/logger/msgs/info.py (98%)
 rename {pufferblow_api => pufferblow}/src/logger/msgs/warnings.py (100%)
 rename {pufferblow_api => pufferblow}/src/messages/messages_manager.py (95%)
 rename {pufferblow_api => pufferblow}/src/models/channel_model.py (94%)
 rename {pufferblow_api => pufferblow}/src/models/conversation_model.py (100%)
 rename {pufferblow_api => pufferblow}/src/models/encryption_key_model.py (96%)
 rename {pufferblow_api => pufferblow}/src/models/message_model.py (94%)
 rename {pufferblow_api => pufferblow}/src/models/message_read_history_model.py (96%)
 rename {pufferblow_api => pufferblow}/src/models/pufferblow_api_config_model.py (100%)
 rename {pufferblow_api => pufferblow}/src/models/salt_model.py (96%)
 rename {pufferblow_api => pufferblow}/src/models/user_model.py (98%)
 rename {pufferblow_api => pufferblow}/src/user/user_manager.py (94%)
 rename {pufferblow_api => pufferblow}/src/utils/create_sha256.py (100%)
 rename {pufferblow_api => pufferblow}/src/utils/current_date.py (100%)
 rename {pufferblow_api => pufferblow}/src/utils/extract_user_id.py (100%)
 rename {pufferblow_api => pufferblow}/src/utils/is_able_to_update.py (100%)
 rename {pufferblow_api => pufferblow}/src/websocket/websocket_manager.py (100%)
 rename {pufferblow_api => pufferblow}/tests/conftest.py (100%)
 rename {pufferblow_api => pufferblow}/tests/test_01_signup.py (89%)
 rename {pufferblow_api => pufferblow}/tests/test_02_user_profile.py (93%)
 rename {pufferblow_api => pufferblow}/tests/test_03_edit_users_profile.py (94%)
 rename {pufferblow_api => pufferblow}/tests/test_04_reset_users_auth_token.py (94%)
 rename {pufferblow_api => pufferblow}/tests/test_05_list_server_users.py (90%)
 rename {pufferblow_api => pufferblow}/tests/test_06_list_server_channels.py (90%)

diff --git a/pufferblow_api/api.py b/pufferblow/api.py
similarity index 96%
rename from pufferblow_api/api.py
rename to pufferblow/api.py
index bae6d6d..758a8fa 100644
--- a/pufferblow_api/api.py
+++ b/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
diff --git a/pufferblow_api/api_initializer.py b/pufferblow/api_initializer.py
similarity index 86%
rename from pufferblow_api/api_initializer.py
rename to pufferblow/api_initializer.py
index bb77726..77d1bbf 100644
--- a/pufferblow_api/api_initializer.py
+++ b/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    
 )
 
diff --git a/pufferblow_api/cli.py b/pufferblow/cli.py
similarity index 89%
rename from pufferblow_api/cli.py
rename to pufferblow/cli.py
index 5062d00..e6d6f2d 100644
--- a/pufferblow_api/cli.py
+++ b/pufferblow/cli.py
@@ -5,7 +5,7 @@
 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,
@@ -13,19 +13,19 @@
     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()
diff --git a/pufferblow_api/constants.py b/pufferblow/constants.py
similarity index 100%
rename from pufferblow_api/constants.py
rename to pufferblow/constants.py
diff --git a/pufferblow_api/src/auth/auth_token_manager.py b/pufferblow/src/auth/auth_token_manager.py
similarity index 94%
rename from pufferblow_api/src/auth/auth_token_manager.py
rename to pufferblow/src/auth/auth_token_manager.py
index 145301f..7a4d40f 100644
--- a/pufferblow_api/src/auth/auth_token_manager.py
+++ b/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
diff --git a/pufferblow_api/src/channels/channels_manager.py b/pufferblow/src/channels/channels_manager.py
similarity index 89%
rename from pufferblow_api/src/channels/channels_manager.py
rename to pufferblow/src/channels/channels_manager.py
index 5d5a071..c2ab98d 100644
--- a/pufferblow_api/src/channels/channels_manager.py
+++ b/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
diff --git a/pufferblow_api/src/config/config_handler.py b/pufferblow/src/config/config_handler.py
similarity index 99%
rename from pufferblow_api/src/config/config_handler.py
rename to pufferblow/src/config/config_handler.py
index 70854e7..b25c11e 100644
--- a/pufferblow_api/src/config/config_handler.py
+++ b/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:
diff --git a/pufferblow_api/src/config/config_sample.toml b/pufferblow/src/config/config_sample.toml
similarity index 100%
rename from pufferblow_api/src/config/config_sample.toml
rename to pufferblow/src/config/config_sample.toml
diff --git a/pufferblow_api/src/database/database.py b/pufferblow/src/database/database.py
similarity index 93%
rename from pufferblow_api/src/database/database.py
rename to pufferblow/src/database/database.py
index a00ad74..04bb6b2 100644
--- a/pufferblow_api/src/database/database.py
+++ b/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,
diff --git a/pufferblow_api/src/database/database_handler.py b/pufferblow/src/database/database_handler.py
similarity index 96%
rename from pufferblow_api/src/database/database_handler.py
rename to pufferblow/src/database/database_handler.py
index ea07a10..1a21f98 100644
--- a/pufferblow_api/src/database/database_handler.py
+++ b/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
diff --git a/pufferblow_api/src/database/tables/auth_tokens.py b/pufferblow/src/database/tables/auth_tokens.py
similarity index 90%
rename from pufferblow_api/src/database/tables/auth_tokens.py
rename to pufferblow/src/database/tables/auth_tokens.py
index ee7067d..10b0f40 100644
--- a/pufferblow_api/src/database/tables/auth_tokens.py
+++ b/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 """
diff --git a/pufferblow_api/src/database/tables/channels.py b/pufferblow/src/database/tables/channels.py
similarity index 86%
rename from pufferblow_api/src/database/tables/channels.py
rename to pufferblow/src/database/tables/channels.py
index 85a78dd..4764f1c 100644
--- a/pufferblow_api/src/database/tables/channels.py
+++ b/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 """
diff --git a/pufferblow_api/src/database/tables/declarative_base.py b/pufferblow/src/database/tables/declarative_base.py
similarity index 100%
rename from pufferblow_api/src/database/tables/declarative_base.py
rename to pufferblow/src/database/tables/declarative_base.py
diff --git a/pufferblow_api/src/database/tables/keys.py b/pufferblow/src/database/tables/keys.py
similarity index 85%
rename from pufferblow_api/src/database/tables/keys.py
rename to pufferblow/src/database/tables/keys.py
index 7c95852..16cb0ac 100644
--- a/pufferblow_api/src/database/tables/keys.py
+++ b/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 """
diff --git a/pufferblow_api/src/database/tables/message_read_history.py b/pufferblow/src/database/tables/message_read_history.py
similarity index 85%
rename from pufferblow_api/src/database/tables/message_read_history.py
rename to pufferblow/src/database/tables/message_read_history.py
index acb6292..5d41f6c 100644
--- a/pufferblow_api/src/database/tables/message_read_history.py
+++ b/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 """
diff --git a/pufferblow_api/src/database/tables/messages.py b/pufferblow/src/database/tables/messages.py
similarity index 86%
rename from pufferblow_api/src/database/tables/messages.py
rename to pufferblow/src/database/tables/messages.py
index 548a813..7920d9e 100644
--- a/pufferblow_api/src/database/tables/messages.py
+++ b/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 """
diff --git a/pufferblow_api/src/database/tables/salts.py b/pufferblow/src/database/tables/salts.py
similarity index 84%
rename from pufferblow_api/src/database/tables/salts.py
rename to pufferblow/src/database/tables/salts.py
index 14fd2d6..114e9e2 100644
--- a/pufferblow_api/src/database/tables/salts.py
+++ b/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 """
diff --git a/pufferblow_api/src/database/tables/users.py b/pufferblow/src/database/tables/users.py
similarity index 93%
rename from pufferblow_api/src/database/tables/users.py
rename to pufferblow/src/database/tables/users.py
index caea390..f87646c 100644
--- a/pufferblow_api/src/database/tables/users.py
+++ b/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 """
diff --git a/pufferblow_api/src/hasher/hasher.py b/pufferblow/src/hasher/hasher.py
similarity index 97%
rename from pufferblow_api/src/hasher/hasher.py
rename to pufferblow/src/hasher/hasher.py
index 744c225..e51fd02 100644
--- a/pufferblow_api/src/hasher/hasher.py
+++ b/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):
     """
diff --git a/pufferblow_api/src/logger/logger.py b/pufferblow/src/logger/logger.py
similarity index 100%
rename from pufferblow_api/src/logger/logger.py
rename to pufferblow/src/logger/logger.py
diff --git a/pufferblow_api/src/logger/msgs/debug.py b/pufferblow/src/logger/msgs/debug.py
similarity index 100%
rename from pufferblow_api/src/logger/msgs/debug.py
rename to pufferblow/src/logger/msgs/debug.py
diff --git a/pufferblow_api/src/logger/msgs/errors.py b/pufferblow/src/logger/msgs/errors.py
similarity index 100%
rename from pufferblow_api/src/logger/msgs/errors.py
rename to pufferblow/src/logger/msgs/errors.py
diff --git a/pufferblow_api/src/logger/msgs/info.py b/pufferblow/src/logger/msgs/info.py
similarity index 98%
rename from pufferblow_api/src/logger/msgs/info.py
rename to pufferblow/src/logger/msgs/info.py
index 364c508..e557b6b 100644
--- a/pufferblow_api/src/logger/msgs/info.py
+++ b/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}'"
diff --git a/pufferblow_api/src/logger/msgs/warnings.py b/pufferblow/src/logger/msgs/warnings.py
similarity index 100%
rename from pufferblow_api/src/logger/msgs/warnings.py
rename to pufferblow/src/logger/msgs/warnings.py
diff --git a/pufferblow_api/src/messages/messages_manager.py b/pufferblow/src/messages/messages_manager.py
similarity index 95%
rename from pufferblow_api/src/messages/messages_manager.py
rename to pufferblow/src/messages/messages_manager.py
index e53ee9b..b616008 100644
--- a/pufferblow_api/src/messages/messages_manager.py
+++ b/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 """
diff --git a/pufferblow_api/src/models/channel_model.py b/pufferblow/src/models/channel_model.py
similarity index 94%
rename from pufferblow_api/src/models/channel_model.py
rename to pufferblow/src/models/channel_model.py
index 0372c51..322c029 100644
--- a/pufferblow_api/src/models/channel_model.py
+++ b/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 """
diff --git a/pufferblow_api/src/models/conversation_model.py b/pufferblow/src/models/conversation_model.py
similarity index 100%
rename from pufferblow_api/src/models/conversation_model.py
rename to pufferblow/src/models/conversation_model.py
diff --git a/pufferblow_api/src/models/encryption_key_model.py b/pufferblow/src/models/encryption_key_model.py
similarity index 96%
rename from pufferblow_api/src/models/encryption_key_model.py
rename to pufferblow/src/models/encryption_key_model.py
index 90bcb44..0ad751d 100644
--- a/pufferblow_api/src/models/encryption_key_model.py
+++ b/pufferblow/src/models/encryption_key_model.py
@@ -2,7 +2,7 @@
 import datetime
 
 # Keys table
-from pufferblow_api.src.database.tables.keys import Keys
+from pufferblow.src.database.tables.keys import Keys
 
 class EncryptionKey (object):
     """ Encryption key data class """
diff --git a/pufferblow_api/src/models/message_model.py b/pufferblow/src/models/message_model.py
similarity index 94%
rename from pufferblow_api/src/models/message_model.py
rename to pufferblow/src/models/message_model.py
index 9498ea4..907fef2 100644
--- a/pufferblow_api/src/models/message_model.py
+++ b/pufferblow/src/models/message_model.py
@@ -1,6 +1,6 @@
 
 # Table
-from pufferblow_api.src.database.tables.messages import Messages
+from pufferblow.src.database.tables.messages import Messages
 
 class Message (object):
     """ Message model """
diff --git a/pufferblow_api/src/models/message_read_history_model.py b/pufferblow/src/models/message_read_history_model.py
similarity index 96%
rename from pufferblow_api/src/models/message_read_history_model.py
rename to pufferblow/src/models/message_read_history_model.py
index 362d5f3..8398ea6 100644
--- a/pufferblow_api/src/models/message_read_history_model.py
+++ b/pufferblow/src/models/message_read_history_model.py
@@ -1,6 +1,6 @@
 
 # Tables
-from pufferblow_api.src.database.tables.message_read_history import MessageReadHistory
+from pufferblow.src.database.tables.message_read_history import MessageReadHistory
 
 class MessageReadHistoryModel(object):
     """ MessageReadHistory model """
diff --git a/pufferblow_api/src/models/pufferblow_api_config_model.py b/pufferblow/src/models/pufferblow_api_config_model.py
similarity index 100%
rename from pufferblow_api/src/models/pufferblow_api_config_model.py
rename to pufferblow/src/models/pufferblow_api_config_model.py
diff --git a/pufferblow_api/src/models/salt_model.py b/pufferblow/src/models/salt_model.py
similarity index 96%
rename from pufferblow_api/src/models/salt_model.py
rename to pufferblow/src/models/salt_model.py
index ec1a523..d2b9fc6 100644
--- a/pufferblow_api/src/models/salt_model.py
+++ b/pufferblow/src/models/salt_model.py
@@ -1,5 +1,5 @@
 # Salts table
-from pufferblow_api.src.database.tables.salts import Salts
+from pufferblow.src.database.tables.salts import Salts
 
 class Salt (object):
     """ Salt model """
diff --git a/pufferblow_api/src/models/user_model.py b/pufferblow/src/models/user_model.py
similarity index 98%
rename from pufferblow_api/src/models/user_model.py
rename to pufferblow/src/models/user_model.py
index c06be8c..2b491c5 100644
--- a/pufferblow_api/src/models/user_model.py
+++ b/pufferblow/src/models/user_model.py
@@ -1,5 +1,5 @@
 # Users table
-from pufferblow_api.src.database.tables.users import Users
+from pufferblow.src.database.tables.users import Users
 
 class User:
     """ User model """
diff --git a/pufferblow_api/src/user/user_manager.py b/pufferblow/src/user/user_manager.py
similarity index 94%
rename from pufferblow_api/src/user/user_manager.py
rename to pufferblow/src/user/user_manager.py
index 945a6fc..bcbd381 100644
--- a/pufferblow_api/src/user/user_manager.py
+++ b/pufferblow/src/user/user_manager.py
@@ -9,21 +9,21 @@
 from loguru import logger
 
 # 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
 
 # Models
-from pufferblow_api.src.models.user_model import User
-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.user_model import User
+from pufferblow.src.models.encryption_key_model import EncryptionKey
+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 (
     info,
     errors,
     debug
diff --git a/pufferblow_api/src/utils/create_sha256.py b/pufferblow/src/utils/create_sha256.py
similarity index 100%
rename from pufferblow_api/src/utils/create_sha256.py
rename to pufferblow/src/utils/create_sha256.py
diff --git a/pufferblow_api/src/utils/current_date.py b/pufferblow/src/utils/current_date.py
similarity index 100%
rename from pufferblow_api/src/utils/current_date.py
rename to pufferblow/src/utils/current_date.py
diff --git a/pufferblow_api/src/utils/extract_user_id.py b/pufferblow/src/utils/extract_user_id.py
similarity index 100%
rename from pufferblow_api/src/utils/extract_user_id.py
rename to pufferblow/src/utils/extract_user_id.py
diff --git a/pufferblow_api/src/utils/is_able_to_update.py b/pufferblow/src/utils/is_able_to_update.py
similarity index 100%
rename from pufferblow_api/src/utils/is_able_to_update.py
rename to pufferblow/src/utils/is_able_to_update.py
diff --git a/pufferblow_api/src/websocket/websocket_manager.py b/pufferblow/src/websocket/websocket_manager.py
similarity index 100%
rename from pufferblow_api/src/websocket/websocket_manager.py
rename to pufferblow/src/websocket/websocket_manager.py
diff --git a/pufferblow_api/tests/conftest.py b/pufferblow/tests/conftest.py
similarity index 100%
rename from pufferblow_api/tests/conftest.py
rename to pufferblow/tests/conftest.py
diff --git a/pufferblow_api/tests/test_01_signup.py b/pufferblow/tests/test_01_signup.py
similarity index 89%
rename from pufferblow_api/tests/test_01_signup.py
rename to pufferblow/tests/test_01_signup.py
index a07e1b0..b576884 100644
--- a/pufferblow_api/tests/test_01_signup.py
+++ b/pufferblow/tests/test_01_signup.py
@@ -1,8 +1,8 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from pufferblow_api.api import api
-from pufferblow_api.tests.conftest import ValueStorage
+from pufferblow.api import api
+from pufferblow.tests.conftest import ValueStorage
 
 @pytest.fixture
 def client():
diff --git a/pufferblow_api/tests/test_02_user_profile.py b/pufferblow/tests/test_02_user_profile.py
similarity index 93%
rename from pufferblow_api/tests/test_02_user_profile.py
rename to pufferblow/tests/test_02_user_profile.py
index 461e21a..c7ca872 100644
--- a/pufferblow_api/tests/test_02_user_profile.py
+++ b/pufferblow/tests/test_02_user_profile.py
@@ -1,8 +1,8 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from pufferblow_api.api import api
-from pufferblow_api.tests.conftest import ValueStorage
+from pufferblow.api import api
+from pufferblow.tests.conftest import ValueStorage
 
 @pytest.fixture
 def client():
diff --git a/pufferblow_api/tests/test_03_edit_users_profile.py b/pufferblow/tests/test_03_edit_users_profile.py
similarity index 94%
rename from pufferblow_api/tests/test_03_edit_users_profile.py
rename to pufferblow/tests/test_03_edit_users_profile.py
index df457ce..8a73d0d 100644
--- a/pufferblow_api/tests/test_03_edit_users_profile.py
+++ b/pufferblow/tests/test_03_edit_users_profile.py
@@ -1,8 +1,8 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from pufferblow_api.api import api
-from pufferblow_api.tests.conftest import ValueStorage
+from pufferblow.api import api
+from pufferblow.tests.conftest import ValueStorage
 
 @pytest.fixture
 def client():
diff --git a/pufferblow_api/tests/test_04_reset_users_auth_token.py b/pufferblow/tests/test_04_reset_users_auth_token.py
similarity index 94%
rename from pufferblow_api/tests/test_04_reset_users_auth_token.py
rename to pufferblow/tests/test_04_reset_users_auth_token.py
index 80693bc..6fa0614 100644
--- a/pufferblow_api/tests/test_04_reset_users_auth_token.py
+++ b/pufferblow/tests/test_04_reset_users_auth_token.py
@@ -1,8 +1,8 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from pufferblow_api.api import api
-from pufferblow_api.tests.conftest import ValueStorage
+from pufferblow.api import api
+from pufferblow.tests.conftest import ValueStorage
 
 @pytest.fixture
 def client():
diff --git a/pufferblow_api/tests/test_05_list_server_users.py b/pufferblow/tests/test_05_list_server_users.py
similarity index 90%
rename from pufferblow_api/tests/test_05_list_server_users.py
rename to pufferblow/tests/test_05_list_server_users.py
index f07d86c..f2fcf2e 100644
--- a/pufferblow_api/tests/test_05_list_server_users.py
+++ b/pufferblow/tests/test_05_list_server_users.py
@@ -1,8 +1,8 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from pufferblow_api.api import api
-from pufferblow_api.tests.conftest import ValueStorage
+from pufferblow.api import api
+from pufferblow.tests.conftest import ValueStorage
 
 @pytest.fixture
 def client():
diff --git a/pufferblow_api/tests/test_06_list_server_channels.py b/pufferblow/tests/test_06_list_server_channels.py
similarity index 90%
rename from pufferblow_api/tests/test_06_list_server_channels.py
rename to pufferblow/tests/test_06_list_server_channels.py
index 7743865..b6fb068 100644
--- a/pufferblow_api/tests/test_06_list_server_channels.py
+++ b/pufferblow/tests/test_06_list_server_channels.py
@@ -1,8 +1,8 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from pufferblow_api.api import api
-from pufferblow_api.tests.conftest import ValueStorage
+from pufferblow.api import api
+from pufferblow.tests.conftest import ValueStorage
 
 @pytest.fixture
 def client():