change to docker

.gitattributes

@@ -1,35 +0,0 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text
-scale-hf-logo.png filter=lfs diff=lfs merge=lfs -text

.pre-commit-config.yaml

@@ -1,53 +0,0 @@
-# Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-default_language_version:
-  python: python3
-
-ci:
-  autofix_prs: true
-  autoupdate_commit_msg: '[pre-commit.ci] pre-commit suggestions'
-  autoupdate_schedule: quarterly
-
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
-    hooks:
-      - id: check-yaml
-      - id: check-case-conflict
-      - id: detect-private-key
-      - id: check-added-large-files
-        args: ['--maxkb=1000']
-      - id: requirements-txt-fixer
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: Format imports
-
-  - repo: https://github.com/psf/black
-    rev: 22.12.0
-    hooks:
-      - id: black
-        name: Format code
-        additional_dependencies: ['click==8.0.2']
-
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    # Ruff version.
-    rev: 'v0.0.267'
-    hooks:
-      - id: ruff

Dockerfile

@@ -0,0 +1,31 @@
+# Start from a base Python image
+FROM python:3.12-slim
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy your setup script and application files
+COPY setup.sh .
+COPY requirements.txt .
+COPY app.py .
+COPY src/ ./src/
+
+# Make setup.sh executable and run it
+# This is where MiniZinc will be installed
+RUN chmod +x setup.sh && ./setup.sh
+
+# Install Python dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# The MiniZinc installation in setup.sh exports PATH,
+# but that only applies to the RUN layer.
+# We need to ensure the PATH is set for the runtime environment of the app.
+ENV MZN_DIR=/opt/minizinc
+ENV PATH="${MZN_DIR}/bin:${PATH}"
+# If MiniZinc has shared libraries in MZN_DIR/lib that are needed at runtime:
+ENV LD_LIBRARY_PATH="${MZN_DIR}/lib:${LD_LIBRARY_PATH}"
+
+# Expose the port Gradio runs on (default is 7860)
+EXPOSE 7860
+
+CMD ["python", "app.py"]

Makefile

@@ -1,13 +0,0 @@
-.PHONY: style format
-
-
-style:
-	python -m black --line-length 119 .
-	python -m isort .
-	ruff check --fix .
-
-
-quality:
-	python -m black --check --line-length 119 .
-	python -m isort --check-only .
-	ruff check .

README.md

@@ -3,9 +3,9 @@ title: CP Bench Competition
 emoji: 🥇
 colorFrom: green
 colorTo: indigo
-sdk: gradio
-sdk_version: 5.30.0
-python_version: 3.12
+sdk: docker
+#sdk_version: 5.30.0
+#python_version: 3.12
 app_file: app.py
 pinned: true
 license: apache-2.0

app.py

@@ -1,48 +1,22 @@
 from src.ui import create_ui
-
 import os
 import subprocess
-import urllib.request
-import tarfile
-
-def install_minizinc():
-    install_path = "/home/user/minizinc"
-    if os.path.exists(os.path.join(install_path, "bin", "minizinc")):
-        print("✅ MiniZinc already installed.")
-        return
-
-    print("⬇️ Downloading MiniZinc...")
-    url = "https://github.com/MiniZinc/MiniZincIDE/releases/download/2.9.0/MiniZincIDE-2.9.0-bundle-linux-x86_64.tgz"
-    bundle_path = "/tmp/minizinc.tgz"
-
-    urllib.request.urlretrieve(url, bundle_path)
-
-    print("📦 Extracting MiniZinc...")
-    os.makedirs(install_path, exist_ok=True)
-    with tarfile.open(bundle_path, "r:gz") as tar:
-        tar.extractall(path=install_path, members=_strip_top_level(tar))
 
-    print("✅ MiniZinc installed.")
-
-def _strip_top_level(tar):
-    # Removes top-level folder when extracting
-    top_level = tar.getmembers()[0].name.split('/')[0]
-    for member in tar.getmembers():
-        member.path = '/'.join(member.path.split('/')[1:])
-        yield member
+try:
+    version = subprocess.check_output(["minizinc", "--version"], text=True, stderr=subprocess.STDOUT)
+    print(f"🧠 MiniZinc version (from Docker env): {version.strip()}")
 
-# Install and patch env
-install_minizinc()
-os.environ["PATH"] = f"/home/user/minizinc/bin:{os.environ['PATH']}"
+    # Optional: Check for solvers to confirm full setup
+    solvers = subprocess.check_output(["minizinc", "--solvers"], text=True, stderr=subprocess.STDOUT)
+    print(f"💡 MiniZinc solvers (from Docker env):\n{solvers.strip()}")
 
-# Check it works
-try:
-    version = subprocess.check_output(["minizinc", "--version"], text=True)
-    print("🧠 MiniZinc version:", version.strip())
+except FileNotFoundError:
+    print("❌ MiniZinc command not found. Check PATH in Dockerfile and setup.sh.")
+except subprocess.CalledProcessError as e:
+    print(f"❌ MiniZinc command failed. Output: {e.output}")
 except Exception as e:
-    print("❌ MiniZinc install failed:", e)
-
+    print(f"❌ Error checking MiniZinc: {e}")
 
 if __name__ == "__main__":
     demo = create_ui()
-    demo.queue().launch()
+    demo.queue().launch() # HF Spaces usually uses port 7860 by default

pyproject.toml

@@ -1,13 +0,0 @@
-[tool.ruff]
-# Enable pycodestyle (`E`) and Pyflakes (`F`) codes by default.
-select = ["E", "F"]
-ignore = ["E501"] # line too long (black is taking care of this)
-line-length = 119
-fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
-
-[tool.isort]
-profile = "black"
-line_length = 119
-
-[tool.black]
-line-length = 119

setup.sh

@@ -4,18 +4,22 @@
 set -e
 
 # Define version and paths
-VERSION=2.9.3
-MZN_DIR=/home/user/minizinc
+VERSION=2.9.3 # Or make this an ARG in Dockerfile if you want to change it easily
+MZN_DIR=/opt/minizinc # This path is used in the Dockerfile ENV
 
-# Download and extract MiniZinc
-wget https://github.com/MiniZinc/MiniZincIDE/releases/download/${VERSION}/MiniZincIDE-${VERSION}-bundle-linux-x86_64.tgz
 mkdir -p $MZN_DIR
-tar -xzf MiniZincIDE-${VERSION}-bundle-linux-x86_64.tgz -C $MZN_DIR --strip-components=1
-rm MiniZincIDE-${VERSION}-bundle-linux-x86_64.tgz
 
-# Export path for the runtime
-echo "export PATH=$MZN_DIR/bin:\$PATH" >> ~/.bashrc
-echo "export PATH=$MZN_DIR/bin:\$PATH" >> ~/.profile
-export PATH=$MZN_DIR/bin:$PATH
+echo "Downloading MiniZinc ${VERSION}..."
+wget -q https://github.com/MiniZinc/MiniZincIDE/releases/download/${VERSION}/MiniZincIDE-${VERSION}-bundle-linux-x86_64.tgz -O MiniZincIDE.tgz
 
-echo "✅ setup.sh finished running" > setup_log.txt
+echo "Extracting MiniZinc to ${MZN_DIR}..."
+tar -xzf MiniZincIDE.tgz -C $MZN_DIR --strip-components=1
+
+echo "Cleaning up downloaded archive..."
+rm MiniZincIDE.tgz
+
+# Ensure binaries are executable (good practice)
+chmod -R +x ${MZN_DIR}/bin || true # Allow to fail if no bin dir yet, though it should exist.
+chmod -R +x ${MZN_DIR}/share/minizinc/solvers || true # Some solvers might be scripts
+
+echo "✅ setup.sh finished installing MiniZinc to ${MZN_DIR}" > setup_log.txt