fix, feat: 'git_repo' is present in /categories, remove unnecessary makefile commands, update to python 3.12.10 for docker image, closes 20

Author: THEGOLDENPRO

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim-bookworm
+FROM python:3.12.10-slim-bookworm
 
 USER root
 
@@ -19,4 +19,4 @@ RUN pip install .
 EXPOSE 8000
 ENV LISTEN_PORT=8000
 
-CMD ["uvicorn", "api.main:app", "--host=0.0.0.0", "--proxy-headers"]
+CMD ["fastapi", "run", "api/main.py"]

Makefile

@@ -1,20 +1,11 @@
 .PHONY: build
 
 build:
-	pip install . -U
-
-run:
-	fastapi dev api/main.py
+	echo "Nothing to build here."
 
 test:
 	ruff check .
 
-install:
-	pip install . -U
-
-install-dev:
-	pip install .[dev] -U
-
 pull-repo:
 	git clone https://github.com/cat-milk/Anime-Girls-Holding-Programming-Books ./assets/git_repo
 

README.md

@@ -80,7 +80,7 @@ Now you may jump to **step 2** of the [docker method](#-docker-method-recommende
 
 #### Prerequisites:
 - [Git](https://git-scm.com/downloads)
-- [Python](https://www.python.org/downloads/) (3.8 - 3.11)
+- [Python](https://www.python.org/downloads/) (3.10 - 3.13)
 - [Make](https://www.gnu.org/software/make/#download) ***(otherwise you'll have to copy the commands from the [Makefile](https://github.com/THEGOLDENPRO/aghpb_api/blob/main/Makefile))***
 
 1. Clone the repo.
@@ -94,14 +94,14 @@ source env/bin/activate # For windows it's --> cd env/Scripts && activate && cd
 ```
 3. Install the API's dependencies.
 ```sh
-make
+pip install . -U
 ```
 4. Pull the ~~anime girls~~ programming books.
 ```sh
 make pull-repo
 ```
-5. Run that sh#t.
+5. Run that mf.
 ```sh
-make run
+fastapi dev api/main.py
 ```
 6. Visit ``localhost:8000`` in your browser, then all should be good! 🌈

api/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.6"
+__version__ = "1.4.7"

api/main.py

@@ -13,18 +13,16 @@
 from slowapi.util import get_remote_address
 from slowapi.errors import RateLimitExceeded
 
-from meow_inator_5000.woutews import nya_service
-
 from . import __version__
 from .info import InfoData
 from .book import Book, BookData
 from .repository import ProgrammingBooks
 from .constants import RANDOM_BOOK_RATE_LIMIT, GET_BOOK_RATE_LIMIT, GIT_REPO_PATH
 from .errors import (
-    APIException, 
-    CategoryNotFoundError, 
-    BookNotFoundError, 
-    RateLimitedError, 
+    APIException,
+    CategoryNotFoundError,
+    BookNotFoundError,
+    RateLimitedError,
     rate_limit_error_handler
 )
 
@@ -92,7 +90,6 @@
     root_path = ROOT_PATH
 )
 app.state.limiter = limiter
-app.include_router(nya_service.router)
 app.add_exception_handler(RateLimitExceeded, rate_limit_error_handler)
 
 @app.get(
@@ -172,8 +169,8 @@ async def categories() -> List[str]:
     tags = ["books"]
 )
 async def search(
-    query: str, 
-    category: str = None, 
+    query: str,
+    category: str = None,
     limit: int = Query(ge = 1, default = 50)
 ) -> List[BookData]:
     """Returns list of book objects."""

api/repository.py

@@ -124,7 +124,10 @@ def parse_books(self) -> None:
             add_msg = f"{Colours.GREY.apply(f'({index}/{file_count})')} Adding book from '{Colours.PINK_GREY.apply(shorter_path(file))}'...\n"
             sys.stdout.write(Colours.BLUE.apply("[CACHED] ") + add_msg if cached_book is not None else add_msg)
 
-            if cached_book is not None:
+            if cached_book is None:
+                book = Book(file, str(search_id))
+                cached_books[str(file)] = book.to_dict()
+            else:
                 book = Book(
                     file, 
                     str(search_id), 
@@ -136,10 +139,6 @@ def parse_books(self) -> None:
                     commit_hash = cached_book["commit_hash"]
                 )
 
-            else:
-                book = Book(file, str(search_id))
-                cached_books[str(file)] = book.to_dict()
-
             if file.parent.name not in categories:
                 categories.append(file.parent.name)
 
@@ -148,6 +147,9 @@ def parse_books(self) -> None:
 
         self.__set_cache(cached_books)
 
+        if "git_repo" in categories:
+            categories.remove("git_repo")
+
         self.books = books
         self.categories = categories
 

pyproject.toml

@@ -5,7 +5,7 @@ authors = [
     {name = "Goldy", email = "[email protected]"}
 ]
 readme = {file = "README.md", content-type = "text/markdown"}
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = { file = "LICENSE" }
 keywords = [
     "aghpb_api", "aghpb", "anime girls holding programming books"
@@ -15,19 +15,17 @@ classifiers = [
     'Operating System :: Microsoft :: Windows :: Windows 10',
     'Operating System :: POSIX :: Linux',
     'License :: OSI Approved :: MIT License',
-    'Programming Language :: Python :: 3.9',
-    'Programming Language :: Python :: 3.10',
 	'Programming Language :: Python :: 3.11',
-    'Programming Language :: Python :: 3.12'
+    'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
 ]
 dependencies = [
     "thefuzz",
     "fastapi[standard]",
-    "devgoldyutils>=2.5.8",
+    "devgoldyutils==3.0.0",
     "typing-extensions",
     "slowapi",
     "python-decouple",
-    "meow-inator-5000@git+https://github.com/THEGOLDENPRO/meow-inator-5000",
 ]
 
 dynamic = ["version"]