stix2arango 1.0.3__tar.gz → 1.1.0__tar.gz

{stix2arango-1.0.3 → stix2arango-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stix2arango
-Version: 1.0.3
+Version: 1.1.0
 Summary: stix2arango is a command line tool that takes a group of STIX 2.1 objects in a bundle and inserts them into ArangoDB. It can also handle updates to existing objects in ArangoDB imported in a bundle.
 Project-URL: Homepage, https://github.com/muchdogesec/stix2arango
 Project-URL: Issues, https://github.com/muchdogesec/stix2arango/issues

{stix2arango-1.0.3 → stix2arango-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "stix2arango"
-version = "1.0.3"
+version = "1.1.0"
 authors = [
   { name = "dogesec" }
 ]

{stix2arango-1.0.3 → stix2arango-1.1.0}/stix2arango/services/arangodb_service.py

@@ -220,7 +220,8 @@ class ArangoDBService:
         )
         out = [dict(zip(('id', '_key', 'modified', '_record_modified', '_is_latest', '_id'), obj_tuple)) for obj_tuple in out]
         annotated, deprecated = annotate_versions(out)
-        self.db.collection(collection_name).update_many(annotated, sync=True, keep_none=False)
+        for chunk in utils.chunked(annotated, 10_000):
+            self.db.collection(collection_name).update_many(chunk, sync=True, keep_none=False)
         return deprecated
 
 
@@ -297,8 +298,9 @@ class ArangoDBService:
     @contextlib.contextmanager
     def transactional(self, write=None, exclusive=None, sync=True):
         original_db = self.db
-        transactional_db = self.db.begin_transaction(allow_implicit=True, write=write, exclusive=exclusive, sync=sync)
+        transactional_db = self.db.begin_transaction(allow_implicit=True, write=write, exclusive=exclusive, sync=sync, lock_timeout=300)
         try:
+            logging.info(f"entering transaction: {transactional_db.transaction_status()}")
             self.db = transactional_db
             yield self
             transactional_db.commit_transaction()
@@ -306,4 +308,5 @@ class ArangoDBService:
             transactional_db.abort_transaction()
             raise
         finally:
+            logging.info(f"exiting transaction: {transactional_db.transaction_status()}")
             self.db = original_db