From c3b27a45c275d2ebe676b6779d4cd7aeaeb4b6d5 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 11 May 2023 05:37:14 +0000 Subject: [PATCH 1/4] Modelling ML Entity --- OpenAPI/TS28105_AiMlNrm.yaml | 61 +++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 77b62f530..429d72af9 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -15,27 +15,6 @@ components: #-------- Definition of types----------------------------------------------------- - MLEntityList: - type: array - items: - $ref: '#/components/schemas/MLEntity' - - MLEntity: - type: object - properties: - mLEntityId: - type: string - inferenceType: - type: string - mLEntityVersion: - type: string - expectedRunTimeContext: - $ref: '#/components/schemas/MLContext' - trainingContext: - $ref: '#/components/schemas/MLContext' - runTimeContext: - $ref: '#/components/schemas/MLContext' - MLContext: type: object properties: @@ -146,8 +125,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityList: - $ref: '#/components/schemas/MLEntityList' + mLEntityRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -167,8 +146,6 @@ components: allOf: - type: object properties: - mLEntityId: - type: string candidateTrainingDataSource: type: array items: @@ -188,6 +165,8 @@ components: type: boolean suspendRequest: type: boolean + mlEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -214,7 +193,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - + mlEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingReport-Single: allOf: @@ -225,8 +205,6 @@ components: allOf: - type: object properties: - mLEntityId: - type: string areConsumerTrainingDataUsed: type: boolean usedConsumerTrainingData: @@ -249,6 +227,27 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mlEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntity-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + inferenceType: + type: string + mLEntityVersion: + type: string + expectedRunTimeContext: + $ref: '#/components/schemas/MLContext' + trainingContext: + $ref: '#/components/schemas/MLContext' + runTimeContext: + $ref: '#/components/schemas/MLContext' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -276,6 +275,10 @@ components: type: array items: $ref: '#/components/schemas/MLTrainingReport-Single' + MLEntity-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntity-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -289,3 +292,5 @@ components: - $ref: '#/components/schemas/MLTrainingRequest-Single' - $ref: '#/components/schemas/MLTrainingProcess-Single' - $ref: '#/components/schemas/MLTrainingReport-Single' + - $ref: '#/components/schemas/MLEntity-Single' + -- GitLab From 3282cc715227918ceed2549623227fac1fa165c9 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 25 May 2023 18:38:45 +0000 Subject: [PATCH 2/4] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 38 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 429d72af9..028e8a7ac 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -125,8 +125,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLEntityList: + $ref: '#/components/schemas/MLEntityList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -146,6 +146,8 @@ components: allOf: - type: object properties: + mLEntityId: + type: string candidateTrainingDataSource: type: array items: @@ -165,8 +167,6 @@ components: type: boolean suspendRequest: type: boolean - mlEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -193,8 +193,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mlEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + MLTrainingReport-Single: allOf: @@ -205,6 +204,8 @@ components: allOf: - type: object properties: + mLEntityId: + type: string areConsumerTrainingDataUsed: type: boolean usedConsumerTrainingData: @@ -227,8 +228,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mlEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntity-Single: allOf: @@ -238,6 +237,8 @@ components: attributes: type: object properties: + mLEntityId: + type: string inferenceType: type: string mLEntityVersion: @@ -247,7 +248,18 @@ components: trainingContext: $ref: '#/components/schemas/MLContext' runTimeContext: - $ref: '#/components/schemas/MLContext' + $ref: '#/components/schemas/MLContext' + + MLEntityRepository-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + mLRepositoryId: + type: string #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -278,8 +290,11 @@ components: MLEntity-Multiple: type: array items: - $ref: '#/components/schemas/MLEntity-Single' - + $ref: '#/components/schemas/MLEntity-Single' + MLEntityRepository-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityRepository-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -293,4 +308,5 @@ components: - $ref: '#/components/schemas/MLTrainingProcess-Single' - $ref: '#/components/schemas/MLTrainingReport-Single' - $ref: '#/components/schemas/MLEntity-Single' + - $ref: '#/components/schemas/MLEntityRepository-Single' -- GitLab From 87b3b6f1350ea73629709edb7315b4838f79ef32 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 25 May 2023 18:44:57 +0000 Subject: [PATCH 3/4] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 028e8a7ac..6f9c318d8 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -125,8 +125,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityList: - $ref: '#/components/schemas/MLEntityList' + mLEntityRepositoryRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -148,6 +148,8 @@ components: properties: mLEntityId: type: string + inferenceType: + type: string candidateTrainingDataSource: type: array items: @@ -167,6 +169,8 @@ components: type: boolean suspendRequest: type: boolean + mLEntityToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -228,6 +232,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEnityGeneratedRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntity-Single: allOf: -- GitLab From b31117623a3476b7fcf381afaef6a812658e6d9b Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 25 May 2023 18:59:23 +0000 Subject: [PATCH 4/4] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 6f9c318d8..e806df534 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -101,6 +101,8 @@ components: $ref: '#/components/schemas/ManagedElement-Multiple' MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' ManagedElement-Single: allOf: @@ -114,6 +116,8 @@ components: properties: MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' MLTrainingFunction-Single: allOf: @@ -266,6 +270,8 @@ components: properties: mLRepositoryId: type: string + MLEntity: + $ref: '#/components/schemas/MLEntity-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -296,7 +302,7 @@ components: MLEntity-Multiple: type: array items: - $ref: '#/components/schemas/MLEntity-Single' + $ref: '#/components/schemas/MLEntity-Single' MLEntityRepository-Multiple: type: array items: -- GitLab