txt2stix 1.1.5__tar.gz → 1.1.6__tar.gz

{txt2stix-1.1.5 → txt2stix-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2stix
-Version: 1.1.5
+Version: 1.1.6
 Summary: txt2stix is a Python script that is designed to identify and extract IoCs and TTPs from text files, identify the relationships between them, convert them to STIX 2.1 objects, and output as a STIX 2.1 bundle.
 Project-URL: Homepage, https://github.com/muchdogesec/txt2stix
 Project-URL: Issues, https://github.com/muchdogesec/txt2stix/issues

{txt2stix-1.1.5 → txt2stix-1.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "txt2stix"
-version = "1.1.5"
+version = "1.1.6"
 authors = [{ name = "dogesec" }]
 maintainers = [{ name = "dogesec" }]
 description = "txt2stix is a Python script that is designed to identify and extract IoCs and TTPs from text files, identify the relationships between them, convert them to STIX 2.1 objects, and output as a STIX 2.1 bundle."

{txt2stix-1.1.5 → txt2stix-1.1.6}/tests/src/test_run_txt2stix.py

@@ -30,6 +30,11 @@ all_extractors = get_all_extractors()
 TEST_AI_MODEL = os.getenv('TEST_AI_MODEL')
 
 
+def as_python(obj):
+    import json
+    from stix2.serialization import serialize
+    return json.loads(serialize(obj))
+
 @mock.patch("txt2stix.txt2stix.validate_token_count")
 def test_content_check_param(mock_validate_token_count, subtests):
     """Test the run_txt2stix function"""
@@ -94,7 +99,8 @@ def test_content_check_param(mock_validate_token_count, subtests):
         mock_check_content.assert_called_once()
         mock_validate_token_count.assert_called_once()
         mock_bundle__add_summary.assert_called_once_with("The summary", parse_model(TEST_AI_MODEL).extractor_name)
-        assert {'source_name': 'txt2stix_describes_incident', 'description': 'false'} in mock_bundler.report.external_references
+        print(as_python(mock_bundler.report.external_references))
+        assert {'source_name': 'txt2stix_describes_incident', 'description': 'false', 'external_id': parse_model(TEST_AI_MODEL).extractor_name} in as_python(mock_bundler.report.external_references)
 
     mock_validate_token_count.reset_mock()
 
@@ -127,7 +133,7 @@ def test_content_check_param(mock_validate_token_count, subtests):
         for classification in incident_classifications:
             assert f"classification.{classification}".lower() in mock_bundler.report.labels
         mock_bundle__add_summary.assert_called_once_with("The summary", parse_model(TEST_AI_MODEL).extractor_name)
-        assert {'source_name': 'txt2stix_describes_incident', 'description': 'true'} in mock_bundler.report.external_references
+        assert {'source_name': 'txt2stix_describes_incident', 'description': 'true', 'external_id': parse_model(TEST_AI_MODEL).extractor_name} in as_python(mock_bundler.report.external_references)
 
     mock_validate_token_count.reset_mock()
 
@@ -149,7 +155,7 @@ def test_content_check_param(mock_validate_token_count, subtests):
         ), "extraction should happen when check_content is disabled"
         mock_check_content.assert_not_called()
         mock_validate_token_count.assert_not_called()
-        assert {'source_name': 'txt2stix_describes_incident', 'description': 'true'} in mock_bundler.report.external_references
+        assert {'source_name': 'txt2stix_describes_incident', 'description': 'true', 'external_id': parse_model(TEST_AI_MODEL).extractor_name} in as_python(mock_bundler.report.external_references)
 
 
 

{txt2stix-1.1.5 → txt2stix-1.1.6}/txt2stix/txt2stix.py

@@ -393,7 +393,7 @@ def run_txt2stix(bundler: txt2stixBundler, preprocessed_text: str, extractors_ma
         should_extract = retval.content_check.describes_incident
         logging.info("=== ai-check-content output ====")
         logging.info(retval.content_check.model_dump_json())
-        bundler.report.external_references.append(dict(source_name='txt2stix_describes_incident', description=str(should_extract).lower()))
+        bundler.report.external_references.append(dict(source_name='txt2stix_describes_incident', description=str(should_extract).lower(), external_id=model.extractor_name))
         for classification in retval.content_check.incident_classification:
             bundler.report.labels.append(f'classification.{classification}'.lower())
         bundler.add_summary(retval.content_check.summary, model.extractor_name)