First set of API refactor changes

server/.env.example

@@ -1,32 +1,27 @@
 
-############################### API SETTINGS #############################
-
-# Server
-HOST=0.0.0.0
-PORT=5000
-DEBUG=0
-ACCESS_LOG=1
-AUTO_RELOAD=1
-WORKERS=1
-TMP_DIR=./__tmp__
-UPDATE_ON_START=0
-
-# Database
-DATABASE_URL=postgresql://311_user:311_pass@db:5432/311_db
-DATABASE_LOG_QUERIES=0
-
-# Redis
-REDIS_ENABLED=1
-REDIS_URL=redis://redis:6379
-REDIS_TTL_SECONDS=3600
-
-# Picklebase
-PICKLEBASE_ENABLED=0
-PICKLEBASE_BATCH_SIZE=400000
-
-# Picklecache
-PICKLECACHE_ENABLED=0
-PICKLECACHE_TTL_SECONDS=3600
+
+######################### DOCKER-COMPOSE SETTINGS ########################
+
+COMPOSE_PROJECT_NAME=311_data
+
+# host/public configs
+API_HOST_PORT=5000
+DB_HOST_PORT=5433
+
+# api config
+DEBUG=True
+API_RESTART_POLICY=no
+APP_PORT=5000
+
+# db connection config
+DB_HOST=db
+DB_PORT=5432
+DB_USER=311_user
+DB_PASS=311_pass
+DB_NAME=311_db
+DB_ECHO=False
+
+############################ 3RD PARTY TOOLS ##############################
 
 # Socrata
 SOCRATA_TOKEN=
@@ -45,14 +40,4 @@ SLACK_ERROR_CODES=[400, 500]
 # Sendgrid
 SENDGRID_API_KEY=
 
-######################### DOCKER-COMPOSE SETTINGS ########################
-
-COMPOSE_PROJECT_NAME=311_data
-DB_USER=311_user
-DB_PASS=311_pass
-DB_NAME=311_db
-DB_HOST_PORT=5433
-API_HOST_PORT=5000
-API_RESTART_POLICY=no
-
-################################# OVERRIDES ##############################
+############################################################################

server/api/.dockerignore

@@ -0,0 +1,5 @@
+# ignore .git and .cache folders
+Pipfile
+Pipfile.lock
+__pycache__
+__tmp__

server/api/Dockerfile

@@ -1,23 +1,17 @@
-FROM python:3.7-slim
+FROM python:3.7
 
-RUN apt-get update && \
-    apt-get install -yq \
-      python3 \
-      python3-dev \
-      gcc \
-      g++ \
-      gfortran \
-      musl-dev && \
-    pip install --upgrade pip
+WORKDIR /home/api
 
-COPY requirements.txt /home/api/
+COPY requirements.txt .
 
 RUN pip install --no-cache-dir -r /home/api/requirements.txt
 
-COPY setup.cfg /home/api/
-COPY /bin /home/api/bin/
-COPY .env* /src /home/api/src/
+COPY . .
 
-WORKDIR /home/api
+ENV APP_HOST=0.0.0.0
+# need add the src folder to sys.path for compatibility
+ENV PYTHONPATH=/home/api/src
+
+EXPOSE 5000
 
-CMD python bin/api_check.py && python bin/api_start.py
+CMD python code/run.py

server/api/Pipfile

@@ -24,6 +24,10 @@ sendgrid = "*"
 sodapy = "*"
 SQLAlchemy = "*"
 tabulate = "*"
+gino = {extras = ["starlette"], version = "*"}
+fastapi = "*"
+uvicorn = "*"
+gunicorn = "*"
 
 [requires]
 python_version = "3.7"