Dockerfile and entrypoint script for improved structure and usability

Dockerfile

@@ -3,7 +3,6 @@ FROM python:3.11-slim
 # Install build tools and required libraries
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
-    python3-dev \
     curl \
   && rm -rf /var/lib/apt/lists/*
 
@@ -18,18 +17,16 @@ ENV COLORTERM=truecolor
 # Set up working directory
 WORKDIR /app
 
-COPY pyproject.toml ./
-COPY drawio2clab.py ./
-COPY clab2drawio.py ./
+COPY pyproject.toml README.md ./
+COPY uv.lock ./
 COPY entrypoint.sh ./
-COPY styles/ ./styles/
-COPY core/ ./core/
-COPY cli/ ./cli/
+COPY clab_io_draw/ ./clab_io_draw/
 
 # Install dependencies using uv
 RUN --mount=type=cache,target=/root/.cache/pip \
-    --mount=type=cache,target=/root/.cache/uv \
-    uv pip install --system -r pyproject.toml
+    --mount=type=cache,target=/root/.cache/uv 
+
+RUN uv pip install --system .
 
 # Make the entrypoint script executable
 RUN chmod +x /app/entrypoint.sh

clab_io_draw/clab2drawio.py

@@ -234,7 +234,6 @@ def main(
 
     print("Saved file to:", output_file)
 
-
 def cli():
     """Entry point for the command line interface."""
     args = parse_arguments()

entrypoint.sh

@@ -22,11 +22,11 @@ Examples:
   Convert .drawio to .yaml: docker run -v "\$(pwd)":/data ghcr.io/srl-labs/clab-io-draw -i input.drawio -o output.yaml
   Convert .yaml to .drawio: docker run -v "\$(pwd)":/data ghcr.io/srl-labs/clab-io-draw -i input.yaml -o output.drawio
 
-clab2drawio.py help:
-$(python -u "/app/clab2drawio.py" -h)
+clab2drawio help:
+$(clab2drawio -h)
 
-drawio2clab.py help:
-$(python -u "/app/drawio2clab.py" -h)
+drawio2clab help:
+$(drawio2clab -h)
 EOF
 }
 
@@ -36,7 +36,6 @@ if [ $# -eq 0 ] || [[ " $@ " =~ " -h " ]] || [[ " $@ " =~ " --help " ]]; then
   exit 0
 fi
 
-script_name=""
 input_file=""
 prev_arg=""
 
@@ -52,10 +51,10 @@ done
 if [ ! -z "$input_file" ]; then
   case $(get_extension "$input_file") in
     yml|yaml)
-      script_name="clab2drawio.py"
+      script_name="clab2drawio"
       ;;
     drawio)
-      script_name="drawio2clab.py"
+      script_name="drawio2clab"
       ;;
     *)
       echo "Unsupported file type: $input_file"
@@ -68,4 +67,4 @@ else
 fi
 
 # Execute the determined script with all passed arguments
-python "/app/${script_name}" "$@"
+$script_name "$@"

pyproject.toml

@@ -15,8 +15,13 @@ dependencies = [
     "textual==1.0.0",
 ]
 
-[tool.setuptools.packages.find]
-include = ["clab_io_draw*"]
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+
+[tool.setuptools.package-data]
+clab_io_draw = ["styles/*.yaml"]
 
 [project.scripts]
 clab2drawio = "clab_io_draw.clab2drawio:cli"