Cleanup mcpgateway-wrapper

Signed-off-by: Mihai Criveti <[email protected]>

Author: crivetimihai

.github/workflows/python-package.yml

@@ -32,8 +32,8 @@ jobs:
       # 3️⃣  Install build front-end; Keep pip current
       - name: Install build tool
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install build   # PyPA-endorsed PEP 517 builder
+          python3 -m pip install --upgrade pip
+          python3 -m pip install build   # PyPA-endorsed PEP 517 builder
 
       # 4️⃣  Invoke the Makefile 'dist' target (creates ./dist/*.whl & *.tar.gz)
       - name: Build distributions

MANIFEST.in

@@ -9,6 +9,7 @@ include pyproject.toml
 include gunicorn.config.py
 include Containerfile
 include Containerfile.lite
+include __init__
 
 # 2️⃣  Top-level config, examples and helper scripts
 include *.py
@@ -32,12 +33,16 @@ include .pycodestyle
 include .pylintrc
 include .whitesource
 include .coveragerc
-#include .gitignore            # purely optional but many projects ship it
+# include .gitignore            # purely optional but many projects ship it
+include .bumpversion.cfg
+include .yamllint
+include .editorconfig
 
 # 4️⃣  Runtime data that lives *inside* the package at import time
 recursive-include mcpgateway/templates *.html
 recursive-include mcpgateway/static *.css *.js *.gif *.png *.svg
 recursive-include mcpgateway *.pyi py.typed
+recursive-include mcpgateway *.ico
 
 # 5️⃣  (Optional) include MKDocs-based docs in the sdist
 graft docs
@@ -48,3 +53,6 @@ prune build
 prune dist
 prune .eggs
 prune *.egg-info
+prune charts
+prune k8s
+prune .devcontainer

Makefile

@@ -162,12 +162,12 @@ certs:                           ## Generate ./certs/cert.pem & ./certs/key.pem
 test:
 	@echo "🧪 Running tests..."
 	@test -d "$(VENV_DIR)" || make venv
-	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python -m pip install pytest pytest-asyncio pytest-cov -q && python -m pytest --maxfail=0 --disable-warnings -v"
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python3 -m pip install pytest pytest-asyncio pytest-cov -q && python3 -m pytest --maxfail=0 --disable-warnings -v"
 
 pytest-examples:
 	@echo "🧪 Testing README examples..."
 	@test -d "$(VENV_DIR)" || make venv
-	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python -m pip install pytest pytest-examples -q && pytest -v test_readme.py"
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python3 -m pip install pytest pytest-examples -q && pytest -v test_readme.py"
 
 test-curl:
 	./test_endpoints.sh
@@ -414,10 +414,10 @@ depend:                             ## 📦  List dependencies
 	pdm list --freeze
 
 snakeviz:                           ## 🐍  Interactive profile visualiser
-	@python -m cProfile -o mcp.prof app/server.py && snakeviz mcp.prof --server
+	@python3 -m cProfile -o mcp.prof app/server.py && snakeviz mcp.prof --server
 
 pstats:                             ## 📊  Static call-graph image
-	@python -m cProfile -o mcp.pstats app/server.py && \
+	@python3 -m cProfile -o mcp.pstats app/server.py && \
 	 gprof2dot -w -e 3 -n 3 -s -f pstats mcp.pstats | \
 	 dot -Tpng -o $(DOCS_DIR)/pstats.png
 
@@ -429,15 +429,15 @@ tox:                                ## 🧪  Multi-Python tox matrix
 	uv pip install tox-travis tox-pdm
 	pdm add -G dev
 	pdm python install 3.11 3.12
-	python -m tox -p 2
+	python3 -m tox -p 2
 
 sbom:								## 🛡️  Generate SBOM & security report
 	@echo "🛡️   Generating SBOM & security report…"
 	@rm -Rf "$(VENV_DIR).sbom"
 	@python3 -m venv "$(VENV_DIR).sbom"
 	@/bin/bash -c "source $(VENV_DIR).sbom/bin/activate && python3 -m pip install --upgrade pip setuptools pdm uv && python3 -m uv pip install .[dev]"
 	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python3 -m uv pip install cyclonedx-bom sbom2doc"
-	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python -m cyclonedx_py environment --validate '$(VENV_DIR).sbom' --pyproject pyproject.toml --gather-license-texts > $(PROJECT_NAME).sbom.json"
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python3 -m cyclonedx_py environment --validate '$(VENV_DIR).sbom' --pyproject pyproject.toml --gather-license-texts > $(PROJECT_NAME).sbom.json"
 	@/bin/bash -c "source $(VENV_DIR)/bin/activate && sbom2doc -i $(PROJECT_NAME).sbom.json -f markdown -o $(DOCS_DIR)/docs/test/sbom.md"
 	@trivy sbom $(PROJECT_NAME).sbom.json | tee -a $(DOCS_DIR)/docs/test/sbom.md
 	@/bin/bash -c "source $(VENV_DIR).sbom/bin/activate && python3 -m pdm outdated | tee -a $(DOCS_DIR)/docs/test/sbom.md"
@@ -641,7 +641,7 @@ pysonar-scanner:
 	@echo "🐍 Scanning code with pysonar-scanner (PyPI) …"
 	@test -f $(SONAR_PROPS) || { echo "❌ $(SONAR_PROPS) not found."; exit 1; }
 	python3 -m pip install --upgrade --quiet pysonar-scanner
-	python -m pysonar_scanner \
+	python3 -m pysonar_scanner \
 		-Dproject.settings=$(SONAR_PROPS) \
 		-Dsonar.host.url=$(SONAR_HOST_URL) \
 		$(if $(SONAR_TOKEN),-Dsonar.login=$(SONAR_TOKEN),)
@@ -739,7 +739,7 @@ pip-audit:
 	@echo "🔒  pip-audit vulnerability scan…"
 	@test -d "$(VENV_DIR)" || $(MAKE) venv
 	@/bin/bash -c "source $(VENV_DIR)/bin/activate && \
-		python -m pip install --quiet --upgrade pip-audit && \
+		python3 -m pip install --quiet --upgrade pip-audit && \
 		pip-audit --progress-spinner ascii --strict || true"
 
 # =============================================================================
@@ -777,15 +777,15 @@ containerfile-update:
 .PHONY: dist wheel sdist verify publish
 
 dist: clean                ## Build wheel + sdist
-	python -m build
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python3 -m build"
 	@echo "🛠  Wheel & sdist written to ./dist"
 
 wheel:                     ## Build wheel only
-	python -m build -w
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python3 -m build -w"
 	@echo "🛠  Wheel written to ./dist"
 
 sdist:                     ## Build source distribution only
-	python -m build -s
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && python3 -m build -s"
 	@echo "🛠  Source distribution written to ./dist"
 
 verify: dist               ## Build, run metadata & manifest checks
@@ -1897,7 +1897,7 @@ shell-linters-install:     ## 🔧  Install shellcheck, shfmt, bashate
 	if ! $(VENV_DIR)/bin/bashate -h >/dev/null 2>&1 ; then \
 	  echo "🛠  Installing bashate (into venv)…" ; \
 	  test -d "$(VENV_DIR)" || $(MAKE) venv ; \
-	  /bin/bash -c "source $(VENV_DIR)/bin/activate && python -m pip install --quiet bashate" ; \
+	  /bin/bash -c "source $(VENV_DIR)/bin/activate && python3 -m pip install --quiet bashate" ; \
 	fi
 	@echo "✅  Shell linters ready."
 

README.md

@@ -199,7 +199,7 @@ npx -y supergateway --stdio "uvenv run mcp_server_time -- --local-timezone=Europ
 # Start the MCP Gateway Wrapper
 export MCP_AUTH_TOKEN=${MCPGATEWAY_BEARER_TOKEN}
 export MCP_SERVER_CATALOG_URLS=http://localhost:4444/servers/1
-python -m mcpgateway.wrapper
+python3 -m mcpgateway.wrapper
 ```
 
 **Initialize the protocol:**
@@ -445,7 +445,7 @@ uv pip install -e '.[dev]' # IMPORTANT: in zsh, quote to disable glob expansion!
 ### pip (alternative)
 
 ```bash
-python -m venv .venv && source .venv/bin/activate
+python3 -m venv .venv && source .venv/bin/activate
 pip install -e ".[dev]"
 ```
 
@@ -518,7 +518,7 @@ You can get started by copying the provided `.env.examples` to `.env` and making
 > * Generate tokens via:
 >
 >   ```bash
->   python -m mcpgateway.utils.create_jwt_token -u admin -e 10080 > token.txt
+>   python3 -m mcpgateway.utils.create_jwt_token -u admin -e 10080 > token.txt
 >   export MCPGATEWAY_BEARER_TOKEN=$(cat token.txt)
 >   ```
 > * Tokens allow non-interactive API clients to authenticate securely.
@@ -772,7 +772,7 @@ Generate an API Bearer token, and test the various API endpoints:
 
 ```bash
 # Generate a bearer token using the configured secret key (use the same as your .env)
-export MCPGATEWAY_BEARER_TOKEN=$(python -m mcpgateway.utils.create_jwt_token -u admin --secret my-test-key)
+export MCPGATEWAY_BEARER_TOKEN=$(python3 -m mcpgateway.utils.create_jwt_token -u admin --secret my-test-key)
 echo ${MCPGATEWAY_BEARER_TOKEN}
 
 # Quickly confirm that authentication works and the gateway is healthy

TESTING.md

@@ -41,13 +41,13 @@ You can run specific tests by specifying the file or directory:
 source ~/.venv/mcpgateway/bin/activate
 
 # Run a specific test file
-python -m pytest tests/unit/mcpgateway/test_config.py -v
+python3 -m pytest tests/unit/mcpgateway/test_config.py -v
 
 # Run a specific test class
-python -m pytest tests/unit/mcpgateway/validation/test_jsonrpc.py::TestJSONRPCValidation -v
+python3 -m pytest tests/unit/mcpgateway/validation/test_jsonrpc.py::TestJSONRPCValidation -v
 
 # Run a specific test method
-python -m pytest tests/unit/mcpgateway/validation/test_jsonrpc.py::TestJSONRPCValidation::test_validate_valid_request -v
+python3 -m pytest tests/unit/mcpgateway/validation/test_jsonrpc.py::TestJSONRPCValidation::test_validate_valid_request -v
 ```
 
 ### Testing README Examples
@@ -67,10 +67,10 @@ To run tests with coverage reporting:
 source ~/.venv/mcpgateway/bin/activate
 
 # Run tests with coverage
-python -m pytest --cov=mcpgateway tests/
+python3 -m pytest --cov=mcpgateway tests/
 
 # Generate a coverage report
-python -m pytest --cov=mcpgateway --cov-report=html tests/
+python3 -m pytest --cov=mcpgateway --cov-report=html tests/
 ```
 
 The HTML coverage report will be available in the `htmlcov` directory.

docs/docs/deployment/ibm-code-engine.md

@@ -81,7 +81,7 @@ To access the APIs you need to generate your JWT token using the same `JWT_SECRE
 
 ```bash
 # Generate a one-off token for the default admin user
-export MCPGATEWAY_BEARER_TOKEN=$(python -m mcpgateway.utils.create_jwt_token -u admin)
+export MCPGATEWAY_BEARER_TOKEN=$(python3 -m mcpgateway.utils.create_jwt_token -u admin)
 echo ${MCPGATEWAY_BEARER_TOKEN} # Check that the key was generated
 ```
 
@@ -224,7 +224,7 @@ Test the API endpoints with the generated `MCPGATEWAY_BEARER_TOKEN`:
 
 ```bash
 # Generate a one-off token for the default admin user
-export MCPGATEWAY_BEARER_TOKEN=$(python -m mcpgateway.utils.create_jwt_token -u admin)
+export MCPGATEWAY_BEARER_TOKEN=$(python3 -m mcpgateway.utils.create_jwt_token -u admin)
 
 # Call a protected endpoint. Since there are not tools, initially this just returns `[]`
 curl -H "Authorization: Bearer ${MCPGATEWAY_BEARER_TOKEN}" \

docs/docs/deployment/local.md

@@ -62,6 +62,6 @@ Visit [http://localhost:4444/admin](http://localhost:4444/admin) and login using
 ## 🔁 Quick JWT Setup
 
 ```bash
-export MCPGATEWAY_BEARER_TOKEN=$(python -m mcpgateway.utils.create_jwt_token -u admin)
+export MCPGATEWAY_BEARER_TOKEN=$(python3 -m mcpgateway.utils.create_jwt_token -u admin)
 curl -H "Authorization: Bearer $MCPGATEWAY_BEARER_TOKEN" http://localhost:4444/tools
 ```

docs/docs/development/building.md

@@ -29,7 +29,7 @@ This will:
 ## 🐍 Manual Python Setup
 
 ```bash
-python -m venv .venv
+python3 -m venv .venv
 source .venv/bin/activate
 pip install -e ".[dev]"
 ```

docs/docs/development/github.md

@@ -214,7 +214,7 @@ make compose-up
 Quickly confirm that authentication works and the gateway is healthy:
 
 ```bash
-export MCPGATEWAY_BEARER_TOKEN=$(python -m mcpgateway.utils.create_jwt_token -u admin --secret my-test-key)
+export MCPGATEWAY_BEARER_TOKEN=$(python3 -m mcpgateway.utils.create_jwt_token -u admin --secret my-test-key)
 curl -s -k -H "Authorization: Bearer $MCPGATEWAY_BEARER_TOKEN" https://localhost:4444/health
 ```
 

docs/docs/development/index.md

@@ -95,7 +95,7 @@ Admin UI and API are protected by Basic Auth or JWT.
 To generate a JWT:
 
 ```bash
-python -m mcpgateway.utils.create_jwt_token \
+python3 -m mcpgateway.utils.create_jwt_token \
   -u admin \
   -e 10080 | tee token.txt