Merge branch 'main' of github.com:DefangLabs/samples

Author: raphaeltm

.github/workflows/check-sample.yml

@@ -30,6 +30,8 @@ jobs:
           ./scripts/check-modified-samples.sh > modified.txt
           echo "@@ MODIFIED @@"
           cat modified.txt
+          echo "@@ CHECKLIST @@"
+          cat checklist.txt
 
       # TODO: Uncomment the following lines to validate the Compose files
       #       once we figure out how to prevent it from erroring on warnings.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Defang Software Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

samples/agentic-strands/app/agent.py

@@ -158,6 +158,12 @@ def chat():
         print(f"Error in /chat endpoint: {str(e)}")
         return jsonify({"error": str(e), "response": str(e)}), 500
 
+@app.get("/health")
+def health_check():
+    """Health check endpoint"""
+    return "ok"
+
+
 # Start Flask server when this script is run directly
 if __name__ == '__main__':
 

samples/agentic-strands/compose.yaml

@@ -13,13 +13,25 @@ services:
       LLM_URL: http://llm/api/v1/
       LLM_MODEL: default
       OPENAI_API_KEY: FAKE_TOKEN
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "python3",
+          "-c",
+          "import urllib.request; exit(0) if urllib.request.urlopen('http://localhost:5001/health').status == 200 else exit(1)",
+        ]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
     depends_on:
       - llm
 
   llm:
     environment:
       - OPENAI_API_KEY=FAKE_TOKEN
-    image: defangio/openai-access-gateway:06339c7
+    image: defangio/openai-access-gateway
     ports:
       - target: 80
         published: 80

samples/django-celery/app/command.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Apply database migrations
-python manage.py migrate
-
 # Create superuser if not exists
 python manage.py createsuperauto
 

samples/django-celery/compose.yaml

@@ -10,6 +10,7 @@ services:
       - POSTGRES_URL=postgres://postgres:${POSTGRES_PASSWORD}@database:5432/postgres
     depends_on:
       - database
+      - migrate
       - broker
     ports:
       - mode: ingress
@@ -22,6 +23,19 @@ services:
       retries: 3
       start_period: 20s
 
+  migrate:
+    restart: no
+    build:
+      context: ./app
+      dockerfile: Dockerfile
+    environment:
+      - SECRET_KEY
+      - REDIS_URL=redis://broker:6379/0
+      - POSTGRES_URL=postgres://postgres:${POSTGRES_PASSWORD}@database:5432/postgres
+    depends_on:
+      - database
+    command: python manage.py migrate
+
   worker:
     restart: unless-stopped
     build:
@@ -37,6 +51,7 @@ services:
     depends_on:
       - database
       - broker
+      - migrate
     command: celery -A django_celery worker --loglevel=info
 
   database:

samples/django-channels-redis-postgres/.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(docker compose:*)"
+    ],
+    "deny": []
+  }
+}

samples/django-channels-redis-postgres/app/Dockerfile

@@ -1,5 +1,5 @@
 # Use a smaller base image
-FROM python:3.10-slim-buster
+FROM python:3.10-slim-bullseye
 
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE=1
@@ -12,7 +12,8 @@ RUN apt-get update \
     && apt-get install -y \
         gcc \
         python3-dev \
-        libpq-dev
+        libpq-dev \
+        netcat-openbsd
 
 # Install dependencies
 COPY requirements.txt /app/
@@ -32,4 +33,4 @@ RUN adduser --disabled-password --gecos '' django
 USER django
 
 # Start server
-CMD ["sh", "-c", "python manage.py migrate && daphne -b 0.0.0.0 -p 8000 django_defang.asgi:application"]
+CMD ["sh", "-c", "daphne -b 0.0.0.0 -p 8000 django_defang.asgi:application"]

samples/django-channels-redis-postgres/compose.dev.yaml

@@ -13,8 +13,16 @@ services:
     depends_on:
       - redis-service
       - postgres-service
-    command: sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
+      - migrate
+    command: sh -c "python manage.py runserver 0.0.0.0:8000"
 
+  migrate:
+    extends:
+      file: compose.yaml
+      service: migrate
+    environment:
+      - POSTGRES_URL=postgres://djangouser:djangopassword@postgres-service:5432/djangodatabase
+  
   redis-service:
     extends:
       file: compose.yaml

samples/django-channels-redis-postgres/compose.yaml

@@ -22,6 +22,7 @@ services:
     depends_on:
       - redis-service
       - postgres-service
+      - migrate
 
   redis-service:
     image: redis:6.2
@@ -31,6 +32,18 @@ services:
       - mode: host
         target: 6379
 
+  migrate:
+    restart: "no"
+    build:
+      context: ./app
+      dockerfile: Dockerfile
+    command: python manage.py migrate
+    depends_on:
+      - postgres-service
+    environment:
+      - POSTGRES_URL=postgres://djangouser:${POSTGRES_PASSWORD}@postgres-service:5432/djangodatabase?
+      - SECRET_KEY
+
   postgres-service:
     image: postgres:16.4
     # uncomment the following line in BYOC