acex-devkit 1.6.0__tar.gz → 1.6.2__tar.gz

{acex_devkit-1.6.0 → acex_devkit-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acex-devkit
-Version: 1.6.0
+Version: 1.6.2
 Summary: ACE-X DevKit - Development kit for building ACE-X drivers and plugins
 License: AGPL-3.0
 Keywords: automation,devkit,sdk,drivers,plugins

{acex_devkit-1.6.0 → acex_devkit-1.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "acex-devkit"
-version = "1.6.0"
+version = "1.6.2"
 description = "ACE-X DevKit - Development kit for building ACE-X drivers and plugins"
 authors = ["Johan Lahti <johan.lahti@acebit.se>"]
 readme = "README.md"

{acex_devkit-1.6.0 → acex_devkit-1.6.2}/src/acex_devkit/models/node_response.py

@@ -1,28 +1,48 @@
 from pydantic import BaseModel, Field
-from typing import Optional, Dict, Any
+from typing import Annotated, Optional, Dict, Any, List, Literal, Union
 from enum import Enum
 from datetime import datetime
 from acex_devkit.models.composed_configuration import ComposedConfiguration
 
 
 class LogicalNodeResponse(BaseModel):
-    id: Optional[int] = Field(None, title='Id')
-    hostname: Optional[str] = Field('R1', title='Hostname')
-    role: Optional[str] = Field('core', title='Role')
-    site: Optional[str] = Field('HQ', title='Site')
-    sequence: Optional[int] = Field(1, title='Sequence')
-    configuration: Optional[ComposedConfiguration] = ComposedConfiguration()
-    meta_data: Optional[Dict[str, Any]] = Field(None, title='Meta Data')
+    id: Optional[int] = None
+    hostname: Optional[str] = None
+    role: Optional[str] = None
+    site: Optional[str] = None
+    sequence: Optional[int] = None
+    configuration: Optional[ComposedConfiguration] = None
+    meta_data: Optional[Dict[str, Any]] = None
 
 
 class Asset(BaseModel):
     id: Optional[int] = None
-    vendor: str = None
-    serial_number: str
-    os: str
-    os_version: str
-    hardware_model: str
+    type: Literal["asset"] = "asset"
+    vendor: Optional[str] = None
+    serial_number: Optional[str] = None
+    os: Optional[str] = None
+    os_version: Optional[str] = None
+    hardware_model: Optional[str] = None
+    ned_id: Optional[str] = None
+
+
+class AssetClusterAsset(BaseModel):
+    id: Optional[int] = None
+    vendor: Optional[str] = None
+    serial_number: Optional[str] = None
+    os: Optional[str] = None
+    os_version: Optional[str] = None
+    hardware_model: Optional[str] = None
+    ned_id: Optional[str] = None
+    cluster_index: Optional[int] = None
+
+
+class AssetCluster(BaseModel):
+    id: Optional[int] = None
+    type: Literal["asset_cluster"] = "asset_cluster"
+    name: Optional[str] = None
     ned_id: Optional[str] = None
+    assets: List[AssetClusterAsset] = []
 
 
 class AssetRefType(str, Enum):
@@ -39,9 +59,9 @@ class NodeStatus(str, Enum):
 
 class NodeBase(BaseModel):
     asset_ref_id: int
-    asset_ref_type: AssetRefType = AssetRefType.asset
+    asset_ref_type: Optional[AssetRefType] = None
     logical_node_id: int
-    status: NodeStatus = NodeStatus.planned
+    status: Optional[NodeStatus] = None
 
 class Node(NodeBase):
     id: Optional[int] = None
@@ -65,7 +85,7 @@ class NodeListItem(NodeBase):
 
 class NodeResponse(NodeBase):
     id: Optional[int] = None
-    asset: Asset
+    asset: Annotated[Union[Asset, AssetCluster], Field(discriminator="type")]
     logical_node: LogicalNodeResponse
     created_at: datetime
     updated_at: Optional[datetime] = None