cognite-neat 1.0.6__tar.gz → 1.0.8__tar.gz

{cognite_neat-1.0.6 → cognite_neat-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 1.0.6
+Version: 1.0.8
 Summary: Knowledge graph transformation
 Author: Nikola Vasiljevic, Anders Albert
 Author-email: Nikola Vasiljevic <nikola.vasiljevic@cognite.com>, Anders Albert <anders.albert@cognite.com>

{cognite_neat-1.0.6 → cognite_neat-1.0.8}/cognite/neat/_client/containers_api.py

@@ -12,6 +12,7 @@ from .data_classes import PagedResponse
 
 class ContainersAPI(NeatAPI):
     ENDPOINT = "/models/containers"
+    LIST_REQUEST_LIMIT = 1000
 
     def apply(self, items: Sequence[ContainerRequest]) -> list[ContainerResponse]:
         """Apply (create or update) containers in CDF.
@@ -93,33 +94,45 @@ class ContainersAPI(NeatAPI):
         self,
         space: str | None = None,
         include_global: bool = False,
-        limit: int = 10,
+        limit: int | None = 10,
     ) -> list[ContainerResponse]:
         """List containers in CDF Project.
 
         Args:
             space: If specified, only containers in this space are returned.
             include_global: If True, include global containers.
-            limit: Maximum number of containers to return. Max is 1000.
+            limit: Maximum number of containers to return. If None, return all containers.
 
         Returns:
             List of ContainerResponse objects.
         """
-        if limit > 1000:
-            raise ValueError("Pagination is not (yet) supported for listing containers. The maximum limit is 1000.")
-        parameters: dict[str, PrimitiveType] = {
-            "includeGlobal": include_global,
-            "limit": limit,
-        }
+        if limit is not None and limit < 0:
+            raise ValueError("Limit must be non-negative.")
+        elif limit is not None and limit == 0:
+            return []
+        parameters: dict[str, PrimitiveType] = {"includeGlobal": include_global}
         if space is not None:
             parameters["space"] = space
-        result = self._http_client.request_with_retries(
-            ParametersRequest(
-                endpoint_url=self._config.create_api_url(self.ENDPOINT),
-                method="GET",
-                parameters=parameters,
+        cursor: str | None = None
+        container_responses: list[ContainerResponse] = []
+        while True:
+            if cursor is not None:
+                parameters["cursor"] = cursor
+            if limit is None:
+                parameters["limit"] = self.LIST_REQUEST_LIMIT
+            else:
+                parameters["limit"] = min(self.LIST_REQUEST_LIMIT, limit - len(container_responses))
+            result = self._http_client.request_with_retries(
+                ParametersRequest(
+                    endpoint_url=self._config.create_api_url(self.ENDPOINT),
+                    method="GET",
+                    parameters=parameters,
+                )
             )
-        )
-        result.raise_for_status()
-        result = PagedResponse[ContainerResponse].model_validate_json(result.success_response.body)
-        return result.items
+            result.raise_for_status()
+            result = PagedResponse[ContainerResponse].model_validate_json(result.success_response.body)
+            container_responses.extend(result.items)
+            cursor = result.next_cursor
+            if cursor is None or (limit is not None and len(container_responses) >= limit):
+                break
+        return container_responses

{cognite_neat-1.0.6 → cognite_neat-1.0.8}/cognite/neat/_client/views_api.py

@@ -13,6 +13,7 @@ from .data_classes import PagedResponse
 
 class ViewsAPI(NeatAPI):
     ENDPOINT = "/models/views"
+    LIST_REQUEST_LIMIT = 1000
 
     def apply(self, items: Sequence[ViewRequest]) -> list[ViewResponse]:
         """Create or update views in CDF Project.
@@ -93,7 +94,7 @@ class ViewsAPI(NeatAPI):
         all_versions: bool = False,
         include_inherited_properties: bool = True,
         include_global: bool = False,
-        limit: int = 10,
+        limit: int | None = 10,
     ) -> list[ViewResponse]:
         """List views in CDF Project.
 
@@ -102,28 +103,42 @@ class ViewsAPI(NeatAPI):
             all_versions: If True, return all versions. If False, only return the latest version.
             include_inherited_properties: If True, include properties inherited from parent views.
             include_global: If True, include global views.
-            limit: Maximum number of views to return. Max is 1000.
+            limit: Maximum number of views to return. If None, return all views.
 
         Returns:
             List of ViewResponse objects.
         """
-        if limit > 1000:
-            raise ValueError("Pagination is not (yet) supported for listing views. The maximum limit is 1000.")
+        if limit is not None and limit < 0:
+            raise ValueError("Limit must be non-negative.")
+        elif limit is not None and limit == 0:
+            return []
         parameters: dict[str, PrimitiveType] = {
             "allVersions": all_versions,
             "includeInheritedProperties": include_inherited_properties,
             "includeGlobal": include_global,
-            "limit": limit,
         }
         if space is not None:
             parameters["space"] = space
-        result = self._http_client.request_with_retries(
-            ParametersRequest(
-                endpoint_url=self._config.create_api_url(self.ENDPOINT),
-                method="GET",
-                parameters=parameters,
+        cursor: str | None = None
+        view_responses: list[ViewResponse] = []
+        while True:
+            if cursor is not None:
+                parameters["cursor"] = cursor
+            if limit is None:
+                parameters["limit"] = self.LIST_REQUEST_LIMIT
+            else:
+                parameters["limit"] = min(self.LIST_REQUEST_LIMIT, limit - len(view_responses))
+            result = self._http_client.request_with_retries(
+                ParametersRequest(
+                    endpoint_url=self._config.create_api_url(self.ENDPOINT),
+                    method="GET",
+                    parameters=parameters,
+                )
             )
-        )
-        result.raise_for_status()
-        result = PagedResponse[ViewResponse].model_validate_json(result.success_response.body)
-        return result.items
+            result.raise_for_status()
+            result = PagedResponse[ViewResponse].model_validate_json(result.success_response.body)
+            view_responses.extend(result.items)
+            cursor = result.next_cursor
+            if cursor is None or (limit is not None and len(view_responses) >= limit):
+                break
+        return view_responses

{cognite_neat-1.0.6 → cognite_neat-1.0.8}/cognite/neat/_data_model/deployer/data_classes.py

@@ -607,7 +607,7 @@ class DeploymentResult(BaseDeployObject):
 
     @property
     def is_dry_run(self) -> bool:
-        return self.status == "pending"
+        return self.responses is None
 
     @property
     def is_success(self) -> bool:

{cognite_neat-1.0.6 → cognite_neat-1.0.8}/cognite/neat/_data_model/models/dms/_view_filter.py

@@ -254,6 +254,9 @@ def _move_filter_key(value: Any) -> Any:
         # Already in the correct format
         return value
     key, data = next(iter(value.items()))
+    # Check if inner data already has filterType (already processed by a previous recursive call)
+    if isinstance(data, dict) and "filterType" in data:
+        return value
     if key not in AVAILABLE_FILTERS:
         raise ValueError(
             f"Unknown filter type: {key!r}. Available filter types: {humanize_collection(AVAILABLE_FILTERS)}."

{cognite_neat-1.0.6 → cognite_neat-1.0.8}/cognite/neat/_session/_html/static/deployment.css

@@ -132,6 +132,16 @@
     color: #9ca3af;
 }
 
+.change-failed {
+    background: #fee2e2;
+    color: #991b1b;
+}
+
+.dark-mode .change-failed {
+    background: #7f1d1d;
+    color: #fca5a5;
+}
+
 .severity-badge {
     padding: 4px 10px;
     border-radius: 4px;
@@ -286,6 +296,16 @@
     color: white;
 }
 
+.status-recovered {
+    background: #10b981;
+    color: white;
+}
+
+.status-recovery_failed {
+    background: #dc2626;
+    color: white;
+}
+
 .dark-mode .status-success {
     background: #059669;
 }
@@ -300,4 +320,157 @@
 
 .dark-mode .status-pending {
     background: #2563eb;
+}
+
+.dark-mode .status-recovered {
+    background: #059669;
+}
+
+.dark-mode .status-recovery_failed {
+    background: #b91c1c;
+}
+
+
+/* Error message handling */
+
+.error-message-box {
+    background: #fee2e2;
+    border: 2px solid #dc2626;
+    border-left: 6px solid #dc2626;
+    border-radius: 8px;
+    padding: 16px;
+    margin-top: 12px;
+    animation: slideIn 0.3s ease-out;
+}
+
+.dark-mode .error-message-box {
+    background: #7f1d1d;
+    border-color: #ef4444;
+}
+
+.error-message-header {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    margin-bottom: 8px;
+}
+
+.error-icon {
+    font-size: 24px;
+}
+
+.error-title {
+    font-weight: 700;
+    font-size: 14px;
+    color: #991b1b;
+}
+
+.dark-mode .error-title {
+    color: #fca5a5;
+}
+
+.error-message-content {
+    color: #7f1d1d;
+    font-size: 13px;
+    line-height: 1.6;
+    padding-left: 34px;
+    font-family: 'Monaco', 'Courier New', monospace;
+}
+
+.dark-mode .error-message-content {
+    color: #fca5a5;
+}
+
+.change-item.failed-change {
+    border-left: 4px solid #dc2626;
+    background: rgba(254, 226, 226, 0.1);
+}
+
+.dark-mode .change-item.failed-change {
+    border-left-color: #ef4444;
+    background: rgba(127, 29, 29, 0.2);
+}
+
+.info-message-box {
+    border-radius: 6px;
+    padding: 12px 16px;
+    margin-top: 12px;
+    font-size: 13px;
+    line-height: 1.6;
+}
+
+.info-message-content {
+    color: inherit;
+}
+
+.info-message-create {
+    background: #d1fae5;
+    border-left: 4px solid #065f46;
+    color: #065f46;
+}
+
+.info-message-update {
+    background: #dbeafe;
+    border-left: 4px solid #1e40af;
+    color: #1e40af;
+}
+
+.info-message-delete {
+    background: #fee2e2;
+    border-left: 4px solid #991b1b;
+    color: #991b1b;
+}
+
+.info-message-skip {
+    background: #fef3c7;
+    border-left: 4px solid #92400e;
+    color: #92400e;
+}
+
+.info-message-unchanged {
+    background: #f3f4f6;
+    border-left: 4px solid #4b5563;
+    color: #4b5563;
+}
+
+.dark-mode .info-message-create {
+    background: #064e3b;
+    border-left-color: #6ee7b7;
+    color: #6ee7b7;
+}
+
+.dark-mode .info-message-update {
+    background: #1e3a8a;
+    border-left-color: #93c5fd;
+    color: #93c5fd;
+}
+
+.dark-mode .info-message-delete {
+    background: #7f1d1d;
+    border-left-color: #fca5a5;
+    color: #fca5a5;
+}
+
+.dark-mode .info-message-skip {
+    background: #78350f;
+    border-left-color: #fde68a;
+    color: #fde68a;
+}
+
+.dark-mode .info-message-unchanged {
+    background: #374151;
+    border-left-color: #9ca3af;
+    color: #9ca3af;
+}
+
+
+@keyframes slideIn {
+    from {
+        opacity: 0;
+        transform: translateY(-10px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
 }

{cognite_neat-1.0.6 → cognite_neat-1.0.8}/cognite/neat/_session/_html/static/deployment.js

@@ -17,7 +17,9 @@ const STATUS_CONFIG = {
     success: { icon: '✅', text: 'Success' },
     failure: { icon: '❌', text: 'Failure' },
     partial: { icon: '⚠️', text: 'Partial Success' },
-    pending: { icon: '⏳', text: 'Pending (Dry Run)' }
+    pending: { icon: '⏳', text: 'Pending (Dry Run)' },
+    recovered: { icon: '🔄', text: 'Recovered' },
+    recovery_failed: { icon: '💔', text: 'Recovery Failed' }
 };
 
 // Initialize status badge
@@ -26,7 +28,7 @@ function initializeStatus() {
     const statusIcon = document.getElementById('statusIcon-' + uniqueId);
     const statusText = document.getElementById('statusText-' + uniqueId);
 
-    const statusConfig = STATUS_CONFIG[stats.status] || STATUS_CONFIG.pending;
+    const statusConfig = STATUS_CONFIG[deploymentStatus] || STATUS_CONFIG.pending;
     statusIcon.textContent = statusConfig.icon;
     statusText.textContent = statusConfig.text;
 }
@@ -43,6 +45,31 @@ function updateTheme() {
     }
 }
 
+function renderChangeMessage(change) {
+    if (!change.message) return '';
+
+    // Using textContent to set the message prevents XSS vulnerabilities
+    // by automatically escaping HTML characters.
+    const messageHolder = document.createElement('div');
+    messageHolder.textContent = change.message;
+    const escapedMessage = messageHolder.innerHTML;
+
+    if (change.change_type === 'failed') {
+        return `
+            <div class="error-message-box">
+                <div class="error-message-header">
+                    <span class="error-icon">❌</span>
+                    <span class="error-title">Deployment Failed</span>
+                </div>
+                <div class="error-message-content">${escapedMessage}</div>
+            </div>`;
+    }
+    return `
+        <div class="info-message-box info-message-${change.change_type}">
+            <div class="info-message-content">${escapedMessage}</div>
+        </div>`;
+}
+
 updateTheme();
 initializeStatus();
 
@@ -76,13 +103,14 @@ function renderChanges() {
     }
 
     listContainer.innerHTML = filtered.map(change => `
-        <div class="change-item">
+        <div class="change-item ${change.change_type === 'failed' ? 'failed-change' : ''}">
             <div class="change-header">
                 <span class="endpoint-badge endpoint-${change.endpoint}">${change.endpoint}</span>
                 <span class="change-type-badge change-${change.change_type}">${change.change_type}</span>
                 <span class="severity-badge severity-${change.severity}">${change.severity}</span>
             </div>
             <div class="resource-id">${change.resource_id}</div>
+
             ${change.changes.length > 0 ? `
                 <div class="field-changes">
                     ${change.changes.map(fc => `
@@ -93,6 +121,9 @@ function renderChanges() {
                     `).join('')}
                 </div>
             ` : ''}
+
+            ${renderChangeMessage(change)}
+
         </div>
     `).join('');
 }
@@ -130,8 +161,8 @@ document.getElementById('searchInput-' + uniqueId).addEventListener('input', fun
 window['exportDeployment_' + uniqueId] = function() {
     const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
     const report = {
-        status: stats.status,
-        is_dry_run: stats.is_dry_run,
+        status: deploymentStatus,
+        is_dry_run: is_dry_run === 'True',
         timestamp: timestamp,
         statistics: stats,
         changes: changes,

{cognite_neat-1.0.6 → cognite_neat-1.0.8}/cognite/neat/_session/_html/templates/deployment.html

@@ -20,6 +20,9 @@
             <div class="stat-item active" data-filter="all">
                 <span class="stat-number">{{total_changes}}</span> Total Changes
             </div>
+            <div class="stat-item" data-filter="failed">
+                <span class="stat-number">{{failed}}</span> Failed
+            </div>
             <div class="stat-item" data-filter="create">
                 <span class="stat-number">{{created}}</span> Created
             </div>
@@ -29,12 +32,12 @@
             <div class="stat-item" data-filter="delete">
                 <span class="stat-number">{{deleted}}</span> Deleted
             </div>
-            <div class="stat-item" data-filter="skip">
-                <span class="stat-number">{{skipped}}</span> Skipped
-            </div>
             <div class="stat-item" data-filter="unchanged">
                 <span class="stat-number">{{unchanged}}</span> Unchanged
             </div>
+            <div class="stat-item" data-filter="skip">
+                <span class="stat-number">{{skipped}}</span> Skipped
+            </div>
             <button class="export-btn" onclick="exportDeployment_{{unique_id}}()">Export Report</button>
         </div>
     </div>
@@ -70,6 +73,8 @@
     const changes = {{CHANGES_JSON}};
     const stats = {{STATS_JSON}};
     const uniqueId = '{{unique_id}}';
+    const is_dry_run = '{{is_dry_run}}';
+    const deploymentStatus = '{{status}}';
     {{SCRIPTS}}
 })();
 </script>

cognite_neat-1.0.8/cognite/neat/_session/_result/__init__.py

@@ -0,0 +1,3 @@
+from ._result import Result
+
+__all__ = ["Result"]

cognite_neat-1.0.8/cognite/neat/_session/_result/_deployment/_physical/_changes.py

@@ -0,0 +1,195 @@
+import itertools
+from typing import Any
+
+from pydantic import BaseModel, Field
+
+from cognite.neat._data_model.deployer.data_classes import (
+    AddedField,
+    AppliedChanges,
+    ChangedField,
+    ChangeResult,
+    DeploymentResult,
+    FieldChange,
+    FieldChanges,
+    RemovedField,
+    ResourceChange,
+)
+
+
+class SerializedFieldChange(BaseModel):
+    """Serialized field change for JSON output."""
+
+    field_path: str
+    severity: str
+    description: str
+
+    @classmethod
+    def from_field_change(cls, field_change: FieldChange) -> list["SerializedFieldChange"]:
+        """Serialize a field change, handling nested FieldChanges recursively.
+
+        Args:
+            field_change: The field change to serialize.
+
+        Returns:
+            List of serialized field changes (may be multiple if nested).
+        """
+        serialized_changes: list[SerializedFieldChange] = []
+
+        if isinstance(field_change, FieldChanges):
+            # Recursively handle nested changes
+            for change in field_change.changes:
+                serialized_changes.extend(cls.from_field_change(change))
+        else:
+            # Base case: single field change
+            serialized_changes.append(cls._from_single_field_change(field_change))
+
+        return serialized_changes
+
+    @classmethod
+    def _from_single_field_change(cls, field_change: FieldChange) -> "SerializedFieldChange":
+        """Serialize a single non-nested field change.
+
+        Args:
+            field_change: The single field change to serialize.
+
+        Returns:
+            Serialized field change.
+        """
+        return cls(
+            field_path=field_change.field_path,
+            severity=field_change.severity.name,
+            description=field_change.description
+            if isinstance(field_change, AddedField | RemovedField | ChangedField)
+            else "Field changed",
+        )
+
+
+class SerializedResourceChange(BaseModel):
+    """Serialized resource change for JSON output."""
+
+    id: int
+    endpoint: str
+    change_type: str
+    severity: str
+    resource_id: str
+    message: str | None = None
+    changes: list[SerializedFieldChange] = Field(default_factory=list)
+
+    @classmethod
+    def from_resource_change(
+        cls, resource: ResourceChange, endpoint: str, change_id: int
+    ) -> "SerializedResourceChange":
+        """Serialize a single resource change.
+
+        Args:
+            resource: The resource change to serialize.
+            endpoint: The endpoint type.
+            change_id: Unique ID for this change.
+
+        Returns:
+            Serialized resource change.
+        """
+        changes: list[SerializedFieldChange] = []
+
+        for change in resource.changes:
+            changes.extend(SerializedFieldChange.from_field_change(change))
+
+        return cls(
+            id=change_id,
+            endpoint=endpoint,
+            change_type=resource.change_type,
+            severity=resource.severity.name,
+            resource_id=str(resource.resource_id),
+            changes=changes,
+        )
+
+    @classmethod
+    def from_change_result(cls, change_id: int, response: ChangeResult) -> "SerializedResourceChange":
+        """Serialize from a change result (actual deployment).
+
+        Args:
+            change_id: Unique ID for this change.
+            response: The change result from deployment.
+
+        Returns:
+            Serialized resource change with deployment status.
+        """
+        serialized_resource_change = cls.from_resource_change(
+            resource=response.change,
+            endpoint=response.endpoint,
+            change_id=change_id,
+        )
+
+        serialized_resource_change.message = response.message
+        if not response.is_success:
+            serialized_resource_change.change_type = "failed"
+
+        return serialized_resource_change
+
+
+class SerializedChanges(BaseModel):
+    """Container for all serialized changes."""
+
+    changes: list[SerializedResourceChange] = Field(default_factory=list)
+
+    @classmethod
+    def from_deployment_result(cls, result: DeploymentResult) -> "SerializedChanges":
+        """Create SerializedChanges from a DeploymentResult.
+
+        Args:
+            result: The deployment result to serialize changes from.
+
+        Returns:
+            SerializedChanges instance with all changes.
+        """
+        serialized = cls()
+
+        if not result.responses:
+            serialized._add_from_dry_run(result)
+        else:
+            serialized._add_from_applied_changes(result.responses)
+
+        return serialized
+
+    def _add_from_dry_run(self, result: DeploymentResult) -> None:
+        """Add changes from dry run deployment.
+
+        Args:
+            result: The deployment result in dry run mode.
+        """
+        # Iterate over each endpoint plan
+        for endpoint_plan in result.plan:
+            # Then per resource in the endpoint
+            for resource in endpoint_plan.resources:
+                # Then serialize individual resource change
+                serialized_resource_change = SerializedResourceChange.from_resource_change(
+                    resource=resource,
+                    endpoint=endpoint_plan.endpoint,
+                    change_id=len(self.changes),
+                )
+                self.changes.append(serialized_resource_change)
+
+    def _add_from_applied_changes(self, applied_changes: AppliedChanges) -> None:
+        """Add changes from actual deployment.
+        Args:
+            result: The deployment result from actual deployment.
+        """
+        for response in itertools.chain(
+            applied_changes.created,
+            applied_changes.merged_updated,
+            applied_changes.deletions,
+            applied_changes.unchanged,
+            applied_changes.skipped,
+        ):
+            self.changes.append(SerializedResourceChange.from_change_result(len(self.changes), response))
+
+    def model_dump_json_flat(self, **kwargs: Any) -> str:
+        """Dump changes as JSON array without the wrapper key.
+        Returns:
+            JSON string of the changes array.
+        """
+        if not self.changes:
+            return "[]"
+
+        iterator = (change.model_dump_json(**kwargs) for change in self.changes)
+        return f"[{','.join(iterator)}]"