build(agent): migrate from Poetry to Rye

Author: azzamsa

.github/workflows/ci_agent.yml

@@ -1,8 +1,5 @@
 name: CI (Agent)
 
-env:
-  VENV_PATH: "~/.venv-agent"
-
 on:
   push:
     paths:
@@ -28,44 +25,21 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-          python-version: '3.11.3'
-
-    - name: Cache poetry install
-      uses: actions/cache@v4
-      with:
-        path: ~/.local
-        key: poetry
-
-    - name: Install Poetry
-      uses: snok/install-poetry@v1
+    - name: Install the latest version of rye
+      uses: eifinger/setup-rye@v4
       with:
-          virtualenvs-create: true
-          virtualenvs-in-project: false
-          virtualenvs-path: ${{ env.VENV_PATH }}
-
-    - name: Cache deps
-      id: cache-deps
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.VENV_PATH }}
-        key: venv-agent-${{ hashFiles('**/poetry.lock') }}
+        enable-cache: true
 
     - name: Install confluent-kafka prerequisites
       run: |
         sudo apt-get install --yes gcc librdkafka-dev python3-dev
 
-    - name: Install dependencies
-      run: |
-        poetry install --no-interaction --no-root
+    - name: Sync dependencies
+      run: rye sync
 
     - uses: taiki-e/install-action@just
     - uses: taiki-e/install-action@dprint
 
     - name: Lint
       # currently cli is not-maintained
-      run: |
-        just fmt-check
-        just lint
+      run: just check

agent/.dockerignore

@@ -15,4 +15,4 @@ __pycache__/
 # other
 .flake8
 .env
-docker-compose.yml
+compose.yml

agent/Dockerfile

@@ -1,38 +1,26 @@
 # didn't work with apline
 FROM python:3.11.3-slim-buster
 
-ENV PIP_DEFAULT_TIMEOUT=100 \
-    POETRY_VERSION=1.4
+ENV PIP_DEFAULT_TIMEOUT=100
 
 RUN apt-get update
 # working with timezones
 RUN apt-get install --no-install-recommends --yes tzdata
 # confluent-kafka-python needs these
 RUN apt-get install --no-install-recommends --yes gcc librdkafka-dev python3-dev
 
-# activate virtualenv
-ENV VIRTUAL_ENV=/opt/venv
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-
 # upgrading pip solves many installation problems
 RUN pip3 install --upgrade pip
-RUN pip3 install "poetry==$POETRY_VERSION"
 
 WORKDIR /dnsagent
 
 # leverage Docker cache
-COPY poetry.lock pyproject.toml /dnsagent/
-
-RUN poetry install --only main --no-interaction --no-ansi
+COPY requirements.lock /dnsagent/
+RUN PYTHONDONTWRITEBYTECODE=1 pip install --no-cache-dir -r requirements.lock
 
 ARG VCS_REVISION
 RUN echo "$VCS_REVISION" > version
 
 COPY . /dnsagent
 
-# check build version
-RUN cat /dnsagent/version
-
-ENV PYTHONPATH="${PYTHONPATH}:/dnsagent"
 CMD ["python3", "dnsagent/start.py"]

agent/justfile

@@ -9,7 +9,7 @@ _default:
 
 # Setup the repository.
 setup:
-    poetry install && poetry shell
+    rye sync
 
 # Tasks to make the code-base comply with the rules. Mostly used in git hooks.
 comply: fmt lint
@@ -19,31 +19,28 @@ check: fmt-check lint
 
 # Build the container image.
 image-build:
-    podman build --tag restknot-agent:latest --build-arg VCS_REVISION=$(git rev-parse --short HEAD) .
+    docker build --tag restknot-agent:latest --build-arg VCS_REVISION=$(git rev-parse --short HEAD) .
 
 # Run the container image.
 image-start:
-    podman-compose up -d
+    docker compose up -d
 
 # Stop the container image.
 image-stop:
-    podman-compose down
+    docker compose down
 
 # Format the codebase.
 fmt:
-    poetry run black .
-    poetry run isort .
+    rye fmt
 
 # Check is the codebase properly formatted.
 fmt-check:
-    poetry run black --check .
+    rye fmt --check
 
 # Lint the codebase.
 lint:
-    poetry run ruff .
+    rye lint
 
 # Check dependencies health.
 up:
-    #!/usr/bin/env bash
-    poetry lock
-    poetry show --outdated | grep --file=<(poetry show --tree | grep '^\w' | cut -d' ' -f1) || echo "All dependencies are up to date, yay!"
+    rye sync --update-all