pycti 6.7.16__tar.gz → 6.7.18__tar.gz

{pycti-6.7.16 → pycti-6.7.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycti
-Version: 6.7.16
+Version: 6.7.18
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran

{pycti-6.7.16 → pycti-6.7.18}/pycti/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "6.7.16"
+__version__ = "6.7.18"
 
 from .api.opencti_api_client import OpenCTIApiClient
 from .api.opencti_api_connector import OpenCTIApiConnector

{pycti-6.7.16 → pycti-6.7.18}/pycti/entities/opencti_case_rfi.py

@@ -701,6 +701,7 @@ class CaseRfi:
         created = kwargs.get("created", None)
         modified = kwargs.get("modified", None)
         name = kwargs.get("name", None)
+        content = kwargs.get("content", None)
         description = kwargs.get("description", None)
         x_opencti_stix_ids = kwargs.get("x_opencti_stix_ids", None)
         granted_refs = kwargs.get("objectOrganization", None)
@@ -742,6 +743,7 @@ class CaseRfi:
                         "modified": modified,
                         "name": name,
                         "description": description,
+                        "content": content,
                         "x_opencti_stix_ids": x_opencti_stix_ids,
                         "x_opencti_workflow_id": x_opencti_workflow_id,
                         "update": update,
@@ -874,6 +876,13 @@ class CaseRfi:
                 stix_object["x_opencti_assignee_ids"] = (
                     self.opencti.get_attribute_in_extension("assignee_ids", stix_object)
                 )
+            if "x_opencti_content" not in stix_object or "content" not in stix_object:
+                stix_object["content"] = self.opencti.get_attribute_in_extension(
+                    "content", stix_object
+                )
+            if "x_opencti_content" in stix_object:
+                stix_object["content"] = stix_object["x_opencti_content"]
+
             if "x_opencti_participant_ids" not in stix_object:
                 stix_object["x_opencti_participant_ids"] = (
                     self.opencti.get_attribute_in_extension(
@@ -900,6 +909,11 @@ class CaseRfi:
                     if "external_references_ids" in extras
                     else None
                 ),
+                content=(
+                    self.opencti.stix2.convert_markdown(stix_object["content"])
+                    if "content" in stix_object
+                    else None
+                ),
                 revoked=stix_object["revoked"] if "revoked" in stix_object else None,
                 severity=stix_object["severity"] if "severity" in stix_object else None,
                 priority=stix_object["priority"] if "priority" in stix_object else None,

{pycti-6.7.16 → pycti-6.7.18}/pycti/entities/opencti_case_rft.py

@@ -697,6 +697,7 @@ class CaseRft:
         priority = kwargs.get("priority", None)
         confidence = kwargs.get("confidence", None)
         lang = kwargs.get("lang", None)
+        content = kwargs.get("content", None)
         created = kwargs.get("created", None)
         modified = kwargs.get("modified", None)
         name = kwargs.get("name", None)
@@ -735,6 +736,7 @@ class CaseRft:
                         "revoked": revoked,
                         "severity": severity,
                         "priority": priority,
+                        "content": content,
                         "confidence": confidence,
                         "lang": lang,
                         "created": created,
@@ -865,6 +867,13 @@ class CaseRft:
                 stix_object["x_opencti_granted_refs"] = (
                     self.opencti.get_attribute_in_extension("granted_refs", stix_object)
                 )
+            if "x_opencti_content" not in stix_object or "content" not in stix_object:
+                stix_object["content"] = self.opencti.get_attribute_in_extension(
+                    "content", stix_object
+                )
+            if "x_opencti_content" in stix_object:
+                stix_object["content"] = stix_object["x_opencti_content"]
+
             if "x_opencti_workflow_id" not in stix_object:
                 stix_object["x_opencti_workflow_id"] = (
                     self.opencti.get_attribute_in_extension("workflow_id", stix_object)
@@ -904,6 +913,11 @@ class CaseRft:
                 confidence=(
                     stix_object["confidence"] if "confidence" in stix_object else None
                 ),
+                content=(
+                    self.opencti.stix2.convert_markdown(stix_object["content"])
+                    if "content" in stix_object
+                    else None
+                ),
                 lang=stix_object["lang"] if "lang" in stix_object else None,
                 created=stix_object["created"] if "created" in stix_object else None,
                 modified=stix_object["modified"] if "modified" in stix_object else None,

{pycti-6.7.16 → pycti-6.7.18}/pycti/entities/opencti_external_reference.py

@@ -276,12 +276,13 @@ class ExternalReference:
         file_markings = kwargs.get("fileMarkings", None)
         mime_type = kwargs.get("mime_type", "text/plain")
         no_trigger_import = kwargs.get("no_trigger_import", False)
+        embedded = kwargs.get("embedded", False)
         if id is not None and file_name is not None:
             final_file_name = os.path.basename(file_name)
             query = """
-                mutation ExternalReferenceEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
+                mutation ExternalReferenceEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean, $embedded: Boolean) {
                     externalReferenceEdit(id: $id) {
-                        importPush(file: $file, fileMarkings: $fileMarkings, version: $version, noTriggerImport: $noTriggerImport) {
+                        importPush(file: $file, fileMarkings: $fileMarkings, version: $version, noTriggerImport: $noTriggerImport, embedded: $embedded) {
                             id
                             name
                         }
@@ -310,6 +311,7 @@ class ExternalReference:
                         if isinstance(no_trigger_import, bool)
                         else no_trigger_import == "True"
                     ),
+                    "embedded": embedded,
                 },
             )
         else:

{pycti-6.7.16 → pycti-6.7.18}/pycti/entities/opencti_grouping.py

@@ -644,6 +644,7 @@ class Grouping:
         modified = kwargs.get("modified", None)
         name = kwargs.get("name", None)
         context = kwargs.get("context", None)
+        content = kwargs.get("content", None)
         description = kwargs.get("description", None)
         x_opencti_aliases = kwargs.get("x_opencti_aliases", None)
         x_opencti_stix_ids = kwargs.get("x_opencti_stix_ids", None)
@@ -681,6 +682,7 @@ class Grouping:
                         "modified": modified,
                         "name": name,
                         "context": context,
+                        "content": content,
                         "description": description,
                         "x_opencti_aliases": x_opencti_aliases,
                         "x_opencti_stix_ids": x_opencti_stix_ids,
@@ -802,6 +804,13 @@ class Grouping:
                 stix_object["x_opencti_granted_refs"] = (
                     self.opencti.get_attribute_in_extension("granted_refs", stix_object)
                 )
+            if "x_opencti_content" not in stix_object or "content" not in stix_object:
+                stix_object["content"] = self.opencti.get_attribute_in_extension(
+                    "content", stix_object
+                )
+            if "x_opencti_content" in stix_object:
+                stix_object["content"] = stix_object["x_opencti_content"]
+
             if "x_opencti_workflow_id" not in stix_object:
                 stix_object["x_opencti_workflow_id"] = (
                     self.opencti.get_attribute_in_extension("workflow_id", stix_object)
@@ -826,6 +835,11 @@ class Grouping:
                     if "external_references_ids" in extras
                     else None
                 ),
+                content=(
+                    self.opencti.stix2.convert_markdown(stix_object["content"])
+                    if "content" in stix_object
+                    else None
+                ),
                 revoked=stix_object["revoked"] if "revoked" in stix_object else None,
                 confidence=(
                     stix_object["confidence"] if "confidence" in stix_object else None

{pycti-6.7.16 → pycti-6.7.18}/pycti/entities/opencti_stix_cyber_observable.py

@@ -185,12 +185,13 @@ class StixCyberObservable(StixCyberObservableDeprecatedMixin):
         version = kwargs.get("version", None)
         mime_type = kwargs.get("mime_type", "text/plain")
         no_trigger_import = kwargs.get("no_trigger_import", False)
+        embedded = kwargs.get("embedded", False)
         if id is not None and file_name is not None:
             final_file_name = os.path.basename(file_name)
             query = """
-                    mutation StixCyberObservableEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
+                    mutation StixCyberObservableEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean, $embedded: Boolean) {
                         stixCyberObservableEdit(id: $id) {
-                            importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport) {
+                            importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport, embedded: $embedded) {
                                 id
                                 name
                             }
@@ -219,6 +220,7 @@ class StixCyberObservable(StixCyberObservableDeprecatedMixin):
                         if isinstance(no_trigger_import, bool)
                         else no_trigger_import == "True"
                     ),
+                    "embedded": embedded,
                 },
             )
         else:

{pycti-6.7.16 → pycti-6.7.18}/pycti/entities/opencti_stix_domain_object.py

@@ -1368,12 +1368,13 @@ class StixDomainObject:
         version = kwargs.get("version", None)
         mime_type = kwargs.get("mime_type", "text/plain")
         no_trigger_import = kwargs.get("no_trigger_import", False)
+        embedded = kwargs.get("embedded", False)
         if id is not None and file_name is not None:
             final_file_name = os.path.basename(file_name)
             query = """
-                mutation StixDomainObjectEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
+                mutation StixDomainObjectEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean, $embedded: Boolean) {
                     stixDomainObjectEdit(id: $id) {
-                        importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport) {
+                        importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport, embedded: $embedded) {
                             id
                             name
                         }
@@ -1402,6 +1403,7 @@ class StixDomainObject:
                         if isinstance(no_trigger_import, bool)
                         else no_trigger_import == "True"
                     ),
+                    "embedded": embedded,
                 },
             )
         else:

{pycti-6.7.16 → pycti-6.7.18}/pycti/utils/opencti_stix2.py

@@ -758,6 +758,7 @@ class OpenCTIStix2:
                                 fileMarkings=file.get("object_marking_refs", None),
                                 mime_type=file["mime_type"],
                                 no_trigger_import=file.get("no_trigger_import", False),
+                                embedded=file.get("embedded", False),
                             )
                 if (
                     self.opencti.get_attribute_in_extension("files", external_reference)
@@ -775,6 +776,7 @@ class OpenCTIStix2:
                                 fileMarkings=file.get("object_marking_refs", None),
                                 mime_type=file["mime_type"],
                                 no_trigger_import=file.get("no_trigger_import", False),
+                                embedded=file.get("embedded", False),
                             )
                 external_references_ids.append(external_reference_id)
         # Granted refs
@@ -1050,6 +1052,7 @@ class OpenCTIStix2:
                             fileMarkings=file.get("object_marking_refs", None),
                             mime_type=file["mime_type"],
                             no_trigger_import=file.get("no_trigger_import", False),
+                            embedded=file.get("embedded", False),
                         )
             if (
                 self.opencti.get_attribute_in_extension("files", stix_object)
@@ -1067,6 +1070,7 @@ class OpenCTIStix2:
                             fileMarkings=file.get("object_marking_refs", None),
                             mime_type=file["mime_type"],
                             no_trigger_import=file.get("no_trigger_import", False),
+                            embedded=file.get("embedded", False),
                         )
         return stix_object_results
 
@@ -1179,6 +1183,7 @@ class OpenCTIStix2:
                             fileMarkings=file.get("object_marking_refs", None),
                             mime_type=file["mime_type"],
                             no_trigger_import=file.get("no_trigger_import", False),
+                            embedded=file.get("embedded", False),
                         )
             if (
                 self.opencti.get_attribute_in_extension("files", stix_object)
@@ -1196,6 +1201,7 @@ class OpenCTIStix2:
                             fileMarkings=file.get("object_marking_refs", None),
                             mime_type=file["mime_type"],
                             no_trigger_import=file.get("no_trigger_import", False),
+                            embedded=file.get("embedded", False),
                         )
             if "id" in stix_object:
                 self.mapping_cache[stix_object["id"]] = {
@@ -2472,6 +2478,7 @@ class OpenCTIStix2:
                         fileMarkings=file.get("object_marking_refs", None),
                         mime_type=file.get("mime_type", None),
                         no_trigger_import=file.get("no_trigger_import", False),
+                        embedded=file.get("embedded", False),
                     )
 
     def apply_patch(self, item):

{pycti-6.7.16 → pycti-6.7.18}/pycti.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycti
-Version: 6.7.16
+Version: 6.7.18
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran