txt2stix 1.1.11__tar.gz → 1.1.12__tar.gz

{txt2stix-1.1.11 → txt2stix-1.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2stix
-Version: 1.1.11
+Version: 1.1.12
 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
@@ -15,8 +15,8 @@ Requires-Python: >=3.9
 Requires-Dist: base58>=2.1.1
 Requires-Dist: beautifulsoup4>=4.12.3
 Requires-Dist: json-repair
-Requires-Dist: llama-index-core>=0.12.42
-Requires-Dist: llama-index-llms-openai>=0.4.5
+Requires-Dist: llama-index-core>=0.14.8
+Requires-Dist: llama-index-llms-openai>=0.6.8
 Requires-Dist: mistune>=3.0.2
 Requires-Dist: pathvalidate>=3.2.0
 Requires-Dist: phonenumbers>=8.13.39
@@ -29,13 +29,18 @@ Requires-Dist: tld>=0.13
 Requires-Dist: tldextract>=5.1.2
 Requires-Dist: validators>=0.28.3
 Provides-Extra: anthropic
-Requires-Dist: llama-index-llms-anthropic>=0.7.2; extra == 'anthropic'
+Requires-Dist: llama-index-llms-anthropic>=0.9.7; extra == 'anthropic'
 Provides-Extra: deepseek
-Requires-Dist: llama-index-llms-deepseek>=0.1.2; extra == 'deepseek'
+Requires-Dist: llama-index-llms-deepseek>=0.2.2; extra == 'deepseek'
 Provides-Extra: gemini
-Requires-Dist: llama-index-llms-gemini>=0.5.0; extra == 'gemini'
+Requires-Dist: llama-index-llms-google-genai>=0.5.0; extra == 'gemini'
+Provides-Extra: llms
+Requires-Dist: llama-index-llms-anthropic>=0.9.7; extra == 'llms'
+Requires-Dist: llama-index-llms-deepseek>=0.2.2; extra == 'llms'
+Requires-Dist: llama-index-llms-google-genai>=0.5.0; extra == 'llms'
+Requires-Dist: llama-index-llms-openrouter>=0.4.2; extra == 'llms'
 Provides-Extra: openrouter
-Requires-Dist: llama-index-llms-openrouter>=0.3.2; extra == 'openrouter'
+Requires-Dist: llama-index-llms-openrouter>=0.4.2; extra == 'openrouter'
 Provides-Extra: tests
 Requires-Dist: pytest; extra == 'tests'
 Requires-Dist: pytest-cov; extra == 'tests'

{txt2stix-1.1.11 → txt2stix-1.1.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "txt2stix"
-version = "1.1.11"
+version = "1.1.12"
 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."
@@ -28,8 +28,8 @@ dependencies = [
   "tldextract>=5.1.2",
   "validators>=0.28.3",
   "base58>=2.1.1",
-  "llama-index-core>=0.12.42",
-  'llama-index-llms-openai>=0.4.5',
+  "llama-index-core>=0.14.8",
+  'llama-index-llms-openai>=0.6.8',
   'mistune>=3.0.2',
   'beautifulsoup4>=4.12.3',
   'stix2-validator',
@@ -52,8 +52,9 @@ stix2arango = "txt2stix.txt2stix:main"
 "includes" = "txt2stix/includes"
 
 [project.optional-dependencies]
-anthropic = ['llama-index-llms-anthropic>=0.7.2']
-gemini = ['llama-index-llms-gemini>=0.5.0']
-deepseek = ['llama-index-llms-deepseek>=0.1.2']
-openrouter = ['llama-index-llms-openrouter>=0.3.2']
+anthropic = ['llama-index-llms-anthropic>=0.9.7']
+gemini = ['llama-index-llms-google-genai>=0.5.0']
+deepseek = ['llama-index-llms-deepseek>=0.2.2']
+openrouter = ['llama-index-llms-openrouter>=0.4.2']
+llms = ["txt2stix[anthropic,gemini,deepseek,openrouter]"]
 tests = ["pytest", "requests", "pytest-subtests", "pytest-cov", "python-dateutil"]

{txt2stix-1.1.11 → txt2stix-1.1.12}/txt2stix/ai_extractor/anthropic.py

@@ -6,7 +6,7 @@ from llama_index.llms.anthropic import Anthropic
 
 
 class AnthropicAIExtractor(BaseAIExtractor, provider="anthropic"):
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, model='claude-sonnet-4-0', **kwargs) -> None:
         kwargs.setdefault('temperature', float(os.environ.get('TEMPERATURE', 0.0)))
-        self.llm = Anthropic(max_tokens=4096, system_prompt=self.system_prompt, **kwargs)
+        self.llm = Anthropic(max_tokens=4096, model=model, system_prompt=self.system_prompt, **kwargs)
         super().__init__()

{txt2stix-1.1.11 → txt2stix-1.1.12}/txt2stix/ai_extractor/gemini.py

@@ -1,17 +1,17 @@
    
 import os
 from txt2stix.ai_extractor.base import BaseAIExtractor
-from llama_index.llms.gemini import Gemini
+from llama_index.llms.google_genai import GoogleGenAI
 
 
 class GeminiAIExtractor(BaseAIExtractor, provider="gemini"):
     def __init__(self, **kwargs) -> None:
         kwargs.setdefault('temperature', float(os.environ.get('TEMPERATURE', 0.0)))
-        self.llm = Gemini(max_tokens=4096, **kwargs)
+        self.llm = GoogleGenAI(max_tokens=4096, **kwargs)
         super().__init__()
 
     def count_tokens(self, text):
-        return self.llm._model.count_tokens(text).total_tokens
+        return self.llm._client.models.count_tokens(model=self.llm.model, contents=text).total_tokens
     
     @property
     def extractor_name(self):

{txt2stix-1.1.11 → txt2stix-1.1.12}/txt2stix/txt2stix.py

@@ -361,6 +361,7 @@ def validate_token_count(max_tokens, input, extractors: list[BaseAIExtractor]):
     logging.info('INPUT_TOKEN_LIMIT = %d', max_tokens)
     for extractor in extractors:
         token_count = _count_token(extractor, input)
+        logging.info(f"{extractor.extractor_name}: input_file token count = {token_count}") 
         if  token_count > max_tokens:
             raise FatalException(f"{extractor.extractor_name}: input_file token count ({token_count}) exceeds INPUT_TOKEN_LIMIT ({max_tokens})")