DOGE-55: Fix dict snake case dump

cognite/client/data_classes/extractionpipelines.py

@@ -15,7 +15,7 @@
     PropertySpec,
 )
 from cognite.client.data_classes.shared import TimestampRange
-from cognite.client.utils._text import convert_all_keys_to_camel_case
+from cognite.client.utils._text import convert_all_keys_to_camel_snake_otherwise
 
 if TYPE_CHECKING:
     from cognite.client import CogniteClient
@@ -43,7 +43,7 @@ def __init__(self, name: str, email: str, role: str, send_notification: bool) ->
     send_notification = CognitePropertyClassUtil.declare_property("sendNotification")
 
     def dump(self, camel_case: bool = False) -> dict[str, Any]:
-        return convert_all_keys_to_camel_case(self) if camel_case else dict(self)
+        return convert_all_keys_to_camel_snake_otherwise(self, camel_case)
 
 
 class ExtractionPipeline(CogniteResource):

cognite/client/data_classes/labels.py

@@ -8,7 +8,7 @@
     CogniteResource,
     CogniteResourceList,
 )
-from cognite.client.utils._text import convert_all_keys_to_camel_case, to_camel_case
+from cognite.client.utils._text import convert_all_keys_to_camel_snake_otherwise, to_camel_case
 
 if TYPE_CHECKING:
     from cognite.client import CogniteClient
@@ -107,7 +107,7 @@ def _load(cls, raw_label: dict[str, Any]) -> Label:
         return cls(external_id=raw_label["externalId"])
 
     def dump(self, camel_case: bool = False) -> dict[str, Any]:
-        return convert_all_keys_to_camel_case(self) if camel_case else dict(self)
+        return convert_all_keys_to_camel_snake_otherwise(self, camel_case)
 
 
 class LabelFilter(dict, CogniteFilter):
@@ -148,6 +148,7 @@ def _wrap_labels(values: list[str] | None) -> list[dict[str, str]] | None:
         return [{"externalId": v} for v in values]
 
     def dump(self, camel_case: bool = False) -> dict[str, Any]:
+        # TODO: convert_all_keys_to_camel_snake_otherwise
         keys = map(to_camel_case, self.keys()) if camel_case else self.keys()
         return dict(zip(keys, map(self._wrap_labels, self.values())))
 

cognite/client/data_classes/shared.py

@@ -120,6 +120,7 @@ def _load(cls, raw_geo_location: dict[str, Any]) -> GeoLocation:
         )
 
     def dump(self, camel_case: bool = False) -> dict[str, Any]:
+        # TODO: convert_all_keys_to_camel_snake_otherwise(self, camel_case)
         return convert_all_keys_to_camel_case(self) if camel_case else dict(self)
 
 
@@ -143,4 +144,5 @@ def _load(cls, raw_geo_location_filter: dict[str, Any]) -> GeoLocationFilter:
         return cls(relation=raw_geo_location_filter["relation"], shape=raw_geo_location_filter["shape"])
 
     def dump(self, camel_case: bool = False) -> dict[str, Any]:
+        # TODO: convert_all_keys_to_camel_snake_otherwise(self, camel_case)
         return convert_all_keys_to_camel_case(self) if camel_case else dict(self)

cognite/client/utils/_text.py

@@ -84,3 +84,10 @@ def shorten(obj: Any, width: int = 20, placeholder: str = "...") -> str:
     if len(s) <= width:
         return s
     return f"{s[:width-n]}{placeholder}"
+
+
+def convert_all_keys_to_camel_snake_otherwise(dct: dict[str, Any], camel_case: bool = False) -> dict[str, Any]:
+    if camel_case:
+        return {to_camel_case(key): value for key, value in dct.items()}
+    else:
+        return {to_snake_case(key): value for key, value in dct.items()}

tests/tests_unit/test_api/test_labels.py

@@ -75,11 +75,6 @@ def test_create_labels_using_wrong_type(self, cognite_client):
         with pytest.raises(TypeError):
             cognite_client.labels.create([Label(external_id="1", name="my_label")])
 
-    def test_load_list(self):
-        assert Label._load_list(None) is None
-        labels = [{"externalId": "a"}, "b", Label("c"), LabelDefinition("d")]
-        assert Label._load_list(labels) == [Label("a"), Label("b"), Label("c"), Label("d")]
-
     def test_list_with_dataset_ids(self, cognite_client, mock_labels_response):
         res = cognite_client.labels.list(data_set_ids=[123], data_set_external_ids=["x"])
         assert res[0].data_set_id == 1

tests/tests_unit/test_base.py

@@ -394,7 +394,7 @@ def test_to_pandas_method(self):
                 "parent-test-1",
                 "A test asset",
                 123,
-                [{"externalId": "ROTATING_EQUIPMENT", "name": "Rotating equipment"}],
+                [{"external_id": "ROTATING_EQUIPMENT", "name": "Rotating equipment"}],
             ]
         }
 

tests/tests_unit/test_data_classes/test_labels.py

@@ -0,0 +1,48 @@
+import pytest
+
+from cognite.client.data_classes.labels import Label, LabelDefinition
+
+
+class TestLabel:
+    @pytest.mark.parametrize(
+        ["fields", "is_camel_case", "expected"],
+        [
+            (
+                {"external_id": "what-the-fox", "snake_rules": True},
+                True,
+                {"externalId": "what-the-fox", "snakeRules": True},
+            ),
+            (
+                {"external_id": "what-the-fox", "snake_rules": True},
+                False,
+                {"external_id": "what-the-fox", "snake_rules": True},
+            ),
+            (
+                {"externalId": "what-the-fox", "snakeRules": True},
+                False,
+                {"external_id": "what-the-fox", "snake_rules": True},
+            ),
+            (
+                {"externalId": "what-the-fox", "snakeRules": True},
+                True,
+                {"externalId": "what-the-fox", "snakeRules": True},
+            ),
+            (
+                {"externalId": "what-the-fox", "snake_rules": True},
+                True,
+                {"externalId": "what-the-fox", "snakeRules": True},
+            ),
+            (
+                {"externalId": "what-the-fox", "snake_rules": True},
+                False,
+                {"external_id": "what-the-fox", "snake_rules": True},
+            ),
+        ],
+    )
+    def test_dump(self, fields: dict, is_camel_case: bool, expected: dict):
+        assert Label(**fields).dump(is_camel_case) == expected
+
+    def test_load_list(self):
+        assert Label._load_list(None) is None
+        labels = [{"externalId": "a"}, "b", Label("c"), LabelDefinition("d")]
+        assert Label._load_list(labels) == [Label("a"), Label("b"), Label("c"), Label("d")]