Merge branch 'apache:main' into load_view

Author: spr0els

.github/workflows/pypi-build-artifacts.yml

@@ -68,7 +68,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a # v3.4.0
+        uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
         with:
           output-dir: wheelhouse
           config-file: "pyproject.toml"

.github/workflows/svn-build-artifacts.yml

@@ -62,7 +62,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a # v3.4.0
+        uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
         with:
           output-dir: wheelhouse
           config-file: "pyproject.toml"

pyiceberg/catalog/rest/__init__.py

@@ -340,7 +340,14 @@ class ListNamespaceResponse(IcebergBaseModel):
 
 class NamespaceResponse(IcebergBaseModel):
     namespace: Identifier = Field()
-    properties: Properties = Field()
+    properties: Properties = Field(default_factory=dict)
+
+    @field_validator("properties", mode="before")
+    @classmethod
+    def replace_none_with_dict(cls, v: Any) -> Properties:
+        if v is None:
+            return {}
+        return v
 
 
 class UpdateNamespacePropertiesResponse(IcebergBaseModel):

tests/catalog/test_rest.py

@@ -923,6 +923,39 @@ def test_load_namespace_properties_200(rest_mock: Mocker) -> None:
     assert RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN).load_namespace_properties(namespace) == {"prop": "yes"}
 
 
+def test_load_namespace_properties_200_without_properties(rest_mock: Mocker) -> None:
+    namespace = "leden"
+    rest_mock.get(
+        f"{TEST_URI}v1/namespaces/{namespace}",
+        json={"namespace": ["leden"]},
+        status_code=200,
+        request_headers=TEST_HEADERS,
+    )
+    assert RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN).load_namespace_properties(namespace) == {}
+
+
+def test_load_namespace_properties_200_with_null_properties(rest_mock: Mocker) -> None:
+    namespace = "leden"
+    rest_mock.get(
+        f"{TEST_URI}v1/namespaces/{namespace}",
+        json={"namespace": ["leden"], "properties": None},
+        status_code=200,
+        request_headers=TEST_HEADERS,
+    )
+    assert RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN).load_namespace_properties(namespace) == {}
+
+
+def test_load_namespace_properties_200_with_empty_properties(rest_mock: Mocker) -> None:
+    namespace = "leden"
+    rest_mock.get(
+        f"{TEST_URI}v1/namespaces/{namespace}",
+        json={"namespace": ["leden"], "properties": {}},
+        status_code=200,
+        request_headers=TEST_HEADERS,
+    )
+    assert RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN).load_namespace_properties(namespace) == {}
+
+
 def test_load_namespace_properties_404(rest_mock: Mocker) -> None:
     namespace = "leden"
     rest_mock.get(