[client] Add ask_enrichments and change operation case

Author: richard-julien

pycti/entities/opencti_stix_core_object.py

@@ -1784,6 +1784,34 @@ def clear_access_restriction(self, **kwargs):
             self.opencti.app_logger.error("[stix_core_object] Missing parameters: id")
             return None
 
+    """
+        Ask enrichment with single connector
+
+        :param element_id: the Stix-Core-Object id
+        :param connector_id the connector
+        :return void
+    """
+
+    def ask_enrichment(self, **kwargs):
+        element_id = kwargs.get("element_id", None)
+        connector_id = kwargs.get("connector_id", None)
+        query = """
+            mutation StixCoreObjectEdit($id: ID!, $connectorId: ID!) {
+                stixCoreObjectEdit(id: $id) {
+                    askEnrichment(connectorId: $connectorId) {
+                      id
+                    }
+                }
+            }
+        """
+        self.opencti.query(
+            query,
+            {
+                "id": element_id,
+                "connectorId": connector_id,
+            },
+        )
+
     """
         Ask enrichment with multiple connectors
 
@@ -1792,13 +1820,13 @@ def clear_access_restriction(self, **kwargs):
         :return void
     """
 
-    def ask_enrichment(self, **kwargs):
+    def ask_enrichments(self, **kwargs):
         element_id = kwargs.get("element_id", None)
         connector_ids = kwargs.get("connector_ids", None)
         query = """
-            mutation StixCoreObjectEdit($id: ID!, $connectorId: [ID!]!) {
+            mutation StixCoreObjectEdit($id: ID!, $connectorIds: [ID!]!) {
                 stixCoreObjectEdit(id: $id) {
-                    askEnrichment(connectorId: $connectorId) {
+                    askEnrichments(connectorIds: $connectorIds) {
                       id
                     }
                 }

pycti/utils/opencti_stix2.py

@@ -2529,10 +2529,10 @@ def import_item(
             if "opencti_operation" in item:
                 if (
                     item["opencti_operation"] == "delete"
-                    or item["opencti_operation"] == "delete-force"
+                    or item["opencti_operation"] == "delete_force"
                 ):
                     self.element_operation_delete(item=item)
-                elif item["opencti_operation"] == "revert-draft":
+                elif item["opencti_operation"] == "revert_draft":
                     self.opencti.stix_core_object.remove_from_draft(id=item["id"])
                 elif item["opencti_operation"] == "restore":
                     self.opencti.trash.restore(item["id"])
@@ -2558,7 +2558,7 @@ def import_item(
                     )
                 elif item["opencti_operation"] == "enrichment":
                     connector_ids = item["connector_ids"]
-                    self.opencti.stix_core_object.ask_enrichment(
+                    self.opencti.stix_core_object.ask_enrichments(
                         element_id=item["id"], connector_ids=connector_ids
                     )
                 else: