indexify 0.2.15__tar.gz → 0.2.17__tar.gz

{indexify-0.2.15 → indexify-0.2.17}/PKG-INFO

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

{indexify-0.2.15 → indexify-0.2.17}/indexify/cli.py

@@ -261,7 +261,7 @@ WORKDIR /app
         docker_file += f"\nRUN pip install indexify"
 
     console.print("Creating image using Dockerfile contents:", style="cyan bold")
-    console.print(f"{docker_file}", style="magenta")
+    print(f"{docker_file}")
 
     client = docker.from_env()
     image_name = f"{image._image_name}:{image._tag}"

{indexify-0.2.15 → indexify-0.2.17}/indexify/executor/function_worker.py

@@ -62,6 +62,7 @@ class FunctionWorker:
         self._executor: concurrent.futures.ProcessPoolExecutor = (
             concurrent.futures.ProcessPoolExecutor(max_workers=workers)
         )
+        self._workers = workers
 
     async def async_submit(
         self,
@@ -74,22 +75,9 @@ class FunctionWorker:
         init_value: Optional[IndexifyData] = None,
     ) -> FunctionWorkerOutput:
         try:
-            result = await asyncio.get_running_loop().run_in_executor(
-                self._executor,
-                _run_function,
-                namespace,
-                graph_name,
-                fn_name,
-                input,
-                code_path,
-                version,
-                init_value,
-            )
-        except BrokenProcessPool as mp:
-            self._executor.shutdown(wait=True, cancel_futures=True)
-            traceback.print_exc()
-            raise mp
-        except FunctionRunException as e:
+            result = _run_function(namespace, graph_name, fn_name, input, code_path, version, init_value)
+            # TODO - bring back running in a separate process
+        except Exception as e:
             return FunctionWorkerOutput(
                 exception=str(e),
                 stdout=e.stdout,

{indexify-0.2.15 → indexify-0.2.17}/indexify/functions_sdk/graph.py

@@ -229,12 +229,12 @@ class Graph:
             cached_output_bytes: Optional[bytes] = self._cache.get(
                 self.name, node_name, input_bytes
             )
-            if cached_output_bytes is not None and enable_cache:
-                print(
-                    f"ran {node_name}: num outputs: {len(cached_output_bytes)} (cache hit)"
-                )
+            if cached_output_bytes is not None and enable_cache: 
                 function_outputs: List[IndexifyData] = []
                 cached_output_list = serializer.deserialize_list(cached_output_bytes)
+                print(
+                    f"ran {node_name}: num outputs: {len(cached_output_list)} (cache hit)"
+                )
                 if accumulator_values.get(node_name, None) is not None:
                     accumulator_values[node_name] = cached_output_list[-1].model_copy()
                     outputs[node_name] = []
@@ -250,16 +250,17 @@ class Graph:
                 if accumulator_values.get(node_name, None) is not None:
                     accumulator_values[node_name] = function_outputs[-1].model_copy()
                     outputs[node_name] = []
-                outputs[node_name].extend(function_outputs)
-                function_outputs_bytes: List[bytes] = [
-                    serializer.serialize_list(function_outputs)
-                ]
-                self._cache.set(
-                    self.name,
-                    node_name,
-                    input_bytes,
-                    function_outputs_bytes,
-                )
+                if function_outputs:
+                    outputs[node_name].extend(function_outputs)
+                    function_outputs_bytes: List[bytes] = [
+                        serializer.serialize_list(function_outputs)
+                    ]
+                    self._cache.set(
+                        self.name,
+                        node_name,
+                        input_bytes,
+                        function_outputs_bytes,
+                    )
             if accumulator_values.get(node_name, None) is not None and queue:
                 print(
                     f"accumulator not none for {node_name}, continuing, len queue: {len(queue)}"

{indexify-0.2.15 → indexify-0.2.17}/indexify/functions_sdk/image.py

@@ -1,11 +1,20 @@
+def python_version_to_image(python_version):
+    if python_version.startswith("3.9"):
+        return "python:3.9.20-bookworm"
+    elif python_version.startswith("3.10"):
+        return "python:3.10.15-bookworm"
+    elif python_version.startswith("3.11"):
+        return "python:3.11.10-bookworm"
+    else:
+        raise ValueError(f"unsupported Python version: {python_version}")
+
+
 class Image:
-    def __init__(self):
+    def __init__(self, python="3.10"):
         self._image_name = None
-
         self._tag = "latest"
-
-        self._base_image = "python:3.11.10-slim-bookworm"
-
+        self._base_image = python_version_to_image(python)
+        self._python_version = python
         self._run_strs = []
 
     def name(self, image_name):

{indexify-0.2.15 → indexify-0.2.17}/indexify/functions_sdk/indexify_functions.py

@@ -218,6 +218,8 @@ class IndexifyFunctionWrapper:
             args.append(input)
 
         extracted_data = self.indexify_function.run(*args, **kwargs)
+        if extracted_data is None:
+            return []
 
         return extracted_data if isinstance(extracted_data, list) else [extracted_data]
 
@@ -234,7 +236,7 @@ class IndexifyFunctionWrapper:
             acc = self.indexify_function.accumulate.model_validate(
                 self.indexify_function.accumulate()
             )
-        outputs: List[Any] = self.run_fn(input, acc=acc)
+        outputs: Optional[List[Any]] = self.run_fn(input, acc=acc)
         return [
             IndexifyData(payload=serializer.serialize(output)) for output in outputs
         ]

{indexify-0.2.15 → indexify-0.2.17}/pyproject.toml

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