acex-client 4.2.0__tar.gz → 4.2.2__tar.gz

{acex_client-4.2.0 → acex_client-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acex-client
-Version: 4.2.0
+Version: 4.2.2
 Summary: ACE-X CLIENT - Client for ACE-X
 License: AGPL-3.0
 Keywords: automation,control
@@ -11,9 +11,9 @@ Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: acex (>=4.3.0,<5.0.0)
-Requires-Dist: acex-devkit (>=1.3.0,<2.0.0)
-Requires-Dist: acex-driver-cisco-ioscli (>=0.0.17,<0.0.18)
+Requires-Dist: acex (>=5.5.0,<6.0.0)
+Requires-Dist: acex-devkit (>=1.5.1,<2.0.0)
+Requires-Dist: acex-driver-cisco-ioscli (>=0.4.1,<0.5.0)
 Requires-Dist: datamodel-code-generator (>=0.43.1,<0.44.0)
 Requires-Dist: datetime (>=6.0,<7.0)
 Requires-Dist: pydantic (>=2.12.5,<3.0.0)

{acex_client-4.2.0 → acex_client-4.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "acex-client"
-version = "4.2.0"
+version = "4.2.2"
 description = "ACE-X CLIENT - Client for ACE-X"
 authors = ["Johan Lahti <johan.lahti@acebit.se>"]
 readme = "README.md"
@@ -18,9 +18,9 @@ requests = "^2.32.5"
 datamodel-code-generator = "^0.43.1"
 pydantic = "^2.12.5"
 datetime = "^6.0"
-acex = "^4.3.0"
-acex-devkit = "^1.3.0"
-acex-driver-cisco-ioscli = "^0.0.17"
+acex = "^5.5.0"
+acex-devkit = "^1.5.1"
+acex-driver-cisco-ioscli = "^0.4.1"
 
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]

{acex_client-4.2.0 → acex_client-4.2.2}/src/acex_client/acex/resources/neds.py

@@ -13,25 +13,25 @@ class Neds(Resource):
 
     def __init__(self, rest_client):
         self.rest = rest_client
-        self.drivers = {}
-        self._load_installed_drivers()
-
-    def _load_installed_drivers(self):
-        """
-        Loads installed drivers into self.drivers
-        """
-        for entry_point in entry_points(group="acex.neds"):
-            try:
-                _class = entry_point.load()
-                instance = _class()
-                version = entry_point.dist.version 
-                self.drivers[_class.__name__] = {
-                    "instance": instance,
-                    "version": version,
-                    "package_name": entry_point.dist.name
-                }
-            except Exception as e:
-                print(f"Error when loading {entry_point.name}: {e}")
+        self._drivers = None
+
+    @property
+    def drivers(self):
+        if self._drivers is None:
+            self._drivers = {}
+            for entry_point in entry_points(group="acex.neds"):
+                try:
+                    _class = entry_point.load()
+                    instance = _class()
+                    version = entry_point.dist.version
+                    self._drivers[_class.__name__] = {
+                        "instance": instance,
+                        "version": version,
+                        "package_name": entry_point.dist.name,
+                    }
+                except Exception as e:
+                    print(f"Error when loading {entry_point.name}: {e}")
+        return self._drivers
 
     def _url_for_wheel(self, ned: Ned) -> str:
         """

acex_client-4.2.2/src/acex_client/acex/resources/node_instances.py

@@ -0,0 +1,11 @@
+
+from acex_devkit.models import NodeResponse, NodeListItem
+from .resource_base import Resource
+
+
+class NodeInstances(Resource):
+
+    ENDPOINT = "/inventory/node_instances/"
+    RESPONSE_MODEL_SINGLE = NodeResponse
+    RESPONSE_MODEL_LIST = NodeListItem
+

acex_client-4.2.2/src/acex_client/acex/resources/resource_base.py

@@ -0,0 +1,63 @@
+class PaginatedResult:
+    """Wraps a paginated API response with iteration support."""
+
+    def __init__(self, items, total, limit, offset):
+        self.items = items
+        self.total = total
+        self.limit = limit
+        self.offset = offset
+
+    def __iter__(self):
+        return iter(self.items)
+
+    def __len__(self):
+        return len(self.items)
+
+    def __bool__(self):
+        return len(self.items) > 0
+
+
+class Resource:
+
+    def __init__(self, rest_client):
+        self.rest = rest_client
+
+    @property
+    def ep(self):
+        return self.__class__.ENDPOINT or ""
+
+    @property
+    def list_model(self):
+        return self.__class__.RESPONSE_MODEL_LIST
+
+    @property
+    def single_model(self):
+        return self.__class__.RESPONSE_MODEL_SINGLE
+
+    def get(self, id):
+        data = self.rest.get_item(self.ep, id)
+        if data != {}:
+            return self.single_model(**data)
+
+    def query(self, limit=100, offset=0, **filters):
+        """Query with pagination and filters. Returns PaginatedResult."""
+        params = {k: v for k, v in filters.items() if v is not None}
+        params["limit"] = limit
+        params["offset"] = offset
+        data = self.rest.query_items(self.ep, params=params)
+
+        # Handle paginated response: {items: [...], total: N, limit: N, offset: N}
+        if isinstance(data, dict) and "items" in data:
+            items = [self.list_model(**item) for item in data["items"]]
+            return PaginatedResult(items, data["total"], data["limit"], data["offset"])
+
+        # Handle plain list response (e.g. NEDs endpoint)
+        if isinstance(data, list):
+            items = [self.list_model(**item) for item in data]
+            return PaginatedResult(items, len(items), len(items), 0)
+
+        return PaginatedResult([], 0, limit, offset)
+
+    def get_all(self):
+        """Backwards-compatible: returns list of all items."""
+        return self.query().items

{acex_client-4.2.0 → acex_client-4.2.2}/src/acex_client/models/generated_models.py

@@ -35,7 +35,7 @@ class AssetClusterCreate(BaseModel):
 
 class AssetRefType(Enum):
     asset = 'asset'
-    assetcluster = 'assetcluster'
+    asset_cluster = 'asset_cluster'
 
 
 class AssetResponse(BaseModel):

{acex_client-4.2.0 → acex_client-4.2.2}/src/acex_client/restclient/restclient.py

@@ -18,8 +18,8 @@ class RestClient:
             data = {}
         return data
 
-    def query_items(self, endpoint: str, params: dict = {}, limit: int = 100, cursor: str = None): 
+    def query_items(self, endpoint: str, params: dict = None):
         url = f"{self.url}{endpoint}"
-        response = requests.get(url, verify=self.verify)
+        response = requests.get(url, params=params, verify=self.verify)
         data = response.json()
         return data

acex_client-4.2.0/src/acex_client/acex/resources/node_instances.py

@@ -1,11 +0,0 @@
-
-from acex_client.models.generated_models import Node, Ned
-from acex_devkit.models import NodeResponse
-from .resource_base import Resource
-
-class NodeInstances(Resource):
-
-    ENDPOINT =  "/inventory/node_instances/"
-    RESPONSE_MODEL_SINGLE = NodeResponse
-    RESPONSE_MODEL_LIST = Node
-

acex_client-4.2.0/src/acex_client/acex/resources/resource_base.py

@@ -1,56 +0,0 @@
-
-
-
-class Resource:
-
-    def __init__(
-            self,
-            rest_client
-        ):
-        self.rest = rest_client
-
-    @property
-    def ep(self):
-        """
-        Each resource that inherits this class
-        can set their specific endpoint as a class
-        variable and get it using this prop.
-        """
-        return self.__class__.ENDPOINT or ""
-
-    @property
-    def list_model(self):
-        """
-        Each resource define their specific response model 
-        as a class variable that can be used via this 
-        property. this property handles the model
-        used when listing multiple items.
-        """
-        return self.__class__.RESPONSE_MODEL_LIST
-
-    @property
-    def single_model(self):
-        """
-        Each resource define their specific response model 
-        as a class variable that can be used via this 
-        property. this property handles the model
-        used when getting single item.
-        """
-        return self.__class__.RESPONSE_MODEL_SINGLE
-
-
-    def get(self, id):
-        data = self.rest.get_item(self.ep, id)
-
-        if data != {}:
-            resource = self.single_model(**data)
-            return resource    
-
-    def get_all(self):
-        response = []
-        api_response = self.rest.query_items(self.ep)
-
-        for resource in api_response:
-            response.append(self.list_model(**resource))
-
-        return response