HowdenLLM 3.1.2__tar.gz → 4.0.0__tar.gz

{howdenllm-3.1.2 → howdenllm-4.0.0}/HowdenLLM/manager.py

@@ -3,6 +3,7 @@ from typing import Callable
 from dotenv import load_dotenv
 from pathlib import Path
 from HowdenLLM.providers.provider_factory import ProviderFactory
+from HowdenCommonObjects.howden_result import HowdenResult
 from typing import Any
 import hashlib
 import os
@@ -61,16 +62,7 @@ class LLM:
         self.total_output_tokens = 0
         self.total_runs = 0
 
-    def _count_tokens(self, text: str) -> int:
-        """Try to count tokens with tiktoken; fallback to rough word count."""
-        try:
-            import tiktoken
-            enc = tiktoken.encoding_for_model(self.model)
-            return len(enc.encode(text))
-        except (KeyError, LookupError, AttributeError, ImportError):
-            return len(text.split())
-
-    async def __call__(self, path_or_content: Path | str) -> str:
+    async def __call__(self, path_or_content: Path | str) -> HowdenResult:
         """
         Execute one completion round and return:
         (output_text, input_token_count, output_token_count)
@@ -84,29 +76,10 @@ class LLM:
 
         prompt = self.template.substitute(content=content)
 
-        # --- count input tokens ---
-        input_text = f"{self.system or ''}\n{prompt}"
-        input_tokens = self._count_tokens(input_text)
-
         # --- run model ---
-        output = await self.provider.complete(self.system, prompt, self.model, self.use_web_search_tool,self.upload_attachment)
-
-        # --- count output tokens ---
-        output_tokens = self._count_tokens(output)
-
-        # --- update totals ---
-        self.total_input_tokens += input_tokens
-        self.total_output_tokens += output_tokens
-        self.total_runs += 1
-        print(f"[{self.name or 'LLM'}] "
-              f"Input tokens: {input_tokens}, "
-              f"Output tokens: {output_tokens}, "
-              f"Total_input: {self.total_input_tokens}, "
-              f"Total_output: {self.total_output_tokens}, "
-              f"Total_input_average: {round(self.total_input_tokens / self.total_runs, 2)}, "
-              f"Total_output_average: {round(self.total_output_tokens / self.total_runs, 2)}")
+        result = await self.provider.complete(self.name, self.system, prompt, self.model, self.use_web_search_tool,self.upload_attachment)
 
-        return output
+        return result
 
     def make_serializable(self, obj: Any) -> Any:
         if obj is None or isinstance(obj, (str, int, float, bool)):
@@ -158,7 +131,7 @@ class LLMSwitch:
     A class that inspects a file to determine which LLM instance to invoke based on file content.
     Changes made to this class by Casper 19/11-25
     """
-    def __init__(self, LLMs: list[LLM], name: str, json_key: str = None) -> None:
+    def __init__(self, LLMs: list[LLM], name: str = None, json_key: str = None) -> None:
         """
         Parameters
         ----------
@@ -172,6 +145,9 @@ class LLMSwitch:
         self.input_parameter = {llm.name: llm.input_params for llm in LLMs}
         self.json_key = json_key
         self.name = name
+        self.system: str # Set during __call__ to the params of the called LLM
+        self.template: str # Set during __call__ to the params of the called LLM
+        self.model: str # Set during __call__ to the params of the called LLM
 
     def _get_json_content(self, filepath: Path) -> str:
         """
@@ -203,7 +179,7 @@ class LLMSwitch:
         else:
             raise NotJsonException(filepath)
 
-    def __call__(self, content_path: Path, filepath: Path) -> str:
+    async def __call__(self, content_path: Path, filepath: Path) -> HowdenResult:
         """
         Reads a file to determine which of the provided LLM objects to call. The method checks each model in
     `   self.LLMS` and calls the first model whose `name` appears in the content.
@@ -234,11 +210,14 @@ class LLMSwitch:
             content = filepath.read_text(encoding="utf-8")
         else:
             raise UnsupportedFiletypeException(filepath)
-        result = ""
+        result = HowdenResult("")
 
         for model in self.LLMS:
             if model.name in content:
-                result = model(content_path)
+                self.system = model.system
+                self.template = model.template
+                self.model = model.model
+                result = await model(content_path)
         return result
 
     def make_serializable(self, obj: Any) -> Any:

howdenllm-4.0.0/HowdenLLM/providers/base_provider.py

@@ -0,0 +1,8 @@
+from abc import ABC, abstractmethod
+from .provider_meta import ProviderMeta
+from HowdenCommonObjects.howden_result import HowdenResult
+
+class BaseProvider(ABC, metaclass=ProviderMeta):
+    @abstractmethod
+    async def complete(self,  name:str, system: str, prompt: str, model: str, use_web_search_tool: bool, upload_attachment: str|None) -> HowdenResult:
+        pass

{howdenllm-3.1.2 → howdenllm-4.0.0}/HowdenLLM/providers/provider_anthropic.py

@@ -1,6 +1,8 @@
 from abc import ABC
 from HowdenLLM.providers.base_provider import BaseProvider
 from anthropic import AsyncAnthropic
+from HowdenCommonObjects.howden_result import HowdenResult
+from HowdenCommonObjects.usage import Usage
 from .known_providers import KnownProviders
 
 class AnthropicProvider(BaseProvider, ABC):
@@ -9,7 +11,7 @@ class AnthropicProvider(BaseProvider, ABC):
     def __init__(self,client: AsyncAnthropic):
         self.client = client
 
-    async def complete(self, system: str, prompt: str, model: str, use_web_search_tool: bool, upload_attachment: str) -> str:
+    async def complete(self, name:str, system: str, prompt: str, model: str, use_web_search_tool: bool, upload_attachment: str|None) -> HowdenResult:
 
         if use_web_search_tool:
             tools=[{"type": "web_search_20260209","name": "web_search","max_uses": 5}]
@@ -17,7 +19,7 @@ class AnthropicProvider(BaseProvider, ABC):
             tools = []
 
         if model in ["claude-opus-4-7", "claude-opus-4-8","claude-opus-4-6","claude-opus-4-5-20251101","claude-sonnet-4-6","claude-sonnet-4-5-20250929"]:
-            message = await self.client.messages.create(
+            response = await self.client.messages.create(
                 model=model,
                 system=system,
                 messages=[
@@ -33,10 +35,15 @@ class AnthropicProvider(BaseProvider, ABC):
         else:
             raise Exception(f"Unsupported model: {model}")
 
-        # print(f"Content: {message}")
-        clean_response = "\n".join(
-            block.text for block in message.content if block.type == "text"
+        clean_response = "\n".join(block.text for block in response.content if block.type == "text")
+        usage = Usage(
+            type="llm",
+            provider=self.provider,
+            model=model,
+            operation=name,
+            input_tokens=response.usage.input_tokens,
+            cached_tokens=response.usage.cache_read_input_tokens,
+            output_tokens=response.usage.output_tokens,
         )
 
-
-        return clean_response
+        return HowdenResult(clean_response, usage)

{howdenllm-3.1.2 → howdenllm-4.0.0}/HowdenLLM/providers/provider_openai.py

@@ -1,7 +1,8 @@
 from abc import ABC
 
 from sympy.codegen.ast import continue_
-
+from HowdenCommonObjects.howden_result import HowdenResult
+from HowdenCommonObjects.usage import Usage
 from HowdenLLM.providers.base_provider import BaseProvider
 from openai import AsyncOpenAI
 from .known_providers import KnownProviders
@@ -12,7 +13,7 @@ class OpenAIProvider(BaseProvider, ABC):
     def __init__(self,client: AsyncOpenAI):
         self.client = client
 
-    async def complete(self, system: str, prompt: str, model: str, use_web_search_tool: bool, upload_attachment: str|None) -> str:
+    async def complete(self, name:str, system: str, prompt: str, model: str, use_web_search_tool: bool, upload_attachment: str|None) -> HowdenResult:
 
         if use_web_search_tool:
             tools = [
@@ -23,7 +24,7 @@ class OpenAIProvider(BaseProvider, ABC):
 
         if upload_attachment:
             with open(upload_attachment, "rb") as f:
-                uploaded = self.client.files.create(
+                uploaded = await self.client.files.create(
                     file=f,
                     purpose="user_data",
                 )
@@ -50,4 +51,14 @@ class OpenAIProvider(BaseProvider, ABC):
         else:
             raise Exception(f"Unsupported model: {model}")
 
-        return response.output_text
+        usage = Usage(
+            type="llm",
+            provider=self.provider,
+            model=model,
+            operation=name,
+            input_tokens=response.usage.input_tokens,
+            cached_tokens=response.usage.input_tokens_details.cached_tokens,
+            output_tokens=response.usage.output_tokens,
+        )
+
+        return HowdenResult(response.output_text, usage)

{howdenllm-3.1.2 → howdenllm-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HowdenLLM
-Version: 3.1.2
+Version: 4.0.0
 Summary: A simple configuration manager with Pydantic and JSON export.
 License: MIT
 Keywords: config,configuration,pydantic,json
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: accelerate (>=1.10.0,<2.0.0)
 Requires-Dist: anthropic (>=0.85.0,<0.86.0)
+Requires-Dist: howdencommonobjects (>=1.1.0)
 Requires-Dist: langchain (>=1.1.3,<2.0.0)
 Requires-Dist: langchain-community (>=0.3.27,<0.4.0)
 Requires-Dist: openai (>=1.99.9,<2.0.0)

{howdenllm-3.1.2 → howdenllm-4.0.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "HowdenLLM"
-version = "3.1.2"
+version = "4.0.0"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12,<3.14"
-dependencies = [ "transformers (>=4.55.0,<5.0.0)", "pydantic (>=2.11.7,<3.0.0)", "python-dotenv (>=1.1.1,<2.0.0)", "langchain-community (>=0.3.27,<0.4.0)", "openai (>=1.99.9,<2.0.0)", "accelerate (>=1.10.0,<2.0.0)", "tiktoken (>=0.12.0,<0.13.0)", "langchain (>=1.1.3,<2.0.0)", "pytest (>=9.0.2,<10.0.0)", "anthropic (>=0.85.0,<0.86.0)",]
+dependencies = [ "transformers (>=4.55.0,<5.0.0)", "pydantic (>=2.11.7,<3.0.0)", "python-dotenv (>=1.1.1,<2.0.0)", "langchain-community (>=0.3.27,<0.4.0)", "openai (>=1.99.9,<2.0.0)", "accelerate (>=1.10.0,<2.0.0)", "tiktoken (>=0.12.0,<0.13.0)", "langchain (>=1.1.3,<2.0.0)", "pytest (>=9.0.2,<10.0.0)", "anthropic (>=0.85.0,<0.86.0)","howdencommonobjects>=1.1.0"]
 [[project.authors]]
 name = "JesperThoftIllemannJ"
 email = "jesper.jaeger@howdendanmark.dk"

howdenllm-3.1.2/HowdenLLM/providers/base_provider.py

@@ -1,7 +0,0 @@
-from abc import ABC, abstractmethod
-from .provider_meta import ProviderMeta
-
-class BaseProvider(ABC, metaclass=ProviderMeta):
-    @abstractmethod
-    async def complete(self,  system: str, prompt: str, model: str, use_web_search_tool: bool, upload_attachment: str|None) -> str:
-        pass