fix: handle invalid geo locations better (#2529)

Author: tommythorsen

cognite/client/data_classes/assets.py

@@ -38,6 +38,7 @@
     ExternalIDTransformerMixin,
     IdTransformerMixin,
     PropertySpec,
+    UnknownCogniteObject,
     WriteableCogniteResource,
     WriteableCogniteResourceList,
 )
@@ -111,8 +112,11 @@ def __init__(
         labels: list[Label] | None = None,
         geo_location: GeoLocation | None = None,
     ) -> None:
-        if geo_location is not None and not isinstance(geo_location, GeoLocation):
-            raise TypeError("Asset.geo_location should be of type GeoLocation")
+        if geo_location is not None:
+            if isinstance(geo_location, dict):
+                geo_location = GeoLocation.load(geo_location)
+            if not isinstance(geo_location, GeoLocation | UnknownCogniteObject):
+                raise TypeError("Asset.geo_location should be of type GeoLocation")
         self.external_id = external_id
         self.name = name
         self.parent_id = parent_id

cognite/client/data_classes/files.py

@@ -17,6 +17,7 @@
     ExternalIDTransformerMixin,
     IdTransformerMixin,
     PropertySpec,
+    UnknownCogniteObject,
     WriteableCogniteResource,
     WriteableCogniteResourceList,
 )
@@ -70,7 +71,7 @@ def __init__(
         if geo_location is not None:
             if isinstance(geo_location, dict):
                 geo_location = GeoLocation.load(geo_location)
-            if not isinstance(geo_location, GeoLocation):
+            if not isinstance(geo_location, GeoLocation | UnknownCogniteObject):
                 raise TypeError("FileMetadata.geo_location should be of type GeoLocation")
         self.external_id = external_id
         self.instance_id = instance_id

tests/tests_unit/test_api/test_assets.py

@@ -4,6 +4,7 @@
 
 from cognite.client._api.assets import Asset, AssetList, AssetUpdate
 from cognite.client.data_classes import AggregateResultItem, AssetFilter, Label, LabelFilter, TimestampRange
+from cognite.client.data_classes._base import UnknownCogniteObject
 from cognite.client.exceptions import CogniteAPIError
 from cognite.client.utils._text import convert_all_keys_to_snake_case
 from tests.utils import jsgz_load
@@ -255,6 +256,11 @@ def test_create_asset_with_label(self, cognite_client, mock_assets_response):
             mock_assets_response.calls[0].request.body
         )["items"][0]
 
+    def test_create_with_invalid_geoLocation(self, cognite_client):
+        invalid_geo_location = {"foo": "bar"}
+        asset = Asset(name="bla", geo_location=invalid_geo_location)
+        assert isinstance(asset.geo_location, UnknownCogniteObject)
+
     def test_search(self, cognite_client, mock_assets_response):
         res = cognite_client.assets.search(filter=AssetFilter(name="1"))
         assert mock_assets_response.calls[0].response.json()["items"] == res.dump(camel_case=True)

tests/tests_unit/test_api/test_files.py

@@ -20,6 +20,7 @@
     LabelFilter,
     TimestampRange,
 )
+from cognite.client.data_classes._base import UnknownCogniteObject
 from cognite.client.data_classes.data_modeling.ids import NodeId
 from cognite.client.exceptions import CogniteAPIError, CogniteAuthorizationError
 from tests.utils import jsgz_load, set_request_limit
@@ -273,6 +274,11 @@ def test_create_with_geoLocation_request(self, cognite_client, mock_file_create_
             body["geoLocation"] == mock_geo_location.dump(camel_case=True) for body in [request_body, response_body]
         )
 
+    def test_create_with_invalid_geoLocation(self, cognite_client):
+        invalid_geo_location = {"foo": "bar"}
+        file_metadata = FileMetadata(name="bla", geo_location=invalid_geo_location)
+        assert isinstance(file_metadata.geo_location, UnknownCogniteObject)
+
     def test_retrieve_single(self, cognite_client, mock_files_response):
         res = cognite_client.files.retrieve(id=1)
         assert isinstance(res, FileMetadata)