Compare commits

...
Sign in to create a new pull request.

12 commits

Author SHA1 Message Date
Daniel Chalef
1a6b49998b Fix error handling bug in PyPI version fetch
The previous error handling was broken due to set -e causing
immediate exit, making the $? check unreachable.

Changes:
- Use set -eo pipefail for proper pipeline error handling
- Check command success with if ! command; then pattern
- Separate check for empty version string
- Both checks now properly reachable and functional

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-30 23:40:07 -07:00
Daniel Chalef
a994d4dbe7 conductor-checkpoint-msg_01KgG6FyiqNNdc51BCehNBjm 2025-10-30 23:39:39 -07:00
Daniel Chalef
75ca28acab Address code review findings - fix critical checkout ref bug
Fix all critical and high-priority issues from code review:

1. Fix checkout ref logic (CRITICAL)
   - Simplified to: ref: ${{ inputs.tag || github.ref }}
   - Works correctly for both workflow_dispatch and push events
   - Removes conditional logic that would fail for manual triggers

2. Consolidate tag validation
   - Remove duplicate validation logic
   - Single validation path for both trigger types
   - Clearer error messages with received value

3. Add PyPI error handling
   - Use curl -sf for proper error codes
   - Validate GRAPHITI_VERSION is not empty
   - Exit with clear error if PyPI fetch fails

4. Improve docker-compose comments
   - Add concrete version tag examples
   - Show users how to pin specific versions
   - Clarify when local build vs registry pull is used

5. Update workflow_dispatch description
   - Clarify tag must already exist in repo
   - Prevent user confusion about tag creation

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-30 23:37:01 -07:00
Daniel Chalef
ad24fa0618 conductor-checkpoint-msg_01T2zdZLAZpVSip6EaiYa66k 2025-10-30 23:33:56 -07:00
Daniel Chalef
b455b8caee conductor-checkpoint-msg_01H4GqBSkLiPgUfHGD57nq5V 2025-10-30 23:28:52 -07:00
Daniel Chalef
bd57ef59ce Fix critical issues in MCP release workflow
Address all critical review comments:

1. Fix malformed Docker tags
   - Change tag suffixes from colons to hyphens
   - standalone: 1.0.0-standalone (not 1.0.0:standalone)
   - combined: 1.0.0 and latest (not :latest)

2. Add checkout ref for manual triggers
   - Use inputs.tag for workflow_dispatch events
   - Ensures manual builds use correct tag ref

3. Add tag input validation
   - Validate tag format (mcp-vX.Y.Z) before processing
   - Provide clear error messages for invalid input

4. Fix release summary overwriting
   - Both matrix jobs now append to summary correctly
   - Each variant creates distinct summary section

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-30 23:28:06 -07:00
Daniel Chalef
3726498cf8 conductor-checkpoint-msg_01TA4DYecHTJ36ndBsU9ooyf 2025-10-30 23:25:15 -07:00
Daniel Chalef
6503e60122 conductor-checkpoint-msg_01BFgirbgmehsEGCMWjgSsnv 2025-10-30 23:19:05 -07:00
Daniel Chalef
999177a0c4 conductor-checkpoint-msg_013iKczSUmjtzPEdcgciXJUd 2025-10-30 23:17:55 -07:00
Daniel Chalef
ad98568319 conductor-checkpoint-msg_01NvLs9EFt8qNiQqtYY8V9WV 2025-10-30 23:15:01 -07:00
Daniel Chalef
5bc6cb450c conductor-checkpoint-msg_0121yRVkMGS2UzMazKiZkgi4 2025-10-30 23:10:21 -07:00
Daniel Chalef
86119ea0a0 conductor-checkpoint-start 2025-10-30 23:09:37 -07:00
4 changed files with 74 additions and 21 deletions

View file

@ -3,6 +3,12 @@ name: Release MCP Server
on: on:
push: push:
tags: ["mcp-v*.*.*"] tags: ["mcp-v*.*.*"]
workflow_dispatch:
inputs:
tag:
description: 'Existing tag to release (e.g., mcp-v1.0.0) - tag must exist in repo'
required: true
type: string
env: env:
REGISTRY: docker.io REGISTRY: docker.io
@ -16,9 +22,26 @@ jobs:
id-token: write id-token: write
environment: environment:
name: release name: release
strategy:
matrix:
variant:
- name: standalone
dockerfile: docker/Dockerfile.standalone
image_suffix: "-standalone"
tag_latest: "standalone"
title: "Graphiti MCP Server (Standalone)"
description: "Standalone Graphiti MCP server for external Neo4j or FalkorDB"
- name: combined
dockerfile: docker/Dockerfile
image_suffix: ""
tag_latest: "latest"
title: "FalkorDB + Graphiti MCP Server"
description: "Combined FalkorDB graph database with Graphiti MCP server"
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
ref: ${{ inputs.tag || github.ref }}
- name: Set up Python 3.11 - name: Set up Python 3.11
uses: actions/setup-python@v5 uses: actions/setup-python@v5
@ -28,17 +51,26 @@ jobs:
- name: Extract and validate version - name: Extract and validate version
id: version id: version
run: | run: |
# Extract tag from either push event or manual workflow_dispatch input
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
TAG_FULL="${{ inputs.tag }}"
TAG_VERSION=${TAG_FULL#mcp-v}
else
TAG_VERSION=${GITHUB_REF#refs/tags/mcp-v} TAG_VERSION=${GITHUB_REF#refs/tags/mcp-v}
fi
# Validate semantic versioning format
if ! [[ $TAG_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then if ! [[ $TAG_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "Tag must follow semantic versioning: mcp-vX.Y.Z" echo "Error: Tag must follow semantic versioning: mcp-vX.Y.Z (e.g., mcp-v1.0.0)"
echo "Received: mcp-v$TAG_VERSION"
exit 1 exit 1
fi fi
# Validate against pyproject.toml version
PROJECT_VERSION=$(python -c "import tomllib; print(tomllib.load(open('mcp_server/pyproject.toml', 'rb'))['project']['version'])") PROJECT_VERSION=$(python -c "import tomllib; print(tomllib.load(open('mcp_server/pyproject.toml', 'rb'))['project']['version'])")
if [ "$TAG_VERSION" != "$PROJECT_VERSION" ]; then if [ "$TAG_VERSION" != "$PROJECT_VERSION" ]; then
echo "Tag version mcp-v$TAG_VERSION does not match mcp_server/pyproject.toml version $PROJECT_VERSION" echo "Error: Tag version mcp-v$TAG_VERSION does not match mcp_server/pyproject.toml version $PROJECT_VERSION"
exit 1 exit 1
fi fi
@ -57,8 +89,19 @@ jobs:
- name: Get latest graphiti-core version from PyPI - name: Get latest graphiti-core version from PyPI
id: graphiti id: graphiti
run: | run: |
# Query PyPI for the latest graphiti-core version # Query PyPI for the latest graphiti-core version with error handling
GRAPHITI_VERSION=$(curl -s https://pypi.org/pypi/graphiti-core/json | python -c "import sys, json; print(json.load(sys.stdin)['info']['version'])") set -eo pipefail
if ! GRAPHITI_VERSION=$(curl -sf https://pypi.org/pypi/graphiti-core/json | python -c "import sys, json; data=json.load(sys.stdin); print(data['info']['version'])"); then
echo "Error: Failed to fetch graphiti-core version from PyPI"
exit 1
fi
if [ -z "$GRAPHITI_VERSION" ]; then
echo "Error: Empty version returned from PyPI"
exit 1
fi
echo "graphiti_version=${GRAPHITI_VERSION}" >> $GITHUB_OUTPUT echo "graphiti_version=${GRAPHITI_VERSION}" >> $GITHUB_OUTPUT
echo "Latest Graphiti Core version from PyPI: ${GRAPHITI_VERSION}" echo "Latest Graphiti Core version from PyPI: ${GRAPHITI_VERSION}"
@ -74,21 +117,22 @@ jobs:
with: with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: | tags: |
type=raw,value=${{ steps.version.outputs.version }} type=raw,value=${{ steps.version.outputs.version }}${{ matrix.variant.image_suffix }}
type=raw,value=${{ steps.version.outputs.version }}-graphiti-${{ steps.graphiti.outputs.graphiti_version }} type=raw,value=${{ steps.version.outputs.version }}-graphiti-${{ steps.graphiti.outputs.graphiti_version }}${{ matrix.variant.image_suffix }}
type=raw,value=latest type=raw,value=${{ matrix.variant.tag_latest }}
labels: | labels: |
org.opencontainers.image.title=Graphiti MCP Server org.opencontainers.image.title=${{ matrix.variant.title }}
org.opencontainers.image.description=MCP server for Graphiti knowledge graph org.opencontainers.image.description=${{ matrix.variant.description }}
org.opencontainers.image.version=${{ steps.version.outputs.version }} org.opencontainers.image.version=${{ steps.version.outputs.version }}
org.opencontainers.image.vendor=Zep AI org.opencontainers.image.vendor=Zep AI
graphiti.core.version=${{ steps.graphiti.outputs.graphiti_version }} graphiti.core.version=${{ steps.graphiti.outputs.graphiti_version }}
- name: Build and push Docker image - name: Build and push Docker image (${{ matrix.variant.name }})
uses: depot/build-push-action@v1 uses: depot/build-push-action@v1
with: with:
project: v9jv1mlpwc project: v9jv1mlpwc
context: ./mcp_server context: ./mcp_server
file: ./mcp_server/${{ matrix.variant.dockerfile }}
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
push: true push: true
tags: ${{ steps.docker_meta.outputs.tags }} tags: ${{ steps.docker_meta.outputs.tags }}
@ -101,11 +145,14 @@ jobs:
- name: Create release summary - name: Create release summary
run: | run: |
echo "## MCP Server Release Summary" >> $GITHUB_STEP_SUMMARY {
echo "" >> $GITHUB_STEP_SUMMARY echo "## MCP Server Release Summary - ${{ matrix.variant.title }}"
echo "**MCP Server Version:** ${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY echo ""
echo "**Graphiti Core Version:** ${{ steps.graphiti.outputs.graphiti_version }}" >> $GITHUB_STEP_SUMMARY echo "**MCP Server Version:** ${{ steps.version.outputs.version }}"
echo "**Build Date:** ${{ steps.meta.outputs.build_date }}" >> $GITHUB_STEP_SUMMARY echo "**Graphiti Core Version:** ${{ steps.graphiti.outputs.graphiti_version }}"
echo "" >> $GITHUB_STEP_SUMMARY echo "**Build Date:** ${{ steps.meta.outputs.build_date }}"
echo "### Docker Image Tags" >> $GITHUB_STEP_SUMMARY echo ""
echo "${{ steps.docker_meta.outputs.tags }}" | tr ',' '\n' | sed 's/^/- /' >> $GITHUB_STEP_SUMMARY echo "### Docker Image Tags"
echo "${{ steps.docker_meta.outputs.tags }}" | tr ',' '\n' | sed 's/^/- /'
echo ""
} >> $GITHUB_STEP_SUMMARY

View file

@ -17,6 +17,9 @@ services:
graphiti-mcp: graphiti-mcp:
image: zepai/knowledge-graph-mcp:standalone image: zepai/knowledge-graph-mcp:standalone
# For specific versions, replace 'standalone' with a version tag:
# image: zepai/knowledge-graph-mcp:1.0.0-standalone
# When building locally, the build section below will be used.
build: build:
context: .. context: ..
dockerfile: docker/Dockerfile.standalone dockerfile: docker/Dockerfile.standalone

View file

@ -21,6 +21,9 @@ services:
graphiti-mcp: graphiti-mcp:
image: zepai/knowledge-graph-mcp:standalone image: zepai/knowledge-graph-mcp:standalone
# For specific versions, replace 'standalone' with a version tag:
# image: zepai/knowledge-graph-mcp:1.0.0-standalone
# When building locally, the build section below will be used.
build: build:
context: .. context: ..
dockerfile: docker/Dockerfile.standalone dockerfile: docker/Dockerfile.standalone

View file

@ -1,12 +1,12 @@
services: services:
graphiti-falkordb: graphiti-falkordb:
image: zepai/graphiti-falkordb:latest image: zepai/knowledge-graph-mcp:latest
build: build:
context: .. context: ..
dockerfile: docker/Dockerfile dockerfile: docker/Dockerfile
args: args:
GRAPHITI_CORE_VERSION: ${GRAPHITI_CORE_VERSION:-0.22.0} GRAPHITI_CORE_VERSION: ${GRAPHITI_CORE_VERSION:-0.22.0}
MCP_SERVER_VERSION: ${MCP_SERVER_VERSION:-1.0.0rc0} MCP_SERVER_VERSION: ${MCP_SERVER_VERSION:-1.0.0}
BUILD_DATE: ${BUILD_DATE:-} BUILD_DATE: ${BUILD_DATE:-}
VCS_REF: ${VCS_REF:-} VCS_REF: ${VCS_REF:-}
env_file: env_file: