vellum-ai 0.14.43__py3-none-any.whl → 0.14.44__py3-none-any.whl

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/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/workflows/ports/utils.py

@@ -11,30 +11,63 @@ PORT_TYPE_PRIORITIES = {
 }
 
 
-def validate_ports(ports: List[Port]) -> bool:
+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]
-    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")
+    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")
 
-    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]
+    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]
 
-    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"
-        )
+        # 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_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")
+        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 = number_of_elif_ports > 0 or number_of_if_ports <= 1
+    enforce_single_invoked_conditional_port = len(port_groups) <= 1
     return enforce_single_invoked_conditional_port

{vellum_ai-0.14.43.dist-info → vellum_ai-0.14.44.dist-info}/METADATA

@@ -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.dist-info → vellum_ai-0.14.44.dist-info}/RECORD

@@ -130,7 +130,7 @@ vellum/client/README.md,sha256=JkCJjmMZl4jrPj46pkmL9dpK4gSzQQmP5I7z4aME4LY,4749
 vellum/client/__init__.py,sha256=Z-JHK2jGxhtTtmkLeOaUGGJWIUNYGNVBLvUewC6lp6w,118148
 vellum/client/core/__init__.py,sha256=SQ85PF84B9MuKnBwHNHWemSGuy-g_515gFYNFhvEE0I,1438
 vellum/client/core/api_error.py,sha256=RE8LELok2QCjABadECTvtDp7qejA1VmINCh6TbqPwSE,426
-vellum/client/core/client_wrapper.py,sha256=gOQ_e1s2iQI79ioggNAaNo71Ue9CGaAkWTvlVyZxaMI,1869
+vellum/client/core/client_wrapper.py,sha256=cnTC1fgCzqUC_BZ21rLn2Wi6ACUHsyWmxx9o2etyN28,1869
 vellum/client/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 vellum/client/core/file.py,sha256=X9IbmkZmB2bB_DpmZAO3crWdXagOakAyn6UCOCImCPg,2322
 vellum/client/core/http_client.py,sha256=R0pQpCppnEtxccGvXl4uJ76s7ro_65Fo_erlNNLp_AI,19228
@@ -1642,9 +1642,9 @@ vellum/workflows/nodes/utils.py,sha256=ziHJc5uU4foxIvacl0Vg7fEJJ0jiznqqhyvURVj0F
 vellum/workflows/outputs/__init__.py,sha256=AyZ4pRh_ACQIGvkf0byJO46EDnSix1ZCAXfvh-ms1QE,94
 vellum/workflows/outputs/base.py,sha256=1OGHqBJVk7i8cW8uewFWOhIjuMlRRpzCDrGE30ZwDjw,8763
 vellum/workflows/ports/__init__.py,sha256=bZuMt-R7z5bKwpu4uPW7LlJeePOQWmCcDSXe5frUY5g,101
-vellum/workflows/ports/node_ports.py,sha256=g4A-8iUAvEJSkaWppbvzAR8XU02R9U-qLN4rP2Kq4Aw,2743
+vellum/workflows/ports/node_ports.py,sha256=2Uo9gwNVCuH86J-GXcpc95QSDh5I-XVvhHJCMSWe-S8,2825
 vellum/workflows/ports/port.py,sha256=eI2SOZPZ5rsC3jMsxW6Rbn0NpaYQsrR7AapiIbbiy8Q,3635
-vellum/workflows/ports/utils.py,sha256=pEjVNJKw9LhD_cFN-o0MWBOW2ejno7jv26qqzjLxwS4,1662
+vellum/workflows/ports/utils.py,sha256=cWJ9xX1KrHBTiU3xe6t7Rs0yaOy9RV18GMtHaAshAsc,3094
 vellum/workflows/references/__init__.py,sha256=glHFC1VfXmcbNvH5VzFbkT03d8_D7MMcvEcsUBrzLIs,591
 vellum/workflows/references/constant.py,sha256=6yUT4q1sMj1hkI_tzzQ9AYcmeeDYFUNCqUq_W2DN0S8,540
 vellum/workflows/references/environment_variable.py,sha256=-gfOcdYwVp9ztSUYz6h2WI2Cg95zqxq5hhFf3Yr7aQg,791
@@ -1698,8 +1698,8 @@ vellum/workflows/workflows/event_filters.py,sha256=GSxIgwrX26a1Smfd-6yss2abGCnad
 vellum/workflows/workflows/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/workflows/tests/test_base_workflow.py,sha256=8P5YIsNMO78_CR1NNK6wkEdkMB4b3Q_Ni1qxh78OnHo,20481
 vellum/workflows/workflows/tests/test_context.py,sha256=VJBUcyWVtMa_lE5KxdhgMu0WYNYnUQUDvTF7qm89hJ0,2333
-vellum_ai-0.14.43.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
-vellum_ai-0.14.43.dist-info/METADATA,sha256=_cI_OM2v1FvIfRXuOWWaVpZdA0DFUSezO_ENVULlBbI,5484
-vellum_ai-0.14.43.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_ai-0.14.43.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
-vellum_ai-0.14.43.dist-info/RECORD,,
+vellum_ai-0.14.44.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
+vellum_ai-0.14.44.dist-info/METADATA,sha256=m4i-IppU7qrX6bueYqy1ma0QUBht58aQCd-FP7Lekxc,5484
+vellum_ai-0.14.44.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_ai-0.14.44.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
+vellum_ai-0.14.44.dist-info/RECORD,,