Update python script

Author: MarkHeff

labs/PiDay-2022-Vision/pythonscript/helmetdetection.py

@@ -20,6 +20,7 @@
 compartment_id = "<compartment id>"
 input_prefix = "<folder name for images>"
 output_prefix = "<output folder name for results>"
+max_results_per_image = 25
 
 # Auth Config Definition
 config = oci.config.from_file('~/.oci/config')
@@ -49,6 +50,7 @@
 ### Vision AI
 # Send the Request to Service with Multiple Features
 image_object_detection_feature = ImageObjectDetectionFeature()
+image_object_detection_feature.max_results = max_results_per_image
 features = [image_object_detection_feature]
 
 # Setup Input Location
@@ -76,9 +78,9 @@
 final_prefix= output_prefix+"/"+res.data.id+"/"+namespace_name+"_"+bucket_name+"_"+input_prefix+"/"
 
 # Logic to perform the following statistics:
-# 1. Count the number of persons and hardhats in each image, and total up the counts
-# 2. Report the person and hardhat counts, and the number of images processed
-# 3. Also, list the names of images where the person count and hardhat count don’t match
+# 1. Count the number of persons and helmets in each image, and total up the counts
+# 2. Report the person and helmets counts, and the number of images processed
+# 3. Also, list the names of images where the person count and helmets count don’t match
 
 # Wait for images to be processed
 print("Wait for images to be analyzed. Timeout after 90 seconds")
@@ -96,12 +98,14 @@
         time.sleep(5)
         i+= 1
 
-person_count=0
-hat_count=0
-total_person_count=0
-total_hat_count=0
-image_counter=0
-no_match_list=[]
+print("\n")
+
+person_count = 0
+helmet_count = 0
+total_person_count = 0
+total_helmet_count = 0
+image_counter = 0
+no_match_list = []
 
 # List all JSON responses received by Vision AI
 object_storage_client = ObjectStorageClient(config)
@@ -111,29 +115,30 @@
     prefix = final_prefix
 )
 
-# Count number of persons and number of hats
+# Count number of persons and number of helmets
 for i in object_list.data.objects:
+    person_count = 0
+    helmet_count = 0
+
     image_counter=image_counter+1
     body=object_storage_client.get_object(namespace_name, bucket_name, object_name=i.name)
     dict_test= json.loads(body.data.content.decode('utf-8'))
     for j in dict_test['imageObjects']:
-        if (j['name'] =='Person' or j['name']=='Man' or j['name']=='Woman' or j['name']=='Human'):
-            person_count = person_count+1
+        if (j['name'] == 'Person' or j['name'] == 'Man' or j['name'] == 'Woman' or j['name'] == 'Human'):
+            person_count = person_count + 1
         if (j['name'] == 'Helmet'):
-            hat_count = hat_count+1
+            helmet_count = helmet_count + 1
 
-    if (person_count != hat_count):
+    if (person_count != helmet_count):
         no_match_list.append(i.name)
 
     total_person_count = total_person_count + person_count
-    total_hat_count = total_hat_count + hat_count  
-    person_count=0
-    hat_count=0
+    total_helmet_count = total_helmet_count + helmet_count  
 
-print ("Number of persons found in images:", person_count,"\n")
-print ("Number of hardhats found in images:", hat_count, "\n")
+print ("Number of persons found in images:", total_person_count,"\n")
+print ("Number of helmets found in images:", total_helmet_count, "\n")
 print ("Number of images processed:", image_counter, "\n")     
-print ("Names of images where hat count is not equal to total number of persons:\n")
+print ("Names of images where at least one person is not wearing their helmet:\n")
 
 for i in no_match_list:
     i=re.sub(final_prefix,'',i)