Refactor code structure for improved readability and maintainability

Author: Zalfsten

dev_environment/start.sh

@@ -21,7 +21,7 @@ fi
 echo "==> Starting SQL-to-ARC with EXTERNAL API..."
 echo "    - Local PostgreSQL will be started"
 echo "    - Database will be initialized with Edaphobase dump"
-echo "    - SQL-to-ARC will connect to the API configured in config-external.yaml"
+echo "    - SQL-to-ARC will connect to the API configured in config.yaml"
 echo "    - Using client certificates: client.crt, client.key"
 echo ""
 
@@ -33,9 +33,9 @@ fi
 # Use sops exec-env to pass the decrypted key as an environment variable
 # without writing it to a physical disk file.
 sops exec-env "${script_dir}/client.key" \
-  "docker compose -f compose-external.yaml up $BUILD_FLAG"
+  "docker compose -f compose.yaml up $BUILD_FLAG"
 
 echo ""
 echo "==> Services finished!"
-echo "    - View logs: docker compose -f compose-external.yaml logs"
-echo "    - Clean up: docker compose -f compose-external.yaml down"
+echo "    - View logs: docker compose -f compose.yaml logs"
+echo "    - Clean up: docker compose -f compose.yaml down"

docker/Dockerfile.sql_to_arc

@@ -1,57 +1,40 @@
-# ---- Package Build Stage ----
-FROM python:3.12.12-alpine3.22 AS package-builder
-
-WORKDIR /build
-
-# Copy project files needed for package build
-COPY pyproject.toml uv.lock ./
-COPY middleware ./middleware
-
-# Upgrade pip and install uv
-RUN pip install --no-cache-dir --upgrade pip==25.0.1 uv==0.9.10
-
-# Build shared package first
-RUN uv build --package shared --wheel
-
-# Build the api client package as wheel
-RUN uv build --package api_client --wheel
-
-# Build the sql_to_arc package as wheel
-RUN uv build --package sql_to_arc --wheel
-
 # ---- Binary Build Stage ----
-FROM python:3.12.12-alpine3.22 AS binary-builder
+FROM python:3.12.12-alpine3.23 AS binary-builder
 
 # Install build tools for PyInstaller
 RUN apk add --no-cache \
     build-base=0.5-r3 \
     python3-dev=3.12.12-r0 \
-    libffi-dev=3.4.8-r0 \
-    openssl-dev=3.5.4-r0 \
-    cargo=1.87.0-r0
+    libffi-dev=3.5.2-r0 \
+    openssl-dev=3.5.5-r0 \
+    cargo=1.91.1-r0 \
+    git=2.52.0-r0
 
 WORKDIR /build
 
 # Install uv and PyInstaller
-RUN pip install --no-cache-dir --upgrade pip==25.0.1 uv==0.9.10
-
-# Copy built wheel from package-builder stage
-COPY --from=package-builder /build/dist/*.whl /tmp/wheels/
+RUN pip install --no-cache-dir --upgrade pip==25.3 uv==0.9.27
 
-# Install the API package from wheel
-RUN uv pip install --system /tmp/wheels/*.whl
+# Copy project files needed for package build
+COPY pyproject.toml uv.lock ./
+COPY middleware ./middleware
 
 # Install PyInstaller
 RUN uv pip install --system pyinstaller
 
+# Install further dependencies for sql_to_arc
+RUN uv sync
+
 # Build standalone binary with PyInstaller
 RUN pyinstaller --onedir \
     --name sql_to_arc \
-    $(python -c "import middleware.sql_to_arc; print(middleware.sql_to_arc.__file__.replace('__init__.py', 'main.py'))")
+    --paths .venv/lib/python3.12/site-packages \
+    --paths /build/middleware/sql_to_arc/src \
+    /build/middleware/sql_to_arc/src/middleware/sql_to_arc/main.py
 
 
 # ---- Runtime Stage ----
-FROM alpine:3.22.2
+FROM alpine:3.23.3
 
 WORKDIR /middleware
 

middleware/sql_to_arc/pyproject.toml

@@ -8,8 +8,10 @@ dependencies = [
     "arctrl>=3.0.0b15",
     "psycopg[binary]>=3.3.2",
     "pydantic>=2.12.5",
-    "shared",
-    "api_client",
+    "shared>=0.0.1",
+    "api_client>=0.0.1",
+    "opentelemetry-api>=1.39.1",
+    "opentelemetry-sdk>=1.39.1"
 ]
 
 [tool.uv.sources]

pyproject.toml

@@ -10,7 +10,6 @@ dependencies = [
 
 [dependency-groups]
 dev = [
-  "fastapi[standard]>=0.124.0",
   "httpx>=0.28.1",
   "pylint>=4.0.4",
   "pytest>=9.0.2",