CheckmarxPythonSDK 1.4.7__tar.gz → 1.4.9__tar.gz

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxAccessControl/AccessControl.py

@@ -55,14 +55,9 @@ class AccessControl:
         Returns:
             list[User]
         """
-        result = []
         relative_url = self.sast_ac + "/AssignableUsers"
         response = self.api_client.get_request(relative_url=relative_url, is_iam=self.is_iam)
-        if response.status_code == OK:
-            result = [
-                construct_user(item) for item in response.json()
-            ]
-        return result
+        return [construct_user(item) for item in response.json() or []]
 
     def get_all_authentication_providers(self) -> List[AuthenticationProvider]:
         """

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/__init__.py

@@ -289,7 +289,9 @@ from .sastResultsPredicatesAPI import (
     get_all_predicates_for_similarity_id,
     get_latest_predicates_for_similarity_id,
     predicate_severity_and_state_by_similarity_id_and_project_id,
+    update_predicate_comment_by_predicate_id,
     recalculate_summary_counters,
+    delete_a_predicate_history,
 )
 from .sastResultsSummaryAPI import (
     SastResultsSummaryAPI,

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/accessManagementAPI.py

@@ -114,7 +114,7 @@ class AccessManagementAPI(object):
             AssignmentsForResource
         """
         relative_url = f"{api_url}/resource-assignments"
-        params = {"resource-ids": ",".join(resource_ids)}
+        params = {"resource-ids": ",".join(resource_ids) if resource_ids else None}
         response = self.api_client.get_request(relative_url=relative_url, params=params)
         return construct_assignments_for_resource(response.json())
 
@@ -164,7 +164,8 @@ class AccessManagementAPI(object):
             Assignment
         """
         relative_url = f"{api_url}/entities-for"
-        params = {"resource-id": resource_id, "resource-type": resource_type, "entity-types": ",".join(entity_types)}
+        params = {"resource-id": resource_id, "resource-type": resource_type,
+                  "entity-types": ",".join(entity_types) if entity_types else None}
         response = self.api_client.get_request(relative_url=relative_url, params=params)
         return construct_assignment(response.json())
 
@@ -190,7 +191,8 @@ class AccessManagementAPI(object):
         """
         relative_url = f"{api_url}/entities-for/extended"
         params = {
-            "resource-id": resource_id, "resource-type": resource_type, "entity-types": ",".join(entity_types),
+            "resource-id": resource_id, "resource-type": resource_type,
+            "entity-types": ",".join(entity_types) if entity_types else None,
             "sort-by": sort_by, "order": order, "limit": limit, "offset": offset, "search": search
         }
         response = self.api_client.get_request(relative_url=relative_url, params=params)
@@ -209,7 +211,7 @@ class AccessManagementAPI(object):
             List[Assignment]
         """
         relative_url = f"{api_url}/resources-for"
-        params = {"entity-id": entity_id, "resource-types": ",".join(resource_types)}
+        params = {"entity-id": entity_id, "resource-types": ",".join(resource_types) if resource_types else None}
         response = self.api_client.get_request(relative_url=relative_url, params=params)
         return [construct_assignment(assignment) for assignment in response.json()]
 
@@ -246,7 +248,7 @@ class AccessManagementAPI(object):
             bool
         """
         relative_url = f"{api_url}/has-access-to-groups"
-        params = {"group-ids": ",".join(group_ids), "project-id": project_id}
+        params = {"group-ids": ",".join(group_ids) if group_ids else None, "project-id": project_id}
         response = self.api_client.get_request(relative_url=relative_url, params=params)
         return response.status_code == OK
 
@@ -269,7 +271,7 @@ class AccessManagementAPI(object):
             ResourcesResponse
         """
         relative_url = f"{api_url}/get-resources"
-        params = {"resource-types": ",".join(resource_types), "action": action}
+        params = {"resource-types": ",".join(resource_types) if resource_types else None, "action": action}
         response = self.api_client.get_request(relative_url=relative_url, params=params)
         return construct_resources_response(response.json())
 
@@ -304,7 +306,8 @@ class AccessManagementAPI(object):
         """Get a list of users with the resources assigned to each user."""
         relative_url = f"{api_url}/users-resources"
         params = {
-            "search": search, "base-roles": ",".join(base_roles), "username": ",".join(usernames),
+            "search": search, "base-roles": ",".join(base_roles) if base_roles else None,
+            "username": ",".join(usernames) if usernames else None,
             "empty-assignments": empty_assignments, "no-groups": no_groups, "created-from": created_from,
             "created-to": created_to, "sort-by": sort_by, "order": order, "limit": limit, "offset": offset
         }
@@ -342,7 +345,8 @@ class AccessManagementAPI(object):
         """
         relative_url = f"{api_url}/clients-resources"
         params = {
-            "search": search, "base-roles": base_roles, "client-id": ",".join(client_ids),
+            "search": search, "base-roles": ",".join(base_roles) if base_roles else None,
+            "client-id": ",".join(client_ids) if client_ids else None,
             "empty-assignments": empty_assignments, "sort-by": sort_by, "order": order,
             "limit": limit, "offset": offset, "no-groups": no_groups, "created-from": created_from,
             "created-to": created_to
@@ -381,7 +385,8 @@ class AccessManagementAPI(object):
         """
         relative_url = f"{api_url}/groups-resources"
         params = {
-            "search": search, "base-roles": base_roles, "name": ",".join(names), "empty-assignments": empty_assignments,
+            "search": search, "base-roles": ",".join(base_roles) if base_roles else None,
+            "name": ",".join(names) if names else None, "empty-assignments": empty_assignments,
             "no-members": no_members, "sort-by": sort_by, "created-from": created_from, "created-to": created_to,
             "order": order, "limit": limit, "offset": offset
         }
@@ -504,7 +509,7 @@ class AccessManagementAPI(object):
         return construct_groups_response(response.json())
 
     def retrieve_groups(
-            self, limit: int = None, offset: int = None, search: str = None, ids: List[str] = None
+            self, limit: int = None, offset: int = None, search: str = None, ids: List[str] = ()
     ) -> List[Group]:
         """
         Get info about user groups in the tenant account

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/applicationsAPI.py

@@ -2,11 +2,11 @@
 from CheckmarxPythonSDK.utilities.compat import NO_CONTENT, CREATED
 from .utilities import type_check
 from .dto import (
-    Application, construct_application_rules, construct_application,
+    Application, construct_application,
     ApplicationInput,
-    ApplicationsCollection,
-    CreatedApplication,
-    Rule,
+    ApplicationsCollection, construct_applications_collection,
+    CreatedApplication, construct_created_application,
+    Rule, construct_rule,
     RuleInput,
 )
 from CheckmarxPythonSDK.api_client import ApiClient
@@ -36,16 +36,7 @@ class ApplicationsAPI(object):
         relative_url = api_url
         response = self.api_client.post_request(relative_url=relative_url, json=application_input.to_dict())
         item = response.json()
-        return CreatedApplication(
-            application_id=item.get("id"),
-            name=item.get("name"),
-            description=item.get("description"),
-            criticality=item.get("criticality"),
-            rules=construct_application_rules(item.get("rules")),
-            tags=item.get("tags"),
-            created_at=item.get("createdAt"),
-            updated_at=item.get("updatedAt")
-        )
+        return construct_created_application(item)
 
     def get_a_list_of_applications(
             self, offset: int = 0, limit: int = 20, name: str = None, tags_keys: List[str] = None,
@@ -70,14 +61,8 @@ class ApplicationsAPI(object):
         relative_url = api_url
         params = {"offset": offset, "limit": limit, "name": name, "tags-keys": tags_keys, "tags-values": tags_values}
         response = self.api_client.get_request(relative_url=relative_url, params=params)
-        app_collection = response.json()
-        return ApplicationsCollection(
-            total_count=app_collection.get("totalCount"),
-            filtered_total_count=app_collection.get("filteredTotalCount"),
-            applications=[
-                construct_application(app) for app in app_collection.get("applications")
-            ]
-        )
+        item = response.json()
+        return construct_applications_collection(item)
 
     def get_application_id_by_name(self, name: str) -> str:
         """
@@ -93,7 +78,7 @@ class ApplicationsAPI(object):
         app_collection = self.get_a_list_of_applications(name=name)
         applications = app_collection.applications
         if applications:
-            application_id = applications[0].application_id
+            application_id = applications[0].id
         return application_id
 
     def get_all_application_tags(self) -> dict:
@@ -174,12 +159,8 @@ class ApplicationsAPI(object):
         relative_url = api_url + "/{id}/project-rules".format(id=application_id)
         type_check(rule_input, RuleInput)
         response = self.api_client.post_request(relative_url=relative_url, json=rule_input.to_dict())
-        rule = response.json()
-        return Rule(
-            rule_id=rule.get("id"),
-            rule_type=rule.get("type"),
-            value=rule.get("value")
-        )
+        item = response.json()
+        return construct_rule(item)
 
     def get_a_list_of_rules_for_a_specific_application(self, application_id: str) -> List[Rule]:
         """
@@ -194,7 +175,7 @@ class ApplicationsAPI(object):
         relative_url = api_url + "/{id}/project-rules".format(id=application_id)
         response = self.api_client.get_request(relative_url=relative_url)
         rules = response.json()
-        return construct_application_rules(rules)
+        return [construct_rule(rule) for rule in rules or []]
 
     def get_an_application_rule(self, application_id: str, rule_id: str) -> Rule:
         """
@@ -212,12 +193,8 @@ class ApplicationsAPI(object):
             id=application_id, rule_id=rule_id
         )
         response = self.api_client.get_request(relative_url=relative_url)
-        rule = response.json()
-        return Rule(
-            rule_id=rule.get("id"),
-            rule_type=rule.get("type"),
-            value=rule.get("value")
-        )
+        item = response.json()
+        return construct_rule(item)
 
     def update_an_application_rule(self, application_id: str, rule_id: str, rule_input: RuleInput) -> bool:
         """
@@ -233,14 +210,11 @@ class ApplicationsAPI(object):
         type_check(application_id, str)
         type_check(rule_id, str)
         type_check(rule_input, RuleInput)
-        is_successful = False
         relative_url = api_url + "/{id}/project-rules/{rule_id}".format(
             id=application_id, rule_id=rule_id
         )
         response = self.api_client.put_request(relative_url=relative_url, json=rule_input.to_dict())
-        if response.status_code in (NO_CONTENT, CREATED):
-            is_successful = True
-        return is_successful
+        return response.status_code in (NO_CONTENT, CREATED)
 
     def delete_an_application_rule(self, application_id: str, rule_id: str) -> bool:
         """

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/byorResultsHandlerAPI.py

@@ -4,7 +4,7 @@ from CheckmarxPythonSDK.utilities.compat import NO_CONTENT
 from .utilities import type_check
 from .dto import (
     ImportRequest,
-    ImportResults,
+    ImportResults, construct_import_results,
     TriageRequest,
     TriageResponse, construct_triage_response,
 )
@@ -33,7 +33,7 @@ class ByorResultsHandlerAPI(object):
         relative_url = api_url + "/imports"
         response = self.api_client.post_request(relative_url=relative_url, json=import_request.to_dict())
         item = response.json()
-        return ImportResults(import_id=item.get("importId"))
+        return construct_import_results(item)
 
     def save_triage(self, triage_request: TriageRequest) -> bool:
         """

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/byorResultsHandlerV2API.py

@@ -5,7 +5,7 @@ from CheckmarxPythonSDK.utilities.compat import NO_CONTENT
 from .utilities import type_check
 from .dto import (
     ImportRequest,
-    ImportResults,
+    ImportResults, construct_import_results,
     ByorJob, construct_byor_job,
     ByorJobPatchRequest,
 )
@@ -34,7 +34,7 @@ class ByorResultsHandlerV2API(object):
         relative_url = api_url + "/imports"
         response = self.api_client.post_request(relative_url=relative_url, json=import_request.to_dict())
         item = response.json()
-        return ImportResults(import_id=item.get("importId"))
+        return construct_import_results(item)
 
     def get_job_by_id(self, job_id: str) -> ByorJob:
         """

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/cloudInsightsServiceAPI.py

@@ -210,7 +210,8 @@ class CloudInsightsServiceAPI(object):
         relative_url = api_url + f"/accounts/{account_id}/resources"
         params = {
             "image-name": image_name, "image-short-name": image_short_name, "public-exposed": public_exposed,
-            "search": search, "cluster-name": ",".join(cluster_names), "asset-type": ",".join(asset_types),
+            "search": search, "cluster-name": ",".join(cluster_names) if cluster_names else None,
+            "asset-type": ",".join(asset_types) if asset_types else None,
             "resource-type": resource_type,
             "offset": offset, "limit": limit, "order-column": order_column, "order-direction": order_direction,
         }

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/contributorsAPI.py

@@ -1,7 +1,7 @@
 from CheckmarxPythonSDK.api_client import ApiClient
 from CheckmarxPythonSDK.CxOne.config import construct_configuration
 from .dto import (
-    Contributors,
+    Contributors, construct_contributors,
     ContributorInsights, construct_contributor_insights,
     ContributorUnfamiliarProjects, construct_contributor_unfamiliar_projects,
 
@@ -27,10 +27,7 @@ class ContributorsAPI(object):
         relative_url = api_url
         response = self.api_client.get_request(relative_url=relative_url)
         item = response.json()
-        return Contributors(
-            allowed_contributors=item.get("allowedContributors"),
-            current_contributors=item.get("currentContributors")
-        )
+        return construct_contributors(item)
 
     def get_contributors_details_for_current_tenant_exported_in_csv(self) -> bytes:
         """

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/customStateAPI.py

@@ -43,7 +43,9 @@ class CustomStateAPI(object):
         params = {"include-deleted": include_deleted}
         response = self.api_client.get_request(relative_url=relative_url, params=params)
         item = response.json()
-        return [construct_custom_state(custom_state) for custom_state in item]
+        return [
+            construct_custom_state(custom_state) for custom_state in item or []
+        ]
 
     def create_a_custom_state(self, name: str) -> Response:
         response = self.api_client.post_request(relative_url=api_url, json={"name": name})

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/dto/AddAssignmentRoles.py

@@ -4,9 +4,9 @@ from typing import List
 
 @dataclass
 class AddAssignmentRoles:
-    entity_id: str
-    resource_id: str
-    entity_roles: List[str]
+    entity_id: str = None
+    resource_id: str = None
+    entity_roles: List[str] = None
 
     def to_dict(self):
         return {

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/dto/Application.py

@@ -1,11 +1,11 @@
 from dataclasses import dataclass
 from typing import List
-from .Rule import Rule
+from .Rule import Rule, construct_rule
 
 
 @dataclass
 class Application:
-    application_id: str = None
+    id: str = None
     name: str = None
     description: str = None
     criticality: int = None
@@ -16,24 +16,15 @@ class Application:
     tags: dict = None
 
 
-def construct_application_rules(rules) -> List[Rule]:
-    rules = rules or []
-    return [
-        Rule(
-            rule_id=rule.get("id"),
-            rule_type=rule.get("type"),
-            value=rule.get("value")
-        ) for rule in rules
-    ]
-
-
 def construct_application(item):
     return Application(
-        application_id=item.get("id"),
+        id=item.get("id"),
         name=item.get("name"),
         description=item.get("description"),
         criticality=item.get("criticality"),
-        rules=construct_application_rules(item.get("rules")),
+        rules=[
+            construct_rule(rule) for rule in item.get("rules", [])
+        ],
         project_ids=item.get("projectIds"),
         created_at=item.get("createdAt"),
         updated_at=item.get("updatedAt"),

checkmarxpythonsdk-1.4.9/CheckmarxPythonSDK/CxOne/dto/ApplicationInput.py

@@ -0,0 +1,32 @@
+from dataclasses import dataclass
+from typing import List
+from .RuleInput import RuleInput
+
+
+@dataclass
+class ApplicationInput:
+    name: str
+    description: str = None
+    criticality: int = 3
+    rules: List[RuleInput] = None
+    tags: dict = None
+
+    def to_dict(self):
+        data = {
+            "name": self.name
+        }
+        if self.description:
+            data.update({"description": self.description})
+        if self.criticality:
+            data.update({"criticality": self.criticality})
+        if self.rules:
+            data.update({"rules": [
+                {
+                    "type": rule.type,
+                    "value": rule.value,
+                } for rule in self.rules
+            ]
+            })
+        if self.tags:
+            data.update({"tags": self.tags})
+        return data

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/dto/ApplicationsCollection.py

@@ -15,6 +15,6 @@ def construct_applications_collection(item):
         total_count=item.get("totalCount"),
         filtered_total_count=item.get("filteredTotalCount"),
         applications=[
-            construct_application(application) for application in item.get("applications")
+            construct_application(application) for application in item.get("applications", [])
         ]
     )

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/dto/AssignmentsForResource.py

@@ -18,6 +18,6 @@ def construct_assignments_for_resource(item) -> AssignmentsForResource:
     return AssignmentsForResource(
         resource_id=item.get("resourceID"),
         assignments=[
-            construct_assignment(assignment) for assignment in item.get("assignments")
+            construct_assignment(assignment) for assignment in item.get("assignments", [])
         ]
     )

checkmarxpythonsdk-1.4.9/CheckmarxPythonSDK/CxOne/dto/AsyncRequestResponse.py

@@ -0,0 +1,17 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class AsyncRequestResponse:
+    id: str = None
+
+    def to_dict(self):
+        return {
+            "id": self.id
+        }
+
+
+def construct_async_request_response(item):
+    return AsyncRequestResponse(
+        id=item.get("id")
+    )

checkmarxpythonsdk-1.4.9/CheckmarxPythonSDK/CxOne/dto/AuditQuery.py

@@ -0,0 +1,13 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class AuditQuery:
+    id: str = None
+    source: str = None
+
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "source": self.source,
+        }

checkmarxpythonsdk-1.4.9/CheckmarxPythonSDK/CxOne/dto/BflTree.py

@@ -0,0 +1,31 @@
+from dataclasses import dataclass
+from .ResultNode import ResultNode, construct_result_node
+from .SastResult import SastResult, construct_sast_result
+from typing import List
+
+
+@dataclass
+class BflTree:
+    """
+    Attributes:
+        id (str): tree ID in the forest
+        bfl (ResultNode): Best Fix Location node of the tree
+        results (list of SastResult): results for the BFL node
+        additional_properties (dict): the additional properties will be added if include-graph is set to true
+
+    """
+    id: str = None
+    bfl: ResultNode = None
+    results: List[SastResult] = None
+    additional_properties: dict = None
+
+
+def construct_bfl_tree(item):
+    return BflTree(
+        id=item.get("id"),
+        bfl=construct_result_node(item.get("bfl")),
+        results=[
+            construct_sast_result(result) for result in item.get("results", [])
+        ],
+        additional_properties=item.get("additionalProperties")
+    )

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/dto/ByorJob.py

@@ -2,7 +2,7 @@ from dataclasses import dataclass
 
 
 @dataclass
-class ByorJob(object):
+class ByorJob:
     id: str = None
     project_id: str = None
     status: str = None

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/dto/ByorJobPatchRequest.py

@@ -2,7 +2,7 @@ from dataclasses import dataclass
 
 
 @dataclass
-class ByorJobPatchRequest(object):
+class ByorJobPatchRequest:
     status: str = None  # Canceled is the only valid input.
 
     def to_dict(self):

checkmarxpythonsdk-1.4.9/CheckmarxPythonSDK/CxOne/dto/Category.py

@@ -0,0 +1,24 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class Category:
+    """
+    Attributes:
+        id (int):
+        name (str):
+        sast_id (int):
+
+    """
+
+    id: int = None
+    name: str = None
+    sast_id: int = None
+
+
+def construct_category(item):
+    return Category(
+        id=item.get("id"),
+        name=item.get("name"),
+        sast_id=item.get("sastId")
+    )

checkmarxpythonsdk-1.4.9/CheckmarxPythonSDK/CxOne/dto/CategoryType.py

@@ -0,0 +1,33 @@
+from dataclasses import dataclass
+from .Category import Category, construct_category
+from typing import List
+
+
+@dataclass
+class CategoryType:
+
+    """
+    Attributes:
+        id (int):
+        name (str):
+        sast_id (int):
+        order (int):
+        categories (list of Category):
+    """
+    id: int = None
+    name: str = None
+    sast_id: int = None
+    order: int = None
+    categories: List[Category] = None
+
+
+def construct_category_type(item):
+    return CategoryType(
+        id=item.get("id"),
+        name=item.get("name"),
+        sast_id=item.get("sastId"),
+        order=item.get("order"),
+        categories=[
+            construct_category(category) for category in item.get("categories", [])
+        ]
+    )

checkmarxpythonsdk-1.4.9/CheckmarxPythonSDK/CxOne/dto/ChangeDetails.py

@@ -0,0 +1,33 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class ChangeDetails:
+    """
+
+    Attributes:
+        engine_version_changed (booL):
+        engine_version_changed_details (str):
+        query_changed (bool):
+        query_changed_details (str):
+        code_change (bool):
+        code_change_details (str):
+    """
+
+    engine_version_changed: bool = None
+    engine_version_changed_details: str = None
+    query_changed: bool = None
+    query_changed_details: str = None
+    code_change: bool = None
+    code_change_details: str = None
+    
+    
+def construct_change_details(item):
+    return ChangeDetails(
+            engine_version_changed=item.get("engineVersionChanged"),
+            engine_version_changed_details=item.get("engineVersionChangeDetails"),
+            query_changed=item.get("queryChanged"),
+            query_changed_details=item.get("queryChangeDetails"),
+            code_change=item.get("codeChanged"),
+            code_change_details=item.get("codeChangeDetails")
+        )

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/dto/Client.py

@@ -58,7 +58,7 @@ def construct_client(item):
         full_scope_allowed=item.get("fullScopeAllowed"),
         node_re_registration_timeout=item.get("nodeReRegistrationTimeout"),
         protocol_mappers=[
-            construct_protocol_mappers_representation(item.get("protocolMappers"))
+            construct_protocol_mappers_representation(mapper) for mapper in item.get("protocolMappers", [])
         ],
         default_client_scopes=item.get("defaultClientScopes"),
     )

{checkmarxpythonsdk-1.4.7 → checkmarxpythonsdk-1.4.9}/CheckmarxPythonSDK/CxOne/dto/ClientsWithResourcesResponse.py

@@ -1,13 +1,13 @@
 from dataclasses import dataclass
 from typing import List
-from .ClientWithResource import construct_client_with_resource
+from .ClientWithResource import ClientWithResource, construct_client_with_resource
 
 
 @dataclass
 class ClientsWithResourcesResponse:
     total_count: int = None
     filtered_count: int = None
-    clients: List[dict] = None
+    clients: List[ClientWithResource] = None
 
 
 def construct_clients_with_resources_response(item):
@@ -15,6 +15,6 @@ def construct_clients_with_resources_response(item):
         total_count=item.get("totalCount"),
         filtered_count=item.get("filteredCount"),
         clients=[
-            construct_client_with_resource(client) for client in item.get("clients")
+            construct_client_with_resource(client) for client in item.get("clients", [])
         ]
     )