idun-agent-engine 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

idun_agent_engine/_version.py

@@ -1,3 +1,3 @@
 """Version information for Idun Agent Engine."""
 
-__version__ = "0.3.4"
+__version__ = "0.3.6"

idun_agent_engine/core/config_builder.py

@@ -4,6 +4,7 @@ This module provides a fluent API for building configuration objects using Pydan
 This approach ensures type safety, validation, and consistency with the rest of the codebase.
 """
 
+import os
 from pathlib import Path
 from typing import Any
 
@@ -24,6 +25,7 @@ from yaml import YAMLError
 
 from ..agent.base import BaseAgent
 from .engine_config import AgentConfig, EngineConfig, ServerConfig
+from idun_agent_schema.manager.guardrail_configs import convert_guardrail
 
 
 class ConfigBuilder:
@@ -119,10 +121,14 @@ class ConfigBuilder:
                     f"Failed to parse yaml file for Engine config: {e}"
                 ) from e
             try:
-                guardrails = yaml_config.get("engine_config", {}).get("guardrails", "")
-                if not guardrails:
-                    # self._guardrails = Guardrails(enabled=False)
+                guardrails_data = yaml_config.get("engine_config", {}).get("guardrails")
+
+                if not guardrails_data:
                     self._guardrails = None
+                else:
+                    converted_data = convert_guardrail(guardrails_data)
+                    self._guardrails = Guardrails.model_validate(converted_data)
+
             except Exception as e:
                 raise YAMLError(f"Failed to parse yaml file for Guardrails: {e}") from e
 

idun_agent_engine/guardrails/base.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Any
 
-from idun_agent_schema.engine.guardrails import Guardrail
+from idun_agent_schema.engine.guardrails_v2 import GuardrailConfig as Guardrail
 
 
 class BaseGuardrail(ABC):

idun_agent_engine/guardrails/guardrails_hub/guardrails_hub.py

@@ -2,26 +2,29 @@
 
 from guardrails import Guard
 from idun_agent_schema.engine.guardrails import Guardrail as GuardrailSchema
-from idun_agent_schema.engine.guardrails_type import (
-    GuardrailType,
-)
+from idun_agent_schema.engine.guardrails_v2 import GuardrailConfigId
 
 from ..base import BaseGuardrail
 
 
-def get_guard_instance(name: str) -> Guard:
+def get_guard_instance(name: GuardrailConfigId) -> Guard:
     """Returns a map of guard type -> guard instance."""
-    if name == "BAN_LIST":
+    if name.value == "ban_list":
         from guardrails.hub import BanList
 
         return BanList
 
-    elif name == "NSFW":
+    elif name.value == "detect_pii":
+        from guardrails.hub import DetectPII
+
+        return DetectPII
+
+    elif name.value == "nsfw":
         from guardrails.hub import NSFWText
 
         return NSFWText
 
-    elif name == "COMPETITOR_CHECK":
+    elif name.value == "competitor_check":
         from guardrails.hub import CompetitorCheck
 
         return CompetitorCheck
@@ -36,14 +39,9 @@ class GuardrailsHubGuard(BaseGuardrail):
     def __init__(self, config: GuardrailSchema, position: str) -> None:
         super().__init__(config)
 
-        self._guard_type = self._guardrail_config.type
-        self._guard_config = self._guardrail_config.config
-
-        if self._guard_type == GuardrailType.GUARDRAILS_HUB:
-            self._guard_url = self._guardrail_config.config["guard_url"]
-
-        self.reject_message: str = self._guard_config["reject_message"]
-        self._install_model()
+        self.guard_id = self._guardrail_config.config_id
+        self._guard_url = self._guardrail_config.guard_url
+        self.reject_message: str = self._guardrail_config.reject_message
         self._guard: Guard | None = self.setup_guard()
         self.position: str = position
 
@@ -53,43 +51,50 @@ class GuardrailsHubGuard(BaseGuardrail):
         from guardrails import install
 
         try:
-            api_key = self._guardrail_config.config["api_key"]
-            subprocess.run(
+            api_key = self._guardrail_config.api_key
+
+            print("Configuring guardrails with token...")
+            result = subprocess.run(
                 [
                     "guardrails",
                     "configure",
                     "--token",
                     api_key,
-                    "--disable-remote-inferencing",  # TODO: maybe provide this as feat
+                    "--disable-remote-inferencing",
                     "--disable-metrics",
                 ],
                 check=True,
+                capture_output=True,
+                text=True,
             )
+            print(f"Configure output: {result.stdout}")
+            if result.stderr:
+                print(f"Configure stderr: {result.stderr}")
             print(f"Installing model: {self._guard_url}..")
-            install(self._guard_url, quiet=True, install_local_models=True)
+            install(self._guard_url, quiet=False, install_local_models=True)
+            print(f"Successfully installed: {self._guard_url}")
+        except subprocess.CalledProcessError as e:
+            raise OSError(
+                f"Cannot configure guardrails: stdout={e.stdout}, stderr={e.stderr}"
+            ) from e
         except Exception as e:
-            raise OSError(f"Cannot install model {self._guard_url}: {e}") from e
+            raise e
 
     def setup_guard(self) -> Guard | None:
         """Installs and configures the guard based on its yaml config."""
-        if self._guard_type == GuardrailType.GUARDRAILS_HUB:
-            self._install_model()
-            guard_name = self._guardrail_config.config.get("guard")
-            guard = get_guard_instance(guard_name)
-            if guard is None:
-                raise ValueError(
-                    f"Guard: {self.guard_type} is not yet supported, or does not exist."
-                )
-
-            guard_instance_params = self._guardrail_config.config.get(
-                "guard_config", {}
+        self._install_model()
+        guard_name = self.guard_id
+        guard = get_guard_instance(guard_name)
+        if guard is None:
+            raise ValueError(
+                f"Guard: {self.guard_id} is not yet supported, or does not exist."
             )
-            guard_instance = guard(**guard_instance_params)
-            for param, value in self._guardrail_config.config["guard_config"].items():
-                setattr(guard, param, value)
-            return guard_instance
-        elif self._guard_type == GuardrailType.CUSTOM_LLM:
-            raise NotImplementedError("Support for CUSTOM_LLM not yet provided.")
+
+        guard_instance_params = self._guardrail_config.guard_params.model_dump()
+        guard_instance = guard(**guard_instance_params)
+        for param, value in guard_instance_params.items():
+            setattr(guard_instance, param, value)
+        return guard_instance
 
     def validate(self, input: str) -> bool:
         """TODO."""

idun_agent_engine/server/lifespan.py

@@ -22,7 +22,7 @@ def _parse_guardrails(guardrails_obj: Guardrails) -> Sequence[BaseGuardrail]:
 
     from ..guardrails.guardrails_hub.guardrails_hub import GuardrailsHubGuard as GHGuard
 
-    if not guardrails_obj.enabled:
+    if not guardrails_obj:
         return []
 
     return [GHGuard(guard, position="input") for guard in guardrails_obj.input] + [

idun_agent_engine/server/routers/agent.py

@@ -95,6 +95,7 @@ async def stream(
 ):
     """Process a message with the agent, streaming ag-ui events."""
     try:
+
         async def event_stream():
             message = {"query": request.query, "session_id": request.session_id}
             async for event in agent.stream(message):
@@ -114,6 +115,11 @@ async def copilotkit_stream(
     ],
 ):
     """Process a message with the agent, streaming ag-ui events."""
+    guardrails = getattr(request.app.state, "guardrails", [])
+    if guardrails:
+        _run_guardrails(
+            guardrails, message=input_data.messages[-1].content, position="input"
+        )
     if isinstance(copilotkit_agent, LangGraphAGUIAgent):
         try:
             # Get the accept header from the request

{idun_agent_engine-0.3.4.dist-info → idun_agent_engine-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: idun-agent-engine
-Version: 0.3.4
+Version: 0.3.6
 Summary: Python SDK and runtime to serve AI agents with FastAPI, LangGraph, and observability.
 Project-URL: Homepage, https://github.com/geoffreyharrazi/idun-agent-platform
 Project-URL: Repository, https://github.com/geoffreyharrazi/idun-agent-platform

{idun_agent_engine-0.3.4.dist-info → idun_agent_engine-0.3.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 idun_agent_engine/__init__.py,sha256=PhOL6foq5V0eXaoXw7xKUeCWXIWrOHrAFB8OuJnBqyM,550
-idun_agent_engine/_version.py,sha256=Z-hDh5-bBX3-YmjcPv65QOTgYe4majrXwcs240OhBY8,72
+idun_agent_engine/_version.py,sha256=qOzk7siFRtqtf3NUtjI6msjuZS0-FpPHkAz7nmx9w5U,72
 idun_agent_engine/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 idun_agent_engine/agent/__init__.py,sha256=foyOoRdI_04q1b6f2A5EXEpWSCKjZxpgWMWrKcsHNl8,220
 idun_agent_engine/agent/base.py,sha256=c-3gljSHQpm6aY0JNDmXkaPtcW55rXdsI8Cgv9l4bCs,3294
@@ -13,12 +13,13 @@ idun_agent_engine/agent/langgraph/__init__.py,sha256=CoBdkp9P4livdy5B0bvj9o7ftoq
 idun_agent_engine/agent/langgraph/langgraph.py,sha256=vM5ppt0s_2izzZVbVXXGXGCVUGSN-GZhvQ5-6YbOgVM,22904
 idun_agent_engine/core/__init__.py,sha256=F0DMDlWcSWS_1dvh3xMbrdcVvZRHVnoAFFgREuSJfBI,408
 idun_agent_engine/core/app_factory.py,sha256=XiLrctFT_n8LP3flKFwJoJDbiWPiw98N9lbkpR8P1O0,2597
-idun_agent_engine/core/config_builder.py,sha256=Q6f7lITqIHFlAfXEIfQvz_6s_GVFc4zVotOFF_YTFho,25641
+idun_agent_engine/core/config_builder.py,sha256=HpKrWwpohuArICyuOd-0eUQMG0PP2ZfhZzRGjLP9yck,25841
 idun_agent_engine/core/engine_config.py,sha256=IR8WhbenDstNSL7ORrUW8AnzgS3exFQxtwip66pFhcM,545
 idun_agent_engine/core/server_runner.py,sha256=vLlgLQM-xyvFgJMgFW2eWZoN1oc0x9FGL6bH8WsF6O8,4897
 idun_agent_engine/guardrails/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-idun_agent_engine/guardrails/base.py,sha256=vC554AbqOup9qjuOaTfG-w3fnd73J_7goMwab63jcIg,792
-idun_agent_engine/guardrails/guardrails_hub/guardrails_hub.py,sha256=7fCFoL8soXVkFW6p-TUD6XyR5x3j3I2ekofUG__sXu8,3396
+idun_agent_engine/guardrails/base.py,sha256=rvi7gcuKK8-3GtGicWzMWYsKKv0g3LjGBI-FycxgKVU,814
+idun_agent_engine/guardrails/guardrails_hub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+idun_agent_engine/guardrails/guardrails_hub/guardrails_hub.py,sha256=DgcUIDy9_bcVcpYVvDJowFe_QVlCpEkr8hntPRgRmS0,3456
 idun_agent_engine/guardrails/guardrails_hub/utils.py,sha256=bC6-MsCVF7xKTr48z7OzJJUeWvqAB7BiHeNTiKsme70,20
 idun_agent_engine/mcp/__init__.py,sha256=tsX4sJa7UZD-lr8O1acMwDrdDWJc_hMlB9IrX1NH8Wk,255
 idun_agent_engine/mcp/helpers.py,sha256=aFiLlk63pifBjGgctREFWxuSbb-um6QDOVpyikQ5NJ0,3224
@@ -37,10 +38,10 @@ idun_agent_engine/observability/phoenix_local/__init__.py,sha256=m9dIw1GWGKAW4wP
 idun_agent_engine/observability/phoenix_local/phoenix_local_handler.py,sha256=wjOZuMpAxdD5D33rzxycNEzFMunETpPnYjiHjbjz5GA,4252
 idun_agent_engine/server/__init__.py,sha256=WaFektUsy37bNg2niAUy_TykzStukgWPnxC-t49CEwo,177
 idun_agent_engine/server/dependencies.py,sha256=MVH8STOQ8wu-iYE_28y5dvw5FGT5PX0uQl0ldkpxw6Y,2080
-idun_agent_engine/server/lifespan.py,sha256=whWv7Gsl3CI_C13vWxl4wODOzlxIPRKSe58-_8B4zI8,3840
+idun_agent_engine/server/lifespan.py,sha256=sp1EaCRKHblRFwYHWWNQzuD3deFiFpb06QlSutvoZRo,3832
 idun_agent_engine/server/server_config.py,sha256=RYA7Y0c5aRw_WXaX8svFUIEtTPqzn3o-WQRm2p52C6g,213
 idun_agent_engine/server/routers/__init__.py,sha256=BgNzSVvHtGPGn5zhXhomwpKlDYBkeFi7xCbdcWVOgc8,102
-idun_agent_engine/server/routers/agent.py,sha256=HQkPRYFE5CadpzEQ3La8kK7lt5QUVuZTk-rzhZg9EsU,8995
+idun_agent_engine/server/routers/agent.py,sha256=qLaVRKgMIu-YfOi-tPEzLNRZKZ4DaZEQ8KQ-4HrWbbY,9194
 idun_agent_engine/server/routers/agui.py,sha256=Z1G4fuo57MazQWfp7ao8QZ1or2H9BXLS_JB1nFPXAkE,1891
 idun_agent_engine/server/routers/base.py,sha256=wICOXCokCIRjmHuDPDTWqeXqOVPes1CtDtiR_HvtsF0,3756
 idun_agent_engine/templates/__init__.py,sha256=xxbJZXaX6VEm_UrqzAOQcuujpEji5yqYzwQfwiqig8o,31
@@ -54,7 +55,7 @@ idun_platform_cli/groups/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 idun_platform_cli/groups/agent/main.py,sha256=QMGQi3JZ76SeFI3miIjVWpMt0L-hGz5FwxtTPQX4-Uw,301
 idun_platform_cli/groups/agent/package.py,sha256=LdIFAcfrlUcCssmSliYQIi0NFMuVkpx6t8WhMHATan8,2525
 idun_platform_cli/groups/agent/serve.py,sha256=2AbL0G1WqR33jlyiGaNvAoPZ3G1o52KYUptz_HaAjIg,3863
-idun_agent_engine-0.3.4.dist-info/METADATA,sha256=7avxM1HbAMGe_e_Baxb148Vwa24Y7VUXe6CLcEtMx8U,10648
-idun_agent_engine-0.3.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-idun_agent_engine-0.3.4.dist-info/entry_points.txt,sha256=XG3oxlSOaCrYKT1oyhKa0Ag1iJPMZ-WF6gaV_mzIJW4,52
-idun_agent_engine-0.3.4.dist-info/RECORD,,
+idun_agent_engine-0.3.6.dist-info/METADATA,sha256=Bz5cHt9CCJaNrzOnPj7ne174MKCw_Imm9pZNxT-D0j4,10648
+idun_agent_engine-0.3.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+idun_agent_engine-0.3.6.dist-info/entry_points.txt,sha256=XG3oxlSOaCrYKT1oyhKa0Ag1iJPMZ-WF6gaV_mzIJW4,52
+idun_agent_engine-0.3.6.dist-info/RECORD,,