Fix observations

Author: juankx-bodo

pydough/metadata/collections/collection_metadata.py

@@ -48,8 +48,8 @@ def __init__(
             PropertyMetadata,
         )
 
-        is_valid_name.verify(name, f"name {name!r}")
-        HasType(GraphMetadata).verify(graph, f"graph {graph}")
+        is_valid_name.verify(name, f"collection name {name!r}")
+        HasType(GraphMetadata).verify(graph, f"graph {name!r}")
 
         self._graph: GraphMetadata = graph
         self._name: str = name

pydough/metadata/graphs/graph_metadata.py

@@ -116,7 +116,7 @@ def add_collection(self, collection: AbstractMetadata) -> None:
         from pydough.metadata.collections import CollectionMetadata
 
         # Make sure the collection is actually a collection
-        HasType(CollectionMetadata).verify(collection, f"collection {collection!r}")
+        HasType(CollectionMetadata).verify(collection, "collection")
         assert isinstance(collection, CollectionMetadata)
 
         # Verify sure the collection has not already been added to the graph

pydough/metadata/properties/property_metadata.py

@@ -45,8 +45,8 @@ def __init__(
         synonyms: list[str] | None,
         extra_semantic_info: dict | None,
     ):
-        is_valid_name.verify(name, f"name {name!r}")
-        HasType(CollectionMetadata).verify(collection, f"collection {collection!r}")
+        is_valid_name.verify(name, f"property name {name!r}")
+        HasType(CollectionMetadata).verify(collection, f"collection {name}")
         self._name: str = name
         self._collection: CollectionMetadata = collection
         super().__init__(description, synonyms, extra_semantic_info)

tests/test_metadata/invalid_graphs.json

@@ -93,6 +93,28 @@
       ],
       "relationships": []
     },
+    {
+      "name": "BAD_TABLE_NAME",
+      "version": "V2",
+      "collections": [
+        {
+          "name": "invalid table_name",
+          "type": "simple table",
+          "table path": "TableName",
+          "unique properties": ["column_name"],
+          "properties": [
+            {
+              "name": "column_name",
+              "type": "table column",
+              "column name": "column_name",
+              "data type": "string",
+              "description": "column description"
+            }
+          ]
+        }
+      ],
+      "relationships": []
+    },
     {
       "name": "BAD_COLUMN_NAME",
       "version": "V2",
@@ -116,17 +138,17 @@
       "relationships": []
     },
     {
-      "name": "BAD_TABLE_NAME",
+      "name": "BAD_UNIQUE_PROPERTY",
       "version": "V2",
       "collections": [
         {
-          "name": "invalid table_name",
+          "name": "collection",
           "type": "simple table",
           "table path": "TableName",
-          "unique properties": ["key"],
+          "unique properties": ["invalid column name"],
           "properties": [
             {
-              "name": "column_name",
+              "name": "invalid column name",
               "type": "table column",
               "column name": "column_name",
               "data type": "string",

tests/test_metadata_errors.py

@@ -85,12 +85,12 @@ def test_missing_property(get_sample_graph: graph_fetcher) -> None:
         ),
         pytest.param(
             "BAD_COLLECTION_NAME_1",
-            "name '0' must be a string that is a valid Python identifier",
+            "collection name '0' must be a string that is a valid Python identifier",
             id="BAD_COLLECTION_NAME_1",
         ),
         pytest.param(
             "BAD_COLLECTION_NAME_2",
-            "name 'Invalid name' must be a string that is a valid Python identifier",
+            "collection name 'Invalid name' must be a string that is a valid Python identifier",
             id="BAD_COLLECTION_NAME_2",
         ),
         pytest.param(
@@ -100,18 +100,23 @@ def test_missing_property(get_sample_graph: graph_fetcher) -> None:
         ),
         pytest.param(
             "BAD_PROPERTY_NAME_2",
-            "name '0' must be a string that is a valid Python identifier",
+            "collection name '0' must be a string that is a valid Python identifier",
             id="BAD_PROPERTY_NAME_2",
         ),
+        pytest.param(
+            "BAD_TABLE_NAME",
+            "collection name 'invalid table_name' must be a string that is a valid Python identifier",
+            id="BAD_TABLE_NAME",
+        ),
         pytest.param(
             "BAD_COLUMN_NAME",
-            "name 'invalid column name' must be a string that is a valid Python identifier",
-            id="BAD_PROPERTY_NAME_2",
+            "property name 'invalid column name' must be a string that is a valid Python identifier",
+            id="BAD_COLUMN_NAME",
         ),
         pytest.param(
-            "BAD_TABLE_NAME",
-            "name 'invalid table_name' must be a string that is a valid Python identifier",
-            id="BAD_PROPERTY_NAME_2",
+            "BAD_UNIQUE_PROPERTY",
+            "property name 'invalid column name' must be a string that is a valid Python identifier",
+            id="BAD_UNIQUE_PROPERTY",
         ),
         pytest.param(
             "BAD_RELATIONSHIP_NAME",