-
Notifications
You must be signed in to change notification settings - Fork 1.4k
wip, checkpoint #156
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
elasticdotventures
wants to merge
9
commits into
ahujasid:main
Choose a base branch
from
elasticdotventures:refactor/project-layout
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
wip, checkpoint #156
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
477091e
wip, checkpoint
elasticdotventures 5c9b26c
Update .github/workflows/docker-build.yml
elasticdotventures ecb4177
Update README.Docker.md
elasticdotventures 02f792d
feat: Add Docker support and GitHub Actions CI/CD
elasticdotventures 57562e7
feat: langchain
elasticdotventures 1491808
fix: Add Dockerfile.vllm with missing DeepSeek-OCR dependencies
elasticdotventures 441e288
feat: Pivot to LLaVA model for vLLM compatibility
elasticdotventures 8c43d53
feat: sync addon version metadata
elasticdotventures 90e021e
Merge branch 'ahujasid:main' into refactor/project-layout
elasticdotventures File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # Git files | ||
| .git | ||
| .gitignore | ||
| .github | ||
|
|
||
| # Python cache | ||
| __pycache__ | ||
| *.pyc | ||
| *.pyo | ||
| *.pyd | ||
| .Python | ||
| *.so | ||
| *.egg | ||
| *.egg-info | ||
| dist | ||
| build | ||
| .eggs | ||
|
|
||
| # IDE | ||
| .vscode | ||
| .idea | ||
| *.swp | ||
| *.swo | ||
| *~ | ||
|
|
||
| # OS | ||
| .DS_Store | ||
| Thumbs.db | ||
|
|
||
| # Documentation | ||
| README.md | ||
| *.md | ||
| assets/ | ||
|
|
||
| # Development | ||
| .env | ||
| .env.local | ||
| venv/ | ||
| env/ | ||
| ENV/ | ||
|
|
||
| # UV cache | ||
| .uv/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| name: Build and Push Docker Image | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| - master | ||
| tags: | ||
| - 'v*' | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| - master | ||
| workflow_dispatch: | ||
|
|
||
| env: | ||
| REGISTRY: ghcr.io | ||
| IMAGE_NAME: ${{ github.repository }} | ||
|
|
||
| jobs: | ||
| build-and-push: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
|
|
||
| - name: Log in to Container Registry | ||
| if: github.event_name != 'pull_request' | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| registry: ${{ env.REGISTRY }} | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Extract metadata (tags, labels) | ||
| id: meta | ||
| uses: docker/metadata-action@v5 | ||
| with: | ||
| images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} | ||
| tags: | | ||
| type=ref,event=branch | ||
| type=ref,event=pr | ||
| type=semver,pattern={{version}} | ||
| type=semver,pattern={{major}}.{{minor}} | ||
| type=semver,pattern={{major}} | ||
| type=sha,prefix={{branch}}- | ||
| type=raw,value=latest,enable={{is_default_branch}} | ||
|
|
||
| - name: Build and push Docker image | ||
| id: build | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| push: ${{ github.event_name != 'pull_request' }} | ||
| tags: ${{ steps.meta.outputs.tags }} | ||
| labels: ${{ steps.meta.outputs.labels }} | ||
| cache-from: type=gha | ||
| cache-to: type=gha,mode=max | ||
| platforms: linux/amd64,linux/arm64 | ||
|
|
||
| - name: Generate artifact attestation | ||
| if: github.event_name != 'pull_request' | ||
| uses: actions/attest-build-provenance@v1 | ||
| with: | ||
| subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} | ||
| subject-digest: ${{ steps.build.outputs.digest }} | ||
| push-to-registry: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| repos: | ||
| - repo: local | ||
| hooks: | ||
| - id: sync-blender-version | ||
| name: sync-blender-version | ||
| entry: python3 scripts/sync_blender_version.py --write | ||
| language: system | ||
| pass_filenames: false | ||
| files: ^(pyproject\.toml|src/blender_mcp/__init__\.py|addon\.py)$ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # Dockerfile for blender-mcp MCP server | ||
| FROM python:3.11-slim | ||
|
|
||
| # Install UV package manager | ||
| RUN pip install uv | ||
|
|
||
| # Set working directory | ||
| WORKDIR /app | ||
|
|
||
| # Copy project files | ||
| COPY pyproject.toml uv.lock ./ | ||
| COPY src/ ./src/ | ||
| COPY main.py ./ | ||
|
|
||
| # Install dependencies | ||
| RUN uv pip install --system -e . | ||
|
|
||
| # Set environment variables | ||
| ENV BLENDER_HOST=host.docker.internal | ||
| ENV BLENDER_PORT=9876 | ||
|
|
||
| # Expose MCP server port (stdio-based, no port needed) | ||
| # The server communicates via stdin/stdout | ||
|
|
||
| # Run the MCP server via the console script to avoid double-import warnings | ||
| CMD ["blender-mcp"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| FROM vllm/vllm-openai:v0.8.5.post1 | ||
|
|
||
| # Install missing dependencies required by DeepSeek-OCR model | ||
| RUN pip install --no-cache-dir addict easydict matplotlib | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
Verify dependencies are truly required and add version pinning.
The comment states these packages are required by DeepSeek-OCR, but there's no evidence that they aren't already transitive dependencies of the vLLM base image or that they're not pinned elsewhere. Additionally, the pip packages lack explicit versions, which could lead to reproducibility issues or incompatibilities with future releases.
To verify that
addict,easydict, andmatplotlibare indeed required (and not already included in the base image), consider running:If these packages are confirmed to be required, apply version constraints to prevent future breakage:
Adjust version numbers based on compatibility testing.
🏁 Script executed:
Length of output: 2600
Remove unnecessary matplotlib dependency and add version pinning for required packages.
DeepSeek-OCR's official requirements specify
addictandeasydictas dependencies, which are correctly included. However,matplotlibis not documented in DeepSeek-OCR's requirements and does not appear in the codebase. Additionally, the packages lack explicit version constraints, risking compatibility issues.Suggested fix:
matplotlib(unnecessary)addictandeasydictto match tested configurations🤖 Prompt for AI Agents