Using new inputs

app.py

@@ -8,14 +8,28 @@ import pandas as pd
 import zipfile
 import os
 
-def Main(configuration, uploadedFile):
+def Main(uploadedFile, txtFileInput, orthographyPercentage, syntaxPercentage, semanticPercentage, studentsRange):
   
     error = ""
     modelResult  = ""
 
-    configuration_dict = json.loads(configuration)
-
     try:        
+        if not txtFileInput:
+            txtFileInput = "./assets/qa.txt"
+        else:
+            txtFileInput = txtFileInput.name
+
+        configuration = readQATextFile(txtFileInput)
+
+        configuration["ortographyPercentage"] = float(orthographyPercentage)
+        configuration["syntaxPercentage"] = float(syntaxPercentage)
+        configuration["semanticPercentage"] = float(semanticPercentage)
+
+        if studentsRange == "":
+            studentsRange = "All"
+
+        configuration["students"] = studentsRange
+
         if not uploadedFile:
             uploadedFilePath = "./assets/test_data.zip"
         else:
@@ -23,18 +37,50 @@ def Main(configuration, uploadedFile):
                      
         config_json = load_json("configV2.json")
 
-        #configuring plentas methodology
-        response = Plentas(config_json[0], [answersTodict(uploadedFilePath), createTeacherJson(configuration_dict)])
-        # #overwriting the custom settings for the settings from the api      
+        modelResult = json.dumps(configuration)
+
+        # #configuring plentas methodology
+        response = Plentas(config_json[0], [answersTodict(uploadedFilePath), createTeacherJson(configuration)])
+        # # #overwriting the custom settings for the settings from the api      
         response.setApiSettings(configuration)
     
-        # modelResult = jsonify(response.processApiData())
+        # # modelResult = jsonify(response.processApiData())
         modelResult = json.dumps(response.processApiData())
     except Exception as e:
         error = "Oops: " + str(e)
     
     return [error, modelResult]
 
+def readQATextFile(qaTextFilePath):
+    configuration = {}
+
+    f = open(qaTextFilePath, 'r')
+    lines = f.readlines()
+
+    count = 0
+    qCount=1
+    
+    q = ""
+    a = ""
+    while count < len(lines):
+        if q == "" or q == "\n":
+            q = lines[count]
+            count += 1
+            continue
+
+        if a == "" or a == "\n":
+            a = lines[count]
+            count += 1            
+            
+        if q != "" and a != "":
+            configuration["minip" + str(qCount)] = q
+            configuration["minir" + str(qCount)] = a
+            qCount += 1
+            q = ""
+            a = ""
+    
+    return configuration
+
 def createTeacherJson(configuration):
     """
     This function extracts the information about the subquestions and subanswers and puts them in the correct format.
@@ -141,15 +187,20 @@ def answersTodict(zip_path):
     save_json(create_file_path('ApiStudentsDict.json', doctype= 1),studentAnswersDict)
     return studentAnswersDict
 
-configuration = gr.inputs.Textbox(lines=10, placeholder="JSON de Configuración")
-zipFileInput = gr.inputs.File(label="ZIP file")
+
+zipFileInput = gr.inputs.File(label="1. Selecciona el .ZIP con las respuestas de los alumnos")
+txtFileInput = gr.inputs.File(label="2. Selecciona el .txt con las preguntas y respuestas correctas. Escriba una pregunta en una sola línea y debajo la respuesta en la línea siguiente.")
+orthographyPercentage = gr.inputs.Textbox(label="Ortografía",lines=1, placeholder="0",default=0.1, numeric=1)
+syntaxPercentage = gr.inputs.Textbox(label="Sintaxis",lines=1, placeholder="0",default=0.1,numeric=1)
+semanticPercentage = gr.inputs.Textbox(label="Semántica",lines=1, placeholder="0",default=0.8, numeric=1)
+studentsRange = gr.inputs.Textbox(label="Estudiantes a evaluar",lines=1, placeholder="Dejar vacío para evaluar todos")
 #dataFrameOutput = gr.outputs.Dataframe(headers=["Resultados"], max_rows=20, max_cols=None, overflow_row_behaviour="paginate", type="pandas", label="Resultado")
 
 labelOutput = gr.outputs.Label(num_top_classes=None, type="auto", label="")
 labelError = gr.outputs.Label(num_top_classes=None, type="auto", label="")
 
 iface = gr.Interface(fn=Main
-    , inputs=[configuration, zipFileInput]
+    , inputs=[zipFileInput, txtFileInput, orthographyPercentage, syntaxPercentage, semanticPercentage, studentsRange]
     , outputs=[labelError, labelOutput]
     , title = "PLENTAS"
 )

assets/qa.txt

@@ -0,0 +1,11 @@
+Esta es la primera pregunta. Que puede tener varias oraciones en una sola línea.
+Aquí va la primera respuesta.
+
+Esta es la segunda pregunta.
+Y esta es la segunda respuesta.
+
+Ahora la tercera pregunta.
+Y aquí la tercera respuesta.
+
+Y la última pregunta.
+Con la última respuesta.

codeScripts/settings.py

@@ -31,7 +31,7 @@ class GetSettings():
             -api_settings: dictionary with the stored parameters from the api
         """
         #transforming string dict into dict
-        api_settings = json.loads(api_settings)
+        #api_settings = json.loads(api_settings)
 
         self.PesoOrtografia = api_settings["ortographyPercentage"]
         self.PesoSintaxis = api_settings["syntaxPercentage"]