Merge branch 'it18257632' into 'master'

It18257632

See merge request !136

.idea/21_22j-38.iml

@@ -6,7 +6,10 @@
       <excludeFolder url="file://$MODULE_DIR$/API/venv" />
       <excludeFolder url="file://$MODULE_DIR$/backend/IT18257632/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
+  <component name="PyDocumentationSettings">
+    <option name="renderExternalDocumentation" value="true" />
+  </component>
 </module>
\ No newline at end of file

.idea/inspectionProfiles/Project_Default.xml

@@ -9,5 +9,12 @@
         </list>
       </option>
     </inspection_tool>
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="tensorflow.keras" />
+        </list>
+      </option>
+    </inspection_tool>
   </profile>
 </component>
\ No newline at end of file

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file

.idea/other.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PySciProjectComponent">
+    <option name="PY_SCI_VIEW" value="true" />
+    <option name="PY_SCI_VIEW_SUGGESTED" value="true" />
+  </component>
+</project>
\ No newline at end of file

API/.idea/API.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="Flask">
+    <option name="enabled" value="true" />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/templates" />
+      </list>
+    </option>
+  </component>
+</module>
\ No newline at end of file

API/.idea/inspectionProfiles/profiles_settings.xml

+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file

API/.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file

API/.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/API.iml" filepath="$PROJECT_DIR$/.idea/API.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

API/app.py

@@ -3,8 +3,13 @@ import random
 import os
 from API.model.colorModel import get_color_activities1, get_color_activities2, get_color_activity_result
 from API.model.readModel import get_reading_activities
+from API.model.userModel import getStudentByName
 from API.routers.router import funtion_one
-from backend.IT18218640.keyword_spotting_service import Keyword_Spotting_service
+# from backend.IT18218640.keyword_spotting_service import Keyword_Spotting_service
+
+# from flask_mysqldb import MySQL
+# import MySQLdb.cursors
+# import re
 
 app = Flask(__name__)
 
@@ -14,6 +19,31 @@ app = Flask(__name__)
 def home():
     return render_template('home.html')
 
+# @app.route('/register', methods =['POST'])
+# def register():
+#     msg = ''
+#     if request.method == 'POST' and 'username' in request.form and 'password' in request.form and 'email' in request.form:
+#         username = request.form['username']
+#         password = request.form['password']
+#         email = request.form['email']
+#         cursor = mysql.connection.cursor(MySQLdb.cursors.DictCursor)
+#         cursor.execute('SELECT * FROM user WHERE name = % s', (username,))
+#         account = cursor.fetchone()
+#         if account:
+#             msg = 'Account already exists !'
+#         elif not re.match(r'[^@]+@[^@]+\.[^@]+', email):
+#             msg = 'Invalid email address !'
+#         elif not re.match(r'[A-Za-z0-9]+', username):
+#             msg = 'Username must contain only characters and numbers !'
+#         elif not username or not password or not email:
+#             msg = 'Please fill out the form !'
+#         else:
+#             cursor.execute('INSERT INTO accounts VALUES (NULL, % s, % s, % s)', (username, password, email,))
+#             mysql.connection.commit()
+#             msg = 'You have successfully registered !'
+#     elif request.method == 'POST':
+#         msg = 'Please fill out the form !'
+#     return msg
 
 # Color Function Route (IT18218640)
 @app.route("/getColorActivities1")
@@ -29,43 +59,43 @@ def getColorActivitiesResult():
     # print("data_dic")
     return get_color_activity_result()
 
-@app.route("/predict", methods=["POST"])
-def predict():
-    # get audio file and save it
-    audio_file = request.files["file"]
-
-    print(f"{request.files['file']}")
-    # print(f"{request.files['name']}")
-
-    ######################################
-    print(f"{request.form['name']}")
-    #####################################
-    # print(f"{request.json}")
-
-    file_name = str(random.randint(0, 100000))
-    # audio_file.save((file_name))
-
-    # get file name
-    # predict_file_name = audio_file.filename
-    # predict_file_name = predict_file_name.split("/")
-    # new_predict_file_name = predict_file_name[1]
-    # new_predict_file_name = new_predict_file_name.split(".")
-    # FPFN = new_predict_file_name[0]
-    # print(f"{FPFN}")
-
-    # invoke keyword spotting service
-    kss = Keyword_Spotting_service()
-
-    # make a prediction
-    predicted_keyword = kss.predict(file_name, request.form['name'])
-
-    # remove the audio file
-    os.remove(file_name)
-
-    # send back the predicted keword in json format
-    data = {"Keyword": predicted_keyword}
-    return jsonify(data)
-    # return "audio_file"
+# @app.route("/predict", methods=["POST"])
+# def predict():
+#     # get audio file and save it
+#     audio_file = request.files["file"]
+#
+#     print(f"{request.files['file']}")
+#     # print(f"{request.files['name']}")
+#
+#     ######################################
+#     print(f"{request.form['name']}")
+#     #####################################
+#     # print(f"{request.json}")
+#
+#     file_name = str(random.randint(0, 100000))
+#     # audio_file.save((file_name))
+#
+#     # get file name
+#     # predict_file_name = audio_file.filename
+#     # predict_file_name = predict_file_name.split("/")
+#     # new_predict_file_name = predict_file_name[1]
+#     # new_predict_file_name = new_predict_file_name.split(".")
+#     # FPFN = new_predict_file_name[0]
+#     # print(f"{FPFN}")
+#
+#     # invoke keyword spotting service
+#     kss = Keyword_Spotting_service()
+#
+#     # make a prediction
+#     predicted_keyword = kss.predict(file_name, request.form['name'])
+#
+#     # remove the audio file
+#     os.remove(file_name)
+#
+#     # send back the predicted keword in json format
+#     data = {"Keyword": predicted_keyword}
+#     return jsonify(data)
+#     # return "audio_file"
 
 # Read Function Route (IT)
 
@@ -91,9 +121,29 @@ def abc():
     # return make_response(d, 200)
     return response_val
 
+# Loging
+@app.route("/login", methods=['POST'])
+def login():
+    req = request.get_json()
+    username = req['username']
+    password = req['password']
+
+    user = getStudentByName(username, password)
+    if len(user) == 0:
+        data = {
+            "body": [],
+            "message": "Failed"
+        }
+    else:
+        data = {
+            "body": user,
+            "message": "Success"
+        }
+
+    body = jsonify(data)
+    return make_response(body)
 
 if __name__ == "__main__":
-    app.run(host='192.168.8.101')
+    # app.run(host='192.168.8.101')
     # app.run(host='192.168.8.100,port='5000', debug=True)
-    # app.run(debug=True)
-
+    app.run(debug=True)

API/db/dbConnection.py

@@ -12,13 +12,13 @@ def create_con():
         database="helply",
         host="127.0.0.1",
         user="root",
-        password="rp19970520"
+        password="12345678"
     )
     return db
 
 
 def create_con_pandas():
-    db_connection_str = 'mysql+mysqlconnector://root:rp19970520@127.0.0.1/helply'
+    db_connection_str = 'mysql+mysqlconnector://root:12345678@127.0.0.1/helply'
     db = create_engine(db_connection_str)
     return db
 

API/model/userModel.py

+from API.db.dbConnection import get_data
+
+
+def getStudentByName(username, password):
+    qry = 'SELECT * FROM `user` WHERE name = "{}" AND password = "{}"'.format(username, password)
+
+    user = get_data(qry)
+    return user

backend/IT18257632/data.json

+{
+    "mappings": [],
+    "labels": [],
+    "MFCCs": [],
+    "files": []
+}
\ No newline at end of file