dandy 2.1.0__tar.gz → 2.2.0__tar.gz

{dandy-2.1.0 → dandy-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dandy
-Version: 2.1.0
+Version: 2.2.0
 Summary: Python Artificial Intelligence Framework
 Author-email: Nathan Johnson <nathanj@stratusadv.com>
 License-Expression: MIT

{dandy-2.1.0 → dandy-2.2.0}/dandy/constants.py

@@ -1,4 +1,4 @@
-__VERSION__ = '2.1.0'
+__VERSION__ = '2.2.0'
 
 # Cache
 

{dandy-2.1.0 → dandy-2.2.0}/dandy/llm/connector.py

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from pydantic import ValidationError
 from pydantic.main import IncEx
@@ -8,11 +11,6 @@ from dandy.http.connector import HttpConnector
 from dandy.intel.factory import IntelFactory
 from dandy.intel.typing import IntelType
 from dandy.llm.config import LlmConfig
-from dandy.llm.diligence.handler import (
-    BaseDiligenceHandler,
-    PreDiligenceHandler,
-    PostDiligenceHandler,
-)
 from dandy.llm.exceptions import LlmCriticalError, LlmRecoverableError
 from dandy.llm.intelligence.prompts import service_system_validation_error_prompt
 from dandy.llm.prompt.prompt import Prompt
@@ -25,6 +23,9 @@ from dandy.llm.recorder import (
 )
 from dandy.llm.request.message import MessageHistory
 
+if TYPE_CHECKING:
+    from dandy.llm.diligence.handler import DiligenceHandler
+
 
 class LlmConnector(BaseConnector):
     def __init__(
@@ -33,7 +34,8 @@ class LlmConnector(BaseConnector):
         llm_config: LlmConfig,
         intel_class: type[IntelType] | None,
         system_prompt: Prompt | str,
-        diligence: float = 1.0,
+        post_diligence_handler: DiligenceHandler | None = None,
+        pre_diligence_handler: DiligenceHandler | None = None,
     ):
         self.recorder_event_id = recorder_event_id
 
@@ -49,16 +51,13 @@ class LlmConnector(BaseConnector):
 
         self.system_prompt_str = str(system_prompt)
 
-        self.diligence = diligence
+        self.post_diligence_handler = post_diligence_handler
+        self.pre_diligence_handler = pre_diligence_handler
 
     @property
     def has_retry_attempts_available(self) -> bool:
         return self.prompt_retry_attempt < self.llm_config.options.prompt_retry_count
 
-    @property
-    def _changed_diligence(self) -> bool:
-        return self.diligence != 1.0
-
     def _http_request_to_response_str(self) -> None:
         http_connector = HttpConnector()
 
@@ -131,15 +130,15 @@ class LlmConnector(BaseConnector):
             )
             raise LlmCriticalError(message)
 
-        if self._changed_diligence:
-            PreDiligenceHandler(level=self.diligence).apply(llm_connector=self)
+        if self.pre_diligence_handler is not None:
+            self.pre_diligence_handler.apply(llm_connector=self)
 
         response_intel_object = self._request_to_intel()
 
-        if self._changed_diligence:
-            PostDiligenceHandler(level=self.diligence).apply(llm_connector=self)
+        if self.post_diligence_handler is not None:
+            self.post_diligence_handler.apply(llm_connector=self)
 
-            if PostDiligenceHandler(level=self.diligence).requires_new_llm_request:
+            if self.post_diligence_handler.requires_new_llm_request:
                 response_intel_object = self._request_to_intel()
 
         return response_intel_object

dandy-2.2.0/dandy/llm/diligence/diligence.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from dandy.llm.connector import LlmConnector
+
+
+class BaseDiligence(ABC):
+    requires_new_llm_request: bool = False
+
+    def __init__(self):
+        self.is_activated = False
+
+    def activate(self) -> None:
+        self.is_activated = True
+
+    def deactivate(self) -> None:
+        self.is_activated = False
+
+    @abstractmethod
+    def apply(self, llm_connector: LlmConnector) -> None:
+        raise NotImplementedError

dandy-2.2.0/dandy/llm/diligence/handler.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, TypeVar
+
+if TYPE_CHECKING:
+    from dandy.llm.connector import LlmConnector
+    from dandy.llm.diligence.diligence import BaseDiligence
+
+DiligenceType = TypeVar('DiligenceType', bound='BaseDiligence')
+
+
+class DiligenceHandler:
+    def __init__(self) -> None:
+        self._diligence_classes_instances: dict[type[BaseDiligence], BaseDiligence] = {}
+
+    @property
+    def is_activated(self) -> bool:
+        if not self._diligence_classes_instances:
+            return False
+
+        return any(diligence.is_activated for diligence in self._diligence_classes_instances.values())
+
+    def apply(self, llm_connector: LlmConnector) -> None:
+        for diligence in self._diligence_classes_instances.values():
+            if diligence.is_activated:
+                diligence.apply(llm_connector=llm_connector)
+
+    def get_diligence(self, diligence_class: type[DiligenceType]) -> DiligenceType:
+        if diligence_class not in self._diligence_classes_instances:
+            self._diligence_classes_instances[diligence_class] = diligence_class()
+
+        return self._diligence_classes_instances[diligence_class]
+
+    @property
+    def requires_new_llm_request(self) -> bool:
+        for diligence in self._diligence_classes_instances.values():
+            if diligence.is_activated and diligence.requires_new_llm_request:
+                return True
+
+        return False

dandy-2.2.0/dandy/llm/diligence/mixin.py

@@ -0,0 +1,12 @@
+from dandy.core.service.mixin import BaseServiceMixin
+from dandy.llm.diligence.service import DiligenceService
+
+
+class DiligenceServiceMixin(BaseServiceMixin):
+    @property
+    def diligence(self) -> DiligenceService:
+        return self._get_service_instance(DiligenceService)
+
+    def reset(self):
+        super().reset()
+        self.diligence.reset()

dandy-2.2.0/dandy/llm/diligence/service.py

@@ -0,0 +1,38 @@
+from dandy.core.service.service import BaseService
+from dandy.llm.diligence.diligence import BaseDiligence
+from dandy.llm.diligence.handler import DiligenceHandler
+from dandy.llm.diligence.second_pass.diligence import SecondPassRemovalDiligence
+from dandy.llm.diligence.stop_word_removal.diligence import StopWordRemovalDiligence
+from dandy.llm.diligence.vowel_removal.diligence import VowelRemovalDiligence
+
+
+class DiligenceService(BaseService['dandy.llm.diligence.mixin.DiligenceServiceMixin']):
+    def __post_init__(self):
+        self.post_handler: DiligenceHandler = None
+        self.pre_handler: DiligenceHandler = None
+        self._reset_handlers()
+
+    def _reset_handlers(self):
+        self.post_handler: DiligenceHandler = DiligenceHandler()
+        self.pre_handler: DiligenceHandler = DiligenceHandler()
+
+    @property
+    def second_pass(self) -> SecondPassRemovalDiligence:
+        return self.post_handler.get_diligence(
+            SecondPassRemovalDiligence
+        )
+
+    @property
+    def stop_word_removal(self) -> StopWordRemovalDiligence:
+        return self.post_handler.get_diligence(
+            StopWordRemovalDiligence
+        )
+
+    @property
+    def vowel_removal(self) -> VowelRemovalDiligence:
+        return self.pre_handler.get_diligence(
+            VowelRemovalDiligence
+        )
+
+    def reset(self):
+        self._reset_handlers()

{dandy-2.1.0 → dandy-2.2.0}/dandy/llm/mixin.py

@@ -8,7 +8,6 @@ from dandy.llm.service import LlmService
 
 
 class LlmServiceMixin(BaseServiceMixin):
-    diligence: float = 1.0
     llm_config: str = 'DEFAULT'
     intel_class: type[BaseIntel] = DefaultIntel
     role: Prompt | str = 'Assistant'
@@ -29,7 +28,6 @@ class LlmServiceMixin(BaseServiceMixin):
         role: Prompt | str | None = None,
         task: Prompt | str | None = None,
         guidelines: Prompt | str | None = None,
-        diligence: float | None = None,
         llm_config: str | None = None,
         llm_temperature: float | None = None,
         **kwargs,
@@ -45,9 +43,6 @@ class LlmServiceMixin(BaseServiceMixin):
         if isinstance(guidelines, (Prompt, str)):
             self.guidelines = guidelines
 
-        if isinstance(diligence, float):
-            self.diligence = diligence
-
         if isinstance(llm_config, str):
             self.llm_config = llm_config
 

{dandy-2.1.0 → dandy-2.2.0}/dandy/llm/service.py

@@ -7,6 +7,7 @@ from dandy.core.future.tools import process_to_future
 from dandy.core.service.service import BaseService
 from dandy.llm.connector import LlmConnector
 from dandy.llm.decoder.mixin import DecoderServiceMixin
+from dandy.llm.diligence.mixin import DiligenceServiceMixin
 from dandy.llm.intelligence.prompts import service_system_prompt
 
 if TYPE_CHECKING:
@@ -22,11 +23,11 @@ if TYPE_CHECKING:
 class LlmService(
     BaseService['dandy.llm.mixin.LlmServiceMixin'],
     DecoderServiceMixin,
+    DiligenceServiceMixin,
 ):
     def __post_init__(self):
         self._llm_connector: LlmConnector = LlmConnector(
             recorder_event_id=self.recorder_event_id,
-            diligence=self.obj.diligence,
             system_prompt=service_system_prompt(
                 role=self.obj.role,
                 task=self.obj.task,
@@ -35,6 +36,8 @@ class LlmService(
             ).to_str(),
             llm_config=self.obj.get_llm_config(),
             intel_class=self.obj.intel_class,
+            post_diligence_handler=self.diligence.post_handler,
+            pre_diligence_handler=self.diligence.pre_handler,
         )
 
     @property

{dandy-2.1.0 → dandy-2.2.0}/dandy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dandy
-Version: 2.1.0
+Version: 2.2.0
 Summary: Python Artificial Intelligence Framework
 Author-email: Nathan Johnson <nathanj@stratusadv.com>
 License-Expression: MIT

{dandy-2.1.0 → dandy-2.2.0}/dandy.egg-info/SOURCES.txt

@@ -144,7 +144,9 @@ dandy/llm/decoder/intelligence/prompts.py
 dandy/llm/diligence/__init__.py
 dandy/llm/diligence/diligence.py
 dandy/llm/diligence/handler.py
+dandy/llm/diligence/mixin.py
 dandy/llm/diligence/recorder.py
+dandy/llm/diligence/service.py
 dandy/llm/diligence/second_pass/__init__.py
 dandy/llm/diligence/second_pass/diligence.py
 dandy/llm/diligence/stop_word_removal/__init__.py

{dandy-2.1.0 → dandy-2.2.0}/pyproject.toml

@@ -88,12 +88,6 @@ dandy = [
 [tool.setuptools.dynamic]
 version = { attr = "dandy.constants.__VERSION__" }
 
-[tool.ruff]
-extend = "ruff.toml"
-
-[tool.ty]
-extend = "ty.toml"
-
 [tool.codespell]
 # Ref: https://github.com/codespell-project/codespell#using-a-config-file
 skip = '.git*,*.svg,*.css,.cache,.npm'

dandy-2.1.0/dandy/llm/diligence/diligence.py

@@ -1,31 +0,0 @@
-from __future__ import annotations
-
-from abc import ABC, abstractmethod
-from typing import Callable, TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from dandy.llm.connector import LlmConnector
-
-
-class BaseDiligence(ABC):
-    trigger_level: float
-    trigger_operator: Callable[[float, float], bool]
-    requires_new_llm_request: bool = False
-
-    def __init_subclass__(cls, **kwargs) -> None:
-        if (
-            cls.trigger_level == 1.0
-            or cls.trigger_level > 2.0
-            or cls.trigger_level < 0.0
-        ):
-            message = f"`{cls.__name__}` should have a trigger level between 0.0 and 2.0 and not 1.0 as it's used as the default."
-            raise ValueError(message)
-
-    @classmethod
-    def is_triggered(cls, level: float) -> bool:
-        return cls.trigger_operator(level, cls.trigger_level)
-
-    @classmethod
-    @abstractmethod
-    def apply(cls, llm_connector: LlmConnector) -> None:
-        raise NotImplementedError

dandy-2.1.0/dandy/llm/diligence/handler.py

@@ -1,44 +0,0 @@
-from __future__ import annotations
-
-from abc import ABC
-from typing import TYPE_CHECKING
-
-from dandy.llm.diligence.second_pass.diligence import SecondPassRemovalDiligence
-from dandy.llm.diligence.stop_word_removal.diligence import StopWordRemovalDiligence
-from dandy.llm.diligence.vowel_removal.diligence import VowelRemovalDiligence
-
-if TYPE_CHECKING:
-    from dandy.llm.connector import LlmConnector
-    from dandy.llm.diligence.diligence import BaseDiligence
-
-
-class BaseDiligenceHandler(ABC):
-    diligence_classes: tuple[type[BaseDiligence]]
-
-    def __init__(self, level: float) -> None:
-        self.level = level
-
-    def apply(self, llm_connector: LlmConnector) -> None:
-        for diligence_class in self.diligence_classes:
-            if diligence_class.is_triggered(self.level):
-                diligence_class.apply(llm_connector=llm_connector)
-
-    @property
-    def requires_new_llm_request(self) -> bool:
-        for diligence_class in self.diligence_classes:
-            if diligence_class.is_triggered(self.level) and diligence_class.requires_new_llm_request:
-                return True
-
-        return False
-
-
-
-class PreDiligenceHandler(BaseDiligenceHandler):
-    diligence_classes = (
-        StopWordRemovalDiligence,
-        VowelRemovalDiligence,
-    )
-
-
-class PostDiligenceHandler(BaseDiligenceHandler):
-    diligence_classes = (SecondPassRemovalDiligence,)