pycti 6.5.1__tar.gz → 6.5.3__tar.gz

{pycti-6.5.1 → pycti-6.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycti
-Version: 6.5.1
+Version: 6.5.3
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: datefinder~=0.7.3
 Requires-Dist: pika~=1.3.0
-Requires-Dist: pydantic~=2.10.4
+Requires-Dist: pydantic<2.11.0,>=2.8.2
 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
@@ -32,16 +32,16 @@ Requires-Dist: requests~=2.32.2
 Requires-Dist: setuptools~=71.1.0
 Requires-Dist: cachetools~=5.5.0
 Requires-Dist: prometheus-client~=0.21.1
-Requires-Dist: opentelemetry-api~=1.22.0
-Requires-Dist: opentelemetry-sdk~=1.22.0
+Requires-Dist: opentelemetry-api<=1.30.0,>=1.22.0
+Requires-Dist: opentelemetry-sdk<=1.30.0,>=1.22.0
 Requires-Dist: deprecation~=2.1.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: build~=1.2.1; extra == "dev"
-Requires-Dist: isort~=5.13.0; extra == "dev"
-Requires-Dist: types-pytz~=2024.2.0.20241221; 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: pytest-cases~=3.8.0; extra == "dev"
 Requires-Dist: pytest-cov~=5.0.0; extra == "dev"

{pycti-6.5.1 → pycti-6.5.3}/pycti/__init__.py

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

{pycti-6.5.1 → pycti-6.5.3}/pycti/api/opencti_api_client.py

@@ -3,7 +3,7 @@ import base64
 import datetime
 import io
 import json
-from typing import Union
+from typing import Dict, Tuple, Union
 
 import magic
 import requests
@@ -83,13 +83,13 @@ class OpenCTIApiClient:
     :param log_level: log level for the client
     :type log_level: str, optional
     :param ssl_verify: Requiring the requests to verify the TLS certificate at the server.
-    :type ssl_verify: bool, optional
+    :type ssl_verify: bool, str, optional
     :param proxies:
     :type proxies: dict, optional, The proxy configuration, would have `http` and `https` attributes. Defaults to {}
         ```
         proxies: {
-            "http: "http://my_proxy:8080"
-            "https: "http://my_proxy:8080"
+            "http": "http://my_proxy:8080"
+            "https": "http://my_proxy:8080"
         }
         ```
     :param json_logging: format the logs as json if set to True
@@ -102,14 +102,14 @@ class OpenCTIApiClient:
 
     def __init__(
         self,
-        url,
-        token,
+        url: str,
+        token: str,
         log_level="info",
-        ssl_verify=False,
-        proxies=None,
+        ssl_verify: Union[bool, str] = False,
+        proxies: Union[Dict[str, str], None] = None,
         json_logging=False,
         bundle_send_to_queue=True,
-        cert=None,
+        cert: Union[str, Tuple[str, str], None] = None,
         auth=None,
         perform_health_check=True,
     ):
@@ -712,12 +712,13 @@ class OpenCTIApiClient:
         data = kwargs.get("data", None)
         mime_type = kwargs.get("mime_type", "text/plain")
         entity_id = kwargs.get("entity_id", None)
+        file_markings = kwargs.get("file_markings", [])
 
         if file_name is not None:
             self.app_logger.info("Uploading a file.")
             query = """
-                    mutation UploadPending($file: Upload!, $entityId: String) {
-                        uploadPending(file: $file, entityId: $entityId) {
+                    mutation UploadPending($file: Upload!, $entityId: String, $file_markings: [String!]) {
+                        uploadPending(file: $file, entityId: $entityId, file_markings: $file_markings) {
                             id
                             name
                         }
@@ -731,7 +732,11 @@ class OpenCTIApiClient:
                     mime_type = magic.from_file(file_name, mime=True)
             return self.query(
                 query,
-                {"file": (File(file_name, data, mime_type)), "entityId": entity_id},
+                {
+                    "file": (File(file_name, data, mime_type)),
+                    "entityId": entity_id,
+                    "file_markings": file_markings,
+                },
             )
         else:
             self.app_logger.error("[upload] Missing parameter: file_name")

{pycti-6.5.1 → pycti-6.5.3}/pycti/connector/opencti_connector_helper.py

@@ -769,6 +769,9 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
     def __init__(self, config: Dict, playbook_compatible=False) -> None:
         sys.excepthook = killProgramHook
 
+        # Cache
+        self.stream_collections = {}
+
         # Load API config
         self.config = config
         self.opencti_url = get_config_variable(
@@ -1063,6 +1066,9 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
                     "stream_live": True,
                     "stream_public": False,
                 }
+            # Get from cache
+            elif self.connect_live_stream_id in self.stream_collections:
+                return self.stream_collections[self.connect_live_stream_id]
             else:
                 query = """
                     query StreamCollection($id: String!) {
@@ -1076,6 +1082,10 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
                     }
                 """
                 result = self.api.query(query, {"id": self.connect_live_stream_id})
+                # Put in cache
+                self.stream_collections[self.connect_live_stream_id] = result["data"][
+                    "streamCollection"
+                ]
                 return result["data"]["streamCollection"]
         else:
             raise ValueError("This connector is not connected to any stream")
@@ -1581,6 +1591,7 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
         event_version = kwargs.get("event_version", None)
         bypass_validation = kwargs.get("bypass_validation", False)
         entity_id = kwargs.get("entity_id", None)
+        file_markings = kwargs.get("file_markings", None)
         file_name = kwargs.get("file_name", None)
         bundle_send_to_queue = kwargs.get("send_to_queue", self.bundle_send_to_queue)
         cleanup_inconsistent_bundle = kwargs.get("cleanup_inconsistent_bundle", False)
@@ -1648,6 +1659,7 @@ class OpenCTIConnectorHelper:  # pylint: disable=too-many-public-methods
                     data=bundle,
                     mime_type="application/json",
                     entity_id=entity_id,
+                    file_markings=file_markings,
                 )
                 return []
             elif validation_mode == "draft" and not draft_id:

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_attack_pattern.py

@@ -256,8 +256,6 @@ class AttackPattern:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Attack-Patterns with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_campaign.py

@@ -241,8 +241,6 @@ class Campaign:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Campaigns with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_case_incident.py

@@ -467,7 +467,7 @@ class CaseIncident:
 
     """
         List Case Incident objects
-        
+
         :param filters: the filters to apply
         :param search: the search keyword
         :param first: return the first n rows from the after ID (or the beginning if not set)
@@ -486,8 +486,6 @@ class CaseIncident:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Case Incidents with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_case_rfi.py

@@ -206,7 +206,7 @@ class CaseRfi:
                         }
                         ... on StixCyberObservable {
                             observable_value
-                        }                        
+                        }
                         ... on StixCoreRelationship {
                             standard_id
                             spec_version
@@ -417,7 +417,7 @@ class CaseRfi:
                         }
                         ... on StixCyberObservable {
                             observable_value
-                        }                        
+                        }
                         ... on StixCoreRelationship {
                             standard_id
                             spec_version
@@ -465,7 +465,7 @@ class CaseRfi:
 
     """
         List Case Rfi objects
-        
+
         :param filters: the filters to apply
         :param search: the search keyword
         :param first: return the first n rows from the after ID (or the beginning if not set)
@@ -484,8 +484,6 @@ class CaseRfi:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Case Rfis with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_case_rft.py

@@ -206,7 +206,7 @@ class CaseRft:
                         }
                         ... on StixCyberObservable {
                             observable_value
-                        }                        
+                        }
                         ... on StixCoreRelationship {
                             standard_id
                             spec_version
@@ -417,7 +417,7 @@ class CaseRft:
                             }
                             ... on StixCyberObservable {
                                 observable_value
-                            }                        
+                            }
                             ... on StixCoreRelationship {
                                 standard_id
                                 spec_version
@@ -465,7 +465,7 @@ class CaseRft:
 
     """
         List Case Rft objects
-        
+
         :param filters: the filters to apply
         :param search: the search keyword
         :param first: return the first n rows from the after ID (or the beginning if not set)
@@ -484,8 +484,6 @@ class CaseRft:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
         self.opencti.app_logger.info(
             "Listing Case Rfts with filters", {"filters": json.dumps(filters)}
         )

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_channel.py

@@ -237,8 +237,6 @@ class Channel:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Channels with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_course_of_action.py

@@ -229,8 +229,6 @@ class CourseOfAction:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Courses-Of-Action with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_data_component.py

@@ -271,8 +271,6 @@ class DataComponent:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Data-Components with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_data_source.py

@@ -229,8 +229,6 @@ class DataSource:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Data-Sources with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_event.py

@@ -241,8 +241,6 @@ class Event:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Events with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_external_reference.py

@@ -93,8 +93,6 @@ class ExternalReference:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing External-Reference with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_feedback.py

@@ -444,8 +444,6 @@ class Feedback:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Feedbacks with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_grouping.py

@@ -434,8 +434,6 @@ class Grouping:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Groupings with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_identity.py

@@ -258,8 +258,6 @@ class Identity:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Identities with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_incident.py

@@ -250,8 +250,6 @@ class Incident:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Incidents with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_infrastructure.py

@@ -270,8 +270,6 @@ class Infrastructure:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Infrastructures with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_intrusion_set.py

@@ -247,8 +247,6 @@ class IntrusionSet:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Intrusion-Sets with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_kill_chain_phase.py

@@ -48,10 +48,7 @@ class KillChainPhase:
         order_by = kwargs.get("orderBy", None)
         order_mode = kwargs.get("orderMode", None)
         custom_attributes = kwargs.get("customAttributes", None)
-        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Kill-Chain-Phase with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_label.py

@@ -44,8 +44,6 @@ class Label:
         custom_attributes = kwargs.get("customAttributes", None)
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Labels with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_language.py

@@ -249,8 +249,6 @@ class Language:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Languages with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_location.py

@@ -257,11 +257,8 @@ class Location:
         order_by = kwargs.get("orderBy", None)
         order_mode = kwargs.get("orderMode", None)
         custom_attributes = kwargs.get("customAttributes", None)
-        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Locations with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_malware.py

@@ -275,8 +275,6 @@ class Malware:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Malwares with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_malware_analysis.py

@@ -255,8 +255,6 @@ class MalwareAnalysis:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Malware analyses with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_marking_definition.py

@@ -66,10 +66,7 @@ class MarkingDefinition:
         order_by = kwargs.get("orderBy", None)
         order_mode = kwargs.get("orderMode", None)
         custom_attributes = kwargs.get("customAttributes", None)
-        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Marking-Definitions with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_narrative.py

@@ -227,8 +227,6 @@ class Narrative:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Narratives with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_note.py

@@ -473,8 +473,6 @@ class Note:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Notes with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_observed_data.py

@@ -190,7 +190,7 @@ class ObservedData:
                         }
                         ... on StixCyberObservable {
                             observable_value
-                        }                               
+                        }
                         ... on StixCoreRelationship {
                             standard_id
                             spec_version
@@ -202,7 +202,7 @@ class ObservedData:
                             spec_version
                             created_at
                             updated_at
-                        }                        
+                        }
                     }
                 }
             }
@@ -401,7 +401,7 @@ class ObservedData:
                         }
                         ... on StixCyberObservable {
                             observable_value
-                        }                               
+                        }
                         ... on StixCoreRelationship {
                             standard_id
                             spec_version
@@ -413,7 +413,7 @@ class ObservedData:
                             spec_version
                             created_at
                             updated_at
-                        }                        
+                        }
                     }
                 }
             }
@@ -461,11 +461,8 @@ class ObservedData:
         order_by = kwargs.get("orderBy", None)
         order_mode = kwargs.get("orderMode", None)
         custom_attributes = kwargs.get("customAttributes", None)
-        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing ObservedDatas with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_opinion.py

@@ -250,8 +250,6 @@ class Opinion:
         custom_attributes = kwargs.get("customAttributes", None)
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Opinions with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_report.py

@@ -504,8 +504,6 @@ class Report:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Reports with filters",

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_stix_core_object.py

@@ -1340,8 +1340,6 @@ class StixCoreObject:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Stix-Core-Objects with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_stix_core_relationship.py

@@ -408,8 +408,6 @@ class StixCoreRelationship:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         search = kwargs.get("search", None)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing stix_core_relationships",

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_stix_cyber_observable.py

@@ -48,9 +48,6 @@ class StixCyberObservable(StixCyberObservableDeprecatedMixin):
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
 
-        if get_all:
-            first = 100
-
         self.opencti.app_logger.info(
             "Listing StixCyberObservables with filters",
             {"filters": json.dumps(filters)},

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_stix_domain_object.py

@@ -1030,8 +1030,6 @@ class StixDomainObject:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         with_files = kwargs.get("withFiles", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Stix-Domain-Objects with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_stix_nested_ref_relationship.py

@@ -24,13 +24,13 @@ class StixNestedRefRelationship:
                     standard_id
                     entity_type
                     parent_types
-                } 
+                }
                 ... on StixSightingRelationship {
                     id
                     standard_id
                     entity_type
                     parent_types
-                }                 
+                }
                 ... on StixCyberObservable {
                     observable_value
                 }
@@ -47,13 +47,13 @@ class StixNestedRefRelationship:
                     standard_id
                     entity_type
                     parent_types
-                } 
+                }
                 ... on StixSightingRelationship {
                     id
                     standard_id
                     entity_type
                     parent_types
-                }                 
+                }
                 ... on StixCyberObservable {
                     observable_value
                 }
@@ -92,10 +92,7 @@ class StixNestedRefRelationship:
         order_by = kwargs.get("orderBy", None)
         order_mode = kwargs.get("orderMode", None)
         custom_attributes = kwargs.get("customAttributes", None)
-        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing stix_nested_ref_relationships",

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_stix_sighting_relationship.py

@@ -340,8 +340,6 @@ class StixSightingRelationship:
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
         search = kwargs.get("search", None)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing stix_sighting with {type: stix_sighting}",

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_task.py

@@ -257,8 +257,6 @@ class Task:
         custom_attributes = kwargs.get("customAttributes", None)
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Tasks with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_threat_actor.py

@@ -168,7 +168,6 @@ class ThreatActor:
         :param str after: (optional) OpenCTI object ID of the first row for pagination
         :param str orderBy: (optional) the field to order the response on
         :param bool orderMode: (optional) either "`asc`" or "`desc`"
-        :param bool getAll: (optional) switch to return all entries (be careful to use this without any other filters)
         :param bool withPagination: (optional) switch to use pagination
         """
 
@@ -179,10 +178,7 @@ class ThreatActor:
         order_by = kwargs.get("orderBy", None)
         order_mode = kwargs.get("orderMode", None)
         custom_attributes = kwargs.get("customAttributes", None)
-        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Threat-Actors with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_threat_actor_group.py

@@ -161,7 +161,6 @@ class ThreatActorGroup:
         :param str after: (optional) OpenCTI object ID of the first row for pagination
         :param str orderBy: (optional) the field to order the response on
         :param bool orderMode: (optional) either "`asc`" or "`desc`"
-        :param bool getAll: (optional) switch to return all entries (be careful to use this without any other filters)
         :param bool withPagination: (optional) switch to use pagination
         """
 
@@ -172,10 +171,7 @@ class ThreatActorGroup:
         order_by = kwargs.get("orderBy", None)
         order_mode = kwargs.get("orderMode", None)
         custom_attributes = kwargs.get("customAttributes", None)
-        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Threat-Actors-Group with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_threat_actor_individual.py

@@ -161,7 +161,6 @@ class ThreatActorIndividual:
         :param str after: (optional) OpenCTI object ID of the first row for pagination
         :param str orderBy: (optional) the field to order the response on
         :param bool orderMode: (optional) either "`asc`" or "`desc`"
-        :param bool getAll: (optional) switch to return all entries (be careful to use this without any other filters)
         :param bool withPagination: (optional) switch to use pagination
         """
 
@@ -172,10 +171,7 @@ class ThreatActorIndividual:
         order_by = kwargs.get("orderBy", None)
         order_mode = kwargs.get("orderMode", None)
         custom_attributes = kwargs.get("customAttributes", None)
-        get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 500
 
         self.opencti.app_logger.info(
             "Listing Threat-Actors-Individual with filters",

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_tool.py

@@ -158,8 +158,6 @@ class Tool:
         custom_attributes = kwargs.get("customAttributes", None)
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Tools with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/entities/opencti_vulnerability.py

@@ -155,8 +155,6 @@ class Vulnerability:
         custom_attributes = kwargs.get("customAttributes", None)
         get_all = kwargs.get("getAll", False)
         with_pagination = kwargs.get("withPagination", False)
-        if get_all:
-            first = 100
 
         self.opencti.app_logger.info(
             "Listing Vulnerabilities with filters", {"filters": json.dumps(filters)}

{pycti-6.5.1 → pycti-6.5.3}/pycti/utils/opencti_logger.py

@@ -1,5 +1,5 @@
-import datetime
 import logging
+from datetime import datetime, timezone
 
 from pythonjsonlogger import jsonlogger
 
@@ -9,8 +9,8 @@ class CustomJsonFormatter(jsonlogger.JsonFormatter):
         super(CustomJsonFormatter, self).add_fields(log_record, record, message_dict)
         if not log_record.get("timestamp"):
             # This doesn't use record.created, so it is slightly off
-            now = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")
-            log_record["timestamp"] = now
+            now = datetime.now(tz=timezone.utc)
+            log_record["timestamp"] = now.strftime("%Y-%m-%dT%H:%M:%S.%fZ")
         if log_record.get("level"):
             log_record["level"] = log_record["level"].upper()
         else:

{pycti-6.5.1 → pycti-6.5.3}/pycti.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycti
-Version: 6.5.1
+Version: 6.5.3
 Summary: Python API client for OpenCTI.
 Home-page: https://github.com/OpenCTI-Platform/client-python
 Author: Filigran
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: datefinder~=0.7.3
 Requires-Dist: pika~=1.3.0
-Requires-Dist: pydantic~=2.10.4
+Requires-Dist: pydantic<2.11.0,>=2.8.2
 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
@@ -32,16 +32,16 @@ Requires-Dist: requests~=2.32.2
 Requires-Dist: setuptools~=71.1.0
 Requires-Dist: cachetools~=5.5.0
 Requires-Dist: prometheus-client~=0.21.1
-Requires-Dist: opentelemetry-api~=1.22.0
-Requires-Dist: opentelemetry-sdk~=1.22.0
+Requires-Dist: opentelemetry-api<=1.30.0,>=1.22.0
+Requires-Dist: opentelemetry-sdk<=1.30.0,>=1.22.0
 Requires-Dist: deprecation~=2.1.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: build~=1.2.1; extra == "dev"
-Requires-Dist: isort~=5.13.0; extra == "dev"
-Requires-Dist: types-pytz~=2024.2.0.20241221; 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: pytest-cases~=3.8.0; extra == "dev"
 Requires-Dist: pytest-cov~=5.0.0; extra == "dev"

{pycti-6.5.1 → pycti-6.5.3}/pycti.egg-info/requires.txt

@@ -1,14 +1,14 @@
 datefinder~=0.7.3
 pika~=1.3.0
-pydantic~=2.10.4
+pydantic<2.11.0,>=2.8.2
 python_json_logger~=2.0.4
 PyYAML~=6.0
 requests~=2.32.2
 setuptools~=71.1.0
 cachetools~=5.5.0
 prometheus-client~=0.21.1
-opentelemetry-api~=1.22.0
-opentelemetry-sdk~=1.22.0
+opentelemetry-api<=1.30.0,>=1.22.0
+opentelemetry-sdk<=1.30.0,>=1.22.0
 deprecation~=2.1.0
 filigran-sseclient>=1.0.2
 stix2~=3.0.1
@@ -22,8 +22,8 @@ python-magic-bin~=0.4.14
 [dev]
 black~=24.4.0
 build~=1.2.1
-isort~=5.13.0
-types-pytz~=2024.2.0.20241221
+isort~=6.0.0
+types-pytz~=2025.1.0.20250204
 pre-commit~=3.8.0
 pytest-cases~=3.8.0
 pytest-cov~=5.0.0

{pycti-6.5.1 → pycti-6.5.3}/setup.cfg

@@ -36,7 +36,7 @@ include_package_data = True
 install_requires = 
 	datefinder~=0.7.3
 	pika~=1.3.0
-	pydantic~=2.10.4
+	pydantic>=2.8.2,<2.11.0
 	python-magic~=0.4.27; sys_platform == 'linux' or sys_platform == 'darwin'
 	python-magic-bin~=0.4.14; sys_platform == 'win32'
 	python_json_logger~=2.0.4
@@ -45,8 +45,8 @@ install_requires =
 	setuptools~=71.1.0
 	cachetools~=5.5.0
 	prometheus-client~=0.21.1
-	opentelemetry-api~=1.22.0
-	opentelemetry-sdk~=1.22.0
+	opentelemetry-api>=1.22.0,<=1.30.0
+	opentelemetry-sdk>=1.22.0,<=1.30.0
 	deprecation~=2.1.0
 	filigran-sseclient>=1.0.2
 	stix2~=3.0.1
@@ -55,8 +55,8 @@ install_requires =
 dev = 
 	black~=24.4.0
 	build~=1.2.1
-	isort~=5.13.0
-	types-pytz~=2024.2.0.20241221
+	isort~=6.0.0
+	types-pytz~=2025.1.0.20250204
 	pre-commit~=3.8.0
 	pytest-cases~=3.8.0
 	pytest-cov~=5.0.0