fixup! Add support for registering views

Author: ebyhr

pyiceberg/catalog/rest/__init__.py

@@ -1322,14 +1322,16 @@ def view_exists(self, identifier: str | Identifier) -> bool:
     @retry(**_RETRY_ARGS)
     def register_view(self, identifier: str | Identifier, metadata_location: str) -> View:
         self._check_endpoint(Capability.V1_REGISTER_VIEW)
-        namespace_and_view = self._split_identifier_for_path(identifier)
-        request = RegisterViewRequest(
-            name=self._identifier_to_validated_tuple(identifier)[-1],
-            metadata_location=metadata_location,
-        )
+        namespace_and_view = self._split_identifier_for_path(identifier, IdentifierKind.VIEW)
+        namespace = namespace_and_view["namespace"]
+        view = namespace_and_view["view"]
+        if self.table_exists(identifier):
+            raise TableAlreadyExistsError(f"Table {namespace}.{view} already exists")
+
+        request = RegisterViewRequest(name=view, metadata_location=metadata_location)
         serialized_json = request.model_dump_json().encode(UTF8)
         response = self._session.post(
-            self.url(Endpoints.register_view, namespace=namespace_and_view["namespace"]),
+            self.url(Endpoints.register_view, namespace=namespace),
             data=serialized_json,
         )
         try:

tests/catalog/test_rest.py

@@ -2124,12 +2124,18 @@ def test_table_identifier_in_commit_table_request(
 
 
 def test_register_view_200(rest_mock: Mocker, example_view_metadata_rest_json: dict[str, Any]) -> None:
+    rest_mock.head(
+        f"{TEST_URI}v1/namespaces/default/tables/registered_view",
+        status_code=404,
+        request_headers=TEST_HEADERS,
+    )
     rest_mock.post(
         f"{TEST_URI}v1/namespaces/default/register-view",
         json=example_view_metadata_rest_json,
         status_code=200,
         request_headers=TEST_HEADERS,
     )
+
     catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN)
     actual = catalog.register_view(
         identifier=("default", "registered_view"), metadata_location="s3://warehouse/database/view/metadata.json"
@@ -2138,11 +2144,15 @@ def test_register_view_200(rest_mock: Mocker, example_view_metadata_rest_json: d
         identifier=("default", "registered_view"),
         metadata=ViewMetadata(**example_view_metadata_rest_json["metadata"]),
     )
-    assert actual.metadata.model_dump() == expected.metadata.model_dump()
-    assert actual.name() == expected.name()
+    assert actual == expected
 
 
-def test_register_view_409(rest_mock: Mocker) -> None:
+def test_register_view_409_view(rest_mock: Mocker) -> None:
+    rest_mock.head(
+        f"{TEST_URI}v1/namespaces/default/tables/registered_view",
+        status_code=404,
+        request_headers=TEST_HEADERS,
+    )
     rest_mock.post(
         f"{TEST_URI}v1/namespaces/default/register-view",
         json={
@@ -2164,6 +2174,26 @@ def test_register_view_409(rest_mock: Mocker) -> None:
     assert "View already exists" in str(e.value)
 
 
+def test_register_view_409_table(rest_mock: Mocker) -> None:
+    rest_mock.head(
+        f"{TEST_URI}v1/namespaces/default/tables/registered_view",
+        status_code=200,
+        request_headers=TEST_HEADERS,
+    )
+    rest_mock.post(
+        f"{TEST_URI}v1/namespaces/default/views/registered_view",
+        status_code=204,
+        request_headers=TEST_HEADERS,
+    )
+
+    catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN)
+    with pytest.raises(TableAlreadyExistsError) as e:
+        catalog.register_view(
+            identifier=("default", "registered_view"), metadata_location="s3://warehouse/database/view/metadata.json"
+        )
+    assert "Table default.registered_view already exists" in str(e.value)
+
+
 def test_drop_view_invalid_namespace(rest_mock: Mocker) -> None:
     view = "view"
     with pytest.raises(NoSuchIdentifierError) as e: