From d65f3615e79451ea4e2edfc683337fe0bffad3ac Mon Sep 17 00:00:00 2001 From: shumim Date: Fri, 19 Jan 2024 02:51:31 +0000 Subject: [PATCH 01/13] =?UTF-8?q?=E2=80=9DInitial=20the=20baseline=20for?= =?UTF-8?q?=20TS28.105=20NRM=20based=20on=20=20S5-238360=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28105_AiMlNrm.yaml | 476 +++++++++++++++++++++++++++++++++-- 1 file changed, 459 insertions(+), 17 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 71e2d3853..94144d83b 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -27,10 +27,11 @@ components: type: string enum: - NOT_STARTED - - TRAINING_IN_PROGRESS + - IN_PROGRESS - SUSPENDED - FINISHED - CANCELLED + - CANCELLING PerformanceRequirements: type: array @@ -45,11 +46,9 @@ components: performanceMetric: type: string performanceScore: - type: number - format: float + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' decisionConfidenceScore: - type: number - format: float + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' TrainingProcessMonitor: description: >- @@ -79,6 +78,67 @@ components: resultStateInfo: type: string + MlManagementPolicy: + description: >- + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” + with specialisations for usage in the "MLTrainingProcess". + type: object + properties: + thresholdList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo' + + SupportedPerfIndicator: + type: object + properties: + performanceIndicatorName: + type: string + isSupportedForTraining: + type: boolean + isSupportedForTesting: + type: boolean + + ManagedActivationScope: + oneOf: + - type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + - type: object + properties: + dNList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + - type: object + properties: + timeWindow: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + - type: object + properties: + geoPolygon: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + + AvailMLCapabilityReport: + type: object + properties: + availMLCapabilityReportID: + type: string # Fixme no specified in DraftCR + mLCapabilityVersionId: + type: array + items: + type: string + expectedPerformanceGains: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + #-------- Definition of abstract IOCs -------------------------------------------- @@ -101,8 +161,14 @@ components: $ref: '#/components/schemas/ManagedElement-Multiple' MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLTestingFunction: + $ref: '#/components/schemas/MLTestingFunction-Multiple' MLEntityRepository: $ref: '#/components/schemas/MLEntityRepository-Multiple' + MLUpdateFunction: + $ref: '#/components/schemas/MLUpdateFunction-Multiple' + AiMlInferenceCapability: + $ref: '#/components/schemas/AiMlInferenceCapability-Multiple' ManagedElement-Single: allOf: @@ -116,8 +182,14 @@ components: properties: MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLTestingFunction: + $ref: '#/components/schemas/MLTestingFunction-Multiple' MLEntityRepository: $ref: '#/components/schemas/MLEntityRepository-Multiple' + MLUpdateFunction: + $ref: '#/components/schemas/MLUpdateFunction-Multiple' + AiMlInferenceCapability: + $ref: '#/components/schemas/AiMlInferenceCapability-Multiple' MLTrainingFunction-Single: allOf: @@ -150,8 +222,6 @@ components: allOf: - type: object properties: - mLEntityId: - type: string inferenceType: type: string candidateTrainingDataSource: @@ -159,8 +229,7 @@ components: items: type: string trainingDataQualityScore: - type: number - format: float + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' trainingRequestSource: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: @@ -172,9 +241,11 @@ components: cancelRequest: type: boolean suspendRequest: - type: boolean + type: boolean mLEntityToTrainRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityCoordinationGroupToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -201,9 +272,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEnityGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLTrainingReport-Single: allOf: @@ -222,24 +290,174 @@ components: type: array items: type: string - modelConfidenceIndication: + confidenceIndication: type: integer modelPerformanceTraining: type: array items: $ref: '#/components/schemas/ModelPerformance' + modelPerformanceValidation: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' + dataRatioTrainingAndValidation: + type: integer areNewTrainingDataUsed: type: boolean trainingRequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - trainingReportRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEnityGeneratedRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityCoordinationGroupToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLTestingFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + mLEntityIdList: + type: array + items: + type: string + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + MLTestingRequest: + $ref: '#/components/schemas/MLTestingRequest-Multiple' + MLTestingReport: + $ref: '#/components/schemas/MLTestingReport-Multiple' + + MLTestingRequest-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + requestStatus: + $ref: '#/components/schemas/RequestStatus' + cancelRequest: + type: boolean + suspendRequest: + type: boolean + mLEntityToTestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityCoordinationGroupToTestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLTestingReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + modelPerformanceTesting: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' + mLTestingResult: + type: string + testingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLInferenceFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + mLEntityIdList: + type: array + items: + type: string + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + MLEntityLoadingRequest: + $ref: '#/components/schemas/MLEntityLoadingRequest-Multiple' + MLEntityLoadingProcess: + $ref: '#/components/schemas/MLEntityLoadingProcess-Multiple' + MLEntityLoadingPolicy: + $ref: '#/components/schemas/MLEntityLoadingPolicy-Multiple' + MLEntity: + $ref: '#/components/schemas/MLEntity-Multiple' + + MLEntityLoadingRequest-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + requestStatus: + $ref: '#/components/schemas/RequestStatus' + cancelRequest: + type: boolean + suspendRequest: + type: boolean + mLEntityToLoadRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntityLoadingPolicy-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + inferenceType: + type: string + mLEntityId: + type: string + policyForLoading: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntityLoadingProcess-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + progressStatus: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + cancelProcess: + type: boolean + suspendProcess: + type: boolean + resumeProcess: + type: boolean + MLEntityLoadingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + MLEntityLoadingPolicyRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + LoadedMLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntity-Single: allOf: @@ -260,7 +478,13 @@ components: trainingContext: $ref: '#/components/schemas/MLContext' runTimeContext: - $ref: '#/components/schemas/MLContext' + $ref: '#/components/schemas/MLContext' + supportedPerformanceIndicators: + $ref: '#/components/schemas/SupportedPerfIndicator' + retrainingEventsMonitorRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + sourceTrainedMLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntityRepository-Single: allOf: @@ -272,8 +496,150 @@ components: properties: mLRepositoryId: type: string + MLEntityList: + $ref: '#/components/schemas/MLEntity-Multiple' + MLEntityCoordinationGroups: + $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' + + MLEntityCoordinationGroup-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + memberMLEntityRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + ## 7.3a.4.1 IOC + MLUpdateFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + availMLCapabilityReport: + $ref: '#/components/schemas/AvailMLCapabilityReport' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + MLUpdateRequest: + $ref: '#/components/schemas/MLUpdateRequest-Multiple' + MLUpdateProcess: + $ref: '#/components/schemas/MLUpdateProcess-Multiple' + MLUpdateReport: + $ref: '#/components/schemas/MLUpdateReport-Multiple' + + MLUpdateRequest-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + performanceGainThreshold: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' + newCapabilityVersionId: + type: array + items: + type: string + updateTimeDeadline: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + requestStatus: + $ref: '#/components/schemas/RequestStatus' + mLUpdateReportingPeriod: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + mLUpdateProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + MLUpdateProcess-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + progressStatus: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLUpdateRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLUpdateReportRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLUpdateReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + updatedMLCapability: + $ref: '#/components/schemas/AvailMLCapabilityReport' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLUpdateProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + AiMlInferenceCapability-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + activationStatus: + type: string + enum: + - ACTIVATED + - DEACTIVATED + managedActivationScope: + $ref: '#/components/schemas/ManagedActivationScope' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: MLEntity: $ref: '#/components/schemas/MLEntity-Multiple' + AiMlESCapability-Single: + allOf: + - $ref: '#/components/schemas/AiMlInferenceCapability-Single' + #- $ref: '#/components/schemas/MlInferenceFunction-Single' + - type: object + properties: + attributes: + type: object + properties: + DMROFunctionRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + # Todo for other attribute related to role + + AiMlLBCapability-Single: + allOf: + - $ref: '#/components/schemas/AiMlInferenceCapability-Single' + # Todo for attribute related to role + + AiMlMOCapability-Single: + allOf: + - $ref: '#/components/schemas/AiMlInferenceCapability-Single' + # Todo for attribute related to role #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -309,6 +675,66 @@ components: type: array items: $ref: '#/components/schemas/MLEntityRepository-Single' + MLEntityCoordinationGroup-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' + MLTestingFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MLTestingFunction-Single' + MLTestingRequest-Multiple: + type: array + items: + $ref: '#/components/schemas/MLTestingRequest-Single' + MLTestingReport-Multiple: + type: array + items: + $ref: '#/components/schemas/MLTestingRequest-Single' + MLInferenceFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MLInferenceFunction-Single' + MLEntityLoadingRequest-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityLoadingRequest-Single' + MLEntityLoadingProcess-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityLoadingProcess-Single' + MLEntityLoadingPolicy-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityLoadingPolicy-Single' + MLUpdateFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MLUpdateFunction-Single' + MLUpdateRequest-Multiple: + type: array + items: + $ref: '#/components/schemas/MLUpdateRequest-Single' + MLUpdateProcess-Multiple: + type: array + items: + $ref: '#/components/schemas/MLUpdateProcess-Single' + MLUpdateReport-Multiple: + type: array + items: + $ref: '#/components/schemas/MLUpdateReport-Single' + AiMlInferenceCapability-Multiple: + type: array + items: + $ref: '#/components/schemas/AiMlInferenceCapability-Single' + AiMlESCapability-Multiple: + type: array + items: + $ref: '#/components/schemas/AiMlESCapability-Single' + AiMlLBCapability-Multiple: + type: array + items: + $ref: '#/components/schemas/AiMlLBCapability-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -323,3 +749,19 @@ components: - $ref: '#/components/schemas/MLTrainingReport-Single' - $ref: '#/components/schemas/MLEntity-Single' - $ref: '#/components/schemas/MLEntityRepository-Single' + - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' + - $ref: '#/components/schemas/MLTestingFunction-Single' + - $ref: '#/components/schemas/MLTestingRequest-Single' + - $ref: '#/components/schemas/MLTestingReport-Single' + - $ref: '#/components/schemas/MLInferenceFunction-Single' + - $ref: '#/components/schemas/MLEntityLoadingRequest-Single' + - $ref: '#/components/schemas/MLEntityLoadingProcess-Single' + - $ref: '#/components/schemas/MLEntityLoadingPolicy-Single' + + - $ref: '#/components/schemas/MLUpdateFunction-Single' + - $ref: '#/components/schemas/MLUpdateRequest-Single' + - $ref: '#/components/schemas/MLUpdateProcess-Single' + - $ref: '#/components/schemas/MLUpdateReport-Single' + - $ref: '#/components/schemas/AiMlInferenceCapability-Single' + - $ref: '#/components/schemas/AiMlESCapability-Single' + - $ref: '#/components/schemas/AiMlLBCapability-Single' -- GitLab From 6ff8be296a80c93acb6aef6c4f016676eb53569f Mon Sep 17 00:00:00 2001 From: shumim Date: Fri, 2 Feb 2024 12:33:54 +0000 Subject: [PATCH 02/13] delete --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 94144d83b..c28f50854 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -31,7 +31,7 @@ components: - SUSPENDED - FINISHED - CANCELLED - - CANCELLING + PerformanceRequirements: type: array -- GitLab From 49a2d726127c6e4fb90bd97202415a4333265001 Mon Sep 17 00:00:00 2001 From: shumin Date: Sun, 4 Feb 2024 21:56:57 +0800 Subject: [PATCH 03/13] clean up --- OpenAPI/28105_training.diff | 136 +++++++++++++++++++++++++++++++++++ OpenAPI/MLTestingNRM.diff | 125 ++++++++++++++++++++++++++++++++ OpenAPI/TS28105_AiMlNrm.yaml | 4 +- 3 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 OpenAPI/28105_training.diff create mode 100644 OpenAPI/MLTestingNRM.diff diff --git a/OpenAPI/28105_training.diff b/OpenAPI/28105_training.diff new file mode 100644 index 000000000..336f7ad33 --- /dev/null +++ b/OpenAPI/28105_training.diff @@ -0,0 +1,136 @@ +diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml +index e13d7fe..b451847 100644 +--- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml ++++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml +@@ -27,7 +27,7 @@ components: + type: string + enum: + - NOT_STARTED +- - TRAINING_IN_PROGRESS ++ - IN_PROGRESS + - SUSPENDED + - FINISHED + - CANCELLED +@@ -45,11 +45,9 @@ components: + performanceMetric: + type: string + performanceScore: +- type: number +- format: float ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + decisionConfidenceScore: +- type: number +- format: float ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + + TrainingProcessMonitor: + description: >- +@@ -150,8 +148,6 @@ components: + allOf: + - type: object + properties: +- mLEntityId: +- type: string + inferenceType: + type: string + candidateTrainingDataSource: +@@ -159,8 +155,7 @@ components: + items: + type: string + trainingDataQualityScore: +- type: number +- format: float ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + trainingRequestSource: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + requestStatus: +@@ -172,9 +167,11 @@ components: + cancelRequest: + type: boolean + suspendRequest: +- type: boolean ++ type: boolean + mLEntityToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' ++ mLEntityCoordinationGroupToTrainRef: ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLTrainingProcess-Single: + allOf: +@@ -226,18 +223,24 @@ components: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' ++ modelPerformanceValidation: ++ type: array ++ items: ++ $ref: '#/components/schemas/ModelPerformance' ++ dataRatioTrainingAndValidation: ++ type: integer + areNewTrainingDataUsed: + type: boolean + trainingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + trainingProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +- trainingReportRef: +- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + lastTrainingRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEnityGeneratedRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' ++ mLEntityCoordinationGroupToTrainRef: ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntity-Single: + allOf: +@@ -260,7 +263,9 @@ components: + runTimeContext: + $ref: '#/components/schemas/MLContext' + retrainingEventsMonitorRef: +- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single' ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' ++ sourceTrainedMLEntityRef: ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + + MLEntityRepository-Single: +@@ -275,6 +280,21 @@ components: + type: string + MLEntity: + $ref: '#/components/schemas/MLEntity-Multiple' ++ MLEntityCoordinationGroup-Single: ++ $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' ++ ++ MLEntityCoordinationGroup-Single: ++ allOf: ++ - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' ++ - type: object ++ properties: ++ attributes: ++ type: object ++ properties: ++ memberMLEntityRefList: ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' ++ MLEntity: ++ $ref: '#/components/schemas/MLEntity-Multiple' + + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- + +@@ -310,7 +330,10 @@ components: + type: array + items: + $ref: '#/components/schemas/MLEntityRepository-Single' +- ++ MLEntityCoordinationGroup-Multiple: ++ type: array ++ items: ++ $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' + #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- + + resources-AiMlNrm: +@@ -324,3 +347,4 @@ components: + - $ref: '#/components/schemas/MLTrainingReport-Single' + - $ref: '#/components/schemas/MLEntity-Single' + - $ref: '#/components/schemas/MLEntityRepository-Single' ++ - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' diff --git a/OpenAPI/MLTestingNRM.diff b/OpenAPI/MLTestingNRM.diff new file mode 100644 index 000000000..35d3e3d58 --- /dev/null +++ b/OpenAPI/MLTestingNRM.diff @@ -0,0 +1,125 @@ +diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml +index fc41e79..b451847 100644 +--- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml ++++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml +@@ -99,8 +99,6 @@ components: + $ref: '#/components/schemas/ManagedElement-Multiple' + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' +- MLTestingFunction: +- $ref: '#/components/schemas/MLTestingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' + +@@ -116,8 +114,6 @@ components: + properties: + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' +- MLTestingFunction: +- $ref: '#/components/schemas/MLTestingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' + +@@ -142,7 +138,7 @@ components: + $ref: '#/components/schemas/MLTrainingProcess-Multiple' + MLTrainingReport: + $ref: '#/components/schemas/MLTrainingReport-Multiple' +- ++ + MLTrainingRequest-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' +@@ -245,66 +241,6 @@ components: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityCoordinationGroupToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +- +- MLTestingFunction-Single: +- allOf: +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' +- - type: object +- properties: +- attributes: +- allOf: +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' +- - type: object +- properties: +- mLEntityIdList: +- type: array +- items: +- type: string +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' +- - type: object +- properties: +- MLTestingRequest: +- $ref: '#/components/schemas/MLTestingRequest-Multiple' +- MLTestingReport: +- $ref: '#/components/schemas/MLTestingReport-Multiple' +- +- MLTestingRequest-Single: +- allOf: +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' +- - type: object +- properties: +- attributes: +- allOf: +- - type: object +- properties: +- requestStatus: +- $ref: '#/components/schemas/RequestStatus' +- cancelRequest: +- type: boolean +- suspendRequest: +- type: boolean +- mLEntityToTestRef: +- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +- mLEntityCoordinationGroupToTestRef: +- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +- +- MLTestingReport-Single: +- allOf: +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' +- - type: object +- properties: +- attributes: +- allOf: +- - type: object +- properties: +- modelPerformanceTesting: +- type: array +- items: +- $ref: '#/components/schemas/ModelPerformance' +- mLTestingResult: +- type: string +- testingRequestRef: +- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntity-Single: + allOf: +@@ -398,18 +334,6 @@ components: + type: array + items: + $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' +- MLTestingFunction-Multiple: +- type: array +- items: +- $ref: '#/components/schemas/MLTestingFunction-Single' +- MLTestingRequest-Multiple: +- type: array +- items: +- $ref: '#/components/schemas/MLTestingRequest-Single' +- MLTestingReport-Multiple: +- type: array +- items: +- $ref: '#/components/schemas/MLTestingReport-Single' + #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- + + resources-AiMlNrm: +@@ -424,6 +348,3 @@ components: + - $ref: '#/components/schemas/MLEntity-Single' + - $ref: '#/components/schemas/MLEntityRepository-Single' + - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' +- - $ref: '#/components/schemas/MLTestingFunction-Single' +- - $ref: '#/components/schemas/MLTestingRequest-Single' +- - $ref: '#/components/schemas/MLTestingReport-Single' +\ No newline at end of file diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index c28f50854..c573e7ece 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -212,6 +212,8 @@ components: $ref: '#/components/schemas/MLTrainingProcess-Multiple' MLTrainingReport: $ref: '#/components/schemas/MLTrainingReport-Multiple' + ThresholdMonitors: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' MLTrainingRequest-Single: allOf: @@ -415,7 +417,7 @@ components: cancelRequest: type: boolean suspendRequest: - type: boolean + type: boolean mLEntityToLoadRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- GitLab From d979cdce9c606d6db0bfc7024bd2b7c13809938f Mon Sep 17 00:00:00 2001 From: shumin Date: Sun, 4 Feb 2024 22:03:37 +0800 Subject: [PATCH 04/13] delete uncessary files --- OpenAPI/28105_training.diff | 136 ------------------------------------ OpenAPI/MLTestingNRM.diff | 125 --------------------------------- 2 files changed, 261 deletions(-) delete mode 100644 OpenAPI/28105_training.diff delete mode 100644 OpenAPI/MLTestingNRM.diff diff --git a/OpenAPI/28105_training.diff b/OpenAPI/28105_training.diff deleted file mode 100644 index 336f7ad33..000000000 --- a/OpenAPI/28105_training.diff +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -index e13d7fe..b451847 100644 ---- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -+++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -@@ -27,7 +27,7 @@ components: - type: string - enum: - - NOT_STARTED -- - TRAINING_IN_PROGRESS -+ - IN_PROGRESS - - SUSPENDED - - FINISHED - - CANCELLED -@@ -45,11 +45,9 @@ components: - performanceMetric: - type: string - performanceScore: -- type: number -- format: float -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - decisionConfidenceScore: -- type: number -- format: float -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - - TrainingProcessMonitor: - description: >- -@@ -150,8 +148,6 @@ components: - allOf: - - type: object - properties: -- mLEntityId: -- type: string - inferenceType: - type: string - candidateTrainingDataSource: -@@ -159,8 +155,7 @@ components: - items: - type: string - trainingDataQualityScore: -- type: number -- format: float -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - trainingRequestSource: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - requestStatus: -@@ -172,9 +167,11 @@ components: - cancelRequest: - type: boolean - suspendRequest: -- type: boolean -+ type: boolean - mLEntityToTrainRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -+ mLEntityCoordinationGroupToTrainRef: -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - MLTrainingProcess-Single: - allOf: -@@ -226,18 +223,24 @@ components: - type: array - items: - $ref: '#/components/schemas/ModelPerformance' -+ modelPerformanceValidation: -+ type: array -+ items: -+ $ref: '#/components/schemas/ModelPerformance' -+ dataRatioTrainingAndValidation: -+ type: integer - areNewTrainingDataUsed: - type: boolean - trainingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - trainingProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- trainingReportRef: -- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - lastTrainingRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEnityGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -+ mLEntityCoordinationGroupToTrainRef: -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - MLEntity-Single: - allOf: -@@ -260,7 +263,9 @@ components: - runTimeContext: - $ref: '#/components/schemas/MLContext' - retrainingEventsMonitorRef: -- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single' -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -+ sourceTrainedMLEntityRef: -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - - MLEntityRepository-Single: -@@ -275,6 +280,21 @@ components: - type: string - MLEntity: - $ref: '#/components/schemas/MLEntity-Multiple' -+ MLEntityCoordinationGroup-Single: -+ $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' -+ -+ MLEntityCoordinationGroup-Single: -+ allOf: -+ - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -+ - type: object -+ properties: -+ attributes: -+ type: object -+ properties: -+ memberMLEntityRefList: -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' -+ MLEntity: -+ $ref: '#/components/schemas/MLEntity-Multiple' - - #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - -@@ -310,7 +330,10 @@ components: - type: array - items: - $ref: '#/components/schemas/MLEntityRepository-Single' -- -+ MLEntityCoordinationGroup-Multiple: -+ type: array -+ items: -+ $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' - #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- - - resources-AiMlNrm: -@@ -324,3 +347,4 @@ components: - - $ref: '#/components/schemas/MLTrainingReport-Single' - - $ref: '#/components/schemas/MLEntity-Single' - - $ref: '#/components/schemas/MLEntityRepository-Single' -+ - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' diff --git a/OpenAPI/MLTestingNRM.diff b/OpenAPI/MLTestingNRM.diff deleted file mode 100644 index 35d3e3d58..000000000 --- a/OpenAPI/MLTestingNRM.diff +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -index fc41e79..b451847 100644 ---- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -+++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -@@ -99,8 +99,6 @@ components: - $ref: '#/components/schemas/ManagedElement-Multiple' - MLTrainingFunction: - $ref: '#/components/schemas/MLTrainingFunction-Multiple' -- MLTestingFunction: -- $ref: '#/components/schemas/MLTestingFunction-Multiple' - MLEntityRepository: - $ref: '#/components/schemas/MLEntityRepository-Multiple' - -@@ -116,8 +114,6 @@ components: - properties: - MLTrainingFunction: - $ref: '#/components/schemas/MLTrainingFunction-Multiple' -- MLTestingFunction: -- $ref: '#/components/schemas/MLTestingFunction-Multiple' - MLEntityRepository: - $ref: '#/components/schemas/MLEntityRepository-Multiple' - -@@ -142,7 +138,7 @@ components: - $ref: '#/components/schemas/MLTrainingProcess-Multiple' - MLTrainingReport: - $ref: '#/components/schemas/MLTrainingReport-Multiple' -- -+ - MLTrainingRequest-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -@@ -245,66 +241,6 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityCoordinationGroupToTrainRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- -- MLTestingFunction-Single: -- allOf: -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- - type: object -- properties: -- attributes: -- allOf: -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' -- - type: object -- properties: -- mLEntityIdList: -- type: array -- items: -- type: string -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- - type: object -- properties: -- MLTestingRequest: -- $ref: '#/components/schemas/MLTestingRequest-Multiple' -- MLTestingReport: -- $ref: '#/components/schemas/MLTestingReport-Multiple' -- -- MLTestingRequest-Single: -- allOf: -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- - type: object -- properties: -- attributes: -- allOf: -- - type: object -- properties: -- requestStatus: -- $ref: '#/components/schemas/RequestStatus' -- cancelRequest: -- type: boolean -- suspendRequest: -- type: boolean -- mLEntityToTestRef: -- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- mLEntityCoordinationGroupToTestRef: -- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- -- MLTestingReport-Single: -- allOf: -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- - type: object -- properties: -- attributes: -- allOf: -- - type: object -- properties: -- modelPerformanceTesting: -- type: array -- items: -- $ref: '#/components/schemas/ModelPerformance' -- mLTestingResult: -- type: string -- testingRequestRef: -- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - MLEntity-Single: - allOf: -@@ -398,18 +334,6 @@ components: - type: array - items: - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' -- MLTestingFunction-Multiple: -- type: array -- items: -- $ref: '#/components/schemas/MLTestingFunction-Single' -- MLTestingRequest-Multiple: -- type: array -- items: -- $ref: '#/components/schemas/MLTestingRequest-Single' -- MLTestingReport-Multiple: -- type: array -- items: -- $ref: '#/components/schemas/MLTestingReport-Single' - #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- - - resources-AiMlNrm: -@@ -424,6 +348,3 @@ components: - - $ref: '#/components/schemas/MLEntity-Single' - - $ref: '#/components/schemas/MLEntityRepository-Single' - - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' -- - $ref: '#/components/schemas/MLTestingFunction-Single' -- - $ref: '#/components/schemas/MLTestingRequest-Single' -- - $ref: '#/components/schemas/MLTestingReport-Single' -\ No newline at end of file -- GitLab From 06f83bacebfddd08965d0bedd6fc65ae91e46fea Mon Sep 17 00:00:00 2001 From: shumin Date: Sun, 4 Feb 2024 23:48:49 +0800 Subject: [PATCH 05/13] 240817-Rel-18 Input to DraftCR 28.105 Corrections of Issues for Request IOCs --- OpenAPI/TS28105_AiMlNrm.yaml | 41 ++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index c573e7ece..8b9576c8e 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -31,7 +31,7 @@ components: - SUSPENDED - FINISHED - CANCELLED - + - CANCELLING PerformanceRequirements: type: array @@ -62,9 +62,9 @@ components: enum: - RUNNING - CANCELLING - - CANCELLED + - NOT_STARTED - SUSPENDED - - FINSHED + - FINISHED progressPercentage: type: integer minimum: 0 @@ -78,6 +78,30 @@ components: resultStateInfo: type: string + MlEntityLoadingProcessMonitor: + description: >- + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLEntityLoadingProcess". + type: object + properties: + MLEntityLoadingProcessId: + type: string + status: + type: string + enum: + - RUNNING + - CANCELLING + - SUSPENDED + - FINISHED + - CANCELLED + progressPercentage: + type: integer + minimum: 0 + maximum: 100 + progressStateInfo: + type: string + resultStateInfo: + type: string + MlManagementPolicy: description: >- This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” @@ -264,6 +288,11 @@ components: type: integer terminationConditions: type: string + enum: + - UPDATED_IN_INFERENCE_FUNCTION + - INFERENCE FUNCTION_TERMINATED + - INFERENCE FUNCTION_UPGRADED + - INFERENCE_CONTEXT_CHANGED progressStatus: $ref: '#/components/schemas/TrainingProcessMonitor' cancelProcess: @@ -561,6 +590,10 @@ components: $ref: '#/components/schemas/RequestStatus' mLUpdateReportingPeriod: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + cancelRequest: + type: boolean + suspendRequest: + type: boolean mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEntityRef: @@ -575,7 +608,7 @@ components: type: object properties: progressStatus: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + $ref: '#/components/schemas/MlEntityLoadingProcessMonitor' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateRequestRef: -- GitLab From c5945c5c2ba271681df8b20dc88406b252b4abb7 Mon Sep 17 00:00:00 2001 From: shumin Date: Sun, 4 Feb 2024 23:57:01 +0800 Subject: [PATCH 06/13] 2nd : 240817-Rel-18 Input to DraftCR 28.105 Corrections of Issues for Request IOCs --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 8b9576c8e..8eb2cd751 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -476,7 +476,7 @@ components: - type: object properties: progressStatus: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + $ref: '#/components/schemas/MlEntityLoadingProcessMonitor' cancelProcess: type: boolean suspendProcess: @@ -608,7 +608,7 @@ components: type: object properties: progressStatus: - $ref: '#/components/schemas/MlEntityLoadingProcessMonitor' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateRequestRef: -- GitLab From 8edaa39443f458e6967a9191219e49e601933cc4 Mon Sep 17 00:00:00 2001 From: shumin Date: Mon, 5 Feb 2024 01:08:15 +0800 Subject: [PATCH 07/13] S5-240812 : Rel-18 Input to draft CR TS 28.105 Available capabilities for MLUpdate --- OpenAPI/TS28105_AiMlNrm.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 8eb2cd751..7824c61f8 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -146,6 +146,17 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + + MLCapabilityInfo: + type: object + properties: + inferenceType: + type: string + capabilityName: + type: string + mLCapabilityParameters: + description: A map (list of key-value pairs) for an inferenceType and capabilityName + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' AvailMLCapabilityReport: type: object @@ -512,6 +523,10 @@ components: $ref: '#/components/schemas/MLContext' supportedPerformanceIndicators: $ref: '#/components/schemas/SupportedPerfIndicator' + mLCapabilitiesInfoList: + type: array + items: + $ref: '#/components/schemas/MLCapabilityInfo' retrainingEventsMonitorRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' sourceTrainedMLEntityRef: -- GitLab From 38715213f8b4f1d8d39047e60ba0d9f4dcac8ad6 Mon Sep 17 00:00:00 2001 From: shumin Date: Mon, 5 Feb 2024 02:36:26 +0800 Subject: [PATCH 08/13] =?UTF-8?q?S5=E2=80=91240815=20:=20Input=20to=20Draf?= =?UTF-8?q?tCR=2028.105=20Correct=20IOCs=20related=20references?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28105_AiMlNrm.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 7824c61f8..00de91665 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -293,8 +293,6 @@ components: allOf: - type: object properties: - mLTrainingProcessId: - type: string priority: type: integer terminationConditions: @@ -314,6 +312,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: @@ -324,8 +324,6 @@ components: allOf: - type: object properties: - mLEntityId: - type: string areConsumerTrainingDataUsed: type: boolean usedConsumerTrainingData: @@ -356,6 +354,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEntityCoordinationGroupToTrainRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTestingFunction-Single: allOf: @@ -367,10 +367,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityIdList: - type: array - items: - type: string + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -471,11 +469,11 @@ components: - type: object properties: inferenceType: - type: string - mLEntityId: type: string policyForLoading: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntityLoadingProcess-Single: allOf: @@ -540,8 +538,8 @@ components: attributes: type: object properties: - mLRepositoryId: - type: string + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntityList: $ref: '#/components/schemas/MLEntity-Multiple' MLEntityCoordinationGroups: -- GitLab From 5a946b7a52c06e3ee3f93317775d746a0d961d00 Mon Sep 17 00:00:00 2001 From: shumin Date: Mon, 5 Feb 2024 12:22:15 +0800 Subject: [PATCH 09/13] =?UTF-8?q?S5-240917=EF=BC=9AInput=20to=20DraftCR=20?= =?UTF-8?q?28.105=20Add=20relations=20for=20NRMs=20related=20to=20AI-ML=20?= =?UTF-8?q?inference=20functions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28105_AiMlNrm.yaml | 57 ++++++++---------------------------- 1 file changed, 13 insertions(+), 44 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 00de91665..c1fd49a3f 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -102,10 +102,9 @@ components: resultStateInfo: type: string - MlManagementPolicy: + AIMLManagementPolicy: description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” - with specialisations for usage in the "MLTrainingProcess". + This data type represents the properties of a policy for AI/ML management. type: object properties: thresholdList: @@ -202,8 +201,8 @@ components: $ref: '#/components/schemas/MLEntityRepository-Multiple' MLUpdateFunction: $ref: '#/components/schemas/MLUpdateFunction-Multiple' - AiMlInferenceCapability: - $ref: '#/components/schemas/AiMlInferenceCapability-Multiple' + AIMLInferenceFunction: + $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' ManagedElement-Single: allOf: @@ -223,8 +222,8 @@ components: $ref: '#/components/schemas/MLEntityRepository-Multiple' MLUpdateFunction: $ref: '#/components/schemas/MLUpdateFunction-Multiple' - AiMlInferenceCapability: - $ref: '#/components/schemas/AiMlInferenceCapability-Multiple' + AIMLInferenceFunction: + $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' MLTrainingFunction-Single: allOf: @@ -471,7 +470,7 @@ components: inferenceType: type: string policyForLoading: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: '#/components/schemas/AIMLManagementPolicy' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -644,7 +643,7 @@ components: mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - AiMlInferenceCapability-Single: + AIMLInferenceFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -661,33 +660,13 @@ components: - DEACTIVATED managedActivationScope: $ref: '#/components/schemas/ManagedActivationScope' + usedByFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: MLEntity: $ref: '#/components/schemas/MLEntity-Multiple' - AiMlESCapability-Single: - allOf: - - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - #- $ref: '#/components/schemas/MlInferenceFunction-Single' - - type: object - properties: - attributes: - type: object - properties: - DMROFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - # Todo for other attribute related to role - - AiMlLBCapability-Single: - allOf: - - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - # Todo for attribute related to role - - AiMlMOCapability-Single: - allOf: - - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - # Todo for attribute related to role #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -771,18 +750,10 @@ components: type: array items: $ref: '#/components/schemas/MLUpdateReport-Single' - AiMlInferenceCapability-Multiple: - type: array - items: - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - AiMlESCapability-Multiple: - type: array - items: - $ref: '#/components/schemas/AiMlESCapability-Single' - AiMlLBCapability-Multiple: + AIMLInferenceFunction-Multiple: type: array items: - $ref: '#/components/schemas/AiMlLBCapability-Single' + $ref: '#/components/schemas/AIMLInferenceFunction-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -810,6 +781,4 @@ components: - $ref: '#/components/schemas/MLUpdateRequest-Single' - $ref: '#/components/schemas/MLUpdateProcess-Single' - $ref: '#/components/schemas/MLUpdateReport-Single' - - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - - $ref: '#/components/schemas/AiMlESCapability-Single' - - $ref: '#/components/schemas/AiMlLBCapability-Single' + - $ref: '#/components/schemas/AIMLInferenceFunction-Single' -- GitLab From 0df809befb5b44f0c6399245a5b30b9a0e731594 Mon Sep 17 00:00:00 2001 From: shumin Date: Mon, 5 Feb 2024 14:02:27 +0800 Subject: [PATCH 10/13] S5-240805/0806/0811 inference function related --- OpenAPI/TS28105_AiMlNrm.yaml | 74 ++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index c1fd49a3f..b682049cd 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -172,6 +172,26 @@ components: $ref: '#/components/schemas/ModelPerformance' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + InferenceOutput: + type: object + properties: + inferenceOutputId: + type: array + items: + type: string + inferenceType: + type: string + inferenceOutputTime: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + # FIXME, isOrder/isUnique both as True + inferencePerformance: + $ref: '#/components/schemas/ModelPerformance' + outputResult: + description: A map (list of key-value pairs) for Inference result name and it's value + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' #-------- Definition of abstract IOCs -------------------------------------------- @@ -662,11 +682,46 @@ components: $ref: '#/components/schemas/ManagedActivationScope' usedByFunctionRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLEntityRef: # FIXME S5-240805,S5-240917 both define here + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - MLEntity: - $ref: '#/components/schemas/MLEntity-Multiple' + AIMLInferenceReport: + $ref: '#/components/schemas/AIMLInferenceReport-Multiple' + + AIMLInferenceReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + inferenceOutputs: #stage 2: attribute table name as: aimlInferenceOutputs FIXME + type: array + items: + $ref: '#/components/schemas/InferenceOutput' + minItems: 1 + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + AIMLInferenceEmulationFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + mLInferenceEmulationFunctionId: #stage 2 definition missing FIXME + type: string + mLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -718,10 +773,6 @@ components: type: array items: $ref: '#/components/schemas/MLTestingRequest-Single' - MLInferenceFunction-Multiple: - type: array - items: - $ref: '#/components/schemas/MLInferenceFunction-Single' MLEntityLoadingRequest-Multiple: type: array items: @@ -754,7 +805,14 @@ components: type: array items: $ref: '#/components/schemas/AIMLInferenceFunction-Single' - + AIMLInferenceReport-Multiple: + type: array + items: + $ref: '#/components/schemas/AIMLInferenceReport-Single' + AIMLInferenceEmulationFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- resources-AiMlNrm: @@ -782,3 +840,5 @@ components: - $ref: '#/components/schemas/MLUpdateProcess-Single' - $ref: '#/components/schemas/MLUpdateReport-Single' - $ref: '#/components/schemas/AIMLInferenceFunction-Single' + - $ref: '#/components/schemas/AIMLInferenceReport-Single' + - $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Single' -- GitLab From b9209c31eec382803472102e2a04767d967bfeeb Mon Sep 17 00:00:00 2001 From: shumin Date: Tue, 6 Feb 2024 11:22:30 +0800 Subject: [PATCH 11/13] Fix the issued based on offline comments from E/// --- OpenAPI/TS28105_AiMlNrm.yaml | 40 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index b682049cd..5e9d8e22e 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -33,11 +33,6 @@ components: - CANCELLED - CANCELLING - PerformanceRequirements: - type: array - items: - $ref: '#/components/schemas/ModelPerformance' - ModelPerformance: type: object properties: @@ -124,9 +119,6 @@ components: ManagedActivationScope: oneOf: - - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - type: object properties: dNList: @@ -160,8 +152,6 @@ components: AvailMLCapabilityReport: type: object properties: - availMLCapabilityReportID: - type: string # Fixme no specified in DraftCR mLCapabilityVersionId: type: array items: @@ -256,7 +246,7 @@ components: - type: object properties: mLEntityRepositoryRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -293,7 +283,9 @@ components: expectedRuntimeContext: $ref: '#/components/schemas/MLContext' performanceRequirements: - $ref: '#/components/schemas/PerformanceRequirements' + type: array + items: + $ref: '#/components/schemas/ModelPerformance' cancelRequest: type: boolean suspendRequest: @@ -332,7 +324,7 @@ components: trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLTrainingReport-Single: allOf: @@ -344,12 +336,16 @@ components: - type: object properties: areConsumerTrainingDataUsed: - type: boolean + type: string + enum: + - ALL + - PARTIALLY + - NONE usedConsumerTrainingData: type: array items: type: string - confidenceIndication: + modelconfidenceIndication: type: integer modelPerformanceTraining: type: array @@ -371,10 +367,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEnityGeneratedRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityCoordinationGroupToTrainRef: + mLEntityCoordinationGroupGeneratedRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLTestingFunction-Single: allOf: @@ -387,7 +383,7 @@ components: - type: object properties: mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -492,7 +488,7 @@ components: policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLEntityLoadingProcess-Single: allOf: @@ -558,7 +554,7 @@ components: type: object properties: mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLEntityList: $ref: '#/components/schemas/MLEntity-Multiple' MLEntityCoordinationGroups: @@ -717,9 +713,7 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLInferenceEmulationFunctionId: #stage 2 definition missing FIXME - type: string - mLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing + AIMLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- GitLab From 03dbc8761161bb6e4ee00945bb98406ea116c869 Mon Sep 17 00:00:00 2001 From: shumin Date: Tue, 6 Feb 2024 17:51:06 +0800 Subject: [PATCH 12/13] Fix the issued based on offline comments from E/// round2 --- OpenAPI/TS28105_AiMlNrm.yaml | 74 +++--------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 5e9d8e22e..05b43260f 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -45,58 +45,23 @@ components: decisionConfidenceScore: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - TrainingProcessMonitor: + ProcessMonitor: description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess". + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” + with specialisations for usage in TS 28.105. type: object properties: - mLTrainingProcessId: - type: string status: type: string - enum: - - RUNNING - - CANCELLING - - NOT_STARTED - - SUSPENDED - - FINISHED progressPercentage: type: integer minimum: 0 maximum: 100 progressStateInfo: type: string - enum: - - COLLECTING_DATA - - PREPARING_TRAINING_DATA - - TRAINING resultStateInfo: type: string - MlEntityLoadingProcessMonitor: - description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLEntityLoadingProcess". - type: object - properties: - MLEntityLoadingProcessId: - type: string - status: - type: string - enum: - - RUNNING - - CANCELLING - - SUSPENDED - - FINISHED - - CANCELLED - progressPercentage: - type: integer - minimum: 0 - maximum: 100 - progressStateInfo: - type: string - resultStateInfo: - type: string - AIMLManagementPolicy: description: >- This data type represents the properties of a policy for AI/ML management. @@ -314,7 +279,7 @@ components: - INFERENCE FUNCTION_UPGRADED - INFERENCE_CONTEXT_CHANGED progressStatus: - $ref: '#/components/schemas/TrainingProcessMonitor' + $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean suspendProcess: @@ -430,32 +395,6 @@ components: testingRequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLInferenceFunction-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - - type: object - properties: - mLEntityIdList: - type: array - items: - type: string - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - type: object - properties: - MLEntityLoadingRequest: - $ref: '#/components/schemas/MLEntityLoadingRequest-Multiple' - MLEntityLoadingProcess: - $ref: '#/components/schemas/MLEntityLoadingProcess-Multiple' - MLEntityLoadingPolicy: - $ref: '#/components/schemas/MLEntityLoadingPolicy-Multiple' - MLEntity: - $ref: '#/components/schemas/MLEntity-Multiple' - MLEntityLoadingRequest-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -500,7 +439,7 @@ components: - type: object properties: progressStatus: - $ref: '#/components/schemas/MlEntityLoadingProcessMonitor' + $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean suspendProcess: @@ -636,7 +575,7 @@ components: type: object properties: progressStatus: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + $ref: '#/components/schemas/ProcessMonitor' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateRequestRef: @@ -824,7 +763,6 @@ components: - $ref: '#/components/schemas/MLTestingFunction-Single' - $ref: '#/components/schemas/MLTestingRequest-Single' - $ref: '#/components/schemas/MLTestingReport-Single' - - $ref: '#/components/schemas/MLInferenceFunction-Single' - $ref: '#/components/schemas/MLEntityLoadingRequest-Single' - $ref: '#/components/schemas/MLEntityLoadingProcess-Single' - $ref: '#/components/schemas/MLEntityLoadingPolicy-Single' -- GitLab From 2700b952d1b45648eb13a7d4dc505ebcc460ed49 Mon Sep 17 00:00:00 2001 From: shumin Date: Tue, 6 Feb 2024 22:52:01 +0800 Subject: [PATCH 13/13] change attribute name --- OpenAPI/TS28105_AiMlNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 05b43260f..8c944a0c9 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -494,9 +494,11 @@ components: properties: mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - MLEntityList: + - type: object + properties: + MLEntity: $ref: '#/components/schemas/MLEntity-Multiple' - MLEntityCoordinationGroups: + MLEntityCoordinationGroup: $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' MLEntityCoordinationGroup-Single: -- GitLab