[client] Fix packaging and imports of the library (#26)

Author: Samuel Hassine

examples/stix2/import.py

@@ -15,4 +15,4 @@
 opencti_api_client = OpenCTIApiClient(config['opencti']['url'], config['opencti']['token'])
 
 # Import the bundle
-opencti_api_client.stix2_import_bundle_from_file(file_to_import, False)
+opencti_api_client.send(file_to_import, False)

pycti/__init__.py

@@ -1,2 +1,11 @@
-from api.opencti_api_client import OpenCTIApiClient
-from connector.opencti_connector_helper import OpenCTIConnectorHelper
+from pycti.api.opencti_api_client import OpenCTIApiClient
+from pycti.api.opencti_api_connector import OpenCTIApiConnector
+from pycti.api.opencti_api_job import OpenCTIApiJob
+
+from pycti.connector.opencti_connector import ConnectorType
+from pycti.connector.opencti_connector import OpenCTIConnector
+from pycti.connector.opencti_connector_helper import OpenCTIConnectorHelper
+
+from pycti.utils.opencti_stix2 import OpenCTIStix2
+from pycti.utils.constants import ObservableTypes
+from pycti.utils.constants import CustomProperties

pycti/api/opencti_api_client.py

@@ -11,10 +11,10 @@
 import uuid
 import logging
 
-from api.opencti_api_connector import OpenCTIApiConnector
-from api.opencti_api_job import OpenCTIApiJob
-from utils.constants import ObservableTypes
-from utils.opencti_stix2 import OpenCTIStix2
+from pycti.api.opencti_api_connector import OpenCTIApiConnector
+from pycti.api.opencti_api_job import OpenCTIApiJob
+from pycti.utils.constants import ObservableTypes
+from pycti.utils.opencti_stix2 import OpenCTIStix2
 
 
 class File:

pycti/api/opencti_api_connector.py

@@ -1,6 +1,6 @@
 import logging
 
-from connector.opencti_connector import OpenCTIConnector
+from pycti.connector.opencti_connector import OpenCTIConnector
 
 
 class OpenCTIApiConnector:

pycti/connector/opencti_connector_helper.py

@@ -11,8 +11,8 @@
 
 from typing import Callable, Dict, List
 from pika.exceptions import UnroutableError, NackError
-from api.opencti_api_client import OpenCTIApiClient
-from connector.opencti_connector import OpenCTIConnector
+from pycti.api.opencti_api_client import OpenCTIApiClient
+from pycti.connector.opencti_connector import OpenCTIConnector
 
 
 class ListenQueue(threading.Thread):
@@ -80,6 +80,7 @@ class OpenCTIConnectorHelper:
         Python API for OpenCTI connector
         :param config: Dict standard config
     """
+
     def __init__(self, config: dict):
         # Load API config
         self.opencti_url = os.getenv('OPENCTI_URL') or config['opencti']['url']
@@ -172,8 +173,8 @@ def _send_bundle(self, bundle, entities_types=None):
         # raise ValueError('The bundle is not a valid STIX2 JSON')
 
         # Prepare the message
-        if self.current_work_id is None:
-            raise ValueError('The job id must be specified')
+        #if self.current_work_id is None:
+        #    raise ValueError('The job id must be specified')
         message = {
             'job_id': job_id,
             'entities_types': entities_types,

pycti/utils/opencti_stix2.py

@@ -11,7 +11,7 @@
 
 import stix2
 from stix2 import ObjectPath, ObservationExpression, EqualityComparisonExpression, HashConstant
-from utils.constants import ObservableTypes, CustomProperties
+from pycti.utils.constants import ObservableTypes, CustomProperties
 
 datefinder.ValueError = ValueError, OverflowError
 utc = pytz.UTC