feat: integrate with new SDK

.devcontainer/build_server.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd server && cargo build --release
+cp target/release/server ../reconstruction

.devcontainer/devcontainer.json

@@ -2,7 +2,11 @@
     "name": "Reconstruction Server Devcontainer",
     "remoteUser": "reconstruction-server",
     "build": {
-        "dockerfile": "../docker/Dockerfile.dev"
+        "dockerfile": "../docker/Dockerfile",
+        "context": "../",
+        "args": {
+            "IS_DEVELOPMENT": "true"
+        }
     },
     "workspaceFolder": "/app",
     "workspaceMount": "source=${localWorkspaceFolder},target=/app,type=bind",
@@ -11,7 +15,8 @@
             "extensions":[
                 "golang.Go",
                 "ms-python.python",
-                "ms-python.debugpy"
+                "ms-python.debugpy",
+                "rust-lang.rust-analyzer"
             ]
         }
     },
@@ -32,5 +37,5 @@
         // Uncomment if you want display forward
         // "source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind,consistency=cached"
     ],
-    "postCreateCommand": "chown -R reconstruction-server:reconstruction-server /app && .devcontainer/build_golang_server.sh"
+    "postCreateCommand": "sudo .devcontainer/build_server.sh && sudo chown -R reconstruction-server:reconstruction-server /app"
 }

.dockerignore

@@ -0,0 +1,9 @@
+target/
+.git/
+.gitignore
+.env
+*.log
+.DS_Store
+README.md
+Dockerfile
+.dockerignore 

.github/workflows/docker-build.yml

@@ -0,0 +1,55 @@
+name: Build Docker Image
+
+on:
+  push:
+    branches:
+      - feature/sdk-integration
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: [self-hosted, Linux] 
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # - name: Free up space
+      #   run: |
+      #     sudo sudo rm -rf /usr/share/dotnet  # ~20GB
+      #     sudo rm -rf /opt/ghc           # ~4GB
+      #     sudo rm -rf /usr/local/lib/android  # ~10GB
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.GLOBAL_COMMON_AWS_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.GLOBAL_COMMON_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.GLOBAL_COMMON_AWS_REGION }}
+
+      - name: Log in to AWS ECR
+        id: ecr-login
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ steps.ecr-login.outputs.registry }}/reconstruction-server
+          tags: |
+            type=ref,event=branch
+            type=sha,prefix=,format=long
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: docker/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.gitignore

@@ -8,5 +8,7 @@ reconstruction
 .venv
 /venv
 /.idea
+target
+volume
 /src/cost_functions.cpython-38-x86_64-linux-gnu.so
 /src/ply_export.cpython-38-x86_64-linux-gnu.so

docker/Dockerfile

@@ -1,17 +1,23 @@
+ARG IS_DEVELOPMENT="false"
+
 ##
-## Go build for server
+## Rust build for server
 ##
-FROM --platform=$BUILDPLATFORM golang:1.21 AS go-build
-RUN mkdir -p /app
-WORKDIR /app
-ADD server /app
-ARG TARGETOS
-ARG TARGETARCH
-ARG VERSION
-RUN CGO_ENABLED=0 GOOS="${TARGETOS}" GOARCH="${TARGETARCH}" go build
+FROM rust:1.84-slim-bullseye AS rust-build
 
+RUN apt-get update && apt-get install -y \
+    git \
+    && rm -rf /var/lib/apt/lists/*
 
-FROM nvidia/cuda:11.0.3-base-ubuntu20.04
+WORKDIR /app
+RUN mkdir -p /app/server
+COPY server /app/server
+RUN cd server && cargo build --release
+
+##
+## Runtime image
+##
+FROM nvidia/cuda:11.0.3-base-ubuntu20.04 AS runtime
 
 ARG USERNAME=reconstruction-server
 ARG USER_UID=1000
@@ -159,15 +165,35 @@ RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && ldconfig
 
 # Run reconstruction server as separate user, not root
 RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    && chown -R $USERNAME:$USERNAME /app
 
 RUN mkdir -p /app/jobs && chown -R reconstruction-server:reconstruction-server /app/jobs
+RUN mkdir -p /app/volume && chown -R reconstruction-server:reconstruction-server /app/volume
+# Dev container: Copy rust tools so we can compile inside the dev container
+FROM runtime AS reconstruction_dev
+
+# Sudo enabled in dev container only
+RUN apt-get install -y sudo \
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME
+
+COPY --from=rust-build /usr/local/rustup /usr/local/rustup
+COPY --from=rust-build /usr/local/cargo /usr/local/cargo
+ENV PATH="/usr/local/cargo/bin:$PATH"
+ENV RUSTUP_HOME="/usr/local/rustup"
+ENV CARGO_HOME="/usr/local/cargo"
 
+# Standalone image: Use the compiled server binary
+FROM runtime AS reconstruction
+COPY --from=rust-build /app/server/target/release/server /app/reconstruction
+RUN chmod +x /app/server
+
+# Final stage: Select between dev and prod
+FROM reconstruction${IS_DEVELOPMENT:+_dev} AS final
+
+WORKDIR /app
 USER $USERNAME
+ENTRYPOINT ["/app/reconstruction"]
 
-COPY --from=go-build /app/reconstruction ./reconstruction
-ENTRYPOINT ["./reconstruction"]
 
-# Overridable using 'docker run ... image_name -api-key <your-api-key>'
-# TODO: we probably don't need api key, or make it optional. Just check domain token.
-CMD ["-api-key", "kaffekopp123"]

main.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 import argparse
-
+import sys
 from local_main import main as local_main
 from global_main import main as global_main
 from occlusion_box import main as occlusion_box_main
@@ -116,21 +116,6 @@ def local_and_global_main_wrapper(args, logger):
     #occlusion_box_wrapper(ply_output_path, global_out_folder / "occlusion", logger)
 
 
-def get_available_scans(datasets_path):
-    """Get list of available scans in the datasets directory.
-
-    Args:
-        datasets_path: Path to datasets directory
-
-    Returns:
-        List of scan names
-    """
-    return [
-        scan.name for scan in datasets_path.iterdir()
-        if scan.is_dir() or scan.suffix == ".zip"
-    ]
-
-
 def process_refinement(args, logger):
     """Process refinement based on specified mode.
 
@@ -182,15 +167,11 @@ def main(args):
         level=args.log_level
     )
 
-    # TODO: ignoring the scans parameter from go for now since it's incorrect (fix after redeploy)
-    # Get available scans from datasets directory
-    args.scans = get_available_scans(args.job_root_path / "datasets")
-
     try:
         process_refinement(args, logger)
     except Exception as e:
         handle_refinement_error(e, args, logger)
-        raise e
+        raise sys.exit(1)
 
 
 def parse_args():
@@ -204,7 +185,7 @@ def parse_args():
         help="Set the logging level (default: INFO)"
     )
 
-    parser.add_argument("--scans", nargs="+", default=[], help="List of scans to process")
+    parser.add_argument("--scans", nargs="+", help="List of scans to process")
     return parser.parse_args()