merge: bring branch up-to-date with master branch

Author: jemarq04

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   test:
     docker:
-      - image: cimg/python:3.12.8
+      - image: cimg/python:3.13.7
     steps:
       - checkout
       - run:
@@ -25,7 +25,7 @@ jobs:
           command: make openapi-generate
   build:
     docker:
-      - image: cimg/python:3.12.8
+      - image: cimg/python:3.13.7
     steps:
       - checkout
       - run:

.github/workflows/database.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Lint
         run: |
           set -e
@@ -17,11 +17,20 @@ jobs:
             echo "$filename"
             ./csvlint -lazyquotes "$filename" # TODO: remove lazyquotes when https://github.com/Clever/csvlint/issues/45 will be addressed
           done
+  openapi:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+      - name: Generate OpenAPI schema
+        run: |
+          make install
+          make openapi-generate
   sqlite:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Start pokeapi
@@ -39,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Build

.github/workflows/docker-build-and-push.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Docker meta

.github/workflows/docker-k8s.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Docker meta
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Docker meta
@@ -103,12 +103,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Build dev environment
         run: |
           docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d
           sleep 30
       - name: Assert containers running
         run: |
           last_command=$(docker ps | grep 'pokeapi-' | wc -l)
-          test "$last_command" -eq 5
+          test "$last_command" -eq 5

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Start pokeapi (docker)
@@ -32,7 +32,7 @@ jobs:
           nohup make serve &
           sleep 3
       - name: Release
-        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8
         if: startsWith(github.ref, 'refs/tags/')
         with:
           draft: true

CONTRIBUTING.md

@@ -26,6 +26,18 @@ git checkout -b my_new_branch
 
 Simple!
 
+## AI assisted coding
+
+Using AI assisted coding tools for auto complete, test generation, etc is allowed so long as a human is the overall primary author of a pull request.
+
+Contributions from supervised AI assisted coding agents who build the majority (or all of) a change, such as [co pilot tasks](https://github.blog/changelog/2025-10-28-a-mission-control-to-assign-steer-and-track-copilot-coding-agent-tasks/), will be accepted only on the following basis:
+
+1. A human can verifiably prove they have reviewed and checked that the contribution does what it says it does.
+2. The human author provides evidence of the prompt given to the AI agent, and the logs of it producing the change. (For example - co pilot tasks produces a public log).
+3. The human author explicitly calls out that an supervised AI agent created the change when they make a pull request.
+4. The human author is prepared to own the change (just like any other change they make) and fix any issues that arise from it.
+
+
 ## Financial contributions
 
 We also welcome financial contributions in full transparency on our [open collective](https://opencollective.com/pokeapi).

Makefile

@@ -2,6 +2,11 @@ veekun_pokedex_repository = ../pokedex
 local_config = --settings=config.local
 docker_config = --settings=config.docker-compose
 gql_compose_config = -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml
+gqlv1beta_compose_config = -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml -f Resources/compose/docker-compose-prod-graphql-v1beta.yml
+
+# Auto-detect Python and pip commands
+PYTHON := $(shell which python3 2>/dev/null || which python 2>/dev/null || echo python3)
+PIP := $(shell which pip3 2>/dev/null || which pip 2>/dev/null || echo pip3)
 
 .PHONY: help
 .SILENT:
@@ -10,40 +15,40 @@ help:
 	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 install:  # Install base requirements to run project
-	pip install -r requirements.txt
+	$(PIP) install -r requirements.txt
 
 dev-install:  # Install developer requirements + base requirements
-	pip install -r test-requirements.txt
+	$(PIP) install -r test-requirements.txt
 
 setup:  # Set up the project database
-	python manage.py migrate ${local_config}
+	$(PYTHON) manage.py migrate ${local_config}
 
 build-db:  # Build database
-	echo "from data.v2.build import build_all; build_all()" | python manage.py shell ${local_config}
+	echo "from data.v2.build import build_all; build_all()" | $(PYTHON) manage.py shell ${local_config}
 
 wipe-sqlite-db:  # Delete's the project database
 	rm -rf db.sqlite3
 
 serve:  # Run the project locally
-	python manage.py runserver ${local_config}
+	$(PYTHON) manage.py runserver ${local_config}
 
 test:  # Run tests
-	python manage.py test ${local_config}
+	$(PYTHON) manage.py test ${local_config}
 
 clean:  # Remove any pyc files
 	find . -type f -name '*.pyc' -delete
 
 migrate:  # Run any outstanding migrations
-	python manage.py migrate ${local_config}
+	$(PYTHON) manage.py migrate ${local_config}
 
 make-migrations:  # Create migrations files if schema has changed
-	python manage.py makemigrations ${local_config}
+	$(PYTHON) manage.py makemigrations ${local_config}
 
 shell:  # Load a shell
-	python manage.py shell ${local_config}
+	$(PYTHON) manage.py shell ${local_config}
 
 openapi-generate:
-	python manage.py spectacular --color --file openapi.yml ${local_config}
+	$(PYTHON) manage.py spectacular --color --file openapi.yml ${local_config}
 
 docker-up:  # (Docker) Create services/volumes/networks
 	docker compose up -d
@@ -82,10 +87,10 @@ docker-prod:
 docker-setup: docker-up docker-migrate docker-build-db  # (Docker) Start services, prepare the latest DB schema, populate the DB
 
 format:  # Format the source code
-	black .
+	black . --extend-exclude '.+/scripts/.+'
 
 format-check:  # Check the source code has been formatted
-	black . --check --exclude 'Resources/scripts/.*'
+	black . --check --extend-exclude '.+/scripts/.+'
 
 pull:
 	git checkout master
@@ -104,11 +109,17 @@ sync-to-veekun: pull pull-veekun  # Copy data from this repository to ../pokedex
 # read-env-file:  # Exports ./.env into shell environment variables
 # 	export `egrep -v '^#' .env | xargs`
 
+hasura-export-v1beta:
+	hasura md export --project graphql/v1beta
+
+hasura-apply-v1beta:
+	hasura md apply --project graphql/v1beta
+
 hasura-export:  # Export Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET
-	hasura md export --project graphql
+	hasura md export --project graphql/v1beta2
 
 hasura-apply:  # Apply local Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET
-	hasura md apply --project graphql
+	hasura md apply --project graphql/v1beta2
 
 hasura-get-anon-schema:  # Dumps GraphQL schema
 	gq http://localhost:8080/v1/graphql --introspect > graphql/schema.graphql
@@ -143,6 +154,23 @@ down-graphql-prod:
 	docker volume prune --all --force
 	sync; echo 3 > /proc/sys/vm/drop_caches
 
+update-graphql-v1beta-data-prod:
+	docker compose ${gqlv1beta_compose_config} stop
+	git pull origin master
+	git submodule update --remote --merge
+	docker compose ${gqlv1beta_compose_config} up --pull always -d app cache db
+	sync; echo 3 > /proc/sys/vm/drop_caches
+	make docker-migrate
+	make docker-build-db
+	docker compose ${gqlv1beta_compose_config} stop app cache
+	docker compose ${gqlv1beta_compose_config} up --pull always -d graphql-engine graphiql
+	sleep 120
+	make hasura-apply-v1beta
+	docker compose ${gqlv1beta_compose_config} up --pull always -d web
+	docker compose exec -T web sh -c 'rm -rf /tmp/cache/*'
+	docker image prune -af
+	sync; echo 3 > /proc/sys/vm/drop_caches
+
 # Nginx doesn't start if upstream graphql-engine is down
 update-graphql-data-prod:
 	docker compose ${gql_compose_config} stop

README.md

@@ -33,7 +33,7 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 - [Join Us On Slack!](#join-us-on-slack)
 - [Contributing](#contributing)
 
-## Setup <a id="setup"></a> &nbsp; [![pyVersion310](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/download/releases/3.10/)
+## Setup <a id="setup"></a> &nbsp; [![pyVersion313](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3137/)
 
 - Download this source code into a working directory, be sure to use the flag `--recurse-submodules` to clone also our submodules.
 
@@ -122,7 +122,7 @@ When you start PokéAPI with the above Docker Compose setup, an [Hasura Engine](
 
 ```sh
 # hasura cli needs to be installed and available in your $PATH: https://hasura.io/docs/latest/graphql/core/hasura-cli/install-hasura-cli.html
-# hasura cli's version has to greater than v2.0.8
+# hasura cli's version has to greater than v2.48.1
 make hasura-apply
 ```
 
@@ -171,6 +171,8 @@ This k8s setup creates all k8s resources inside the _Namespace_ `pokeapi`, run `
 |.Net Standard |[mtrdp642/PokeApiNet](https://github.com/mtrdp642/PokeApiNet)|Auto caching |
 |Dart|[prathanbomb/pokedart](https://github.com/prathanbomb/pokedart)| |
 |Go|[mtslzr/pokeapi-go](https://github.com/mtslzr/pokeapi-go)|Auto caching |
+|Go|[JoshGuarino/PokeGo](https://github.com/JoshGuarino/PokeGo) |Auto caching |
+|Haxe|[KinoCreatesGames/poke-api](https://github.com/KinoCreatesGames/poke-api) |Auto caching |
 |PHP |[lmerotta/phpokeapi](https://github.com/lmerotta/phpokeapi)|Auto caching, lazy loading |
 |PowerShell|[Celerium/PokeAPI-PowerShellWrapper](https://github.com/Celerium/PokeAPI-PowerShellWrapper)| |
 |Python|[beastmatser/aiopokeapi](https://github.com/beastmatser/aiopokeapi)|Auto caching, asynchronous |
@@ -197,7 +199,7 @@ Thank you to all our backers! [Become a backer](https://opencollective.com/pokea
 Have a question or just want to discuss new ideas and improvements? Hit us up on Slack. ~~Consider talking with us here before creating a new issue.~~
 This way we can keep issues here a bit more organized and helpful in the long run. Be excellent to each other :smile:
 
-[Sign up](https://join.slack.com/t/pokeapi/shared_invite/zt-2ampo6her-_tHSI3uOS65WzGypt7Y96w) easily!
+[Sign up](https://join.slack.com/t/pokeapi/shared_invite/zt-38w145rww-I_ROYnZME2n1c7mQXppEAQ) easily!
 
 Once you've signed up visit [PokéAPI on Slack](https://pokeapi.slack.com)
 

Resources/compose/docker-compose-prod-graphql-v1beta.yml

@@ -0,0 +1,10 @@
+# TODO: when removing v1beta, delete the file
+version: '2.4'
+services:
+  graphiql:
+    image: pokeapi/graphiql:v1beta-2.1.0
+  web:
+    volumes:
+      - ./Resources/nginx/nginx-gql-v1beta.conf:/etc/nginx/nginx.conf:ro
+      - ./Resources/nginx/ssl:/ssl:ro
+      - graphql_cache:/tmp/cache

Resources/compose/docker-compose-prod-graphql.yml

@@ -33,12 +33,9 @@ services:
       HASURA_GRAPHQL_EVENTS_HTTP_POOL_SIZE: 10
 
   graphiql:
-    image: pokeapi/graphiql:2.0.0
+    image: pokeapi/graphiql:v1beta2-2.1.0
     expose:
       - 80
     depends_on:
       - graphql-engine
     restart: always
-
-volumes:
-  graphiql: