hamtaa-texttools 0.1.43__tar.gz → 0.1.44__tar.gz

{hamtaa_texttools-0.1.43 → hamtaa_texttools-0.1.44}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: hamtaa-texttools
-Version: 0.1.43
+Version: 0.1.44
 Summary: A set of high-level NLP tools
 Author: Tohidi, Montazer, Givechi, Mousavinezhad
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: openai==1.97.1
-Requires-Dist: numpy==1.26.4
+Requires-Dist: openai>=1.97.0
+Requires-Dist: numpy>=1.26.4
 
 # Text Tools
 
@@ -20,7 +20,7 @@ Requires-Dist: numpy==1.26.4
 </p>
 
 
-### How to Install
+## How to Install
 
 Install the package using:
 

{hamtaa_texttools-0.1.43 → hamtaa_texttools-0.1.44}/README.md

@@ -10,7 +10,7 @@
 </p>
 
 
-### How to Install
+## How to Install
 
 Install the package using:
 

{hamtaa_texttools-0.1.43 → hamtaa_texttools-0.1.44}/hamtaa_texttools.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: hamtaa-texttools
-Version: 0.1.43
+Version: 0.1.44
 Summary: A set of high-level NLP tools
 Author: Tohidi, Montazer, Givechi, Mousavinezhad
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: openai==1.97.1
-Requires-Dist: numpy==1.26.4
+Requires-Dist: openai>=1.97.0
+Requires-Dist: numpy>=1.26.4
 
 # Text Tools
 
@@ -20,7 +20,7 @@ Requires-Dist: numpy==1.26.4
 </p>
 
 
-### How to Install
+## How to Install
 
 Install the package using:
 

hamtaa_texttools-0.1.44/hamtaa_texttools.egg-info/requires.txt

@@ -0,0 +1,2 @@
+openai>=1.97.0
+numpy>=1.26.4

{hamtaa_texttools-0.1.43 → hamtaa_texttools-0.1.44}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hamtaa-texttools"
-version = "0.1.43"
+version = "0.1.44"
 description = "A set of high-level NLP tools"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -15,8 +15,8 @@ authors = [
   { name = "Mousavinezhad" }
 ]
 dependencies = [
-  "openai==1.97.1",
-  "numpy==1.26.4",
+  "openai>=1.97.0",
+  "numpy>=1.26.4",
 ]
 
 [tool.setuptools.packages.find]

{hamtaa_texttools-0.1.43 → hamtaa_texttools-0.1.44}/texttools/formatter/gemma3_formatter.py

@@ -1,5 +1,3 @@
-from typing import Literal
-
 from texttools.formatter.base import ChatFormatter
 
 
@@ -10,14 +8,13 @@ class Gemma3Formatter(ChatFormatter):
     """
 
     ROLE = "role"
+    CONTENT = "content"
     USER_ROLE = "user"
     ASSISTANT_ROLE = "assistant"
-    CONTENT = "content"
     VALID_ROLES = {USER_ROLE, ASSISTANT_ROLE}
+    VALID_KEYS = {ROLE, CONTENT}
 
-    def format(
-        self, messages: list[dict[Literal["role", "content"], str]]
-    ) -> list[dict[str, str]]:
+    def format(self, messages: list[dict[str, str]]) -> list[dict[str, str]]:
         """
         :param messages: list of {"role": ..., "content": ...}, where role is "user", "assistant", or "system"
         :return: a new list where consecutive "user" messages are merged into single entries
@@ -25,14 +22,20 @@ class Gemma3Formatter(ChatFormatter):
 
         merged: list[dict[str, str]] = []
 
-        for msg in messages:
-            role, content = msg[self.ROLE], msg[self.CONTENT].strip()
+        for message in messages:
+            # Validate keys strictly
+            if set(message.keys()) != self.VALID_KEYS:
+                raise ValueError(
+                    f"Message dict keys must be exactly {self.VALID_KEYS}, got {set(message.keys())}"
+                )
+
+            role, content = message[self.ROLE], message[self.CONTENT].strip()
 
             # Replace "system" role with "user" role
             if role == "system":
                 role = self.USER_ROLE
 
-            # Raise value error if msg["role"] wan't a valid role
+            # Raise value error if message["role"] wan't a valid role
             if role not in self.VALID_ROLES:
                 raise ValueError(f"Unexpected role: {role}")
 

{hamtaa_texttools-0.1.43 → hamtaa_texttools-0.1.44}/texttools/tools/question_detector/gemma_detector.py

@@ -36,64 +36,48 @@ class GemmaQuestionDetector(BaseQuestionDetector):
         self.model = model
         self.temperature = temperature
         self.client_kwargs = client_kwargs
-
         self.chat_formatter = chat_formatter or Gemma3Formatter()
-
         self.use_reason = use_reason
         self.prompt_template = prompt_template
 
-        self.json_schema = {"is_question": bool}
-
     def _build_messages(self, text: str, reason: str = None) -> list[dict[str, str]]:
-        clean = self.preprocess(text)
-        schema_instr = f"respond only in JSON format: {self.json_schema}"
+        clean_text = self.preprocess(text)
         messages: list[dict[str, str]] = []
 
         if reason:
             messages.append({"role": "user", "content": reason})
 
-        messages.append({"role": "user", "content": schema_instr})
         if self.prompt_template:
             messages.append({"role": "user", "content": self.prompt_template})
-        messages.append({"role": "user", "content": clean})
+        messages.append({"role": "user", "content": clean_text})
 
-        # this line will restructure the messages
-        # based on the formatter that we provided
-        # some models will require custom settings
+        # Restructure the messages based on the formatter; some models will require custom settings
         restructured = self.chat_formatter.format(messages=messages)
 
         return restructured
 
     def _reason(self, text: str) -> list:
-        messages = [
-            {
-                "role": "user",
-                "content": """
-                    we want to analyze this text snippet to see if it contains any question
-                    or request of some kind or not
-                    read the text, and reason about it being a request or not
-                    summerized
-                    short answer
-                    """,
-            },
-            {
-                "role": "user",
-                "content": f"""
+        reason_prompt = f"""
+                    We want to analyze this text snippet to see if it contains any question
+                    or request of some kind or not.
+                    Read the text, and reason about it being a request or not.
+                    Summerized, Short answer
                     {text}
-                    """,
-            },
+                    """
+        messages = [
+            {"role": "user", "content": reason_prompt},
         ]
 
         restructured = self.chat_formatter.format(messages=messages)
 
-        resp = self.client.chat.completions.create(
+        response = self.client.chat.completions.create(
             model=self.model,
             messages=restructured,
             temperature=self.temperature,
             **self.client_kwargs,
         )
 
-        reason = resp.choices[0].message.content.strip()
+        reason = response.choices[0].message.content.strip()
         return reason
 
     def detect(self, text: str) -> bool:
@@ -125,6 +109,6 @@ class GemmaQuestionDetector(BaseQuestionDetector):
                 f"Failed to parse the response. Raw content: {message.content}"
             )
 
-        # dispatch and return
+        # Dispatch and return
         self._dispatch({"question": text, "result": result})
         return result

hamtaa_texttools-0.1.43/hamtaa_texttools.egg-info/requires.txt

@@ -1,2 +0,0 @@
-openai==1.97.1
-numpy==1.26.4