pycti 6.6.2__tar.gz → 6.6.4__tar.gz

{pycti-6.6.2 → pycti-6.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycti
-Version: 6.6.2
+Version: 6.6.4
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran
@@ -23,37 +23,37 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: datefinder~=0.7.3
 Requires-Dist: pika~=1.3.0
-Requires-Dist: pydantic<2.11.0,>=2.8.2
+Requires-Dist: pydantic~=2.11.3
 Requires-Dist: python-magic~=0.4.27; sys_platform == "linux" or sys_platform == "darwin"
 Requires-Dist: python-magic-bin~=0.4.14; sys_platform == "win32"
-Requires-Dist: python_json_logger~=2.0.4
+Requires-Dist: python_json_logger~=3.3.0
 Requires-Dist: PyYAML~=6.0
-Requires-Dist: requests<=2.32.3,>=2.32.0
-Requires-Dist: setuptools~=71.1.0
+Requires-Dist: requests~=2.32.3
+Requires-Dist: setuptools~=78.1.0
 Requires-Dist: cachetools~=5.5.0
 Requires-Dist: prometheus-client~=0.21.1
-Requires-Dist: opentelemetry-api<=1.30.0,>=1.22.0
-Requires-Dist: opentelemetry-sdk<=1.30.0,>=1.22.0
+Requires-Dist: opentelemetry-api~=1.32.0
+Requires-Dist: opentelemetry-sdk~=1.32.0
 Requires-Dist: deprecation~=2.1.0
 Requires-Dist: fastapi<0.116.0,>=0.115.8
 Requires-Dist: uvicorn[standard]<0.35.0,>=0.33.0
 Requires-Dist: filigran-sseclient>=1.0.2
 Requires-Dist: stix2~=3.0.1
 Provides-Extra: dev
-Requires-Dist: black~=24.4.0; extra == "dev"
+Requires-Dist: black~=25.1.0; extra == "dev"
 Requires-Dist: build~=1.2.1; extra == "dev"
 Requires-Dist: isort~=6.0.0; extra == "dev"
-Requires-Dist: types-pytz~=2025.1.0.20250204; extra == "dev"
-Requires-Dist: pre-commit~=3.8.0; extra == "dev"
+Requires-Dist: types-pytz~=2025.2.0.20250326; extra == "dev"
+Requires-Dist: pre-commit~=4.2.0; extra == "dev"
 Requires-Dist: pytest-cases~=3.8.0; extra == "dev"
-Requires-Dist: pytest-cov~=5.0.0; extra == "dev"
+Requires-Dist: pytest-cov~=6.1.1; extra == "dev"
 Requires-Dist: pytest_randomly~=3.16.0; extra == "dev"
 Requires-Dist: pytest~=8.3.4; extra == "dev"
 Requires-Dist: types-python-dateutil~=2.9.0; extra == "dev"
 Requires-Dist: wheel~=0.45.1; extra == "dev"
 Provides-Extra: doc
 Requires-Dist: autoapi~=2.0.1; extra == "doc"
-Requires-Dist: sphinx-autodoc-typehints~=2.5.0; extra == "doc"
+Requires-Dist: sphinx-autodoc-typehints~=3.1.0; extra == "doc"
 Requires-Dist: sphinx-rtd-theme~=3.0.2; extra == "doc"
 Dynamic: license-file
 

{pycti-6.6.2 → pycti-6.6.4}/pycti/__init__.py

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

{pycti-6.6.2 → pycti-6.6.4}/pycti/api/opencti_api_client.py

@@ -71,6 +71,25 @@ from pycti.utils.opencti_stix2 import OpenCTIStix2
 from pycti.utils.opencti_stix2_utils import OpenCTIStix2Utils
 
 
+def build_request_headers(token: str, custom_headers: str, app_logger):
+    headers_dict = {
+        "User-Agent": "pycti/" + __version__,
+        "Authorization": "Bearer " + token,
+    }
+    # Build and add custom headers
+    if custom_headers is not None:
+        for header_pair in custom_headers.strip().split(";"):
+            if header_pair:  # Skip empty header pairs
+                try:
+                    key, value = header_pair.split(":", 1)
+                    headers_dict[key.strip()] = value.strip()
+                except ValueError:
+                    app_logger.warning(
+                        "Ignored invalid header pair", {"header_pair": header_pair}
+                    )
+    return headers_dict
+
+
 class File:
     def __init__(self, name, data, mime="text/plain"):
         self.name = name
@@ -99,24 +118,28 @@ class OpenCTIApiClient:
         ```
     :param json_logging: format the logs as json if set to True
     :type json_logging: bool, optional
+    :param bundle_send_to_queue: if bundle will be sent to queue
+    :type bundle_send_to_queue: bool, optional
     :param cert: If String, file path to pem file. If Tuple, a ('path_to_cert.crt', 'path_to_key.key') pair representing the certificate and the key.
     :type cert: str, tuple, optional
-    :param auth: Add a AuthBase class with custom authentication for you OpenCTI infrastructure.
-    :type auth: requests.auth.AuthBase, optional
+    :param custom_headers: Add custom headers to use with the graphql queries
+    :type custom_headers: str, optional must in the format header01:value;header02:value
+    :param perform_health_check: if client init must check the api access
+    :type perform_health_check: bool, optional
     """
 
     def __init__(
         self,
         url: str,
         token: str,
-        log_level="info",
+        log_level: str = "info",
         ssl_verify: Union[bool, str] = False,
         proxies: Union[Dict[str, str], None] = None,
-        json_logging=False,
-        bundle_send_to_queue=True,
+        json_logging: bool = False,
+        bundle_send_to_queue: bool = True,
         cert: Union[str, Tuple[str, str], None] = None,
-        auth=None,
-        perform_health_check=True,
+        custom_headers: str = None,
+        perform_health_check: bool = True,
     ):
         """Constructor method"""
 
@@ -138,17 +161,10 @@ class OpenCTIApiClient:
         # Define API
         self.api_token = token
         self.api_url = url + "/graphql"
-        self.request_headers = {
-            "User-Agent": "pycti/" + __version__,
-            "Authorization": "Bearer " + token,
-        }
-
-        if auth is not None:
-            self.session = requests.session()
-            self.session.auth = auth
-        else:
-            self.session = requests.session()
-
+        self.request_headers = build_request_headers(
+            token, custom_headers, self.app_logger
+        )
+        self.session = requests.session()
         # Define the dependencies
         self.work = OpenCTIApiWork(self)
         self.playbook = OpenCTIApiPlaybook(self)

{pycti-6.6.2 → pycti-6.6.4}/pycti/connector/opencti_connector_helper.py

@@ -902,6 +902,12 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
         self.opencti_token = get_config_variable(
             "OPENCTI_TOKEN", ["opencti", "token"], config
         )
+        self.opencti_custom_headers = get_config_variable(
+            "OPENCTI_CUSTOM_HEADERS",
+            ["opencti", "custom_headers"],
+            config,
+            default=None,
+        )
         self.opencti_ssl_verify = get_config_variable(
             "OPENCTI_SSL_VERIFY", ["opencti", "ssl_verify"], config, False, False
         )
@@ -1078,6 +1084,7 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
             self.log_level,
             self.opencti_ssl_verify,
             json_logging=self.opencti_json_logging,
+            custom_headers=self.opencti_custom_headers,
             bundle_send_to_queue=self.bundle_send_to_queue,
         )
         # - Impersonate API that will use applicant id
@@ -1088,6 +1095,7 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
             self.log_level,
             self.opencti_ssl_verify,
             json_logging=self.opencti_json_logging,
+            custom_headers=self.opencti_custom_headers,
             bundle_send_to_queue=self.bundle_send_to_queue,
         )
         self.connector_logger = self.api.logger_class(self.connect_name)
@@ -1932,10 +1940,6 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
             raise ValueError("Nothing to import")
 
         if bundle_send_to_queue:
-            if work_id:
-                self.api.work.add_expectations(work_id, expectations_number)
-                if draft_id:
-                    self.api.work.add_draft_context(work_id, draft_id)
             if entities_types is None:
                 entities_types = []
             if self.queue_protocol == "amqp":

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_attack_pattern.py

@@ -17,6 +17,14 @@ class AttackPattern:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -109,6 +117,14 @@ class AttackPattern:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_campaign.py

@@ -17,6 +17,14 @@ class Campaign:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -103,6 +111,14 @@ class Campaign:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_case_incident.py

@@ -17,6 +17,14 @@ class CaseIncident:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -233,6 +241,14 @@ class CaseIncident:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_case_rfi.py

@@ -17,6 +17,14 @@ class CaseRfi:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -232,6 +240,14 @@ class CaseRfi:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_case_rft.py

@@ -17,6 +17,14 @@ class CaseRft:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -232,6 +240,14 @@ class CaseRft:
                 spec_version
                 created_at
                 updated_at
+                status {
+                    id
+                    template {
+                      id
+                      name
+                      color
+                    }
+                }
                 createdBy {
                     ... on Identity {
                         id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_course_of_action.py

@@ -17,6 +17,14 @@ class CourseOfAction:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -96,6 +104,14 @@ class CourseOfAction:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_data_component.py

@@ -17,6 +17,14 @@ class DataComponent:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -118,6 +126,14 @@ class DataComponent:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_data_source.py

@@ -17,6 +17,14 @@ class DataSource:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -97,6 +105,14 @@ class DataSource:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_event.py

@@ -17,6 +17,14 @@ class Event:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -103,6 +111,14 @@ class Event:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_feedback.py

@@ -16,6 +16,14 @@ class Feedback:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -204,6 +212,14 @@ class Feedback:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_grouping.py

@@ -18,6 +18,14 @@ class Grouping:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -197,6 +205,14 @@ class Grouping:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_identity.py

@@ -19,6 +19,14 @@ class Identity:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -112,6 +120,14 @@ class Identity:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_incident.py

@@ -18,6 +18,14 @@ class Incident:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -107,6 +115,14 @@ class Incident:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_infrastructure.py

@@ -22,6 +22,14 @@ class Infrastructure:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -117,6 +125,14 @@ class Infrastructure:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_intrusion_set.py

@@ -17,6 +17,14 @@ class IntrusionSet:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -106,6 +114,14 @@ class IntrusionSet:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id

{pycti-6.6.2 → pycti-6.6.4}/pycti/entities/opencti_language.py

@@ -17,6 +17,14 @@ class Language:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id
@@ -120,6 +128,14 @@ class Language:
             spec_version
             created_at
             updated_at
+            status {
+                id
+                template {
+                  id
+                  name
+                  color
+                }
+            }
             createdBy {
                 ... on Identity {
                     id