From 54a9ca52ded59c43e0e89282fd794eba62e60f5b Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Tue, 22 Nov 2022 18:02:03 +0100
Subject: [PATCH] refactoring

---
 src/CaptchaReader.py      | 19 ++++++++++++-------
 src/HowBadIsMyBatch.ipynb |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/CaptchaReader.py b/src/CaptchaReader.py
index e537e478aff..5ca351e4d61 100644
--- a/src/CaptchaReader.py
+++ b/src/CaptchaReader.py
@@ -56,18 +56,23 @@ def decode_batch_predictions(pred):
         output_text.append(res)
     return output_text
 
+model = None
+def _getModel():
+    global model
+    if model is None:
+        print("loading model...")
+        model = load_model()
+        model.summary()
+    return model
+
 def load_model():
     _model = keras.models.load_model('model')
-    model = keras.models.Model(
+    __model = keras.models.Model(
         _model.get_layer(name="image").input,
         _model.get_layer(name="dense2").output)
-    return model
+    return __model
 
 def getTextInCaptchaImage(captchaImageFile):
     batchImages = encode_single_sample(captchaImageFile)
-    preds = model.predict(batchImages)
+    preds = _getModel().predict(batchImages)
     return decode_batch_predictions(preds)[0]
-
-print("loading model...")
-model = load_model()
-model.summary()
\ No newline at end of file
diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index 14afaa20aa3..18515fda151 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -38,7 +38,7 @@
    "source": [
     "dateProvider = DateProvider()\n",
     "print('          lastUpdated:', dateProvider.getLastUpdated())\n",
-    "print('lastUpdatedDataSource:', dateProvider.getLastUpdatedDataSource())        \n",
+    "print('lastUpdatedDataSource:', dateProvider.getLastUpdatedDataSource())\n",
     "needsUpdate = dateProvider.needsUpdate()\n",
     "print('needsUpdate:', needsUpdate)"
    ]
@@ -81,7 +81,7 @@
    "outputs": [],
    "source": [
     "updateVAERSFiles(\n",
-    "        needsUpdate,\n",
+    "        needsUpdate = needsUpdate,\n",
     "        years = [2022],\n",
     "        workingDirectory = getWorkingDirectory())"
    ]