From 0dd48dca6014ce31a8098cb878724e8d391f761b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Schmelczer?= <andras@schmelczer.dev>
Date: Sun, 10 Apr 2022 14:43:21 +0200
Subject: [PATCH] Simplify example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: András Schmelczer <andras@schmelczer.dev>
---
 .gitignore                          |  4 +++-
 .vscode/settings.json               |  1 +
 example/.gitignore                  |  3 ---
 example/config.py                   |  1 -
 example/main_batch.py               |  2 ++
 example/models/__init__.py          |  1 -
 example/models/domain_prediction.py |  9 ---------
 example/predict_domain.py           | 11 ++++++++---
 example/train.ipynb                 |  8 ++++----
 9 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 example/.gitignore
 delete mode 100644 example/config.py
 delete mode 100644 example/models/__init__.py
 delete mode 100644 example/models/domain_prediction.py

diff --git a/.gitignore b/.gitignore
index 0a758d8..3d5ab14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@
 __pycache__
 .cache
 .mypy_cache
-.pytest_cache
\ No newline at end of file
+.pytest_cache
+**/.ipynb_checkpoints
+**/tracing_database.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 097fc0d..d9a251a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,6 +9,7 @@
     "psutil",
     "pydantic",
     "pyplot",
+    "redoc",
     "sklearn",
     "starlette",
     "Tfidf",
diff --git a/example/.gitignore b/example/.gitignore
deleted file mode 100644
index 2f87778..0000000
--- a/example/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-data
-.ipynb_checkpoints
-tracing_database.json
diff --git a/example/config.py b/example/config.py
deleted file mode 100644
index 88cc87f..0000000
--- a/example/config.py
+++ /dev/null
@@ -1 +0,0 @@
-model_key = "small-domain-prediction-v2"
diff --git a/example/main_batch.py b/example/main_batch.py
index 121cbbf..0325196 100644
--- a/example/main_batch.py
+++ b/example/main_batch.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import json
 from random import shuffle
 
diff --git a/example/models/__init__.py b/example/models/__init__.py
deleted file mode 100644
index 2d8e188..0000000
--- a/example/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .domain_prediction import DomainPrediction
diff --git a/example/models/domain_prediction.py b/example/models/domain_prediction.py
deleted file mode 100644
index 0ca53c1..0000000
--- a/example/models/domain_prediction.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from typing import List
-
-from pydantic import BaseModel
-
-
-class DomainPrediction(BaseModel):
-    domain: str
-    probability: float
-    explanation: List[str]
diff --git a/example/predict_domain.py b/example/predict_domain.py
index 553b8ff..d301b1c 100644
--- a/example/predict_domain.py
+++ b/example/predict_domain.py
@@ -1,16 +1,21 @@
 import re
 from typing import Dict, Iterable, List
 
-from config import model_key
-from models import DomainPrediction
 from preprocess import preprocess
+from pydantic import BaseModel
 from sklearn.pipeline import Pipeline
 
 from good_ai import log_argument, log_metric, use_model
 from good_ai.utilities.clean import clean
 
 
-@use_model(model_key, version="latest")
+class DomainPrediction(BaseModel):
+    domain: str
+    probability: float
+    explanation: List[str]
+
+
+@use_model("small-domain-prediction-v2", version="latest")
 @log_argument("text", validator=lambda t: len(t) > 0)
 def predict_domain(
     text: str, model: Pipeline, cut_off_probability: float = 0.2
diff --git a/example/train.ipynb b/example/train.ipynb
index dc00dfe..0ce23df 100644
--- a/example/train.ipynb
+++ b/example/train.ipynb
@@ -29,8 +29,7 @@
     "from good_ai.utilities.language import is_english, predict_language\n",
     "from good_ai import save_model, set_default_config, LargeFile\n",
     "\n",
-    "from preprocess import preprocess\n",
-    "from config import model_key"
+    "from preprocess import preprocess"
    ]
   },
   {
@@ -48,7 +47,8 @@
    "source": [
     "PREFIX = \"domain-\"\n",
     "DATASET_KEY = \"data\"\n",
-    "MAX_FILE_COUNT = 5"
+    "MAX_FILE_COUNT = 5\n",
+    "MODEL_KEY = \"small-domain-prediction-v2\""
    ]
   },
   {
@@ -774,7 +774,7 @@
     }
    ],
    "source": [
-    "save_model(classifier, key=model_key, keep_last_n=1)"
+    "save_model(classifier, key=MODEL_KEY, keep_last_n=1)"
    ]
   }
  ],