kestrapy 2.1.0.dev512__tar.gz → 2.1.0.dev528__tar.gz

{kestrapy-2.1.0.dev512 → kestrapy-2.1.0.dev528}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kestrapy
-Version: 2.1.0.dev512
+Version: 2.1.0.dev528
 Summary: Kestra EE
 Home-page: https://github.com/kestra-io/client-sdk
 Author: Kestra

{kestrapy-2.1.0.dev512 → kestrapy-2.1.0.dev528}/kestrapy/__init__.py

@@ -9,7 +9,7 @@
 """  # noqa: E501
 
 
-__version__ = "2.1.0.dev512"
+__version__ = "2.1.0.dev528"
 
 # Define package exports
 __all__ = [
@@ -136,14 +136,22 @@ __all__ = [
     "Asset",
     "AssetFailureBehavior",
     "AssetIdentifier",
-    "AssetTopologyGraph",
-    "AssetTopologyGraphEdge",
-    "AssetTopologyGraphNode",
-    "AssetTopologyGraphNodeNodeType",
+    "AssetRelationGraph",
+    "AssetRelationGraphEdge",
+    "AssetRelationGraphNode",
+    "AssetRelationRef",
+    "AssetWriteSummary",
     "AssetsControllerApiAsset",
-    "AssetsControllerApiAssetLineageEvent",
     "AssetsControllerApiAssetLock",
     "AssetsControllerApiAssetUsage",
+    "AssetsControllerApiParentRequest",
+    "AssetsControllerApiRelation",
+    "AssetsControllerApiRelationGroup",
+    "AssetsControllerApiRelationItem",
+    "AssetsControllerApiRelationNode",
+    "AssetsControllerApiRelationPage",
+    "AssetsControllerApiRelationRequest",
+    "AssetsControllerApiRelationSummary",
     "AssetsControllerAssetLockRequest",
     "AssetsDeclaration",
     "AssetsInOut",
@@ -419,6 +427,7 @@ __all__ = [
     "NamespaceAllowedNamespace",
     "NamespaceFileRevision",
     "NamespaceLight",
+    "NodeType",
     "Notification",
     "NotificationControllerApiMarkAllRead",
     "NotificationControllerApiNotificationHistory",
@@ -442,7 +451,6 @@ __all__ = [
     "PagedResultsAppsControllerApiApp",
     "PagedResultsAppsControllerApiAppCatalogItem",
     "PagedResultsAssetsControllerApiAsset",
-    "PagedResultsAssetsControllerApiAssetLineageEvent",
     "PagedResultsAssetsControllerApiAssetUsage",
     "PagedResultsAuditLogControllerApiAuditLogItem",
     "PagedResultsBlueprint",
@@ -542,7 +550,11 @@ __all__ = [
     "QuotaLimitControllerApiQuotaLimitResetRequest",
     "RBACServiceRoleAssignmentRoleOrigin",
     "Relation",
-    "Relation1",
+    "RelationDirection",
+    "RelationKind",
+    "RelationOrigin",
+    "RelationProvenance",
+    "RelationState",
     "RelationType",
     "Resolution",
     "Resource",
@@ -821,14 +833,22 @@ from kestrapy.models.assertion_run_error import AssertionRunError as AssertionRu
 from kestrapy.models.asset import Asset as Asset
 from kestrapy.models.asset_failure_behavior import AssetFailureBehavior as AssetFailureBehavior
 from kestrapy.models.asset_identifier import AssetIdentifier as AssetIdentifier
-from kestrapy.models.asset_topology_graph import AssetTopologyGraph as AssetTopologyGraph
-from kestrapy.models.asset_topology_graph_edge import AssetTopologyGraphEdge as AssetTopologyGraphEdge
-from kestrapy.models.asset_topology_graph_node import AssetTopologyGraphNode as AssetTopologyGraphNode
-from kestrapy.models.asset_topology_graph_node_node_type import AssetTopologyGraphNodeNodeType as AssetTopologyGraphNodeNodeType
+from kestrapy.models.asset_relation_graph import AssetRelationGraph as AssetRelationGraph
+from kestrapy.models.asset_relation_graph_edge import AssetRelationGraphEdge as AssetRelationGraphEdge
+from kestrapy.models.asset_relation_graph_node import AssetRelationGraphNode as AssetRelationGraphNode
+from kestrapy.models.asset_relation_ref import AssetRelationRef as AssetRelationRef
+from kestrapy.models.asset_write_summary import AssetWriteSummary as AssetWriteSummary
 from kestrapy.models.assets_controller_api_asset import AssetsControllerApiAsset as AssetsControllerApiAsset
-from kestrapy.models.assets_controller_api_asset_lineage_event import AssetsControllerApiAssetLineageEvent as AssetsControllerApiAssetLineageEvent
 from kestrapy.models.assets_controller_api_asset_lock import AssetsControllerApiAssetLock as AssetsControllerApiAssetLock
 from kestrapy.models.assets_controller_api_asset_usage import AssetsControllerApiAssetUsage as AssetsControllerApiAssetUsage
+from kestrapy.models.assets_controller_api_parent_request import AssetsControllerApiParentRequest as AssetsControllerApiParentRequest
+from kestrapy.models.assets_controller_api_relation import AssetsControllerApiRelation as AssetsControllerApiRelation
+from kestrapy.models.assets_controller_api_relation_group import AssetsControllerApiRelationGroup as AssetsControllerApiRelationGroup
+from kestrapy.models.assets_controller_api_relation_item import AssetsControllerApiRelationItem as AssetsControllerApiRelationItem
+from kestrapy.models.assets_controller_api_relation_node import AssetsControllerApiRelationNode as AssetsControllerApiRelationNode
+from kestrapy.models.assets_controller_api_relation_page import AssetsControllerApiRelationPage as AssetsControllerApiRelationPage
+from kestrapy.models.assets_controller_api_relation_request import AssetsControllerApiRelationRequest as AssetsControllerApiRelationRequest
+from kestrapy.models.assets_controller_api_relation_summary import AssetsControllerApiRelationSummary as AssetsControllerApiRelationSummary
 from kestrapy.models.assets_controller_asset_lock_request import AssetsControllerAssetLockRequest as AssetsControllerAssetLockRequest
 from kestrapy.models.assets_declaration import AssetsDeclaration as AssetsDeclaration
 from kestrapy.models.assets_in_out import AssetsInOut as AssetsInOut
@@ -1109,6 +1129,7 @@ from kestrapy.models.namespace import Namespace as Namespace
 from kestrapy.models.namespace_allowed_namespace import NamespaceAllowedNamespace as NamespaceAllowedNamespace
 from kestrapy.models.namespace_file_revision import NamespaceFileRevision as NamespaceFileRevision
 from kestrapy.models.namespace_light import NamespaceLight as NamespaceLight
+from kestrapy.models.node_type import NodeType as NodeType
 from kestrapy.models.notification import Notification as Notification
 from kestrapy.models.notification_controller_api_mark_all_read import NotificationControllerApiMarkAllRead as NotificationControllerApiMarkAllRead
 from kestrapy.models.notification_controller_api_notification_history import NotificationControllerApiNotificationHistory as NotificationControllerApiNotificationHistory
@@ -1132,7 +1153,6 @@ from kestrapy.models.paged_results_api_trigger_state import PagedResultsApiTrigg
 from kestrapy.models.paged_results_apps_controller_api_app import PagedResultsAppsControllerApiApp as PagedResultsAppsControllerApiApp
 from kestrapy.models.paged_results_apps_controller_api_app_catalog_item import PagedResultsAppsControllerApiAppCatalogItem as PagedResultsAppsControllerApiAppCatalogItem
 from kestrapy.models.paged_results_assets_controller_api_asset import PagedResultsAssetsControllerApiAsset as PagedResultsAssetsControllerApiAsset
-from kestrapy.models.paged_results_assets_controller_api_asset_lineage_event import PagedResultsAssetsControllerApiAssetLineageEvent as PagedResultsAssetsControllerApiAssetLineageEvent
 from kestrapy.models.paged_results_assets_controller_api_asset_usage import PagedResultsAssetsControllerApiAssetUsage as PagedResultsAssetsControllerApiAssetUsage
 from kestrapy.models.paged_results_audit_log_controller_api_audit_log_item import PagedResultsAuditLogControllerApiAuditLogItem as PagedResultsAuditLogControllerApiAuditLogItem
 from kestrapy.models.paged_results_blueprint import PagedResultsBlueprint as PagedResultsBlueprint
@@ -1232,7 +1252,11 @@ from kestrapy.models.quota_limit import QuotaLimit as QuotaLimit
 from kestrapy.models.quota_limit_controller_api_quota_limit_reset_request import QuotaLimitControllerApiQuotaLimitResetRequest as QuotaLimitControllerApiQuotaLimitResetRequest
 from kestrapy.models.rbac_service_role_assignment_role_origin import RBACServiceRoleAssignmentRoleOrigin as RBACServiceRoleAssignmentRoleOrigin
 from kestrapy.models.relation import Relation as Relation
-from kestrapy.models.relation1 import Relation1 as Relation1
+from kestrapy.models.relation_direction import RelationDirection as RelationDirection
+from kestrapy.models.relation_kind import RelationKind as RelationKind
+from kestrapy.models.relation_origin import RelationOrigin as RelationOrigin
+from kestrapy.models.relation_provenance import RelationProvenance as RelationProvenance
+from kestrapy.models.relation_state import RelationState as RelationState
 from kestrapy.models.relation_type import RelationType as RelationType
 from kestrapy.models.resolution import Resolution as Resolution
 from kestrapy.models.resource import Resource as Resource

{kestrapy-2.1.0.dev512 → kestrapy-2.1.0.dev528}/kestrapy/api/assets_api.py

@@ -1,24 +1,26 @@
-import warnings
 from typing import Any, List, Optional
 
 from kestrapy.base_api import BaseApi
+from kestrapy.models.asset_relation_graph import AssetRelationGraph
 from kestrapy.models.assets_controller_api_asset import AssetsControllerApiAsset
-from kestrapy.models.assets_controller_api_asset_lineage_event import AssetsControllerApiAssetLineageEvent
 from kestrapy.models.assets_controller_api_asset_lock import AssetsControllerApiAssetLock
 from kestrapy.models.assets_controller_api_asset_usage import AssetsControllerApiAssetUsage
+from kestrapy.models.assets_controller_api_parent_request import AssetsControllerApiParentRequest
+from kestrapy.models.assets_controller_api_relation import AssetsControllerApiRelation
+from kestrapy.models.assets_controller_api_relation_page import AssetsControllerApiRelationPage
+from kestrapy.models.assets_controller_api_relation_request import AssetsControllerApiRelationRequest
+from kestrapy.models.assets_controller_api_relation_summary import AssetsControllerApiRelationSummary
 from kestrapy.models.assets_controller_asset_lock_request import AssetsControllerAssetLockRequest
-from kestrapy.models.asset_topology_graph import AssetTopologyGraph
 from kestrapy.models.bulk_response import BulkResponse
 from kestrapy.models.paged_results_assets_controller_api_asset import PagedResultsAssetsControllerApiAsset
-from kestrapy.models.paged_results_assets_controller_api_asset_lineage_event import PagedResultsAssetsControllerApiAssetLineageEvent
 from kestrapy.models.paged_results_assets_controller_api_asset_usage import PagedResultsAssetsControllerApiAssetUsage
 from kestrapy.models.query_filter import QueryFilter
+from kestrapy.models.relation_direction import RelationDirection
+from kestrapy.models.relation_kind import RelationKind
 
-_LINEAGE_EVENTS_REMOVED = (
-    "the lineage-event store and its routes were removed in Kestra develop "
-    "(kestra-ee 091e7d441, after 2.0.x); the route now answers 403 there. It still works "
-    "against Kestra 2.0.x. Lineage is now served through the asset relation endpoints."
-)
+
+def _enum_value(value: Any) -> Any:
+    return value.value if hasattr(value, 'value') else value
 
 
 class AssetsApi(BaseApi):
@@ -60,12 +62,78 @@ class AssetsApi(BaseApi):
         self,
         id: str,
         tenant: str,
-        destination_only: Optional[bool] = None,
+        kinds: Optional[List[RelationKind]] = None,
         expand_all: Optional[bool] = None,
-    ) -> AssetTopologyGraph:
+        hub_cursor: Optional[str] = None,
+    ) -> AssetRelationGraph:
         path = self._tenant_path(tenant, "assets", id, "dependencies")
-        params = self._build_query_params(destinationOnly=destination_only, expandAll=expand_all)
-        return self._json_request("GET", path, AssetTopologyGraph, params=params)
+        return self._json_request("GET", path, AssetRelationGraph, params=self._graph_params(kinds, expand_all, hub_cursor))
+
+    def flow_asset_dependencies(
+        self,
+        namespace: str,
+        id: str,
+        tenant: str,
+        kinds: Optional[List[RelationKind]] = None,
+        expand_all: Optional[bool] = None,
+        hub_cursor: Optional[str] = None,
+    ) -> AssetRelationGraph:
+        path = self._tenant_path(tenant, "flows", namespace, id, "asset-dependencies")
+        return self._json_request("GET", path, AssetRelationGraph, params=self._graph_params(kinds, expand_all, hub_cursor))
+
+    def _graph_params(
+        self,
+        kinds: Optional[List[RelationKind]],
+        expand_all: Optional[bool],
+        hub_cursor: Optional[str],
+    ) -> list:
+        params = list(self._build_query_params(expandAll=expand_all, hubCursor=hub_cursor).items())
+        self._append_repeated_param(params, "kinds", [_enum_value(k) for k in kinds] if kinds else None)
+        return params
+
+    # ---- Relations ----
+
+    def asset_relation_summary(
+        self, id: str, tenant: str, limit: Optional[int] = None
+    ) -> AssetsControllerApiRelationSummary:
+        path = self._tenant_path(tenant, "assets", id, "relations", "summary")
+        params = self._build_query_params(limit=limit)
+        return self._json_request("GET", path, AssetsControllerApiRelationSummary, params=params)
+
+    def asset_relations(
+        self,
+        id: str,
+        tenant: str,
+        kind: RelationKind,
+        direction: RelationDirection,
+        after: Optional[str] = None,
+        size: Optional[int] = None,
+    ) -> AssetsControllerApiRelationPage:
+        path = self._tenant_path(tenant, "assets", id, "relations")
+        params = self._build_query_params(
+            kind=_enum_value(kind), direction=_enum_value(direction), after=after, size=size
+        )
+        return self._json_request("GET", path, AssetsControllerApiRelationPage, params=params)
+
+    def create_asset_relation(
+        self, id: str, tenant: str, request: AssetsControllerApiRelationRequest
+    ) -> AssetsControllerApiRelation:
+        path = self._tenant_path(tenant, "assets", id, "relations")
+        return self._json_request("POST", path, AssetsControllerApiRelation, body=request)
+
+    def delete_asset_relation(self, id: str, uid: str, tenant: str) -> None:
+        path = self._tenant_path(tenant, "assets", id, "relations", uid)
+        self._void_request("DELETE", path)
+
+    # ---- Parent ----
+
+    def set_asset_parent(self, id: str, tenant: str, parent: AssetsControllerApiParentRequest) -> AssetsControllerApiAsset:
+        path = self._tenant_path(tenant, "assets", id, "parent")
+        return self._json_request("PUT", path, AssetsControllerApiAsset, body=parent)
+
+    def clear_asset_parent(self, id: str, tenant: str) -> AssetsControllerApiAsset:
+        path = self._tenant_path(tenant, "assets", id, "parent")
+        return self._json_request("DELETE", path, AssetsControllerApiAsset)
 
     # ---- Bulk delete ----
 
@@ -84,18 +152,6 @@ class AssetsApi(BaseApi):
         self._append_filter_params(params, filters)
         return self._json_request("DELETE", path, BulkResponse, params=params)
 
-    def delete_asset_lineage_events_by_query(self, tenant: str, filters: List[QueryFilter]) -> BulkResponse:
-        """Deprecated: see ``_LINEAGE_EVENTS_REMOVED``."""
-        warnings.warn(
-            f"delete_asset_lineage_events_by_query is deprecated: {_LINEAGE_EVENTS_REMOVED}",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        path = self._tenant_path(tenant, "assets", "lineage-events", "by-query")
-        params: list = []
-        self._append_filter_params(params, filters)
-        return self._json_request("DELETE", path, BulkResponse, params=params)
-
     def delete_asset_usages_by_query(self, tenant: str, filters: List[QueryFilter]) -> BulkResponse:
         path = self._tenant_path(tenant, "assets", "usages", "by-query")
         params: list = []
@@ -118,26 +174,6 @@ class AssetsApi(BaseApi):
         self._append_filter_params(params, filters)
         return self._json_request("GET", path, PagedResultsAssetsControllerApiAsset, params=params)
 
-    def search_asset_lineage_events(
-        self,
-        tenant: str,
-        page: Optional[int] = None,
-        size: Optional[int] = None,
-        sort: Optional[List[str]] = None,
-        filters: Optional[List[QueryFilter]] = None,
-    ) -> PagedResultsAssetsControllerApiAssetLineageEvent:
-        """Deprecated: see ``_LINEAGE_EVENTS_REMOVED``."""
-        warnings.warn(
-            f"search_asset_lineage_events is deprecated: {_LINEAGE_EVENTS_REMOVED}",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        path = self._tenant_path(tenant, "assets", "lineage-events", "search")
-        params = list(self._build_query_params(page=page, size=size).items())
-        self._append_repeated_param(params, "sort", sort)
-        self._append_filter_params(params, filters)
-        return self._json_request("GET", path, PagedResultsAssetsControllerApiAssetLineageEvent, params=params)
-
     def search_asset_usages(
         self,
         tenant: str,

{kestrapy-2.1.0.dev512 → kestrapy-2.1.0.dev528}/kestrapy/api/reusable_inputs_api.py

@@ -15,9 +15,12 @@ class ReusableInputsApi(BaseApi):
         tenant: str,
         page: Optional[int] = None,
         size: Optional[int] = None,
+        allow_draft: Optional[bool] = None,
     ) -> PagedResultsReusableInputsWithSource:
+        """Lists the blocks visible from a namespace, including those inherited from parent namespaces. Without
+        ``allow_draft``, only the blocks an execution can use are listed, each as the revision it would run."""
         path = self._tenant_path(tenant, "namespaces", namespace, "reusable-inputs")
-        params = self._build_query_params(page=page, size=size)
+        params = self._build_query_params(page=page, size=size, allowDraft=allow_draft)
         return self._json_request("GET", path, PagedResultsReusableInputsWithSource, params=params)
 
     def reusable_inputs(
@@ -26,9 +29,13 @@ class ReusableInputsApi(BaseApi):
         id: str,
         tenant: str,
         revision: Optional[int] = None,
+        allow_draft: Optional[bool] = None,
     ) -> ReusableInputsWithSource:
+        """Retrieves a block, resolving namespace inheritance. Without ``allow_draft``, the revision an execution
+        would use is returned: the latest that isn't a draft, unless ``revision`` is set; a block with only
+        drafts fails with a 422."""
         path = self._tenant_path(tenant, "namespaces", namespace, "reusable-inputs", id)
-        params = self._build_query_params(revision=revision)
+        params = self._build_query_params(revision=revision, allowDraft=allow_draft)
         return self._json_request("GET", path, ReusableInputsWithSource, params=params)
 
     def list_reusable_inputs_revisions(self, namespace: str, id: str, tenant: str) -> List[ReusableInputsWithSource]:
@@ -42,9 +49,12 @@ class ReusableInputsApi(BaseApi):
         tenant: str,
         body: str,
         fail_if_exists: Optional[bool] = None,
+        draft: Optional[bool] = None,
     ) -> ReusableInputsWithSource:
+        """Creates or updates a block from its YAML source. With ``draft``, the revision is saved as a draft,
+        which executions skip and which may be invalid."""
         path = self._tenant_path(tenant, "namespaces", namespace, "reusable-inputs", id)
-        params = self._build_query_params(failIfExists=fail_if_exists)
+        params = self._build_query_params(failIfExists=fail_if_exists, draft=draft)
         return self._json_request("PUT", path, ReusableInputsWithSource, params=params, body=body, content_type=self.YAML)
 
     def delete_reusable_inputs(self, namespace: str, id: str, tenant: str) -> None:

{kestrapy-2.1.0.dev512 → kestrapy-2.1.0.dev528}/kestrapy/configuration.py

@@ -530,7 +530,7 @@ conf = kestrapy.Configuration(
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2.0.0-SNAPSHOT\n"\
-               "SDK Package Version: 2.1.0.dev512".\
+               "SDK Package Version: 2.1.0.dev528".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:

{kestrapy-2.1.0.dev512 → kestrapy-2.1.0.dev528}/kestrapy/models/__init__.py

@@ -106,14 +106,22 @@ from kestrapy.models.assertion_run_error import AssertionRunError
 from kestrapy.models.asset import Asset
 from kestrapy.models.asset_failure_behavior import AssetFailureBehavior
 from kestrapy.models.asset_identifier import AssetIdentifier
-from kestrapy.models.asset_topology_graph import AssetTopologyGraph
-from kestrapy.models.asset_topology_graph_edge import AssetTopologyGraphEdge
-from kestrapy.models.asset_topology_graph_node import AssetTopologyGraphNode
-from kestrapy.models.asset_topology_graph_node_node_type import AssetTopologyGraphNodeNodeType
+from kestrapy.models.asset_relation_graph import AssetRelationGraph
+from kestrapy.models.asset_relation_graph_edge import AssetRelationGraphEdge
+from kestrapy.models.asset_relation_graph_node import AssetRelationGraphNode
+from kestrapy.models.asset_relation_ref import AssetRelationRef
+from kestrapy.models.asset_write_summary import AssetWriteSummary
 from kestrapy.models.assets_controller_api_asset import AssetsControllerApiAsset
-from kestrapy.models.assets_controller_api_asset_lineage_event import AssetsControllerApiAssetLineageEvent
 from kestrapy.models.assets_controller_api_asset_lock import AssetsControllerApiAssetLock
 from kestrapy.models.assets_controller_api_asset_usage import AssetsControllerApiAssetUsage
+from kestrapy.models.assets_controller_api_parent_request import AssetsControllerApiParentRequest
+from kestrapy.models.assets_controller_api_relation import AssetsControllerApiRelation
+from kestrapy.models.assets_controller_api_relation_group import AssetsControllerApiRelationGroup
+from kestrapy.models.assets_controller_api_relation_item import AssetsControllerApiRelationItem
+from kestrapy.models.assets_controller_api_relation_node import AssetsControllerApiRelationNode
+from kestrapy.models.assets_controller_api_relation_page import AssetsControllerApiRelationPage
+from kestrapy.models.assets_controller_api_relation_request import AssetsControllerApiRelationRequest
+from kestrapy.models.assets_controller_api_relation_summary import AssetsControllerApiRelationSummary
 from kestrapy.models.assets_controller_asset_lock_request import AssetsControllerAssetLockRequest
 from kestrapy.models.assets_declaration import AssetsDeclaration
 from kestrapy.models.assets_in_out import AssetsInOut
@@ -394,6 +402,7 @@ from kestrapy.models.namespace import Namespace
 from kestrapy.models.namespace_allowed_namespace import NamespaceAllowedNamespace
 from kestrapy.models.namespace_file_revision import NamespaceFileRevision
 from kestrapy.models.namespace_light import NamespaceLight
+from kestrapy.models.node_type import NodeType
 from kestrapy.models.notification import Notification
 from kestrapy.models.notification_controller_api_mark_all_read import NotificationControllerApiMarkAllRead
 from kestrapy.models.notification_controller_api_notification_history import NotificationControllerApiNotificationHistory
@@ -417,7 +426,6 @@ from kestrapy.models.paged_results_api_trigger_state import PagedResultsApiTrigg
 from kestrapy.models.paged_results_apps_controller_api_app import PagedResultsAppsControllerApiApp
 from kestrapy.models.paged_results_apps_controller_api_app_catalog_item import PagedResultsAppsControllerApiAppCatalogItem
 from kestrapy.models.paged_results_assets_controller_api_asset import PagedResultsAssetsControllerApiAsset
-from kestrapy.models.paged_results_assets_controller_api_asset_lineage_event import PagedResultsAssetsControllerApiAssetLineageEvent
 from kestrapy.models.paged_results_assets_controller_api_asset_usage import PagedResultsAssetsControllerApiAssetUsage
 from kestrapy.models.paged_results_audit_log_controller_api_audit_log_item import PagedResultsAuditLogControllerApiAuditLogItem
 from kestrapy.models.paged_results_blueprint import PagedResultsBlueprint
@@ -513,7 +521,11 @@ from kestrapy.models.quota_limit import QuotaLimit
 from kestrapy.models.quota_limit_controller_api_quota_limit_reset_request import QuotaLimitControllerApiQuotaLimitResetRequest
 from kestrapy.models.rbac_service_role_assignment_role_origin import RBACServiceRoleAssignmentRoleOrigin
 from kestrapy.models.relation import Relation
-from kestrapy.models.relation1 import Relation1
+from kestrapy.models.relation_direction import RelationDirection
+from kestrapy.models.relation_kind import RelationKind
+from kestrapy.models.relation_origin import RelationOrigin
+from kestrapy.models.relation_provenance import RelationProvenance
+from kestrapy.models.relation_state import RelationState
 from kestrapy.models.relation_type import RelationType
 from kestrapy.models.resolution import Resolution
 from kestrapy.models.resource import Resource

kestrapy-2.1.0.dev512/kestrapy/models/asset_topology_graph.py → kestrapy-2.1.0.dev528/kestrapy/models/asset_relation_graph.py

@@ -12,21 +12,22 @@ import pprint
 import regex as re
 import json
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, StrictBool
 from typing import Any, ClassVar, Dict, List, Optional
-from kestrapy.models.asset_topology_graph_edge import AssetTopologyGraphEdge
-from kestrapy.models.asset_topology_graph_node import AssetTopologyGraphNode
+from kestrapy.models.asset_relation_graph_edge import AssetRelationGraphEdge
+from kestrapy.models.asset_relation_graph_node import AssetRelationGraphNode
 from typing import Optional, Set
 from typing_extensions import Self
 
-class AssetTopologyGraph(BaseModel):
+class AssetRelationGraph(BaseModel):
     """
-    AssetTopologyGraph
+    AssetRelationGraph
     """ # noqa: E501
-    nodes: Optional[List[AssetTopologyGraphNode]] = None
-    edges: Optional[List[AssetTopologyGraphEdge]] = None
+    nodes: Optional[List[AssetRelationGraphNode]] = None
+    edges: Optional[List[AssetRelationGraphEdge]] = None
+    truncated: Optional[StrictBool] = None
     additional_properties: Dict[str, Any] = {}
-    __properties: ClassVar[List[str]] = ["nodes", "edges"]
+    __properties: ClassVar[List[str]] = ["nodes", "edges", "truncated"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -46,7 +47,7 @@ class AssetTopologyGraph(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of AssetTopologyGraph from a JSON string"""
+        """Create an instance of AssetRelationGraph from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -92,7 +93,7 @@ class AssetTopologyGraph(BaseModel):
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of AssetTopologyGraph from a dict"""
+        """Create an instance of AssetRelationGraph from a dict"""
         if obj is None:
             return None
 
@@ -100,8 +101,9 @@ class AssetTopologyGraph(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "nodes": [AssetTopologyGraphNode.from_dict(_item) for _item in obj["nodes"]] if obj.get("nodes") is not None else None,
-            "edges": [AssetTopologyGraphEdge.from_dict(_item) for _item in obj["edges"]] if obj.get("edges") is not None else None
+            "nodes": [AssetRelationGraphNode.from_dict(_item) for _item in obj["nodes"]] if obj.get("nodes") is not None else None,
+            "edges": [AssetRelationGraphEdge.from_dict(_item) for _item in obj["edges"]] if obj.get("edges") is not None else None,
+            "truncated": obj.get("truncated")
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

kestrapy-2.1.0.dev512/kestrapy/models/asset_topology_graph_edge.py → kestrapy-2.1.0.dev528/kestrapy/models/asset_relation_graph_edge.py

@@ -12,21 +12,26 @@ import pprint
 import regex as re
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from kestrapy.models.relation1 import Relation1
+from kestrapy.models.relation_kind import RelationKind
+from kestrapy.models.relation_origin import RelationOrigin
 from typing import Optional, Set
 from typing_extensions import Self
 
-class AssetTopologyGraphEdge(BaseModel):
+class AssetRelationGraphEdge(BaseModel):
     """
-    AssetTopologyGraphEdge
+    AssetRelationGraphEdge
     """ # noqa: E501
     source: Optional[StrictStr] = None
     target: Optional[StrictStr] = None
-    relation: Optional[Relation1] = None
+    kind: Optional[RelationKind] = None
+    directed: Optional[StrictBool] = None
+    role: Optional[StrictStr] = None
+    origin: Optional[RelationOrigin] = None
+    task_type: Optional[StrictStr] = Field(default=None, alias="taskType")
     additional_properties: Dict[str, Any] = {}
-    __properties: ClassVar[List[str]] = ["source", "target", "relation"]
+    __properties: ClassVar[List[str]] = ["source", "target", "kind", "directed", "role", "origin", "taskType"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -46,7 +51,7 @@ class AssetTopologyGraphEdge(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of AssetTopologyGraphEdge from a JSON string"""
+        """Create an instance of AssetRelationGraphEdge from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -74,11 +79,21 @@ class AssetTopologyGraphEdge(BaseModel):
             for _key, _value in self.additional_properties.items():
                 _dict[_key] = _value
 
+        # set to None if role (nullable) is None
+        # and model_fields_set contains the field
+        if self.role is None and "role" in self.model_fields_set:
+            _dict['role'] = None
+
+        # set to None if task_type (nullable) is None
+        # and model_fields_set contains the field
+        if self.task_type is None and "task_type" in self.model_fields_set:
+            _dict['taskType'] = None
+
         return _dict
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of AssetTopologyGraphEdge from a dict"""
+        """Create an instance of AssetRelationGraphEdge from a dict"""
         if obj is None:
             return None
 
@@ -88,7 +103,11 @@ class AssetTopologyGraphEdge(BaseModel):
         _obj = cls.model_validate({
             "source": obj.get("source"),
             "target": obj.get("target"),
-            "relation": obj.get("relation")
+            "kind": obj.get("kind"),
+            "directed": obj.get("directed"),
+            "role": obj.get("role"),
+            "origin": obj.get("origin"),
+            "taskType": obj.get("taskType")
         })
         # store additional fields in additional_properties
         for _key in obj.keys():