hamtaa-texttools 1.0.9__tar.gz → 1.1.1__tar.gz

{hamtaa_texttools-1.0.9/hamtaa_texttools.egg-info → hamtaa_texttools-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamtaa-texttools
-Version: 1.0.9
+Version: 1.1.1
 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
@@ -29,7 +29,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: openai==1.97.1
-Requires-Dist: PyYAML>=6.0
+Requires-Dist: pyyaml>=6.0
 Dynamic: license-file
 
 # TextTools
@@ -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 → hamtaa_texttools-1.1.1}/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.9 → hamtaa_texttools-1.1.1/hamtaa_texttools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamtaa-texttools
-Version: 1.0.9
+Version: 1.1.1
 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
@@ -29,7 +29,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: openai==1.97.1
-Requires-Dist: PyYAML>=6.0
+Requires-Dist: pyyaml>=6.0
 Dynamic: license-file
 
 # TextTools
@@ -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 → hamtaa_texttools-1.1.1}/hamtaa_texttools.egg-info/requires.txt

@@ -1,2 +1,2 @@
 openai==1.97.1
-PyYAML>=6.0
+pyyaml>=6.0

{hamtaa_texttools-1.0.9 → hamtaa_texttools-1.1.1}/pyproject.toml

@@ -1,32 +1,32 @@
-[build-system]
-requires = ["setuptools>=61.0", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "hamtaa-texttools"
-version = "1.0.9"
-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 = "A high-level NLP toolkit built on top of modern LLMs."
-readme = "README.md"
-license = {file = "LICENSE"}
-requires-python = ">=3.8"
-dependencies = [
-  "openai==1.97.1",
-  "PyYAML>=6.0",
-]
-keywords = ["nlp", "llm", "text-processing", "openai"]
-
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["texttools*"]
-
-[tool.setuptools]
-include-package-data = true
-
-[tool.setuptools.package-data]
-"texttools" = ["prompts/*.yaml", "prompts/*.yml"]
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "hamtaa-texttools"
+version = "1.1.1"
+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 = "A high-level NLP toolkit built on top of modern LLMs."
+readme = "README.md"
+license = {file = "LICENSE"}
+requires-python = ">=3.8"
+dependencies = [
+  "openai==1.97.1",
+  "pyyaml>=6.0",
+]
+keywords = ["nlp", "llm", "text-processing", "openai"]
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["texttools*"]
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-data]
+"texttools" = ["prompts/*.yaml", "prompts/*.yml"]

{hamtaa_texttools-1.0.9 → hamtaa_texttools-1.1.1}/texttools/tools/async_the_tool.py

@@ -39,7 +39,10 @@ class AsyncTheTool:
         Categorize a text into a single Islamic studies domain category.
 
         Returns:
-            {"result": <category string>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The assigned Islamic studies category
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -71,7 +74,10 @@ class AsyncTheTool:
         Extract salient keywords from text.
 
         Returns:
-            {"result": [<keyword1>, <keyword2>, ...]} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (list[str]): List of extracted keywords
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -103,7 +109,10 @@ class AsyncTheTool:
         Perform Named Entity Recognition (NER) over the input text.
 
         Returns:
-            {"result": [{"text": <entity>, "type": <entity_type>}, ...]} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (list[dict]): List of entities with 'text' and 'type' keys
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -134,7 +143,10 @@ class AsyncTheTool:
         Detect if the input is phrased as a question.
 
         Returns:
-            {"result": True} or {"result": False} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (bool): True if text is a question, False otherwise
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -166,7 +178,10 @@ class AsyncTheTool:
         Generate a single question from the given text.
 
         Returns:
-            {"result": <generated_question>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The generated question
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -199,7 +214,10 @@ class AsyncTheTool:
         Merge multiple questions into a single unified question.
 
         Returns:
-            {"result": <merged_question>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The merged question
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         text = ", ".join(text)
         return await self.operator.run(
@@ -233,7 +251,10 @@ class AsyncTheTool:
         Rewrite a text with different modes.
 
         Returns:
-            {"result": <rewritten_text>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The rewritten text
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -266,7 +287,10 @@ class AsyncTheTool:
         Generate a list of questions about a subject.
 
         Returns:
-            {"result": [<question1>, <question2>, ...]} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (list[str]): List of generated questions
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -299,7 +323,10 @@ class AsyncTheTool:
         Summarize the given subject text.
 
         Returns:
-            {"result": <summary>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The summary text
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -331,7 +358,10 @@ class AsyncTheTool:
         Translate text between languages.
 
         Returns:
-            {"result": <translated_text>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The translated text
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return await self.operator.run(
             # User parameters
@@ -363,7 +393,8 @@ class AsyncTheTool:
         Custom tool that can do almost anything!
 
         Returns:
-            {"result": <Any>}
+            ToolOutput: Object with fields:
+                - result (str): The output result
         """
         return await self.operator.run(
             # User paramaeters

{hamtaa_texttools-1.0.9 → hamtaa_texttools-1.1.1}/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.9 → hamtaa_texttools-1.1.1}/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.9 → hamtaa_texttools-1.1.1}/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")
 

{hamtaa_texttools-1.0.9 → hamtaa_texttools-1.1.1}/texttools/tools/the_tool.py

@@ -37,7 +37,10 @@ class TheTool:
         Categorize a text into a single Islamic studies domain category.
 
         Returns:
-            {"result": <category string>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The assigned Islamic studies category
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -69,7 +72,10 @@ class TheTool:
         Extract salient keywords from text.
 
         Returns:
-            {"result": [<keyword1>, <keyword2>, ...]} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (list[str]): List of extracted keywords
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -101,7 +107,10 @@ class TheTool:
         Perform Named Entity Recognition (NER) over the input text.
 
         Returns:
-            {"result": [{"text": <entity>, "type": <entity_type>}, ...]} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (list[dict]): List of entities with 'text' and 'type' keys
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -132,7 +141,10 @@ class TheTool:
         Detect if the input is phrased as a question.
 
         Returns:
-            {"result": True} or {"result": False} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (bool): True if text is a question, False otherwise
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -164,7 +176,10 @@ class TheTool:
         Generate a single question from the given text.
 
         Returns:
-            {"result": <generated_question>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The generated question
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -197,7 +212,10 @@ class TheTool:
         Merge multiple questions into a single unified question.
 
         Returns:
-            {"result": <merged_question>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The merged question
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         text = ", ".join(text)
         return self.operator.run(
@@ -231,7 +249,10 @@ class TheTool:
         Rewrite a text with different modes.
 
         Returns:
-            {"result": <rewritten_text>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The rewritten text
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -264,7 +285,10 @@ class TheTool:
         Generate a list of questions about a subject.
 
         Returns:
-            {"result": [<question1>, <question2>, ...]} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (list[str]): List of generated questions
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -297,7 +321,10 @@ class TheTool:
         Summarize the given subject text.
 
         Returns:
-            {"result": <summary>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The summary text
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -329,7 +356,10 @@ class TheTool:
         Translate text between languages.
 
         Returns:
-            {"result": <translated_text>} + ("logprobs" and "analysis" if enabled)
+            ToolOutput: Object containing:
+                - result (str): The translated text
+                - logprobs (list | None): Probability data if logprobs enabled
+                - analysis (str | None): Detailed reasoning if with_analysis enabled
         """
         return self.operator.run(
             # User parameters
@@ -361,7 +391,8 @@ class TheTool:
         Custom tool that can do almost anything!
 
         Returns:
-            {"result": <Any>}
+            ToolOutput: Object with fields:
+                - result (str): The output result
         """
         return self.operator.run(
             # User paramaeters