hamtaa-texttools 1.1.20__py3-none-any.whl → 1.1.22__py3-none-any.whl

{hamtaa_texttools-1.1.20.dist-info → hamtaa_texttools-1.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamtaa-texttools
-Version: 1.1.20
+Version: 1.1.22
 Summary: A high-level NLP toolkit built on top of modern LLMs.
 Author-email: Tohidi <the.mohammad.tohidi@gmail.com>, Montazer <montazerh82@gmail.com>, Givechi <mohamad.m.givechi@gmail.com>, MoosaviNejad <erfanmoosavi84@gmail.com>, Zareshahi <a.zareshahi1377@gmail.com>
 License: MIT License
@@ -37,61 +37,53 @@ Dynamic: license-file
 
 ## 📌 Overview
 
-**TextTools** is a high-level **NLP toolkit** built on top of modern **LLMs**.  
+**TextTools** is a high-level **NLP toolkit** built on top of **LLMs**.  
 
 It provides both **sync (`TheTool`)** and **async (`AsyncTheTool`)** APIs for maximum flexibility.
 
 It provides ready-to-use utilities for **translation, question detection, keyword extraction, categorization, NER extraction, and more** - designed to help you integrate AI-powered text processing into your applications with minimal effort.
 
+**Note:** Most features of `texttools` are reliable when you use `google/gemma-3n-e4b-it` model.
+
 ---
 
 ## ✨ Features
 
 TextTools provides a rich collection of high-level NLP utilities,
-Each tool is designed to work with structured outputs (JSON / Pydantic).
+Each tool is designed to work with structured outputs.
 
-- **`categorize()`** - Classifies text into given categories (You have to create a category tree)
-- **`extract_keywords()`** - Extracts keywords from text
+- **`categorize()`** - Classifies text into given categories
+- **`extract_keywords()`** - Extracts keywords from the text
 - **`extract_entities()`** - Named Entity Recognition (NER) system
-- **`is_question()`** - Binary detection of whether input is a question
+- **`is_question()`** - Binary question detection
 - **`text_to_question()`** - Generates questions from text
-- **`merge_questions()`** - Merges multiple questions with different modes
-- **`rewrite()`** - Rewrites text with different wording/meaning
+- **`merge_questions()`** - Merges multiple questions into one
+- **`rewrite()`** - Rewrites text in a diffrent way
 - **`subject_to_question()`** - Generates questions about a specific subject
 - **`summarize()`** - Text summarization
-- **`translate()`** - Text translation between languages
+- **`translate()`** - Text translation
 - **`propositionize()`** - Convert text to atomic independence meaningful sentences 
-- **`check_fact()`** - Check a statement is relevant to source text or not 
+- **`check_fact()`** - Check whether a statement is relevant to the source text
 - **`run_custom()`** - Allows users to define a custom tool with an arbitrary BaseModel
 
 ---
 
+## 🚀 Installation
+
+Install the latest release via PyPI:
+
+```bash
+pip install -U hamtaa-texttools
+```
+
+---
+
 ## 📊 Tool Quality Tiers
 
-| Status | Meaning | Use in Production? |
-|--------|---------|-------------------|
-| **✅ Production** | Evaluated, tested, stable. | **Yes** - ready for reliable use. |
-| **🧪 Experimental** | Added to the package but **not fully evaluated**. Functional, but quality may vary. | **Use with caution** - outputs not yet validated. |
-
-### Current Status
-**Production Tools:**
-- `categorize()` (list mode)
-- `extract_keywords()`
-- `extract_entities()`
-- `is_question()`
-- `text_to_question()`
-- `merge_questions()`
-- `rewrite()`
-- `subject_to_question()`
-- `summarize()`
-- `run_custom()` (fine in most cases)
-
-**Experimental Tools:**
-- `categorize()` (tree mode)
-- `translate()`
-- `propositionize()`
-- `check_fact()`
-- `run_custom()` (not evaluated in all scenarios)
+| Status | Meaning | Tools | Use in Production? |
+|--------|---------|----------|-------------------|
+| **✅ Production** | Evaluated, tested, stable. | `categorize()` (list mode), `extract_keywords()`, `extract_entities()`, `is_question()`, `text_to_question()`, `merge_questions()`, `rewrite()`, `subject_to_question()`, `summarize()`, `run_custom()` | **Yes** - ready for reliable use. |
+| **🧪 Experimental** | Added to the package but **not fully evaluated**. Functional, but quality may vary. | `categorize()` (tree mode), `translate()`, `propositionize()`, `check_fact()` | **Use with caution** - outputs not yet validated. |
 
 ---
 
@@ -100,48 +92,37 @@ Each tool is designed to work with structured outputs (JSON / Pydantic).
 TextTools provides several optional flags to customize LLM behavior:
 
 - **`with_analysis: bool`** → Adds a reasoning step before generating the final output.
-**Note:** This doubles token usage per call because it triggers an additional LLM request.
+**Note:** This doubles token usage per call.
 
 - **`logprobs: bool`** → Returns token-level probabilities for the generated output. You can also specify `top_logprobs=<N>` to get the top N alternative tokens and their probabilities.  
 **Note:** This feature works if it's supported by the model.
 
-- **`output_lang: str`** → Forces the model to respond in a specific language. The model will ignore other instructions about language and respond strictly in the requested language.
+- **`output_lang: str`** → Forces the model to respond in a specific language.
 
-- **`user_prompt: str`** → Allows you to inject a custom instruction or prompt into the model alongside the main template. This gives you fine-grained control over how the model interprets or modifies the input text.
+- **`user_prompt: str`** → Allows you to inject a custom instruction or into the model alongside the main template. This gives you fine-grained control over how the model interprets or modifies the input text.
 
 - **`temperature: float`** → Determines how creative the model should respond. Takes a float number from `0.0` to `2.0`.
 
-- **`validator: Callable (Experimental)`** → Forces TheTool to validate the output result based on your custom validator. Validator should return a bool (True if there were no problem, False if the validation fails.) If the validator fails, TheTool will retry to get another output by modifying `temperature`. You can specify `max_validation_retries=<N>` to change the number of retries.
+- **`validator: Callable (Experimental)`** → Forces TheTool to validate the output result based on your custom validator. Validator should return a boolean. If the validator fails, TheTool will retry to get another output by modifying `temperature`. You can also specify `max_validation_retries=<N>`.
 
-- **`priority: int (Experimental)`** → Task execution priority level. Higher values = higher priority. Affects processing order in queues.
+- **`priority: int (Experimental)`** → Task execution priority level. Affects processing order in queues.
 **Note:** This feature works if it's supported by the model and vLLM.
 
-**Note:** There might be some tools that don't support some of the parameters above.
-
 ---
 
 ## 🧩 ToolOutput
 
 Every tool of `TextTools` returns a `ToolOutput` object which is a BaseModel with attributes:
-- **`result: Any`** → The output of LLM
-- **`analysis: str`** → The reasoning step before generating the final output
-- **`logprobs: list`** → Token-level probabilities for the generated output 
-- **`process: str`** → The tool name which processed the input
-- **`processed_at: datetime`** → The process time
-- **`execution_time: float`** → The execution time (seconds)
-- **`errors: list[str]`** → Any error that have occured during calling LLM
+- **`result: Any`**
+- **`analysis: str`**
+- **`logprobs: list`**
+- **`errors: list[str]`**
+- **`ToolOutputMetadata`** →
+    - **`tool_name: str`**
+    - **`processed_at: datetime`**
+    - **`execution_time: float`**
 
-**Note:** You can use `repr(ToolOutput)` to see details of your ToolOutput.
-
----
-
-## 🚀 Installation
-
-Install the latest release via PyPI:
-
-```bash
-pip install -U hamtaa-texttools
-```
+**Note:** You can use `repr(ToolOutput)` to print your output with all the details.
 
 ---
 
@@ -159,26 +140,13 @@ pip install -U hamtaa-texttools
 from openai import OpenAI
 from texttools import TheTool
 
-# Create your OpenAI client
 client = OpenAI(base_url = "your_url", API_KEY = "your_api_key")
+model = "model_name"
 
-# Specify the model
-model = "gpt-4o-mini"
-
-# Create an instance of TheTool
 the_tool = TheTool(client=client, model=model)
 
-# Example: Question Detection
-detection = the_tool.is_question("Is this project open source?", logprobs=True, top_logprobs=2)
-print(detection.result)
-print(detection.logprobs)
-# Output: True + logprobs
-
-# Example: Translation
-translation = the_tool.translate("سلام، حالت چطوره؟" target_language="English", with_analysis=True)
-print(translation.result)
-print(translation.analysis)
-# Output: "Hi! How are you?"  + analysis
+detection = the_tool.is_question("Is this project open source?")
+print(repr(detection))
 ```
 
 ---
@@ -191,22 +159,17 @@ from openai import AsyncOpenAI
 from texttools import AsyncTheTool
 
 async def main():
-    # Create your AsyncOpenAI client
     async_client = AsyncOpenAI(base_url="your_url", api_key="your_api_key")
+    model = "model_name"
 
-    # Specify the model
-    model = "gpt-4o-mini"
-
-    # Create an instance of AsyncTheTool
     async_the_tool = AsyncTheTool(client=async_client, model=model)
     
-    # Example: Async Translation and Keyword Extraction
     translation_task = async_the_tool.translate("سلام، حالت چطوره؟", target_language="English")
     keywords_task = async_the_tool.extract_keywords("Tomorrow, we will be dead by the car crash")
 
     (translation, keywords) = await asyncio.gather(translation_task, keywords_task)
-    print(translation.result)
-    print(keywords.result)
+    print(repr(translation))
+    print(repr(keywords))
 
 asyncio.run(main())
 ```
@@ -224,37 +187,16 @@ Use **TextTools** when you need to:
 
 ---
 
-## 🔍 Logging
-
-TextTools uses Python's standard `logging` module. The library's default logger level is `WARNING`, so if you want to modify it, follow instructions:
-
-
-```python
-import logging
-
-# Default: warnings and errors only
-logging.basicConfig(level=logging.WARNING)
-
-# Debug everything (verbose)
-logging.basicConfig(level=logging.DEBUG)
-
-# Complete silence
-logging.basicConfig(level=logging.CRITICAL)
-```
-
----
-
 ## 📚 Batch Processing
 
 Process large datasets efficiently using OpenAI's batch API.
 
-## ⚡ Quick Start (Batch)
+## ⚡ Quick Start (Batch Runner)
 
 ```python
 from pydantic import BaseModel
-from texttools import BatchJobRunner, BatchConfig
+from texttools import BatchRunner, BatchConfig
 
-# Configure your batch job
 config = BatchConfig(
     system_prompt="Extract entities from the text",
     job_name="entity_extraction",
@@ -263,12 +205,10 @@ config = BatchConfig(
     model="gpt-4o-mini"
 )
 
-# Define your output schema
 class Output(BaseModel):
     entities: list[str]
 
-# Run the batch job
-runner = BatchJobRunner(config, output_model=Output)
+runner = BatchRunner(config, output_model=Output)
 runner.run()
 ```
 

hamtaa_texttools-1.1.22.dist-info/RECORD

@@ -0,0 +1,32 @@
+hamtaa_texttools-1.1.22.dist-info/licenses/LICENSE,sha256=Hb2YOBKy2MJQLnyLrX37B4ZVuac8eaIcE71SvVIMOLg,1082
+texttools/__init__.py,sha256=fqGafzxcnGw0_ivi-vUyLfytWOkjLOumiaB0-I612iY,305
+texttools/batch/batch_config.py,sha256=scWYQBDuaTj8-b2x_a33Zu-zxm7eqEf5FFoquD-Sv94,1029
+texttools/batch/batch_manager.py,sha256=6HfsexU0PHGGBH7HKReZ-CQxaQI9DXYKAPsFXxovb_I,8740
+texttools/batch/batch_runner.py,sha256=bpgRnFZiaxqAP6sm3kzb-waeNhIRxXYhttGikGFeXXU,10013
+texttools/internals/async_operator.py,sha256=VHs06Yd_OZqUVyhCOMn7iujEChqhJg8aRS8NXpHBO1w,6719
+texttools/internals/exceptions.py,sha256=h_yp_5i_5IfmqTBQ4S6ZOISrrliJBQ3HTEAjwJXrplk,495
+texttools/internals/models.py,sha256=9uoCAe2TLrSzyS9lMJja5orPAYaCvVL1zoCb6FNdkfs,4541
+texttools/internals/operator_utils.py,sha256=p44-YovUiLefJ-akB3o7Tk1o73ITFxx7E77pod4Aa1Y,2491
+texttools/internals/prompt_loader.py,sha256=yYXDD4YYG2zohGPAmvZwmv5f6xV_RSl5yOrObTh9w7I,3352
+texttools/internals/sync_operator.py,sha256=23mIxk96SOOkYb_7VXjmkNKuWqPTRQVhO4cTKQ_4Mtw,6624
+texttools/internals/text_to_chunks.py,sha256=vY3odhgCZK4E44k_SGlLoSiKkdN0ib6-lQAsPcplAHA,3843
+texttools/prompts/README.md,sha256=ztajRJcmFLhyrUF0_qmOXaCwGsTGCFabfMjch2LAJG0,1375
+texttools/prompts/categorize.yaml,sha256=016b1uGtbKXEwB8_2_bBgVuUelBlu_rgT85XK_c3Yv0,1219
+texttools/prompts/check_fact.yaml,sha256=gQqacCXqUEx3u2FRwhFSZHvhyWGwsYuJd1nIJyhpu7Q,700
+texttools/prompts/extract_entities.yaml,sha256=DN8lZjvzCjotODnHFkWIAxFvmVvoeSs-hDKdN1L6bec,608
+texttools/prompts/extract_keywords.yaml,sha256=GoeApi9SUCLZgs18H2-2BxZiKQ3lHptMPesgq3cluqU,3171
+texttools/prompts/is_question.yaml,sha256=w5qF-z05h62YVs-0x2b2ySlHDKIhukFC9pibnvNM0vc,469
+texttools/prompts/merge_questions.yaml,sha256=f6bHEx54jJ8hnb8iDBUCxXeGdGwRFmuu7vOkVWdaIkM,1788
+texttools/prompts/propositionize.yaml,sha256=agZKQY-NmeJD86DGjmd-paIuazf82bczIGadgzSP5Vs,1378
+texttools/prompts/rewrite.yaml,sha256=h6x8aXcW8oRxEbp466eak0y-LCkUOKf-mJ-vNVp5j5M,5386
+texttools/prompts/run_custom.yaml,sha256=IETY9H0wPGWIIzcnupfbwwKQblwZrbYAxB754W9MhgU,125
+texttools/prompts/subject_to_question.yaml,sha256=TfVmZ6gDgaHRqJWCVkFlKpuJczpMvJTo4XLWPaq5zic,1145
+texttools/prompts/summarize.yaml,sha256=CKx4vjhHbGus1TdjDz_oc0bNEQtq7zfHsZkV2WeYHDU,457
+texttools/prompts/text_to_question.yaml,sha256=mnArBoYu7gpGHriaU2-Aw5SixB2ZIgoHMt99PnTPKD0,1003
+texttools/prompts/translate.yaml,sha256=ew9RERAVSzg0cvxAinNwTSFIaOIjdwIsekbUsgAuNgo,632
+texttools/tools/async_tools.py,sha256=s3g6_8Jmg2KvdItWa3sXGfWI8YaOUPnfIRtWhWRMd1c,44543
+texttools/tools/sync_tools.py,sha256=AcApMy_XvT47rBtqGdAFrKE1QDZq30f0uJsqiWYUWQg,44349
+hamtaa_texttools-1.1.22.dist-info/METADATA,sha256=RF431cau25sLMmynuSHXKssKt3ipFt5M9ZKJJA3C9UI,8718
+hamtaa_texttools-1.1.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hamtaa_texttools-1.1.22.dist-info/top_level.txt,sha256=5Mh0jIxxZ5rOXHGJ6Mp-JPKviywwN0MYuH0xk5bEWqE,10
+hamtaa_texttools-1.1.22.dist-info/RECORD,,

texttools/__init__.py

@@ -1,7 +1,7 @@
-from .batch.batch_runner import BatchJobRunner
-from .batch.batch_config import BatchConfig
 from .tools.sync_tools import TheTool
 from .tools.async_tools import AsyncTheTool
 from .internals.models import CategoryTree
+from .batch.batch_runner import BatchRunner
+from .batch.batch_config import BatchConfig
 
-__all__ = ["TheTool", "AsyncTheTool", "BatchJobRunner", "BatchConfig", "CategoryTree"]
+__all__ = ["TheTool", "AsyncTheTool", "CategoryTree", "BatchRunner", "BatchConfig"]

texttools/batch/batch_config.py

@@ -1,7 +1,20 @@
 from dataclasses import dataclass
 from collections.abc import Callable
 
-from texttools.batch.internals.utils import import_data, export_data
+
+def export_data(data) -> list[dict[str, str]]:
+    """
+    Produces a structure of the following form from an initial data structure:
+    [{"id": str, "text": str},...]
+    """
+    return data
+
+
+def import_data(data) -> object:
+    """
+    Takes the output and adds and aggregates it to the original structure.
+    """
+    return data
 
 
 @dataclass

texttools/batch/batch_runner.py

@@ -9,7 +9,7 @@ from dotenv import load_dotenv
 from openai import OpenAI
 from pydantic import BaseModel
 
-from texttools.batch.internals.batch_manager import BatchManager
+from texttools.batch.batch_manager import BatchManager
 from texttools.batch.batch_config import BatchConfig
 from texttools.internals.models import Str
 from texttools.internals.exceptions import TextToolsError, ConfigurationError
@@ -20,7 +20,7 @@ T = TypeVar("T", bound=BaseModel)
 logger = logging.getLogger("texttools.batch_runner")
 
 
-class BatchJobRunner:
+class BatchRunner:
     """
     Handles running batch jobs using a batch manager and configuration.
     """

texttools/internals/async_operator.py

@@ -1,11 +1,10 @@
 from typing import TypeVar, Type
 from collections.abc import Callable
-import logging
 
 from openai import AsyncOpenAI
 from pydantic import BaseModel
 
-from texttools.internals.models import ToolOutput
+from texttools.internals.models import OperatorOutput
 from texttools.internals.operator_utils import OperatorUtils
 from texttools.internals.prompt_loader import PromptLoader
 from texttools.internals.exceptions import (
@@ -18,39 +17,21 @@ from texttools.internals.exceptions import (
 # Base Model type for output models
 T = TypeVar("T", bound=BaseModel)
 
-logger = logging.getLogger("texttools.async_operator")
-
 
 class AsyncOperator:
     """
-    Core engine for running text-processing operations with an LLM (Async).
-
-    It wires together:
-    - `PromptLoader` → loads YAML prompt templates.
-    - `UserMergeFormatter` → applies formatting to messages (e.g., merging).
-    - AsyncOpenAI client → executes completions/parsed completions.
+    Core engine for running text-processing operations with an LLM.
     """
 
     def __init__(self, client: AsyncOpenAI, model: str):
         self._client = client
         self._model = model
 
-    async def _analyze(self, prompt_configs: dict[str, str], temperature: float) -> str:
-        """
-        Calls OpenAI API for analysis using the configured prompt template.
-        Returns the analyzed content as a string.
-        """
+    async def _analyze_completion(self, analyze_message: list[dict[str, str]]) -> str:
         try:
-            analyze_prompt = prompt_configs["analyze_template"]
-
-            if not analyze_prompt:
-                raise PromptError("Analyze template is empty")
-
-            analyze_message = [OperatorUtils.build_user_message(analyze_prompt)]
             completion = await self._client.chat.completions.create(
                 model=self._model,
                 messages=analyze_message,
-                temperature=temperature,
             )
 
             if not completion.choices:
@@ -61,7 +42,7 @@ class AsyncOperator:
             if not analysis:
                 raise LLMError("Empty analysis response")
 
-            return analysis.strip()
+            return analysis
 
         except Exception as e:
             if isinstance(e, (PromptError, LLMError)):
@@ -70,12 +51,12 @@ class AsyncOperator:
 
     async def _parse_completion(
         self,
-        message: list[dict[str, str]],
+        main_message: list[dict[str, str]],
         output_model: Type[T],
         temperature: float,
-        logprobs: bool = False,
-        top_logprobs: int = 3,
-        priority: int | None = 0,
+        logprobs: bool,
+        top_logprobs: int,
+        priority: int,
     ) -> tuple[T, object]:
         """
         Parses a chat completion using OpenAI's structured output format.
@@ -84,7 +65,7 @@ class AsyncOperator:
         try:
             request_kwargs = {
                 "model": self._model,
-                "messages": message,
+                "messages": main_message,
                 "response_format": output_model,
                 "temperature": temperature,
             }
@@ -92,8 +73,10 @@ class AsyncOperator:
             if logprobs:
                 request_kwargs["logprobs"] = True
                 request_kwargs["top_logprobs"] = top_logprobs
+
             if priority:
                 request_kwargs["extra_body"] = {"priority": priority}
+
             completion = await self._client.beta.chat.completions.parse(
                 **request_kwargs
             )
@@ -122,24 +105,24 @@ class AsyncOperator:
         user_prompt: str | None,
         temperature: float,
         logprobs: bool,
-        top_logprobs: int | None,
+        top_logprobs: int,
         validator: Callable[[object], bool] | None,
         max_validation_retries: int | None,
+        priority: int,
         # Internal parameters
         prompt_file: str,
         output_model: Type[T],
         mode: str | None,
-        priority: int | None = 0,
         **extra_kwargs,
-    ) -> ToolOutput:
+    ) -> OperatorOutput:
         """
-        Execute the LLM pipeline with the given input text. (Async)
+        Execute the LLM pipeline with the given input text.
         """
         try:
-            prompt_loader = PromptLoader()
-            output = ToolOutput()
+            if logprobs and (not isinstance(top_logprobs, int) or top_logprobs < 2):
+                raise ValueError("top_logprobs should be an int greater than 1")
 
-            # Prompt configs contain two keys: main_template and analyze template, both are string
+            prompt_loader = PromptLoader()
             prompt_configs = prompt_loader.load(
                 prompt_file=prompt_file,
                 text=text.strip(),
@@ -147,67 +130,45 @@ class AsyncOperator:
                 **extra_kwargs,
             )
 
-            messages = []
+            analysis: str | None = None
 
             if with_analysis:
-                analysis = await self._analyze(prompt_configs, temperature)
-                messages.append(
-                    OperatorUtils.build_user_message(
-                        f"Based on this analysis: {analysis}"
-                    )
-                )
-
-            if output_lang:
-                messages.append(
-                    OperatorUtils.build_user_message(
-                        f"Respond only in the {output_lang} language."
-                    )
+                analyze_message = OperatorUtils.build_message(
+                    prompt_configs["analyze_template"]
                 )
+                analysis = await self._analyze_completion(analyze_message)
 
-            if user_prompt:
-                messages.append(
-                    OperatorUtils.build_user_message(
-                        f"Consider this instruction {user_prompt}"
-                    )
+            main_message = OperatorUtils.build_message(
+                OperatorUtils.build_main_prompt(
+                    prompt_configs["main_template"], analysis, output_lang, user_prompt
                 )
-
-            messages.append(
-                OperatorUtils.build_user_message(prompt_configs["main_template"])
             )
 
-            messages = OperatorUtils.user_merge_format(messages)
-
-            if logprobs and (not isinstance(top_logprobs, int) or top_logprobs < 2):
-                raise ValueError("top_logprobs should be an integer greater than 1")
-
             parsed, completion = await self._parse_completion(
-                messages, output_model, temperature, logprobs, top_logprobs, priority
+                main_message,
+                output_model,
+                temperature,
+                logprobs,
+                top_logprobs,
+                priority,
             )
 
-            output.result = parsed.result
-
             # Retry logic if validation fails
-            if validator and not validator(output.result):
+            if validator and not validator(parsed.result):
                 if (
                     not isinstance(max_validation_retries, int)
                     or max_validation_retries < 1
                 ):
-                    raise ValueError(
-                        "max_validation_retries should be a positive integer"
-                    )
+                    raise ValueError("max_validation_retries should be a positive int")
 
                 succeeded = False
-                for attempt in range(max_validation_retries):
-                    logger.warning(
-                        f"Validation failed, retrying for the {attempt + 1} time."
-                    )
-
-                    # Generate new temperature for retry
+                for _ in range(max_validation_retries):
+                    # Generate a new temperature to retry
                     retry_temperature = OperatorUtils.get_retry_temp(temperature)
 
                     try:
                         parsed, completion = await self._parse_completion(
-                            messages,
+                            main_message,
                             output_model,
                             retry_temperature,
                             logprobs,
@@ -215,30 +176,26 @@ class AsyncOperator:
                             priority=priority,
                         )
 
-                        output.result = parsed.result
-
                         # Check if retry was successful
-                        if validator(output.result):
+                        if validator(parsed.result):
                             succeeded = True
                             break
 
-                    except LLMError as e:
-                        logger.error(f"Retry attempt {attempt + 1} failed: {e}")
+                    except LLMError:
+                        pass
 
                 if not succeeded:
-                    raise ValidationError(
-                        f"Validation failed after {max_validation_retries} retries"
-                    )
-
-            if logprobs:
-                output.logprobs = OperatorUtils.extract_logprobs(completion)
-
-            if with_analysis:
-                output.analysis = analysis
-
-            output.process = prompt_file[:-5]
+                    raise ValidationError("Validation failed after all retries")
+
+            operator_output = OperatorOutput(
+                result=parsed.result,
+                analysis=analysis if with_analysis else None,
+                logprobs=OperatorUtils.extract_logprobs(completion)
+                if logprobs
+                else None,
+            )
 
-            return output
+            return operator_output
 
         except (PromptError, LLMError, ValidationError):
             raise