hamtaa-texttools 1.0.9__py3-none-any.whl → 1.1.0__py3-none-any.whl

{hamtaa_texttools-1.0.9.dist-info → hamtaa_texttools-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamtaa-texttools
-Version: 1.0.9
+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.9.dist-info → hamtaa_texttools-1.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hamtaa_texttools-1.0.9.dist-info/licenses/LICENSE,sha256=Hb2YOBKy2MJQLnyLrX37B4ZVuac8eaIcE71SvVIMOLg,1082
+hamtaa_texttools-1.1.0.dist-info/licenses/LICENSE,sha256=Hb2YOBKy2MJQLnyLrX37B4ZVuac8eaIcE71SvVIMOLg,1082
 texttools/__init__.py,sha256=v3tQCH_Cjj47fCpuhK6sKSVAqEjNkc-cZbY4OJa4IZw,202
 texttools/batch/__init__.py,sha256=q50JsQsmQGp_8RW0KNasYeYWVV0R4FUNZ-ujXwEJemY,143
 texttools/batch/batch_manager.py,sha256=leVIFkR-3HpDkQi_MK3TgFNnHYsCN-wbS4mTWoPmO3c,8828
@@ -18,13 +18,13 @@ texttools/prompts/translate.yaml,sha256=mGT2uBCei6uucWqVbs4silk-UV060v3G0jnt0P6s
 texttools/tools/__init__.py,sha256=hG1I28Q7BJ1Dbs95x6QMKXdsAlC5Eh_tqC-EbAibwiU,114
 texttools/tools/async_the_tool.py,sha256=9VY6ym7SvQqlokt0mwAwnytmu1CUIehDmnAvx74Z78o,12480
 texttools/tools/the_tool.py,sha256=JtQolr6i_6xogtuhX6IhyudFyAsitQy5NfSxUJAS-iA,12246
-texttools/tools/internals/async_operator.py,sha256=GPTHsjldQlmNYXkGCyypc9ENIxjeHUIHWWJ_ltUyNfs,6006
+texttools/tools/internals/async_operator.py,sha256=Kj-DLBKcKbZPCJYn4lVo4Iiei11M04pwgWpIl8L69aM,6169
 texttools/tools/internals/base_operator.py,sha256=OWJe8ybA6qmmoc7ysYeB8ccHPneDlEtmFGH1jLWQCeY,3135
 texttools/tools/internals/formatters.py,sha256=tACNLP6PeoqaRpNudVxBaHA25zyWqWYPZQuYysIu88g,941
-texttools/tools/internals/operator.py,sha256=gl_vzcLueYi6cbxjIHhOCBtyhM6UXwJJ9Mstj8bA-Mg,5896
-texttools/tools/internals/output_models.py,sha256=Rf2x-UuGlmQHrvYIqnD11YuzMH_mPuir62HoMJQa2uk,1528
+texttools/tools/internals/operator.py,sha256=g1E1WkgnKRDgOs6fEFu0-gPCw1Bniwb4VI9Er3Op_gk,6063
+texttools/tools/internals/output_models.py,sha256=gbVbzBWeyHUVNsCBuawdgz9ZEzsC7wfygGgZJsAaexY,1662
 texttools/tools/internals/prompt_loader.py,sha256=rbitJD3e8vAdcooP1Yx6KnSI83g28ho-FegfZ1cJ4j4,1979
-hamtaa_texttools-1.0.9.dist-info/METADATA,sha256=mehOxCOj3f4MHTMwNEEHlSVMYVXgUuKZBysR0jcG2OU,7135
-hamtaa_texttools-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hamtaa_texttools-1.0.9.dist-info/top_level.txt,sha256=5Mh0jIxxZ5rOXHGJ6Mp-JPKviywwN0MYuH0xk5bEWqE,10
-hamtaa_texttools-1.0.9.dist-info/RECORD,,
+hamtaa_texttools-1.1.0.dist-info/METADATA,sha256=2IllcLt4gku7lqVQ-hueY1ccV2l0xaSE001aOizzvcg,7144
+hamtaa_texttools-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hamtaa_texttools-1.1.0.dist-info/top_level.txt,sha256=5Mh0jIxxZ5rOXHGJ6Mp-JPKviywwN0MYuH0xk5bEWqE,10
+hamtaa_texttools-1.1.0.dist-info/RECORD,,

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)])

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)])

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")