cognite-neat 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

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/_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/_data_model/deployer/data_classes.py

@@ -86,6 +86,12 @@ class PrimitiveField(FieldChange, ABC):
     def severity(self) -> SeverityType:
         return self.item_severity
 
+    @property
+    @abstractmethod
+    def description(self) -> str:
+        """Human-readable description of the change."""
+        ...
+
 
 class AddedField(PrimitiveField):
     new_value: BaseModelObject | str | int | float | bool | None

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/_v0/core/_utils/auth.py

@@ -267,12 +267,22 @@ def _from_dotenv(evn_file: Path) -> EnvironmentVariables:
         raise FileNotFoundError(f"{evn_file} does not exist.")
     content = evn_file.read_text()
     valid_variables = {f.name for f in fields(EnvironmentVariables)}
-    variables: dict[str, str] = {}
+    int_variables = {"CDF_MAX_WORKERS", "CDF_CLIENT_TIMEOUT", "CDF_REDIRECT_PORT"}
+    variables: dict[str, str | int] = {}
+    value: str | int
     for line in content.splitlines():
         if line.startswith("#") or "=" not in line:
             continue
         key, value = line.split("=", 1)
         if key in valid_variables:
+            if key in int_variables:
+                try:
+                    value = int(value)
+                except ValueError as e:
+                    raise ValueError(
+                        f"Failed to parse {evn_file.as_posix()!r} file. "
+                        f"Variable '{key}' must be an integer, but got '{value}'."
+                    ) from e
             variables[key] = value
     return EnvironmentVariables(**variables)  # type: ignore[arg-type]
 

cognite/neat/_version.py

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

{cognite_neat-1.0.7.dist-info → cognite_neat-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 1.0.7
+Version: 1.0.9
 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.dist-info → cognite_neat-1.0.9.dist-info}/RECORD

@@ -3,12 +3,12 @@ cognite/neat/_client/__init__.py,sha256=75Bh7eGhaN4sOt3ZcRzHl7pXaheu1z27kmTHeaI0
 cognite/neat/_client/api.py,sha256=nbxCdWBXcTVM6MrQeT_VpB6ehfoI544JHPFq-ejQKCY,292
 cognite/neat/_client/client.py,sha256=h0HELAHiBFxMNInkDu4AzbgfEIXqeM0BqqnMBmXjgi0,903
 cognite/neat/_client/config.py,sha256=eIIdWaA13yncRP6X7vTYsTpmXmVcmkhZPv5oPnLUEVc,1484
-cognite/neat/_client/containers_api.py,sha256=JPXbCm68d5GsnIdMWgQKP48ax9lY8L2w2tC-7iKCpUA,4486
+cognite/neat/_client/containers_api.py,sha256=7bVIlL5PwoAG5Bks1ortW_bCG8iTkFqFVyL05pdJ3Pw,5176
 cognite/neat/_client/data_classes.py,sha256=HYPsrAJGVCUmlWTSIxJgAnIHAOzcyDveMM6Z-cuA92M,1404
 cognite/neat/_client/data_model_api.py,sha256=ogVHOabQ3HTqWaaoiGClmbtYdP-pl6DPN2zmPdH5LWY,4253
 cognite/neat/_client/spaces_api.py,sha256=xHtSMt_2k2YwZ5_8kH2dfa7fWxQQrky7wra4Ar2jwqs,4111
 cognite/neat/_client/statistics_api.py,sha256=HcYb2nNC9M_iaI1xyjjLn2Cz1tcyu7BJeaqVps79tg4,773
-cognite/neat/_client/views_api.py,sha256=vZh851Yw8X-Y90sahOiGnq-pwDOBBXegcxTtypkcMvA,4956
+cognite/neat/_client/views_api.py,sha256=Qzk_wiLtaWszxCQFDBoWCH1yDc4GOEJsVOcL061rcK0,5639
 cognite/neat/_config.py,sha256=MzQiZer0Wyk6VEtfDtl_tTF9KYAjYu2Q8jE7RugMJuM,9201
 cognite/neat/_data_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_data_model/_analysis.py,sha256=d_gP0M_8-HjSAhWT28cfdOsydNAKmOOT4pTh5W_CQcU,8827
@@ -21,7 +21,7 @@ cognite/neat/_data_model/deployer/_differ_container.py,sha256=mcy7PhUOfnvAxnZWNo
 cognite/neat/_data_model/deployer/_differ_data_model.py,sha256=iA7Xp-7NRvzZJXLLpJaLebkKKpv_VCBKPX6f-RU9wBk,1864
 cognite/neat/_data_model/deployer/_differ_space.py,sha256=J_AaqiseLpwQsOkKc7gmho4U2oSWAGVeEdQNepZiWw0,343
 cognite/neat/_data_model/deployer/_differ_view.py,sha256=g1xHwsoxFUaTOTtQa19nntKF3rxFzc2FxpKKFAUN_NE,11412
-cognite/neat/_data_model/deployer/data_classes.py,sha256=e0whwQkvaVAAL26McEnbLFREeWXMOevNKONJHQmfM8w,26779
+cognite/neat/_data_model/deployer/data_classes.py,sha256=1T4Kk9DjYo_wgmFMC--DWq82Ws7F3FqCiNtcRA5C5_4,26916
 cognite/neat/_data_model/deployer/deployer.py,sha256=8W6Zy8MVLaUWRqNlNrP-A1HUJlOMdzpDsyPqClxfyrU,20288
 cognite/neat/_data_model/exporters/__init__.py,sha256=AskjmB_0Vqib4kN84bWt8-M8nO42QypFf-l-E8oA5W8,482
 cognite/neat/_data_model/exporters/_api_exporter.py,sha256=G9cqezy_SH8VdhW4o862qBHh_QcbzfP6O1Yyjvdpeog,1579
@@ -59,7 +59,7 @@ cognite/neat/_data_model/models/dms/_references.py,sha256=x2sK_YnEpWtLED4j8dqrqV
 cognite/neat/_data_model/models/dms/_schema.py,sha256=2JFLcm52smzPdtZ69Lf02UbYAD8I_hpRbI7ZAzdxJJs,641
 cognite/neat/_data_model/models/dms/_space.py,sha256=3KvWg0bVuLpgQwhkDbsJ53ZMMmK0cKUgfyDRrSrERko,1904
 cognite/neat/_data_model/models/dms/_types.py,sha256=5-cgC53AG186OZUqkltv7pMjcGNLuH7Etbn8IUcgk1c,447
-cognite/neat/_data_model/models/dms/_view_filter.py,sha256=cfeEOtRz5SGFI0rmPD3jNl-V6_zJxyxgxYjG3Oz8OEU,10301
+cognite/neat/_data_model/models/dms/_view_filter.py,sha256=SXZw2soq9KKNFQQKHPrI9YxptxYdffUhbo-rNI_icmw,10476
 cognite/neat/_data_model/models/dms/_view_property.py,sha256=nJBPmw4KzJOdaQmvRfCE3A4FL-E13OsNUEufI64vLKo,9271
 cognite/neat/_data_model/models/dms/_views.py,sha256=1yxuwnsUM4WKItEY1hmJbMQKW0q3Dn321NmLmKLJeCM,8657
 cognite/neat/_data_model/models/entities/__init__.py,sha256=7dDyES7fYl9LEREal59F038RdEvfGRpUOc6n_MtSgjU,836
@@ -270,7 +270,7 @@ cognite/neat/_v0/core/_store/_instance.py,sha256=helzPszrD6ti4Efo0IE4fpcUxnQN7AC
 cognite/neat/_v0/core/_store/_provenance.py,sha256=3U63x-qvNUv89c_dcKD8Lrbo4BPw-hcdHy8wfBMWn4w,7338
 cognite/neat/_v0/core/_store/exceptions.py,sha256=ypiAiUNGVULAKE6GVcVVjpMscRyY4qjnYDV_k8jnnOk,1672
 cognite/neat/_v0/core/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/_v0/core/_utils/auth.py,sha256=RrwfhuX5ldsU9YQ767eLvWQC1xtT81OHo6yw-iDafu8,14841
+cognite/neat/_v0/core/_utils/auth.py,sha256=uaPymyoiaOQ9to-m9e6ALlpI_weEmCNmfshKh3_Y6YI,15312
 cognite/neat/_v0/core/_utils/auxiliary.py,sha256=cUAW3_OT8hYNNoFhcdqEPyaM7TNqTkA0eUzCbCvtaNc,7116
 cognite/neat/_v0/core/_utils/collection_.py,sha256=06avD7NaXOSlM500zmJgwWVM-suDBg-rt5sd6nHKrhA,2384
 cognite/neat/_v0/core/_utils/graph_transformations_report.py,sha256=WRA0JrQmRYwT-2-GwbOR1ZncnNrufXt7j__CP_QRI34,1239
@@ -315,9 +315,9 @@ cognite/neat/_v0/session/_template.py,sha256=BNcvrW5y7LWzRM1XFxZkfR1Nc7e8UgjBClH
 cognite/neat/_v0/session/_to.py,sha256=AnsRSDDdfFyYwSgi0Z-904X7WdLtPfLlR0x1xsu_jAo,19447
 cognite/neat/_v0/session/_wizard.py,sha256=baPJgXAAF3d1bn4nbIzon1gWfJOeS5T43UXRDJEnD3c,1490
 cognite/neat/_v0/session/exceptions.py,sha256=jv52D-SjxGfgqaHR8vnpzo0SOJETIuwbyffSWAxSDJw,3495
-cognite/neat/_version.py,sha256=2sCnCVH3MOOkLqwv-pjtB202dwYfG-1e2vtDDOCqmIQ,44
+cognite/neat/_version.py,sha256=xkV7Ynbzd3nMdRtl2ZfVZQqTsYCuXajW-2kq0kFsnHI,44
 cognite/neat/legacy.py,sha256=eI2ecxOV8ilGHyLZlN54ve_abtoK34oXognkFv3yvF0,219
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-1.0.7.dist-info/WHEEL,sha256=93kfTGt3a0Dykt_T-gsjtyS5_p8F_d6CE1NwmBOirzo,79
-cognite_neat-1.0.7.dist-info/METADATA,sha256=aXEyOVPO3fvZT-NcPv1Zc3N9hZEVOuFQhRW_zHtnLSg,6090
-cognite_neat-1.0.7.dist-info/RECORD,,
+cognite_neat-1.0.9.dist-info/WHEEL,sha256=93kfTGt3a0Dykt_T-gsjtyS5_p8F_d6CE1NwmBOirzo,79
+cognite_neat-1.0.9.dist-info/METADATA,sha256=A0qrxdua5CQ2020BXufsTZgZmveQULmVtfqqBCrMV64,6090
+cognite_neat-1.0.9.dist-info/RECORD,,