pycti 5.12.14__py3-none-any.whl → 5.12.15__py3-none-any.whl

pycti/entities/opencti_case_rft.py

@@ -5,8 +5,6 @@ import uuid
 from dateutil.parser import parse
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class CaseRft:
     def __init__(self, opencti):
@@ -494,7 +492,9 @@ class CaseRft:
         with_files = kwargs.get("withFiles", False)
         if get_all:
             first = 500
-        LOGGER.info("Listing Case Rfts with filters " + json.dumps(filters) + ".")
+        self.opencti.app_logger.info(
+            "Listing Case Rfts with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
                         query CaseRfts($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: CaseRftsOrdering, $orderMode: OrderingMode) {
@@ -538,7 +538,7 @@ class CaseRft:
             final_data = final_data + data
             while result["data"]["caseRfts"]["pageInfo"]["hasNextPage"]:
                 after = result["date"]["caseRfts"]["pageInfo"]["endCursor"]
-                self.opencti.log("info", "Listing Case Rfts after " + after)
+                self.opencti.app_logger.info("Listing Case Rfts", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -572,7 +572,7 @@ class CaseRft:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            self.opencti.log("info", "Reading Case Rft { " + id + "}.")
+            self.opencti.app_logger.info("Reading Case Rft", {"id": id})
             query = (
                 """
                             query CaseRft($id: String!) {
@@ -643,13 +643,12 @@ class CaseRft:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            self.opencti.log(
-                "info",
-                "Checking StixObjectOrStixRelationship {"
-                + stix_object_or_stix_relationship_id
-                + "} in CaseRft {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Checking StixObjectOrStixRelationship in CaseRft",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                 query CaseRftContainsStixObjectOrStixRelationship($id: String!, $stixObjectOrStixRelationshipId: String!) {
@@ -665,9 +664,8 @@ class CaseRft:
             )
             return result["data"]["caseRftContainsStixObjectOrStixRelationship"]
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseRft] Missing parameters: id or stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.error(
+                "[opencti_caseRft] Missing parameters: id or stixObjectOrStixRelationshipId"
             )
 
     """
@@ -697,7 +695,7 @@ class CaseRft:
         takedown_types = kwargs.get("takedown_types", None)
 
         if name is not None:
-            self.opencti.log("info", "Creating Case Rft {" + name + "}.")
+            self.opencti.app_logger.info("Creating Case Rft", {"name": name})
             query = """
                 mutation CaseRftAdd($input: CaseRftAddInput!) {
                     caseRftAdd(input: $input) {
@@ -734,10 +732,7 @@ class CaseRft:
             )
             return self.opencti.process_multiple_fields(result["data"]["caseRftAdd"])
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseRft] Missing parameters: name",
-            )
+            self.opencti.app_logger.error("[opencti_caseRft] Missing parameters: name")
 
         """
         Add a Stix-Entity object to Case Rft object (object_refs)
@@ -753,13 +748,12 @@ class CaseRft:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            self.opencti.log(
-                "info",
-                "Adding StixObjectOrStixRelationship {"
-                + stix_object_or_stix_relationship_id
-                + "} to CaseRft {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Adding StixObjectOrStixRelationship in CaseRft",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                mutation CaseRftEditRelationAdd($id: ID!, $input: StixRefRelationshipAddInput) {
@@ -782,9 +776,8 @@ class CaseRft:
             )
             return True
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseRft] Missing parameters: id and stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.info(
+                "[opencti_caseRft] Missing parameters: id and stixObjectOrStixRelationshipId"
             )
             return False
 
@@ -802,13 +795,12 @@ class CaseRft:
             "stixObjectOrStixRelationshipId", None
         )
         if id is not None and stix_object_or_stix_relationship_id is not None:
-            self.opencti.log(
-                "info",
-                "Removing StixObjectOrStixRelationship {"
-                + stix_object_or_stix_relationship_id
-                + "} to CaseRft {"
-                + id
-                + "}",
+            self.opencti.app_logger.info(
+                "Removing StixObjectOrStixRelationship in CaseRft",
+                {
+                    "stix_object_or_stix_relationship_id": stix_object_or_stix_relationship_id,
+                    "id": id,
+                },
             )
             query = """
                mutation CaseRftEditRelationDelete($id: ID!, $toId: StixRef!, $relationship_type: String!) {
@@ -829,9 +821,8 @@ class CaseRft:
             )
             return True
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_caseRft] Missing parameters: id and stixObjectOrStixRelationshipId",
+            self.opencti.app_logger.error(
+                "[opencti_caseRft] Missing parameters: id and stixObjectOrStixRelationshipId"
             )
             return False
 
@@ -897,14 +888,14 @@ class CaseRft:
                 update=update,
             )
         else:
-            self.opencti.log(
-                "error", "[opencti_caseRft] Missing parameters: stixObject"
+            self.opencti.app_logger.error(
+                "[opencti_caseRft] Missing parameters: stixObject"
             )
 
     def delete(self, **kwargs):
         id = kwargs.get("id", None)
         if id is not None:
-            self.opencti.log("info", "Deleting Case RFT {%s}.", id)
+            self.opencti.app_logger.info("Deleting Case RFT", {"id": id})
             query = """
                  mutation CaseRFTDelete($id: ID!) {
                      stixDomainObjectEdit(id: $id) {
@@ -914,5 +905,5 @@ class CaseRft:
              """
             self.opencti.query(query, {"id": id})
         else:
-            self.opencti.log("error", "[opencti_case_rft] Missing parameters: id")
+            self.opencti.app_logger.error("[opencti_case_rft] Missing parameters: id")
             return None

pycti/entities/opencti_channel.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class Channel:
     def __init__(self, opencti):
@@ -252,7 +250,9 @@ class Channel:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Channels with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Channels with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query Channels($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: ChannelsOrdering, $orderMode: OrderingMode) {
@@ -296,7 +296,7 @@ class Channel:
             final_data = final_data + data
             while result["data"]["channels"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["channels"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Channels after " + after)
+                self.opencti.app_logger.info("Listing Channels", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -330,7 +330,7 @@ class Channel:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Channel {%s}.", id)
+            self.opencti.app_logger.info("Reading Channel", {"id": id})
             query = (
                 """
                 query Channel($id: String!) {
@@ -355,7 +355,9 @@ class Channel:
             else:
                 return None
         else:
-            LOGGER.error("[opencti_channel] Missing parameters: id or filters")
+            self.opencti.app_logger.error(
+                "[opencti_channel] Missing parameters: id or filters"
+            )
             return None
 
     """
@@ -385,7 +387,7 @@ class Channel:
         update = kwargs.get("update", False)
 
         if name is not None:
-            LOGGER.info("Creating Channel {%s}.", name)
+            self.opencti.app_logger.info("Creating Channel", {"name": name})
             query = """
                 mutation ChannelAdd($input: ChannelAddInput!) {
                     channelAdd(input: $input) {
@@ -422,7 +424,9 @@ class Channel:
             )
             return self.opencti.process_multiple_fields(result["data"]["channelAdd"])
         else:
-            LOGGER.error("[opencti_channel] Missing parameters: name and description")
+            self.opencti.app_logger.error(
+                "[opencti_channel] Missing parameters: name and description"
+            )
 
     """
         Import an Channel object from a STIX2 object
@@ -486,4 +490,6 @@ class Channel:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_channel] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_channel] Missing parameters: stixObject"
+            )

pycti/entities/opencti_course_of_action.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class CourseOfAction:
     def __init__(self, opencti):
@@ -255,7 +253,9 @@ class CourseOfAction:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Courses-Of-Action with filters %s.", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Courses-Of-Action with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query CoursesOfAction($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: CoursesOfActionOrdering, $orderMode: OrderingMode) {
@@ -299,7 +299,9 @@ class CourseOfAction:
             final_data = final_data + data
             while result["data"]["coursesOfAction"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["coursesOfAction"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Courses-Of-Action after " + after)
+                self.opencti.app_logger.info(
+                    "Listing Courses-Of-Action", {"after": after}
+                )
                 result = self.opencti.query(
                     query,
                     {
@@ -333,7 +335,7 @@ class CourseOfAction:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Course-Of-Action {%s}.", id)
+            self.opencti.app_logger.info("Reading Course-Of-Action", {"id": id})
             query = (
                 """
                 query CourseOfAction($id: String!) {
@@ -360,7 +362,9 @@ class CourseOfAction:
             else:
                 return None
         else:
-            LOGGER.error("[opencti_course_of_action] Missing parameters: id or filters")
+            self.opencti.app_logger.error(
+                "[opencti_course_of_action] Missing parameters: id or filters"
+            )
             return None
 
     """
@@ -390,7 +394,7 @@ class CourseOfAction:
         update = kwargs.get("update", False)
 
         if name is not None:
-            LOGGER.info("Creating Course Of Action {%s}.", name)
+            self.opencti.app_logger.info("Creating Course Of Action", {"name": name})
             query = """
                 mutation CourseOfActionAdd($input: CourseOfActionAddInput!) {
                     courseOfActionAdd(input: $input) {
@@ -429,7 +433,7 @@ class CourseOfAction:
                 result["data"]["courseOfActionAdd"]
             )
         else:
-            LOGGER.error(
+            self.opencti.app_logger.error(
                 "[opencti_course_of_action] Missing parameters: name and description"
             )
 
@@ -518,4 +522,6 @@ class CourseOfAction:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_course_of_action] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_course_of_action] Missing parameters: stixObject"
+            )

pycti/entities/opencti_data_component.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class DataComponent:
     def __init__(self, opencti):
@@ -286,7 +284,9 @@ class DataComponent:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Data-Components with filters " + json.dumps(filters) + ".")
+        self.opencti.app_logger.info(
+            "Listing Data-Components with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query DataComponents($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: DataComponentsOrdering, $orderMode: OrderingMode) {
@@ -330,7 +330,9 @@ class DataComponent:
             final_data = final_data + data
             while result["data"]["dataComponents"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["dataComponents"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Data-Components after " + after)
+                self.opencti.app_logger.info(
+                    "Listing Data-Components", {"after": after}
+                )
                 result = self.opencti.query(
                     query,
                     {
@@ -364,7 +366,7 @@ class DataComponent:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            self.opencti.log("info", "Reading Data-Component {" + id + "}.")
+            self.opencti.app_logger.info("Reading Data-Component", {"id": id})
             query = (
                 """
                 query DataComponent($id: String!) {
@@ -389,8 +391,8 @@ class DataComponent:
             else:
                 return None
         else:
-            self.opencti.log(
-                "error", "[opencti_data_component] Missing parameters: id or filters"
+            self.opencti.app_logger.error(
+                "[opencti_data_component] Missing parameters: id or filters"
             )
             return None
 
@@ -421,8 +423,10 @@ class DataComponent:
         update = kwargs.get("update", False)
 
         if name is not None:
-            self.opencti.log("info", "Creating Data Component {" + name + "}.")
-            self.opencti.log("info", "Creating Data Component {" + str(kwargs) + "}.")
+            self.opencti.app_logger.info("Creating Data Component", {"name": name})
+            self.opencti.app_logger.info(
+                "Creating Data Component", {"data": str(kwargs)}
+            )
             query = """
                 mutation DataComponentAdd($input: DataComponentAddInput!) {
                     dataComponentAdd(input: $input) {
@@ -461,9 +465,8 @@ class DataComponent:
                 result["data"]["dataComponentAdd"]
             )
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_data_component] Missing parameters: name and description",
+            self.opencti.app_logger.error(
+                "[opencti_data_component] Missing parameters: name and description"
             )
 
     """
@@ -541,8 +544,8 @@ class DataComponent:
                 update=update,
             )
         else:
-            self.opencti.log(
-                "error", "[opencti_data_source] Missing parameters: stixObject"
+            self.opencti.app_logger.error(
+                "[opencti_data_source] Missing parameters: stixObject"
             )
 
     def process_multiple_fields(self, data):

pycti/entities/opencti_data_source.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class DataSource:
     def __init__(self, opencti):
@@ -254,9 +252,8 @@ class DataSource:
         if get_all:
             first = 100
 
-        self.opencti.log(
-            "info",
-            "Listing Data-Sources with filters " + json.dumps(filters) + ".",
+        self.opencti.app_logger.info(
+            "Listing Data-Sources with filters", {"filters": json.dumps(filters)}
         )
         query = (
             """
@@ -301,7 +298,7 @@ class DataSource:
             final_data = final_data + data
             while result["data"]["dataSources"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["dataSources"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Data-Sources after " + after)
+                self.opencti.app_logger.info("Listing Data-Sources", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -335,7 +332,7 @@ class DataSource:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            self.opencti.log("info", "Reading Data-Source {" + id + "}.")
+            self.opencti.app_logger.info("Reading Data-Source", {"id": id})
             query = (
                 """
                 query DataSource($id: String!) {
@@ -360,8 +357,8 @@ class DataSource:
             else:
                 return None
         else:
-            self.opencti.log(
-                "error", "[opencti_data_source] Missing parameters: id or filters"
+            self.opencti.app_logger.error(
+                "[opencti_data_source] Missing parameters: id or filters"
             )
             return None
 
@@ -393,8 +390,8 @@ class DataSource:
         update = kwargs.get("update", False)
 
         if name is not None:
-            self.opencti.log("info", "Creating Data Source {" + name + "}.")
-            self.opencti.log("info", "Creating Data Source {" + str(kwargs) + "}.")
+            self.opencti.app_logger.info("Creating Data Source", {"name": name})
+            self.opencti.app_logger.info("Creating Data Source", {"data": str(kwargs)})
             query = """
                 mutation DataSourceAdd($input: DataSourceAddInput!) {
                     dataSourceAdd(input: $input) {
@@ -432,9 +429,8 @@ class DataSource:
             )
             return self.opencti.process_multiple_fields(result["data"]["dataSourceAdd"])
         else:
-            self.opencti.log(
-                "error",
-                "[opencti_data_source] Missing parameters: name and description",
+            self.opencti.app_logger.error(
+                "[opencti_data_source] Missing parameters: name and description"
             )
 
     """
@@ -517,6 +513,6 @@ class DataSource:
                 update=update,
             )
         else:
-            self.opencti.log(
-                "error", "[opencti_data_source] Missing parameters: stixObject"
+            self.opencti.app_logger.error(
+                "[opencti_data_source] Missing parameters: stixObject"
             )

pycti/entities/opencti_event.py

@@ -5,8 +5,6 @@ import uuid
 
 from stix2.canonicalization.Canonicalize import canonicalize
 
-from pycti.entities import LOGGER
-
 
 class Event:
     def __init__(self, opencti):
@@ -256,7 +254,9 @@ class Event:
         if get_all:
             first = 100
 
-        LOGGER.info("Listing Events with filters %s", json.dumps(filters))
+        self.opencti.app_logger.info(
+            "Listing Events with filters", {"filters": json.dumps(filters)}
+        )
         query = (
             """
             query Events($filters: FilterGroup, $search: String, $first: Int, $after: ID, $orderBy: EventsOrdering, $orderMode: OrderingMode) {
@@ -300,7 +300,7 @@ class Event:
             final_data = final_data + data
             while result["data"]["events"]["pageInfo"]["hasNextPage"]:
                 after = result["data"]["events"]["pageInfo"]["endCursor"]
-                LOGGER.info("Listing Events after %s", after)
+                self.opencti.app_logger.info("Listing Events", {"after": after})
                 result = self.opencti.query(
                     query,
                     {
@@ -334,7 +334,7 @@ class Event:
         custom_attributes = kwargs.get("customAttributes", None)
         with_files = kwargs.get("withFiles", False)
         if id is not None:
-            LOGGER.info("Reading Event {%s}.", id)
+            self.opencti.app_logger.info("Reading Event", {"id": id})
             query = (
                 """
                 query Event($id: String!) {
@@ -359,7 +359,9 @@ class Event:
             else:
                 return None
         else:
-            LOGGER.error("[opencti_event] Missing parameters: id or filters")
+            self.opencti.app_logger.error(
+                "[opencti_event] Missing parameters: id or filters"
+            )
             return None
 
     """
@@ -390,7 +392,7 @@ class Event:
         update = kwargs.get("update", False)
 
         if name is not None:
-            LOGGER.info("Creating Event {%s}.", name)
+            self.opencti.app_logger.info("Creating Event", {"name": name})
             query = """
                 mutation EventAdd($input: EventAddInput!) {
                     eventAdd(input: $input) {
@@ -428,7 +430,9 @@ class Event:
             )
             return self.opencti.process_multiple_fields(result["data"]["eventAdd"])
         else:
-            LOGGER.error("[opencti_event] Missing parameters: name and description")
+            self.opencti.app_logger.error(
+                "[opencti_event] Missing parameters: name and description"
+            )
 
     """
         Import an Event object from a STIX2 object
@@ -495,4 +499,6 @@ class Event:
                 update=update,
             )
         else:
-            LOGGER.error("[opencti_event] Missing parameters: stixObject")
+            self.opencti.app_logger.error(
+                "[opencti_event] Missing parameters: stixObject"
+            )