From 5016cc0b5e1705c606071a3712822e277aac4cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de> Date: Sun, 23 Jan 2022 17:58:09 +0100 Subject: [PATCH] Fix path and import errors --- slo-checker/generic/Dockerfile | 4 +++- slo-checker/generic/app/test.py | 2 +- slo-checker/generic/requirements.txt | 2 +- slo-checker/record-lag/Dockerfile | 4 +++- slo-checker/record-lag/app/main.py | 4 ++-- slo-checker/record-lag/requirements.txt | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/slo-checker/generic/Dockerfile b/slo-checker/generic/Dockerfile index f4bdbb04b..2cbc89a15 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 1b187191e..2609225dd 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 b81dc20e0..4beb3b77a 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 f4bdbb04b..2cbc89a15 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 0fc3a8414..621fa0cfc 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 a2ee65f5a..f1fe45015 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 -- GitLab