txt2stix 1.0.12__tar.gz → 1.0.14__tar.gz

{txt2stix-1.0.12 → txt2stix-1.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2stix
-Version: 1.0.12
+Version: 1.0.14
 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.0.12 → txt2stix-1.0.14}/includes/extractions/ai/config.yaml

@@ -28,7 +28,7 @@ ai_ipv4_address_cidr:
   modified:  2020-01-01
   created_by: DOGESEC
   version: 1.0.0
-  prompt_base: 'Extract all IPv4 addresses with a CIDR from the text.'
+  prompt_base: 'Extract all IPv4 addresses with a CIDR from the text. CIDR part must be >=0 <=32.'
   prompt_helper: 'Do not include any IPs that do not have a CIDR.'
   prompt_conversion: ''
   test_cases: ipv4_address_cidr
@@ -44,8 +44,8 @@ ai_ipv4_address_port:
   modified:  2020-01-01
   created_by: DOGESEC
   version: 1.0.0
-  prompt_base: 'Extract all IPv4 addresses with a port from the text.'
-  prompt_helper: 'Do not include any IPv4s that do not contain a port number'
+  prompt_base: 'Extract all IPv4 addresses with a port from the text. Port number part must be >=0 <=65535.'
+  prompt_helper: 'Do not include any IPv4s that do not contain a port number.'
   prompt_conversion: ''
   test_cases: ipv4_address_port
   stix_mapping: ipv4-addr-port
@@ -72,13 +72,13 @@ ai_ipv6_address_cidr:
   type: ai
   dogesec_web: true
   name: 'IPv6 Address with CIDR'
-  description: 'Extracts IPv6 addresses with CIDRs'
+  description: 'Extracts IPv6 addresses with CIDRs.'
   notes: 'pattern_ipv6_address_cidr legacy extraction also exists if you cannot use AI'
   created: 2020-01-01
   modified:  2020-01-01
   created_by: DOGESEC
   version: 1.0.0
-  prompt_base: 'Extract all IPv6 addresses with a CIDR from the text.'
+  prompt_base: 'Extract all IPv6 addresses with a CIDR from the text. CIDR part must be >=0 <=128.'
   prompt_helper: 'Do not include any IPv6s that do not contain a CIDR'
   prompt_conversion: ''
   test_cases: generic_ipv6_address_cidr
@@ -94,7 +94,7 @@ ai_ipv6_address_port:
   modified:  2020-01-01
   created_by: DOGESEC
   version: 1.0.0
-  prompt_base: 'Extract all IPv6 addresses with a CIDR from the text.'
+  prompt_base: 'Extract all IPv6 addresses with a CIDR from the text. Port number part must be >=0 <=65535.'
   prompt_helper: 'Do not include any IPv6s that do not contain a port number'
   prompt_conversion: ''
   test_cases: generic_ipv6_address_port

{txt2stix-1.0.12 → txt2stix-1.0.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "txt2stix"
-version = "1.0.12"
+version = "1.0.14"
 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.0.12 → txt2stix-1.0.14}/tests/src/test_retriever.py

@@ -113,7 +113,7 @@ def f():
         (
             "vulmatch-cpe-id",
             "cpe:2.3:h:qualcomm:sd821:-:*:*:*:*:*:*:*",
-            ["software--0028c970-9268-5988-b941-f6bfc050300a"],
+            ["software--4e0ea65d-90b0-5582-a1d6-b69d5472fbb2"],
         ),
     ],
 )

{txt2stix-1.0.12 → txt2stix-1.0.14}/tests/src/test_run_txt2stix.py

@@ -124,7 +124,7 @@ def test_content_check_param(mock_validate_token_count, subtests):
         mock_check_content.assert_called_once()
         mock_validate_token_count.assert_called_once()
         for classification in incident_classifications:
-            assert f"txt2stix:{classification}".lower() in mock_bundler.report.labels
+            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)
 
     mock_validate_token_count.reset_mock()

{txt2stix-1.0.12 → txt2stix-1.0.14}/txt2stix/txt2stix.py

@@ -394,7 +394,7 @@ def run_txt2stix(bundler: txt2stixBundler, preprocessed_text: str, extractors_ma
         logging.info("=== ai-check-content output ====")
         logging.info(retval.content_check.model_dump_json())
         for classification in retval.content_check.incident_classification:
-            bundler.report.labels.append(f'txt2stix:{classification}'.lower())
+            bundler.report.labels.append(f'classification.{classification}'.lower())
         bundler.add_summary(retval.content_check.summary, model.extractor_name)
 
     if should_extract or ai_extract_if_no_incidence: