indexify 0.2__tar.gz → 0.2.2__tar.gz

{indexify-0.2 → indexify-0.2.2}/PKG-INFO

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

{indexify-0.2 → indexify-0.2.2}/indexify/__init__.py

@@ -1,6 +1,7 @@
 from . import data_loaders
 from .client import create_client
 from .functions_sdk.graph import Graph
+from .functions_sdk.image import Image
 from .functions_sdk.indexify_functions import (
     indexify_function,
     indexify_router,
@@ -12,6 +13,7 @@ from .settings import DEFAULT_SERVICE_URL
 __all__ = [
     "data_loaders",
     "Graph",
+    "Image",
     "indexify_function",
     "indexify_router",
     "DEFAULT_SERVICE_URL",

{indexify-0.2 → indexify-0.2.2}/indexify/cli.py

@@ -19,7 +19,7 @@ from rich.theme import Theme
 
 from indexify.executor.agent import ExtractorAgent
 from indexify.executor.function_worker import FunctionWorker
-from indexify.functions_sdk.image import Image
+from indexify.functions_sdk.image import Image, DEFAULT_IMAGE
 
 custom_theme = Theme(
     {
@@ -130,7 +130,6 @@ def build_image(workflow_file_path: str, func_names: List[str]):
         )
 
     found_funcs = []
-    graph = None
     for name, obj in globals_dict.items():
         for func_name in func_names:
             if name == func_name:
@@ -143,6 +142,15 @@ def build_image(workflow_file_path: str, func_names: List[str]):
     )
 
 
+@app.command(help="Build default image for indexify")
+def build_default_image():
+    _build_image(image=DEFAULT_IMAGE)
+
+    console.print(
+        Text(f"Built default indexify image", style="cyan"),
+    )
+
+
 @app.command(help="Joins the extractors to the coordinator server")
 def executor(
     server_addr: str = "localhost:8900",
@@ -211,25 +219,29 @@ def _build_image(image: Image, func_name: str = None):
         )
         exit(-1)
 
-    docker_file_str_template = """
-FROM {base_image}
+    docker_file = f"""
+FROM {image._base_image}
+
+RUN mkdir -p ~/.indexify
+
+RUN touch ~/.indexify/image_name
+
+RUN  echo {image._image_name} > ~/.indexify/image_name
 
 WORKDIR /app
 
 """
 
-    docker_file_str = docker_file_str_template.format(base_image=image._base_image)
-
     run_strs = ["RUN " + i for i in image._run_strs]
 
-    docker_file_str += "\n".join(run_strs)
+    docker_file += "\n".join(run_strs)
 
     console.print("Creating image using Dockerfile contents:", style="cyan bold")
-    console.print(f"{docker_file_str}", style="magenta")
+    console.print(f"{docker_file}", style="magenta")
 
     client = docker.from_env()
     client.images.build(
-        fileobj=io.BytesIO(docker_file_str.encode()),
+        fileobj=io.BytesIO(docker_file.encode()),
         tag=f"{image._image_name}:{image._tag}",
         rm=True,
     )

{indexify-0.2 → indexify-0.2.2}/indexify/client.py

@@ -9,10 +9,10 @@ from .settings import DEFAULT_SERVICE_URL
 def create_client(
     service_url: str = DEFAULT_SERVICE_URL,
     config_path: Optional[str] = None,
-    local: bool = False,
+    in_process: bool = False,
     *args,
     **kwargs,
 ) -> IndexifyClient:
-    if local:
+    if in_process:
         return LocalClient()
     return RemoteClient(config_path=config_path, service_url=service_url, **kwargs)

{indexify-0.2 → indexify-0.2.2}/indexify/executor/agent.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
 import ssl
-import traceback
 from concurrent.futures.process import BrokenProcessPool
 from typing import Dict, List, Optional
 
@@ -24,6 +23,7 @@ from .api_objects import ExecutorMetadata, Task
 from .downloader import DownloadedInputs, Downloader
 from .executor_tasks import DownloadGraphTask, DownloadInputTask, ExtractTask
 from .function_worker import FunctionWorker
+from .runtime_probes import ProbeInfo, RuntimeProbes
 from .task_reporter import TaskReporter
 from .task_store import CompletedTask, TaskStore
 
@@ -98,6 +98,7 @@ class ExtractorAgent:
         self._task_reporter = TaskReporter(
             base_url=self._base_url, executor_id=self._executor_id
         )
+        self._probe = RuntimeProbes()
 
     async def task_completion_reporter(self):
         console.print(Text("Starting task completion reporter", style="bold cyan"))
@@ -305,11 +306,12 @@ class ExtractorAgent:
                 words = snake_str.split("_")
                 return words[0].capitalize() + "" + " ".join(words[1:])
 
+            runtime_probe: ProbeInfo = self._probe.probe()
             data = ExecutorMetadata(
                 id=self._executor_id,
-                address="",
-                runner_name="extractor",
-                labels={},
+                addr="",
+                image_name=runtime_probe.image_name,
+                labels=runtime_probe.labels,
             ).model_dump()
 
             panel_content = "\n".join(
@@ -318,7 +320,7 @@ class ExtractorAgent:
             console.print(
                 Panel(
                     panel_content,
-                    title="Attempting to Register Executor",
+                    title="attempting to Register Executor",
                     border_style="cyan",
                 )
             )
@@ -333,7 +335,7 @@ class ExtractorAgent:
                         headers={"Content-Type": "application/json"},
                     ) as event_source:
                         console.print(
-                            Text("Executor registered successfully", style="bold green")
+                            Text("executor registered successfully", style="bold green")
                         )
                         async for sse in event_source.aiter_sse():
                             data = json.loads(sse.data)
@@ -345,14 +347,14 @@ class ExtractorAgent:
                             self._task_store.add_tasks(tasks)
             except Exception as e:
                 console.print(
-                    Text("Registration Error: ", style="red bold")
-                    + Text(f"Failed to register: {e}", style="red")
+                    Text("registration Error: ", style="red bold")
+                    + Text(f"failed to register: {e}", style="red")
                 )
                 await asyncio.sleep(5)
                 continue
 
     async def _shutdown(self, loop):
-        console.print(Text("Shutting down agent...", style="bold yellow"))
+        console.print(Text("shutting down agent...", style="bold yellow"))
         self._should_run = False
         for task in asyncio.all_tasks(loop):
             task.cancel()

{indexify-0.2 → indexify-0.2.2}/indexify/executor/api_objects.py

@@ -18,8 +18,8 @@ class Task(BaseModel):
 
 class ExecutorMetadata(BaseModel):
     id: str
-    address: str
-    runner_name: str
+    addr: str
+    image_name: str
     labels: Dict[str, Any]
 
 

indexify-0.2.2/indexify/executor/runtime_probes.py

@@ -0,0 +1,48 @@
+import os
+import platform
+import sys
+from typing import Any, Dict, Tuple
+
+from pydantic import BaseModel
+
+
+class ProbeInfo(BaseModel):
+    image_name: str
+    python_major_version: int
+    labels: Dict[str, Any] = {}
+
+
+class RuntimeProbes:
+    def __init__(self) -> None:
+        self._image_name = self._read_image_name()
+        self._os_name = platform.system()
+        self._architecture = platform.machine()
+        (
+            self._python_version_major,
+            self._python_version_minor,
+        ) = self._get_python_version()
+
+    def _read_image_name(self) -> str:
+        file_path = os.path.expanduser("~/.indexify/image_name")
+        if os.path.exists(file_path):
+            with open(file_path, "r") as file:
+                return file.read().strip()
+        return "indexify-executor-default"
+
+    def _get_python_version(self) -> Tuple[int, int]:
+        version_info = sys.version_info
+        return version_info.major, version_info.minor
+
+    def probe(self) -> ProbeInfo:
+        labels = {
+            "os": self._os_name,
+            "image_name": self._image_name,
+            "architecture": self._architecture,
+            "python_major_version": self._python_version_major,
+            "python_minor_version": self._python_version_minor,
+        }
+        return ProbeInfo(
+            image_name=self._image_name,
+            python_major_version=self._python_version_major,
+            labels=labels,
+        )

{indexify-0.2 → indexify-0.2.2}/indexify/functions_sdk/graph.py

@@ -66,6 +66,7 @@ class FunctionMetadata(BaseModel):
     fn_name: str
     description: str
     reducer: bool = False
+    image_name: str
     payload_encoder: str = "cloudpickle"
 
 
@@ -74,6 +75,7 @@ class RouterMetadata(BaseModel):
     description: str
     source_fn: str
     target_fns: List[str]
+    image_name: str
     payload_encoder: str = "cloudpickle"
 
 
@@ -244,6 +246,7 @@ class Graph:
             fn_name=start_node.fn_name,
             description=start_node.description,
             reducer=start_node.accumulate is not None,
+            image_name=start_node.image._image_name,
         )
         metadata_edges = self.edges.copy()
         metadata_nodes = {}
@@ -256,6 +259,7 @@ class Graph:
                         source_fn=node_name,
                         target_fns=self.routers[node_name],
                         payload_encoder=node.payload_encoder,
+                        image_name=node.image._image_name,
                     )
                 )
             else:
@@ -265,6 +269,7 @@ class Graph:
                         fn_name=node.fn_name,
                         description=node.description,
                         reducer=node.accumulate is not None,
+                        image_name=node.image._image_name,
                     )
                 )
         return ComputeGraphMetadata(

{indexify-0.2 → indexify-0.2.2}/indexify/functions_sdk/graph_validation.py

@@ -42,28 +42,25 @@ def validate_route(
 
     if signature.return_annotation == inspect.Signature.empty:
         raise Exception(f"Function {from_node.name} has empty return type annotation")
+    
+    return_annotation = signature.return_annotation
 
-    # We lose the exact type string when the object is created
-    source = inspect.getsource(from_node.run)
+    if hasattr(return_annotation, '__origin__') and return_annotation.__origin__ is Union:
+        for arg in return_annotation.__args__:
+            if hasattr(arg, 'name'):
+                if arg not in to_nodes:
+                    raise Exception(
+                        f"Unable to find {arg.name} in to_nodes {[node.name for node in to_nodes]}"
+                    )
 
-    union_pattern = r"Union\[((?:\w+(?:,\s*)?)+)\]"
-    union_match = re.search(union_pattern, source)
-
-    src_route_nodes = None
-    if union_match:
-        # nodes = re.findall(r'\w+', match.group(1))
-        src_route_nodes = [node.strip() for node in union_match.group(1).split(",")]
-        if len(src_route_nodes) <= 1:
-            raise Exception(f"Invalid router for {from_node.name}, lte 1 route.")
+    if hasattr(return_annotation, '__origin__') and return_annotation.__origin__ is list:
+        union_args = return_annotation.__args__[0].__args__
+        for arg in union_args:
+            if hasattr(arg, 'name'):
+                if arg not in to_nodes:
+                    raise Exception(
+                        f"Unable to find {arg.name} in to_nodes {[node.name for node in to_nodes]}"
+                    )
     else:
-        raise Exception(
-            f"Invalid router for {from_node.name}, cannot find output nodes"
-        )
+        raise Exception(f"Return type of {from_node.name} is not a Union")
 
-    to_node_names = [i.name for i in to_nodes]
-
-    for src_node in src_route_nodes:
-        if src_node not in to_node_names:
-            raise Exception(
-                f"Unable to find {src_node} in to_nodes " f"{to_node_names}"
-            )

{indexify-0.2 → indexify-0.2.2}/indexify/functions_sdk/image.py

@@ -7,9 +7,8 @@ class Image:
         self._base_image = None
 
         self._run_strs = []
-        pass
 
-    def image_name(self, image_name):
+    def name(self, image_name):
         self._image_name = image_name
         return self
 
@@ -24,3 +23,12 @@ class Image:
     def run(self, run_str):
         self._run_strs.append(run_str)
         return self
+
+
+DEFAULT_IMAGE = (
+    Image()
+    .name("indexify-executor-default")
+    .base_image("python:3.10.15-slim-bookworm")
+    .tag("latest")
+    .run("pip install indexify")
+)

{indexify-0.2 → indexify-0.2.2}/indexify/functions_sdk/indexify_functions.py

@@ -16,7 +16,7 @@ from pydantic import BaseModel
 from typing_extensions import get_type_hints
 
 from .data_objects import IndexifyData, RouterOutput
-from .image import Image
+from .image import DEFAULT_IMAGE, Image
 
 
 class EmbeddingIndexes(BaseModel):
@@ -34,8 +34,8 @@ class PlacementConstraints(BaseModel):
 
 class IndexifyFunction(ABC):
     name: str = ""
-    base_image: Optional[str] = None
     description: str = ""
+    image: Optional[Image] = DEFAULT_IMAGE
     placement_constraints: List[PlacementConstraints] = []
     accumulate: Optional[Type[Any]] = None
     payload_encoder: Optional[str] = "cloudpickle"
@@ -53,7 +53,7 @@ class IndexifyFunction(ABC):
 class IndexifyRouter(ABC):
     name: str = ""
     description: str = ""
-    image: Image = None
+    image: Optional[Image] = DEFAULT_IMAGE
     placement_constraints: List[PlacementConstraints] = []
     payload_encoder: Optional[str] = "cloudpickle"
 
@@ -65,9 +65,9 @@ class IndexifyRouter(ABC):
 def indexify_router(
     name: Optional[str] = None,
     description: Optional[str] = "",
-    image: Image = None,
+    image: Optional[Image] = DEFAULT_IMAGE,
     placement_constraints: List[PlacementConstraints] = [],
-    output_encoder: Optional[str] = "cloudpickle",
+    payload_encoder: Optional[str] = "cloudpickle",
 ):
     def construct(fn):
         args = locals().copy()
@@ -90,7 +90,7 @@ def indexify_router(
                 setattr(IndexifyRo, key, value)
 
         IndexifyRo.image = image
-        IndexifyRo.payload_encoder = output_encoder
+        IndexifyRo.payload_encoder = payload_encoder
         return IndexifyRo
 
     return construct
@@ -99,11 +99,9 @@ def indexify_router(
 def indexify_function(
     name: Optional[str] = None,
     description: Optional[str] = "",
-    image: Image = None,
+    image: Optional[Image] = DEFAULT_IMAGE,
     accumulate: Optional[Type[BaseModel]] = None,
-    min_batch_size: Optional[int] = None,
-    max_batch_size: Optional[int] = None,
-    output_encoder: Optional[str] = "cloudpickle",
+    payload_encoder: Optional[str] = "cloudpickle",
     placement_constraints: List[PlacementConstraints] = [],
 ):
     def construct(fn):
@@ -128,9 +126,7 @@ def indexify_function(
 
         IndexifyFn.image = image
         IndexifyFn.accumulate = accumulate
-        IndexifyFn.min_batch_size = min_batch_size
-        IndexifyFn.max_batch_size = max_batch_size
-        IndexifyFn.payload_encoder = output_encoder
+        IndexifyFn.payload_encoder = payload_encoder
         return IndexifyFn
 
     return construct

{indexify-0.2 → indexify-0.2.2}/indexify/functions_sdk/object_serializer.py

@@ -48,7 +48,6 @@ class MsgPackSerializer:
     @staticmethod
     def deserialize(data: bytes) -> IndexifyData:
         cached_output = msgpack.unpackb(data)
-        print(cached_output)
         return IndexifyData(**cached_output)
 
     @staticmethod

{indexify-0.2 → indexify-0.2.2}/indexify/local_client.py

@@ -49,7 +49,7 @@ class LocalClient(IndexifyClient):
             serializer = get_serializer(
                 g.get_function(k).indexify_function.payload_encoder
             )
-            self._accumulators[k] = IndexifyData(payload=serializer.deserialize(v))
+            self._accumulators[k] = IndexifyData(payload=serializer.serialize(v))
         self._results[input.id] = outputs
         self._run(g, input, outputs)
         return input.id

{indexify-0.2 → indexify-0.2.2}/pyproject.toml

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