Fix 66+67 (#80)

* dont import tlp:red automatically #66

* use prompt_helper #67

txt2stix/ai_extractor/utils.py

@@ -42,18 +42,17 @@ def parse(self, text: str):
 
 def get_extractors_str(extractors):
     extractor: Extractor = None
-    extractors_str = []
+    buffer = io.StringIO()
     for extractor in extractors:
-        extractor_str = textwrap.dedent(
-        f"""
-        <extractor name={repr(extractor.name)} extraction_key={repr(extractor.extraction_key)}>
-        - {extractor.prompt_base}
-        - {extractor.prompt_conversion}
-        </extractor>
-        """
-        )
-        extractors_str.append(extractor_str)
-    return "".join(extractors_str)
+        print(f"<extractor name={repr(extractor.name)} extraction_key={repr(extractor.extraction_key)}>", file=buffer)
+        print(f"- {extractor.prompt_base}", file=buffer)
+        if extractor.prompt_helper:
+            print(f"- {extractor.prompt_helper}", file=buffer)
+        if extractor.prompt_conversion:
+            print(f"- {extractor.prompt_conversion}", file=buffer)
+        print("</extractor>", file=buffer)
+        print("\n"*2, file=buffer)
+    return buffer.getvalue()
 
 
 

txt2stix/stix.py

@@ -248,9 +248,6 @@ def set_defaults(self):
         self.bundle.objects.extend([self.default_marking, self.identity, self.report])
         # add default STIX 2.1 marking definition for txt2stix
         self.report.object_marking_refs.append(self.default_marking.id)
-        # add import tlp:red for notes if it's not imported already
-        if self.tlp_level != TLP_LEVEL.RED:
-            self.bundle.objects.append(TLP_LEVEL.RED.value)
 
     def add_extension(self, object):
         _type = object["type"]