indexify 0.2.35__tar.gz → 0.2.37__tar.gz

{indexify-0.2.35 → indexify-0.2.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: indexify
-Version: 0.2.35
+Version: 0.2.37
 Summary: Python Client for Indexify
 Home-page: https://github.com/tensorlakeai/indexify
 License: Apache 2.0

{indexify-0.2.35 → indexify-0.2.37}/indexify/executor/agent.py

@@ -299,7 +299,7 @@ class ExtractorAgent:
                 image_version=image_version,
                 labels=runtime_probe.labels,
             ).model_dump()
-            logging.info("registering_executor", executor_id=self._executor_id)
+            logging.info("registering_executor", executor_id=self._executor_id, url=url)
             try:
                 async with get_httpx_client(self._config_path, True) as client:
                     async with aconnect_sse(
@@ -310,9 +310,10 @@ class ExtractorAgent:
                         headers={"Content-Type": "application/json"},
                     ) as event_source:
                         if not event_source.response.is_success:
+                            resp = await event_source.response.aread()
                             logging.error(
                                 f"failed to register",
-                                resp=str(event_source.response.content),
+                                resp=str(resp),
                                 status_code=event_source.response.status_code,
                             )
                             await asyncio.sleep(5)

{indexify-0.2.35 → indexify-0.2.37}/indexify/functions_sdk/graph.py

@@ -147,6 +147,11 @@ class Graph:
         from_node: Union[Type[IndexifyFunction], Type[IndexifyRouter]],
         to_node: List[Union[Type[IndexifyFunction], Type[IndexifyRouter]]],
     ) -> "Graph":
+        if issubclass(from_node, IndexifyRouter):
+            raise ValueError(
+                "Cannot add edges from a router node, use route method instead"
+            )
+
         self.add_node(from_node)
         from_node_name = from_node.name
         for node in to_node:

{indexify-0.2.35 → indexify-0.2.37}/indexify/functions_sdk/indexify_functions.py

@@ -112,11 +112,32 @@ class IndexifyRouter:
         pass
 
 
-from inspect import signature
+from inspect import Parameter, signature
 
 from typing_extensions import get_type_hints
 
 
+def _process_dict_arg(dict_arg: dict, sig: inspect.Signature) -> Tuple[list, dict]:
+    new_args = []
+    new_kwargs = {}
+    remaining_kwargs = dict_arg.copy()
+
+    # Match dictionary keys to function parameters
+    for param_name, param in sig.parameters.items():
+        if param_name in dict_arg:
+            new_args.append(dict_arg[param_name])
+            remaining_kwargs.pop(param_name, None)
+
+    if any(v.kind == Parameter.VAR_KEYWORD for v in sig.parameters.values()):
+        # Combine remaining dict items with additional kwargs
+        new_kwargs.update(remaining_kwargs)
+    elif len(remaining_kwargs) > 0:
+        # If there are remaining kwargs, add them as a single dict argument
+        new_args.append(remaining_kwargs)
+
+    return new_args, new_kwargs
+
+
 def indexify_router(
     name: Optional[str] = None,
     description: Optional[str] = "",
@@ -132,6 +153,13 @@ def indexify_router(
 
         # Create run method that preserves signature
         def run(self, *args, **kwargs):
+            # Process dictionary argument mapping it to args or to kwargs.
+            if len(args) == 1 and isinstance(args[0], dict):
+                sig = inspect.signature(fn)
+                dict_arg = args[0]
+                new_args, new_kwargs = _process_dict_arg(dict_arg, sig)
+                return fn(*new_args, **new_kwargs)
+
             return fn(*args, **kwargs)
 
         # Apply original signature and annotations to run method
@@ -173,6 +201,20 @@ def indexify_function(
 
         # Create run method that preserves signature
         def run(self, *args, **kwargs):
+            # Process dictionary argument mapping it to args or to kwargs.
+            if self.accumulate and len(args) == 2 and isinstance(args[1], dict):
+                sig = inspect.signature(fn)
+                new_args = [args[0]]  # Keep the accumulate argument
+                dict_arg = args[1]
+                new_args_from_dict, new_kwargs = _process_dict_arg(dict_arg, sig)
+                new_args.extend(new_args_from_dict)
+                return fn(*new_args, **new_kwargs)
+            elif len(args) == 1 and isinstance(args[0], dict):
+                sig = inspect.signature(fn)
+                dict_arg = args[0]
+                new_args, new_kwargs = _process_dict_arg(dict_arg, sig)
+                return fn(*new_args, **new_kwargs)
+
             return fn(*args, **kwargs)
 
         # Apply original signature and annotations to run method
@@ -252,14 +294,15 @@ class IndexifyFunctionWrapper:
     def run_router(
         self, input: Union[Dict, Type[BaseModel]]
     ) -> Tuple[List[str], Optional[str]]:
-        kwargs = input if isinstance(input, dict) else {"input": input}
         args = []
         kwargs = {}
-        if isinstance(input, dict):
-            kwargs = input
-        else:
-            args.append(input)
         try:
+            # tuple and list are considered positional arguments, list is used for compatibility
+            # with json encoding which won't deserialize in tuple.
+            if isinstance(input, tuple) or isinstance(input, list):
+                args += input
+            else:
+                args.append(input)
             extracted_data = self.indexify_function.run(*args, **kwargs)
         except Exception as e:
             return [], traceback.format_exc()
@@ -271,14 +314,18 @@ class IndexifyFunctionWrapper:
         return edges, None
 
     def run_fn(
-        self, input: Union[Dict, Type[BaseModel]], acc: Type[Any] = None
+        self, input: Union[Dict, Type[BaseModel], List, Tuple], acc: Type[Any] = None
     ) -> Tuple[List[Any], Optional[str]]:
         args = []
         kwargs = {}
+
         if acc is not None:
             args.append(acc)
-        if isinstance(input, dict):
-            kwargs = input
+
+        # tuple and list are considered positional arguments, list is used for compatibility
+        # with json encoding which won't deserialize in tuple.
+        if isinstance(input, tuple) or isinstance(input, list):
+            args += input
         else:
             args.append(input)
 

{indexify-0.2.35 → indexify-0.2.37}/indexify/remote_graph.py

@@ -23,7 +23,7 @@ class RemoteGraph:
         :param server_url: The URL of the server where the graph will be registered.
             Not used if client is provided.
         :param client: The IndexifyClient used to communicate with the server.
-            Prefered over server_url.
+            Preferred over server_url.
         """
         self._name = name
         if client:
@@ -88,7 +88,7 @@ class RemoteGraph:
         :param server_url: The URL of the server where the graph will be registered.
             Not used if client is provided.
         :param client: The IndexifyClient used to communicate with the server.
-            Prefered over server_url.
+            Preferred over server_url.
         """
         g.validate_graph()
         if not client:
@@ -110,7 +110,7 @@ class RemoteGraph:
         :param server_url: The URL of the server where the graph will be registered.
             Not used if client is provided.
         :param client: The IndexifyClient used to communicate with the server.
-            Prefered over server_url.
+            Preferred over server_url.
         :return: A RemoteGraph object.
         """
         return cls(name=name, server_url=server_url, client=client)

{indexify-0.2.35 → indexify-0.2.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "indexify"
-version = "0.2.35"
+version = "0.2.37"
 description = "Python Client for Indexify"
 authors = ["Tensorlake Inc. <support@tensorlake.ai>"]
 license = "Apache 2.0"