diff --git a/slo-checker/record-lag/Dockerfile b/slo-checker/record-lag/Dockerfile index 032b8153a6989ca04631ba553289dacb3620a38d..f4bdbb04b5529f65908c20d99c38289901283966 100644 --- a/slo-checker/record-lag/Dockerfile +++ b/slo-checker/record-lag/Dockerfile @@ -1,6 +1,13 @@ -FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7 +FROM python:3.8 -COPY requirements.txt requirements.txt -RUN pip install -r requirements.txt +WORKDIR /code -COPY ./app /app \ No newline at end of file +COPY ./requirements.txt /code/requirements.txt +RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt + +COPY ./app /code/app + +ENV HOST 0.0.0.0 +ENV PORT 80 + +CMD ["sh", "-c", "uvicorn app.main:app --host $HOST --port $PORT"] diff --git a/slo-checker/record-lag/app/main.py b/slo-checker/record-lag/app/main.py index 621fa0cfc9c27e809fd92752de93f2795fa32c05..0fc3a84146b9f2af79178ccedbc4d593dd51ff2e 100644 --- a/slo-checker/record-lag/app/main.py +++ b/slo-checker/record-lag/app/main.py @@ -1,5 +1,5 @@ from fastapi import FastAPI,Request -import trend_slope_computer as trend_slope_computer +from .trend_slope_computer import compute import logging import os import pandas as pd @@ -33,7 +33,7 @@ def calculate_slope_trend(results, warmup): logger.info("Calculating trend slope with warmup of %s seconds for data frame:\n %s", warmup, df) try: - trend_slope = trend_slope_computer.compute(df, warmup) + trend_slope = compute(df, warmup) except Exception as e: err_msg = 'Computing trend slope failed.' logger.exception(err_msg) diff --git a/slo-checker/record-lag/requirements.txt b/slo-checker/record-lag/requirements.txt index 8b6c3863226c2bd5e8bcd7982b2674dee593f192..a2ee65f5a0909a7e6dba41c001bd780a3afccca1 100644 --- a/slo-checker/record-lag/requirements.txt +++ b/slo-checker/record-lag/requirements.txt @@ -1,5 +1,6 @@ -fastapi==0.65.2 +#requests +fastapi>=0.68.0,<0.69.0 +uvicorn>=0.15.0,<0.16.0 +#pydantic>=1.8.0,<2.0.0 scikit-learn==0.20.3 pandas==1.0.3 -uvicorn -requests