vellum-ai 0.14.43__tar.gz → 0.14.44__tar.gz

{vellum_ai-0.14.43 → vellum_ai-0.14.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vellum-ai
-Version: 0.14.43
+Version: 0.14.44
 Summary: 
 License: MIT
 Requires-Python: >=3.9,<4.0

{vellum_ai-0.14.43 → vellum_ai-0.14.44}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vellum-ai"
-version = "0.14.43"
+version = "0.14.44"
 description = ""
 readme = "README.md"
 authors = []

{vellum_ai-0.14.43 → vellum_ai-0.14.44}/src/vellum/client/core/client_wrapper.py

@@ -18,7 +18,7 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "vellum-ai",
-            "X-Fern-SDK-Version": "0.14.43",
+            "X-Fern-SDK-Version": "0.14.44",
         }
         headers["X-API-KEY"] = self.api_key
         return headers

{vellum_ai-0.14.43 → vellum_ai-0.14.44}/src/vellum/workflows/ports/node_ports.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, Iterator, Optional, Set, Tuple, Type
 
 from vellum.workflows.outputs.base import BaseOutput, BaseOutputs
 from vellum.workflows.ports.port import Port
-from vellum.workflows.ports.utils import validate_ports
+from vellum.workflows.ports.utils import get_port_groups, validate_ports
 from vellum.workflows.state.base import BaseState
 from vellum.workflows.types.core import ConditionType
 
@@ -54,7 +54,8 @@ class NodePorts(metaclass=_NodePortsMeta):
                 resolved_condition = port.resolve_condition(state)
                 if resolved_condition:
                     invoked_ports.add(port)
-                    break
+                    if len(get_port_groups(all_ports)) <= 1:
+                        break
 
             elif port._condition_type == ConditionType.ELSE and not invoked_ports:
                 invoked_ports.add(port)

vellum_ai-0.14.44/src/vellum/workflows/ports/utils.py

@@ -0,0 +1,73 @@
+from collections import Counter
+from typing import List
+
+from vellum.workflows.ports.port import Port
+from vellum.workflows.types.core import ConditionType
+
+PORT_TYPE_PRIORITIES = {
+    ConditionType.IF: 1,
+    ConditionType.ELIF: 2,
+    ConditionType.ELSE: 3,
+}
+
+
+def get_port_groups(ports: List[Port]) -> List[List[ConditionType]]:
+    # We don't want to validate ports with no condition (default ports)
+    port_types = [port._condition_type for port in ports if port._condition_type is not None]
+
+    ports_class = f"{ports[0].node_class}.Ports"
+
+    # Check all ports by port groups
+    port_groups: List[List[ConditionType]] = []
+    current_port_group: List[ConditionType] = []
+
+    for port_type in port_types:
+        # Start a new group only if we see an IF
+        if port_type == ConditionType.IF:
+            # Only append the current group if it's not empty and starts with an IF
+            if current_port_group and current_port_group[0] == ConditionType.IF:
+                port_groups.append(current_port_group)
+            current_port_group = [port_type]
+        else:
+            # If we see an ELIF or ELSE without a preceding IF, that's an error
+            if not current_port_group:
+                raise ValueError(f"Class {ports_class} must have ports in the following order: on_if, on_elif, on_else")
+            current_port_group.append(port_type)
+
+    if current_port_group and current_port_group[0] == ConditionType.IF:
+        port_groups.append(current_port_group)
+    elif current_port_group:
+        # If the last group doesn't start with IF, that's an error
+        raise ValueError(f"Class {ports_class} must have ports in the following order: on_if, on_elif, on_else")
+
+    return port_groups
+
+
+def validate_ports(ports: List[Port]) -> bool:
+    ports_class = f"{ports[0].node_class}.Ports"
+    port_groups = get_port_groups(ports)
+    # Validate each port group
+    for group in port_groups:
+        # Check that each port group is in the correct order
+        sorted_group = sorted(group, key=lambda port_type: PORT_TYPE_PRIORITIES[port_type])
+        if sorted_group != group:
+            raise ValueError(f"Class {ports_class} must have ports in the following order: on_if, on_elif, on_else")
+
+        # Count the types in this port group
+        counter = Counter(group)
+        number_of_if_ports = counter[ConditionType.IF]
+        number_of_elif_ports = counter[ConditionType.ELIF]
+        number_of_else_ports = counter[ConditionType.ELSE]
+
+        # Apply the rules to each port group
+        if number_of_if_ports != 1:
+            raise ValueError(f"Class {ports_class} must have exactly one on_if condition")
+
+        if number_of_elif_ports > 0 and number_of_if_ports != 1:
+            raise ValueError(f"Class {ports_class} containing on_elif ports must have exactly one on_if condition")
+
+        if number_of_else_ports > 1:
+            raise ValueError(f"Class {ports_class} must have at most one on_else condition")
+
+    enforce_single_invoked_conditional_port = len(port_groups) <= 1
+    return enforce_single_invoked_conditional_port

vellum_ai-0.14.43/src/vellum/workflows/ports/utils.py

@@ -1,40 +0,0 @@
-from collections import Counter
-from typing import List
-
-from vellum.workflows.ports.port import Port
-from vellum.workflows.types.core import ConditionType
-
-PORT_TYPE_PRIORITIES = {
-    ConditionType.IF: 1,
-    ConditionType.ELIF: 2,
-    ConditionType.ELSE: 3,
-}
-
-
-def validate_ports(ports: List[Port]) -> bool:
-    # We don't want to validate ports with no condition (default ports)
-    port_types = [port._condition_type for port in ports if port._condition_type is not None]
-    sorted_port_types = sorted(port_types, key=lambda port_type: PORT_TYPE_PRIORITIES[port_type])
-
-    if sorted_port_types != port_types:
-        raise ValueError("Port conditions must be in the following order: on_if, on_elif, on_else")
-
-    counter = Counter(port_types)
-    number_of_if_ports = counter[ConditionType.IF]
-    number_of_elif_ports = counter[ConditionType.ELIF]
-    number_of_else_ports = counter[ConditionType.ELSE]
-    ports_class = f"{ports[0].node_class}.Ports"
-
-    if number_of_if_ports == 0 and (number_of_elif_ports > 0 or number_of_else_ports > 0):
-        raise ValueError(
-            f"Class {ports_class} containing on_elif or on_else port conditions must have at least one on_if condition"
-        )
-
-    if number_of_elif_ports > 0 and number_of_if_ports != 1:
-        raise ValueError(f"Class {ports_class} containing on_elif ports must have exactly one on_if condition")
-
-    if number_of_else_ports > 1:
-        raise ValueError(f"Class {ports_class} must have at most one on_else port condition")
-
-    enforce_single_invoked_conditional_port = number_of_elif_ports > 0 or number_of_if_ports <= 1
-    return enforce_single_invoked_conditional_port