test / quickstart fixes

Author: tpellissier

examples/advanced/file_upload.py

@@ -152,18 +152,18 @@ def backoff(op, *, delays=(0,2,5,10), retry_status=(400,403,404,409,412,429,500,
         raise last
 
 # --------------------------- Table ensure ---------------------------
-TABLE_SCHEMA_NAME = "new_FileSample"
+TABLE_LOGICAL_NAME = "new_filesample"
 # If user wants new publisher prefix / naming, adjust above.
 
 def ensure_table():
-    # Check by schema
-    existing = client.get_table_info(TABLE_SCHEMA_NAME)
+    # Check by logical name
+    existing = client.get_table_info(TABLE_LOGICAL_NAME)
     if existing:
-        print({"table": TABLE_SCHEMA_NAME, "existed": True})
+        print({"table": TABLE_LOGICAL_NAME, "existed": True})
         return existing
-    log("client.create_table('new_filesample', schema={new_title})")
-    info = client.create_table(TABLE_SCHEMA_NAME, {"new_title": "string"})
-    print({"table": TABLE_SCHEMA_NAME, "existed": False, "metadata_id": info.get('metadata_id')})
+    log(f"client.create_table('{TABLE_LOGICAL_NAME}', schema={{'new_title': 'string'}})")
+    info = client.create_table(TABLE_LOGICAL_NAME, {"new_title": "string"})
+    print({"table": TABLE_LOGICAL_NAME, "existed": False, "metadata_id": info.get('metadata_id')})
     return info
 
 try:
@@ -388,8 +388,8 @@ def get_dataset_info(file_path: Path):
 # --------------------------- Cleanup ---------------------------
 if cleanup_record and record_id:
     try:
-        log(f"client.delete('{entity_set}', '{record_id}')")
-        backoff(lambda: client.delete(entity_set, record_id))
+        log(f"client.delete('{logical}', '{record_id}')")
+        backoff(lambda: client.delete(logical, record_id))
         print({"record_deleted": True})
     except Exception as e:  # noqa: BLE001
         print({"record_deleted": False, "error": str(e)})
@@ -398,8 +398,8 @@ def get_dataset_info(file_path: Path):
 
 if cleanup_table:
     try:
-        log(f"client.delete_table('{TABLE_SCHEMA_NAME}')")
-        client.delete_table(TABLE_SCHEMA_NAME)
+        log(f"client.delete_table('{TABLE_LOGICAL_NAME}')")
+        client.delete_table(TABLE_LOGICAL_NAME)
         print({"table_deleted": True})
     except Exception as e:  # noqa: BLE001
         print({"table_deleted": False, "error": str(e)})

examples/advanced/pandas_integration.py

@@ -54,8 +54,8 @@ def backoff_retry(op, *, delays=(0, 2, 5, 10, 20), retry_http_statuses=(400, 403
 table_info = None
 created_this_run = False
 
-# First check for existing table
-existing = client.get_table_info("SampleItem")
+# First check for existing table (use logical name - lowercase with prefix)
+existing = client.get_table_info("new_sampleitem")
 if existing:
 	table_info = existing
 	created_this_run = False
@@ -68,16 +68,16 @@ def backoff_retry(op, *, delays=(0, 2, 5, 10, 20), retry_http_statuses=(400, 403
 	})
 
 else:
-	# Create it since it doesn't exist
+	# Create it since it doesn't exist (use logical name)
 	try:
 		table_info = client.create_table(
-			"SampleItem",
+			"new_sampleitem",
 			{
-				"code": "string",
-				"count": "int",
-				"amount": "decimal",
-				"when": "datetime",
-				"active": "bool",
+				"new_code": "string",
+				"new_count": "int",
+				"new_amount": "decimal",
+				"new_when": "datetime",
+				"new_active": "bool",
 			},
 		)
 		created_this_run = True if table_info and table_info.get("columns_created") else False
@@ -217,10 +217,10 @@ def _retry_if(ex: Exception) -> bool:
 # 6) Cleanup: delete the custom table if it exists
 print("Cleanup (Metadata):")
 try:
-	# Delete if present, regardless of whether it was created in this run
-	info = client.get_table_info("SampleItem")
+	# Delete if present, regardless of whether it was created in this run (use logical name)
+	info = client.get_table_info("new_sampleitem")
 	if info:
-		client.delete_table("SampleItem")
+		client.delete_table("new_sampleitem")
 		print({"table_deleted": True})
 	else:
 		print({"table_deleted": False, "reason": "not found"})

examples/basic/quickstart.py

@@ -646,11 +646,11 @@ def _ensure_removed():
 print("Cleanup (Metadata):")
 if delete_table_at_end:
 	try:
-		log_call("client.get_table_info('new_SampleItem')")
-		info = client.get_table_info("new_SampleItem")
+		log_call("client.get_table_info('new_sampleitem')")
+		info = client.get_table_info("new_sampleitem")
 		if info:
-			log_call("client.delete_table('new_SampleItem')")
-			client.delete_table("new_SampleItem")
+			log_call("client.delete_table('new_sampleitem')")
+			client.delete_table("new_sampleitem")
 			print({"table_deleted": True})
 		else:
 			print({"table_deleted": False, "reason": "not found"})

src/dataverse_sdk/data/odata.py

@@ -255,6 +255,9 @@ def _create_multiple(self, entity_set: str, logical_name: str, records: List[Dic
     # --- Derived helpers for high-level client ergonomics ---
     def _primary_id_attr(self, logical_name: str) -> str:
         """Return primary key attribute using metadata; error if unavailable."""
+        # Normalize logical name for case-insensitive lookup
+        logical_name = self._normalize_logical_name(logical_name)
+        
         # Get from unified metadata cache
         if logical_name in self._entity_metadata_cache:
             pid = self._entity_metadata_cache[logical_name].get('primary_id_attribute')
@@ -713,6 +716,9 @@ def _logical_to_schema_name(self, logical_name: str) -> str:
         Use this ONLY when creating new entities where we control the SchemaName.
         For existing entities, use _get_entity_schema_name() to get the actual SchemaName from server.
         """
+        # Normalize logical name first
+        logical_name = self._normalize_logical_name(logical_name)
+        
         if "_" not in logical_name:
             # No prefix, just capitalize first letter
             return logical_name[:1].upper() + logical_name[1:]

tests/unit/data/test_naming_normalization.py

@@ -608,5 +608,45 @@ def test_attribute_cache_case_insensitive():
     assert ("NEW_SAMPLEITEM", "NEW_TITLE") not in c._attribute_schema_cache
 
 
+def test_primary_id_attr_case_insensitive():
+    """Test that _primary_id_attr normalizes logical names for cache lookup."""
+    responses = [
+        (200, {}, MD_SAMPLE_ITEM)  # Only ONE server call should be made
+    ]
+    c = TestableClient(responses)
+    
+    # Multiple lookups with different casings
+    pid1 = c._primary_id_attr("new_sampleitem")
+    pid2 = c._primary_id_attr("NEW_SAMPLEITEM")
+    pid3 = c._primary_id_attr("New_SampleItem")
+    pid4 = c._primary_id_attr("  new_sampleitem  ")  # With whitespace
+    
+    # All should return the same primary ID attribute
+    assert pid1 == pid2 == pid3 == pid4 == "new_sampleitemid"
+    
+    # Verify only 1 HTTP call was made (all others used cache)
+    assert len(c._http.calls) == 1
+    
+    # Verify the cache key is normalized (lowercase)
+    assert "new_sampleitem" in c._entity_metadata_cache
+    assert "NEW_SAMPLEITEM" not in c._entity_metadata_cache
+
+
+def test_logical_to_schema_name_case_insensitive():
+    """Test that _logical_to_schema_name normalizes input for consistent output."""
+    c = TestableClient([])
+    
+    # All variations should produce the same SchemaName
+    assert c._logical_to_schema_name("new_sampleitem") == "new_Sampleitem"
+    assert c._logical_to_schema_name("NEW_SAMPLEITEM") == "new_Sampleitem"
+    assert c._logical_to_schema_name("New_SampleItem") == "new_Sampleitem"
+    assert c._logical_to_schema_name("  new_sampleitem  ") == "new_Sampleitem"
+    
+    # Test without prefix
+    assert c._logical_to_schema_name("account") == "Account"
+    assert c._logical_to_schema_name("ACCOUNT") == "Account"
+    assert c._logical_to_schema_name("Account") == "Account"
+
+
 if __name__ == "__main__":
     pytest.main([__file__, "-v"])