[PYG-287] 🍃WindTurbine extending core (#359)

* build: poetry update * build: upgrade * refactor: firts draft enterprise * refactor: maybe finished with extension * fix: a bounch of bugs * refactor: split out enterprise * fix: one less bug * fix: errors in enterprise * fix: reverse bug * fix: equipment * fix: bug * fix: one more bug * refactor; valid dml * refactor: start on mapping * refactor; rename modules * refactor: move * refactor: first pass solution model * fix: bug in solution model * fix: bug in solution Datasheet.yaml * fix: added missing sources * fix: added missing views * fix: solution model * refactor: drop unit to avoid describable * build: update
cognitedata · Nov 16, 2024 · f1a9317 · f1a9317
1 parent 0a28ef7
commit f1a9317
Show file tree

Hide file tree

Showing 110 changed files with 2,187 additions and 344 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,4 @@ node_modules/
 package-lock.json
 package.json
 *.env
+playground.ipynb
diff --git a/cdf.toml b/cdf.toml
@@ -5,7 +5,7 @@ default_env = "dev"
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf module upgrade' command.
-version = "0.3.7"
+version = "0.3.10"
 
 [plugins]
 run = false

diff --git a/cdf/config.dev.yaml b/cdf/config.dev.yaml
@@ -8,10 +8,12 @@ environment:
 variables:
   modules:
     models:
-      pygen:
+      omni:
         pygen_models_space: sp_pygen_models
-        pygen_power: sp_pygen_power
         pygen_other_models_space: sp_pygen_models_other
+      wind:
+        pygen_power: sp_pygen_power
+        pygen_power_enterprise: sp_pygen_power_enterprise
 
       cdf_idm_extension:
         organization: YourOrg

diff --git a/...els/pygen/data_models/omni.datamodel.yaml → ...dels/omni/data_models/omni.datamodel.yaml b/...els/pygen/data_models/omni.datamodel.yaml → ...dels/omni/data_models/omni.datamodel.yaml
diff --git a/...ners/CDFExternalReferences.container.yaml → ...ners/CDFExternalReferences.container.yaml b/...ners/CDFExternalReferences.container.yaml → ...ners/CDFExternalReferences.container.yaml
diff --git a/...DFExternalReferencesListed.container.yaml → ...DFExternalReferencesListed.container.yaml b/...DFExternalReferencesListed.container.yaml → ...DFExternalReferencesListed.container.yaml
diff --git a/.../containers/ConnectionBase.container.yaml → .../containers/ConnectionBase.container.yaml b/.../containers/ConnectionBase.container.yaml → .../containers/ConnectionBase.container.yaml
diff --git a/...iners/ConnectionDirectList.container.yaml → ...iners/ConnectionDirectList.container.yaml b/...iners/ConnectionDirectList.container.yaml → ...iners/ConnectionDirectList.container.yaml
diff --git a/.../containers/ConnectionEdge.container.yaml → .../containers/ConnectionEdge.container.yaml b/.../containers/ConnectionEdge.container.yaml → .../containers/ConnectionEdge.container.yaml
diff --git a/...PolymorphismImplementation.container.yaml → ...PolymorphismImplementation.container.yaml b/...PolymorphismImplementation.container.yaml → ...PolymorphismImplementation.container.yaml
diff --git a/.../PolymorphismMainInterface.container.yaml → .../PolymorphismMainInterface.container.yaml b/.../PolymorphismMainInterface.container.yaml → .../PolymorphismMainInterface.container.yaml
diff --git a/...s/PolymorphismSubInterface.container.yaml → ...s/PolymorphismSubInterface.container.yaml b/...s/PolymorphismSubInterface.container.yaml → ...s/PolymorphismSubInterface.container.yaml
diff --git a/...ntainers/PrimitiveNullable.container.yaml → ...ntainers/PrimitiveNullable.container.yaml b/...ntainers/PrimitiveNullable.container.yaml → ...ntainers/PrimitiveNullable.container.yaml
diff --git a/...rs/PrimitiveNullableListed.container.yaml → ...rs/PrimitiveNullableListed.container.yaml b/...rs/PrimitiveNullableListed.container.yaml → ...rs/PrimitiveNullableListed.container.yaml
diff --git a/...ntainers/PrimitiveRequired.container.yaml → ...ntainers/PrimitiveRequired.container.yaml b/...ntainers/PrimitiveRequired.container.yaml → ...ntainers/PrimitiveRequired.container.yaml
diff --git a/...rs/PrimitiveRequiredListed.container.yaml → ...rs/PrimitiveRequiredListed.container.yaml b/...rs/PrimitiveRequiredListed.container.yaml → ...rs/PrimitiveRequiredListed.container.yaml
diff --git a/...ners/PrimitiveWithDefaults.container.yaml → ...ners/PrimitiveWithDefaults.container.yaml b/...ners/PrimitiveWithDefaults.container.yaml → ...ners/PrimitiveWithDefaults.container.yaml
diff --git a/...ygen/data_models/omni/node_type.node.yaml → ...omni/data_models/omni/node_type.node.yaml b/...ygen/data_models/omni/node_type.node.yaml → ...omni/data_models/omni/node_type.node.yaml
diff --git a/...mni/views/CDFExternalReferences.view.yaml → ...mni/views/CDFExternalReferences.view.yaml b/...mni/views/CDFExternalReferences.view.yaml → ...mni/views/CDFExternalReferences.view.yaml
diff --git a/...ews/CDFExternalReferencesListed.view.yaml → ...ews/CDFExternalReferencesListed.view.yaml b/...ews/CDFExternalReferencesListed.view.yaml → ...ews/CDFExternalReferencesListed.view.yaml
diff --git a/...dels/omni/views/ConnectionEdgeA.view.yaml → ...dels/omni/views/ConnectionEdgeA.view.yaml b/...dels/omni/views/ConnectionEdgeA.view.yaml → ...dels/omni/views/ConnectionEdgeA.view.yaml
diff --git a/...dels/omni/views/ConnectionItemA.view.yaml → ...dels/omni/views/ConnectionItemA.view.yaml b/...dels/omni/views/ConnectionItemA.view.yaml → ...dels/omni/views/ConnectionItemA.view.yaml
diff --git a/...dels/omni/views/ConnectionItemB.view.yaml → ...dels/omni/views/ConnectionItemB.view.yaml b/...dels/omni/views/ConnectionItemB.view.yaml → ...dels/omni/views/ConnectionItemB.view.yaml
diff --git a/...dels/omni/views/ConnectionItemC.view.yaml → ...dels/omni/views/ConnectionItemC.view.yaml b/...dels/omni/views/ConnectionItemC.view.yaml → ...dels/omni/views/ConnectionItemC.view.yaml
diff --git a/...dels/omni/views/ConnectionItemD.view.yaml → ...dels/omni/views/ConnectionItemD.view.yaml b/...dels/omni/views/ConnectionItemD.view.yaml → ...dels/omni/views/ConnectionItemD.view.yaml
diff --git a/...dels/omni/views/ConnectionItemE.view.yaml → ...dels/omni/views/ConnectionItemE.view.yaml b/...dels/omni/views/ConnectionItemE.view.yaml → ...dels/omni/views/ConnectionItemE.view.yaml
diff --git a/...dels/omni/views/ConnectionItemF.view.yaml → ...dels/omni/views/ConnectionItemF.view.yaml b/...dels/omni/views/ConnectionItemF.view.yaml → ...dels/omni/views/ConnectionItemF.view.yaml
diff --git a/...dels/omni/views/ConnectionItemG.view.yaml → ...dels/omni/views/ConnectionItemG.view.yaml b/...dels/omni/views/ConnectionItemG.view.yaml → ...dels/omni/views/ConnectionItemG.view.yaml
diff --git a/...en/data_models/omni/views/Empty.view.yaml → ...ni/data_models/omni/views/Empty.view.yaml b/...en/data_models/omni/views/Empty.view.yaml → ...ni/data_models/omni/views/Empty.view.yaml
diff --git a/...ymorphismDependentOnNonWritable.view.yaml → ...ymorphismDependentOnNonWritable.view.yaml b/...ymorphismDependentOnNonWritable.view.yaml → ...ymorphismDependentOnNonWritable.view.yaml
diff --git a/...ews/PolymorphismImplementation1.view.yaml → ...ews/PolymorphismImplementation1.view.yaml b/...ews/PolymorphismImplementation1.view.yaml → ...ews/PolymorphismImplementation1.view.yaml
diff --git a/...phismImplementation1NonWritable.view.yaml → ...phismImplementation1NonWritable.view.yaml b/...phismImplementation1NonWritable.view.yaml → ...phismImplementation1NonWritable.view.yaml
diff --git a/...ews/PolymorphismImplementation2.view.yaml → ...ews/PolymorphismImplementation2.view.yaml b/...ews/PolymorphismImplementation2.view.yaml → ...ews/PolymorphismImplementation2.view.yaml
diff --git a/...views/PolymorphismMainInterface.view.yaml → ...views/PolymorphismMainInterface.view.yaml b/...views/PolymorphismMainInterface.view.yaml → ...views/PolymorphismMainInterface.view.yaml
diff --git a/.../views/PolymorphismSubInterface.view.yaml → .../views/PolymorphismSubInterface.view.yaml b/.../views/PolymorphismSubInterface.view.yaml → .../views/PolymorphismSubInterface.view.yaml
diff --git a/...ls/omni/views/PrimitiveNullable.view.yaml → ...ls/omni/views/PrimitiveNullable.view.yaml b/...ls/omni/views/PrimitiveNullable.view.yaml → ...ls/omni/views/PrimitiveNullable.view.yaml
diff --git a/...i/views/PrimitiveNullableListed.view.yaml → ...i/views/PrimitiveNullableListed.view.yaml b/...i/views/PrimitiveNullableListed.view.yaml → ...i/views/PrimitiveNullableListed.view.yaml
diff --git a/...ls/omni/views/PrimitiveRequired.view.yaml → ...ls/omni/views/PrimitiveRequired.view.yaml b/...ls/omni/views/PrimitiveRequired.view.yaml → ...ls/omni/views/PrimitiveRequired.view.yaml
diff --git a/...i/views/PrimitiveRequiredListed.view.yaml → ...i/views/PrimitiveRequiredListed.view.yaml b/...i/views/PrimitiveRequiredListed.view.yaml → ...i/views/PrimitiveRequiredListed.view.yaml
diff --git a/...mni/views/PrimitiveWithDefaults.view.yaml → ...mni/views/PrimitiveWithDefaults.view.yaml b/...mni/views/PrimitiveWithDefaults.view.yaml → ...mni/views/PrimitiveWithDefaults.view.yaml
diff --git a/...gen/data_models/omni_multi.datamodel.yaml → ...mni/data_models/omni_multi.datamodel.yaml b/...gen/data_models/omni_multi.datamodel.yaml → ...mni/data_models/omni_multi.datamodel.yaml
diff --git a/...rphismImplementation1OtherSpace.view.yaml → ...rphismImplementation1OtherSpace.view.yaml b/...rphismImplementation1OtherSpace.view.yaml → ...rphismImplementation1OtherSpace.view.yaml
diff --git a/...s/PolymorphismImplementation1v2.view.yaml → ...s/PolymorphismImplementation1v2.view.yaml b/...s/PolymorphismImplementation1v2.view.yaml → ...s/PolymorphismImplementation1v2.view.yaml
diff --git a/...pygen/data_models/omni_sub.datamodel.yaml → .../omni/data_models/omni_sub.datamodel.yaml b/...pygen/data_models/omni_sub.datamodel.yaml → .../omni/data_models/omni_sub.datamodel.yaml
diff --git a/...odels/pygen/data_models/schema.space.yaml → ...models/omni/data_models/schema.space.yaml b/...odels/pygen/data_models/schema.space.yaml → ...models/omni/data_models/schema.space.yaml
@@ -1,10 +1,7 @@
 - space: {{ pygen_models_space }}
   name: PygenModels
   description: This space contains all the schemas for the pygen models
-- space: {{ pygen_power }}
-  name: PygenPower
-  description: This space contains all the schemas for the pygen power models
 - space: {{ pygen_other_models_space }}
   name: PygenModels
   description: This is an additional space for the pygen models, used to test
-    creating a model with views in different spaces.
+    creating a model with views in different spaces.
diff --git a/cdf/modules/models/pygen/data_models/windturbine/views/GeneratingUnit.view.yaml b/cdf/modules/models/pygen/data_models/windturbine/views/GeneratingUnit.view.yaml
diff --git a/cdf/modules/models/wind/data_models/enterprise.datamodel.yaml b/cdf/modules/models/wind/data_models/enterprise.datamodel.yaml
@@ -0,0 +1,206 @@
+space: {{ pygen_power_enterprise }}
+externalId: WindDomain
+version: v1
+name: WindDomain
+description: This is an enterprise data model for wind domain.
+views:
+- space: {{ pygen_power_enterprise }}
+  externalId: Blade
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: Gearbox
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: Generator
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: HighSpeedShaft
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: MainShaft
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: Metmast
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: Nacelle
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: PowerInverter
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: Rotor
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: SensorPosition
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: GeneratingUnit
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: WindTurbine
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: SolarPanel
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: WorkOrder
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: SensorTimeSeries
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: GeneratingEquipment
+  version: v1
+  type: view
+- space: {{ pygen_power_enterprise }}
+  externalId: DataSheet
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteDescribable
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteSourceable
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteSourceSystem
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteSchedulable
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteVisualizable
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite3DTransformation
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteCubeMap
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite3DObject
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite3DModel
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteCADModel
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite3DRevision
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CognitePointCloudModel
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite360ImageModel
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteCADRevision
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CognitePointCloudRevision
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite360ImageCollection
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteCADNode
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CognitePointCloudVolume
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite360Image
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite360ImageStation
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: Cognite360ImageAnnotation
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteAsset
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteAssetClass
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteAssetType
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteEquipment
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteEquipmentType
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteFile
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteFileCategory
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteActivity
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteTimeSeries
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteAnnotation
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteDiagramAnnotation
+  version: v1
+  type: view
+- space: cdf_cdm
+  externalId: CogniteUnit
+  version: v1
+  type: view
diff --git a/cdf/modules/models/wind/data_models/enterprise/containers/Blade.container.yaml b/cdf/modules/models/wind/data_models/enterprise/containers/Blade.container.yaml
@@ -0,0 +1,13 @@
+space: {{ pygen_power_enterprise }}
+externalId: Blade
+name: Blade
+usedFor: node
+properties:
+  is_damaged:
+    type:
+      list: false
+      type: boolean
+    nullable: true
+    autoIncrement: false
+    immutable: false
+    name: is_damaged
diff --git a/cdf/modules/models/wind/data_models/enterprise/containers/Datasheet.container.yaml b/cdf/modules/models/wind/data_models/enterprise/containers/Datasheet.container.yaml
@@ -0,0 +1,14 @@
+space: {{ pygen_power_enterprise }}
+externalId: DataSheet
+name: DataSheet
+usedFor: node
+properties:
+  UUID:
+    type:
+      list: false
+      collation: ucs_basic
+      type: text
+    nullable: true
+    autoIncrement: false
+    immutable: false
+    name: UUID
diff --git a/...urbine/containers/Distance.container.yaml → ...rprise/containers/Distance.container.yaml b/...urbine/containers/Distance.container.yaml → ...rprise/containers/Distance.container.yaml
@@ -1,4 +1,4 @@
-space: {{ pygen_power }}
+space: {{ pygen_power_enterprise }}
 externalId: Distance
 name: Distance
 usedFor: edge

diff --git a/...turbine/containers/Gearbox.container.yaml → ...erprise/containers/Gearbox.container.yaml b/...turbine/containers/Gearbox.container.yaml → ...erprise/containers/Gearbox.container.yaml
@@ -1,28 +1,28 @@
-space: {{ pygen_power }}
+space: {{ pygen_power_enterprise }}
 externalId: Gearbox
 name: Gearbox
 usedFor: node
 properties:
   displacement_x:
     type:
       list: false
-      type: timeseries
+      type: direct
     nullable: true
     autoIncrement: false
     immutable: false
     name: displacement_x
   displacement_y:
     type:
       list: false
-      type: timeseries
+      type: direct
     nullable: true
     autoIncrement: false
     immutable: false
     name: displacement_y
   displacement_z:
     type:
       list: false
-      type: timeseries
+      type: direct
     nullable: true
     autoIncrement: false
     immutable: false

diff --git a/.../containers/GeneratingUnit.container.yaml → .../containers/GeneratingUnit.container.yaml b/.../containers/GeneratingUnit.container.yaml → .../containers/GeneratingUnit.container.yaml
@@ -1,4 +1,4 @@
-space: {{ pygen_power }}
+space: {{ pygen_power_enterprise }}
 externalId: GeneratingUnit
 name: GeneratingUnit
 usedFor: node

diff --git a/...rbine/containers/Generator.container.yaml → ...prise/containers/Generator.container.yaml b/...rbine/containers/Generator.container.yaml → ...prise/containers/Generator.container.yaml
@@ -1,20 +1,20 @@
-space: {{ pygen_power }}
+space: {{ pygen_power_enterprise }}
 externalId: Generator
 name: Generator
 usedFor: node
 properties:
   generator_speed_controller:
     type:
       list: false
-      type: timeseries
+      type: direct
     nullable: true
     autoIncrement: false
     immutable: false
     name: generator_speed_controller
   generator_speed_controller_reference:
     type:
       list: false
-      type: timeseries
+      type: direct
     nullable: true
     autoIncrement: false
     immutable: false