diff options
| -rw-r--r-- | Dockerfile | 10 | ||||
| -rw-r--r-- | app/constants/constants.py (renamed from constants.py) | 2 | ||||
| -rw-r--r-- | app/energy_request/energy_request.py (renamed from energy_request.py) | 2 | ||||
| -rw-r--r-- | app/energy_service.py (renamed from energy_service.py) | 4 | ||||
| -rw-r--r-- | app/login/login.py (renamed from login.py) | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a12ab80 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM python:3.9 +WORKDIR /server + +COPY ./requirements.txt /server/requirements.txt + +RUN pip install --no-cache-dir --upgrade -r /server/requirements.txt + +COPY ./app /server/app + +CMD ["uvicorn", "app.energy_service:app", "--host", "0.0.0.0", "--port", "80"] diff --git a/constants.py b/app/constants/constants.py index ed594ec..f3ab71d 100644 --- a/constants.py +++ b/app/constants/constants.py @@ -1,4 +1,4 @@ -from credentials import * +from app.login.credentials import * # TODO: Organize this better diff --git a/energy_request.py b/app/energy_request/energy_request.py index 9b8542a..f6aac3f 100644 --- a/energy_request.py +++ b/app/energy_request/energy_request.py @@ -1,6 +1,6 @@ import json import requests -from constants import usageRequestCookies, genericRequestHeaders, electricUsageRequestJson, waterUsageRequestJson, waterRequestEndpoint, electricRequestEndpoint +from ..constants.constants import usageRequestCookies, genericRequestHeaders, electricUsageRequestJson, waterUsageRequestJson, waterRequestEndpoint, electricRequestEndpoint # Electric diff --git a/energy_service.py b/app/energy_service.py index ac3f6fe..8c43c8a 100644 --- a/energy_service.py +++ b/app/energy_service.py @@ -1,6 +1,6 @@ from fastapi import FastAPI -from login import login -from energy_request import request +from app.login.login import login +from app.energy_request.energy_request import request app = FastAPI(docs_url=None, redoc_url=None) diff --git a/login.py b/app/login/login.py index 67f4f67..511be44 100644 --- a/login.py +++ b/app/login/login.py @@ -1,6 +1,6 @@ import requests import re -from constants import loginPageHeaders, loginRequestJson, genericRequestHeaders, loginPageUri, loginRequestEndpoint +from ..constants.constants import loginPageHeaders, loginRequestJson, genericRequestHeaders, loginPageUri, loginRequestEndpoint def login(): # Grab generated session keys from viewing the webpage |
