You can now raise esorm.error.ConflictError to retry in retry_on_conf…

…lict decorated functions and methods.

esorm/error.py

@@ -31,6 +31,14 @@ class InvalidModelError(Exception):
     """
 
 
+class ConflictError(Exception):
+    """
+    Raised when a conflict occurs.
+
+    You can manually raise this to retry operation with `retry_on_conflict` decorator.
+    """
+
+
 class BulkOperationError(TypedDict):
     """
     A dictionary type to represent an error in a bulk operation response from Elasticsearch.

esorm/model.py

@@ -32,7 +32,7 @@
 from .utils import snake_case, utcnow
 from .aggs import ESAggs, ESAggsResponse
 
-from .error import InvalidResponseError, NotFoundError
+from .error import InvalidResponseError, NotFoundError, ConflictError as ESORMConflictError
 from .esorm import es, get_es_version
 from .query import ESQuery
 from .response import ESResponse
@@ -981,7 +981,7 @@ async def wrapper(*args, **kwargs):
             while True:
                 try:
                     return await func(*args, **kwargs)
-                except ElasticConflictError:
+                except (ElasticConflictError, ESORMConflictError):
                     # Reload the document if it is a method of ESModel
                     if reload_on_conflict and isinstance(args[0], ESModel):
                         await args[0].reload()