Upload 5 files

.gitattributes

@@ -1,35 +1,35 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tar filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.arrow filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+*.ftz filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.h5 filter=lfs diff=lfs merge=lfs -text
+*.joblib filter=lfs diff=lfs merge=lfs -text
+*.lfs.* filter=lfs diff=lfs merge=lfs -text
+*.mlmodel filter=lfs diff=lfs merge=lfs -text
+*.model filter=lfs diff=lfs merge=lfs -text
+*.msgpack filter=lfs diff=lfs merge=lfs -text
+*.npy filter=lfs diff=lfs merge=lfs -text
+*.npz filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text
+*.ot filter=lfs diff=lfs merge=lfs -text
+*.parquet filter=lfs diff=lfs merge=lfs -text
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.pickle filter=lfs diff=lfs merge=lfs -text
+*.pkl filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.pth filter=lfs diff=lfs merge=lfs -text
+*.rar filter=lfs diff=lfs merge=lfs -text
+*.safetensors filter=lfs diff=lfs merge=lfs -text
+saved_model/**/* filter=lfs diff=lfs merge=lfs -text
+*.tar.* filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
+*.tflite filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.wasm filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
+*tfevents* filter=lfs diff=lfs merge=lfs -text

Dockerfile

@@ -0,0 +1,55 @@
+FROM weishaw/sub2api:latest
+
+USER root
+
+# Install local Redis runtime dependencies.
+RUN set -eux; \
+    if command -v apk >/dev/null 2>&1; then \
+        apk add --no-cache \
+          bash \
+          ca-certificates \
+          netcat-openbsd \
+          redis \
+          postgresql15-client \
+          su-exec; \
+    elif command -v apt-get >/dev/null 2>&1; then \
+        apt-get update && apt-get install -y --no-install-recommends \
+          bash \
+          ca-certificates \
+          netcat-openbsd \
+          redis-server \
+          postgresql-client \
+          gosu \
+          && rm -rf /var/lib/apt/lists/*; \
+    else \
+        echo "No supported package manager found in base image"; \
+        exit 1; \
+    fi
+
+ENV PORT=8080 \
+    HOST=0.0.0.0 \
+    AUTO_SETUP=true \
+    ADMIN_EMAIL=admin@sub2api.com \
+    SERVER_HOST=0.0.0.0 \
+    SERVER_PORT=8080 \
+    DATABASE_HOST=pg-newapi-codeatlantis666.f.aivencloud.com \
+    DATABASE_PORT=22503 \
+    DATABASE_USER=avnadmin \
+    DATABASE_PASSWORD= \
+    DATABASE_DBNAME=sub2api \
+    DATABASE_SSLMODE=require \
+    DATABASE_SSLROOTCERT=/app/ca.pem \
+    REDIS_HOST=127.0.0.1 \
+    REDIS_PORT=6379 \
+    REDIS_DB=0 \
+    REDIS_PASSWORD="" \
+    REDIS_ENABLE_TLS=false \
+    REDIS_URL=redis://127.0.0.1:6379/0
+
+COPY hf-entrypoint.sh /usr/local/bin/hf-entrypoint.sh
+COPY ca.pem /app/ca.pem
+RUN sed -i 's/\r$//' /usr/local/bin/hf-entrypoint.sh \
+    && chmod +x /usr/local/bin/hf-entrypoint.sh
+
+EXPOSE 8080
+ENTRYPOINT ["/usr/local/bin/hf-entrypoint.sh"]

README.md

@@ -1,10 +1,11 @@
----
-title: Sub2api
-emoji: 👁
-colorFrom: gray
-colorTo: green
-sdk: docker
-pinned: false
----
-
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+---
+title: Sub2api
+emoji: 🚀
+colorFrom: red
+colorTo: green
+sdk: docker
+pinned: false
+app_port: 8080
+---
+
+Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference

ca.pem

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEQTCCAqmgAwIBAgIUUIvalUEGuCbKWGhDPHK8kH+ZX5MwDQYJKoZIhvcNAQEM
+BQAwOjE4MDYGA1UEAwwvNDBlZGM0ZWEtY2Q5ZS00MDhmLTk1NWQtNzk5Y2Y5ZmU5
+Yzk2IFByb2plY3QgQ0EwHhcNMjQwNDIwMDY0ODA0WhcNMzQwNDE4MDY0ODA0WjA6
+MTgwNgYDVQQDDC80MGVkYzRlYS1jZDllLTQwOGYtOTU1ZC03OTljZjlmZTljOTYg
+UHJvamVjdCBDQTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALbeRvoT
+xSFMyOWzNPL8W7S8rUy/GRI/TERJPQafcgYT2Fn4J5fql+OFPLa0uT7fZ0HeDjkM
+LeAqMNBJIF4O1IErzEbj/CEGoaeLKN3TRDENAhXSbG3ZsFGRR9YboCU0l9Z3qTL0
+nXRIJ/lMnhbDC10KXILRrESSrvVBWasgx86y+ZQr2nIdJeX1EC/hUYGp0AG89Goi
+2YxfzdxLVlyLOy9FUX1hm4KlWOKnJ5DWJDmngYsQBBI0SKZoujB/ReerB1bCJ6o/
+k2gHPy08qwtns5huz9pgC2BL7vTtGiHtHg6EXRsRcQciDhwIP1TkxROzvTWXuFg3
+4HjX3zZ/R/Yc+lXH0It0umsKYfphzQyB204oPbSoIKpUFoy0U2dALmtscrR7kt/5
+2o6sn2gP46fgFJLdDaButVDeSH504uEl0PXGohFwMV6MVIiiJWLsRvoVXaO0Ho5w
+ULlzK9FgfFnhy0YIMdcBfealdMsi2mUkruROMI6MnFh2Tw2ZihyekreONQIDAQAB
+oz8wPTAdBgNVHQ4EFgQU0mmAUizQPzYlq2vxup8aSHxeuKswDwYDVR0TBAgwBgEB
+/wIBADALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEMBQADggGBACVcnSou40huAkm+
+t/Hz2lQHlMfjsGs57lx4IIJTa8Tf5jbn+G5Us3IVFGQZSnu9EoFy1UiEryQ733u9
+Gbsbjau6nLJzk3DZUb2pQUxBQsZBU4NLlpikTwTvJvbOxuQEq1FTEjFp25Tr52G4
+u83szTo+dD9/+mRwrHt8KjyUF9/I+LMR7YhWGZfS2WFzKhC/qkGshAAAk3xoV7wW
+cHEmaXR9ume//c6uybQ0NvHXbTk30dEwfhbUpvy91XN2KpkdCBjQhohJGf5Eb2qY
+QJJzXmHfJWIfC5beHreYQdJY7wwbdCR8trmxUT8NsXTmYJzcGtwIvQmdhsPXehk7
+goBeVzZs1jv+F1ZIRII58NXRMHxzQpzh5xMKSESFE1KwaBCVWF7k/cSE+QvGBcKx
+2gw+2CRJ5DS3M9P16iPMUcdBec2MXTSuhBIXUgQGTakO73VskJUSTlukH3O7RfXs
+2PQq4Dgu3/cKEVMKpdz5Jb42n5M2PaX65c64aaOkCN0D32YKKw==
+-----END CERTIFICATE-----

hf-entrypoint.sh

@@ -0,0 +1,174 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "[boot] start redis"
+redis-server --bind 127.0.0.1 --port 6379 --daemonize yes
+
+export DATABASE_HOST="${DATABASE_HOST:-pg-newapi-codeatlantis666.f.aivencloud.com}"
+export DATABASE_PORT="${DATABASE_PORT:-22503}"
+export DATABASE_USER="${DATABASE_USER:-avnadmin}"
+export DATABASE_DBNAME="${DATABASE_DBNAME:-sub2api}"
+export DATABASE_SSLMODE="${DATABASE_SSLMODE:-require}"
+export DATABASE_SSLROOTCERT="${DATABASE_SSLROOTCERT:-/app/ca.pem}"
+
+if [ -z "${SQL_PASSWORD:-}" ]; then
+  echo "[error] SQL_PASSWORD is required. Set Space Secret SQL_PASSWORD."
+  echo "[error] You can provide either:"
+  echo "[error]   1) password only (recommended with DATABASE_USER), or"
+  echo "[error]   2) 'username:password' in SQL_PASSWORD."
+  exit 1
+fi
+
+if [ ! -f "${DATABASE_SSLROOTCERT}" ]; then
+  echo "[error] CA cert not found at ${DATABASE_SSLROOTCERT}."
+  echo "[error] Upload ca.pem and/or set DATABASE_SSLROOTCERT correctly."
+  exit 1
+fi
+
+if [[ "${SQL_PASSWORD}" == *:* ]]; then
+  export DATABASE_USER="${SQL_PASSWORD%%:*}"
+  export DATABASE_PASSWORD="${SQL_PASSWORD#*:}"
+else
+  export DATABASE_PASSWORD="${SQL_PASSWORD}"
+fi
+
+if command -v psql >/dev/null 2>&1; then
+  export PGHOST="${DATABASE_HOST}"
+  export PGPORT="${DATABASE_PORT}"
+  export PGUSER="${DATABASE_USER}"
+  export PGPASSWORD="${DATABASE_PASSWORD}"
+  export PGSSLMODE="${DATABASE_SSLMODE}"
+  export PGSSLROOTCERT="${DATABASE_SSLROOTCERT}"
+
+  if ! psql "dbname=postgres" -tAc "SELECT 1" >/dev/null 2>&1; then
+    echo "[boot] 'postgres' database missing or inaccessible, trying to create it..."
+    EXISTS_IN_TARGET=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT 1 FROM pg_database WHERE datname='postgres'" 2>/dev/null || true)
+    if [ "${EXISTS_IN_TARGET}" != "1" ]; then
+      if psql "dbname=${DATABASE_DBNAME}" -v ON_ERROR_STOP=1 -c "CREATE DATABASE postgres" >/dev/null 2>&1; then
+        echo "[boot] created database: postgres"
+      else
+        echo "[warn] failed to create database 'postgres'. Auto setup may fail if upstream still requires dbname=postgres."
+      fi
+    else
+      echo "[boot] database 'postgres' already exists"
+    fi
+  fi
+fi
+
+# sub2api AutoSetup currently uses a hard 60s migration context.
+# Pre-apply selected heavy migrations when needed to reduce timeout risk.
+is_true() {
+  case "${1:-}" in
+    1|t|T|true|TRUE|yes|YES|y|Y|on|ON) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+migration_applied() {
+  local mig_name="$1"
+  local out=""
+  if ! is_true "${SCHEMA_MIGRATIONS_EXISTS:-}"; then
+    echo "0"
+    return 0
+  fi
+  out=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT 1 FROM schema_migrations WHERE filename='${mig_name}' LIMIT 1" 2>/dev/null | tr -d '[:space:]' || true)
+  if [ "${out}" = "1" ]; then
+    echo "1"
+  else
+    echo "0"
+  fi
+}
+
+preapply_migration() {
+  local mig_name="$1"
+  local mig_url="$2"
+  local mig_sql="/tmp/${mig_name}"
+  if curl -fsSL "${mig_url}" -o "${mig_sql}" >/dev/null 2>&1; then
+    echo "[boot] pre-applying migration ${mig_name} ..."
+    if PGOPTIONS="-c statement_timeout=0 -c lock_timeout=0" psql "dbname=${DATABASE_DBNAME}" -v ON_ERROR_STOP=1 -f "${mig_sql}" >/dev/null 2>&1; then
+      echo "[boot] pre-apply ${mig_name} done"
+      rm -f "${mig_sql}" || true
+      return 0
+    fi
+    echo "[warn] pre-apply ${mig_name} failed; AutoSetup will continue with built-in migration flow"
+    rm -f "${mig_sql}" || true
+    return 1
+  fi
+  echo "[warn] failed to download migration ${mig_name} from ${mig_url}"
+  return 1
+}
+
+if command -v psql >/dev/null 2>&1 && command -v curl >/dev/null 2>&1; then
+  SCHEMA_MIGRATIONS_EXISTS=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT to_regclass('public.schema_migrations') IS NOT NULL" 2>/dev/null | tr -d '[:space:]' || true)
+  OPS_CORE_EXISTS=$(psql "dbname=${DATABASE_DBNAME}" -tAc "SELECT to_regclass('public.ops_error_logs') IS NOT NULL" 2>/dev/null | tr -d '[:space:]' || true)
+
+  MIG_033_APPLIED="$(migration_applied "033_ops_monitoring_vnext.sql")"
+  MIG_062_APPLIED="$(migration_applied "062_add_scheduler_and_usage_composite_indexes_notx.sql")"
+  MIG_065_APPLIED="$(migration_applied "065_add_search_trgm_indexes.sql")"
+
+  if [ "${MIG_033_APPLIED}" != "1" ]; then
+    # If ops core tables already exist, avoid re-running destructive 033 pre-apply.
+    if is_true "${OPS_CORE_EXISTS}"; then
+      echo "[boot] skip pre-apply 033: ops schema already present"
+    else
+      preapply_migration \
+        "033_ops_monitoring_vnext.sql" \
+        "${MIG_033_URL:-https://raw.githubusercontent.com/Wei-Shaw/sub2api/main/backend/migrations/033_ops_monitoring_vnext.sql}" || true
+    fi
+  fi
+
+  if [ "${MIG_062_APPLIED}" != "1" ]; then
+    preapply_migration \
+      "062_add_scheduler_and_usage_composite_indexes_notx.sql" \
+      "${MIG_062_URL:-https://raw.githubusercontent.com/Wei-Shaw/sub2api/main/backend/migrations/062_add_scheduler_and_usage_composite_indexes_notx.sql}" || true
+  fi
+
+  if [ "${MIG_065_APPLIED}" != "1" ]; then
+    preapply_migration \
+      "065_add_search_trgm_indexes.sql" \
+      "${MIG_065_URL:-https://raw.githubusercontent.com/Wei-Shaw/sub2api/main/backend/migrations/065_add_search_trgm_indexes.sql}" || true
+  fi
+fi
+
+DATABASE_QUERY="sslmode=${DATABASE_SSLMODE}&sslrootcert=${DATABASE_SSLROOTCERT}"
+if [ -n "${DATABASE_QUERY_EXTRA:-}" ]; then
+  DATABASE_QUERY="${DATABASE_QUERY}&${DATABASE_QUERY_EXTRA}"
+fi
+
+export DATABASE_URL="postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_DBNAME}?${DATABASE_QUERY}"
+export POSTGRES_URL="${DATABASE_URL}"
+export DB_URL="${DATABASE_URL}"
+export REDIS_URL="${REDIS_URL:-redis://127.0.0.1:6379/0}"
+export PORT="${PORT:-8080}"
+export HOST="${HOST:-0.0.0.0}"
+export AUTO_SETUP="${AUTO_SETUP:-true}"
+export ADMIN_EMAIL="${ADMIN_EMAIL:-admin@sub2api.com}"
+if [ -n "${SUB2API_ADMIN_PASSWORD:-}" ] && [ -z "${ADMIN_PASSWORD:-}" ]; then
+  export ADMIN_PASSWORD="${SUB2API_ADMIN_PASSWORD}"
+fi
+if [ -z "${ADMIN_PASSWORD:-}" ]; then
+  echo "[error] ADMIN_PASSWORD is required. Set Space Secret ADMIN_PASSWORD (or SUB2API_ADMIN_PASSWORD)."
+  exit 1
+fi
+export SERVER_HOST="${HOST}"
+export SERVER_PORT="${PORT}"
+export DATABASE_HOST="${DATABASE_HOST}"
+export DATABASE_PORT="${DATABASE_PORT}"
+export DATABASE_USER="${DATABASE_USER}"
+export DATABASE_PASSWORD="${DATABASE_PASSWORD}"
+export DATABASE_DBNAME="${DATABASE_DBNAME}"
+export DATABASE_SSLMODE="${DATABASE_SSLMODE}"
+export REDIS_HOST="${REDIS_HOST:-127.0.0.1}"
+export REDIS_PORT="${REDIS_PORT:-6379}"
+export REDIS_DB="${REDIS_DB:-0}"
+export REDIS_PASSWORD="${REDIS_PASSWORD:-}"
+export REDIS_ENABLE_TLS="${REDIS_ENABLE_TLS:-false}"
+
+echo "[boot] DATABASE_URL=postgresql://${DATABASE_USER}:******@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_DBNAME}?sslmode=${DATABASE_SSLMODE}&sslrootcert=${DATABASE_SSLROOTCERT}"
+echo "[boot] REDIS_URL=${REDIS_URL}"
+echo "[boot] APP_PORT=${PORT}"
+echo "[boot] ADMIN_EMAIL=${ADMIN_EMAIL}"
+
+# Start sub2api with the original entrypoint discovered from the base image.
+mkdir -p /app/data
+exec /app/sub2api