From d685f7b30c3eae28fd5081a5ebd44f7a454f3bfb Mon Sep 17 00:00:00 2001 From: Michael Merry Okungbowa Date: Thu, 9 Nov 2023 09:50:52 +0000 Subject: [PATCH 1/5] mikosa for real --- .circleci/config.yml | 2 +- packages/ml_api/requirements.txt | 7 ++++++- packages/ml_api/tests/test_controller.py | 2 +- packages/regression_model/requirements.txt | 16 ++++++++-------- packages/regression_model/tests/test_predict.py | 2 +- scripts/fetch_kaggle_dataset.sh | 4 +++- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc490b4a3..b3069eaf8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 defaults: &defaults docker: - - image: circleci/python:3.7.2 + - image: circleci/python:3.8 working_directory: ~/project prepare_venv: &prepare_venv diff --git a/packages/ml_api/requirements.txt b/packages/ml_api/requirements.txt index a21d786b7..4c1625a16 100644 --- a/packages/ml_api/requirements.txt +++ b/packages/ml_api/requirements.txt @@ -1,7 +1,12 @@ --extra-index-url=${PIP_EXTRA_INDEX_URL} # api -flask==1.0.2 +flask==1.1.1 +jinja2==2.10.3 +markupsafe==1.1.1 +itsdangerous==1.1.0 +werkzeug==0.16.0 + # schema validation marshmallow==2.17.0 diff --git a/packages/ml_api/tests/test_controller.py b/packages/ml_api/tests/test_controller.py index cc0beb09f..9f5d1b878 100644 --- a/packages/ml_api/tests/test_controller.py +++ b/packages/ml_api/tests/test_controller.py @@ -45,5 +45,5 @@ def test_prediction_endpoint_returns_prediction(flask_test_client): response_json = json.loads(response.data) prediction = response_json['predictions'] response_version = response_json['version'] - assert math.ceil(prediction[0]) == 112476 + assert math.ceil(prediction[0]) == 112512 assert response_version == _version diff --git a/packages/regression_model/requirements.txt b/packages/regression_model/requirements.txt index 919b75917..dc681c01b 100644 --- a/packages/regression_model/requirements.txt +++ b/packages/regression_model/requirements.txt @@ -3,17 +3,17 @@ # updates/fixes, whilst ensuring we don't install a major update which could introduce backwards incompatible changes. # Model Building Requirements -numpy>=1.18.1,<1.19.0 -pandas>=0.25.3,<0.26.0 -scikit-learn>=0.22.1,<0.23.0 -joblib>=0.14.1,<0.15.0 +numpy>=1.18.1 +pandas>=0.25.3 +scikit-learn>=0.21.3 +joblib>=0.14.1 # testing requirements -pytest>=5.3.2,<6.0.0 +pytest>=5.3.2 # packaging -setuptools>=41.4.0,<42.0.0 -wheel>=0.33.6,<0.34.0 +setuptools>=41.4.0 +wheel>=0.33.6 # fetching datasets -kaggle>=1.5.6,<1.6.0 +kaggle>=1.5.6 diff --git a/packages/regression_model/tests/test_predict.py b/packages/regression_model/tests/test_predict.py index 3c7147f89..8d74205c0 100644 --- a/packages/regression_model/tests/test_predict.py +++ b/packages/regression_model/tests/test_predict.py @@ -15,7 +15,7 @@ def test_make_single_prediction(): # Then assert subject is not None assert isinstance(subject.get('predictions')[0], float) - assert math.ceil(subject.get('predictions')[0]) == 112476 + assert math.ceil(subject.get('predictions')[0]) == 112512 def test_make_multiple_predictions(): diff --git a/scripts/fetch_kaggle_dataset.sh b/scripts/fetch_kaggle_dataset.sh index 455b9c970..b8226abc5 100644 --- a/scripts/fetch_kaggle_dataset.sh +++ b/scripts/fetch_kaggle_dataset.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash -kaggle competitions download -c house-prices-advanced-regression-techniques -p packages/regression_model/regression_model/datasets/ \ No newline at end of file +kaggle competitions download -c house-prices-advanced-regression-techniques -p packages/regression_model/regression_model/datasets/ + + unzip packages/regression_model/regression_model/datasets/house-prices-advanced-regression-techniques.zip -d packages/regression_model/regression_model/datasets \ No newline at end of file From 4cc44925fb5f4c3f7d8ab158985964b33c811abc Mon Sep 17 00:00:00 2001 From: Michael Merry Okungbowa Date: Thu, 9 Nov 2023 09:52:39 +0000 Subject: [PATCH 2/5] mikosa for real --- .../regression_model/processing/preprocessors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/regression_model/regression_model/processing/preprocessors.py b/packages/regression_model/regression_model/processing/preprocessors.py index 47326120f..d5f771dc5 100644 --- a/packages/regression_model/regression_model/processing/preprocessors.py +++ b/packages/regression_model/regression_model/processing/preprocessors.py @@ -91,7 +91,7 @@ def fit(self, X, y=None): for var in self.variables: # the encoder will learn the most frequent categories - t = pd.Series(X[var].value_counts() / np.float(len(X))) + t = pd.Series(X[var].value_counts() / np.float64(len(X))) # frequent labels: self.encoder_dict_[var] = list(t[t >= self.tol].index) From 0990f56b307ad43e50484a9833006bee59f90cb1 Mon Sep 17 00:00:00 2001 From: Michael Merry Okungbowa Date: Thu, 9 Nov 2023 09:57:47 +0000 Subject: [PATCH 3/5] mikosa for real --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 692a61f79..b1580e9b2 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # Deploying Machine Learning Models -For the documentation, visit the course on Udemy. +For the documentation, visit the course on Udemy From 6cd8a0b6bc3ce97758bf16a4e227107e19d91cf0 Mon Sep 17 00:00:00 2001 From: Michael Merry Okungbowa Date: Thu, 9 Nov 2023 10:02:47 +0000 Subject: [PATCH 4/5] mikosa for real --- packages/ml_api/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ml_api/requirements.txt b/packages/ml_api/requirements.txt index 4c1625a16..4c1edebc2 100644 --- a/packages/ml_api/requirements.txt +++ b/packages/ml_api/requirements.txt @@ -12,4 +12,4 @@ werkzeug==0.16.0 marshmallow==2.17.0 # Install from gemfury -regression-model==1.0.0 \ No newline at end of file +regression-model==0.1.1 \ No newline at end of file From 36fd5b6e528a61394738f94df992c4596d8ea217 Mon Sep 17 00:00:00 2001 From: Michael Merry Okungbowa Date: Thu, 9 Nov 2023 10:04:49 +0000 Subject: [PATCH 5/5] mikosa for real --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b1580e9b2..ab7ed9131 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # Deploying Machine Learning Models -For the documentation, visit the course on Udemy +For the documentation, visit the course on Udemy.