lmnr 0.2.6__py3-none-any.whl → 0.2.7__py3-none-any.whl

lmnr/cli/parser/nodes/code.py

@@ -0,0 +1,27 @@
+from dataclasses import dataclass
+import uuid
+
+from lmnr.cli.parser.nodes import Handle, NodeFunctions
+from lmnr.cli.parser.utils import map_handles
+
+
+@dataclass
+class CodeNode(NodeFunctions):
+    id: uuid.UUID
+    name: str
+    inputs: list[Handle]
+    outputs: list[Handle]
+    inputs_mappings: dict[uuid.UUID, uuid.UUID]
+
+    def handles_mapping(
+        self, output_handle_id_to_node_name: dict[str, str]
+    ) -> list[tuple[str, str]]:
+        return map_handles(
+            self.inputs, self.inputs_mappings, output_handle_id_to_node_name
+        )
+
+    def node_type(self) -> str:
+        return "Code"
+
+    def config(self) -> dict:
+        return {}

lmnr/cli/parser/nodes/condition.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass
+import uuid
+
+from lmnr.cli.parser.nodes import Handle, NodeFunctions
+from lmnr.cli.parser.utils import map_handles
+
+
+@dataclass
+class ConditionNode(NodeFunctions):
+    id: uuid.UUID
+    name: str
+    inputs: list[Handle]
+    outputs: list[Handle]
+    inputs_mappings: dict[uuid.UUID, uuid.UUID]
+    condition: str
+
+    def handles_mapping(
+        self, output_handle_id_to_node_name: dict[str, str]
+    ) -> list[tuple[str, str]]:
+        return map_handles(
+            self.inputs, self.inputs_mappings, output_handle_id_to_node_name
+        )
+
+    def node_type(self) -> str:
+        return "Condition"
+
+    def config(self) -> dict:
+        return {
+            "condition": self.condition,
+        }

lmnr/cli/parser/nodes/router.py

@@ -0,0 +1,37 @@
+from dataclasses import dataclass
+import uuid
+
+from lmnr.cli.parser.nodes import Handle, NodeFunctions
+from lmnr.cli.parser.utils import map_handles
+
+
+@dataclass
+class Route:
+    name: str
+
+
+@dataclass
+class RouterNode(NodeFunctions):
+    id: uuid.UUID
+    name: str
+    inputs: list[Handle]
+    outputs: list[Handle]
+    inputs_mappings: dict[uuid.UUID, uuid.UUID]
+    routes: list[Route]
+    has_default_route: bool
+
+    def handles_mapping(
+        self, output_handle_id_to_node_name: dict[str, str]
+    ) -> list[tuple[str, str]]:
+        return map_handles(
+            self.inputs, self.inputs_mappings, output_handle_id_to_node_name
+        )
+
+    def node_type(self) -> str:
+        return "Router"
+
+    def config(self) -> dict:
+        return {
+            "routes": str([route.name for route in self.routes]),
+            "has_default_route": str(self.has_default_route),
+        }

lmnr/cli/parser/nodes/types.py

@@ -2,9 +2,12 @@ from typing import Any, Union
 import uuid
 
 from lmnr.cli.parser.nodes import Handle
+from lmnr.cli.parser.nodes.code import CodeNode
+from lmnr.cli.parser.nodes.condition import ConditionNode
 from lmnr.cli.parser.nodes.input import InputNode
 from lmnr.cli.parser.nodes.llm import LLMNode
 from lmnr.cli.parser.nodes.output import OutputNode
+from lmnr.cli.parser.nodes.router import Route, RouterNode
 from lmnr.cli.parser.nodes.semantic_search import (
     SemanticSearchDatasource,
     SemanticSearchNode,
@@ -21,7 +24,15 @@ def node_input_from_json(json_val: Any) -> NodeInput:
         raise ValueError(f"Invalid NodeInput value: {json_val}")
 
 
-Node = Union[InputNode, OutputNode, LLMNode, SemanticSearchNode]
+Node = Union[
+    InputNode,
+    OutputNode,
+    ConditionNode,
+    LLMNode,
+    RouterNode,
+    SemanticSearchNode,
+    CodeNode,
+]
 
 
 def node_from_dict(node_dict: dict) -> Node:
@@ -44,6 +55,18 @@ def node_from_dict(node_dict: dict) -> Node:
                 for k, v in node_dict["inputsMappings"].items()
             },
         )
+    elif node_dict["type"] == "Condition":
+        return ConditionNode(
+            id=uuid.UUID(node_dict["id"]),
+            name=node_dict["name"],
+            inputs=[Handle.from_dict(handle) for handle in node_dict["inputs"]],
+            outputs=[Handle.from_dict(handle) for handle in node_dict["outputs"]],
+            inputs_mappings={
+                uuid.UUID(k): uuid.UUID(v)
+                for k, v in node_dict["inputsMappings"].items()
+            },
+            condition=node_dict["condition"],
+        )
     elif node_dict["type"] == "LLM":
         return LLMNode(
             id=uuid.UUID(node_dict["id"]),
@@ -69,6 +92,19 @@ def node_from_dict(node_dict: dict) -> Node:
             structured_output_schema=None,
             structured_output_schema_target=None,
         )
+    elif node_dict["type"] == "Router":
+        return RouterNode(
+            id=uuid.UUID(node_dict["id"]),
+            name=node_dict["name"],
+            inputs=[Handle.from_dict(handle) for handle in node_dict["inputs"]],
+            outputs=[Handle.from_dict(handle) for handle in node_dict["outputs"]],
+            inputs_mappings={
+                uuid.UUID(k): uuid.UUID(v)
+                for k, v in node_dict["inputsMappings"].items()
+            },
+            routes=[Route(name=route["name"]) for route in node_dict["routes"]],
+            has_default_route=node_dict["hasDefaultRoute"],
+        )
     elif node_dict["type"] == "SemanticSearch":
         return SemanticSearchNode(
             id=uuid.UUID(node_dict["id"]),
@@ -87,5 +123,16 @@ def node_from_dict(node_dict: dict) -> Node:
                 for ds in node_dict["datasources"]
             ],
         )
+    elif node_dict["type"] == "Code":
+        return CodeNode(
+            id=uuid.UUID(node_dict["id"]),
+            name=node_dict["name"],
+            inputs=[Handle.from_dict(handle) for handle in node_dict["inputs"]],
+            outputs=[Handle.from_dict(handle) for handle in node_dict["outputs"]],
+            inputs_mappings={
+                uuid.UUID(k): uuid.UUID(v)
+                for k, v in node_dict["inputsMappings"].items()
+            },
+        )
     else:
         raise ValueError(f"Node type {node_dict['type']} not supported")

lmnr/cli/parser/parser.py

@@ -17,6 +17,9 @@ def runnable_graph_to_template_vars(graph: dict) -> dict:
         node = node_from_dict(node_obj)
         handles_mapping = node.handles_mapping(output_handle_id_to_node_name)
         node_type = node.node_type()
+
+        unique_handles = set([handle_name for (handle_name, _) in handles_mapping])
+
         tasks.append(
             {
                 "name": node.name,
@@ -28,10 +31,7 @@ def runnable_graph_to_template_vars(graph: dict) -> dict:
                     handle_name for (handle_name, _) in handles_mapping
                 ],
                 "handle_args": ", ".join(
-                    [
-                        f"{handle_name}: NodeInput"
-                        for (handle_name, _) in handles_mapping
-                    ]
+                    [f"{handle_name}: NodeInput" for handle_name in unique_handles]
                 ),
                 "prev": [],
                 "next": [],

lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/engine.py

@@ -170,13 +170,17 @@ class Engine:
                 active_tasks.remove(task_id)
 
             if depth > 0:
-                # propagate reset once we enter the loop
-                # TODO: Implement this for cycles
-                raise NotImplementedError()
+                self.propagate_reset(task_id, task_id, tasks)
 
+            # terminate graph on recursion depth exceeding 10
             if depth == 10:
-                # TODO: Implement this for cycles
-                raise NotImplementedError()
+                logging.error("Max recursion depth exceeded, terminating graph")
+                error = Message(
+                    id=uuid.uuid4(),
+                    value="Max recursion depth exceeded",
+                    start_time=start_time,
+                    end_time=datetime.datetime.now(),
+                )
 
             if not next:
                 # if there are no next tasks, we can terminate the graph
@@ -260,3 +264,30 @@ class Engine:
             task,
             queue,
         )
+
+    def propagate_reset(
+        self, current_task_name: str, start_task_name: str, tasks: dict[str, Task]
+    ) -> None:
+        task = tasks[current_task_name]
+
+        for next_task_name in task.next:
+            if next_task_name == start_task_name:
+                return
+
+            next_task = tasks[next_task_name]
+
+            # in majority of cases there will be only one handle name
+            # however we need to handle the case when single output is mapped
+            # to multiple inputs on the next node
+            handle_names = []
+            for k, v in next_task.handles_mapping:
+                if v == task.name:
+                    handle_names.append(k)
+
+            for handle_name in handle_names:
+                next_state = next_task.input_states[handle_name]
+
+                if next_state.get_state().is_success():
+                    next_state.set_state(State.empty())
+                    next_state.semaphore.release()
+                    self.propagate_reset(next_task_name, start_task_name, tasks)

lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/nodes/functions.py

@@ -1,6 +1,7 @@
 import requests
 import json
 
+from lmnr.types import ConditionedValue
 from lmnr_engine.engine.action import NodeRunError, RunOutput
 from lmnr_engine.types import ChatMessage, NodeInput
 
@@ -24,8 +25,8 @@ def {{task.function_name}}({{ task.handle_args }}, _env: dict[str, str]) -> RunO
     rendered_prompt = """{{task.config.prompt}}"""
     {% set prompt_variables = task.input_handle_names|reject("equalto", "chat_messages") %}
     {% for prompt_variable in prompt_variables %}
-    # TODO: Fix this. Using double curly braces in quotes because normal double curly braces
-    # get replaced during rendering by Cookiecutter. This is a hacky solution.
+    {# TODO: Fix this. Using double curly braces in quotes because normal double curly braces
+    # get replaced during rendering by Cookiecutter. This is a hacky solution.#}
     rendered_prompt = rendered_prompt.replace("{{'{{'}}{{prompt_variable}}{{'}}'}}", {{prompt_variable}})  # type: ignore
     {% endfor %}
 
@@ -68,7 +69,8 @@ def {{task.function_name}}({{ task.handle_args }}, _env: dict[str, str]) -> RunO
     completion_message = chat_completion["choices"][0]["message"]["content"]
 
     meta_log = {}
-    meta_log["node_chunk_id"] = None  # TODO: Add node chunk id
+    {# TODO: Add node chunk id #}
+    meta_log["node_chunk_id"] = None
     meta_log["model"] = "{{task.config.model}}"
     meta_log["prompt"] = rendered_prompt
     meta_log["input_message_count"] = len(messages)
@@ -77,7 +79,8 @@ def {{task.function_name}}({{ task.handle_args }}, _env: dict[str, str]) -> RunO
     meta_log["total_token_count"] = (
         chat_completion["usage"]["prompt_tokens"] + chat_completion["usage"]["completion_tokens"]
     )
-    meta_log["approximate_cost"] = None  # TODO: Add approximate cost
+    {# TODO: Add approximate cost #}
+    meta_log["approximate_cost"] = None
     {% elif task.config.provider == "anthropic" %}
     data = {
         "model": "{{task.config.model}}",
@@ -85,7 +88,7 @@ def {{task.function_name}}({{ task.handle_args }}, _env: dict[str, str]) -> RunO
     }
     data.update(params)
 
-    # TODO: Generate appropriate code based on this if-else block
+    {# TODO: Generate appropriate code based on this if-else block #}
     if len(messages) == 1 and messages[0].role == "system":
         messages[0].role = "user"
         message_jsons = [
@@ -116,7 +119,8 @@ def {{task.function_name}}({{ task.handle_args }}, _env: dict[str, str]) -> RunO
     completion_message = chat_completion["content"][0]["text"]
 
     meta_log = {}
-    meta_log["node_chunk_id"] = None  # TODO: Add node chunk id
+    {# TODO: Add node chunk id#}
+    meta_log["node_chunk_id"] = None
     meta_log["model"] = "{{task.config.model}}"
     meta_log["prompt"] = rendered_prompt
     meta_log["input_message_count"] = len(messages)
@@ -125,7 +129,8 @@ def {{task.function_name}}({{ task.handle_args }}, _env: dict[str, str]) -> RunO
     meta_log["total_token_count"] = (
         chat_completion["usage"]["input_tokens"] + chat_completion["usage"]["output_tokens"]
     )
-    meta_log["approximate_cost"] = None  # TODO: Add approximate cost
+    {# TODO: Add approximate cost#}
+    meta_log["approximate_cost"] = None
     {% else %}
     {% endif %}
 
@@ -150,7 +155,7 @@ def {{task.function_name}}(query: NodeInput, _env: dict[str, str]) -> RunOutput:
     }
     query_res = requests.post("https://api.lmnr.ai/v2/semantic-search", headers=headers, json=data)
     if query_res.status_code != 200:
-        raise NodeRunError(f"Vector search request failed: {query_res.text}")
+        raise NodeRunError(f"Vector search request failed:{query_res.status_code}\n{query_res.text}")
 
     results = query_res.json()
 
@@ -168,6 +173,37 @@ def {{task.function_name}}(query: NodeInput, _env: dict[str, str]) -> RunOutput:
     return RunOutput(status="Success", output=output)
 
 
+{% elif task.node_type == "Router" %}
+def {{task.function_name}}(condition: NodeInput, input: NodeInput, _env: dict[str, str]) -> RunOutput:
+    routes = {{ task.config.routes }}
+    has_default_route = {{ task.config.has_default_route }}
+
+    for route in routes:
+        if route == condition:
+            return RunOutput(status="Success", output=ConditionedValue(condition=route, value=input))
+        
+    if has_default_route:
+        return RunOutput(status="Success", output=ConditionedValue(condition=routes[-1], value=input))
+
+    raise NodeRunError(f"No route found for condition {condition}")
+
+
+{% elif task.node_type == "Condition" %}
+def {{task.function_name}}(input: NodeInput, _env: dict[str, str]) -> RunOutput:
+    condition = "{{task.config.condition}}"
+
+    if input.condition == condition:
+        return RunOutput(status="Success", output=input.value)
+    else:
+        return RunOutput(status="Termination", output=None)
+
+
+{% elif task.node_type == "Code" %}
+def {{task.function_name}}({{ task.handle_args }}, _env: dict[str, str]) -> RunOutput:
+    # Implement any functionality you want here
+    raise NodeRunError("Implement your code here")
+
+
 {% elif task.node_type == "Output" %}
 def {{task.function_name}}(output: NodeInput, _env: dict[str, str]) -> RunOutput:
     return RunOutput(status="Success", output=output)

lmnr/types.py

@@ -9,7 +9,12 @@ class ChatMessage(pydantic.BaseModel):
     content: str
 
 
-NodeInput = Union[str, list[ChatMessage]]  # TypeAlias
+class ConditionedValue(pydantic.BaseModel):
+    condition: str
+    value: "NodeInput"
+
+
+NodeInput = Union[str, list[ChatMessage], ConditionedValue]  # TypeAlias
 
 
 class EndpointRunRequest(pydantic.BaseModel):
@@ -51,7 +56,7 @@ class SDKError(Exception):
         super().__init__(error_message)
 
 
-class ToolCallRequest(pydantic.BaseModel):
+class ToolCallFunction(pydantic.BaseModel):
     name: str
     arguments: str
 
@@ -59,7 +64,7 @@ class ToolCallRequest(pydantic.BaseModel):
 class ToolCall(pydantic.BaseModel):
     id: Optional[str]
     type: Optional[str]
-    function: ToolCallRequest
+    function: ToolCallFunction
 
 
 # TODO: allow snake_case and manually convert to camelCase

{lmnr-0.2.6.dist-info → lmnr-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lmnr
-Version: 0.2.6
+Version: 0.2.7
 Summary: Python SDK for Laminar AI
 License: Apache-2.0
 Author: lmnr.ai
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 
 # Laminar AI
 
-This reipo provides core for code generation, Laminar CLI, and Laminar SDK.
+This repo provides core for code generation, Laminar CLI, and Laminar SDK.
 
 ## Quickstart
 ```sh

{lmnr-0.2.6.dist-info → lmnr-0.2.7.dist-info}/RECORD

@@ -5,28 +5,31 @@ lmnr/cli/cli.py,sha256=pzr5LUILi7TcaJIkC-CzmT7RG7-HWApQmUpgK9bc7mI,2847
 lmnr/cli/cookiecutter.json,sha256=PeiMMzCPzDhsapqYoAceYGPI5lOUNimvFzh5KeQv5QE,359
 lmnr/cli/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/cli/parser/nodes/__init__.py,sha256=BNbbfn0WwbFDA6TNhLOaT_Ji69rCL5voUibqMD7Knng,1163
+lmnr/cli/parser/nodes/code.py,sha256=GXqOxN6tdiStZGWLbN3WZCmDfzwYIgSRmZ5t72AOIXc,661
+lmnr/cli/parser/nodes/condition.py,sha256=AJny0ILXbSy1hTwsRvZvDUqts9INNx63yQSkD7Dp7KU,740
 lmnr/cli/parser/nodes/input.py,sha256=Xwktcih7Mezqv4cEejfPkpG8uJxDsbqRytBvKmlJDYE,578
 lmnr/cli/parser/nodes/llm.py,sha256=iQWYFnQi5PcQD9WJpTSHbSzClM6s0wBOoEqyN5c4yQo,1674
 lmnr/cli/parser/nodes/output.py,sha256=1XBppSscxM01kfZhE9oOh2GgdCVzyPVe2RAxLI5HmUc,665
+lmnr/cli/parser/nodes/router.py,sha256=dmCx4ho8_GdFJXQa8UevMf_uEP7AKBv_MJ2zpLC6Vck,894
 lmnr/cli/parser/nodes/semantic_search.py,sha256=o_XCR7BShAq8VGeKjPTwL6MxLdB07XHSd5CE71sFFiY,2105
-lmnr/cli/parser/nodes/types.py,sha256=c7jNaR7YlZUkxB9OosAkFH4o6ZPga0Bec1WtOxq9fGs,3505
-lmnr/cli/parser/parser.py,sha256=UtuupKj2Dh-47HVcYU4PI2s4Erh1gTjKiuGCcc-nkbM,2163
+lmnr/cli/parser/nodes/types.py,sha256=NRhlgI3WGd86AToo-tU974DEZzbLaH4iDdP-hEEQiIo,5343
+lmnr/cli/parser/parser.py,sha256=kAZEeg358lyj_Q1IIhQB_bA7LW3Aw6RduShIfUSmLqQ,2173
 lmnr/cli/parser/utils.py,sha256=wVaqHVOR9VXl8Og9nkVyCVgHIcgbtYGkDOEGPtmjZ8g,715
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/__init__.py,sha256=pLVZqvDnNf9foGR-HXnX2F7WC2TWmyCTNcUctG8SXAI,27
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/action.py,sha256=mZMQwwPV5LtSfwdwQ7HefI3ttvwuokp4mhVI_Xn1Zck,274
-lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/engine.py,sha256=TKmgfXbs_BiuMpzHuPuSfq1mX3UEnQFnpKgU2NsYkB4,8397
+lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/engine.py,sha256=kCY6J7oQpm3f9YCYY2ZBzM_9bUv_XYTCRD_uFa6PLWQ,9640
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/state.py,sha256=wTx7jAv7b63-8k34cYfQp_DJxhCCOYT_qRHkmnZfnc0,1686
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/task.py,sha256=ware5VIrZvluHH3mpH6h7G0YDk5L0buSQ7s09za4Fro,1200
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/__init__.py,sha256=bsfbNUBYtKv37qzc_GLhSAzBam2lnowP_dlr8pubhcg,80
-lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/nodes/functions.py,sha256=HwK6gKngZi1AhEyu9BVtE5IfD4NScRCdFLXV8uiBD34,6578
+lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/nodes/functions.py,sha256=Bwu8p7m16NAyt9wC0DTQL0MrHbM44WylLs5wTLwSxBM,7845
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/{{cookiecutter.pipeline_dir_name}}.py,sha256=WG-ZMofPpGXCx5jdWVry3_XBzcKjqn8ZycFSiWEOBPg,2858
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/types.py,sha256=iWuflMV7TiaBPs6-B-BlrovvWpZgHGGHK0v8rSqER7A,997
 lmnr/sdk/endpoint.py,sha256=0HjcxMUcJz-klFZO2f5xtTaoLjcaEb8vrJ_YldTWUc8,7467
 lmnr/sdk/remote_debugger.py,sha256=vCpMz7y3uboOi81qEwr8z3fhQ2H1y2YtJAxXVtb6uCA,5141
-lmnr/types.py,sha256=IcoKNL1KJ-GIeunrt5fYuB_XhsBrtYZ9d1ShFJqrsUc,2004
-lmnr-0.2.6.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
-lmnr-0.2.6.dist-info/METADATA,sha256=wipVETWwLYjuhdrOpkgUA7iE-kpj5lGph4X7zE0tLvQ,5428
-lmnr-0.2.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lmnr-0.2.6.dist-info/entry_points.txt,sha256=Qg7ZRax4k-rcQsZ26XRYQ8YFSBiyY2PNxYfq4a6PYXI,41
-lmnr-0.2.6.dist-info/RECORD,,
+lmnr/types.py,sha256=OR9xRAQ5uTTwpJTDL_e3jZqxYJWvyX96CCoxr3oo94g,2112
+lmnr-0.2.7.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
+lmnr-0.2.7.dist-info/METADATA,sha256=Ya1KVPAiyGxAZybuXSum8wmy4l-SnyYvaTTrvQ7uZRU,5427
+lmnr-0.2.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lmnr-0.2.7.dist-info/entry_points.txt,sha256=Qg7ZRax4k-rcQsZ26XRYQ8YFSBiyY2PNxYfq4a6PYXI,41
+lmnr-0.2.7.dist-info/RECORD,,