Sort imports using isort

Author: peritz

pycti/__init__.py

@@ -12,6 +12,9 @@
 from .connector.opencti_metric_handler import OpenCTIMetricHandler
 from .entities.opencti_attack_pattern import AttackPattern
 from .entities.opencti_campaign import Campaign
+
+# Administrative entities
+from .entities.opencti_capability import Capability
 from .entities.opencti_case_incident import CaseIncident
 from .entities.opencti_case_rfi import CaseRfi
 from .entities.opencti_case_rft import CaseRft
@@ -21,6 +24,7 @@
 from .entities.opencti_data_source import DataSource
 from .entities.opencti_external_reference import ExternalReference
 from .entities.opencti_feedback import Feedback
+from .entities.opencti_group import Group
 from .entities.opencti_grouping import Grouping
 from .entities.opencti_identity import Identity
 from .entities.opencti_incident import Incident
@@ -37,6 +41,8 @@
 from .entities.opencti_observed_data import ObservedData
 from .entities.opencti_opinion import Opinion
 from .entities.opencti_report import Report
+from .entities.opencti_role import Role
+from .entities.opencti_settings import Settings
 from .entities.opencti_stix_core_relationship import StixCoreRelationship
 from .entities.opencti_stix_cyber_observable import StixCyberObservable
 from .entities.opencti_stix_domain_object import StixDomainObject
@@ -50,15 +56,8 @@
 from .entities.opencti_threat_actor_group import ThreatActorGroup
 from .entities.opencti_threat_actor_individual import ThreatActorIndividual
 from .entities.opencti_tool import Tool
-from .entities.opencti_vulnerability import Vulnerability
-
-# Administrative entities
-from .entities.opencti_capability import Capability
-from .entities.opencti_role import Role
-from .entities.opencti_group import Group
 from .entities.opencti_user import User
-from .entities.opencti_settings import Settings
-
+from .entities.opencti_vulnerability import Vulnerability
 from .utils.constants import (
     CustomObjectCaseIncident,
     CustomObjectChannel,

pycti/api/opencti_api_client.py

@@ -14,6 +14,7 @@
 from pycti.api.opencti_api_work import OpenCTIApiWork
 from pycti.entities.opencti_attack_pattern import AttackPattern
 from pycti.entities.opencti_campaign import Campaign
+from pycti.entities.opencti_capability import Capability
 from pycti.entities.opencti_case_incident import CaseIncident
 from pycti.entities.opencti_case_rfi import CaseRfi
 from pycti.entities.opencti_case_rft import CaseRft
@@ -24,6 +25,7 @@
 from pycti.entities.opencti_event import Event
 from pycti.entities.opencti_external_reference import ExternalReference
 from pycti.entities.opencti_feedback import Feedback
+from pycti.entities.opencti_group import Group
 from pycti.entities.opencti_grouping import Grouping
 from pycti.entities.opencti_identity import Identity
 from pycti.entities.opencti_incident import Incident
@@ -42,6 +44,8 @@
 from pycti.entities.opencti_observed_data import ObservedData
 from pycti.entities.opencti_opinion import Opinion
 from pycti.entities.opencti_report import Report
+from pycti.entities.opencti_role import Role
+from pycti.entities.opencti_settings import Settings
 from pycti.entities.opencti_stix import Stix
 from pycti.entities.opencti_stix_core_object import StixCoreObject
 from pycti.entities.opencti_stix_core_relationship import StixCoreRelationship
@@ -59,13 +63,9 @@
 from pycti.entities.opencti_threat_actor_group import ThreatActorGroup
 from pycti.entities.opencti_threat_actor_individual import ThreatActorIndividual
 from pycti.entities.opencti_tool import Tool
+from pycti.entities.opencti_user import User
 from pycti.entities.opencti_vocabulary import Vocabulary
 from pycti.entities.opencti_vulnerability import Vulnerability
-from pycti.entities.opencti_capability import Capability
-from pycti.entities.opencti_role import Role
-from pycti.entities.opencti_group import Group
-from pycti.entities.opencti_user import User
-from pycti.entities.opencti_settings import Settings
 from pycti.utils.opencti_logger import logger
 from pycti.utils.opencti_stix2 import OpenCTIStix2
 from pycti.utils.opencti_stix2_utils import OpenCTIStix2Utils

pycti/entities/opencti_capability.py

@@ -1,4 +1,4 @@
-from typing import List, Dict
+from typing import Dict, List
 
 
 class Capability:

pycti/entities/opencti_group.py

@@ -1,4 +1,4 @@
-from typing import List, Dict, Optional
+from typing import Dict, List, Optional
 
 
 class Group:

pycti/entities/opencti_user.py

@@ -1,6 +1,5 @@
 import secrets
-
-from typing import List, Dict, Optional
+from typing import Dict, List, Optional
 
 
 class User:

tests/02-integration/entities/test_group.py

@@ -1,5 +1,4 @@
-from tests.cases.entities import (
-    GroupTest, RoleTest, MarkingDefinitionTest, UserTest)
+from tests.cases.entities import GroupTest, MarkingDefinitionTest, RoleTest, UserTest
 
 
 def test_group_roles(api_client):

tests/02-integration/entities/test_user.py

@@ -1,4 +1,4 @@
-from tests.cases.entities import GroupTest, UserTest, IdentityOrganizationTest
+from tests.cases.entities import GroupTest, IdentityOrganizationTest, UserTest
 
 
 def test_user_membership(api_client):

tests/cases/entities.py

@@ -2,8 +2,8 @@
 
 from stix2 import TLP_GREEN, TLP_WHITE, AttackPattern
 
-from pycti.utils.constants import ContainerTypes, IdentityTypes, LocationTypes
 from pycti.entities.opencti_settings import Settings
+from pycti.utils.constants import ContainerTypes, IdentityTypes, LocationTypes
 from tests.utils import get_incident_end_date, get_incident_start_date