Merge pull request #156 from OpenMOSS/dev

Update on UI; minor fixes

Author: dest1n1s

.DS_Store

@@ -0,0 +1,95 @@
+name: Docker
+
+# This workflow builds Docker images on push to main/dev branches
+# and publishes (pushes) them to GHCR on version tags.
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+    tags:
+      - "v*"
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    strategy:
+      matrix:
+        include:
+          - context: .
+            file: server/Dockerfile
+            image: ghcr.io/${{ github.repository }}-backend
+          - context: ui-ssr
+            file: ui-ssr/Dockerfile
+            image: ghcr.io/${{ github.repository }}-frontend
+
+    steps:
+      - name: Free Disk Space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          swap-storage: true
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: "true"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        # Only login if we are going to push
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ matrix.image }}
+          tags: |
+            # Tag with the exact git tag
+            type=ref,event=tag
+            # Extract version from tag (stripping 'v' prefix if present)
+            type=match,pattern=v(.*),group=1
+            # Standard semver (if valid)
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            # Branch and SHA
+            type=ref,event=branch
+            type=sha
+            # latest tag only for stable releases (no 'a', 'b', 'rc' etc. in the tag name)
+            type=raw,value=latest,enable=${{ github.ref_type == 'tag' && !contains(github.ref_name, 'a') && !contains(github.ref_name, 'b') && !contains(github.ref_name, 'rc') }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ matrix.context }}
+          file: ${{ matrix.file }}
+          # Only push on tags
+          push: ${{ startsWith(github.ref, 'refs/tags/v') }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/docker-publish.yml

@@ -196,8 +196,4 @@ pyrightconfig.json
 /analysis-results
 /analysis
 /results
-/graphs
-
-# uv
-# We ignore uv.lock as conflicting optional dependencies generates non-compatible uv.lock files.
-uv.lock
+/graphs

.gitignore

@@ -0,0 +1,40 @@
+services:
+  mongodb:
+    image: mongo:latest
+    restart: always
+    ports:
+      - "27017:27017"
+    volumes:
+      - mongodb_data:/data/db
+
+  backend:
+    build:
+      context: .
+      dockerfile: server/Dockerfile
+    restart: always
+    ports:
+      - "24577:24577"
+    environment:
+      - MONGO_URI=mongodb://mongodb:27017/
+      - MONGO_DB=mechinterp
+    depends_on:
+      - mongodb
+    # Mount volumes for models and SAEs if needed, or use environment variables to point to paths
+    # volumes:
+    #   - ./models:/models
+    #   - ./saes:/saes
+
+  frontend:
+    build:
+      context: ui-ssr
+      dockerfile: Dockerfile
+    restart: always
+    ports:
+      - "24576:24576"
+    environment:
+      - BACKEND_URL=http://backend:24577
+    depends_on:
+      - backend
+
+volumes:
+  mongodb_data:

docker-compose.yml

@@ -22,7 +22,8 @@ dependencies = [
     "jaxtyping>=0.2.34",
     "safetensors>=0.4.5",
     "pydantic>=2.10.6",
-    "argparse>=1.4.0",
+    "typer>=0.15.0",
+    "rich>=13.0.0",
     "pyyaml>=6.0.2",
     "tomlkit>=0.13.2",
     "torch==2.9.0",
@@ -63,7 +64,7 @@ email = "junxuanwang21@m.fudan.edu.cn"
 text = "MIT"
 
 [project.scripts]
-lm-saes = "lm_saes.entrypoint:entrypoint"
+lm-saes = "lm_saes.cli:entrypoint"
 
 [build-system]
 requires = ["uv_build>=0.9.6,<0.10.0"]
@@ -72,6 +73,7 @@ build-backend = "uv_build"
 [dependency-groups]
 dev = [
     "transformer-lens",
+    "argparse>=1.4.0",
     "jupyter>=1.1.1",
     "ipywidgets>=8.1.5",
     "pytest>=8.3.3",

pyproject.toml

@@ -0,0 +1,37 @@
+FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim
+
+WORKDIR /app
+
+# Enable bytecode compilation
+ENV UV_COMPILE_BYTECODE=1
+
+# Copy from the cache instead of linking since it's a mounted volume
+ENV UV_LINK_MODE=copy
+
+# Copy the project's dependency files and local dependencies
+COPY pyproject.toml uv.lock README.md ./
+COPY TransformerLens ./TransformerLens
+
+# Install the project's dependencies using the lockfile and settings
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked --no-dev --no-install-project
+
+# Copy the source code
+COPY src ./src
+COPY server ./server
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked --no-dev
+
+# Place executables in the environment at the front of the path
+ENV PATH="/app/.venv/bin:$PATH"
+
+# Reset the entrypoint, don't invoke `uv`
+ENTRYPOINT []
+
+# Expose the port
+EXPOSE 24577
+
+# Run the application
+CMD ["uvicorn", "server.app:app", "--host", "0.0.0.0", "--port", "24577"]
+