slight reformatting

DSGT-DLP · May 1, 2024 · 0724b98 · 0724b98
1 parent 38b79da
commit 0724b98
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/frontend/src/features/Train/types/trainTypes.ts b/frontend/src/features/Train/types/trainTypes.ts
@@ -68,9 +68,9 @@ export interface ConfusionMatrixChart {
 
 // more detailed information, used when viewing a run
 export interface DetailedTrainResultsData {
-  basicInfo: TrainResultsData
+  basic_info: TrainResultsData
 
-  allMetrics: Chart[]
+  all_metrics: Chart[]
 }
 
 export interface FileUploadData {

diff --git a/frontend/src/pages/train/[train_space_id].tsx b/frontend/src/pages/train/[train_space_id].tsx
@@ -19,7 +19,7 @@ const mapTrainResultsDataToCharts = (
   detailedTrainResultsData: DetailedTrainResultsData
 ) => {
   // sort by graph_index asc and ignore negative graph indices
-  const sortedData = detailedTrainResultsData.allMetrics
+  const sortedData = detailedTrainResultsData.all_metrics
     .filter((metric) => metric.graph_index >= 0)
     .sort((a, b) => a.graph_index - b.graph_index);
   const charts = [];

diff --git a/training/training/core/celery/worker.py b/training/training/core/celery/worker.py
@@ -34,11 +34,11 @@ def saveDetailedTrainResultsDataToS3(
 ):
     s3 = boto3.resource("s3")
     s3.Object(
-        "dlp-executions", f"{detailedTrainResultsData.basicInfo.trainspaceId}.json"
+        "dlp-executions", f"{detailedTrainResultsData.basic_info.trainspaceId}.json"
     ).put(Body=detailedTrainResultsData.json())
 
 
-def collectClassificationTrainingResults(trainer, basicInfo):
+def collectClassificationTrainingResults(trainer, basic_info):
     trainTestLoss = [
         {
             "x_name": "Epoch",
@@ -63,8 +63,8 @@ def collectClassificationTrainingResults(trainer, basicInfo):
 
     detailedTrainResultsData = DetailedTrainResultsData(
         **{
-            "basicInfo": basicInfo,
-            "allMetrics": [
+            "basic_info": basic_info,
+            "all_metrics": [
                 {
                     "name": "Train and test loss vs epoch",
                     "time_series": trainTestLoss,
@@ -92,7 +92,7 @@ def collectClassificationTrainingResults(trainer, basicInfo):
 @celery_app.task(name="tabularTrainTask")
 def tabularTrainTask(input: dict, trainspaceId: str, uid: str):
     tabularParams = TabularParams(**input)
-    basicInfo = TrainResultsData(
+    basic_info = TrainResultsData(
         **{
             "name": tabularParams.name,
             "trainspaceId": trainspaceId,
@@ -137,7 +137,7 @@ def tabularTrainTask(input: dict, trainspaceId: str, uid: str):
             )
 
             detailedTrainResultsData = collectClassificationTrainingResults(
-                trainer, basicInfo
+                trainer, basic_info
             )
 
             # save detailedTrainResultsData
@@ -174,8 +174,8 @@ def tabularTrainTask(input: dict, trainspaceId: str, uid: str):
 
             detailedTrainResultsData = DetailedTrainResultsData(
                 **{
-                    "basicInfo": basicInfo,
-                    "allMetrics": [
+                    "basic_info": basic_info,
+                    "all_metrics": [
                         {
                             "name": "Train and test loss vs epoch",
                             "time_series": trainTestLoss,
@@ -193,7 +193,7 @@ def tabularTrainTask(input: dict, trainspaceId: str, uid: str):
 @celery_app.task(name="imageTrainTask")
 def imageTrainTask(input: dict, trainspaceId: str, uid: str):
     imageParams = ImageParams(**input)
-    basicInfo = TrainResultsData(
+    basic_info = TrainResultsData(
         **{
             "name": imageParams.name,
             "trainspaceId": trainspaceId,
@@ -223,7 +223,7 @@ def imageTrainTask(input: dict, trainspaceId: str, uid: str):
                 dataCreator.getCategoryList(),
             )
             detailedTrainResultsData = collectClassificationTrainingResults(
-                trainer, basicInfo
+                trainer, basic_info
             )
 
             # save detailedTrainResultsData

diff --git a/training/training/routes/training/results/results.py b/training/training/routes/training/results/results.py
@@ -27,7 +27,7 @@ def getDetailedTrainResultsData(request: Request, trainspace_id: str):
         file_content = content_object.get()["Body"].read().decode("utf-8")
         json_content = json.loads(file_content)
         detailedTrainResultsData = DetailedTrainResultsData(**json_content)
-        if request.auth["uid"] != detailedTrainResultsData.basicInfo.uid:
+        if request.auth["uid"] != detailedTrainResultsData.basic_info.uid:
             raise AuthenticationError("Invalid authorization")
 
     except botocore.exceptions.ClientError as e:

diff --git a/training/training/routes/training/results/schemas.py b/training/training/routes/training/results/schemas.py
@@ -70,6 +70,6 @@ class ConfusionMatrixChart(Schema):
 
 
 class DetailedTrainResultsData(Schema):
-    basicInfo: TrainResultsData
+    basic_info: TrainResultsData
 
-    allMetrics: List[Chart]
+    all_metrics: List[Chart]