cognite-neat 0.127.21__py3-none-any.whl → 0.127.23__py3-none-any.whl

cognite/neat/_data_model/validation/dms/__init__.py

@@ -13,7 +13,11 @@ from ._connections import (
     ReverseConnectionTargetMissing,
 )
 from ._consistency import ViewSpaceVersionInconsistentWithDataModel
-from ._containers import ExternalContainerDoesNotExist, RequiredContainerDoesNotExist
+from ._containers import (
+    ExternalContainerDoesNotExist,
+    ExternalContainerPropertyDoesNotExist,
+    RequiredContainerDoesNotExist,
+)
 from ._limits import (
     ContainerPropertyCountIsOutOfLimits,
     ContainerPropertyListSizeIsOutOfLimits,
@@ -36,6 +40,7 @@ __all__ = [
     "DataModelViewCountIsOutOfLimits",
     "DmsDataModelValidation",
     "ExternalContainerDoesNotExist",
+    "ExternalContainerPropertyDoesNotExist",
     "ImplementedViewNotExisting",
     "RequiredContainerDoesNotExist",
     "ReverseConnectionContainerMissing",

cognite/neat/_data_model/validation/dms/_containers.py

@@ -12,17 +12,15 @@ BASE_CODE = "NEAT-DMS-CONTAINER"
 
 class ExternalContainerDoesNotExist(DataModelValidator):
     """
-    Validates that any container or container property referenced by a view property, when the
+    Validates that any container referenced by a view property, when the
     referenced container does not belong to the data model's space, exists in CDF.
 
     ## What it does
     For each view property that maps to a container in a different space than the data model,
-    this validator checks that:
-    - the referenced external container exists in CDF, and
-    - that the referenced container property also exists in that external container.
+    this validator checks that the referenced external container exists in CDF.
 
     ## Why is this bad?
-    If a view property references a container or container property that does not exist in CDF,
+    If a view property references a container that does not exist in CDF,
     the data model cannot be deployed. The affected view property will not function, and the
     deployment of the entire data model will fail.
 
@@ -30,10 +28,6 @@ class ExternalContainerDoesNotExist(DataModelValidator):
     View `my_space:WindTurbine` has a property `location` that maps to container
     `other_space:WindTurbineContainer`, where `other_space` differs from `my_space`. If that
     container does not exist in CDF, the model cannot be deployed.
-
-    Similarly, if a view property references `other_space:WindTurbineContainer` and its property
-    `gpsCoordinates`, and `gpsCoordinates` does not exist in that container in CDF, deployment
-    will also fail.
     """
 
     code = f"{BASE_CODE}-001"
@@ -50,7 +44,7 @@ class ExternalContainerDoesNotExist(DataModelValidator):
                     continue
 
                 # Check existence of container in CDF
-                elif property_.container not in self.cdf_resources.containers_by_reference:
+                if property_.container not in self.cdf_resources.containers_by_reference:
                     errors.append(
                         ConsistencyError(
                             message=(
@@ -62,8 +56,50 @@ class ExternalContainerDoesNotExist(DataModelValidator):
                         )
                     )
 
+        return errors
+
+
+class ExternalContainerPropertyDoesNotExist(DataModelValidator):
+    """
+    Validates that any container property referenced by a view property, when the
+    referenced container does not belong to the data model's space, exists in CDF.
+
+    ## What it does
+    For each view property that maps to a container in a different space than the data model,
+    this validator checks that the referenced container property exists in that external container in CDF.
+    This validator only runs if the external container exists in CDF.
+
+    ## Why is this bad?
+    If a view property references a container property that does not exist in CDF,
+    the data model cannot be deployed. The affected view property will not function, and the
+    deployment of the entire data model will fail.
+
+    ## Example
+    View `my_space:WindTurbine` has a property `location` that maps to container property
+    `gpsCoordinates` in `other_space:WindTurbineContainer`. If `gpsCoordinates` does not exist
+    in that container in CDF, deployment will fail.
+    """
+
+    code = f"{BASE_CODE}-002"
+
+    def run(self) -> list[ConsistencyError]:
+        errors: list[ConsistencyError] = []
+
+        for view_ref, view in self.merged_views.items():
+            for property_ref, property_ in view.properties.items():
+                if not isinstance(property_, ViewCorePropertyRequest):
+                    continue
+
+                if property_.container.space == self.local_resources.data_model_reference.space:
+                    continue
+
+                # Only check property if container exists in CDF
+                # this check is done in ExternalContainerDoesNotExist
+                if property_.container not in self.cdf_resources.containers_by_reference:
+                    continue
+
                 # Check existence of container property in CDF
-                elif (
+                if (
                     property_.container_property_identifier
                     not in self.cdf_resources.containers_by_reference[property_.container].properties
                 ):
@@ -100,7 +136,7 @@ class RequiredContainerDoesNotExist(DataModelValidator):
     If `windy_space:LocationContainer` does not exist in the data model or in CDF, deployment will fail.
     """
 
-    code = f"{BASE_CODE}-002"
+    code = f"{BASE_CODE}-003"
 
     def run(self) -> list[ConsistencyError]:
         errors: list[ConsistencyError] = []

cognite/neat/_data_model/validation/dms/_orchestrator.py

@@ -35,7 +35,11 @@ from ._connections import (
     ReverseConnectionTargetMissing,
 )
 from ._consistency import ViewSpaceVersionInconsistentWithDataModel
-from ._containers import ExternalContainerDoesNotExist, RequiredContainerDoesNotExist
+from ._containers import (
+    ExternalContainerDoesNotExist,
+    ExternalContainerPropertyDoesNotExist,
+    RequiredContainerDoesNotExist,
+)
 from ._views import ImplementedViewNotExisting, ViewToContainerMappingNotPossible
 
 
@@ -116,6 +120,7 @@ class DmsDataModelValidation(OnSuccessIssuesChecker):
             ImplementedViewNotExisting(local_resources, cdf_resources, self._modus_operandi),
             # Containers
             ExternalContainerDoesNotExist(local_resources, cdf_resources, self._modus_operandi),
+            ExternalContainerPropertyDoesNotExist(local_resources, cdf_resources, self._modus_operandi),
             RequiredContainerDoesNotExist(local_resources, cdf_resources, self._modus_operandi),
             # Consistency
             ViewSpaceVersionInconsistentWithDataModel(local_resources, cdf_resources, self._modus_operandi),

cognite/neat/_session/_html/static/deployment.js

@@ -4,12 +4,13 @@ let currentFilters = {
     severity: 'all',
 };
 let currentSearch = '';
-let isDarkMode = localStorage.getItem('neat-deployment-theme') === 'dark';
+const storageKey = 'neat-deployment-theme-' + uniqueId;
+let isDarkMode = localStorage.getItem(storageKey) === 'dark';
 
-const container = document.getElementById('deploymentContainer');
-const themeToggle = document.getElementById('themeToggle');
-const themeIcon = document.getElementById('themeIcon');
-const themeText = document.getElementById('themeText');
+const container = document.getElementById('deploymentContainer-' + uniqueId);
+const themeToggle = document.getElementById('themeToggle-' + uniqueId);
+const themeIcon = document.getElementById('themeIcon-' + uniqueId);
+const themeText = document.getElementById('themeText-' + uniqueId);
 
 // Status configuration
 const STATUS_CONFIG = {
@@ -21,9 +22,9 @@ const STATUS_CONFIG = {
 
 // Initialize status badge
 function initializeStatus() {
-    const statusBadge = document.getElementById('statusBadge');
-    const statusIcon = document.getElementById('statusIcon');
-    const statusText = document.getElementById('statusText');
+    const statusBadge = document.getElementById('statusBadge-' + uniqueId);
+    const statusIcon = document.getElementById('statusIcon-' + uniqueId);
+    const statusText = document.getElementById('statusText-' + uniqueId);
 
     const statusConfig = STATUS_CONFIG[stats.status] || STATUS_CONFIG.pending;
     statusIcon.textContent = statusConfig.icon;
@@ -47,12 +48,12 @@ initializeStatus();
 
 themeToggle.addEventListener('click', function() {
     isDarkMode = !isDarkMode;
-    localStorage.setItem('neat-deployment-theme', isDarkMode ? 'dark' : 'light');
+    localStorage.setItem(storageKey, isDarkMode ? 'dark' : 'light');
     updateTheme();
 });
 
 function renderChanges() {
-    const listContainer = document.getElementById('deploymentList');
+    const listContainer = document.getElementById('deploymentList-' + uniqueId);
     const filtered = changes.filter(change => {
         const matchesChangeType = currentFilters.changeType === 'all' ||
                                  change.change_type === currentFilters.changeType;
@@ -97,9 +98,9 @@ function renderChanges() {
 }
 
 // Change type filters (stat items)
-document.querySelectorAll('.stat-item').forEach(item => {
+document.querySelectorAll('#deploymentContainer-' + uniqueId + ' .stat-item').forEach(item => {
     item.addEventListener('click', function() {
-        document.querySelectorAll('.stat-item').forEach(i => i.classList.remove('active'));
+        document.querySelectorAll('#deploymentContainer-' + uniqueId + ' .stat-item').forEach(i => i.classList.remove('active'));
         this.classList.add('active');
         currentFilters.changeType = this.dataset.filter;
         renderChanges();
@@ -107,10 +108,10 @@ document.querySelectorAll('.stat-item').forEach(item => {
 });
 
 // Other filters
-document.querySelectorAll('.filter-btn').forEach(btn => {
+document.querySelectorAll('#deploymentContainer-' + uniqueId + ' .filter-btn').forEach(btn => {
     btn.addEventListener('click', function() {
         const filterType = this.dataset.filterType;
-        document.querySelectorAll(`[data-filter-type="${filterType}"]`).forEach(b =>
+        document.querySelectorAll('#deploymentContainer-' + uniqueId + ` [data-filter-type="${filterType}"]`).forEach(b =>
             b.classList.remove('active')
         );
         this.classList.add('active');
@@ -120,13 +121,13 @@ document.querySelectorAll('.filter-btn').forEach(btn => {
 });
 
 // Search
-document.getElementById('searchInput').addEventListener('input', function(e) {
+document.getElementById('searchInput-' + uniqueId).addEventListener('input', function(e) {
     currentSearch = e.target.value;
     renderChanges();
 });
 
 // Export function
-window.exportDeployment = function() {
+window['exportDeployment_' + uniqueId] = function() {
     const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
     const report = {
         status: stats.status,

cognite/neat/_session/_html/templates/deployment.html

@@ -3,17 +3,17 @@
 {{SPECIFIC_CSS}}
 </style>
 
-<div class="issues-container deployment-container" id="deploymentContainer">
+<div class="issues-container deployment-container" id="deploymentContainer-{{unique_id}}">
     <div class="issues-header deployment-header">
-        <button class="theme-toggle" id="themeToggle">
-            <span id="themeIcon">🌙</span>
-            <span id="themeText">Dark</span>
+        <button class="theme-toggle" id="themeToggle-{{unique_id}}">
+            <span id="themeIcon-{{unique_id}}">🌙</span>
+            <span id="themeText-{{unique_id}}">Dark</span>
         </button>
         <h2 class="deployment-title issues-title">
             <span>Deployment Result</span>
-            <span class="status-badge status-{{status}}" id="statusBadge">
-                <span id="statusIcon"></span>
-                <span id="statusText"></span>
+            <span class="status-badge status-{{status}}" id="statusBadge-{{unique_id}}">
+                <span id="statusIcon-{{unique_id}}"></span>
+                <span id="statusText-{{unique_id}}"></span>
             </span>
         </h2>
         <div class="deployment-stats issues-stats">
@@ -35,7 +35,7 @@
             <div class="stat-item" data-filter="unchanged">
                 <span class="stat-number">{{unchanged}}</span> Unchanged
             </div>
-            <button class="export-btn" onclick="exportDeployment()">Export Report</button>
+            <button class="export-btn" onclick="exportDeployment_{{unique_id}}()">Export Report</button>
         </div>
     </div>
 
@@ -58,17 +58,18 @@
         </div>
 
         <div class="control-group">
-            <input type="text" class="search-input" placeholder="🔍 Search resource IDs, changes..." id="searchInput">
+            <input type="text" class="search-input" placeholder="🔍 Search resource IDs, changes..." id="searchInput-{{unique_id}}">
         </div>
     </div>
 
-    <div class="deployment-list issues-list" id="deploymentList"></div>
+    <div class="deployment-list issues-list" id="deploymentList-{{unique_id}}"></div>
 </div>
 
 <script>
 (function() {
     const changes = {{CHANGES_JSON}};
     const stats = {{STATS_JSON}};
+    const uniqueId = '{{unique_id}}';
     {{SCRIPTS}}
 })();
 </script>

cognite/neat/_session/_result.py

@@ -1,4 +1,5 @@
 import json
+import uuid
 from typing import Any, get_args
 
 from pydantic import BaseModel, Field
@@ -203,6 +204,9 @@ class Result:
 
     def _build_template_vars(self, stats: DeploymentStatistics) -> dict[str, Any]:
         """Build template variables from statistics."""
+        # Generate unique ID for this render to avoid conflicts in Jupyter
+        unique_id = uuid.uuid4().hex[:8]
+
         # Convert Pydantic models to dicts for JSON serialization
         serialized_changes = [change.model_dump() for change in self._serialized_changes]
 
@@ -216,6 +220,7 @@ class Result:
             "deleted": stats.by_change_type.delete,
             "skipped": stats.by_change_type.skip,
             "unchanged": stats.by_change_type.unchanged,
+            "unique_id": unique_id,
         }
 
     def _repr_html_(self) -> str:

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.127.21"
+__version__ = "0.127.23"
 __engine__ = "^2.0.4"

{cognite_neat-0.127.21.dist-info → cognite_neat-0.127.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.127.21
+Version: 0.127.23
 Summary: Knowledge graph transformation
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Homepage, https://cognite-neat.readthedocs-hosted.com/

{cognite_neat-0.127.21.dist-info → cognite_neat-0.127.23.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cognite/neat/__init__.py,sha256=Lo4DbjDOwnhCYUoAgPp5RG1fDdF7OlnomalTe7n1ydw,211
 cognite/neat/_exceptions.py,sha256=ox-5hXpee4UJlPE7HpuEHV2C96aLbLKo-BhPDoOAzhA,1650
 cognite/neat/_issues.py,sha256=wH1mnkrpBsHUkQMGUHFLUIQWQlfJ_qMfdF7q0d9wNhY,1871
-cognite/neat/_version.py,sha256=6TSmw-RWqsWG5I8-dNbvOb-gEQhv4rs3V4jd6qB5P8s,47
+cognite/neat/_version.py,sha256=6DktX2aOea0YNw_rdzDYmaQ9evSmuWHFadhPA0xSc_M,47
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/v1.py,sha256=owqW5Mml2DSZx1AvPvwNRTBngfhBNrQ6EH-7CKL7Jp0,61
 cognite/neat/_client/__init__.py,sha256=75Bh7eGhaN4sOt3ZcRzHl7pXaheu1z27kmTHeaI05vo,114
@@ -73,32 +73,32 @@ cognite/neat/_data_model/models/entities/_data_types.py,sha256=DfdEWGek7gODro-_0
 cognite/neat/_data_model/models/entities/_identifiers.py,sha256=uBiK4ot3V0b_LGXuJ7bfha6AEcFI3p2letr1z2iSvig,1923
 cognite/neat/_data_model/models/entities/_parser.py,sha256=zef_pSDZYMZrJl4IKreFDR577KutfhtN1xpH3Ayjt2o,7669
 cognite/neat/_data_model/validation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/_data_model/validation/dms/__init__.py,sha256=y-7ISQri7EVZJDNcDgtxpnCm6c_JulrLmmxOeHPJNm0,2256
+cognite/neat/_data_model/validation/dms/__init__.py,sha256=qK9zBaXHj7x9k7geA1fRk6ewRB_hGm7bcq69WlDyffc,2357
 cognite/neat/_data_model/validation/dms/_ai_readiness.py,sha256=SI46roGc2pbZQwY-6tuSWyS7uMbg2mIzXcVA3NPRCk4,6742
 cognite/neat/_data_model/validation/dms/_base.py,sha256=y95k6HWGxX_EnnyuV2ooftgiyC-fwJaaHW28oEf9oBs,13113
 cognite/neat/_data_model/validation/dms/_connections.py,sha256=goIcsGV4yYb-d9ltXg4eM5qxt8iErIIxtkiKJXZUYyM,26937
 cognite/neat/_data_model/validation/dms/_consistency.py,sha256=K0mfAwwpW6zQXGDEldrA7Lgqk-giV_Y-gUKyb8Dw47k,2445
-cognite/neat/_data_model/validation/dms/_containers.py,sha256=Vs5Zj0NWVuO0APDEZaO7q2U877-tJzTDpaaCEd5AcTA,5991
+cognite/neat/_data_model/validation/dms/_containers.py,sha256=Jqwu2JH36eyqA7xt6_UaLEl-zhZi4itI1dmb73GpJMY,7431
 cognite/neat/_data_model/validation/dms/_limits.py,sha256=LVxF1qmeEdUVVAPmywCgxWJ9BR7Ai6nI4X1ylJ7pv8I,15982
-cognite/neat/_data_model/validation/dms/_orchestrator.py,sha256=FChXB7zflQtnR46BRUFkDCwosLu9YeFLeydEoyFtpVI,10176
+cognite/neat/_data_model/validation/dms/_orchestrator.py,sha256=4_KHtfJcuXSSIP7sazhBzM4_nSEz0d77CrsX5rmShOc,10337
 cognite/neat/_data_model/validation/dms/_views.py,sha256=3bHEEbFKTR_QH_tiJYHppQsZ9ruApv-kdyfehEjIlCU,4198
 cognite/neat/_session/__init__.py,sha256=owqW5Mml2DSZx1AvPvwNRTBngfhBNrQ6EH-7CKL7Jp0,61
 cognite/neat/_session/_issues.py,sha256=E8UQeSJURg2dm4MF1pfD9dp-heSRT7pgQZgKlD1-FGs,2723
 cognite/neat/_session/_opt.py,sha256=QcVK08JMmVzJpD0GKHelbljMOQi6CMD1w-maQOlbyZQ,1350
 cognite/neat/_session/_physical.py,sha256=VyMvvPyN9khR_26rMS0kVuZg23k5c8Hfs7XDeMrkF_w,10526
-cognite/neat/_session/_result.py,sha256=P_7d92OSSJAusjKMTTdsc67CKnPDGUSitlGxSk0KB_A,7714
+cognite/neat/_session/_result.py,sha256=po2X4s-Tioe0GQAGCfK862hKXNRX5YjJZsEzNcTC8nI,7879
 cognite/neat/_session/_session.py,sha256=rezw1MEMN8DPA6waULt5-mdeMuwq3ZNnSb1CSsKM0ko,2584
 cognite/neat/_session/_wrappers.py,sha256=9t_MnJ0Sw_v-f6oTIh8dtAT-3oEbqumGuND97aPCC3M,3581
 cognite/neat/_session/_html/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_session/_html/_render.py,sha256=fD8iee4ql50CrHGH41SSh9Tw1lM0tHt-NF0OnnxHosg,1193
 cognite/neat/_session/_html/static/__init__.py,sha256=ZLQFJMITBgbiyTRaVbFAm1l-Dhr5pXKKsfY8jjD3ZhY,305
 cognite/neat/_session/_html/static/deployment.css,sha256=wRv2G0NKIxSq4kyOqd3ajZY60KeT4D6-D3lG-TmzURY,4894
-cognite/neat/_session/_html/static/deployment.js,sha256=3pcQYaW9NAGfeMotZIUIvA6PsWCyrMkJkz3ykNB5lh4,5490
+cognite/neat/_session/_html/static/deployment.js,sha256=0fNAIYYtDJR6RhvZvnRSN6UvgvnWTXb_UFUSDxsI9JU,5795
 cognite/neat/_session/_html/static/issues.css,sha256=Egvqo2cnY8FKTtZp_v3rTWcIgb1vTJvToNCJJovWm70,3824
 cognite/neat/_session/_html/static/issues.js,sha256=NHx_iAsZTvpZjOoFsxFU_sxqjF4-F4EdHRmoc2DjpIE,6348
 cognite/neat/_session/_html/static/shared.css,sha256=uUm5fqK1zrMBWCuAWdUoBRaAj9AO611hUxuGvxMzbzc,4190
 cognite/neat/_session/_html/templates/__init__.py,sha256=hgufJuBxUZ2nLCMTCxGixmk5ztZF38HzPcvtBkWJwxw,128
-cognite/neat/_session/_html/templates/deployment.html,sha256=COETMP0EEA46xzPlY-RTHo5TdtonV-dscZr15GAY0fs,3309
+cognite/neat/_session/_html/templates/deployment.html,sha256=rhqcBI5no8h0BEiwTIQy5A3wvBygytCUolpc50yFiTE,3487
 cognite/neat/_session/_html/templates/issues.html,sha256=k9Ml3LLeWGhpMfqSoCl6QuNRRy__E6Sa5S_I1Kc33NU,1659
 cognite/neat/_session/_usage_analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_session/_usage_analytics/_collector.py,sha256=XRyeIW7Att3pIgLpNxQ2joGdIDijfgrPfX7G13OKz-o,4786
@@ -312,7 +312,7 @@ cognite/neat/v0/session/engine/__init__.py,sha256=D3MxUorEs6-NtgoICqtZ8PISQrjrr4
 cognite/neat/v0/session/engine/_import.py,sha256=1QxA2_EK613lXYAHKQbZyw2yjo5P9XuiX4Z6_6-WMNQ,169
 cognite/neat/v0/session/engine/_interface.py,sha256=3W-cYr493c_mW3P5O6MKN1xEQg3cA7NHR_ev3zdF9Vk,533
 cognite/neat/v0/session/engine/_load.py,sha256=u0x7vuQCRoNcPt25KJBJRn8sJabonYK4vtSZpiTdP4k,5201
-cognite_neat-0.127.21.dist-info/METADATA,sha256=B9N21gWYbuIj-g0hT8DstCeNKA-QQ838OHJ-c1Ws1FM,9150
-cognite_neat-0.127.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.127.21.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.127.21.dist-info/RECORD,,
+cognite_neat-0.127.23.dist-info/METADATA,sha256=Ax86njFaCOT2zngYvUBqbGlWnTbu744tClzc7erssFs,9150
+cognite_neat-0.127.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.127.23.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.127.23.dist-info/RECORD,,