Merge branch 'develop'

Signed-off-by: Yam Marcovitz <[email protected]>

Author: kichanyurd

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to Parlant will be documented here.
 ## [Unreleased]
 TBD
 
+## [2.1.1] - 2025-04-30
+
+### Fixed
+- Fixed rendering relationships in CLI
+- Fixed parlant client using old imports from python client SDK
+
 ## [2.1.0] - 2025-04-29
 
 ### Added

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "parlant"
-version = "2.1.0"
+version = "2.1.1"
 license = "Apache-2.0"
 description = ""
 authors = ["Yam Marcovitz <[email protected]>", "Dor Zohar <[email protected]>"]
@@ -36,7 +36,7 @@ networkx = { extras = ["default"], version = "^3.3" }
 openai = "^1.45.0"
 openapi3-parser = "1.1.21"
 opentelemetry-exporter-otlp-proto-grpc = "1.27.0"
-parlant-client = "^1.1.0"
+parlant-client = { git = "https://github.com/emcie-co/parlant-client-python.git", tag = "develop.1745947308" }
 python = "^3.10"
 python-dateutil = "^2.8.2"
 python-dotenv = "^1.0.1"

pyproject.toml

@@ -46,7 +46,7 @@
     EventInspectionResult,
     Guideline,
     Relationship,
-    GuidelineRelationshipKindDto,
+    RelationshipKindDto,
     GuidelineToolAssociation,
     GuidelineToolAssociationUpdateParams,
     GuidelineTagsUpdateParams,
@@ -439,7 +439,7 @@ def create_relationship(
         ctx: click.Context,
         source: str,
         target: str,
-        kind: GuidelineRelationshipKindDto,
+        kind: RelationshipKindDto,
     ) -> Relationship:
         client = cast(ParlantClient, ctx.obj.client)
 
@@ -460,7 +460,7 @@ def remove_relationship(
         id: Optional[str],
         source_id: Optional[str],
         target_id: Optional[str],
-        kind: Optional[GuidelineRelationshipKindDto],
+        kind: Optional[RelationshipKindDto],
     ) -> str:
         client = cast(ParlantClient, ctx.obj.client)
 
@@ -506,7 +506,7 @@ def list_relationships(
         ctx: click.Context,
         guideline_id: Optional[str],
         tag: Optional[str],
-        kind: GuidelineRelationshipKindDto,
+        kind: RelationshipKindDto,
         indirect: bool,
     ) -> list[Relationship]:
         client = cast(ParlantClient, ctx.obj.client)
@@ -1633,8 +1633,17 @@ def to_indirect_relationship_item(rel: Relationship) -> OrderedDict[str, str]:
             return OrderedDict(result)
 
         if relationships:
-            direct = [r for r in relationships if not r.indirect]
-            indirect = [r for r in relationships if r.indirect]
+            direct = [
+                r
+                for r in relationships
+                if entity in (r.source_guideline, r.target_guideline, r.source_tag, r.target_tag)
+            ]
+            indirect = [
+                r
+                for r in relationships
+                if entity
+                not in (r.source_guideline, r.target_guideline, r.source_tag, r.target_tag)
+            ]
 
             if direct:
                 rich.print("\nDirect Relationships:")
@@ -1765,7 +1774,7 @@ def create_relationship(
         ctx: click.Context,
         source_id: str,
         target_id: str,
-        kind: GuidelineRelationshipKindDto,
+        kind: RelationshipKindDto,
     ) -> None:
         try:
             relationship = Actions.create_relationship(
@@ -1786,7 +1795,7 @@ def remove_relationship(
         id: Optional[str],
         source_id: Optional[str],
         target_id: Optional[str],
-        kind: Optional[GuidelineRelationshipKindDto],
+        kind: Optional[RelationshipKindDto],
     ) -> None:
         try:
             relationship_id = Actions.remove_relationship(
@@ -1807,7 +1816,7 @@ def list_relationships(
         ctx: click.Context,
         guideline_id: Optional[str],
         tag: Optional[str],
-        kind: GuidelineRelationshipKindDto,
+        kind: RelationshipKindDto,
         indirect: bool,
     ) -> None:
         try:
@@ -3166,7 +3175,7 @@ def relationship_create(
         ctx: click.Context,
         source: str,
         target: str,
-        kind: GuidelineRelationshipKindDto,
+        kind: RelationshipKindDto,
     ) -> None:
         Interface.create_relationship(
             ctx=ctx,
@@ -3206,7 +3215,7 @@ def relationship_delete(
         id: Optional[str],
         source: Optional[str],
         target: Optional[str],
-        kind: Optional[GuidelineRelationshipKindDto],
+        kind: Optional[RelationshipKindDto],
     ) -> None:
         if id:
             if source or target or kind:
@@ -3256,7 +3265,7 @@ def relationship_list(
         ctx: click.Context,
         guideline_id: Optional[str],
         tag: Optional[str],
-        kind: GuidelineRelationshipKindDto,
+        kind: RelationshipKindDto,
         indirect: bool,
     ) -> None:
         if guideline_id and tag:

src/parlant/bin/client.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = "2.1.0"
+VERSION = "2.1.1"

src/parlant/core/version.py

@@ -518,8 +518,10 @@ async def test_that_guidelines_can_be_entailed(
         )
 
         process = await run_cli(
-            "guideline",
-            "entail",
+            "relationship",
+            "create",
+            "--kind",
+            "entailment",
             "--source",
             first_guideline["id"],
             "--target",
@@ -565,76 +567,6 @@ async def test_that_a_guideline_can_be_deleted(
         assert len(guidelines) == 0
 
 
-async def test_that_a_connection_can_be_deleted(
-    context: ContextOfTest,
-) -> None:
-    with run_server(context):
-        while not is_server_responsive(SERVER_PORT):
-            pass
-
-        async with httpx.AsyncClient(
-            follow_redirects=True,
-            timeout=httpx.Timeout(30),
-        ) as client:
-            guidelines_response = await client.post(
-                f"{SERVER_ADDRESS}/guidelines/",
-                json={
-                    "condition": "the customer greets you",
-                    "action": "greet them back with 'Hello'",
-                },
-            )
-            guidelines_response.raise_for_status()
-
-            first = guidelines_response.json()
-
-            guidelines_response = await client.post(
-                f"{SERVER_ADDRESS}/guidelines/",
-                json={
-                    "condition": "greeting the customer",
-                    "action": "ask for his health condition",
-                },
-            )
-            guidelines_response.raise_for_status()
-
-            second = guidelines_response.json()
-
-            first = first["id"]
-            second = second["id"]
-
-            connection_response = await client.patch(
-                f"{SERVER_ADDRESS}/guidelines/{first}",
-                json={
-                    "connections": {
-                        "add": [
-                            {
-                                "source": first,
-                                "target": second,
-                            }
-                        ],
-                    },
-                },
-            )
-            connection_response.raise_for_status()
-
-        process = await run_cli(
-            "guideline",
-            "disentail",
-            "--source",
-            first,
-            "--target",
-            second,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout_view, stderr_view = await process.communicate()
-        output_view = stdout_view.decode() + stderr_view.decode()
-        assert "Traceback (most recent call last):" not in output_view
-        assert process.returncode == os.EX_OK
-
-        guideline = await context.api.read_guideline(guideline_id=first)
-        assert len(guideline["connections"]) == 0
-
-
 async def test_that_a_tool_can_be_enabled_for_a_guideline(
     context: ContextOfTest,
 ) -> None:
@@ -1657,29 +1589,6 @@ async def test_that_tags_can_be_listed(context: ContextOfTest) -> None:
         assert "SecondTag" in output
 
 
-async def test_that_a_tag_can_be_viewed(context: ContextOfTest) -> None:
-    with run_server(context):
-        while not is_server_responsive(SERVER_PORT):
-            pass
-
-        tag_id = (await context.api.create_tag("TestViewTag"))["id"]
-
-        process = await run_cli(
-            "tag",
-            "view",
-            "--id",
-            tag_id,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await process.communicate()
-        output = stdout.decode() + stderr.decode()
-        assert process.returncode == os.EX_OK
-
-        assert "TestViewTag" in output
-        assert tag_id in output
-
-
 async def test_that_a_tag_can_be_updated(context: ContextOfTest) -> None:
     with run_server(context):
         while not is_server_responsive(SERVER_PORT):