[client] Improve worker behavior to handle complex bundle (#629)

Author: richard-julien

pycti/api/opencti_api_client.py

@@ -351,14 +351,16 @@ def query(self, query, variables=None):
                     if "name" in main_error
                     else main_error["message"]
                 )
-                if "data" in main_error and "reason" in main_error["data"]:
-                    raise ValueError(
-                        {"name": error_name, "message": main_error["data"]["reason"]}
-                    )
-                else:
-                    raise ValueError(
-                        {"name": error_name, "message": main_error["message"]}
-                    )
+                error_detail = {
+                    "name": error_name,
+                    "error_message": main_error["message"],
+                }
+                meta_data = main_error["data"] if "data" in main_error else {}
+                # Prevent logging of input as bundle is logged differently
+                if meta_data.get("input") is not None:
+                    del meta_data["input"]
+                value_error = {**error_detail, **meta_data}
+                raise ValueError(value_error)
             else:
                 return result
         else:

pycti/connector/opencti_connector_helper.py

@@ -1226,17 +1226,22 @@ def send_stix2_bundle(self, bundle: str, **kwargs) -> list:
 
         if bypass_split:
             bundles = [bundle]
+            expectations_number = len(json.loads(bundle)["objects"])
         else:
             stix2_splitter = OpenCTIStix2Splitter()
-            bundles = stix2_splitter.split_bundle(bundle, True, event_version)
+            expectations_number, bundles = (
+                stix2_splitter.split_bundle_with_expectations(
+                    bundle, True, event_version
+                )
+            )
 
         if len(bundles) == 0:
             self.metric.inc("error_count")
             raise ValueError("Nothing to import")
 
         if bundle_send_to_queue:
             if work_id:
-                self.api.work.add_expectations(work_id, len(bundles))
+                self.api.work.add_expectations(work_id, expectations_number)
             if entities_types is None:
                 entities_types = []
             pika_credentials = pika.PlainCredentials(