Revert "meh"

This reverts commit 368a02f.

Author: yuming-long

test/api/test_api.py

@@ -470,67 +470,3 @@ def test_streaming_unstructured_ingest_error_with_none_status_code():
         "Async gen test UnstructuredIngestError with None status_code"
         in invoke_response.status_code_text
     )
-
-
-# Tests for UnstructuredIngestErrorV2
-@pytest.mark.parametrize(
-    "file_data", mock_file_data, ids=[type(fd).__name__ for fd in mock_file_data]
-)
-def test_unstructured_ingest_error_v2_with_status_code(file_data):
-    """Test that UnstructuredIngestErrorV2 with status_code is handled correctly."""
-    from test.assets.exception_status_code import (
-        function_raises_unstructured_ingest_error_v2_with_status_code as test_fn,
-    )
-
-    client = TestClient(wrap_in_fastapi(func=test_fn, plugin_id="mock_plugin"))
-
-    post_body = {"file_data": file_data.model_dump()}
-    resp = client.post("/invoke", json=post_body)
-    resp_content = resp.json()
-    invoke_response = InvokeResponse.model_validate(resp_content)
-
-    # Should use the UnstructuredIngestErrorV2's status_code
-    assert invoke_response.status_code == 400
-    assert "Test UnstructuredIngestErrorV2 with status_code" in invoke_response.status_code_text
-
-
-@pytest.mark.parametrize(
-    "file_data", mock_file_data, ids=[type(fd).__name__ for fd in mock_file_data]
-)
-def test_unstructured_ingest_error_v2_without_status_code(file_data):
-    """Test that UnstructuredIngestErrorV2 without status_code defaults to 500."""
-    from test.assets.exception_status_code import (
-        function_raises_unstructured_ingest_error_v2_without_status_code as test_fn,
-    )
-
-    client = TestClient(wrap_in_fastapi(func=test_fn, plugin_id="mock_plugin"))
-
-    post_body = {"file_data": file_data.model_dump()}
-    resp = client.post("/invoke", json=post_body)
-    resp_content = resp.json()
-    invoke_response = InvokeResponse.model_validate(resp_content)
-
-    # Should default to 500 when UnstructuredIngestErrorV2 has no status_code
-    assert invoke_response.status_code == 500
-    assert "Test UnstructuredIngestErrorV2 without status_code" in invoke_response.status_code_text
-
-
-@pytest.mark.parametrize(
-    "file_data", mock_file_data, ids=[type(fd).__name__ for fd in mock_file_data]
-)
-def test_async_unstructured_ingest_error_v2(file_data):
-    """Test that async functions with UnstructuredIngestErrorV2 are handled correctly."""
-    from test.assets.exception_status_code import (
-        async_function_raises_unstructured_ingest_error_v2 as test_fn,
-    )
-
-    client = TestClient(wrap_in_fastapi(func=test_fn, plugin_id="mock_plugin"))
-
-    post_body = {"file_data": file_data.model_dump()}
-    resp = client.post("/invoke", json=post_body)
-    resp_content = resp.json()
-    invoke_response = InvokeResponse.model_validate(resp_content)
-
-    # Should use the UnstructuredIngestErrorV2's status_code
-    assert invoke_response.status_code == 503
-    assert "Async test UnstructuredIngestErrorV2" in invoke_response.status_code_text

test/assets/exception_status_code.py

@@ -2,7 +2,6 @@
 
 from fastapi import HTTPException
 from unstructured_ingest.error import UnstructuredIngestError
-from unstructured_ingest.errors_v2 import UnstructuredIngestError as UnstructuredIngestErrorV2
 
 
 class ExceptionWithNoneStatusCode(Exception):
@@ -138,52 +137,3 @@ async def async_gen_function_raises_unstructured_ingest_error_with_none_status_c
     error = UnstructuredIngestError("Async gen test UnstructuredIngestError with None status_code")
     error.status_code = None
     raise error
-
-
-# V2 Error Functions - using UnstructuredIngestErrorV2
-def function_raises_unstructured_ingest_error_v2_with_status_code():
-    """Function that raises UnstructuredIngestErrorV2 with status_code."""
-    error = UnstructuredIngestErrorV2("Test UnstructuredIngestErrorV2 with status_code")
-    error.status_code = 400
-    raise error
-
-
-def function_raises_unstructured_ingest_error_v2_without_status_code():
-    """Function that raises UnstructuredIngestErrorV2 without status_code."""
-    raise UnstructuredIngestErrorV2("Test UnstructuredIngestErrorV2 without status_code")
-
-
-def function_raises_unstructured_ingest_error_v2_with_none_status_code():
-    """Function that raises UnstructuredIngestErrorV2 with None status_code."""
-    error = UnstructuredIngestErrorV2("Test UnstructuredIngestErrorV2 with None status_code")
-    error.status_code = None
-    raise error
-
-
-async def async_function_raises_unstructured_ingest_error_v2():
-    """Async function that raises UnstructuredIngestErrorV2."""
-    error = UnstructuredIngestErrorV2("Async test UnstructuredIngestErrorV2")
-    error.status_code = 503
-    raise error
-
-
-async def async_gen_function_raises_unstructured_ingest_error_v2():
-    """Async generator that raises UnstructuredIngestErrorV2."""
-    # Don't yield anything, just raise the exception
-    if False:  # This ensures the function is detected as a generator but never yields
-        yield None
-    error = UnstructuredIngestErrorV2("Async gen test UnstructuredIngestErrorV2")
-    error.status_code = 502
-    raise error
-
-
-async def async_gen_function_raises_unstructured_ingest_error_v2_with_none_status_code():
-    """Async generator that raises UnstructuredIngestErrorV2 with None status_code."""
-    # Don't yield anything, just raise the exception
-    if False:  # This ensures the function is detected as a generator but never yields
-        yield None
-    error = UnstructuredIngestErrorV2(
-        "Async gen test UnstructuredIngestErrorV2 with None status_code"
-    )
-    error.status_code = None
-    raise error

unstructured_platform_plugins/etl_uvicorn/api_generator.py

@@ -13,7 +13,6 @@
 from starlette.responses import RedirectResponse
 from unstructured_ingest.data_types.file_data import BatchFileData, FileData, file_data_from_dict
 from unstructured_ingest.error import UnstructuredIngestError
-from unstructured_ingest.errors_v2 import UnstructuredIngestError as UnstructuredIngestErrorV2
 from uvicorn.config import LOG_LEVELS
 from uvicorn.importer import import_from_string
 
@@ -225,7 +224,7 @@ async def _stream_response():
                 else exc.detail,
                 file_data=request_dict.get("file_data", None),
             )
-        except (UnstructuredIngestError, UnstructuredIngestErrorV2) as exc:
+        except UnstructuredIngestError as exc:
             logger.error(
                 f"UnstructuredIngestError: {str(exc)} (status_code={exc.status_code})",
                 exc_info=True,