Skip to content

Commit c47df57

Browse files
authored
Merge branch 'main' into feat/openai-block-v4
2 parents 0116181 + 61b659d commit c47df57

File tree

5 files changed

+1467
-4
lines changed

5 files changed

+1467
-4
lines changed

inference/core/interfaces/stream/inference_pipeline.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,10 +596,9 @@ def init_with_workflow(
596596
named_workflow_specified = (workspace_name is not None) and (
597597
workflow_id is not None
598598
)
599-
if not (named_workflow_specified != (workflow_specification is not None)):
599+
if not named_workflow_specified and not workflow_specification:
600600
raise ValueError(
601-
"Parameters (`workspace_name`, `workflow_id`) can be used mutually exclusive with "
602-
"`workflow_specification`, but at least one must be set."
601+
"Either (`workspace_name`, `workflow_id`) or `workflow_specification` must be provided."
603602
)
604603
try:
605604
from inference.core.interfaces.stream.model_handlers.workflows import (

inference/core/interfaces/webrtc_worker/modal.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ def spawn_rtc_peer_connection_modal(
423423
workflow_id=webrtc_request.workflow_configuration.workflow_id,
424424
)
425425
)
426-
427426
tags = {"tag": docker_tag}
428427
if workspace_id:
429428
tags["workspace_id"] = workspace_id

inference/core/workflows/core_steps/loader.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@
164164
from inference.core.workflows.core_steps.models.foundation.anthropic_claude.v1 import (
165165
AnthropicClaudeBlockV1,
166166
)
167+
from inference.core.workflows.core_steps.models.foundation.anthropic_claude.v2 import (
168+
AnthropicClaudeBlockV2,
169+
)
167170
from inference.core.workflows.core_steps.models.foundation.clip.v1 import (
168171
ClipModelBlockV1,
169172
)
@@ -585,6 +588,7 @@ def load_blocks() -> List[Type[WorkflowBlock]]:
585588
DimensionCollapseBlockV1,
586589
FirstNonEmptyOrDefaultBlockV1,
587590
AnthropicClaudeBlockV1,
591+
AnthropicClaudeBlockV2,
588592
CosineSimilarityBlockV1,
589593
BackgroundColorVisualizationBlockV1,
590594
BarcodeDetectorBlockV1,

0 commit comments

Comments
 (0)