txt2detection 1.0.12__py3-none-any.whl → 1.0.14__py3-none-any.whl

txt2detection/__main__.py

@@ -265,8 +265,9 @@ def run_txt2detection(
                 created=detection.date,
                 modified=detection.modified,
             )
-        detection.level = kwargs.get("level", detection.level)
-        detection.status = kwargs.get("status", detection.status)
+        kwargs['license'] = kwargs.get('license') or detection.license
+        detection.level = kwargs.get("level") or detection.level
+        detection.status = kwargs.get("status") or detection.status
         detection.date = as_date(kwargs.get("created"))
         detection.modified = as_date(kwargs.get("modified"))
         detection.references = kwargs["reference_urls"]

txt2detection/ai_extractor/utils.py

@@ -1,6 +1,7 @@
 import io
 import logging
 import typing
+import json_repair
 
 from llama_index.core.output_parsers import PydanticOutputParser
 
@@ -16,4 +17,5 @@ class ParserWithLogging(PydanticOutputParser):
         print(text, file=f)
         print("=================close=================" + "\n" * 5, file=f)
         logging.debug(f.getvalue())
-        return super().parse(text)
+        repaired_json = json_repair.repair_json(text)
+        return super().parse(repaired_json)

txt2detection/bundler.py

@@ -87,7 +87,7 @@ class Bundler:
     )
 
     extension_definition = load_stix_object_from_url(
-        "https://raw.githubusercontent.com/muchdogesec/stix2extensions/refs/heads/main/extension-definitions/properties/indicator-sigma_rule.json"
+        "https://raw.githubusercontent.com/muchdogesec/stix2extensions/refs/heads/main/extension-definitions/properties/indicator-sigma-rule.json"
     )
 
     @classmethod

{txt2detection-1.0.12.dist-info → txt2detection-1.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2detection
-Version: 1.0.12
+Version: 1.0.14
 Summary: A command line tool that takes a txt file containing threat intelligence and turns it into a detection rule.
 Project-URL: Homepage, https://github.com/muchdogesec/txt2detection
 Project-URL: Issues, https://github.com/muchdogesec/txt2detection/issues
@@ -12,6 +12,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
+Requires-Dist: json-repair
 Requires-Dist: jsonschema>=4.22.0; python_version >= '3.8'
 Requires-Dist: llama-index-core>=0.12.42
 Requires-Dist: llama-index-llms-openai>=0.4.5

{txt2detection-1.0.12.dist-info → txt2detection-1.0.14.dist-info}/RECORD

@@ -1,7 +1,7 @@
 txt2detection/__init__.py,sha256=Fc460P0q_eb2u3Xc89z-fwl-4ai3jrPqPNVwJQYNkNQ,89
-txt2detection/__main__.py,sha256=felrmY7q1tLK4wc17Lx0Ip3WJ23GicoIj0k7pelCqLM,11610
+txt2detection/__main__.py,sha256=KC4JtsrFXXiXfNv77lVaYbDBrub5grup5-MNjwHhmOs,11685
 txt2detection/attack_navigator.py,sha256=CEph4Q3N49ASC0b0eXzTgbBU_JBUHUrBWag7dn_TGbg,2135
-txt2detection/bundler.py,sha256=QnuVdyL0J2CC2rIgTLCt3HclDAxXtK7kdLtv8AGMsJ0,15151
+txt2detection/bundler.py,sha256=bu-AbcnWiyTw9ILPw_V4aPXzcqa9VQWVWTMsy25uxP0,15151
 txt2detection/credential_checker.py,sha256=NuKk7WlDshtdpGecxY1exoi4fUHCygunPH2lZ20oEA8,2598
 txt2detection/models.py,sha256=9nEmbyRNIM5ZhM6asJymKlcUA2Bj2mbFEtWX5OPTU2s,12857
 txt2detection/observables.py,sha256=FuOfq7TsQykeHbE5waakx-rh1JacAq3G8mUqi-3Aw_o,5896
@@ -14,10 +14,10 @@ txt2detection/ai_extractor/gemini.py,sha256=hlcKkiHGzQJ0dQECfIhjx2LfdhZoquAF9POw
 txt2detection/ai_extractor/openai.py,sha256=ggonpHtckNz9GEJIR0ADMzZWDKi6EWuicP0fsxvkP3A,616
 txt2detection/ai_extractor/openrouter.py,sha256=rL-SnzRhzrCnPJGLxbTlRyxU0NAw42RmSq3ouuo3Iag,658
 txt2detection/ai_extractor/prompts.py,sha256=u8PyFcyqrr-MTo2uwa4cDOhh7FbvSnmc0sceaKzThsw,5996
-txt2detection/ai_extractor/utils.py,sha256=CHsyVylMIldFATXPcmRNciruO-4nqh68n076lABRaFk,536
+txt2detection/ai_extractor/utils.py,sha256=EZJb3T34WV5iXIg1xh3nbcPC8PWWHc6puc5IiDtE3YM,618
 txt2detection/config/detection_languages.yaml,sha256=dgQUJPxhDRJ_IiFEFOiH0yhEer3SkFSIhY4pS3BsX2c,287
-txt2detection-1.0.12.dist-info/METADATA,sha256=V23xCbPkNx7btdIwmi9VZEeDsfZYUJIIOnx6EmV-YLA,14797
-txt2detection-1.0.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-txt2detection-1.0.12.dist-info/entry_points.txt,sha256=ep_rLlS2r1-kKE7S3iKf3SVwbCU9-FZhU9zUebitw7A,62
-txt2detection-1.0.12.dist-info/licenses/LICENSE,sha256=BK8Ppqlc4pdgnNzIxnxde0taoQ1BgicdyqmBvMiNYgY,11364
-txt2detection-1.0.12.dist-info/RECORD,,
+txt2detection-1.0.14.dist-info/METADATA,sha256=1hSBgeJcwkpXkXVUoKihFdGXcPa2lctx9ym58dgVNHE,14824
+txt2detection-1.0.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+txt2detection-1.0.14.dist-info/entry_points.txt,sha256=ep_rLlS2r1-kKE7S3iKf3SVwbCU9-FZhU9zUebitw7A,62
+txt2detection-1.0.14.dist-info/licenses/LICENSE,sha256=BK8Ppqlc4pdgnNzIxnxde0taoQ1BgicdyqmBvMiNYgY,11364
+txt2detection-1.0.14.dist-info/RECORD,,