Patched import issue

Author: Jebbex1

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Stegastatter"
-version = "1.0.1"
+version = "1.0.2"
 description = "A steganography engine"
 authors = [
     {name = "Jebbex1"}

stegastatter/bpcs/bit_plane.py

@@ -3,7 +3,7 @@
 from typing import Generator, Callable
 import numpy as np
 
-from errors import BPCSError
+from ..errors import BPCSError
 
 
 def xor_lists(a: list[bool], b: list[bool]) -> list[bool]:
@@ -145,6 +145,6 @@ def iterate_all_but_last_dim(arr: np.ndarray) -> Generator:
                 yield ind
 
         update_logger.info("Stacking bit plane blocks into an image...")
-        temp_array = np.reshape([bit_list_to_decimal(temp_array[ind]) for ind in iterate_all_but_last_dim(temp_array)],
+        temp_array = np.reshape([bit_list_to_decimal(temp_array[ind].tolist()) for ind in iterate_all_but_last_dim(temp_array)],
                                 temp_array.shape[:-1])
         return temp_array

stegastatter/bpcs/bpcs_image.py

@@ -2,10 +2,10 @@
 
 import numpy as np
 
-from bpcs.bit_plane import BitPlane
-from bpcs.extract import extract_message_from_vessel
-from bpcs.embed import embed_message_in_vessel
-from image_utils import open_image_from_bytes, image_to_array, array_to_image, image_to_bytes
+from .bit_plane import BitPlane
+from .extract import extract_message_from_vessel
+from .embed import embed_message_in_vessel
+from ..image_utils import open_image_from_bytes, image_to_array, array_to_image, image_to_bytes
 
 
 class BPCSImage:

stegastatter/bpcs/capacity.py

@@ -1,10 +1,10 @@
 import math
 import numpy as np
 
-from bpcs.core import calc_bpcs_complexity_coefficient
-from bpcs.dimension_computing import compute_all_block_indices
-from bpcs.dynamic_prefixing import get_prefix_length
-from content_wrapper.wrapper import get_max_unwapped_length
+from .core import calc_bpcs_complexity_coefficient
+from .dimension_computing import compute_all_block_indices
+from .dynamic_prefixing import get_prefix_length
+from ..content_wrapper.wrapper import get_max_unwapped_length
 
 
 def count_accepted_blocks(vessel_blocks: np.ndarray, image_shape: tuple[int, int, int, int],

stegastatter/bpcs/dimension_computing.py

@@ -1,10 +1,10 @@
 import multiprocessing
 from typing import Generator, Any
 
-from errors import BPCSError
+from ..errors import BPCSError
 
 
-def compute_segment_division_indices(total_length: int, segment_length: int) -> list[zip]:
+def compute_segment_division_indices(total_length: int, segment_length: int) -> list[tuple[int, Any]]:
     """
     Divides a range of length total_length into separate segments of all length segment_length. Leaves out any segments
     that don't have length of segment_length (if total_length%segment_length != 0 then we have segments that aren't of
@@ -23,7 +23,7 @@ def compute_segment_division_indices(total_length: int, segment_length: int) ->
 
 
 def compute_all_block_indices(image_shape: tuple[int, int, int, int],
-                              block_shape: tuple[int, int]) -> Generator[list[slice], Any, None]:
+                              block_shape: tuple[int, int]) -> Generator[list[int | slice], Any, Any]:
     """
     Computes every possible block location in an image of shape (x, y, channel, bit-plane index).
     :param image_shape: an array describing the image to compute all grid dimensions from

stegastatter/bpcs/dynamic_prefixing.py

@@ -2,7 +2,7 @@
 from random import choices
 import numpy as np
 
-from bpcs.core import calc_bpcs_complexity_coefficient
+from .core import calc_bpcs_complexity_coefficient
 
 
 def get_prefix_length(block_area: int, min_alpha: float) -> int:

stegastatter/bpcs/embed.py

@@ -1,11 +1,11 @@
 import multiprocessing
 import numpy as np
 
-from bpcs.block_operations import bytes_to_blocks
-from bpcs.core import calc_bpcs_complexity_coefficient, conjugate
-from bpcs.initilization_vector import build_iv_blocks, build_conjugation_blocks
-from errors import BPCSError, BPCSCapacityError
-from bpcs.capacity import calculate_embedding_blocks_num, collect_accepted_blocks
+from .block_operations import bytes_to_blocks
+from .core import calc_bpcs_complexity_coefficient, conjugate
+from .initilization_vector import build_iv_blocks, build_conjugation_blocks
+from ..errors import BPCSError, BPCSCapacityError
+from .capacity import calculate_embedding_blocks_num, collect_accepted_blocks
 
 
 def get_message_blocks_from_bytes(message: bytes) -> tuple[np.ndarray, int]:

stegastatter/bpcs/extract.py

@@ -1,12 +1,12 @@
 import multiprocessing
 import numpy as np
 
-from bpcs.dimension_computing import compute_all_block_indices
-from bpcs.block_operations import blocks_to_bits
-from bit_operations_utils import bits_to_bytes
-from errors import BPCSExtractError
-from bpcs.core import calc_bpcs_complexity_coefficient, conjugate
-from bpcs.initilization_vector import slice_iv_from_accepted_blocks, \
+from .dimension_computing import compute_all_block_indices
+from .block_operations import blocks_to_bits
+from ..bit_operations_utils import bits_to_bytes
+from ..errors import BPCSExtractError
+from .core import calc_bpcs_complexity_coefficient, conjugate
+from .initilization_vector import slice_iv_from_accepted_blocks, \
     slice_conj_blocks_from_accepted_blocks
 
 

stegastatter/bpcs/initilization_vector.py

@@ -1,7 +1,7 @@
 import math
 import numpy as np
 
-from bpcs.dynamic_prefixing import get_prefix_length, bits_to_prefixed_blocks, \
+from .dynamic_prefixing import get_prefix_length, bits_to_prefixed_blocks, \
     get_data_from_prefixed_blocks
 
 

stegastatter/content_wrapper/aes_gcm.py

@@ -2,7 +2,7 @@
 from Crypto.Cipher import AES
 from Crypto.Random import get_random_bytes
 
-from errors import ContentWrapperError
+from ..errors import ContentWrapperError
 
 
 def encrypt(plaintext: bytes, key: bytes) -> tuple[bytes, bytes, bytes, bytes, bytes]: