pycti 5.12.29__py3-none-any.whl → 5.12.30__py3-none-any.whl

pycti/__init__.py

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

pycti/api/opencti_api_client.py

@@ -4,6 +4,7 @@ import datetime
 import io
 import json
 from typing import Union
+from urllib.parse import urljoin
 
 import magic
 import requests
@@ -110,6 +111,7 @@ class OpenCTIApiClient:
         json_logging=False,
         cert=None,
         auth=None,
+        perform_health_check=True,
     ):
         """Constructor method"""
 
@@ -128,7 +130,7 @@ class OpenCTIApiClient:
 
         # Define API
         self.api_token = token
-        self.api_url = url + "/graphql"
+        self.api_url = urljoin(url, "/graphql")
         self.request_headers = {
             "User-Agent": "pycti/" + __version__,
             "Authorization": "Bearer " + token,
@@ -196,7 +198,7 @@ class OpenCTIApiClient:
         self.indicator = Indicator(self)
 
         # Check if openCTI is available
-        if not self.health_check():
+        if perform_health_check and not self.health_check():
             raise ValueError(
                 "OpenCTI API is not reachable. Waiting for OpenCTI API to start or check your configuration..."
             )
@@ -209,12 +211,15 @@ class OpenCTIApiClient:
             "true" if synchronized is True else "false"
         )
 
+    def get_request_headers(self):
+        return self.request_headers
+
     def set_retry_number(self, retry_number):
         self.request_headers["opencti-retry-number"] = (
             "" if retry_number is None else str(retry_number)
         )
 
-    def query(self, query, variables={}):
+    def query(self, query, variables=None):
         """submit a query to the OpenCTI GraphQL API
 
         :param query: GraphQL query string
@@ -224,7 +229,7 @@ class OpenCTIApiClient:
         :return: returns the response json content
         :rtype: Any
         """
-
+        variables = variables or {}
         query_var = {}
         files_vars = []
         # Implementation of spec https://github.com/jaydenseric/graphql-multipart-request-spec
@@ -376,15 +381,15 @@ class OpenCTIApiClient:
         :rtype: bool
         """
         try:
-            self.app_logger.info("Health check (me)...")
+            self.app_logger.info("Health check (platform version)...")
             test = self.query(
                 """
-              query {
-                me {
-                  id
-                }
-              }
-            """
+                  query {
+                    about {
+                      version
+                    }
+                  }
+                """
             )
             if test is not None:
                 return True

{pycti-5.12.29.dist-info → pycti-5.12.30.dist-info}/METADATA

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

{pycti-5.12.29.dist-info → pycti-5.12.30.dist-info}/RECORD

@@ -1,6 +1,6 @@
-pycti/__init__.py,sha256=oAKCN-NvLpcMEzG3FBSs1jIhB6LZdrSv-yog-0zLCmU,4693
+pycti/__init__.py,sha256=lDF77TRWtXw0Qa5AIzk4pzk5nq7nkbsC-rhuFwnN6GQ,4693
 pycti/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycti/api/opencti_api_client.py,sha256=FBqYjmheUeY_h8QfloImMPu8QEjpPT7A5GI2e2SDImw,28631
+pycti/api/opencti_api_client.py,sha256=iTOlkLW8LZybU20XhuzSqmxuH2DG-KirvAmZsHSig00,28887
 pycti/api/opencti_api_connector.py,sha256=fYF0Jy9KIMFNt1RC_A1rpWomVJ-oj5HiSsBem4W0J5U,3549
 pycti/api/opencti_api_playbook.py,sha256=Wcf-G__IHmR7LwtUFVUVx4Skg9e2mcb89n_HyfWC9YM,1383
 pycti/api/opencti_api_work.py,sha256=ow30gswv4k5zLlZGlvLAn47ZM07RLsYvEV-KwtwedQg,7109
@@ -61,8 +61,8 @@ pycti/utils/opencti_stix2.py,sha256=VsPlUBed3YGmd2eTBpD3r8p-aYZFFwgruKNmsV_KYqQ,
 pycti/utils/opencti_stix2_splitter.py,sha256=Ht9Mp-W3gbwxIKEr7i_5NYpcDr3TA2gYdC4TzOz0G4c,4496
 pycti/utils/opencti_stix2_update.py,sha256=CnMyqkeVA0jgyxEcgqna8sABU4YPMjkEJ228GVurIn4,14658
 pycti/utils/opencti_stix2_utils.py,sha256=_ijIz6SRP2OeIaWJcXJt8go510MUEGfWE3KY-I_9QZc,3725
-pycti-5.12.29.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pycti-5.12.29.dist-info/METADATA,sha256=XNuC3Gr46585pUsrIdAB7qz92u6HxhFD09stPAPz2v0,5304
-pycti-5.12.29.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pycti-5.12.29.dist-info/top_level.txt,sha256=cqEpxitAhHP4VgSA6xmrak6Yk9MeBkwoMTB6k7d2ZnE,6
-pycti-5.12.29.dist-info/RECORD,,
+pycti-5.12.30.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pycti-5.12.30.dist-info/METADATA,sha256=M2CCKhs2rBFp_xRcqGQw7CKLQTmBEZs_66Su_TdKDic,5304
+pycti-5.12.30.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+pycti-5.12.30.dist-info/top_level.txt,sha256=cqEpxitAhHP4VgSA6xmrak6Yk9MeBkwoMTB6k7d2ZnE,6
+pycti-5.12.30.dist-info/RECORD,,