Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[project]
name = "one_liner"
version = "0.1.1.dev7"

version = "0.1.1.dev8"
readme = "README.md"
requires-python = ">=3.11"
dependencies = [
Expand Down
16 changes: 13 additions & 3 deletions src/one_liner/rpc_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ def _receive_worker(self):
_send(self.socket, name="", data=str(e), success=False)

def add_named_call(self, call_name: str,
obj_name: str, attr_name: str,
args: list | None = None, kwargs: list | None = None):
obj_name: str, attr_name: str,
args: list | None = None, kwargs: list | None = None):
"""Setup a call to be called with `call_by_name` on the
:py:class:`~one_lner.client.ZMQRPCClient`

Expand All @@ -89,7 +89,7 @@ def add_named_call(self, call_name: str,
self.named_call_signatures[call_name] = (obj_name, attr_name, args, kwargs)

def _call_by_name(self, call_name: str, args: list | None = None,
kwargs: list | None = None):
kwargs: dict | None = None):
"""Lookup a configured call by its `'call_name'`, call it with the
specified args/kwargs, and return the result.

Expand All @@ -113,6 +113,11 @@ def _call_by_name(self, call_name: str, args: list | None = None,
# Update args & kwargs from their defaults for this call if specified.
args = args + default_args[len(args):]
kwargs = default_kwargs | kwargs
debug_msg = (f"Invoking named call: {obj_name}.{attr_name}("
f"{', '.join([str(a) for a in args])}"
f"{', ' if (len(args) and len(kwargs)) else ''}"
f"{', '.join([str(k) + '=' + str(v) for k, v in kwargs.items()])})")
self.log.debug(debug_msg)
return self._call(obj_name=obj_name, attr_name=attr_name, args=args,
kwargs=kwargs)

Expand All @@ -135,6 +140,11 @@ def _call(self, obj_name: str, attr_name: str, args: list | None = None,
self.log.error(error_msg)
raise AttributeError(error_msg) from e
try:
debug_msg = (f"Calling: {obj_name}.{attr_name}("
f"{', '.join([str(a) for a in args])}"
f"{', ' if (len(args) and len(kwargs)) else ''}"
f"{', '.join([str(k) + '=' + str(v) for k, v in kwargs.items()])})")
self.log.debug(debug_msg)
return func(*args, **kwargs)
except Exception as e: # catch-all error calling the function.
error_msg = (f"func: {obj_name}.{attr_name}("
Expand Down
Loading