Update Dockerfile and docker-compose.yml for Python 3.13, add graphviz installation, and modify main.py for RabbitMQ connection. Introduce GitHub Actions workflow for Docker image publishing.

Author: Abhinav-ark

.github/workflows/publish.yml

@@ -0,0 +1,18 @@
+name: Build and Publish Docker Image
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  main-workflow:
+    uses: Evolutionary-Algorithms-On-Click/operations/.github/workflows/docker-publish.yml@main
+    with:
+      branch: ${{ github.ref }}
+      image_name: ${{ github.repository }}
+      event_name: ${{ github.event_name }}
+    permissions:
+      contents: read
+      packages: write
+      id-token: write

Dockerfile

@@ -1,14 +1,16 @@
 # Use an official Python runtime as a parent image
-FROM python:3.9
+FROM python:3.13
 
 # Set the working directory in the container
 WORKDIR /app
 
 # Copy the current directory contents into the container
 COPY . .
 
+# Install graphviz
+RUN apt-get update && apt-get install -y graphviz libgraphviz-dev pkg-config
+
 # Install dependencies
 RUN pip install --no-cache-dir -r requirements.txt
-
 # Run the application
-CMD ["python", "worker.py"]
+CMD ["python", "main.py"]

docker-compose.yml

@@ -1,60 +1,11 @@
-version: '3.8'
 
 services:
-  rabbitmq:
-    image: "rabbitmq:4.0-management"
-    container_name: rabbitmq
-    ports:
-      - "5672:5672"
-      - "15672:15672"
+  auth:
+    image: ghcr.io/evolutionary-algorithms-on-click/runner:main
     environment:
-      RABBITMQ_DEFAULT_USER: user
-      RABBITMQ_DEFAULT_PASS: password
-
-  minio:
-    image: "minio/minio"
-    container_name: minio
-    environment:
-      MINIO_ACCESS_KEY: minioadmin
-      MINIO_SECRET_KEY: minioadmin
-    ports:
-      - "9000:9000"
-      - "9001:9001"
-    command: server /data --console-address ":9001"
-    volumes:
-      - minio-data:/data
-
-  cockroachdb:
-    image: cockroachdb/cockroach:v23.1.11
-    container_name: cockroachdb
-    command: start-single-node --insecure
-    ports:
-      - "26257:26257"
-      - "8081:8080"
-    volumes:
-      - cockroach-data:/cockroach/cockroach-data
-
-# postgresql://root@localhost:26257/defaultdb?sslmode=disable
-
-  # worker:
-  #   build: .
-  #   container_name: worker
-  #   depends_on:
-  #     - rabbitmq
-  #     - minio
-  #     - cockroachdb
-  #   environment:
-  #     RABBITMQ_HOST: rabbitmq
-  #     RABBITMQ_QUEUE: task_queue
-  #     MINIO_URL: minio:9000
-  #     MINIO_ACCESS_KEY: minioadmin
-  #     MINIO_SECRET_KEY: minioadmin
-  #     BUCKET_NAME: code-files
-  #     DB_HOST: cockroachdb
-  #     DB_NAME: mydatabase
-  #     DB_USER: root
-  #     DB_PASSWORD: ""
-
-volumes:
-  minio-data:
-  cockroach-data:
+      COCKROACHDB_URL : postgresql://[email protected]:26257/defaultdb?sslmode=disable
+      MINIO_URL : host.docker.internal:9000
+      MINIO_ACCESS_KEY : <minio-key>
+      MINIO_SECRET_KEY : <minio-pass>
+      RABBITMQ_URL : amqp://<user>:<password>@host.docker.internal:5672/
+      RABBITMQ_QUEUE: <task_queue_name>

main.py

@@ -7,20 +7,15 @@
 import psycopg2
 
 # Read environment variables
-RABBITMQ_URL = os.getenv(
-    "RABBITMQ_URL", "amqp://guest:guest@localhost:5672/"
-)  # Connection string
+RABBITMQ_URL = os.getenv("RABBITMQ_URL", "amqp://user:password@localhost:5672/")  # Connection string
+
 QUEUE_NAME = os.getenv("RABBITMQ_QUEUE", "task_queue")
 
 MINIO_URL = os.getenv("MINIO_URL", "localhost:9000")
 MINIO_ACCESS_KEY = os.getenv("MINIO_ACCESS_KEY", "minioadmin")
-MINIO_SECRET_KEY = os.getenv(
-    "MINIO_SECRET_KEY", "minioadmin"
-)
+MINIO_SECRET_KEY = os.getenv("MINIO_SECRET_KEY", "minioadmin")
 
-COCKROACHDB_URL = os.getenv(
-    "COCKROACHDB_URL", "postgresql://root@localhost:26257/defaultdb?sslmode=disable"
-)
+COCKROACHDB_URL = os.getenv("COCKROACHDB_URL", "postgresql://root@localhost:26257/defaultdb?sslmode=disable")
 
 
 def parse_json_string(json_string):
@@ -191,6 +186,8 @@ def process_message(ch, method, properties, body):
 
         file_parent_dir = os.path.dirname(full_file_path)
 
+        ch.basic_ack(delivery_tag=method.delivery_tag)
+
         if (runType == "ml"):
             print("Running python " + full_file_path)
             # Run the subprocess from the parent directory of the python script.
@@ -247,7 +244,6 @@ def process_message(ch, method, properties, body):
     except Exception as e:
         print(f"Error running {fileName}: {e}")
 
-    ch.basic_ack(delivery_tag=method.delivery_tag)
 
 
 # Connect to RabbitMQ using the connection string

requirements.txt

@@ -10,5 +10,4 @@ scikit-learn
 pillow
 networkx
 pygraphviz
-pandas
-itertools
+pandas