change default reportId & ReportDatetime

src/services/json_generator.py

@@ -1,6 +1,7 @@
+import datetime
 import json
 import tempfile
-from datetime import datetime
+import uuid
 from assets.utils.validation import validate_boamps_schema
 from src.services.report_builder import ReportBuilder
 import os
@@ -99,13 +100,19 @@ def generate_json(
         # Use ReportBuilder for cleaner, more maintainable code
         builder = ReportBuilder()
 
+        # Create a uuid & a report datetime if not filled by the user
+        if not reportId:
+            reportId = str(uuid.uuid4())
+        if not reportDatetime:
+            reportDatetime = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
         # Build header section
         header_data = {
             "licensing": licensing,
             "formatVersion": formatVersion,
             "formatVersionSpecificationUri": formatVersionSpecificationUri,
             "reportId": reportId,
-            "reportDatetime": reportDatetime or datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+            "reportDatetime": reportDatetime,
             "reportStatus": reportStatus,
             "publisher_name": publisher_name,
             "publisher_division": publisher_division,

src/ui/form_components.py

@@ -1,6 +1,4 @@
-import uuid
 import gradio as gr
-import datetime
 from src.services.util import (
     REPORT_STATUS_OPTIONS, CONFIDENTIALITY_LEVELS, DATA_USAGE_OPTIONS, DATA_FORMAT,
     DATA_TYPES, DATA_SOURCE,
@@ -167,12 +165,11 @@ def create_header_tab():
         formatVersionSpecificationUri = gr.Textbox(
             label="Format Version Specification URI", info="(the URI of the present specification of this set of schemas)")
         reportId = gr.Textbox(
-            label="Report ID", info="(the unique identifier of this report, preferably as a uuid4 string)", value=str(uuid.uuid4()))
+            label="Report ID", info="(the unique identifier of this report, preferably as a uuid4 string)")
         reportDatetime = gr.Textbox(
             label="Report Datetime",
             info="Required field<br>(the publishing date of this report in format YYYY-MM-DD HH:MM:SS)",
             elem_classes="mandatory_field",
-            value=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         )
         reportStatus = gr.Dropdown(value=None,
                                    label="Report Status",