Merge pull request #1 from matsuolab/master

.github/workflows/test.yml

@@ -21,6 +21,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install pytest great_expectations pandas scikit-learn flake8 black mypy pytest-cov
+        pip install mlflow numpy tensorflow
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
     - name: Lint with flake8
@@ -39,3 +40,13 @@ jobs:
     - name: Run model tests
       run: |
         pytest day5/演習3/tests/test_model.py -v
+
+    # 追加: モデルの推論精度・時間の検証
+    - name: Run model inference tests
+      run: |
+        pytest day5/演習3/tests/test_model_inference.py -v
+
+    # 追加: モデルのパフォーマンス比較テスト
+    - name: Run model performance comparison
+      run: |
+        pytest day5/演習3/tests/test_model_comparison.py -v

day5/演習2/black_check.py

@@ -1,7 +1,18 @@
+def say_hello(name):
+    print("Hello," + name + "!")  # greet
+
+
+def say_hello(name):
+    print("Hello," + name + "!")  # greet
+
+
+def add(a, b):
+    return a + b
+
+
+def add(a, b):
+    return a + b
+
 
-def say_hello(name):print("Hello,"+name+"!")   # greet
-def say_hello(name):print("Hello,"     +    name   +"!")   # greet
-def add( a,b):return a+b
-def add( a ,     b    ):return a+b
 def add(a, b):
-    return a+b
+    return a + b

day5/演習2/main.py

@@ -11,6 +11,7 @@
 import time
 import great_expectations as gx
 
+
 class DataLoader:
     """データロードを行うクラス"""
 

day5/演習3/tests/test_model_inference.py

@@ -0,0 +1,36 @@
+import pytest
+import time
+import os
+import pandas as pd
+from models.main import DataLoader, ModelTester  # パスはリポジトリ構成に合わせて変更
+
+
+def test_model_inference_accuracy():
+    """モデルの推論精度をテスト"""
+    # モデル読み込み
+    model = ModelTester.load_model("models/titanic_model.pkl")
+
+    # テストデータの読み込みと前処理
+    data = DataLoader.load_titanic_data("data/Titanic.csv")
+    X, y = DataLoader.preprocess_titanic_data(data)
+
+    # 精度評価
+    y_pred = model.predict(X)
+    accuracy = (y_pred == y).mean()
+
+    # 閾値に基づくテスト
+    assert accuracy >= 0.75, f"Accuracy too low: {accuracy:.4f}"
+
+
+def test_model_inference_time():
+    """モデルの推論時間をテスト"""
+    model = ModelTester.load_model("models/titanic_model.pkl")
+    data = DataLoader.load_titanic_data("data/Titanic.csv")
+    X, _ = DataLoader.preprocess_titanic_data(data)
+
+    start = time.time()
+    _ = model.predict(X)
+    elapsed = time.time() - start
+
+    assert elapsed < 1.0, f"Inference took too long: {elapsed:.4f} sec"
+