✨ feat: contrib for tenacity

Author: mic1on

example/addict_demo.py

@@ -0,0 +1,18 @@
+from usepy import useAdDict
+
+test_dict = {
+    "title": "test",
+    "detail": {
+        "authors": [
+            "author1",
+            "author2"
+        ],
+        "content": "test content"
+    }
+}
+
+if __name__ == '__main__':
+    d = useAdDict(test_dict)
+    assert d.title == "test"
+    assert d.detail.authors[0] == "author1"
+    assert d.test == {}

example/contrib/pydantic_demo.py

@@ -0,0 +1,21 @@
+from usepy.contrib.pydantic_ import BaseORMModel, Field
+
+if __name__ == '__main__':
+    class Project(BaseORMModel):
+        id: str = Field(..., path="detail.id")
+        url: str = Field(..., path="detail.url")
+        author_name: list = Field(..., path="detail.authors[*].name")
+
+
+    test_data = {
+        "detail": {
+            "id": "123",
+            "url": "https://www.baidu.com",
+            "authors": [
+                {"name": "张三"},
+                {"name": "李四"},
+            ]
+        }
+    }
+    project = Project.from_orm({"model": Project, "data": test_data}).dict()
+    print(project)

example/contrib/tenacity_demo.py

@@ -0,0 +1,21 @@
+import asyncio
+from usepy.contrib.tenacity_ import retry
+
+if __name__ == '__main__':
+    @retry(max_times=3,
+           wait_times=1,
+           retry_on_result=None,
+           retry_error_callback=lambda x: print("123"))
+    def demo():
+        print("test")
+        return None
+
+
+    @retry(max_times=3, wait_times=1, retry_on_result=None, retry_error_callback=lambda x: print("123"))
+    async def async_demo():
+        print("async_demo")
+        return None
+
+
+    demo()
+    asyncio.run(async_demo())

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "usepy"
-version = "0.1.40"
+version = "0.1.41"
 description = "usepy"
 homepage = "https://usepy.code05.com/"
 authors = ["miclon <jcnd@163.com>"]

src/usepy/contrib/pydantic.py renamed to src/usepy/contrib/pydantic_.py

@@ -44,24 +44,3 @@ class Project(BaseORMModel):
     class Config:
         orm_mode = True
         getter_dict = Getter
-
-
-if __name__ == '__main__':
-    class Project(BaseORMModel):
-        id: str = Field(..., path="detail.id")
-        url: str = Field(..., path="detail.url")
-        author_name: list = Field(..., path="detail.authors[*].name")
-
-
-    test_data = {
-        "detail": {
-            "id": "123",
-            "url": "https://www.baidu.com",
-            "authors": [
-                {"name": "张三"},
-                {"name": "李四"},
-            ]
-        }
-    }
-    project = Project.from_orm({"model": Project, "data": test_data}).dict()
-    print(project)

src/usepy/contrib/tenacity_.py

@@ -0,0 +1,68 @@
+import typing as t
+from inspect import iscoroutinefunction
+
+from tenacity import (
+    retry as _retry,
+    stop_after_attempt, stop_never, wait_fixed,
+    retry_if_result, retry_if_exception_type
+)
+
+undefined = object()
+
+
+def retry(max_times: t.Optional[int] = None,
+          wait_times: t.Optional[int] = None,
+          retry_on_result=undefined,
+          retry_on_exception: t.Union[
+              t.Type[BaseException],
+              t.Tuple[t.Type[BaseException], ...],
+          ] = Exception,
+          *t_args, **t_kw):
+    """
+    包装tenacity.retry，让调用更简易些
+    :param max_times: 最大重试次数
+    :param wait_times: 每次重试等待时间
+    :param retry_on_result: 当返回值等于retry_on_result时，重试
+    :param retry_on_exception: 当抛出指定异常时，重试
+    :param t_args: tenacity.retry的参数
+    :param t_kw: tenacity.retry的参数
+    :return:
+    """
+
+    stop_on = stop_never if max_times is None else stop_after_attempt(max_times)
+
+    retry_on = retry_if_exception_type(retry_on_exception)
+    if retry_on_result is not undefined:
+        retry_on = retry_if_result(lambda result: result == retry_on_result) | retry_on
+
+    wait_on = wait_fixed(wait_times) if wait_times is not None else wait_fixed(0)
+
+    def decorator(func):
+
+        if iscoroutinefunction(func):
+            @_retry(retry=retry_on, stop=stop_on, wait=wait_on, *t_args, **t_kw)
+            async def wrapper(*args, **kwargs):
+                return await func(*args, **kwargs)
+
+            return wrapper
+
+        else:
+            @_retry(retry=retry_on, stop=stop_on, wait=wait_on, *t_args, **t_kw)
+            def wrapper(*args, **kwargs):
+                return func(*args, **kwargs)
+
+            return wrapper
+
+    return decorator
+
+
+if __name__ == '__main__':
+    @retry(max_times=3, wait_times=1, retry_on_result=None, retry_error_callback=lambda x: print("123"))
+    async def maybe_none():
+        print("111111")
+        return None
+
+
+    import asyncio
+
+    asyncio.run(maybe_none())