vellum-ai 0.11.3__tar.gz → 0.11.4__tar.gz

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/PKG-INFO

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

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/ee/vellum_cli/config.py

@@ -20,6 +20,15 @@ class WorkflowDeploymentConfig(UniversalBaseModel):
     description: Optional[str] = None
     release_tags: Optional[List[str]] = None
 
+    def merge(self, other: "WorkflowDeploymentConfig") -> "WorkflowDeploymentConfig":
+        return WorkflowDeploymentConfig(
+            id=self.id or other.id,
+            label=self.label or other.label,
+            name=self.name or other.name,
+            description=self.description or other.description,
+            release_tags=self.release_tags or other.release_tags,
+        )
+
 
 class WorkflowConfig(UniversalBaseModel):
     module: str
@@ -28,10 +37,37 @@ class WorkflowConfig(UniversalBaseModel):
     deployments: List[WorkflowDeploymentConfig] = field(default_factory=list)
 
     def merge(self, other: "WorkflowConfig") -> "WorkflowConfig":
+        self_deployment_by_id = {
+            deployment.id: deployment for deployment in self.deployments if deployment.id is not None
+        }
+        other_deployment_by_id = {
+            deployment.id: deployment for deployment in other.deployments if deployment.id is not None
+        }
+        all_ids = sorted(set(self_deployment_by_id.keys()).union(set(other_deployment_by_id.keys())))
+        merged_deployments = []
+        for id in all_ids:
+            self_deployment = self_deployment_by_id.get(id)
+            other_deployment = other_deployment_by_id.get(id)
+            if self_deployment and other_deployment:
+                merged_deployments.append(self_deployment.merge(other_deployment))
+            elif self_deployment:
+                merged_deployments.append(self_deployment)
+            elif other_deployment:
+                merged_deployments.append(other_deployment)
+
+        for deployment in self.deployments:
+            if deployment.id is None:
+                merged_deployments.append(deployment)
+
+        for deployment in other.deployments:
+            if deployment.id is None:
+                merged_deployments.append(deployment)
+
         return WorkflowConfig(
             module=self.module,
             workflow_sandbox_id=self.workflow_sandbox_id or other.workflow_sandbox_id,
             ignore=self.ignore or other.ignore,
+            deployments=merged_deployments,
         )
 
 

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/ee/vellum_cli/push.py

@@ -1,3 +1,4 @@
+from importlib import metadata
 import io
 import json
 import os
@@ -50,6 +51,9 @@ def push_command(
     workflow = BaseWorkflow.load_from_module(workflow_config.module)
     workflow_display = get_workflow_display(base_display_class=VellumWorkflowDisplay, workflow_class=workflow)
     exec_config = workflow_display.serialize()
+    exec_config["runner_config"] = {
+        "sdk_version": metadata.version("vellum-ai"),
+    }
 
     label = snake_to_title_case(workflow_config.module.split(".")[-1])
 

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/ee/vellum_cli/tests/conftest.py

@@ -1,19 +1,29 @@
 import pytest
+from dataclasses import dataclass
 import os
 import shutil
 import tempfile
 from uuid import uuid4
-from typing import Any, Callable, Dict, Generator, Tuple
+from typing import Any, Callable, Dict, Generator
 
 import tomli_w
 
 
+@dataclass
+class MockModuleResult:
+    temp_dir: str
+    module: str
+    set_pyproject_toml: Callable[[Dict[str, Any]], None]
+    workflow_sandbox_id: str
+
+
 @pytest.fixture
-def mock_module() -> Generator[Tuple[str, str, Callable[[Dict[str, Any]], None]], None, None]:
+def mock_module() -> Generator[MockModuleResult, None, None]:
     current_dir = os.getcwd()
     temp_dir = tempfile.mkdtemp()
     os.chdir(temp_dir)
     module = "examples.mock"
+    workflow_sandbox_id = str(uuid4())
 
     def set_pyproject_toml(vellum_config: Dict[str, Any]) -> None:
         pyproject_toml_path = os.path.join(temp_dir, "pyproject.toml")
@@ -28,13 +38,18 @@ def mock_module() -> Generator[Tuple[str, str, Callable[[Dict[str, Any]], None]]
             "workflows": [
                 {
                     "module": module,
-                    "workflow_sandbox_id": str(uuid4()),
+                    "workflow_sandbox_id": workflow_sandbox_id,
                 }
             ]
         }
     )
 
-    yield temp_dir, module, set_pyproject_toml
+    yield MockModuleResult(
+        temp_dir=temp_dir,
+        module=module,
+        set_pyproject_toml=set_pyproject_toml,
+        workflow_sandbox_id=workflow_sandbox_id,
+    )
 
     os.chdir(current_dir)
     shutil.rmtree(temp_dir)

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/ee/vellum_cli/tests/test_pull.py

@@ -37,7 +37,8 @@ def _zip_file_map(file_map: dict[str, str]) -> bytes:
 )
 def test_pull(vellum_client, mock_module, base_command):
     # GIVEN a module on the user's filesystem
-    temp_dir, module, _ = mock_module
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
 
     # AND the workflow pull API call returns a zip file
     vellum_client.workflows.pull.return_value = iter([_zip_file_map({"workflow.py": "print('hello')"})])
@@ -58,7 +59,9 @@ def test_pull(vellum_client, mock_module, base_command):
 
 def test_pull__second_module(vellum_client, mock_module):
     # GIVEN a module on the user's filesystem
-    temp_dir, module, set_pyproject_toml = mock_module
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
+    set_pyproject_toml = mock_module.set_pyproject_toml
 
     # AND the workflow pull API call returns a zip file
     vellum_client.workflows.pull.return_value = iter([_zip_file_map({"workflow.py": "print('hello')"})])
@@ -134,7 +137,7 @@ def test_pull__sandbox_id_with_no_config(vellum_client):
 
 def test_pull__sandbox_id_with_other_workflow_configured(vellum_client, mock_module):
     # GIVEN a pyproject.toml with a workflow configured
-    temp_dir, _, _ = mock_module
+    temp_dir = mock_module.temp_dir
 
     # AND a different workflow sandbox id
     workflow_sandbox_id = "87654321-0000-0000-0000-000000000000"
@@ -163,7 +166,8 @@ def test_pull__sandbox_id_with_other_workflow_configured(vellum_client, mock_mod
 
 def test_pull__remove_missing_files(vellum_client, mock_module):
     # GIVEN a module on the user's filesystem
-    temp_dir, module, _ = mock_module
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
 
     # AND the workflow pull API call returns a zip file
     vellum_client.workflows.pull.return_value = iter([_zip_file_map({"workflow.py": "print('hello')"})])
@@ -192,7 +196,9 @@ def test_pull__remove_missing_files(vellum_client, mock_module):
 
 def test_pull__remove_missing_files__ignore_pattern(vellum_client, mock_module):
     # GIVEN a module on the user's filesystem
-    temp_dir, module, set_pyproject_toml = mock_module
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
+    set_pyproject_toml = mock_module.set_pyproject_toml
 
     # AND the workflow pull API call returns a zip file
     vellum_client.workflows.pull.return_value = iter([_zip_file_map({"workflow.py": "print('hello')"})])
@@ -243,7 +249,7 @@ def test_pull__remove_missing_files__ignore_pattern(vellum_client, mock_module):
 
 def test_pull__include_json(vellum_client, mock_module):
     # GIVEN a module on the user's filesystem
-    _, module, __ = mock_module
+    module = mock_module.module
 
     # AND the workflow pull API call returns a zip file
     vellum_client.workflows.pull.return_value = iter(
@@ -265,7 +271,7 @@ def test_pull__include_json(vellum_client, mock_module):
 
 def test_pull__exclude_code(vellum_client, mock_module):
     # GIVEN a module on the user's filesystem
-    _, module, __ = mock_module
+    module = mock_module.module
 
     # AND the workflow pull API call returns a zip file
     vellum_client.workflows.pull.return_value = iter(
@@ -283,3 +289,75 @@ def test_pull__exclude_code(vellum_client, mock_module):
     vellum_client.workflows.pull.assert_called_once()
     call_args = vellum_client.workflows.pull.call_args.kwargs
     assert call_args["request_options"]["additional_query_parameters"] == {"exclude_code": True}
+
+
+def test_pull__sandbox_id_with_other_workflow_deployment_in_lock(vellum_client, mock_module):
+    # GIVEN a pyproject.toml with a workflow configured
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
+    workflow_sandbox_id = mock_module.workflow_sandbox_id
+
+    # AND there's a workflow deployment in the lock file
+    vellum_lock_json = os.path.join(temp_dir, "vellum.lock.json")
+    with open(vellum_lock_json, "w") as f:
+        json.dump(
+            {
+                "version": "1.0",
+                "workflows": [
+                    {
+                        "module": module,
+                        "workflow_sandbox_id": "0edc07cd-45b9-43e8-99bc-1f181972a857",
+                        "ignore": "tests/*",
+                        "deployments": [
+                            {
+                                "id": "7e5a7610-4c46-4bc9-b06e-0fc6a9e28959",
+                                "label": None,
+                                "name": None,
+                                "description": None,
+                                "release_tags": None,
+                            }
+                        ],
+                    }
+                ],
+            },
+            f,
+        )
+
+    # AND a different workflow sandbox id
+    new_workflow_sandbox_id = "87654321-0000-0000-0000-000000000000"
+
+    # AND the workflow pull API call returns a zip file
+    vellum_client.workflows.pull.return_value = iter([_zip_file_map({"workflow.py": "print('hello')"})])
+
+    # WHEN the user runs the pull command with the new workflow sandbox id
+    runner = CliRunner()
+    result = runner.invoke(cli_main, ["workflows", "pull", "--workflow-sandbox-id", new_workflow_sandbox_id])
+
+    # THEN the command returns successfully
+    assert result.exit_code == 0
+
+    # AND the lock file is updated to preserve the deployment and include the new workflow
+    with open(vellum_lock_json) as f:
+        lock_data = json.load(f)
+        assert lock_data["workflows"] == [
+            {
+                "module": module,
+                "workflow_sandbox_id": workflow_sandbox_id,
+                "ignore": "tests/*",
+                "deployments": [
+                    {
+                        "id": "7e5a7610-4c46-4bc9-b06e-0fc6a9e28959",
+                        "label": None,
+                        "name": None,
+                        "description": None,
+                        "release_tags": None,
+                    },
+                ],
+            },
+            {
+                "module": "workflow_87654321",
+                "workflow_sandbox_id": new_workflow_sandbox_id,
+                "ignore": None,
+                "deployments": [],
+            },
+        ]

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/ee/vellum_cli/tests/test_push.py

@@ -29,8 +29,7 @@ def _extract_tar_gz(tar_gz_bytes: bytes) -> dict[str, str]:
 
 def test_push__no_config(mock_module):
     # GIVEN no config file set
-    _, _, set_pyproject_toml = mock_module
-    set_pyproject_toml({"workflows": []})
+    mock_module.set_pyproject_toml({"workflows": []})
 
     # WHEN calling `vellum push`
     runner = CliRunner()
@@ -44,8 +43,7 @@ def test_push__no_config(mock_module):
 
 def test_push__multiple_workflows_configured__no_module_specified(mock_module):
     # GIVEN multiple workflows configured
-    _, _, set_pyproject_toml = mock_module
-    set_pyproject_toml({"workflows": [{"module": "examples.mock"}, {"module": "examples.mock2"}]})
+    mock_module.set_pyproject_toml({"workflows": [{"module": "examples.mock"}, {"module": "examples.mock2"}]})
 
     # WHEN calling `vellum push` without a module specified
     runner = CliRunner()
@@ -62,8 +60,8 @@ def test_push__multiple_workflows_configured__no_module_specified(mock_module):
 
 def test_push__multiple_workflows_configured__not_found_module(mock_module):
     # GIVEN multiple workflows configured
-    _, module, set_pyproject_toml = mock_module
-    set_pyproject_toml({"workflows": [{"module": "examples.mock2"}, {"module": "examples.mock3"}]})
+    module = mock_module.module
+    mock_module.set_pyproject_toml({"workflows": [{"module": "examples.mock2"}, {"module": "examples.mock3"}]})
 
     # WHEN calling `vellum push` with a module that doesn't exist
     runner = CliRunner()
@@ -85,7 +83,8 @@ def test_push__multiple_workflows_configured__not_found_module(mock_module):
 )
 def test_push__happy_path(mock_module, vellum_client, base_command):
     # GIVEN a single workflow configured
-    temp_dir, module, _ = mock_module
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
 
     # AND a workflow exists in the module successfully
     base_dir = os.path.join(temp_dir, *module.split("."))
@@ -134,7 +133,8 @@ class ExampleWorkflow(BaseWorkflow):
 )
 def test_push__deployment(mock_module, vellum_client, base_command):
     # GIVEN a single workflow configured
-    temp_dir, module, _ = mock_module
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
 
     # AND a workflow exists in the module successfully
     base_dir = os.path.join(temp_dir, *module.split("."))

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/pyproject.toml

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

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/src/vellum/client/core/client_wrapper.py

@@ -17,7 +17,7 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "vellum-ai",
-            "X-Fern-SDK-Version": "0.11.2",
+            "X-Fern-SDK-Version": "0.11.4",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/src/vellum/workflows/graph/graph.py

@@ -12,11 +12,13 @@ if TYPE_CHECKING:
 GraphTargetOfSets = Union[
     Set[NodeType],
     Set["Graph"],
-    Set[Union[Type["BaseNode"], "Graph"]],
+    Set["Port"],
+    Set[Union[Type["BaseNode"], "Graph", "Port"]],
 ]
 
 GraphTarget = Union[
     Type["BaseNode"],
+    "Port",
     "Graph",
     GraphTargetOfSets,
 ]
@@ -53,9 +55,13 @@ class Graph:
                 entrypoints.update(target._entrypoints)
                 edges.update(target._edges)
                 terminals.update(target._terminals)
-            else:
+            elif hasattr(target, "Ports"):
                 entrypoints.update({port for port in target.Ports})
                 terminals.update({port for port in target.Ports})
+            else:
+                # target is a Port
+                entrypoints.update({target})
+                terminals.update({target})
 
         return Graph(entrypoints=entrypoints, edges=list(edges), terminals=terminals)
 
@@ -77,11 +83,16 @@ class Graph:
                         self._extend_edges(elem.edges)
                         for other_terminal in elem._terminals:
                             new_terminals.add(other_terminal)
-                    else:
+                    elif hasattr(elem, "Ports"):
                         midgraph = final_output_node >> elem
                         self._extend_edges(midgraph.edges)
                         for other_terminal in elem.Ports:
                             new_terminals.add(other_terminal)
+                    else:
+                        # elem is a Port
+                        midgraph = final_output_node >> elem
+                        self._extend_edges(midgraph.edges)
+                        new_terminals.add(elem)
             self._terminals = new_terminals
             return self
 
@@ -93,10 +104,18 @@ class Graph:
             self._terminals = other._terminals
             return self
 
+        if hasattr(other, "Ports"):
+            for final_output_node in self._terminals:
+                subgraph = final_output_node >> other
+                self._extend_edges(subgraph.edges)
+            self._terminals = {port for port in other.Ports}
+            return self
+
+        # other is a Port
         for final_output_node in self._terminals:
             subgraph = final_output_node >> other
             self._extend_edges(subgraph.edges)
-        self._terminals = {port for port in other.Ports}
+        self._terminals = {other}
         return self
 
     @property

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/src/vellum/workflows/graph/tests/test_graph.py

@@ -435,3 +435,28 @@ def test_graph__set_to_node():
 
     # AND two edges
     assert len(list(graph.edges)) == 2
+
+
+def test_graph__node_to_port():
+    # GIVEN two nodes, one with a port
+    class SourceNode(BaseNode):
+        pass
+
+    class MiddleNode(BaseNode):
+        class Ports(BaseNode.Ports):
+            custom = Port.on_else()
+
+    class TargetNode(BaseNode):
+        pass
+
+    # WHEN we create a graph from the source node to the target node
+    graph = SourceNode >> MiddleNode.Ports.custom >> TargetNode
+
+    # THEN the graph has the source node as the entrypoint
+    assert set(graph.entrypoints) == {SourceNode}
+
+    # AND three nodes
+    assert len(list(graph.nodes)) == 3
+
+    # AND two edges
+    assert len(list(graph.edges)) == 2

{vellum_ai-0.11.3 → vellum_ai-0.11.4}/src/vellum/workflows/ports/port.py

@@ -52,6 +52,9 @@ class Port:
         if isinstance(other, set) or isinstance(other, Graph):
             return Graph.from_port(self) >> other
 
+        if isinstance(other, Port):
+            return Graph.from_port(self) >> Graph.from_port(other)
+
         edge = Edge(from_port=self, to_node=other)
         if edge not in self._edges:
             self._edges.append(edge)