Merge pull request #101 from IBM/release-planning-cleanup-v4

Release planning cleanup v4 - and --version flag for cli

Author: crivetimihai

.devcontainer/devcontainer.json

@@ -25,6 +25,6 @@
   },
   "remoteEnv": {
     "MCPGATEWAY_DEV_MODE": "true",
-    "VENV_DIR": "/Users/mg/.venv/mcpgateway"
+    "VENV_DIR": "$HOME/.venv/mcpgateway"
   }
 }

.devcontainer/postCreateCommand.sh

@@ -11,7 +11,7 @@ fi
 make install-dev
 
 # Run tests to verify setup
-make test
+# make test
 
 echo "Devcontainer setup complete."
 

.github/workflows/python-package.yml

@@ -29,12 +29,15 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      # 3️⃣  Install build front-end; Keep pip current
+      # 3️⃣  Install build front-end; Keep pip current; bootstrap venv
       - name: Install build tool
         run: |
           python3 -m pip install --upgrade pip
           python3 -m pip install build   # PyPA-endorsed PEP 517 builder
 
+      - name: Bootstrap project venv
+        run: make venv
+
       # 4️⃣  Invoke the Makefile 'dist' target (creates ./dist/*.whl & *.tar.gz)
       - name: Build distributions
         run: make dist                 # Uses the Makefile's `dist` rule

Containerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9-minimal:9.6-1747218906
+FROM registry.access.redhat.com/ubi9-minimal:9.6-1749489516
 LABEL maintainer="Mihai Criveti" \
       name="mcp/mcpgateway" \
       version="0.1.0" \

Containerfile.lite

@@ -24,12 +24,12 @@ ARG PYTHON_VERSION=3.11            # Python major.minor series to track
 ###########################
 # Base image for copying into scratch
 ###########################
-FROM registry.access.redhat.com/ubi9/ubi-micro:9.6-1747318857 AS base
+FROM registry.access.redhat.com/ubi9/ubi-micro:9.6-1749632992 AS base
 
 ###########################
 # Builder stage
 ###########################
-FROM registry.access.redhat.com/ubi9/ubi:9.6-1747219013 AS builder
+FROM registry.access.redhat.com/ubi9/ubi:9.6-1749542372 AS builder
 SHELL ["/bin/bash", "-c"]
 
 ARG PYTHON_VERSION

Makefile

@@ -125,6 +125,7 @@ check-env:
 # help: serve-ssl            - Run Gunicorn behind HTTPS on :4444 (uses ./certs)
 # help: dev                  - Run fast-reload dev server (uvicorn)
 # help: run                  - Execute helper script ./run.sh
+# help: smoketest            - Run smoketest.py --verbose (build container, add MCP server, test endpoints)
 # help: test                 - Run unit tests with pytest
 # help: test-curl            - Smoke-test API endpoints with curl script
 # help: pytest-examples      - Run README / examples through pytest-examples
@@ -159,6 +160,11 @@ certs:                           ## Generate ./certs/cert.pem & ./certs/key.pem
 	chmod 640 certs/key.pem
 
 ## --- Testing -----------------------------------------------------------------
+smoketest:
+	@echo "🚀 Running smoketest…"
+	@./smoketest.py --verbose || { echo "❌ Smoketest failed!"; exit 1; }
+	@echo "✅ Smoketest passed!"
+
 test:
 	@echo "🧪 Running tests..."
 	@test -d "$(VENV_DIR)" || make venv
@@ -774,33 +780,46 @@ containerfile-update:
 # help: verify               - Build + twine + check-manifest + pyroma (no upload)
 # help: publish              - Verify, then upload to PyPI (needs TWINE_* creds)
 # =============================================================================
-.PHONY: dist wheel sdist verify publish
-
-dist: clean                ## Build wheel + sdist
-	python3 -m build
-	@echo "🛠  Wheel & sdist written to ./dist"
-
-wheel:                     ## Build wheel only
-	python3 -m build -w
-	@echo "🛠  Wheel written to ./dist"
-
-sdist:                     ## Build source distribution only
-	python3 -m build -s
-	@echo "🛠  Source distribution written to ./dist"
+.PHONY: dist wheel sdist verify publish publish-testpypi
+
+dist: clean                  ## Build wheel + sdist into ./dist
+	@test -d "$(VENV_DIR)" || $(MAKE) --no-print-directory venv
+	@/bin/bash -eu -c "\
+	    source $(VENV_DIR)/bin/activate && \
+	    python3 -m pip install --quiet --upgrade pip build && \
+	    python3 -m build"
+	@echo '🛠  Wheel & sdist written to ./dist'
+
+wheel:                       ## Build wheel only
+	@test -d "$(VENV_DIR)" || $(MAKE) --no-print-directory venv
+	@/bin/bash -eu -c "\
+	    source $(VENV_DIR)/bin/activate && \
+	    python3 -m pip install --quiet --upgrade pip build && \
+	    python3 -m build -w"
+	@echo '🛠  Wheel written to ./dist'
+
+sdist:                       ## Build source distribution only
+	@test -d "$(VENV_DIR)" || $(MAKE) --no-print-directory venv
+	@/bin/bash -eu -c "\
+	    source $(VENV_DIR)/bin/activate && \
+	    python3 -m pip install --quiet --upgrade pip build && \
+	    python3 -m build -s"
+	@echo '🛠  Source distribution written to ./dist'
 
 verify: dist               ## Build, run metadata & manifest checks
-	twine check dist/*                 # metadata sanity
-	check-manifest                     # sdist completeness
-	pyroma -d .                        # metadata quality score
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && \
+	twine check dist/* && \
+	check-manifest && \
+	pyroma -d ."
 	@echo "✅  Package verified – ready to publish."
 
 publish: verify            ## Verify, then upload to PyPI
-	twine upload dist/*               # creds via env vars or ~/.pypirc
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && twine upload dist/*"
 	@echo "🚀  Upload finished – check https://pypi.org/project/$(PROJECT_NAME)/"
 
-publish-testpypi: verify            ## Verify, then upload to TestPyPI
-	twine upload --repository testpypi dist/*  # creds via env vars or ~/.pypirc
-	@echo "🚀  Upload finished – check https://pypi.org/project/$(PROJECT_NAME)/"
+publish-testpypi: verify   ## Verify, then upload to TestPyPI
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && twine upload --repository testpypi dist/*"
+	@echo "🚀  Upload finished – check https://test.pypi.org/project/$(PROJECT_NAME)/"
 
 # =============================================================================
 # 🦭 PODMAN CONTAINER BUILD & RUN
@@ -1620,7 +1639,7 @@ local-pypi-debug:
 # help: devpi-clean          - Full cycle: build → upload → install locally
 # help: devpi-status         - Show devpi server status
 # help: devpi-web            - Open devpi web interface
-# help: devpi-delete         - Delete mcpgateway==<ver> from devpi index
+# help: devpi-delete         - Delete mcp-contextforge-gateway==<ver> from devpi index
 
 
 .PHONY: devpi-install devpi-init devpi-start devpi-stop devpi-setup-user devpi-upload \
@@ -1738,21 +1757,21 @@ devpi-upload: dist devpi-setup-user		## Build wheel/sdist, then upload
 	@echo "🌐  Browse packages: $(DEVPI_URL)/$(DEVPI_INDEX)"
 
 devpi-test:
-	@echo "📥  Installing package from devpi..."
+	@echo "📥  Installing package mcp-contextforge-gateway from devpi..."
 	@if ! curl -s $(DEVPI_URL) >/dev/null 2>&1; then \
 		echo "❌  DevPi server not running. Run 'make devpi-start' first."; \
 		exit 1; \
 	fi
 	@/bin/bash -c "source $(VENV_DIR)/bin/activate && \
 	pip install --index-url $(DEVPI_URL)/$(DEVPI_INDEX)/+simple/ \
 	            --extra-index-url https://pypi.org/simple/ \
-	            --force-reinstall $(PROJECT_NAME)"
-	@echo "✅  Installed $(PROJECT_NAME) from devpi"
+	            --force-reinstall mcp-contextforge-gateway"
+	@echo "✅  Installed mcp-contextforge-gateway from devpi"
 
 devpi-clean: clean dist devpi-upload devpi-test
 	@echo "🎉  Full devpi cycle complete!"
 	@echo "📊  Package info:"
-	@/bin/bash -c "source $(VENV_DIR)/bin/activate && pip show $(PROJECT_NAME)"
+	@/bin/bash -c "source $(VENV_DIR)/bin/activate && pip show mcp-contextforge-gateway"
 
 devpi-status:
 	@echo "🔍  DevPi server status:"
@@ -1848,11 +1867,11 @@ VER ?= $(shell python -c "import tomllib, pathlib; \
 print(tomllib.loads(pathlib.Path('pyproject.toml').read_text())['project']['version'])" \
 2>/dev/null || echo 0.0.0)
 
-devpi-delete: devpi-setup-user                 ## Delete mcpgateway==$(VER) from index
-	@echo "🗑️   Removing mcpgateway==$(VER) from $(DEVPI_INDEX)…"
+devpi-delete: devpi-setup-user                 ## Delete mcp-contextforge-gateway==$(VER) from index
+	@echo "🗑️   Removing mcp-contextforge-gateway==$(VER) from $(DEVPI_INDEX)…"
 	@/bin/bash -c "source $(VENV_DIR)/bin/activate && \
 		devpi use $(DEVPI_INDEX) && \
-		devpi remove -y mcpgateway==$(VER) || true"
+		devpi remove -y mcp-contextforge-gateway==$(VER) || true"
 	@echo "✅  Delete complete (if it existed)"
 
 

mcpgateway/cli.py

@@ -41,6 +41,8 @@
 
 import uvicorn
 
+from mcpgateway import __version__
+
 # ---------------------------------------------------------------------------
 # Configuration defaults (overridable via environment variables)
 # ---------------------------------------------------------------------------
@@ -105,6 +107,11 @@ def _insert_defaults(raw_args: List[str]) -> List[str]:
 def main() -> None:  # noqa: D401 – imperative mood is fine here
     """Entry point for the *mcpgateway* console script (delegates to Uvicorn)."""
 
+    # Check for version flag
+    if "--version" in sys.argv or "-V" in sys.argv:
+        print(f"mcpgateway {__version__}")
+        return
+
     # Discard the program name and inspect the rest.
     user_args = sys.argv[1:]
     uvicorn_argv = _insert_defaults(user_args)

mcpgateway/wrapper.py

@@ -94,7 +94,7 @@ def _extract_base_url(url: str) -> str:
         raise ValueError(f"Invalid URL provided: {url}")
 
     if "/servers/" in url:
-        before_servers = parsed.path.split('/servers')[0]
+        before_servers = parsed.path.split("/servers")[0]
         return f"{parsed.scheme}://{parsed.netloc}{before_servers}"
 
     return f"{url}"