pycti 5.12.28__tar.gz → 5.12.30__tar.gz

{pycti-5.12.28 → pycti-5.12.30}/PKG-INFO

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

{pycti-5.12.28 → pycti-5.12.30}/pycti/__init__.py

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

{pycti-5.12.28 → pycti-5.12.30}/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.28 → pycti-5.12.30}/pycti.egg-info/PKG-INFO

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