mariadb update

docker-compose.yml

@@ -11,6 +11,11 @@ services:
       - ../classla/classla_resources:/root/classla_resources
     environment:
       - PYTHONUNBUFFERED=1
+      - MDB_DATABASE=corpus_120k
+      - MDB_HOST=164.8.252.72
+      - MDB_PORT=3306
+      - MDB_USER=rsdo5
+      - MDB_PASSWORD=rsdo5mysql
   tika2:
     image: apache/tika:1.28.4-full
     entrypoint: [ "/bin/sh", "-c", "java -jar /tika-server-1.28.4.jar -h 0.0.0.0 -p 9999" ]

swagger_server/controllers/oss_controller.py

@@ -1,3 +1,4 @@
+from swagger_server import db_utils
 from swagger_server import util
 from flask import send_file
 
@@ -20,7 +21,7 @@ def get_conllus(leta, vrste, kljucnebesede, cerifpodrocja):  # noqa: E501
     """
     if not kljucnebesede:
         return "Manjkajo kljucne besede", 400
-    files = util.get_files_by_keywords(kljucnebesede)
+    files = db_utils.get_files_by_udc(kljucnebesede)
     if not files:
         return 'Nobena datoteka ne ustreza iskalnemu pogoju', 404
     return ' '.join(files), 200
@@ -63,7 +64,7 @@ def get_files(leta, vrste, kljucnebesede, cerifpodrocja):  # noqa: E501
     """
     if not kljucnebesede:
         return "Manjkajo kljucne besede", 400
-    files = util.get_files_by_keywords(kljucnebesede)
+    files = db_utils.get_files_by_udc(kljucnebesede)
     if not files:
         return 'Nobena datoteka ne ustreza iskalnemu pogoju', 404
     return ' '.join(files), 200
@@ -81,13 +82,13 @@ def get_number_texts(leta, vrste, kljucnebesede, cerifpodrocja):  # noqa: E501
     :param kljucnebesede: 
     :type kljucnebesede: List[str]
     :param cerifpodrocja: 
-    :type cerifpodrocja: List[int]
+    :type udc: List[int]
 
     :rtype: int
     """
     if not kljucnebesede:
         return "Manjkajo kljucne besede", 400
-    files = util.get_files_by_keywords(kljucnebesede)
+    files = db_utils.get_files_by_udc(kljucnebesede)
     return len(files), 200
 
 
@@ -109,7 +110,7 @@ def get_texts(leta, vrste, kljucnebesede, cerifpodrocja):  # noqa: E501
     """
     if not kljucnebesede:
         return "Manjkajo kljucne besede", 400
-    files = util.get_files_by_keywords(kljucnebesede)
+    files = db_utils.get_files_by_udc(kljucnebesede)
     if not files:
         return 'Nobena datoteka ne ustreza iskalnemu pogoju', 404
     return ' '.join(files), 200

swagger_server/utils/db_utils.py

@@ -1,26 +1,36 @@
 import mariadb
+import os
 import sys
-from decouple import config
+
 
 
 database_info = {
-    'database': config('MDB_DATABASE'),
+    'database': os.environ.get("MDB_DATABASE", default="true"),
-    'host': config('MDB_HOST'),
+    'host': os.environ.get("MDB_HOST", default="true"),
-    'port': config('MDB_PORT', cast=int),
+    'port': os.environ.get("MDB_PORT", default="true"),
-    'user': config('MDB_USER'),
+    'user': os.environ.get("MDB_USER", default="true"),
-    'password': config('MDB_PASSWORD')
+    'password': os.environ.get("MDB_PASSWORD", default="true"),
 }
 
 cur = None
 
 # Connect to MariaDB Platform
-try:
+
-    conn = mariadb.connect(**database_info)
+
-    # Get cursor
+def get_files_by_udc(udc):
-    cur = conn.cursor()
+   ret = []
-except mariadb.Error as e:
+
-    print(f"Error connecting to MariaDB Platform: {e}")
+   try:
-    # sys.exit(1)
+        conn = mariadb.connect(**database_info)
+        cur = conn.cursor()
+        #cur.execute(f'SELECT * from os2022_ngrams WHERE file_id = {file_id}')
+        #cur.execute(f'SELECT COUNT(*) FROM os2022_ngrams')
+        #ret = list(cur)
+    except mariadb.Error as e:
+        print(f"Error connecting to MariaDB Platform: {e}")
+    
+
+    return ret
 
 
 # class BaseModel(Model):