docker stack deployment

.gitignore

@@ -1,5 +1,7 @@
 data/samples/
 data/wordlist.json
+data/sskj_senses.json
+data/appindex.json
 *egg-info/
 *.pyc
 src/frontend_vue/node_modules/

Dockerfile-backend-flask

@@ -0,0 +1,16 @@
+FROM cjvt-python-env
+
+RUN mkdir -p /project/src/backend_flask
+RUN mkdir -p /project/src/pkg
+RUN mkdir -p /project/data
+
+COPY src/backend_flask /project/src/backend_flask
+COPY src/pkg /project/src/pkg
+
+COPY data/appindex.json /project/data
+
+COPY src/backend_flask/entrypoint.sh /.
+
+COPY src/backend_flask/conf_files/prod_conf.yaml /project
+
+ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

Makefile

@@ -21,6 +21,9 @@ KRES_SRL_FOLDER = "/home/kristjan/kres_data/payload/kres_json"
 SSKJ_WORDLIST = "$(MAKE_ROOT)/data/wordlist.json"
 SSKJ_JSON = "$(MAKE_ROOT)/data/sskj_senses.json"
 
+# for pre-generation the index of all headwords and functors
+APPINDEX_PATH = "$(MAKE_ROOT)/data/appindex.json"
+
 OUTPUT = "db"
 # OUTPUT = "file"
 OUTDIR = "/tmp/three"  # if you're running this in docker, make sure to mount the volume
@@ -102,6 +105,9 @@ frontend-dev:
 frontend-prod:
 	cd src/frontend_vue/; $(MAKE) prod
 
+build-frontend-prod:
+	cd src/frontend_vue/; $(MAKE) build-prod
+
 
 ## Backend
 
@@ -112,17 +118,23 @@ backend-prepare-db:
 		--config-file ./conf_files/dev_conf.yaml \
 		--dbuser $(DB_USR_USER) --dbpass $(DB_USR_PASS) --dbaddr $(DBADDR) \
 		--sskj-wordlist $(SSKJ_WORDLIST) \
+		--appindex-json $(APPINDEX_PATH) \
 		--prepare-db
 
 backend-dev:
 	cd ./src/backend_flask; python3 app.py \
 		--config-file ./conf_files/dev_conf.yaml \
-		--dbuser $(DB_USR_USER) --dbpass $(DB_USR_PASS) --dbaddr $(DBADDR)
+		--dbuser $(DB_USR_USER) --dbpass $(DB_USR_PASS) --dbaddr $(DBADDR) \
+		--appindex-json $(APPINDEX_PATH)
 
-backend-prod:
+backend-prod-old:
 	cd ./src/backend_flask; python3 app.py \
 		--config-file ./conf_files/prod_conf.yaml \
-		--dbuser $(DB_USR_USER) --dbpass $(DB_USR_PASS) --dbaddr $(DBADDR)
+		--dbuser $(DB_USR_USER) --dbpass $(DB_USR_PASS) --dbaddr $(DBADDR) \
+		--appindex-json $(APPINDEX_PATH)
+
+build-backend-flask:
+	cd ./src/backend_flask; $(MAKE) build
 
 ## add sskj senses to db (generated with pkg/seqparser)
 sskj-senses:
@@ -132,3 +144,7 @@ sskj-senses:
 		--dbaddr $(DBADDR) \
 		--dbuser $(DB_USR_USER) \
 		--dbpass $(DB_USR_PASS)
+
+deploy-prod-stack:
+	- docker network create val-backend
+	docker stack deploy -c production.yaml val

README.md

@@ -52,8 +52,6 @@ $ make fill-database-ssj
 $ make fill-database-kres
 # You can detach from the running process using Ctrl-p + Ctrl-q
 
-
-
 # this is a long operation
 # if running on a remote server, use nohup:
 $ nohup $(make fill-database > fill-database.log) &
@@ -74,6 +72,10 @@ $ make python-env-install
 # needs to be ran once to modify a new database
 $ make backend-prepare-db
 
+# if you have the file prepared (sskj_senses.json), you can
+# fill the database with some senses
+$ make sskj-senses
+
 # with debugger
 $ make backend-dev
 
@@ -100,3 +102,80 @@ $ make frontend-prod
 ```
 
 App available on: `http://0.0.0.0:8080`.  
+
+
+## Production deployment
+Prerequisite: machine with free ports 80 and 8084.  
+
+
+### Database
+Either build the database from scratch (lenghty process) using above instructions or just migrate the database from the faculty server (recommended).  
+
+Build container my-mongo:
+```bash
+# run once and destroy containers
+$ make database-service
+```
+
+### Backend
+Set database connection details in `/src/backend_flask/db_config.py`.  
+Change 'valuser' and 'valuserpass' to the database user.
+```bash
+mongodb://valuser:valuserpass@my_mongo/valdb
+```
+In the above line, replace `valuser` with the username and `valuserpass` with the password that was used to create the database tables (the values were set in the root Makefile).  
+
+You can also set the number of workers in `/src/backend_flask/entrypoint.sh`.  
+In line with `gunicorn -t 4 -b 127.0.0.1:8084 app:app`, edit the `-t` parameter.  
+Rule of thumb is 2x number of available CPU cores.  
+
+Build the backend container:
+```bash
+# From git root
+$ make build-backend-flask
+```
+
+### Frontend
+Set the server address (where backend will be runnig) in `src/frontend_vue/config/config_prod.json`.  
+Build the `/dist` folder that contains the static app (we will be using Nginx to serve it).  
+```bash
+# From git root
+$ make build-frontend-prod
+```
+
+All set, now run the stack.  
+Stack configuration in `production.yaml`.  
+
+```bash
+# From git root
+$ make deploy-prod-stack
+```
+
+
+
+## Uploading a mongo dump
+There's a 15GB mongo dump containing the fully processed kres and ssj data.  
+We can use that file to deploy our aplication.  
+With this database, we will need a minimum of 8GB ram to serve the app.  
+If the server is struggling, frontend will throw "Network errors".  
+
+Check `0.0.0.0:8081` and remove (or backup) the current example database `valdb`.  
+
+Run the stack with mongo port mapped:
+(uncomment the lines in `production.yaml`)
+```yml
+ports:
+  - 27017:27017
+```
+
+Run a separate my-mongo container with the mounted data:
+```bash
+$ mongo run -it --net host -v <local_dump_path>/dumps my-mongo /bin/bash
+```
+
+Inside the container (edit the uesrname, password):
+```bash
+$ mongorestore /dumps/valdb --db valdb --uri=mongodb://valuser:valuserpass@0.0.0.0:27017
+```
+
+After uploading, restart the stack with `27017` commented out.  

dockerfiles/database/mongodb-stack.yml

@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
 
-  my-mongo:
+  my_mongo:
     image: my-mongo
     restart: always
     ports:
@@ -13,7 +13,7 @@ services:
     volumes:
       - ${HOME}/mongo_container/data/:/data/db
 
-  mongo-express:
+  mongo_express:
     image: mongo-express
     restart: always
     ports:
@@ -23,4 +23,4 @@ services:
       ME_CONFIG_BASICAUTH_PASSWORD: ${MONGOEXPRESS_PASS}
       ME_CONFIG_MONGODB_ADMINUSERNAME: ${DB_ADM_USER}
       ME_CONFIG_MONGODB_ADMINPASSWORD: ${DB_ADM_PASS}
-      ME_CONFIG_MONGODB_SERVER: my-mongo
+      ME_CONFIG_MONGODB_SERVER: my_mongo

dockerfiles/python-env/Dockerfile

@@ -1,26 +1,26 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update --fix-missing
 RUN apt-get install -y \
 vim \
 python3 \
 python3-pip \
-sshfs
+sshfs \
+curl
+
+RUN pip3 install --upgrade pip
 
 RUN pip3 install \
 	lxml \
 	pandas \
 	sklearn \
 	argparse \
+	pyyaml \
 	pathlib \
+	flask \
+	flask_cors \
 	pymongo \
-	flask
+	flask-pymongo \
-
+	gunicorn
-RUN apt-get install -y \
-	curl
 
 ENV PYTHONIOENCODING UTF-8
-
-RUN pip3 install \
-	pyyaml \
-	flask_cors

dockerfiles/python-env/Makefile

@@ -1,4 +1,4 @@
-IMAGE_NAME="cjvt-python-env"
+IMAGE_NAME="cjvt-python-env"  # don't change, used in backend_flask/Makefile
 CNNAME="python-env"
 
 all: build run

dockerfiles/python-env/entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "testing entrypoint."
+$(exit 1)
+exit 0

nginx.conf

@@ -0,0 +1,26 @@
+# frontend
+server {
+    listen 80;
+    server_name  _;
+
+    location / {
+        root   /srv/dist;
+        index  index.html index.htm;
+    }
+
+    location /home {
+      return 301 /;
+    }
+}
+
+# backend
+server {
+    listen 8084;
+    server_name _;
+
+    location / {
+        proxy_set_header X-Forward-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $http_host;
+        proxy_pass http://backend_flask:8084;
+    }
+}

production.yaml

@@ -0,0 +1,43 @@
+version: '3.1'
+
+services:
+
+  my_mongo:
+    image: my-mongo
+    restart: always
+    # ports:
+    #   - 27017:27017
+    expose:
+      - 27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: valuser
+      MONGO_INITDB_ROOT_PASSWORD: valuserpass
+    volumes:
+      - ${HOME}/mongo_container/data/:/data/db
+
+  mongo_express:
+    image: mongo-express
+    restart: always
+    ports:
+      - 8081:8081
+    environment:
+      ME_CONFIG_BASICAUTH_USERNAME: test
+      ME_CONFIG_BASICAUTH_PASSWORD: test
+      ME_CONFIG_MONGODB_ADMINUSERNAME: valadmin
+      ME_CONFIG_MONGODB_ADMINPASSWORD: rolercoaster
+      ME_CONFIG_MONGODB_SERVER: my_mongo
+
+  backend_flask:
+    image: backend-flask
+    expose:
+      - 8084
+
+  proxy:
+    image: nginx
+    ports:
+      - 80:80
+      - 8084:8084
+    volumes:
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
+      - ./src/frontend_vue/dist:/srv/dist
+

src/backend_flask/Makefile

@@ -0,0 +1,16 @@
+IMG="backend-flask"
+CNT="backend_flask"
+
+clean:
+	- docker rm -f $(CNT)
+
+run: clean build
+	docker run -d --net host --name $(CNT) $(IMG)
+	docker logs -f $(CNT)
+
+build: build-cjvt-python-env
+	# docker build . -f ../../Dockerfile-backend-flask -t $(IMG)
+	cd ../..; docker build . -f Dockerfile-backend-flask -t $(IMG)
+
+build-cjvt-python-env:
+	cd ../../dockerfiles/python-env; $(MAKE) build

src/backend_flask/app.py

@@ -26,25 +26,21 @@ from email.mime.text import MIMEText
 from copy import deepcopy as DC
 from pathlib import Path
 from pymongo import MongoClient
+from flask_pymongo import PyMongo
 import pymongo
 import argparse
 
-# some db collections
-USERS_COLL = "users"
-TOKENS_COLL = "usertokens"
-SENSES_COLL = "senses"
-SENSEMAP_COLL = "sensemap"
-
-# pre-generated data (gui leftside word index)
-CORPORA = ["ssj", "kres"]
-app_index = None
-sskj_wordlist = None  # used by _is_banned(hw)
-BANNED_HEADWORDS = ["biti"]
 
 log = logging.getLogger(__name__)
-valdb = None
 app = Flask(__name__)
 
+app.config.from_object("db_config")
+mongo = PyMongo(app)
+
+app.config["CORPORA"] = ["ssj", "kres"]
+app.config["BANNED_HEADWORDS"] = ["biti"]
+app.config["QUERY_LIMIT"] = 1000
+
 
 # when running vuejs via webpack
 # CORS(app)
@@ -59,7 +55,7 @@ CORS(app)
 @app.route("/api/dev")
 def api_dev():
     print("DEV")
-    cur = valdb.kres.find({"headwords": "nagovarjati"})
+    cur = mongo.db.kres.find({"headwords": "nagovarjati"})
     frames = []
     for ent in cur:
         frames += frames_from_db_entry(ent)
@@ -72,12 +68,12 @@ def api_dev():
 @app.route("/api/words/<corpus>")
 def api_words(corpus):
     return json.dumps({
-        "sorted_words": app_index[corpus]["words"], # todo - make corpus as arg
+        "sorted_words": app.config["app_index"][corpus]["words"], # todo - make corpus as arg
     })
 
 @app.route("/api/functors/<corpus>")
 def api_functors(corpus):
-    return json.dumps(app_index[corpus]["functors"])
+    return json.dumps(app.config["app_index"][corpus]["functors"])
 
 # INDEX SELECTION -------------------^
 
@@ -98,7 +94,7 @@ def api_register():
     ):
         return "ERR"
     email_hash = hashlib.sha256(email.encode("utf-8")).hexdigest()
-    existing = list(valdb[USERS_COLL].find({
+    existing = list(mongo.db.users.find({
         "$or": [{"username": username}, {"email": email_hash}]
     }))
     if len(existing) > 0:
@@ -109,7 +105,7 @@ def api_register():
             password.encode("utf-8")).hexdigest(),
         "email": email_hash
     }
-    valdb[USERS_COLL].insert(entry)
+    mongo.db.users.insert(entry)
     return "OK"
 
 
@@ -121,7 +117,7 @@ def api_login():
     password = data["password"]
     hpass = hashlib.sha256(password.encode("utf-8")).hexdigest()
 
-    db_user = list(valdb[USERS_COLL].find({
+    db_user = list(mongo.db.users.find({
         "username": username,
         "hpass": hpass
     }))
@@ -135,7 +131,7 @@ def api_login():
         "date": datetime.datetime.utcnow(),
         "token": token
     }
-    valdb[TOKENS_COLL].update(
+    mongo.db.usertokens.update(
         {"username": token_entry["username"]},
         token_entry,
         upsert=True
@@ -178,7 +174,7 @@ def api_new_pass():
     username = data["username"]
     email = data["email"]
     hemail = hashlib.sha256(email.encode("utf-8")).hexdigest()
-    db_res = list(valdb[USERS_COLL].find({
+    db_res = list(mongo.db.users.find({
         "username": username,
         "email": hemail
     }))
@@ -190,7 +186,7 @@ def api_new_pass():
         string.ascii_letters + string.digits) for i in range(10)])
     # update locally
     hpass = hashlib.sha256(new_pass.encode("utf-8")).hexdigest()
-    valdb[USERS_COLL].update(
+    mongo.db.users.update(
         {
             "username": username,
             "email": hemail
@@ -208,12 +204,12 @@ def token_to_username(token):
     key = {
         "token": token
     }
-    res = list(valdb[TOKENS_COLL].find(key))
+    res = list(mongo.db.usertokens.find(key))
     if len(res) != 1:
         return None
     username = res[0]["username"]
     # update deletion interval
-    valdb[TOKENS_COLL].update(
+    mongo.db.usertokens.update(
         key, {"$set": {"date": datetime.datetime.utcnow()}})
     return username
 
@@ -248,18 +244,19 @@ def api_get_frames():
     RF = reduce_functions[rf_name]["f"]
 
     corpus = request.args.get("cor")
-    if corpus not in CORPORA:
+    if corpus not in app.config["CORPORA"]:
         return json.dumps({"error": "cor={kres,ssj}"})
 
-    cur = valdb[corpus].find({"headwords": hw})
+    cur = mongo.db[corpus].find({"headwords": hw})
     frames = []
-    for ent in cur:
+    for ent in cur[:app.config["QUERY_LIMIT"]]:
         frames += frames_from_db_entry(ent)  # pre-process this step for prod TODO
+    cur.close()
 
     # filter by relevant hw
     frames = [x for x in frames if x.hw == hw]
 
-    ret_frames = RF(frames, valdb[SENSEMAP_COLL])
+    ret_frames = RF(frames, mongo.db.sensemap)
 
     json_ret = {"frames": []}
     for frame in ret_frames:
@@ -300,19 +297,20 @@ def api_get_functor_frames():
     RF = reduce_functions[rf_name]["f"]
 
     corpus = request.args.get("cor")
-    if corpus not in CORPORA:
+    if corpus not in app.config["CORPORA"]:
         return json.dumps({"error": "cor={kres,ssj}"})
 
-    cur = valdb[corpus].find({"functors": functor})
+    cur = mongo.db[corpus].find({"functors": functor})
     frames = []
-    for ent in cur:
+    for ent in cur[:app.config["QUERY_LIMIT"]]:
         frames += frames_from_db_entry(ent)  # pre-process this step for prod TODO
+    cur.close()
 
     # filter by relevant functor
     frames = [x for x in frames if functor in x.get_functors()]
 
     # raw_frames = vallex.functors_index[functor]  # TODO
-    ret_frames = RF(frames, valdb[SENSEMAP_COLL])
+    ret_frames = RF(frames, mongo.db.sensemap)
     ret_frames = _aggregate_by_hw(ret_frames)
 
     json_ret = {"frames": []}
@@ -331,10 +329,10 @@ def api_get_functor_frames():
 def api_senses_get():
     # returns senses and mapping for hw
     hw = request.args.get("hw")
-    senses = list(valdb[SENSES_COLL].find({
+    senses = list(mongo.db.senses.find({
         "hw": hw
     }))
-    sense_map_query = list(valdb[SENSEMAP_COLL].find({
+    sense_map_query = list(mongo.db.sensemap.find({
         "hw": hw
     }))
     # aggregation by max date possible on DB side
@@ -414,7 +412,7 @@ def api_senses_update():
         print(ns)
 
         # insert into db
-        valdb[SENSES_COLL].insert(ns)
+        mongo.db.senses.insert(ns)
 
     # replace tmp_id with mongo's _id
     for ssj_id, el in sense_map.items():
@@ -429,7 +427,7 @@ def api_senses_update():
             "date": datetime.datetime.utcnow()
         }
         # vallex.db["v2_sense_map"].update(key, data, upsert=True)
-        valdb[SENSEMAP_COLL].insert(data)
+        mongo.db.sensemap.insert(data)
     return "OK"
 
 # SENSES ----------------------------^
@@ -438,25 +436,25 @@ def api_senses_update():
 # APP PREFLIGHT ---------------------.
 def _is_banned(hw):
     banned = True
-    if hw in BANNED_HEADWORDS:
+    if hw in app.config["BANNED_HEADWORDS"]:
         banned = True
     elif hw in sskj_wordlist["wordlist"]:
         banned = False
     elif (hw + " se") in sskj_wordlist["wordlist"]:
         banned = False
-
-    if hw[-1] == "_":
-        log.debug("hw: {}, banned: {}".format(hw, banned))
     return banned
 
-def prepare_app_index():
+def prepare_app_index(appindex_json, sskj_wordlist):
     log.info("[*] preparing app_index")
     # create app_index (used in frontend, left side word index)
-    tmp_app_index = {c: {} for c in CORPORA}
+    tmp_app_index = {c: {} for c in app.config["CORPORA"]}
-    for corpus in CORPORA:
+    for corpus in app.config["CORPORA"]:
         res_hws = {}
         res_fns = {}
-        for e in valdb[corpus].find({}):
+
+        nentries = mongo.db[corpus].count()
+        idx = 0
+        for e in mongo.db[corpus].find({}):
             if "headwords" not in e:
                 continue
             for hw in e["headwords"]:
@@ -471,6 +469,10 @@ def prepare_app_index():
                     res_fns[fn] += 1
                 else:
                     res_fns[fn] = 1
+            idx += 1
+            if idx % 10000 == 0:
+                log.debug("indexing {}: {}/{}".format(
+                    corpus, idx, nentries))
 
         alphabetical = {}
         for k, e in res_hws.items():
@@ -486,15 +488,41 @@ def prepare_app_index():
 
         tmp_app_index[corpus]["words"] = alphabetical
 
+
         functors = [(k, e) for (k, e) in res_fns.items()]
         functors = sorted(functors, key=lambda x: x[0])
         tmp_app_index[corpus]["functors"] = functors
 
-    valdb.appindex.update({"dockey": "appindex"}, {"dockey": "appindex", "data": tmp_app_index}, upsert=True)
+    with Path(appindex_json).open("w") as fp:
+        json.dump(tmp_app_index, fp)
 
 # APP PREFLIGHT ---------------------^
 
 
+def init_wsgi(app):
+    print("Initiating wsgi")
+    config = None
+    with Path("/project/prod_conf.yaml").open("r") as fp:
+        config = list(yaml.safe_load_all(fp))[0]
+
+    app.debug = False
+    logfile = config["logfile"]
+    logging.basicConfig(filename=logfile, level=logging.INFO)
+
+    # app index from db
+    with Path(config["appindex"]).open("r") as fp:
+        # a dirty hack but ok
+        app.config["app_index"] = json.load(fp)
+
+    # log.info("[*] Starting app.py with config:\n%s".format(config))
+    log.info("[*] Starting app.py with config:\n{}".format(config))
+
+
+# if we don't pass arguments, assume production environment (gunicorn)
+if "gunicorn" in sys.argv[0]:
+    init_wsgi(app)
+
+
 if __name__ == "__main__":
     print("Starting app.py main()")
     aparser = argparse.ArgumentParser(description="Arguments for app.py")
@@ -504,9 +532,9 @@ if __name__ == "__main__":
     aparser.add_argument("--dbpass", type=str)
     aparser.add_argument("--dbaddr", type=str)
     aparser.add_argument("--sskj-wordlist", type=str)
+    aparser.add_argument("--appindex-json", type=str)
     args = aparser.parse_args()
 
-    config = None
     with Path(args.config_file).open("r") as fp:
         config = list(yaml.safe_load_all(fp))[0]
 
@@ -517,27 +545,31 @@ if __name__ == "__main__":
     else:
         logging.basicConfig(filename=logfile, level=logging.INFO)
 
+    """
     # db login
     client = MongoClient(
         "mongodb://{}".format(args.dbaddr),
         username=args.dbuser,
         password=args.dbpass,
-        authSource="valdb",
+        authSource="mongo.db",
         authMechanism='SCRAM-SHA-1'
     )
-    valdb = client.valdb
+    valdb = client.mongo.db
+    """
 
     if args.prepare_db:
         with Path(args.sskj_wordlist).open("r") as fp:
             sskj_wordlist = json.load(fp)
-        prepare_app_index()
+        prepare_app_index(args.appindex_json, sskj_wordlist)
         sys.exit()
 
     # app index from db
-    app_index = (valdb.appindex.find_one({"dockey": "appindex"}))["data"]
+    with Path(args.appindex_json).open("r") as fp:
+        app.config["app_index"] = json.load(fp)
 
     # log.info("[*] Starting app.py with config:\n%s".format(config))
     log.info("[*] Starting app.py with config:\n{}".format(config))
 
     app.run(host=str(config["host"]), port=int(config["port"]))
 
+

src/backend_flask/conf_files/dev_conf.yaml

@@ -4,3 +4,4 @@ port: 8084
 host: localhost
 logfile: "/var/log/valency_backend.log"
 ---
+

src/backend_flask/conf_files/prod_conf.yaml

@@ -1,6 +1,5 @@
 ---
-debug: True
 port: 8084
 host: 0.0.0.0
 logfile: "/var/log/valency_backend.log"
----
+appindex: /project/data/appindex.json

src/backend_flask/db_config.py

@@ -0,0 +1,2 @@
+MONGO_URI = "mongodb://sizif:p5e3r4u8t7@my_mongo:27017/valdb"
+MONGO_AUTH_SOURCE = 'admin'

src/backend_flask/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+pip3 install -e /project/src/pkg/cjvt-corpusparser/.
+pip3 install -e /project/src/pkg/valency/.
+pip3 install -e /project/src/pkg/seqparser/.
+
+cd /project/src/backend_flask
+gunicorn -t 4 -b 0.0.0.0:8084 app:app

src/backend_flask/preprocess.py

@@ -1,73 +0,0 @@
-# Deprecated: headword creation moved to be part of corpusparser,
-# index creation moved to app.py as a preprocessing (with exit) step
-
-CORPORA = ["kres", "ssj"]
-
-if __name__ == "__main__":
-
-	valdb = None
-
-    def helper_tid_to_token(tid, tokens):
-        for t in tokens:
-            if t["tid"] == tid:
-                return t
-        return None
-
-    # update entries (add headwords and fuctors for indexing)
-    for corpus in CORPORA:
-        for e in valdb[corpus].find({}):
-            if e["srl_links"] is None:
-                e["headwords"] = []
-                e["functors"] = []
-            else:
-                hw_tids = list(set([x["from"] for x in e["srl_links"]]))
-                hw_tokens = [helper_tid_to_token(tid, e["tokens"]) for tid in hw_tids]
-                headwords = [(t["lemma"] if t["msd"][0] == "G" else t["lemma"] + "_") for t in hw_tokens]
-                e["headwords"] = headwords
-
-                functors = list(set([x["afun"] for x in e["srl_links"]]))
-                e["functors"] = functors
-
-            valdb[corpus].save(e)
-
-        valdb[corpus].ensure_index([("headwords", pymongo.ASCENDING)])
-        valdb[corpus].ensure_index([("functors", pymongo.ASCENDING)])
-
-    # create app_index (used in frontend, left side word index)
-    tmp_app_index = {c: {} for c in CORPORA}
-    for corpus in CORPORA:
-        res_hws = {}
-        res_fns = {}
-        for e in valdb[corpus].find({}):
-            if "headwords" not in e:
-                continue
-            for hw in e["headwords"]:
-                if hw in res_hws:
-                    res_hws[hw] += 1
-                else:
-                    res_hws[hw] = 1
-            if "functors" not in e:
-                continue
-            for fn in e["functors"]:
-                if fn in res_fns:
-                    res_fns[fn] += 1
-                else:
-                    res_fns[fn] = 1
-
-        alphabetical = {}
-        for k, e in res_hws.items():
-            fst = k[0].lower()
-            if fst in alphabetical:
-                alphabetical[fst].append((k, e))
-            else:
-                alphabetical[fst] = [(k, e)]
-
-        for k, e in alphabetical.items():
-            alphabetical[k] = sorted(e, key=lambda x: x[0]) 
-        tmp_app_index[corpus]["words"] = alphabetical
-
-        functors = [(k, e) for (k, e) in res_fns.items()]
-        functors = sorted(functors, key=lambda x: x[0])
-        tmp_app_index[corpus]["functors"] = functors
-
-    valdb.appindex.update({"dockey": "appindex"}, {"dockey": "appindex", "data": tmp_app_index}, upsert=True)

src/frontend_vue/Makefile

@@ -18,7 +18,12 @@ dev:	build-container clean
 	docker run --name $(CONNAME) -d -p 8080:8080 -v $(shell pwd):/src $(IMGNAME) /src/ops_scripts/dev.sh
 
 prod: 	build-container clean
-	docker run --name $(CONNAME) -d -p 8080:8080 -v $(shell pwd):/src $(IMGNAME) /src/ops_scripts/prod.sh
+	docker run --restart always --name $(CONNAME) -d -p 8080:8080 -v $(shell pwd):/src $(IMGNAME) /src/ops_scripts/prod.sh
 
 node-env: clean
 	docker run --name $(CONNAME) -it -p 8080:8080 -v $(shell pwd):/src $(IMGNAME)
+
+build-prod: 	build-container clean
+	docker run --rm -v $(shell pwd):/src $(IMGNAME) /src/ops_scripts/prod.sh
+
+

src/frontend_vue/config/config.json

@@ -1,3 +1,3 @@
 {
-    "api_addr": "http://0.0.0.0:8084"
+    "api_addr": "http://193.2.76.103:8084"
 }

src/frontend_vue/dist_bkp/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>vue_frontend</title><link href=/static/css/app.05a420a551b5bded5dfec6b370d3edca.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.5d3d2fd333c62579d227.js></script><script type=text/javascript src=/static/js/app.8538f7133303d3e391b2.js></script></body></html>

src/frontend_vue/dist_bkp/static/js/manifest.2ae2e69a05c33dfc65f8.js

@@ -0,0 +1,2 @@
+!function(r){var n=window.webpackJsonp;window.webpackJsonp=function(e,u,c){for(var f,i,p,a=0,l=[];a<e.length;a++)i=e[a],o[i]&&l.push(o[i][0]),o[i]=0;for(f in u)Object.prototype.hasOwnProperty.call(u,f)&&(r[f]=u[f]);for(n&&n(e,u,c);l.length;)l.shift()();if(c)for(a=0;a<c.length;a++)p=t(t.s=c[a]);return p};var e={},o={2:0};function t(n){if(e[n])return e[n].exports;var o=e[n]={i:n,l:!1,exports:{}};return r[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=r,t.c=e,t.d=function(r,n,e){t.o(r,n)||Object.defineProperty(r,n,{configurable:!1,enumerable:!0,get:e})},t.n=function(r){var n=r&&r.__esModule?function(){return r.default}:function(){return r};return t.d(n,"a",n),n},t.o=function(r,n){return Object.prototype.hasOwnProperty.call(r,n)},t.p="/",t.oe=function(r){throw console.error(r),r}}([]);
+//# sourceMappingURL=manifest.2ae2e69a05c33dfc65f8.js.map

src/frontend_vue/dist_bkp/static/js/manifest.2ae2e69a05c33dfc65f8.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap d176f5affa434246605f"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,IAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.2ae2e69a05c33dfc65f8.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap d176f5affa434246605f"],"sourceRoot":""}

src/frontend_vue/ops_scripts/prod.sh

@@ -4,4 +4,4 @@ cp ./config/config_prod.json ./config/config.json
 
 npm install
 npm run build
-http-server /src/dist
+# http-server /src/dist

src/frontend_vue/package.json

@@ -38,7 +38,7 @@
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
     "node-notifier": "^5.4.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
+    "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "portfinder": "^1.0.20",
     "postcss-import": "^11.0.0",

src/frontend_vue/src/components/Frame.vue

@@ -6,7 +6,12 @@
         <div class="col-sm-7">
             <div class="row">
                 <div class="col-sm-12">
+                    <span v-if="frameData.sentences.length < frameData.sentence_count">
+                        št. povedi: {{ frameData.sentence_count }} (prikazanih {{ frameData.sentences.length }})
+                    </span>
+                    <span v-else>
                         št. povedi: {{ frameData.sentences.length }}
+                    </span>
                 </div>
             </div>
 

src/frontend_vue/src/components/Nav.vue

@@ -1,6 +1,6 @@
 <template>
 <nav>
-    <b-navbar toggleable="md" type="light" variant="light">
+    <b-navbar id="nav-red-bg" toggleable="md" type="light" variant="light">
     <b-navbar-toggle target="nav_collapse"></b-navbar-toggle>
     <!--b-navbar-brand>Vezljivostni vzorci slovenskih glagolov</b-navbar-brand-->
     <b-navbar-brand class=cursorpointer v-on:click="goHome">
@@ -112,7 +112,7 @@ export default {
 </script>
 
 <style>
-.bg-light {
+#nav-red-bg {
     background-color: rgb(183,21,17,0.9) !important;
 }
 nav a {

src/pkg/valency/valency/Frame.py

@@ -37,7 +37,8 @@ def frames_from_db_entry(dbent):
     return frames
 
 class Frame():
-    def __init__(self, tids, deep_links=None, slots=None, hw_lemma=None, sentences=None):
+    def __init__(self, tids, deep_links=None, slots=None, 
+        hw_lemma=None, sentences=None, sentence_count=None):
         self.hw = hw_lemma
         self.tids = tids   # list of tokens with the same hw_lemma
         # Each tid = "S123.t123";
@@ -50,6 +51,8 @@ class Frame():
         self.sense_info = {}
         self.sentences = sentences
         self.aggr_sent = None  # Dictionary { hw: self.sentences idx }
+        self.sentence_count = sentence_count  # paging, optimization
+
 
     def get_functors(self):
         return [slot.functor for slot in self.slots]
@@ -62,7 +65,8 @@ class Frame():
             "slots": [slot.to_json() for slot in self.slots],
             "sentences": self.sentences,
             "aggr_sent": self.aggr_sent,
-            "sense_info": self.sense_info
+            "sense_info": self.sense_info,
+            "sentence_count": self.sentence_count
         }
         return ret
 

src/pkg/valency/valency/frame.py

@@ -1,96 +0,0 @@
-import logging
-
-log = logging.getLogger(__name__)
-
-
-class Frame():
-    def __init__(self, tids, deep_links=None, slots=None, hw=None):
-        self.hw = hw
-        self.tids = tids   # list of tokens with the same hw_lemma
-        # Each tid = "S123.t123";
-        # you can get sentence with vallex.get_sentence(S123)
-        self.slots = []
-        if slots is None:
-            self.slots = self.init_slots(deep_links)
-        else:
-            self.slots = slots
-        self.sense_info = {}
-        self.sentences = None  # Used for passing to view in app.py, get_frames
-        self.aggr_sent = None  # Dictionary { hw: self.sentences idx }
-
-    def to_json(self):
-        ret = {
-            "hw": self.hw,
-            "tids": self.tids,
-            "slots": [slot.to_json() for slot in self.slots],
-            "sentences": self.sentences,
-            "aggr_sent": self.aggr_sent,
-            "sense_info": self.sense_info
-        }
-        return ret
-
-    def init_slots(self, deep):
-        slots = []
-        for link in deep:
-            slots.append(Slot(
-                functor=link["functor"],
-                tids=[link["to"]]
-            ))
-        return slots
-
-    def sort_slots(self):
-        # ACT, PAT, alphabetically
-        srt1 = [
-            x for x in self.slots
-            if (x.functor == "ACT" or
-                x.functor == "PAT")
-        ]
-        srt1 = sorted(srt1, key=lambda x: x.functor)
-        srt2 = [
-            x for x in self.slots
-            if (x.functor != "ACT" and
-                x.functor != "PAT")
-        ]
-        srt2 = sorted(srt2, key=lambda x: x.functor)
-        self.slots = (srt1 + srt2)
-
-    def to_string(self):
-        ret = "Frame:\n"
-        ret += "sense_info: {}\n".format(str(self.sense_info))
-        ret += "tids: ["
-        for t in self.tids:
-            ret += (str(t) + ", ")
-        ret += "]\n"
-        if self.slots is not None:
-            ret += "slots:\n"
-            for sl in self.slots:
-                ret += (sl.to_string() + "\n")
-        return ret
-
-
-class Slot():
-    # Each slot is identified by its functor (ACT, PAT, ...)
-    # It consists of different tokens.
-    def __init__(self, functor, tids=None, count=None):
-        self.functor = functor
-        self.tids = tids or []  # combining multiple sentences vertically
-        self.count = count or 1
-
-    def to_string(self):
-        ret = "---- Slot:\n"
-        ret += "functor: {}\n".format(self.functor)
-        ret += "tids: ["
-        for t in self.tids:
-            ret += (str(t) + ", ")
-        ret += "]\n"
-        ret += "]\n"
-        ret += "----\n"
-        return ret
-
-    def to_json(self):
-        ret = {
-            "functor": self.functor,
-            "tids": self.tids,
-            "count": self.count
-        }
-        return ret

src/pkg/valency/valency/reduce_functions.py

@@ -9,6 +9,7 @@ import logging
 log = logging.getLogger(__name__)
 
 SENSE_UNDEFINED = "nedefinirano"
+SENTENCE_LIMIT = 10
 
 ## TIDI: use frame.py
 ## TODO: build a list of [Frame] with lists of [Slot]
@@ -70,7 +71,10 @@ def reduce_1(frames, valdb_sensemap=None):
         for functor in fs[0]:
             slots[functor] = Slot(functor=functor)
         # Reduce slots from all frames. (Merge ACT from all frames, ...)
+        sentence_count = len(fs[1])
         for frame in fs[1]:
+            if len(tids) >= SENTENCE_LIMIT:
+                break
             tids += frame.tids
             sentences += frame.sentences
             for sl in frame.slots:
@@ -78,8 +82,13 @@ def reduce_1(frames, valdb_sensemap=None):
         slots_list = []
         for k, e in slots.items():
             slots_list.append(e)
-        # TODO does appending hw_lemma of first frame work for functor frames too?
+        rf = Frame(
-        rf = Frame(hw_lemma=fs[1][0].hw, tids=tids, slots=slots_list, sentences=sentences)
+            hw_lemma=fs[1][0].hw,
+            tids=tids,
+            slots=slots_list,
+            sentences=sentences,
+            sentence_count=sentence_count
+        )
         rf.sort_slots()
         ret_frames.append(rf)
     return sorted_by_len_tids(ret_frames)
@@ -182,7 +191,11 @@ def frames_from_sense_ids(raw_frames, id_map):
         tids = []
         reduced_slots = []
         sentences = []
+
+        sentence_count = len(frames)
         for frame in frames:
+            if len(tids) >= SENTENCE_LIMIT:
+                break
             tids += frame.tids
             sentences += frame.sentences
             for slot in frame.slots:
@@ -204,7 +217,8 @@ def frames_from_sense_ids(raw_frames, id_map):
             hw_lemma="derp",
             tids=tids,
             slots=reduced_slots,
-            sentences=sentences
+            sentences=sentences,
+            sentence_count=sentence_count,
         )
         id_map_entry = (
             id_map.get(tids[0]) or