Merge pull request #207 from MindSetLib/dev

Dev

.github/workflows/insolver-pypi-release.yaml

@@ -27,7 +27,7 @@ jobs:
     - name: Install dependencies
       shell: bash
       run: |
-        pip install -U pip setuptools wheel
+        python -m pip install --upgrade pip setuptools wheel
         poetry self add poetry-version-plugin
     - name: Build a binary wheel and a source tarball
       run: poetry build

.github/workflows/insolver-tests.yaml

@@ -36,7 +36,7 @@ jobs:
     - name: Install dependencies
       shell: bash
       run: |
-        pip install -U pip setuptools wheel
+        python -m pip install --upgrade pip setuptools wheel
         poetry install --extras "all" --with dev --no-interaction
     - name: Lint with black
       shell: bash

README.md

@@ -17,6 +17,7 @@ Insolver can be installed via pip from PyPI. There are several installation opti
 |----------------------------------------------------|---------------------------------------------|
 | Regular installation                               | `pip install insolver`                      |
 | Installation with feature engineering requirements | `pip install insolver[feature_engineering]` |
+| Installation with feature monitoring requirements  | `pip install insolver[feature_monitoring]`  |
 | Installation with interpretation requirements      | `pip install insolver[interpretation]`      |
 | Installation with serving requirements             | `pip install insolver[serving]`             |
 | Installation with report requirements              | `pip install insolver[report]`              |

insolver/pricing/optimization.py

@@ -19,7 +19,7 @@ def max_conversion(x: np.ndarray, threshold: Union[float, int] = 0.5) -> np.ndar
     orig = x[np.abs(x[:, 0] - x[:, 1].max()) < 0.01]  # [:, 0] for price, [:, 1] for orig_price
     if orig.shape[0] == 0:
         orig = max_profit(x)
-    if x[:, 3].min() >= 0.5:  # [:, 3] for orig_pred
+    if x[:, 3].min() >= threshold:  # [:, 3] for orig_pred
         choice = orig
     else:
         converted = x[x[:, 2] >= threshold]

pyproject.toml

@@ -100,6 +100,7 @@ sphinxcontrib-serializinghtml = "*"
 
 [tool.poetry.extras]
 feature_engineering = ["statsmodels"]
+feature_monitoring = ["Jinja2"]
 interpretation = ["alibi", "dice-ml", "lime"]
 report = ["Jinja2", "lime", "ydata-profiling"]
 serving = ["Flask", "fastapi", "uvicorn", "pydantic", "gunicorn", "Django", "djangorestframework", "sympy", "Jinja2"]

serving_docker/Dockerfile

@@ -1,7 +1,7 @@
-FROM python:3.8
+FROM python:3.10
 
 # Setup build arguments
-ARG INSOLVER_VER=0.4.11
+ARG INSOLVER_VER=0.4.28
 ARG MODEL
 ARG TRANSFORMS
 

tests/feature_monitoring/test_HomogeneityReport.py

@@ -29,3 +29,4 @@
 os.rmdir('./datasets/')
 
 assert os.path.exists('homogeneity_report.html')
+os.remove('homogeneity_report.html')