diff --git a/slo-checker/generic/Dockerfile b/slo-checker/generic/Dockerfile index f4bdbb04b5529f65908c20d99c38289901283966..2cbc89a150217f15b3c4ba921050db720a34bf50 100644 --- a/slo-checker/generic/Dockerfile +++ b/slo-checker/generic/Dockerfile @@ -7,7 +7,9 @@ RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt COPY ./app /code/app +WORKDIR /code/app + ENV HOST 0.0.0.0 ENV PORT 80 -CMD ["sh", "-c", "uvicorn app.main:app --host $HOST --port $PORT"] +CMD ["sh", "-c", "uvicorn main:app --host $HOST --port $PORT"] diff --git a/slo-checker/generic/app/test.py b/slo-checker/generic/app/test.py index 1b187191ee7fb79e1bf8e1a99c27595cffadf94b..2609225ddc9e6e96cdcd01db197cebbdd6501102 100644 --- a/slo-checker/generic/app/test.py +++ b/slo-checker/generic/app/test.py @@ -1,5 +1,5 @@ import unittest -from .main import app, get_aggr_func, check_result +from main import app, get_aggr_func, check_result import json from fastapi.testclient import TestClient diff --git a/slo-checker/generic/requirements.txt b/slo-checker/generic/requirements.txt index b81dc20e0af5a5aa67bb2b71390e5ef157e71846..4beb3b77a991f7d5b5754a7494065bbfe0b6590d 100644 --- a/slo-checker/generic/requirements.txt +++ b/slo-checker/generic/requirements.txt @@ -2,5 +2,5 @@ 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 +#scikit-learn==0.22.2 pandas==1.0.3 diff --git a/slo-checker/record-lag/Dockerfile b/slo-checker/record-lag/Dockerfile index f4bdbb04b5529f65908c20d99c38289901283966..2cbc89a150217f15b3c4ba921050db720a34bf50 100644 --- a/slo-checker/record-lag/Dockerfile +++ b/slo-checker/record-lag/Dockerfile @@ -7,7 +7,9 @@ RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt COPY ./app /code/app +WORKDIR /code/app + ENV HOST 0.0.0.0 ENV PORT 80 -CMD ["sh", "-c", "uvicorn app.main:app --host $HOST --port $PORT"] +CMD ["sh", "-c", "uvicorn 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 0fc3a84146b9f2af79178ccedbc4d593dd51ff2e..621fa0cfc9c27e809fd92752de93f2795fa32c05 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 -from .trend_slope_computer import compute +import trend_slope_computer as trend_slope_computer 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 = compute(df, warmup) + trend_slope = trend_slope_computer.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 a2ee65f5a0909a7e6dba41c001bd780a3afccca1..f1fe45015bb63287bc6b59490601c43d88eb878d 100644 --- a/slo-checker/record-lag/requirements.txt +++ b/slo-checker/record-lag/requirements.txt @@ -2,5 +2,5 @@ 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 +scikit-learn==0.22.2 pandas==1.0.3