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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 1.0.7
+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.7 → 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.7 → 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.7 → 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.7 → cognite_neat-1.0.8}/cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.7"
+__version__ = "1.0.8"
 __engine__ = "^2.0.4"

{cognite_neat-1.0.7 → cognite_neat-1.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite-neat"
-version = "1.0.7"
+version = "1.0.8"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [