Remove opts on registration (#202)

* Remove opts on registration

* Use constant retry policy on run

* Use ctx.info.attempt

* fix bug

Author: Tomperez98

resonate/conventions/base.py

@@ -21,4 +21,4 @@ def timeout(self) -> int:
         return self.opts.timeout
 
     def options(self, send_to: str | None, tags: dict[str, str] | None, timeout: int | None, version: int | None) -> None:
-        self.opts.merge(timeout=timeout, tags=tags)
+        self.opts = self.opts.merge(timeout=timeout, tags=tags)

resonate/resonate.py

@@ -106,36 +106,24 @@ def register[**P, R](
         /,
         *,
         name: str | None = None,
-        send_to: str | None = None,
-        timeout: int | None = None,
         version: int = 1,
-        tags: dict[str, str] | None = None,
-        retry_policy: RetryPolicy | None = None,
     ) -> Function[P, R]: ...
     @overload
     def register[**P, R](
         self,
         *,
         name: str | None = None,
-        send_to: str | None = None,
-        timeout: int | None = None,
         version: int = 1,
-        tags: dict[str, str] | None = None,
-        retry_policy: RetryPolicy | None = None,
     ) -> Callable[[Callable], Function[P, Any]]: ...
     def register[**P, R](
         self,
         *args: Callable | None,
         name: str | None = None,
-        send_to: str | None = None,
-        timeout: int | None = None,
         version: int = 1,
-        tags: dict[str, str] | None = None,
-        retry_policy: RetryPolicy | None = None,
     ) -> Callable[[Callable], Function[P, R]] | Function[P, R]:
         def wrapper(func: Callable) -> Function[P, R]:
             self._registry.add(func.func if isinstance(func, Function) else func, name or func.__name__, version)
-            return Function(self, name or func.__name__, func, self._opts.merge(send_to=send_to, version=version, timeout=timeout, tags=tags, retry_policy=retry_policy))
+            return Function(self, name or func.__name__, func, self._opts.merge(version=version))
 
         if args and callable(args[0]):
             return wrapper(args[0])

tests/test_bridge.py

@@ -8,7 +8,7 @@
 
 from resonate.message_sources.poller import Poller
 from resonate.resonate import Resonate
-from resonate.retry_policies import Constant
+from resonate.retry_policies.constant import Constant
 from resonate.stores.local import LocalStore
 from resonate.stores.remote import RemoteStore
 
@@ -241,20 +241,16 @@ def test_basic_retries() -> None:
     # Use a different instance that only do local store
     resonate = Resonate()
 
-    n = 0
-
     def retriable(ctx: Context) -> int:
-        nonlocal n
-        n += 1
-        if n == 4:
-            return n
+        if ctx.info.attempt == 4:
+            return ctx.info.attempt
         raise RuntimeError
 
-    f = resonate.register(retriable, retry_policy=Constant(delay=1, max_retries=3))
+    f = resonate.register(retriable)
     resonate.start()
 
     start_time = time.time()
-    handle = f.run(f"retriable-{int(start_time)}")
+    handle = f.options(retry_policy=Constant(delay=1, max_retries=3)).run(f"retriable-{int(start_time)}")
     result = handle.result()
     end_time = time.time()
 

tests/test_resonate.py

@@ -162,11 +162,12 @@ def test_run(
     assert cmd_invoke(bridge) == invoke_with_opts
 
     version = (version or 1) + 1
-    f2 = resonate.register(func, name=name, send_to=send_to, version=version, timeout=timeout, tags=tags)
+
+    f2 = resonate.register(func, name=name, version=version)
     opts = opts.merge(version=version)
     invoke_with_opts.opts = opts
 
-    f2.run("f", *args, **kwargs)
+    f2.options(timeout=timeout, tags=tags, send_to=send_to).run("f", *args, **kwargs)
     assert cmd_invoke(bridge) == invoke_with_opts
 
     f2.options(**opts.to_dict()).run("f", *args, **kwargs)
@@ -240,10 +241,10 @@ def test_rpc(
     assert cmd_invoke(bridge) == invoke_with_opts
 
     version = (version or 1) + 1
-    f2 = resonate.register(func, name=name, send_to=send_to, version=version, timeout=timeout, tags=tags)
+    f2 = resonate.register(func, name=name, version=version)
     invoke_with_opts.opts = invoke_with_opts.opts.merge(version=version)
 
-    f2.rpc("f", *args, **kwargs)
+    f2.options(send_to=send_to, timeout=timeout, tags=tags).rpc("f", *args, **kwargs)
     assert cmd_invoke(bridge) == invoke_with_opts
 
     f2.options(**opts.to_dict()).rpc("f", *args, **kwargs)
@@ -291,9 +292,9 @@ def baz(ctx: Context, a: int, b: str, /) -> int | str: ...
 @pytest.mark.parametrize(
     ("func", "kwargs"),
     [
-        (lambda x: x, {"name": "foo", "timeout": 1, "version": -1}),
-        (lambda x: x, {"name": "foo", "timeout": -1, "version": 1}),
-        (lambda x: x, {"timeout": 1, "version": 1}),
+        (lambda x: x, {"name": "foo", "version": -1}),
+        (lambda x: x, {"name": "foo", "version": 1}),
+        (lambda x: x, {"version": 1}),
         (foo, {"version": 1}),
         (foo, {"version": 2}),
         (bar, {"version": 1}),