🦍Adjustment of typed. (#292)

* tests: updated test * refactor: make typed private * refactor: remove ruff complains
cognitedata · Aug 21, 2024 · 120f58a · 120f58a
1 parent e8e4fab
commit 120f58a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/cognite/pygen/_core/models/data_classes.py b/cognite/pygen/_core/models/data_classes.py
@@ -625,9 +625,9 @@ class NodeDataClass(DataClass):
     def typed_properties_name(self) -> str:
         """The name of the typed properties class."""
         if self.has_edge_class:
-            return f"{self.read_name.removesuffix('Node')}Properties"
+            return f"_{self.read_name.removesuffix('Node')}Properties"
         else:
-            return f"{self.read_name}Properties"
+            return f"_{self.read_name}Properties"
 
 
 @dataclass
@@ -641,9 +641,9 @@ class EdgeDataClass(DataClass):
     def typed_properties_name(self) -> str:
         """The name of the typed properties class."""
         if self.has_node_class:
-            return f"{self.read_name.removesuffix('Edge')}Properties"
+            return f"_{self.read_name.removesuffix('Edge')}Properties"
         else:
-            return f"{self.read_name}Properties"
+            return f"_{self.read_name}Properties"
 
     @property
     def is_edge_class(self) -> bool:

diff --git a/cognite/pygen/_core/models/fields/base.py b/cognite/pygen/_core/models/fields/base.py
@@ -69,11 +69,17 @@ def from_property(
 
         doc_name = to_words(name, singularize=True)
         variable = create_name(prop_name, field_naming.variable)
+        description: str | None = None
+        if hasattr(prop, "description") and isinstance(prop.description, str):
+            # This is a workaround for the fact that the description can contain curly quotes
+            # which is ruff will complain about. (These comes from che Core model)
+            description = prop.description.replace("‘", "'").replace("’", "'")  # noqa: RUF001
+
         base = cls(
             name=name,
             doc_name=doc_name,
             prop_name=prop_name,
-            description=prop.description if hasattr(prop, "description") else None,
+            description=description,
             pydantic_field=pydantic_field,
         )
         if isinstance(prop, dm.ConnectionDefinition) or (

diff --git a/tests/test_integration/test_typed_classes.py b/tests/test_integration/test_typed_classes.py
@@ -79,7 +79,7 @@ def test_create_retrieve_delete(
 
     @staticmethod
     def create_core_multi_api_generator(client: CogniteClient) -> MultiAPIGenerator:
-        data_model = _get_data_model(("cdf_cdm_experimental", "core_data_model", "v1"), client, print)
+        data_model = _get_data_model(("cdf_cdm_experimental", "CogniteCore", "v1"), client, print)
         # Ensure we have a random order of views
         # This should be sorted before generating the typed classes
         random.shuffle(data_model.views)