first_commit

Author: t33nsy

Dockerfile

@@ -12,3 +12,8 @@ COPY . .
 
 ENV PYTHONPATH='/project/:/project/app/'
 WORKDIR /project/app
+
+RUN STATIC_HASH=$(find app/static -type f -exec md5sum {} \; | md5sum | cut -d' ' -f1) && \
+    echo $STATIC_HASH >> /APP_STATIC_HASH 
+
+ENV APP_STATIC_HASH_FILE=/APP_STATIC_HASH

app/config.py

@@ -1,3 +1,4 @@
+import os
 from configparser import ConfigParser
 from collections import OrderedDict
 
@@ -24,3 +25,21 @@ def init_config(config_path):
         config_raw = ConfigParser()
         config_raw.read(config_path)
         Config.c = DictToObject(config_raw._sections)
+
+class VersionCache:
+    _instance = None
+    
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            hash_file = os.getenv("APP_STATIC_HASH_FILE", "dev")
+            if hash_file and os.path.exists(hash_file):
+                with open(hash_file) as f:
+                    cls._instance.version=f.read().split()
+            else:
+                cls._instance.version = "dev"
+            return cls._instance
+    
+    @classmethod
+    def get_version(cls):
+        return cls().version

app/templates/user_info.html

@@ -11,7 +11,7 @@
 </div>
 
 
-<script src="/static/js/libraries/jquery.min.js"></script>
-<script src="/static/js/user_info.js"></script>
+<script src="{{ versioned_url('js/libraries/jquery.min.js') }}"></script>
+<script src="{{ versioned_url('js/user_info.js') }}"></script>
 
 {% endblock %}

app/utils.py

@@ -7,14 +7,14 @@
 
 import fitz
 from bson import ObjectId
-from flask import json
+from flask import json, url_for
 import magic
 import pymorphy2
 from nltk.corpus import stopwords
 from pydub import AudioSegment
 import subprocess
 
-from app.config import Config
+from app.config import Config, VersionCache
 
 PDF_HEX_START = ['25', '50', '44', '46']
 SECONDS_PER_MINUTE = 60
@@ -209,6 +209,10 @@ def delete_punctuation(text: str) -> str:
     return text.translate(str.maketrans('', '', string.punctuation + "\t\n\r\v\f"))
 
 
+def versioned_url(filename):
+    v = VersionCache.get_version()
+    return url_for('static', filename=filename) + f'?v={v}'
+
 class RepeatedTimer:
     """
     Utility class to call a function with a given interval between the end and the beginning of consecutive calls

app/web_speech_trainer.py

@@ -34,7 +34,7 @@
 from app.routes.capacity import routes_capacity
 from app.status import PassBackStatus, TrainingStatus
 from app.training_manager import TrainingManager
-from app.utils import ALLOWED_EXTENSIONS, DEFAULT_EXTENSION
+from app.utils import ALLOWED_EXTENSIONS, DEFAULT_EXTENSION, versioned_url
 
 app = Flask(__name__)
 app.register_blueprint(api_audio)
@@ -57,6 +57,7 @@
 app.register_blueprint(routes_task_attempts)
 app.register_blueprint(routes_version)
 app.register_blueprint(routes_capacity)
+app.jinja_env.globals['versioned_url'] = versioned_url
 
 logger = get_root_logger(service_name='web')