From ae9f1498f8d9b6a249a50eb8ef635f193e13fef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20R=C3=B8nning?= Date: Mon, 8 Sep 2025 11:28:17 +0200 Subject: [PATCH 1/7] =?UTF-8?q?[AAA-3112]=C2=A0include=20version=20configu?= =?UTF-8?q?ration=20for=20agent=20deployment=20with=20QKG=20tool?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cognite/client/data_classes/agents/agent_tools.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cognite/client/data_classes/agents/agent_tools.py b/cognite/client/data_classes/agents/agent_tools.py index d19d95eff3..2185ea7522 100644 --- a/cognite/client/data_classes/agents/agent_tools.py +++ b/cognite/client/data_classes/agents/agent_tools.py @@ -166,10 +166,12 @@ class QueryKnowledgeGraphAgentToolConfiguration(WriteableCogniteResource): Args: data_models (Sequence[DataModelInfo] | None): The data models and views to query. instance_spaces (InstanceSpaces | None): The instance spaces to query. + version (str | None): The version of the query generation strategy to use. A higher number does not necessarily mean a better query. """ data_models: Sequence[DataModelInfo] | None = None instance_spaces: InstanceSpaces | None = None + version: str | None = None @classmethod def _load( @@ -186,6 +188,7 @@ def _load( return cls( data_models=data_models, instance_spaces=instance_spaces, + version=resource.get("version"), ) def dump(self, camel_case: bool = True) -> dict[str, Any]: @@ -196,6 +199,8 @@ def dump(self, camel_case: bool = True) -> dict[str, Any]: if self.instance_spaces: key = "instanceSpaces" if camel_case else "instance_spaces" result[key] = self.instance_spaces.dump(camel_case=camel_case) + if self.version: + result["version"] = self.version return result def as_write(self) -> QueryKnowledgeGraphAgentToolConfiguration: From c46d5238f6a285bc71905616e9b027584265d464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20R=C3=B8nning?= Date: Mon, 8 Sep 2025 12:42:47 +0200 Subject: [PATCH 2/7] Giving docstring hints about supported versions --- cognite/client/data_classes/agents/agent_tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cognite/client/data_classes/agents/agent_tools.py b/cognite/client/data_classes/agents/agent_tools.py index 2185ea7522..23c6315b65 100644 --- a/cognite/client/data_classes/agents/agent_tools.py +++ b/cognite/client/data_classes/agents/agent_tools.py @@ -166,7 +166,7 @@ class QueryKnowledgeGraphAgentToolConfiguration(WriteableCogniteResource): Args: data_models (Sequence[DataModelInfo] | None): The data models and views to query. instance_spaces (InstanceSpaces | None): The instance spaces to query. - version (str | None): The version of the query generation strategy to use. A higher number does not necessarily mean a better query. + version (str | None): The version of the query generation strategy to use. A higher number does not necessarily mean a better query. Supported values are "v1" and "v2". """ data_models: Sequence[DataModelInfo] | None = None @@ -188,7 +188,7 @@ def _load( return cls( data_models=data_models, instance_spaces=instance_spaces, - version=resource.get("version"), + version=resource.get("version", "v2"), ) def dump(self, camel_case: bool = True) -> dict[str, Any]: From ed0ee1c5113471f34da603f7c1b71c5296c8b68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20R=C3=B8nning?= Date: Mon, 8 Sep 2025 12:46:21 +0200 Subject: [PATCH 3/7] reverted to no default value --- cognite/client/data_classes/agents/agent_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cognite/client/data_classes/agents/agent_tools.py b/cognite/client/data_classes/agents/agent_tools.py index 23c6315b65..b9e0588c8c 100644 --- a/cognite/client/data_classes/agents/agent_tools.py +++ b/cognite/client/data_classes/agents/agent_tools.py @@ -188,7 +188,7 @@ def _load( return cls( data_models=data_models, instance_spaces=instance_spaces, - version=resource.get("version", "v2"), + version=resource.get("version"), ) def dump(self, camel_case: bool = True) -> dict[str, Any]: From 445aeedace5268d95f51858ec3964db05b2c4322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20R=C3=B8nning?= Date: Mon, 8 Sep 2025 13:11:59 +0200 Subject: [PATCH 4/7] Update cognite/client/data_classes/agents/agent_tools.py Co-authored-by: Anders Albert <60234212+doctrino@users.noreply.github.com> --- cognite/client/data_classes/agents/agent_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cognite/client/data_classes/agents/agent_tools.py b/cognite/client/data_classes/agents/agent_tools.py index b9e0588c8c..5e8272a996 100644 --- a/cognite/client/data_classes/agents/agent_tools.py +++ b/cognite/client/data_classes/agents/agent_tools.py @@ -171,7 +171,7 @@ class QueryKnowledgeGraphAgentToolConfiguration(WriteableCogniteResource): data_models: Sequence[DataModelInfo] | None = None instance_spaces: InstanceSpaces | None = None - version: str | None = None + version: Literal["v1", "v2"] | str | None = None @classmethod def _load( From 127d7009472312213e6afdc663088f3db182fdc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20R=C3=B8nning?= Date: Thu, 25 Sep 2025 10:34:59 +0200 Subject: [PATCH 5/7] Update cognite/client/data_classes/agents/agent_tools.py Co-authored-by: Erlend vollset --- cognite/client/data_classes/agents/agent_tools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cognite/client/data_classes/agents/agent_tools.py b/cognite/client/data_classes/agents/agent_tools.py index 5e8272a996..94ee2f6a95 100644 --- a/cognite/client/data_classes/agents/agent_tools.py +++ b/cognite/client/data_classes/agents/agent_tools.py @@ -169,9 +169,9 @@ class QueryKnowledgeGraphAgentToolConfiguration(WriteableCogniteResource): version (str | None): The version of the query generation strategy to use. A higher number does not necessarily mean a better query. Supported values are "v1" and "v2". """ - data_models: Sequence[DataModelInfo] | None = None - instance_spaces: InstanceSpaces | None = None - version: Literal["v1", "v2"] | str | None = None + data_models: Sequence[DataModelInfo] | None + instance_spaces: InstanceSpaces | None + version: Literal["v1", "v2"] | str | None @classmethod def _load( From c54eac18a75ab4d90e10bbe8c77b98287d5a2231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20R=C3=B8nning?= Date: Fri, 26 Sep 2025 08:24:34 +0200 Subject: [PATCH 6/7] Updated tests --- tests/tests_integration/test_api/test_agents.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/tests_integration/test_api/test_agents.py b/tests/tests_integration/test_api/test_agents.py index 2ab037b2ed..79af1d0562 100644 --- a/tests/tests_integration/test_api/test_agents.py +++ b/tests/tests_integration/test_api/test_agents.py @@ -41,7 +41,9 @@ def permanent_agent(cognite_client: CogniteClient) -> Agent: version="v1", view_external_ids=["CogniteAsset"], ) - ] + ], + instance_spaces=None, + version="v2", ), ) ], @@ -80,7 +82,9 @@ def test_create_retrieve_update_delete_agent(self, cognite_client: CogniteClient version="v1", view_external_ids=["CogniteAsset"], ) - ] + ], + instance_spaces=None, + version="v2", ), ), SummarizeDocumentAgentToolUpsert( From 6c6ba80d8d03ee8cb3755824d8074902d2aaa860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20R=C3=B8nning?= Date: Fri, 26 Sep 2025 08:29:31 +0200 Subject: [PATCH 7/7] Updated tests again --- tests/tests_unit/test_api/test_agents.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests_unit/test_api/test_agents.py b/tests/tests_unit/test_api/test_agents.py index b05cfdad3f..bf853e69bd 100644 --- a/tests/tests_unit/test_api/test_agents.py +++ b/tests/tests_unit/test_api/test_agents.py @@ -138,6 +138,7 @@ def test_upsert_full(self, cognite_client: CogniteClient, mock_agent_upsert_resp ) ], instance_spaces=InstanceSpaces(type="all"), + version="v2", ), ) ],