need to be merge

Makefile

@@ -16,20 +16,24 @@ debug:
 	uv pdb python3 a_maze_ing.py config.txt
 
 clean:
-	rm -rf */**/__pycache__ __pycache__ .mypy_cache .venv dist build */**/*.egg-info *.egg-info test.txt
+	rm -rf */**/__pycache__ */__pycache__ __pycache__ .mypy_cache .venv dist build */**/*.egg-info */*.egg-info *.egg-info test.txt
 
 fclean: clean
 	rm mazegen-1.0.0-py3-none-any.whl 
 
 lint:
 	uv run flake8 . --exclude=.venv
-	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs src
+	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs -p mazegen
+	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs -p parsing
+	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs src/AMazeIng.py
 	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs tests
 	uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs a_maze_ing.py
 
 lint-strict:
 	uv run flake8 . --exclude=.venv
-	uv run env PYTHONPATH=src python3 -m mypy --strict src
+	uv run env PYTHONPATH=src python3 -m mypy --strict -p mazegen
+	uv run env PYTHONPATH=src python3 -m mypy --strict src/AMazeIng.py
+	uv run env PYTHONPATH=src python3 -m mypy --strict -p parsing
 	uv run env PYTHONPATH=src python3 -m mypy --strict tests
 	uv run env PYTHONPATH=src python3 -m mypy --strict a_maze_ing.py
 

README.md

@@ -1,3 +1 @@
-The Randomized Kruskal's Algorithm
+SITULITUPU
-
-The Randomized Prim's Algorithm

a_maze_ing.py

@@ -1,7 +1,7 @@
 from typing import Any
 from numpy.typing import NDArray
-from src.AMazeIng import AMazeIng
+from AMazeIng import AMazeIng
-from src.parsing.Parsing import DataMaze as Parsing
+from parsing.Parsing import DataMaze as Parsing
 from mlx import Mlx
 import time
 
@@ -474,7 +474,7 @@ class MazeMLX:
         self.mlx.mlx_loop_hook(self.mlx_ptr, self.draw_image, amazing)
         self.mlx.mlx_hook(self.win_ptr, 33, 0, self.close_loop, None)
         self.mlx.mlx_hook(
-            self.win_ptr, 2, 1 << 0, self.handle_key_press, amazing
+            self.win_ptr, 2, 1 << 0, self.handle_key_press_mteriier, amazing
         )
         self.mlx.mlx_loop(self.mlx_ptr)
 

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "A-Maze-ing"
+name = "mazegen"
 version = "0.1.0"
 description = "This is the way"
 readme = "README.md"
@@ -30,5 +30,8 @@ requires = ["setuptools>=78.1.0", "wheel>=0.45.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
-package-dir = {"" = "src/amaz_lib"}
+package-dir = {"" = "src"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
 

src/AMazeIng.py

@@ -2,7 +2,7 @@ from typing import Generator
 from typing_extensions import Self
 from pydantic import BaseModel, Field, model_validator, ConfigDict
 
-from .amaz_lib import Maze, MazeGenerator, MazeSolver
+from mazegen import Maze, MazeGenerator, MazeSolver
 
 
 class AMazeIng(BaseModel):

src/amaz_lib/__init__.py

@@ -1,18 +0,0 @@
-from .Cell import Cell
-from .Maze import Maze
-from .MazeGenerator import MazeGenerator, DepthFirstSearch
-from .MazeGenerator import Kruskal
-from .MazeSolver import MazeSolver, AStar, DepthFirstSearchSolver
-
-__version__ = "1.0.0"
-__author__ = "us"
-__all__ = [
-    "Cell",
-    "Maze",
-    "MazeGenerator",
-    "DepthFirstSearchSolver",
-    "MazeSolver",
-    "AStar",
-    "Kruskal",
-    "DepthFirstSearch",
-]

src/mazegen/MazeGenerator.py

@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from typing import Generator, Any
 import numpy as np
 from numpy.typing import NDArray
-from .Cell import Cell
+from mazegen.Cell import Cell
 import math
 import random
 

src/mazegen/__init__.py

@@ -0,0 +1,18 @@
+from mazegen.Cell import Cell
+from mazegen.Maze import Maze
+from mazegen.MazeGenerator import MazeGenerator, DepthFirstSearch
+from mazegen.MazeGenerator import Kruskal
+from mazegen.MazeSolver import MazeSolver, AStar, DepthFirstSearchSolver
+
+__version__ = "1.0.0"
+__author__ = "us"
+__all__ = [
+    "Cell",
+    "Maze",
+    "MazeGenerator",
+    "DepthFirstSearchSolver",
+    "MazeSolver",
+    "AStar",
+    "Kruskal",
+    "DepthFirstSearch",
+]

src/parsing/Parsing.py

@@ -1,5 +1,5 @@
-from ..amaz_lib import DepthFirstSearch, Kruskal
+from mazegen import DepthFirstSearch, Kruskal
-from ..amaz_lib import AStar, DepthFirstSearchSolver
+from mazegen import AStar, DepthFirstSearchSolver
 from typing import Any
 
 

tests/test_Cell.py

@@ -1,4 +1,4 @@
-from amaz_lib.Cell import Cell
+from mazegen import Cell
 
 
 def test_cell_setter_getter() -> None:

tests/test_Depth.py

@@ -1,5 +1,5 @@
-from amaz_lib.MazeGenerator import DepthFirstSearch
+from mazegen import DepthFirstSearch
-from amaz_lib.Cell import Cell
+from mazegen import Cell
 import numpy as np
 
 

tests/test_Maze.py

@@ -1,6 +1,6 @@
 import numpy
-from amaz_lib.Cell import Cell
+from mazegen import Cell
-from amaz_lib.Maze import Maze
+from mazegen import Maze
 
 
 def test_maze_setter_getter() -> None:

tests/test_MazeGenerator.py

@@ -1,5 +1,5 @@
 import numpy
-from amaz_lib.MazeGenerator import DepthFirstSearch
+from mazegen import DepthFirstSearch
 
 
 class TestMazeGenerator:

tests/test_MazeSolver.py

@@ -1,6 +1,6 @@
-from amaz_lib.Cell import Cell
+from mazegen import Cell
 import numpy as np
-from amaz_lib import AStar, Maze
+from mazegen import AStar, Maze
 
 
 def test_solver() -> None:

uv.lock

@@ -6,36 +6,6 @@ resolution-markers = [
     "python_full_version < '3.11'",
 ]
 
-[[package]]
-name = "a-maze-ing"
-version = "0.1.0"
-source = { editable = "." }
-dependencies = [
-    { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
-    { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
-    { name = "pydantic" },
-]
-
-[package.dev-dependencies]
-dev = [
-    { name = "flake8" },
-    { name = "mypy" },
-    { name = "pytest" },
-]
-
-[package.metadata]
-requires-dist = [
-    { name = "numpy", specifier = ">=2.2.6" },
-    { name = "pydantic", specifier = ">=2.12.5" },
-]
-
-[package.metadata.requires-dev]
-dev = [
-    { name = "flake8", specifier = ">=7.3.0" },
-    { name = "mypy", specifier = ">=1.19.1" },
-    { name = "pytest", specifier = ">=9.0.2" },
-]
-
 [[package]]
 name = "annotated-types"
 version = "0.7.0"
@@ -174,6 +144,36 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b2/c8/d148e041732d631fc76036f8b30fae4e77b027a1e95b7a84bb522481a940/librt-0.8.1-cp314-cp314t-win_arm64.whl", hash = "sha256:bf512a71a23504ed08103a13c941f763db13fb11177beb3d9244c98c29fb4a61", size = 48755, upload-time = "2026-02-17T16:12:47.943Z" },
 ]
 
+[[package]]
+name = "mazegen"
+version = "0.1.0"
+source = { editable = "." }
+dependencies = [
+    { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
+    { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
+    { name = "pydantic" },
+]
+
+[package.dev-dependencies]
+dev = [
+    { name = "flake8" },
+    { name = "mypy" },
+    { name = "pytest" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "numpy", specifier = ">=2.2.6" },
+    { name = "pydantic", specifier = ">=2.12.5" },
+]
+
+[package.metadata.requires-dev]
+dev = [
+    { name = "flake8", specifier = ">=7.3.0" },
+    { name = "mypy", specifier = ">=1.19.1" },
+    { name = "pytest", specifier = ">=9.0.2" },
+]
+
 [[package]]
 name = "mccabe"
 version = "0.7.0"