Functional fix for issue #2721

octopoes/octopoes/api/api.py

@@ -25,6 +25,7 @@
 from octopoes.events.manager import get_rabbit_channel
 from octopoes.models.exception import ObjectNotFoundException
 from octopoes.version import __version__
+from octopoes.xtdb.exceptions import NodeNotFound, ObjectNotFound
 
 settings = Settings()
 logger = logging.getLogger(__name__)
@@ -78,6 +79,22 @@ def http_exception_handler(request: Request, exc: RequestError) -> JSONResponse:
     )
 
 
+@app.exception_handler(ObjectNotFound)
+def object_not_found_exception_handler(request: Request, exc: ObjectNotFound) -> JSONResponse:
+    raise ObjectNotFoundException("Object not found")
+
+
+@app.exception_handler(NodeNotFound)
+def node_not_found_exception_handler(request: Request, exc: NodeNotFound) -> JSONResponse:
+    logger.info(exc)
+    return JSONResponse(
+        {
+            "value": "Node not found",
+        },
+        status.HTTP_404_NOT_FOUND,
+    )
+
+
 @app.exception_handler(ObjectNotFoundException)
 def not_found_exception_handler(request: Request, exc: ObjectNotFoundException) -> JSONResponse:
     logger.info(exc)

octopoes/octopoes/xtdb/client.py

@@ -10,7 +10,7 @@
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter
 
 from octopoes.models.transaction import TransactionRecord
-from octopoes.xtdb.exceptions import NodeNotFound, XTDBException
+from octopoes.xtdb.exceptions import NodeNotFound, ObjectNotFound, XTDBException
 from octopoes.xtdb.query import Query
 
 logger = logging.getLogger(__name__)
@@ -63,7 +63,12 @@ def _verify_response(response: Response) -> None:
                 logger.error(response.request.url)
                 logger.error(response.request.content)
                 logger.error(response.text)
-            raise e
+                raise e
+            else:
+                if response.json() == {"error": "Node not found"}:
+                    raise NodeNotFound
+                elif response.json()["error"].endswith("not found"):
+                    raise ObjectNotFound
 
     def client_url(self) -> str:
         return f"/{self._client}"

octopoes/octopoes/xtdb/exceptions.py

@@ -4,3 +4,7 @@ class XTDBException(Exception):
 
 class NodeNotFound(XTDBException):
     """The XTDB node was not found"""
+
+
+class ObjectNotFound(XTDBException):
+    """The XTDB object was not found"""