Merge pull request #7 from SonySemiconductorSolutions/release/v1/1.1.0

Squashed merge

Author: TE-YOSHIYUKIHAYASHI

.devcontainer/Dependencies/aitrios-sdk-console-access-lib-python

@@ -75,17 +75,17 @@ This repository provides sample code for a [Flask](https://flask.palletsprojects
 
 ### Restrictions
 
-None
+- Only images and inference results up to 10 hours after the inference start time can be acquired.
 
 ## Get support
 
-- [Contact us](https://developer.aitrios.sony-semicon.com/en/edge-ai-sensing/contact-us/)
+- [Contact us](https://support.aitrios.sony-semicon.com/hc/en-us/requests/new/)
 
 ## See also
 
 - [Get Started](https://developer.aitrios.sony-semicon.com/en/edge-ai-sensing/guides/)
-- [aitrios-sdk-console-access-lib-python](https://github.com/SonySemiconductorSolutions/aitrios-sdk-console-access-lib-python)
-- [aitrios-sdk-cloud-app-sample-python](https://github.com/SonySemiconductorSolutions/aitrios-sdk-cloud-app-sample-python)
+- [aitrios-sdk-console-access-lib-python](https://github.com/SonySemiconductorSolutions/aitrios-sdk-console-access-lib-python/tree/v1/main)
+- [aitrios-sdk-cloud-app-sample-python](https://github.com/SonySemiconductorSolutions/aitrios-sdk-cloud-app-sample-python/tree/v1/main)
 
 ## Trademark
 

README.md

@@ -19,7 +19,7 @@
 from setuptools import find_packages, setup
 
 PACKAGE_NAME = "checkdata-python"
-PACKAGE_VERSION = "0.1.0"
+PACKAGE_VERSION = "1.1.0"
 PACKAGE_DESCRIPTION = "checkdata-python"
 AUTHOR_NAME = "Sony Semiconductor Solutions Corporation"
 AUTHOR_EMAIL = ""

setup.py

@@ -35,12 +35,9 @@ def get_devices():
     try:
         devices_data = get_console_data.get_devices()
         return jsonify(devices_data), 200
-    
+
     except Exception as error:
-        error_message = {
-            "result": "ERROR",
-            "message": str(error)
-        }
+        error_message = {"result": "ERROR", "message": str(error)}
         return jsonify(error_message), 400
 
 
@@ -51,35 +48,34 @@ def get_image_directories():
         if device_id == "":
             error_response = {
                 "result": "ERROR",
-                "message": "Device ID is not specified."
+                "message": "Device ID is not specified.",
             }
             return jsonify(error_response), 400
-        
+
         directories_data = get_console_data.get_image_directories(device_id)
         return jsonify(directories_data), 200
-    
+
     except Exception as error:
-        error_message = {
-            "result": "ERROR",
-            "message": str(error)
-        }
+        error_message = {"result": "ERROR", "message": str(error)}
         return jsonify(error_message), 400
 
 
 @app.route("/api/getImagesAndInferences", methods=["GET"])
 def get_images_and_inferences():
     try:
         device_id = request.args.get("deviceId")
-        sub_directory = request.args.get("imagePath")
+        sub_directory_name = request.args.get("imagePath")
         number_of_images = request.args.get("numberOfImages")
-        if device_id == "" or sub_directory == "" or number_of_images == "":
+        if device_id == "" or sub_directory_name == "" or number_of_images == "":
             error_response = {
                 "result": "ERROR",
-                "message": "Device ID is not specified."
+                "message": "Required parameter is not specified.",
             }
             return jsonify(error_response), 400
-        
-        images_list = get_console_data.get_images(device_id, sub_directory, int(number_of_images))
+
+        images_list = get_console_data.get_images(
+            device_id, sub_directory_name, int(number_of_images)
+        )
         output_list = []
         for image in images_list:
             image_timestamp = image["name"].replace(".jpg", "")
@@ -98,19 +94,13 @@ def get_images_and_inferences():
                 }
                 output_list.append(output)
             except Exception as error:
-                error_message = {
-                    "result": "ERROR",
-                    "message": str(error)
-                }
+                error_message = {"result": "ERROR", "message": str(error)}
                 return jsonify(error_message), 400
-            
+
         return jsonify(output_list), 200
-    
+
     except Exception as error:
-        error_message = {
-            "result": "ERROR",
-            "message": str(error)
-        }
+        error_message = {"result": "ERROR", "message": str(error)}
         return jsonify(error_message), 500
 
 

src/app.py

@@ -14,6 +14,7 @@
 limitations under the License.
 """
 
+from datetime import datetime, timezone, timedelta
 from data_loader.common.get_client import get_console_client
 
 
@@ -40,11 +41,32 @@ def get_image_directories(device_id):
         raise Exception(str(error))
 
 
-def get_images(device_id, device_directory_name, number_of_images):
+def get_images(device_id, sub_directory_name, number_of_images):
     try:
         client_obj = get_console_client()
+
+        start_datetime = convert_timestamp_to_datetime(sub_directory_name)
+        start_time = start_datetime.strftime("%Y%m%d%H%M")
+
+        # Retrieve images for 10 hours from the specified time.
+        # If 10 hours later exceeds the current time, use the current time.
+        tenhours_later_datetime = start_datetime + timedelta(hours=10)
+        current_datetime = datetime.now(timezone.utc)
+        end_datetime = (
+            tenhours_later_datetime
+            if tenhours_later_datetime < current_datetime
+            else current_datetime
+        )
+        end_time = end_datetime.strftime("%Y%m%d%H%M")
+
         response = client_obj.insight.get_images(
-            device_id=device_id, sub_directory_name=device_directory_name, number_of_images=number_of_images
+            device_id=device_id,
+            sub_directory_name=sub_directory_name,
+            number_of_images=number_of_images,
+            order_by="DESC",
+            skip=0,
+            from_datetime=start_time,
+            to_datetime=end_time,
         )
         if len(response["images"]) == 0:
             raise Exception("Cannot get images.")
@@ -62,10 +84,24 @@ def get_inference_result(device_id, image_timestamp):
             raw=1,
             time=image_timestamp,
         )
-        if len(response[0]["inferences"]) == 0:
+        if len(response[0]["inference_result"]["Inferences"]) == 0:
             print("Cannot get inference results.")
             raise Exception("Cannot get inference results.")
-        return response[0]["inferences"]
+        return response[0]["inference_result"]["Inferences"]
     except Exception as error:
         raise Exception(str(error))
-    
+
+
+def convert_timestamp_to_datetime(timestamp):
+    converted_datetime = datetime(
+        year=int(timestamp[:4]),
+        month=int(timestamp[4:6]),
+        day=int(timestamp[6:8]),
+        hour=int(timestamp[8:10]),
+        minute=int(timestamp[10:12]),
+        second=int(timestamp[12:14]),
+        microsecond=int(timestamp[14:] + "000"),
+        tzinfo=timezone.utc,
+    )
+
+    return converted_datetime