hamtaa-texttools 1.0.8__tar.gz → 1.1.0__tar.gz

{hamtaa_texttools-1.0.8/hamtaa_texttools.egg-info → hamtaa_texttools-1.1.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: hamtaa-texttools
-Version: 1.0.8
-Summary: TextTools is a high-level NLP toolkit built on top of modern LLMs.
+Version: 1.1.0
+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>
 License: MIT License
         
@@ -63,7 +63,7 @@ Each tool is designed to work out-of-the-box with structured outputs (JSON / Pyd
 
 ---
 
-## ⚙️ `with_analysis`, `logprobs`, `output_lang`, and `user_prompt` parameters
+## ⚙️ `with_analysis`, `logprobs`, `output_lang`, `user_prompt` and `temperature` parameters
 
 TextTools provides several optional flags to customize LLM behavior:
 
@@ -119,14 +119,14 @@ 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"])
+print(detection.result)
+print(detection.logprobs)
 # Output: True \n --logprobs
 
 # Example: Translation
 translation = the_tool.translate("سلام، حالت چطوره؟" target_language="English", with_analysis=True)
-print(translation["result"])
-print(translation["analysis"])
+print(translation.result)
+print(translation.analysis)
 # Output: "Hi! How are you?" \n --analysis
 ```
 
@@ -150,8 +150,8 @@ async def main():
     the_tool = AsyncTheTool(client=async_client, model=model)
 
     # Example: Async Translation
-    result = await the_tool.translate("سلام، حالت چطوره؟", target_language="English")
-    print(result["result"])
+    translation = await the_tool.translate("سلام، حالت چطوره؟", target_language="English")
+    print(translation.result)
     # Output: "Hi! How are you?"
 
 asyncio.run(main())

{hamtaa_texttools-1.0.8 → hamtaa_texttools-1.1.0}/README.md

@@ -29,7 +29,7 @@ Each tool is designed to work out-of-the-box with structured outputs (JSON / Pyd
 
 ---
 
-## ⚙️ `with_analysis`, `logprobs`, `output_lang`, and `user_prompt` parameters
+## ⚙️ `with_analysis`, `logprobs`, `output_lang`, `user_prompt` and `temperature` parameters
 
 TextTools provides several optional flags to customize LLM behavior:
 
@@ -85,14 +85,14 @@ 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"])
+print(detection.result)
+print(detection.logprobs)
 # Output: True \n --logprobs
 
 # Example: Translation
 translation = the_tool.translate("سلام، حالت چطوره؟" target_language="English", with_analysis=True)
-print(translation["result"])
-print(translation["analysis"])
+print(translation.result)
+print(translation.analysis)
 # Output: "Hi! How are you?" \n --analysis
 ```
 
@@ -116,8 +116,8 @@ async def main():
     the_tool = AsyncTheTool(client=async_client, model=model)
 
     # Example: Async Translation
-    result = await the_tool.translate("سلام، حالت چطوره؟", target_language="English")
-    print(result["result"])
+    translation = await the_tool.translate("سلام، حالت چطوره؟", target_language="English")
+    print(translation.result)
     # Output: "Hi! How are you?"
 
 asyncio.run(main())

{hamtaa_texttools-1.0.8 → hamtaa_texttools-1.1.0/hamtaa_texttools.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: hamtaa-texttools
-Version: 1.0.8
-Summary: TextTools is a high-level NLP toolkit built on top of modern LLMs.
+Version: 1.1.0
+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>
 License: MIT License
         
@@ -63,7 +63,7 @@ Each tool is designed to work out-of-the-box with structured outputs (JSON / Pyd
 
 ---
 
-## ⚙️ `with_analysis`, `logprobs`, `output_lang`, and `user_prompt` parameters
+## ⚙️ `with_analysis`, `logprobs`, `output_lang`, `user_prompt` and `temperature` parameters
 
 TextTools provides several optional flags to customize LLM behavior:
 
@@ -119,14 +119,14 @@ 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"])
+print(detection.result)
+print(detection.logprobs)
 # Output: True \n --logprobs
 
 # Example: Translation
 translation = the_tool.translate("سلام، حالت چطوره؟" target_language="English", with_analysis=True)
-print(translation["result"])
-print(translation["analysis"])
+print(translation.result)
+print(translation.analysis)
 # Output: "Hi! How are you?" \n --analysis
 ```
 
@@ -150,8 +150,8 @@ async def main():
     the_tool = AsyncTheTool(client=async_client, model=model)
 
     # Example: Async Translation
-    result = await the_tool.translate("سلام، حالت چطوره؟", target_language="English")
-    print(result["result"])
+    translation = await the_tool.translate("سلام، حالت چطوره؟", target_language="English")
+    print(translation.result)
     # Output: "Hi! How are you?"
 
 asyncio.run(main())

{hamtaa_texttools-1.0.8 → hamtaa_texttools-1.1.0}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hamtaa-texttools"
-version = "1.0.8"
+version = "1.1.0"
 authors = [
   { name = "Tohidi", email = "the.mohammad.tohidi@gmail.com" },
   { name = "Montazer", email = "montazerh82@gmail.com" },
   { name = "Givechi", email = "mohamad.m.givechi@gmail.com" },
   { name = "MoosaviNejad", email = "erfanmoosavi84@gmail.com" },
 ]
-description = "TextTools is a high-level NLP toolkit built on top of modern LLMs."
+description = "A high-level NLP toolkit built on top of modern LLMs."
 readme = "README.md"
 license = {file = "LICENSE"}
 requires-python = ">=3.8"

{hamtaa_texttools-1.0.8 → hamtaa_texttools-1.1.0}/texttools/tools/internals/async_operator.py

@@ -4,6 +4,7 @@ import logging
 from openai import AsyncOpenAI
 from pydantic import BaseModel
 
+from texttools.tools.internals.output_models import ToolOutput
 from texttools.tools.internals.base_operator import BaseOperator
 from texttools.tools.internals.formatters import Formatter
 from texttools.tools.internals.prompt_loader import PromptLoader
@@ -152,7 +153,7 @@ class AsyncOperator(BaseOperator):
                     messages, output_model, temperature, logprobs, top_logprobs
                 )
             elif resp_format == "parse":
-                parsed, completion = await self._vllm_completion(
+                parsed, completion = await self._parse_completion(
                     messages, output_model, temperature, logprobs, top_logprobs
                 )
 
@@ -162,16 +163,17 @@ class AsyncOperator(BaseOperator):
                     "The provided output_model must define a field named 'result'"
                 )
 
-            results = {"result": parsed.result}
+            output = ToolOutput(result="", analysis="", logprobs=[], errors=[])
+
+            output.result = parsed.result
 
             if logprobs:
-                results["logprobs"] = self._extract_logprobs(completion)
+                output.logprobs = self._extract_logprobs(completion)
 
             if with_analysis:
-                results["analysis"] = analysis
-
-            return results
+                output.analysis = analysis
 
+            return output
         except Exception as e:
-            logger.error(f"Async TheTool failed: {e}")
-            return {"error": str(e), "result": ""}
+            logger.error(f"AsyncTheTool failed: {e}")
+            return ToolOutput(result="", analysis="", logprobs=[], errors=[str(e)])

{hamtaa_texttools-1.0.8 → hamtaa_texttools-1.1.0}/texttools/tools/internals/base_operator.py

@@ -2,6 +2,7 @@ from typing import TypeVar, Type, Any
 import json
 import re
 import math
+import logging
 
 from pydantic import BaseModel
 from openai import OpenAI, AsyncOpenAI
@@ -9,6 +10,10 @@ from openai import OpenAI, AsyncOpenAI
 # Base Model type for output models
 T = TypeVar("T", bound=BaseModel)
 
+# Configure logger
+logger = logging.getLogger("base_operator")
+logger.setLevel(logging.INFO)
+
 
 class BaseOperator:
     def __init__(self, client: OpenAI | AsyncOpenAI, model: str):
@@ -61,7 +66,8 @@ class BaseOperator:
 
         for choice in completion.choices:
             if not getattr(choice, "logprobs", None):
-                continue
+                logger.error("logprobs is not avalible in the chosen model.")
+                return []
 
             for logprob_item in choice.logprobs.content:
                 if ignore_pattern.match(logprob_item.token):

{hamtaa_texttools-1.0.8 → hamtaa_texttools-1.1.0}/texttools/tools/internals/operator.py

@@ -4,6 +4,7 @@ import logging
 from openai import OpenAI
 from pydantic import BaseModel
 
+from texttools.tools.internals.output_models import ToolOutput
 from texttools.tools.internals.base_operator import BaseOperator
 from texttools.tools.internals.formatters import Formatter
 from texttools.tools.internals.prompt_loader import PromptLoader
@@ -162,16 +163,17 @@ class Operator(BaseOperator):
                     "The provided output_model must define a field named 'result'"
                 )
 
-            result = {"result": parsed.result}
+            output = ToolOutput(result="", analysis="", logprobs=[], errors=[])
+
+            output.result = parsed.result
 
             if logprobs:
-                result["logprobs"] = self._extract_logprobs(completion)
+                output.logprobs = self._extract_logprobs(completion)
 
             if with_analysis:
-                result["analysis"] = analysis
-
-            return result
+                output.analysis = analysis
 
+            return output
         except Exception as e:
             logger.error(f"TheTool failed: {e}")
-            return {"error": str(e), "result": ""}
+            return ToolOutput(result="", analysis="", logprobs=[], errors=[str(e)])

{hamtaa_texttools-1.0.8 → hamtaa_texttools-1.1.0}/texttools/tools/internals/output_models.py

@@ -1,8 +1,15 @@
-from typing import Literal
+from typing import Literal, Any
 
 from pydantic import BaseModel, Field
 
 
+class ToolOutput(BaseModel):
+    result: str
+    analysis: str
+    logprobs: list[dict[str, Any]]
+    errors: list[str]
+
+
 class StrOutput(BaseModel):
     result: str = Field(..., description="The output string")