refactor: move messages and bridge modules

Dockerfile

@@ -45,7 +45,7 @@ RUN python3 -m pip install pip --upgrade && \
 # This significantly reduces the total build time, as each time we make a build call for a device,
 # only device-specific kernel source is being downloaded into the container.
 #
-RUN python3 ${WDIR}/wrapper/bridge.py --shared
+RUN python3 ${WDIR}/wrapper/utils/bridge.py --shared
 
 # launch app
 CMD [ "/bin/bash" ]

tests/unit/wrapper/utils/test_messages.py → tests/unit/wrapper/tools/test_messages.py

@@ -1,6 +1,6 @@
 import pytest
 
-from wrapper.utils import messages as msg
+from wrapper.tools import messages as msg
 
 
 def test__message_note__validate(capfd):

wrapper/__main__.py

@@ -3,8 +3,7 @@
 import json
 import argparse
 
-from wrapper.tools import cleaning as cm
-from wrapper.utils import messages as msg
+from wrapper.tools import cleaning as cm, messages as msg
 from wrapper.configs import ArgumentConfig, DirectoryConfig as dcfg
 from wrapper.engines import DockerEngine, PodmanEngine
 from wrapper.commands import KernelCommand, AssetsCommand, BundleCommand

wrapper/clients/github.py

@@ -5,8 +5,7 @@
 from typing import Optional
 from pydantic import BaseModel
 
-from wrapper.tools import cleaning as cm, commands as ccmd
-from wrapper.utils import messages as msg
+from wrapper.tools import cleaning as cm, commands as ccmd, messages as msg
 from wrapper.configs import DirectoryConfig as dcfg
 
 

wrapper/clients/rom_api.py

@@ -1,7 +1,7 @@
 import requests
 from pydantic import BaseModel
 
-from wrapper.utils import messages as msg
+from wrapper.tools import messages as msg
 from wrapper.interfaces import IRomApi
 
 

wrapper/commands/bundle.py

@@ -5,8 +5,7 @@
 from pydantic import BaseModel
 
 from wrapper.core import KernelBuilder, AssetsCollector
-from wrapper.tools import cleaning as cm, commands as ccmd, fileoperations as fo
-from wrapper.utils import messages as msg
+from wrapper.tools import cleaning as cm, commands as ccmd, fileoperations as fo, messages as msg
 from wrapper.configs import DirectoryConfig as dcfg
 from wrapper.interfaces import IBundleCommand
 

wrapper/configs/argument_config.py

@@ -4,8 +4,7 @@
 from typing import Optional
 from pydantic import BaseModel
 
-from wrapper.tools import commands as ccmd
-from wrapper.utils import messages as msg
+from wrapper.tools import commands as ccmd, messages as msg
 
 
 class ArgumentConfig(BaseModel):

wrapper/core/assets_collector.py

@@ -1,8 +1,7 @@
 import os
 from pydantic import BaseModel
 
-from wrapper.tools import cleaning as cm, fileoperations as fo
-from wrapper.utils import messages as msg
+from wrapper.tools import cleaning as cm, fileoperations as fo, messages as msg
 from wrapper.clients import GitHubApi, LineageOsApi, ParanoidAndroidApi
 from wrapper.configs import DirectoryConfig as dcfg
 from wrapper.interfaces import IAssetsCollector

wrapper/core/kernel_builder.py

@@ -4,8 +4,8 @@
 from pathlib import Path
 from pydantic import BaseModel
 
-from wrapper.tools import cleaning as cm, commands as ccmd, fileoperations as fo
-from wrapper.utils import ResourceManager, messages as msg
+from wrapper.tools import cleaning as cm, commands as ccmd, fileoperations as fo, messages as msg
+from wrapper.utils import ResourceManager
 from wrapper.configs import DirectoryConfig as dcfg
 from wrapper.interfaces import IKernelBuilder
 

wrapper/engines/container_engine.py

@@ -5,8 +5,7 @@
 from pydantic import BaseModel
 from subprocess import CompletedProcess
 
-from wrapper.tools import commands as ccmd
-from wrapper.utils import messages as msg
+from wrapper.tools import commands as ccmd, messages as msg
 from wrapper.configs import DirectoryConfig as dcfg
 from wrapper.interfaces import IContainerEngine
 
@@ -70,7 +69,7 @@ def dir_bundle_conan(self) -> Path:
     @property
     def wrapper_cmd(self) -> str:
         # prepare launch command
-        cmd = f"python3 {Path('wrapper', 'bridge.py')}"
+        cmd = f"python3 {Path('wrapper', 'utils', 'bridge.py')}"
         arguments = {
             "--command": self.command,
             "--codename": self.codename,

wrapper/engines/docker_engine.py

@@ -1,8 +1,7 @@
 import os
 from typing import override
 
-from wrapper.tools import commands as ccmd
-from wrapper.utils import messages as msg
+from wrapper.tools import commands as ccmd, messages as msg
 from wrapper.interfaces import IDockerEngine
 
 from wrapper.engines.container_engine import ContainerEngine

wrapper/tools/__init__.py

@@ -1,3 +1,4 @@
 from .cleaning import remove, git, root
 from .commands import launch
 from .fileoperations import ucopy, download
+from .messages import banner, note, error, cancel, done, outputstream

wrapper/tools/commands.py

@@ -2,7 +2,7 @@
 import subprocess
 from subprocess import CompletedProcess
 
-from wrapper.utils import messages as msg
+from wrapper.tools import messages as msg
 
 
 def launch(

wrapper/tools/fileoperations.py

@@ -4,8 +4,7 @@
 from typing import Tuple
 from pathlib import Path
 
-from wrapper.tools import commands as ccmd
-from wrapper.utils import messages as msg
+from wrapper.tools import commands as ccmd, messages as msg
 
 
 def ucopy(src: Path, dst: Path, exceptions: Tuple[str] = ()) -> None:

wrapper/utils/__init__.py

@@ -1,2 +1 @@
 from .resource_manager import ResourceManager
-from .messages import banner, note, error, cancel, done, outputstream

wrapper/bridge.py → wrapper/utils/bridge.py

@@ -1,7 +1,8 @@
 import sys
 import argparse
 
-from wrapper.utils import messages as msg, ResourceManager
+from wrapper.tools import messages as msg
+from wrapper.utils import ResourceManager
 from wrapper.commands import KernelCommand, AssetsCommand, BundleCommand
 
 

wrapper/utils/resource_manager.py

@@ -3,8 +3,7 @@
 import tarfile
 from typing import Optional
 
-from wrapper.tools import cleaning as cm, commands as ccmd, fileoperations as fo
-from wrapper.utils import messages as msg
+from wrapper.tools import cleaning as cm, commands as ccmd, fileoperations as fo, messages as msg
 from wrapper.configs import DirectoryConfig as dcfg