Merge pull request #48 from mfwolffe/main

DAWn_EE guided activity models

Author: hcientist

.tool-versions

@@ -0,0 +1 @@
+python 3.11.6

Dockerfile Dockerfile.awsDockerfile renamed to Dockerfile.aws

@@ -0,0 +1 @@
+web: bash start.sh

Procfile

@@ -16,6 +16,7 @@
     SubmissionViewSet,
     AttachmentViewSet,
     TeacherSubmissionViewSet,
+    ActivityProgressViewSet,
 )
 from teleband.musics.api.views import PieceViewSet
 from teleband.instruments.api.views import InstrumentViewSet
@@ -45,6 +46,7 @@
 
 assignments_router = nested_cls(courses_router, "assignments", lookup="assignment")
 assignments_router.register("submissions", SubmissionViewSet)
+assignments_router.register("activity-progress", ActivityProgressViewSet, basename="activity-progress")
 
 attachments_router = nested_cls(assignments_router, "submissions", lookup="submission")
 attachments_router.register("attachments", AttachmentViewSet)

config/api_router.py

@@ -0,0 +1,149 @@
+"""
+Django settings for Railway deployment.
+
+Simplified production settings without AWS dependencies.
+Uses whitenoise for static files and local filesystem for media.
+"""
+
+from .base import *  # noqa
+from .base import env, ROOT_DIR
+import os
+
+# GENERAL
+# ------------------------------------------------------------------------------
+SECRET_KEY = env("DJANGO_SECRET_KEY")
+DEBUG = env.bool("DJANGO_DEBUG", default=False)
+
+# Allow Railway's domain and custom domains
+ALLOWED_HOSTS = env.list(
+    "DJANGO_ALLOWED_HOSTS",
+    default=["localhost", ".railway.app", ".up.railway.app"]
+)
+
+# DATABASES
+# ------------------------------------------------------------------------------
+# Railway provides DATABASE_URL automatically when you add Postgres
+# Falls back to SQLite for simpler setups
+if env("DATABASE_URL", default=None):
+    DATABASES = {
+        "default": env.db("DATABASE_URL"),
+    }
+    DATABASES["default"]["ATOMIC_REQUESTS"] = True
+    DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60)
+else:
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": ROOT_DIR / "db.sqlite3",
+        }
+    }
+
+# CACHES
+# ------------------------------------------------------------------------------
+# Use local memory cache instead of Redis for simplicity
+CACHES = {
+    "default": {
+        "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+        "LOCATION": "unique-snowflake",
+    }
+}
+
+# SECURITY
+# ------------------------------------------------------------------------------
+SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
+SECURE_SSL_REDIRECT = env.bool("DJANGO_SECURE_SSL_REDIRECT", default=True)
+SESSION_COOKIE_SECURE = True
+CSRF_COOKIE_SECURE = True
+SECURE_HSTS_SECONDS = 60
+SECURE_HSTS_INCLUDE_SUBDOMAINS = True
+SECURE_HSTS_PRELOAD = True
+SECURE_CONTENT_TYPE_NOSNIFF = True
+
+# STATIC FILES (whitenoise)
+# ------------------------------------------------------------------------------
+INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS  # noqa F405
+MIDDLEWARE.insert(1, "whitenoise.middleware.WhiteNoiseMiddleware")  # After SecurityMiddleware
+
+STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+STATIC_URL = "/static/"
+STATIC_ROOT = ROOT_DIR / "staticfiles"
+
+# MEDIA FILES (local filesystem)
+# ------------------------------------------------------------------------------
+# Media files stored in Railway volume at /app/mediafiles
+# Sample audio copied from git on first deploy, user recordings persist in volume
+MEDIA_URL = "/media/"
+MEDIA_ROOT = env("MEDIA_ROOT", default="/app/mediafiles")
+
+# EMAIL
+# ------------------------------------------------------------------------------
+# Use console backend for development/testing (emails print to console)
+EMAIL_BACKEND = env(
+    "DJANGO_EMAIL_BACKEND",
+    default="django.core.mail.backends.console.EmailBackend"
+)
+DEFAULT_FROM_EMAIL = env(
+    "DJANGO_DEFAULT_FROM_EMAIL",
+    default="MusicCPR <noreply@musiccpr.org>"
+)
+
+# ADMIN
+# ------------------------------------------------------------------------------
+ADMIN_URL = env("DJANGO_ADMIN_URL", default="admin/")
+
+# LOGGING
+# ------------------------------------------------------------------------------
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "formatters": {
+        "verbose": {
+            "format": "%(levelname)s %(asctime)s %(name)s %(message)s"
+        }
+    },
+    "handlers": {
+        "console": {
+            "level": "DEBUG",
+            "class": "logging.StreamHandler",
+            "formatter": "verbose",
+        },
+    },
+    "root": {"level": "INFO", "handlers": ["console"]},
+    "loggers": {
+        "django": {
+            "handlers": ["console"],
+            "level": "WARNING",
+            "propagate": False,
+        },
+        "django.request": {
+            "handlers": ["console"],
+            "level": "ERROR",
+            "propagate": False,
+        },
+    },
+}
+
+# CORS
+# ------------------------------------------------------------------------------
+# Allow Vercel frontend domains
+CORS_ALLOWED_ORIGIN_REGEXES = env.list(
+    "CORS_ALLOWED_ORIGINS_REGEX",
+    default=[
+        r"^https://.*\.vercel\.app$",
+        r"^https://.*\.railway\.app$",
+        r"^http://localhost:\d+$",
+        r"^http://127\.0\.0\.1:\d+$",
+    ]
+)
+
+# Also allow specific origins if set
+CORS_ALLOWED_ORIGINS = env.list(
+    "CORS_ALLOWED_ORIGINS",
+    default=[]
+)
+
+# CSRF trusted origins (needed for admin)
+CSRF_TRUSTED_ORIGINS = env.list(
+    "CSRF_TRUSTED_ORIGINS",
+    default=["https://*.railway.app", "https://*.vercel.app"]
+)

config/settings/railway.py

@@ -1,15 +1,51 @@
+import os
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from django.urls import include, path
+from django.urls import include, path, re_path
 from django.views import defaults as default_views
 from django.views.generic import TemplateView
+from django.views.static import serve
+from django.http import JsonResponse
 from teleband.users.api.views import obtain_delete_auth_token
 from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
 
+
+def debug_media(request):
+    """Diagnostic endpoint to check media files."""
+    import subprocess
+    result = {
+        "MEDIA_ROOT": str(settings.MEDIA_ROOT),
+        "MEDIA_ROOT_exists": os.path.exists(settings.MEDIA_ROOT),
+        "cwd": os.getcwd(),
+    }
+
+    # List files in MEDIA_ROOT
+    if os.path.exists(settings.MEDIA_ROOT):
+        try:
+            files = []
+            for root, dirs, filenames in os.walk(settings.MEDIA_ROOT):
+                for f in filenames[:20]:  # Limit to first 20
+                    files.append(os.path.join(root, f).replace(settings.MEDIA_ROOT, ""))
+            result["files"] = files
+            result["file_count"] = sum(len(f) for _, _, f in os.walk(settings.MEDIA_ROOT))
+        except Exception as e:
+            result["error"] = str(e)
+    else:
+        result["files"] = []
+
+    # Also check teleband/media
+    teleband_media = os.path.join(os.getcwd(), "teleband", "media")
+    result["teleband_media_exists"] = os.path.exists(teleband_media)
+    if os.path.exists(teleband_media):
+        result["teleband_media_count"] = sum(len(f) for _, _, f in os.walk(teleband_media))
+
+    return JsonResponse(result)
+
 urlpatterns = [
     path("", TemplateView.as_view(template_name="pages/home.html"), name="home"),
+    path("debug-media/", debug_media, name="debug-media"),
     path(
         "about/", TemplateView.as_view(template_name="pages/about.html"), name="about"
     ),
@@ -27,7 +63,16 @@
         name="swagger-ui",
     ),
     path("dashboards/", include("teleband.dashboards.urls", namespace="dashboards")),
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+]
+
+# Serve media files - in production with S3 this is handled by S3,
+# but for Railway/local deployments we serve from filesystem
+# Note: static() only works with DEBUG=True, so we use serve() directly for non-S3 deployments
+if not hasattr(settings, 'DEFAULT_FILE_STORAGE') or 'S3' not in getattr(settings, 'DEFAULT_FILE_STORAGE', ''):
+    urlpatterns += [
+        re_path(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),
+    ]
+
 if settings.DEBUG:
     # Static file serving when using Gunicorn + Uvicorn for local web socket development
     urlpatterns += staticfiles_urlpatterns()

config/urls.py

@@ -0,0 +1,83 @@
+# Railway + Vercel Deployment
+
+## Backend (Railway)
+
+### Setup
+
+1. Create project in Railway, connect GitHub repo
+2. Add PostgreSQL: **+ New** → **Database** → **PostgreSQL**
+3. Add Volume: **+ New** → **Volume** → mount at `/app/mediafiles`
+4. Set environment variables (see below)
+5. Enable public networking: **Settings** → **Networking** → **Public Networking**
+
+### Environment Variables
+
+| Variable | Value |
+|----------|-------|
+| `DJANGO_SECRET_KEY` | `python -c "from django.core.management.utils import get_random_secret_key; print(get_random_secret_key())"` |
+| `MEDIA_ROOT` | `/app/mediafiles` |
+| `CORS_ALLOWED_ORIGINS` | `https://your-frontend.vercel.app` |
+| `CSRF_TRUSTED_ORIGINS` | `https://your-frontend.vercel.app,https://*.railway.app` |
+
+Auto-set by Railway: `DATABASE_URL`
+
+### Key Files
+
+- `config/settings/railway.py` - Railway-specific settings (whitenoise, local cache, no AWS)
+- `requirements/railway.txt` - Dependencies without AWS packages
+- `start.sh` - Startup script (seeds media to volume, runs migrations, starts gunicorn)
+- `nixpacks.toml` - Points to `start.sh`
+- `Procfile` - Fallback start command
+
+### Debug Endpoint
+
+`/debug-media/` - Shows MEDIA_ROOT contents and file counts
+
+---
+
+## Frontend (Vercel)
+
+### Setup
+
+1. Import GitHub repo in Vercel
+2. Framework: **Next.js** (auto-detected)
+3. Set environment variables (see below)
+4. Deploy
+
+### Environment Variables
+
+| Variable | Value |
+|----------|-------|
+| `NEXT_PUBLIC_BACKEND_HOST` | `https://your-backend.up.railway.app` |
+| `NEXTAUTH_URL` | `https://your-frontend.vercel.app` |
+| `SECRET` | Any random string |
+
+### Custom Domain
+
+1. Vercel: **Settings** → **Domains** → Add `your.domain.com`
+2. DNS: Add CNAME record `your` → `cname.vercel-dns.com`
+3. Update `NEXTAUTH_URL` to match
+
+---
+
+## Architecture
+
+```
+┌─────────────────┐     ┌──────────────────┐
+│  Vercel         │────▶│  Railway         │
+│  (Next.js)      │     │  (Django)        │
+└─────────────────┘     └────────┬─────────┘
+                                 │
+                    ┌────────────┼────────────┐
+                    ▼            ▼            ▼
+               PostgreSQL    Volume       Whitenoise
+               (database)   (media)      (static)
+```
+
+| Component | Solution |
+|-----------|----------|
+| Static files | Whitenoise (served from container) |
+| Media files | Railway Volume at `/app/mediafiles` |
+| Database | Railway PostgreSQL |
+| Cache | Local memory |
+| Email | Console backend (logs) |

docs/railway-deployment.md

@@ -0,0 +1,3 @@
+# Use shell script for start command
+[start]
+cmd = "bash start.sh"

nixpacks.toml

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://railway.app/railway.schema.json",
+  "build": {
+    "builder": "NIXPACKS"
+  },
+  "deploy": {
+    "restartPolicyType": "ON_FAILURE",
+    "restartPolicyMaxRetries": 10
+  }
+}

railway.json

@@ -0,0 +1,19 @@
+# Railway deployment requirements
+# Simplified production without AWS dependencies
+
+-r base.txt
+
+# Web server
+gunicorn==22.0.0
+
+# Database (Railway provides Postgres, or use SQLite)
+psycopg2-binary==2.9.9
+
+# Static files
+whitenoise==6.7.0
+
+# Note: The following are NOT included (vs production.txt):
+# - boto3 (S3)
+# - django-storages (S3)
+# - django-anymail (SES email)
+# - Collectfast (S3 optimization)