issue #8: Adding new workflow

.github/CODEOWNERS

@@ -0,0 +1,6 @@
+# This CODEOWNERS file is auto-generated. See the script at <https://github.com/ai-cfia/devops/blob/main/github-management-script/codeowners-file-creation.sh> for modification details.
+
+/.github/ @ai-cfia/devops
+Dockerfile @ai-cfia/devops
+docker-compose.yml @ai-cfia/devops
+docker-compose.*.yml @ai-cfia/devops

.github/workflows/python-api-test-workflows.yml

@@ -0,0 +1,21 @@
+name: Python api-test workflows
+
+on:
+  pull_request:
+    types:
+      - opened
+      - closed
+      - synchronize
+
+jobs:
+  markdown-check:
+    uses: ai-cfia/github-workflows/.github/workflows/workflow-markdown-check.yml@main
+    secrets: inherit
+
+  repo-standard:
+    uses: ai-cfia/github-workflows/.github/workflows/workflow-repo-standards-validation.yml@main
+    secrets: inherit
+
+  test-python:
+    uses: ai-cfia/github-workflows/.github/workflows/workflow-lint-test-python.yml@main
+    secrets: inherit

.gitignore

@@ -2,4 +2,5 @@ keys.json
 questions.json
 keys_questions.txt
 questions_spreadsheet.csv
-base_composition_questions.csv
+base_composition_questions.csv
+*.pyc

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./Tests",
+        "-p",
+        "test*.py"
+    ],
+    "python.testing.unittestEnabled": true
+}

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 AI @ Canadian Food Inspection Agency (CFIA)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,2 +1,3 @@
 # harvester-prototype
-This repository is for the frontend of the project react 
+
+This repository is for the frontend of the project react

TESTING.md

@@ -0,0 +1,7 @@
+# Testing
+
+Run:
+
+```cmd
+python -m unittest discover -s Tests
+```

app.py

@@ -24,16 +24,16 @@ def getListImage(image_paths):
     return request
 
 def addText(request, number, baseQuestions=None):
-    if baseQuestions == None:
+    if baseQuestions is None:
         request.append(create_base_request(read_csv_file("base_composition_questions.csv")))
     else:  
         request.append(create_final_request(read_csv_file("questions_spreadsheet.csv"), baseQuestions))
 
     return request
 
-def generateRequest(directory, model:GenerativeModel, vertex:vertexai, baseQuestions=None, typeOfQuestion):
+def generateRequest(directory, model:GenerativeModel, vertex:vertexai, baseQuestions=None):
     request = getListImage(collect_images(directory))
-    if baseQuestions == None:
+    if baseQuestions is None:
         request = addText(request, 1)
     else:
         request = addText(request, 2, baseQuestions)
@@ -55,18 +55,18 @@ def generateRequest(directory, model:GenerativeModel, vertex:vertexai, baseQuest
         stream=False,
     )   
 
-    if baseQuestions == None:
+    if baseQuestions is None:
         baseQuestions = toDict(responses.text)
-    else:
-        otherQuestion = toDict(responses, baseQuestions)
+    #else:
+       # otherQuestion = toDict(responses, baseQuestions)
 
     print(responses.text)
 
     return baseQuestions
 
 def toDict(responses, baseQuestions=None):
     responseAsDict = {}
-    if baseQuestions == None: 
+    if baseQuestions is None: 
         for response in responses:
             texte = response
             indice = texte.find(":")
@@ -85,10 +85,10 @@ def  create_final_request(file, baseQuestions, typeOfQuestion):
     for index, line in file.iterrows():
         if not line.isnull().all():
             categorie = str(line['Categories'])
-            if line['Specification'] != None:
+            if line['Specification'] is not None:
                 request_AsText += str(line['Specification']) + "\n"
 
-            if line['Categories'] != None:
+            if line['Categories'] is not None:
                 if "not_asked" in categorie:
                     break
                 elif "all" in categorie:
@@ -175,12 +175,12 @@ def create_base_request(file):
 model = GenerativeModel("gemini-1.0-pro-vision-001")
 projectinit=vertexai.init(project="test-application-2-416219", location="northamerica-northeast1")
 #Original question
-baseQuestions = generateRequest('Company_Image_Folder\\Acti_Sol1', model, projectinit, None, "Original_question")
-baseQuestions = generateRequest('Company_Image_Folder\\Acti_Sol1', model, projectinit, baseQuestions, "Original_question")
+baseQuestions = generateRequest('company_image_folder\\Acti_Sol1', model, projectinit, None, "Original_question")
+baseQuestions = generateRequest('company_image_folder\\Acti_Sol1', model, projectinit, baseQuestions, "Original_question")
 # Modified question
-baseQuestions = generateRequest('Company_Image_Folder\\Acti_Sol1', model, projectinit, None, "Modified_question")
-baseQuestions = generateRequest('Company_Image_Folder\\Acti_Sol1', model, projectinit, baseQuestions, "Modified_question")
+baseQuestions = generateRequest('company_image_folder\\Acti_Sol1', model, projectinit, None, "Modified_question")
+baseQuestions = generateRequest('company_image_folder\\Acti_Sol1', model, projectinit, baseQuestions, "Modified_question")
 
 #generateRequest('Company_Image_Folder\Bio_Fleur', model, projectinit)
 #generateRequest('Company_Image_Folder\Bio_Fleur', model, projectinit)
-#generateRequest('Company_Image_Folder\Bio_Fleur', model, projectinit)
+#generateRequest('Company_Image_Folder\Bio_Fleur', model, projectinit)

Tests/testWithBaseQuestion.py → tests/test_whit_base_question.py

@@ -1,21 +1,21 @@
-import unittest
-
-class testWithBaseQuestion(unittest.TestCase):
-    def setUp(self):
-        # This method will be called before each test
-        pass
-
-    def tearDown(self):
-        # This method will be called after each test
-        pass
-
-    def test_case_1(self):
-        # Write your test case here
-        pass
-
-    def test_case_2(self):
-        # Write your test case here
-        pass
-
-if __name__ == '__main__':
-    unittest.main()
+import unittest
+
+class testWithBaseQuestion(unittest.TestCase):
+    def setUp(self):
+        # This method will be called before each test
+        pass
+
+    def tearDown(self):
+        # This method will be called after each test
+        pass
+
+    def test_case_1(self):
+        # Write your test case here
+        pass
+
+    def test_case_2(self):
+        # Write your test case here
+        pass
+
+if __name__ == '__main__':
+    unittest.main()