fix package name, change _parse_connection_name function name, add te…

…sts (#126)
deepset-ai · Oct 11, 2023 · 5357ae5 · 5357ae5
1 parent 3555315
commit 5357ae5
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 5 deletions.
diff --git a/canals/pipeline/connections.py b/canals/pipeline/connections.py
@@ -15,7 +15,7 @@
 logger = logging.getLogger(__name__)
 
 
-def _parse_connection_name(connection: str) -> Tuple[str, Optional[str]]:
+def parse_connection(connection: str) -> Tuple[str, Optional[str]]:
     """
     Returns component-connection pairs from a connect_to/from string
     """

diff --git a/canals/pipeline/pipeline.py b/canals/pipeline/pipeline.py
@@ -24,7 +24,7 @@
 from canals.pipeline.draw import _draw, _convert_for_debug, RenderingEngines
 from canals.pipeline.sockets import InputSocket, OutputSocket
 from canals.pipeline.validation import _validate_pipeline_input
-from canals.pipeline.connections import _parse_connection_name, _find_unambiguous_connection
+from canals.pipeline.connections import parse_connection, _find_unambiguous_connection
 from canals.utils import _type_name
 from canals.serialization import component_to_dict, component_from_dict
 
@@ -249,8 +249,8 @@ def connect(self, connect_from: str, connect_to: str) -> None:
                 not present in the pipeline, or the connections don't match by type, and so on).
         """
         # Edges may be named explicitly by passing 'node_name.edge_name' to connect().
-        from_node, from_socket_name = _parse_connection_name(connect_from)
-        to_node, to_socket_name = _parse_connection_name(connect_to)
+        from_node, from_socket_name = parse_connection(connect_from)
+        to_node, to_socket_name = parse_connection(connect_to)
 
         # Get the nodes data.
         try:

diff --git a/test/pipelines/__init__.py → test/pipeline/__init__.py b/test/pipelines/__init__.py → test/pipeline/__init__.py
diff --git a/test/pipelines/integration/__init__.py → test/pipeline/integration/__init__.py b/test/pipelines/integration/__init__.py → test/pipeline/integration/__init__.py
diff --git a/...ines/integration/test_complex_pipeline.py → ...line/integration/test_complex_pipeline.py b/...ines/integration/test_complex_pipeline.py → ...line/integration/test_complex_pipeline.py
diff --git a/.../integration/test_double_loop_pipeline.py → .../integration/test_double_loop_pipeline.py b/.../integration/test_double_loop_pipeline.py → .../integration/test_double_loop_pipeline.py
diff --git a/...test_fixed_decision_and_merge_pipeline.py → ...test_fixed_decision_and_merge_pipeline.py b/...test_fixed_decision_and_merge_pipeline.py → ...test_fixed_decision_and_merge_pipeline.py
diff --git a/...tegration/test_fixed_decision_pipeline.py → ...tegration/test_fixed_decision_pipeline.py b/...tegration/test_fixed_decision_pipeline.py → ...tegration/test_fixed_decision_pipeline.py
diff --git a/...ntegration/test_fixed_merging_pipeline.py → ...ntegration/test_fixed_merging_pipeline.py b/...ntegration/test_fixed_merging_pipeline.py → ...ntegration/test_fixed_merging_pipeline.py
diff --git a/...lines/integration/test_linear_pipeline.py → ...eline/integration/test_linear_pipeline.py b/...lines/integration/test_linear_pipeline.py → ...eline/integration/test_linear_pipeline.py
diff --git a/...ration/test_looping_and_merge_pipeline.py → ...ration/test_looping_and_merge_pipeline.py b/...ration/test_looping_and_merge_pipeline.py → ...ration/test_looping_and_merge_pipeline.py
diff --git a/...ines/integration/test_looping_pipeline.py → ...line/integration/test_looping_pipeline.py b/...ines/integration/test_looping_pipeline.py → ...line/integration/test_looping_pipeline.py
diff --git a/...ration/test_parallel_branches_pipeline.py → ...ration/test_parallel_branches_pipeline.py b/...ration/test_parallel_branches_pipeline.py → ...ration/test_parallel_branches_pipeline.py
diff --git a/...t_variable_decision_and_merge_pipeline.py → ...t_variable_decision_and_merge_pipeline.py b/...t_variable_decision_and_merge_pipeline.py → ...t_variable_decision_and_merge_pipeline.py
diff --git a/...ration/test_variable_decision_pipeline.py → ...ration/test_variable_decision_pipeline.py b/...ration/test_variable_decision_pipeline.py → ...ration/test_variable_decision_pipeline.py
diff --git a/...gration/test_variable_merging_pipeline.py → ...gration/test_variable_merging_pipeline.py b/...gration/test_variable_merging_pipeline.py → ...gration/test_variable_merging_pipeline.py
diff --git a/test/pipelines/unit/__init__.py → test/pipeline/unit/__init__.py b/test/pipelines/unit/__init__.py → test/pipeline/unit/__init__.py
diff --git a/test/pipelines/unit/test_connections.py → test/pipeline/unit/test_connections.py b/test/pipelines/unit/test_connections.py → test/pipeline/unit/test_connections.py
@@ -8,9 +8,10 @@
 
 import pytest
 
-from canals import Pipeline, component
+from canals import Pipeline
 from canals.errors import PipelineConnectError
 from canals.testing import factory
+from canals.pipeline.connections import parse_connection
 from sample_components import AddFixedValue
 
 
@@ -407,3 +408,9 @@ def test_connect_many_connections_possible_no_name_matches():
     pipe.add_component("c2", Component2())
     with pytest.raises(PipelineConnectError, match=expected_message):
         pipe.connect("c1", "c2")
+
+
+def test_parse_connection():
+    assert parse_connection("foobar") == ("foobar", None)
+    assert parse_connection("foo.bar") == ("foo", "bar")
+    assert parse_connection("foo.bar.baz") == ("foo", "bar.baz")
diff --git a/test/pipelines/unit/test_draw.py → test/pipeline/unit/test_draw.py b/test/pipelines/unit/test_draw.py → test/pipeline/unit/test_draw.py
diff --git a/test/pipelines/unit/test_pipeline.py → test/pipeline/unit/test_pipeline.py b/test/pipelines/unit/test_pipeline.py → test/pipeline/unit/test_pipeline.py
diff --git a/...lines/unit/test_validation_pipeline_io.py → ...eline/unit/test_validation_pipeline_io.py b/...lines/unit/test_validation_pipeline_io.py → ...eline/unit/test_validation_pipeline_io.py