fix: switch to custom docker image to get up-to-date texlive

Dockerfile

@@ -0,0 +1,94 @@
+# Custom docker image for AutomaTikZ, based on the default HF Spaces GPU image.
+# The default image installs a tex live version that is too old for our needs,
+# so we install the latest one oureselves. The modifications stay close to the
+# source image, so, should the official image be updated to a newer ubuntu
+# version, it could be changed back to a gradio space without much effort.
+
+## system setup
+# -----------------------------------------------------------------------------
+FROM docker.io/nvidia/cuda:11.7.1-cudnn8-devel-ubuntu22.04@sha256:69cd988555eabe116f76acc754b363eee75f37674c23adb2b523f5fa32543984
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y \
+  git \
+  make \
+  build-essential \
+  libssl-dev \
+  zlib1g-dev \
+  libbz2-dev \
+  libreadline-dev \
+  libsqlite3-dev \
+  wget \
+  curl \
+  llvm \
+  libncursesw5-dev \
+  xz-utils \
+  tk-dev \
+  libxml2-dev \
+  libxmlsec1-dev \
+  libffi-dev \
+  liblzma-dev \
+  ffmpeg \
+  libsm6 \
+  libxext6 \
+  cmake \
+  libgl1-mesa-glx \
+  sudo
+
+## setup user
+# -----------------------------------------------------------------------------
+RUN useradd -m -G users -u 1000 user
+
+ENV HOME=/home/user \
+  PATH=/home/user/.local/bin:$PATH
+
+WORKDIR $HOME/app
+
+## custom dependencies
+# -----------------------------------------------------------------------------
+
+# Install an up-to-date tex live version
+ENV PATH=/opt/texbin:$PATH
+
+RUN curl -LO https://github.com/scottkosty/install-tl-ubuntu/raw/master/install-tl-ubuntu \
+  && chmod +x ./install-tl-ubuntu \
+  && ./install-tl-ubuntu \
+  && rm ./install-tl-ubuntu
+
+RUN --mount=target=/root/packages.txt,source=packages.txt \
+  apt-get update \
+  && sed '/texlive*/d' /root/packages.txt \
+  | xargs -r apt-get install -y \
+  && rm -rf /var/lib/apt/lists/*
+
+# Install pyenv
+ENV PYENV_ROOT=/opt/pyenv
+ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
+
+RUN curl https://pyenv.run | bash \
+  && chown -R root:users $PYENV_ROOT \
+  && chmod -R g+w $PYENV_ROOT
+
+RUN pyenv install 3.10 \
+  && pyenv global 3.10 \
+  && pyenv rehash \
+  && pip install --no-cache-dir --upgrade pip==22.3.1 setuptools wheel \
+  && pip install --no-cache-dir datasets "huggingface-hub>=0.12.1" "protobuf<4" "click<8.1" "pydantic~=1.0"
+
+RUN --mount=target=requirements.txt,source=requirements.txt \
+  pip install --no-cache-dir -r requirements.txt
+
+RUN --mount=target=pre-requirements.txt,source=pre-requirements.txt \
+  pip install --no-cache-dir -r pre-requirements.txt
+
+RUN pip install --no-cache-dir gradio[oauth]==3.47.1 uvicorn>=0.14.0 spaces==0.16.1
+
+RUN chown -R user $HOME/app
+COPY --chown=user . $HOME/app
+
+## launch app
+# -----------------------------------------------------------------------------
+USER user
+
+CMD ["python", "app.py"]

README.md

@@ -3,9 +3,7 @@ title: AutomaTikZ
 emoji: 🏝️
 colorFrom: blue
 colorTo: indigo
-sdk: gradio
-sdk_version: 3.47.1
-app_file: app.py
+sdk: docker
 pinned: false
 license: apache-2.0
 suggested_hardware: a100-large

app.py

@@ -1,120 +1,23 @@
-from os import getenv, system
+from os import getenv
 from textwrap import dedent
 from torch import cuda
-from functools import partial
 
-from tempfile import NamedTemporaryFile
 import gradio as gr
-from automatikz.infer import TikzDocument
-import fitz
-#from src.automatikz.examples.webui.webui import get_banner
+from src.automatikz.examples.webui.webui import build_ui, get_banner
 
-tikz=r"""\documentclass[tikz,border=3mm]{standalone}
-\usepackage{pgfplots}
-\pgfplotsset{compat=1.16}
-\usepgfplotslibrary{colormaps}
-\tikzset{pics/2d-grid/.style 2 args={code={%
-   \pgfmathtruncatemacro{\mymax}{max(#1,#2)}
-   \draw[blue,thick] (0,0) grid[xstep=0.2,ystep=0.2] (\mymax,0.1);
-   \foreach \x in {0.1,0.3,...,\mymax}
-     \node[below,font=\sffamily] at (\x,0) {\pgfmathprintnumber{\x}};
-   \foreach \y in {0.1,0.2,...,\mymax}
-     \node[left,font=\sffamily] at (0.2,\y) {\pgfmathprintnumber{\y}};
-   \foreach \sh in {0.05,0.1,...,#1}
-     \foreach \ch in {0.05,0.1,...,#2}   
-     \path[blue,fill=blue!30] (\sh,\ch) rectangle (\sh+0.05,\ch+0.05);
-}}}
-\begin{document}
-\begin{tikzpicture}[scale=1.5]
- \begin{axis}[
-    view={35}{40},
-    grid=major,
-    colormap/violet,
-    zlabel=$x_1$,
-    ylabel=$x_2$,
-    xlabel=$x_3$,
-    zlabel at={(3.6,2.)},
-    ylabel at={(2.5,3.6)},
-    zlabel shift={(0pt, -12pt)},
-    set layers=standard,
-    axis on top,
-    legend style={font=\small,legend cell align=right,
-        legend plot pos=right,
-        legend style={draw=none,
-        /tikz/every even column/.append style={column sep=0.35cm}},
-    },
- ]       
-  \begin{scope}[on background layer]
-    \pic{2d-grid={17}{7.2}};
-  \end{scope}
-  \begin{scope}[on background layer]
-    \pic{2d-grid={12}{1.5}};
-  \end{scope}
-  \begin{scope}[on background layer]
-    \pic{2d-grid={9}{0.3}};
-  \end{scope}
-  \begin{scope}[on background layer]
-    \pic{2d-grid={9}{0.3}};
-  \end{scope}
-  \begin{scope}[on background layer]
-    \pic{2d-grid={4.2}{0.4}};
-  \end{scope}
-  \begin{scope}[on background layer]
-    \pic{2d-grid={4.2}{0.4}};
-  \end{scope}
-  \begin{scope}[on background layer]
-    \pic{2d-grid={4.2}{0.4}};
-  \end{scope}
-  \begin{scope}[on background layer]
-    \pic{2d-grid={4.2}{0.4}};
-  \end{scope}
-  \begin{scope}[on background layer]
-    \pic{2d-grid={4.2}{0.4}};
-  \end{scope}
-    %    
- \end{axis}
-\end{tikzpicture}
-\end{document}"""
+PUBLIC_DEMO = getenv("SPACE_ID") == "nllg/AutomaTikZ"
 
-def convert_to_svg(pdf):
-    doc = fitz.open("pdf", pdf.raw) # type: ignore
-    return doc[0].get_svg_image()
-
-def tex_compile(
-    code: str,
-    timeout: int = 120,
-    rasterize: bool = False
-):
-    tikzdoc = TikzDocument(code, timeout=timeout)
-    if not tikzdoc.has_content:
-        if tikzdoc.compiled_with_errors:
-            raise gr.Error("TikZ code did not compile!") # type: ignore
-        else:
-            gr.Warning("TikZ code compiled to an empty image!") # type: ignore
-    elif tikzdoc.compiled_with_errors:
-        gr.Warning("TikZ code compiled with errors!") # type: ignore
-
-    if rasterize:
-        yield tikzdoc.rasterize()
-    else:
-        with NamedTemporaryFile(suffix=".svg", buffering=0) as tmpfile:
-            if pdf:=tikzdoc.pdf:
-                tmpfile.write(convert_to_svg(pdf).encode())
-            yield tmpfile.name if pdf else None
-
-with gr.Blocks(css=".gradio-container {text-align: center}", theme=gr.themes.Soft()) as demo:
-    with open("/etc/os-release") as f:
-        print(f.read())
-        system("latexmk --version")
-        #with open("bla.tex", "w") as f:
-        #    f.write(tikz)
-        #    system("latexmk -f -nobibtex -norc -file-line-error -interaction=nonstopmode bla.tex")
-        #doc = TikzDocument(tikz)
-        #print(doc.log, doc.has_content, doc.compiled_with_errors, doc.status)
-        image = gr.Image()
-        run_btn = gr.Button("Run", variant="primary")
-        run_btn.click(
-            partial(tex_compile, code=tikz),
-            outputs=image
-        )
-        demo.queue().launch()
+if PUBLIC_DEMO and not cuda.is_available():
+    with gr.Blocks(css=".gradio-container {text-align: center}", theme=gr.themes.Soft(), title="AutomaTikZ") as demo:
+        badge = "https://huggingface.co/datasets/huggingface/badges/resolve/main/duplicate-this-space-xl.svg"
+        link = "https://huggingface.co/spaces/nllg/AutomaTikZ?duplicate=true"
+        html = f'<a style="display:inline-block" href="{link}"> <img src="{badge}" alt="Duplicate this Space"> </a>'
+        message = dedent("""\
+        The size of our models exceeds the resource constraints offered by the
+        free tier of Hugging Face Spaces. For full functionality, we recommend
+        duplicating this space on a paid private GPU runtime.
+        """)
+        gr.Markdown(f'{get_banner()}\n{message}\n{html}')
+        demo.launch()
+else:
+    build_ui(lock=PUBLIC_DEMO).queue().launch(server_name="0.0.0.0", server_port=7860)