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

texttools/internals/models.py

@@ -1,25 +1,39 @@
+from __future__ import annotations
+
 from datetime import datetime
-from typing import Type, Literal
+from typing import Type, Literal, Any
 
 from pydantic import BaseModel, Field, create_model
 
 
-class ToolOutput(BaseModel):
-    result: object = None
-    logprobs: list[dict[str, object]] = []
-    analysis: str = ""
-    process: str | None = None
-    processed_at: datetime = datetime.now()
+class ToolOutputMetadata(BaseModel):
+    tool_name: str
+    processed_at: datetime = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     execution_time: float | None = None
+
+
+class ToolOutput(BaseModel):
+    result: Any = None
+    analysis: str | None = None
+    logprobs: list[dict[str, Any]] | None = None
     errors: list[str] = []
+    metadata: ToolOutputMetadata | None = None
 
     def __repr__(self) -> str:
-        return f"""
-        ToolOutput(process='{self.process}', result_type='{type(self.result)}', 
-        result='{self.result}', analysis='{self.analysis}', 
-        logprobs='{self.logprobs}', errors='{self.errors}', 
-        processed_at='{self.processed_at}', execution_time='{self.execution_time}'
-        """
+        base = f"""ToolOutput(result='{self.result}', result_type='{type(self.result)}', analysis='{self.analysis}', logprobs='{self.logprobs}', errors='{self.errors}'"""
+
+        if self.metadata:
+            base += f""", tool_name='{self.metadata.tool_name}', 
+            processed_at='{self.metadata.processed_at}', execution_time='{self.metadata.execution_time}'
+            """
+
+        return base
+
+
+class OperatorOutput(BaseModel):
+    result: Any
+    analysis: str | None
+    logprobs: list[dict[str, Any]] | None
 
 
 class Str(BaseModel):
@@ -53,114 +67,69 @@ class ReasonListStr(BaseModel):
     )
 
 
-class Node(BaseModel):
-    node_id: int
-    name: str
-    level: int
-    parent_id: int | None
-    description: str
+class Node:
+    def __init__(self, name: str, description: str, level: int, parent: Node | None):
+        self.name = name
+        self.description = description
+        self.level = level
+        self.parent = parent
+        self.children = {}
 
 
 class CategoryTree:
-    def __init__(self, tree_name):
-        self._root = Node(
-            node_id=0, name=tree_name, level=0, parent_id=None, description="Root node"
-        )
-        self._all_nodes: list[Node] = [self._root]
-        self._new_id = 1
-
-    def get_all_nodes(self) -> list[Node]:
+    def __init__(self):
+        self._root = Node(name="root", description="root", level=0, parent=None)
+        self._all_nodes = {"root": self._root}
+
+    def get_all_nodes(self) -> dict[str, Node]:
         return self._all_nodes
 
     def get_level_count(self) -> int:
-        return max([item.level for item in self._all_nodes])
-
-    def get_node(self, identifier: int | str) -> Node | None:
-        if isinstance(identifier, str):
-            for node in self.get_all_nodes():
-                if node.name == identifier:
-                    return node
-            return None
-        elif isinstance(identifier, int):
-            for node in self.get_all_nodes():
-                if node.node_id == identifier:
-                    return node
-            return None
-        else:
-            return None
-
-    def get_children(self, parent_node: Node) -> list[Node] | None:
-        children = [
-            node
-            for node in self.get_all_nodes()
-            if parent_node.node_id == node.parent_id
-        ]
-        return children if children else None
+        return max(node.level for node in self._all_nodes.values())
+
+    def get_node(self, name: str) -> Node | None:
+        return self._all_nodes.get(name)
 
     def add_node(
         self,
-        node_name: str,
-        parent_name: str | None = None,
+        name: str,
+        parent_name: str,
         description: str | None = None,
     ) -> None:
-        if self.get_node(node_name):
-            raise ValueError(f"{node_name} has been chosen for another category before")
-
-        if parent_name:
-            parent_node = self.get_node(parent_name)
-            if not parent_node:
-                raise ValueError(f"Parent category '{parent_name}' not found")
-            parent_id = parent_node.node_id
-            level = parent_node.level + 1
-        else:
-            level = 1
-            parent_id = 0
+        if self.get_node(name):
+            raise ValueError(f"Cannot add {name} category twice")
+
+        parent = self.get_node(parent_name)
+
+        if not parent:
+            raise ValueError(f"Parent category '{parent_name}' not found")
 
         node_data = {
-            "node_id": self._new_id,
-            "name": node_name,
-            "level": level,
-            "parent_id": parent_id,
+            "name": name,
             "description": description if description else "No description provided",
+            "level": parent.level + 1,
+            "parent": parent,
         }
 
-        self._all_nodes.append(Node(**node_data))
-        self._new_id += 1
-
-    def remove_node(self, identifier: int | str) -> None:
-        node = self.get_node(identifier)
-
-        if node:
-            # Remove node's children recursively
-            children = self.get_children(node)
-
-            if not children:
-                self._all_nodes.remove(node)
-                return
-
-            for child in children:
-                self.remove_node(child.name)
-
-            self._all_nodes.remove(node)
-        else:
-            raise ValueError(f"Node with identifier: '{identifier}' not found.")
-
-    def dump_tree(self) -> dict:
-        def build_dict(node: Node) -> dict:
-            children = [
-                build_dict(child)
-                for child in self._all_nodes
-                if child.parent_id == node.node_id
-            ]
-            return {
-                "node_id": node.node_id,
-                "name": node.name,
-                "level": node.level,
-                "parent_id": node.parent_id,
-                "children": children,
-            }
-
-        return {"category_tree": build_dict(self._root)["children"]}
+        new_node = Node(**node_data)
+        parent.children[name] = new_node
+        self._all_nodes[name] = new_node
+
+    def remove_node(self, name: str) -> None:
+        if name == "root":
+            raise ValueError("Cannot remove the root node")
+
+        node = self.get_node(name)
+        if not node:
+            raise ValueError(f"Category: '{name}' not found")
+
+        for child_name in list(node.children.keys()):
+            self.remove_node(child_name)
+
+        if node.parent:
+            del node.parent.children[name]
+
+        del self._all_nodes[name]
 
 
 # This function is needed to create CategorizerOutput with dynamic categories

texttools/internals/operator_utils.py

@@ -5,8 +5,30 @@ import random
 
 class OperatorUtils:
     @staticmethod
-    def build_user_message(prompt: str) -> dict[str, str]:
-        return {"role": "user", "content": prompt}
+    def build_main_prompt(
+        main_template: str,
+        analysis: str | None,
+        output_lang: str | None,
+        user_prompt: str | None,
+    ) -> str:
+        main_prompt = ""
+
+        if analysis:
+            main_prompt += f"Based on this analysis:\n{analysis}\n"
+
+        if output_lang:
+            main_prompt += f"Respond only in the {output_lang} language.\n"
+
+        if user_prompt:
+            main_prompt += f"Consider this instruction {user_prompt}\n"
+
+        main_prompt += main_template
+
+        return main_prompt
+
+    @staticmethod
+    def build_message(prompt: str) -> list[dict[str, str]]:
+        return [{"role": "user", "content": prompt}]
 
     @staticmethod
     def extract_logprobs(completion: dict) -> list[dict]:
@@ -20,7 +42,7 @@ class OperatorUtils:
 
         for choice in completion.choices:
             if not getattr(choice, "logprobs", None):
-                return []
+                raise ValueError("Your model does not support logprobs")
 
             for logprob_item in choice.logprobs.content:
                 if ignore_pattern.match(logprob_item.token):
@@ -52,27 +74,3 @@ class OperatorUtils:
         new_temp = base_temp + delta_temp
 
         return max(0.0, min(new_temp, 1.5))
-
-    @staticmethod
-    def user_merge_format(messages: list[dict[str, str]]) -> list[dict[str, str]]:
-        """
-        Merges consecutive user messages into a single message, separated by newlines.
-
-        This is useful for condensing a multi-turn user input into a single
-        message for the LLM. Assistant and system messages are left unchanged and
-        act as separators between user message groups.
-        """
-        merged = []
-
-        for message in messages:
-            role, content = message["role"], message["content"].strip()
-
-            # Merge with previous user turn
-            if merged and role == "user" and merged[-1]["role"] == "user":
-                merged[-1]["content"] += "\n" + content
-
-            # Otherwise, start a new turn
-            else:
-                merged.append({"role": role, "content": content})
-
-        return merged

texttools/internals/prompt_loader.py

@@ -12,20 +12,12 @@ class PromptLoader:
     Responsibilities:
     - Load and parse YAML prompt definitions.
     - Select the right template (by mode, if applicable).
-    - Inject variables (`{input}`, plus any extra kwargs) into the templates.
+    - Inject variables (`{text}`, plus any extra kwargs) into the templates.
     """
 
     MAIN_TEMPLATE = "main_template"
     ANALYZE_TEMPLATE = "analyze_template"
 
-    @staticmethod
-    def _build_format_args(text: str, **extra_kwargs) -> dict[str, str]:
-        # Base formatting args
-        format_args = {"input": text}
-        # Merge extras
-        format_args.update(extra_kwargs)
-        return format_args
-
     # Use lru_cache to load each file once
     @lru_cache(maxsize=32)
     def _load_templates(self, prompt_file: str, mode: str | None) -> dict[str, str]:
@@ -69,16 +61,6 @@ class PromptLoader:
                     + (f" for mode '{mode}'" if mode else "")
                 )
 
-            if (
-                not analyze_template
-                or not analyze_template.strip()
-                or analyze_template.strip() in ["{analyze_template}", "{}"]
-            ):
-                raise PromptError(
-                    "analyze_template cannot be empty"
-                    + (f" for mode '{mode}'" if mode else "")
-                )
-
             return {
                 self.MAIN_TEMPLATE: main_template,
                 self.ANALYZE_TEMPLATE: analyze_template,
@@ -94,7 +76,8 @@ class PromptLoader:
     ) -> dict[str, str]:
         try:
             template_configs = self._load_templates(prompt_file, mode)
-            format_args = self._build_format_args(text, **extra_kwargs)
+            format_args = {"text": text}
+            format_args.update(extra_kwargs)
 
             # Inject variables inside each template
             for key in template_configs.keys():

texttools/internals/sync_operator.py

@@ -1,11 +1,10 @@
 from typing import TypeVar, Type
 from collections.abc import Callable
-import logging
 
 from openai import OpenAI
 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.sync_operator")
-
 
 class Operator:
     """
-    Core engine for running text-processing operations with an LLM (Sync).
-
-    It wires together:
-    - `PromptLoader` → loads YAML prompt templates.
-    - `UserMergeFormatter` → applies formatting to messages (e.g., merging).
-    - OpenAI client → executes completions/parsed completions.
+    Core engine for running text-processing operations with an LLM.
     """
 
     def __init__(self, client: OpenAI, model: str):
         self._client = client
         self._model = model
 
-    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.
-        """
+    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 = self._client.chat.completions.create(
                 model=self._model,
                 messages=analyze_message,
-                temperature=temperature,
             )
 
             if not completion.choices:
@@ -61,7 +42,7 @@ class Operator:
             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 Operator:
 
     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 Operator:
         try:
             request_kwargs = {
                 "model": self._model,
-                "messages": message,
+                "messages": main_message,
                 "response_format": output_model,
                 "temperature": temperature,
             }
@@ -92,8 +73,10 @@ class Operator:
             if logprobs:
                 request_kwargs["logprobs"] = True
                 request_kwargs["top_logprobs"] = top_logprobs
+
             if priority:
                 request_kwargs["extra_body"] = {"priority": priority}
+
             completion = self._client.beta.chat.completions.parse(**request_kwargs)
 
             if not completion.choices:
@@ -120,24 +103,24 @@ class Operator:
         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. (Sync)
+        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(),
@@ -145,67 +128,45 @@ class Operator:
                 **extra_kwargs,
             )
 
-            messages = []
+            analysis: str | None = None
 
             if with_analysis:
-                analysis = 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 = 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 = 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 = self._parse_completion(
-                            messages,
+                            main_message,
                             output_model,
                             retry_temperature,
                             logprobs,
@@ -213,30 +174,26 @@ class Operator:
                             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

texttools/prompts/README.md

@@ -15,7 +15,7 @@ This folder contains YAML files for all prompts used in the project. Each file r
 ```yaml
 main_template:
   mode_1: |
-    Your main instructions here with placeholders like {input}.
+    Your main instructions here with placeholders like {text}.
   mode_2: |
     Optional reasoning instructions here.
 
@@ -30,6 +30,6 @@ analyze_template:
 
 ## Guidelines
 1. **Naming**: Use descriptive names for each YAML file corresponding to the tool or task it serves.
-2. **Placeholders**: Use `{input}` or other relevant placeholders to dynamically inject data.
+2. **Placeholders**: Use `{text}` or other relevant placeholders to dynamically inject data.
 3. **Modes**: If using modes, ensure both `main_template` and `analyze_template` contain the corresponding keys.
 4. **Consistency**: Keep formatting consistent across files for easier parsing by scripts.