Skip to content

Commit

Permalink
add model api
Browse files Browse the repository at this point in the history
  • Loading branch information
Kacper Kubara authored and Kacper Kubara committed Jan 12, 2023
1 parent e393337 commit fb15eb8
Show file tree
Hide file tree
Showing 22 changed files with 42,885 additions and 10 deletions.
160 changes: 160 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ lint:
.PHONY: test
test:
python3 -m pytest --version
python3 -m pytest tests
python3 -m pytest src/tests
.PHONY: black
black:
python3 -m black --version
Expand Down
Binary file removed __pycache__/base.cpython-311.pyc
Binary file not shown.
Binary file removed __pycache__/base.cpython-38.pyc
Binary file not shown.
Binary file removed __pycache__/featurizing.cpython-38.pyc
Binary file not shown.
Binary file removed __pycache__/preprocessing.cpython-311.pyc
Binary file not shown.
Binary file removed __pycache__/preprocessing.cpython-38.pyc
Binary file not shown.
42,659 changes: 42,659 additions & 0 deletions data/X_test.csv

Large diffs are not rendered by default.

Binary file removed models/label_encoder.pickle
Binary file not shown.
Binary file removed models/random_forest_classifier.pickle
Binary file not shown.
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"
8 changes: 8 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[metadata]
name = mypackage
version = 0.0.1

[options]
install_requires =
requests
importlib-metadata; python_version < "3.8"
Empty file added src/__init__.py
Empty file.
File renamed without changes.
File renamed without changes.
34 changes: 34 additions & 0 deletions src/main.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
from fastapi import FastAPI
from pydantic import BaseModel

from typing import Dict

from pipelines import train_pipeline, predict_pipeline

app = FastAPI()


class InputData(BaseModel):
pass # ToDo: finish implementation


@app.get("/train/")
def train():
print("Retraining the model")
train_pipeline()
return "Success"


@app.post("/predict/")
def predict(input_data: Dict):
# input_data = InputDate(**input_data)
if input_data["mode"] == "test":
pred = predict_pipeline(X_test=None)
else:
pred = predict_pipeline(X_test=input_data)
return {"results": pred.tolist()}


@app.get("/hello-world/")
def hello_world():
return "Hello World"
16 changes: 14 additions & 2 deletions pipeline.py → src/pipelines.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import pickle

from sklearn.preprocessing import LabelEncoder
from sklearn.ensemble import RandomForestClassifier
from sklearn.pipeline import make_pipeline
import pandas as pd

from preprocessing import PreProcessor
from featurizing import Featurizer
Expand All @@ -18,7 +21,16 @@ def train_pipeline():
pipe = make_pipeline(featurization_pipeline, rfc)
print("Model fit")
pipe.fit(X_train, y_train)
pickle.dump(pipe, open("./models/rfc.pkl", "wb"))
X_test.to_csv("./data/X_test.csv")


def predict_pipeline(X_test=None):
# Assumption that data ispreprocessed already
if X_test is None:
# Use dummy data then
X_test = pd.read_csv("./data/X_test.csv")

if __name__ == "__main__":
train_pipeline()
# Use the featurization and model pipeline
model = pickle.load(open("./models/rfc.pkl", "rb"))
return model.predict(X_test)
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/test_base.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from abc import ABC

from base import Runner
from src.base import Runner


def test_runner_init():
Expand Down
7 changes: 3 additions & 4 deletions tests/test_featurizing.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import pytest
import pandas as pd

from preprocessing import PreProcessor
from featurizing import Featurizer
from base import Runner
from src.preprocessing import PreProcessor
from src.featurizing import Featurizer
from src.base import Runner


@pytest.fixture
Expand Down
4 changes: 2 additions & 2 deletions tests/test_preprocessing.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import pytest
import pandas as pd

from preprocessing import PreProcessor
from base import Runner
from src.preprocessing import PreProcessor
from src.base import Runner


@pytest.fixture
Expand Down

0 comments on commit fb15eb8

Please sign in to comment.