iatoolkit 2.2.4__tar.gz → 2.3.0__tar.gz

{iatoolkit-2.2.4/src/iatoolkit.egg-info → iatoolkit-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iatoolkit
-Version: 2.2.4
+Version: 2.3.0
 Summary: IAToolkit
 Author: Fernando Libedinsky
 License-Expression: MIT

{iatoolkit-2.2.4 → iatoolkit-2.3.0}/src/iatoolkit/__init__.py

@@ -3,7 +3,7 @@
 #
 # IAToolkit is open source software.
 
-__version__ = "2.2.4"
+__version__ = "2.3.0"
 
 # Expose main classes and functions at the top level of the package
 

{iatoolkit-2.2.4 → iatoolkit-2.3.0}/src/iatoolkit/common/routes.py

@@ -22,6 +22,7 @@ def register_views(app):
     from iatoolkit.views.load_document_api_view import LoadDocumentApiView
     from iatoolkit.views.user_feedback_api_view import UserFeedbackApiView
     from iatoolkit.views.prompt_api_view import PromptApiView
+    from iatoolkit.views.prompt_resource_api_view import PromptResourceApiView
     from iatoolkit.views.history_api_view import HistoryApiView
     from iatoolkit.views.help_content_api_view import HelpContentApiView
     from iatoolkit.views.profile_api_view import UserLanguageApiView
@@ -121,6 +122,12 @@ def register_views(app):
     app.add_url_rule('/<company_short_name>/api/prompts/<prompt_name>',
                      view_func=prompt_view,
                      methods=['GET', 'POST','PUT', 'DELETE'])
+
+    app.add_url_rule(
+        '/<string:company_short_name>/api/admin/prompts/<string:prompt_name>/resources',
+        view_func=PromptResourceApiView.as_view('prompt_resources_api'),
+        methods=['GET', 'PUT'],
+    )
     # toolbar buttons
     app.add_url_rule('/<company_short_name>/api/feedback', view_func=UserFeedbackApiView.as_view('feedback'))
     app.add_url_rule('/<company_short_name>/api/history', view_func=HistoryApiView.as_view('history'))

iatoolkit-2.3.0/src/iatoolkit/config/system_prompts_pack.yaml

@@ -0,0 +1,106 @@
+version: 2
+prompts:
+  - key: core_identity
+    filename: core_identity.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+  - key: chat_user_profile
+    filename: chat_user_profile.prompt
+    include:
+      execution_modes:
+        - chat
+  - key: chat_state_rules
+    filename: chat_state_rules.prompt
+    include:
+      execution_modes:
+        - chat
+  - key: links_documents
+    filename: links_documents.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+  - key: multimodal_basics
+    filename: multimodal_basics.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+  - key: output_basics
+    filename: output_basics.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+      response_modes:
+        - chat_compatible
+  - key: presentation_formatting
+    filename: presentation_formatting.prompt
+    include:
+      execution_modes:
+        - chat
+      response_modes:
+        - chat_compatible
+  - key: html_structures
+    filename: html_structures.prompt
+    include:
+      execution_modes:
+        - chat
+      response_modes:
+        - chat_compatible
+  - key: tool_html_passthrough
+    filename: tool_html_passthrough.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+  - key: file_download_output
+    filename: file_download_output.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+      all_capabilities:
+        - can_generate_files
+  - key: email_output
+    filename: email_output.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+      all_capabilities:
+        - can_send_email
+  - key: sql_core
+    filename: sql_core.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+      all_capabilities:
+        - can_query_sql
+  - key: sql_jsonb
+    filename: sql_jsonb.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+      all_capabilities:
+        - can_query_sql
+  - key: sql_casting
+    filename: sql_casting.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+      all_capabilities:
+        - can_query_sql
+  - key: sql_aggregation_scope
+    filename: sql_aggregation_scope.prompt
+    include:
+      execution_modes:
+        - chat
+        - agent
+      all_capabilities:
+        - can_query_sql

{iatoolkit-2.2.4 → iatoolkit-2.3.0}/src/iatoolkit/locales/en.yaml

@@ -312,14 +312,14 @@ ui:
     restore_failed: "Failed to restore skill version."
     restore_ok: "Skill version restored."
     readonly_message: "Skill editing requires admin or owner role."
-    uncategorized: "Uncategorized"
+    uncategorized: "General"
     binding_label: "Binding {number}"
     resource_type_label: "Resource type"
     resource_key_label: "Resource key"
     resource_key_placeholder: "routing.yaml or collection name"
     metadata_json_label: "Metadata JSON"
-    prompt_type_agent: "Agent"
-    prompt_type_prompt: "Prompt"
+    execution_mode_agentic: "Agentic"
+    execution_mode_conversational: "Conversational"
     resource_type_tool: "Tool"
     resource_type_rag_collection: "RAG collection"
     resource_type_sql_source: "SQL source"
@@ -661,6 +661,9 @@ ui:
     definition_error_loading: "Could not load pipeline definition"
     definition_error_loading_list: "Could not load pipeline definitions"
     no_definitions: "No pipeline definitions yet."
+    no_active_definitions: "No active pipeline definitions."
+    show_inactive: "Show inactive"
+    definitions_filter_summary: "Showing {visible} of {total} pipelines"
     definition_last_run: "Last run"
     definition_no_runs: "No runs"
     definition_column_pipeline: "Pipeline"
@@ -984,12 +987,13 @@ ui:
     tab_editor: "Editor"
     tab_output: "Output"
     tab_tools: "Tools"
+    tab_resources: "Resources"
     tab_playground: "Playground"
     config_title: "Config"
     desc_label: "Description"
     desc_placeholder: "Describe this prompt..."
     vars_label: "Input Variables"
-    prompt_type_label: "Prompt Type"
+    execution_mode_label: "Execution Mode"
     active_label: "Active"
     output_type_label: "Output Type"
     output_type_free_text: "Free text"
@@ -1056,6 +1060,13 @@ ui:
     tools_type_http: "HTTP"
     tools_type_native: "NATIVE"
     tools_type_system: "SYSTEM"
+    resources_title: "Agent Resources"
+    resources_help: "Define the data scope visible to this agent. Only typed resources relevant to the selected tools are shown."
+    resources_sql_title: "SQL Sources"
+    resources_sql_help: "Select the SQL sources this agent can use."
+    resources_rag_title: "RAG Collections"
+    resources_rag_help: "Select the document collections this agent can search."
+    resources_memory_hint: "Memory tools use the current user scope and do not require extra bindings."
     run_btn: "Run"
     copy_html_btn: "Copy HTML"
     copy_json_btn: "Copy JSON"

{iatoolkit-2.2.4 → iatoolkit-2.3.0}/src/iatoolkit/locales/es.yaml

@@ -312,14 +312,14 @@ ui:
     restore_failed: "No se pudo restaurar la versión de la skill."
     restore_ok: "Versión de skill restaurada."
     readonly_message: "La edición de skills requiere rol admin u owner."
-    uncategorized: "Sin categoría"
+    uncategorized: "General"
     binding_label: "Binding {number}"
     resource_type_label: "Tipo de recurso"
     resource_key_label: "Key del recurso"
     resource_key_placeholder: "routing.yaml o nombre de colección"
     metadata_json_label: "Metadata JSON"
-    prompt_type_agent: "Agente"
-    prompt_type_prompt: "Prompt"
+    execution_mode_agentic: "Agéntico"
+    execution_mode_conversational: "Conversacional"
     resource_type_tool: "Tool"
     resource_type_rag_collection: "Colección RAG"
     resource_type_sql_source: "Fuente SQL"
@@ -662,6 +662,9 @@ ui:
     definition_error_loading: "No se pudo cargar la definición de pipeline"
     definition_error_loading_list: "No se pudieron cargar las definiciones de pipeline"
     no_definitions: "Todavía no hay definiciones de pipeline."
+    no_active_definitions: "No hay definiciones de pipeline activas."
+    show_inactive: "Mostrar inactivas"
+    definitions_filter_summary: "Mostrando {visible} de {total} pipelines"
     definition_last_run: "Última ejecución"
     definition_no_runs: "Sin ejecuciones"
     definition_column_pipeline: "Pipeline"
@@ -987,12 +990,13 @@ ui:
     tab_editor: "Editor"
     tab_output: "Salida"
     tab_tools: "Tools"
+    tab_resources: "Recursos"
     tab_playground: "Playground"
     config_title: "Configuración"
     desc_label: "Descripción"
     desc_placeholder: "Describe este prompt..."
     vars_label: "Variables de Entrada"
-    prompt_type_label: "Tipo de Prompt"
+    execution_mode_label: "Modo de ejecución"
     active_label: "Activo"
     output_type_label: "Tipo de Salida"
     output_type_free_text: "Texto libre"
@@ -1059,6 +1063,13 @@ ui:
     tools_type_http: "HTTP"
     tools_type_native: "NATIVE"
     tools_type_system: "SYSTEM"
+    resources_title: "Recursos del Agente"
+    resources_help: "Define el alcance de datos visible para este agente. Solo se muestran recursos tipados relevantes para las tools seleccionadas."
+    resources_sql_title: "Fuentes SQL"
+    resources_sql_help: "Selecciona las fuentes SQL que este agente podrá usar."
+    resources_rag_title: "Colecciones RAG"
+    resources_rag_help: "Selecciona las colecciones documentales que este agente podrá consultar."
+    resources_memory_hint: "Las tools de memoria usan el scope del usuario actual y no requieren bindings adicionales."
     run_btn: "Ejecutar"
     copy_html_btn: "Copiar HTML"
     copy_json_btn: "Copiar JSON"

{iatoolkit-2.2.4 → iatoolkit-2.3.0}/src/iatoolkit/repositories/llm_query_repo.py

@@ -3,8 +3,14 @@
 #
 # IAToolkit is open source software.
 
-from iatoolkit.repositories.models import (LLMQuery, Tool,
-                    Company, Prompt, PromptCategory, PromptType)
+from iatoolkit.repositories.models import (
+    LLMQuery,
+    Tool,
+    Company,
+    Prompt,
+    PromptCategory,
+    PromptExecutionMode,
+)
 from injector import inject
 from iatoolkit.repositories.database_manager import DatabaseManager
 from sqlalchemy import or_, and_
@@ -134,36 +140,19 @@ class LLMQueryRepo:
         return self.session.query(Prompt).filter_by(company_id=company.id, name=prompt_name).first()
 
     def get_prompts(self, company: Company, include_all: bool = False) -> list[Prompt]:
-        editable_types = [PromptType.COMPANY.value, PromptType.AGENT.value]
         if include_all:
             # Include all prompts (for the prompt admin dashboard)
             return self.session.query(Prompt).filter(
                 Prompt.company_id == company.id,
-                Prompt.prompt_type.in_(editable_types),
             ).all()
         else:
-            # Only active company prompts (default behavior for end users)
+            # Only active prompts explicitly exposed in chat for end users.
             return self.session.query(Prompt).filter(
                 Prompt.company_id == company.id,
-                Prompt.prompt_type == PromptType.COMPANY.value,
-                Prompt.active == True
+                Prompt.visible_in_chat.is_(True),
+                Prompt.active.is_(True),
             ).all()
 
-    def delete_prompts_by_type(self, company_id: int, prompt_types: list[str]) -> int:
-        if not prompt_types:
-            return 0
-
-        deleted_count = (
-            self.session.query(Prompt)
-            .filter(
-                Prompt.company_id == company_id,
-                Prompt.prompt_type.in_(prompt_types),
-            )
-            .delete(synchronize_session=False)
-        )
-        self.session.commit()
-        return int(deleted_count or 0)
-
     def create_or_update_prompt(self, new_prompt: Prompt):
         prompt = self.session.query(Prompt).filter_by(company_id=new_prompt.company_id,
                                                  name=new_prompt.name).first()
@@ -171,7 +160,12 @@ class LLMQueryRepo:
             prompt.category_id = new_prompt.category_id
             prompt.description = new_prompt.description
             prompt.order = new_prompt.order
-            prompt.prompt_type = new_prompt.prompt_type
+            prompt.visible_in_chat = bool(getattr(new_prompt, "visible_in_chat", True))
+            prompt.execution_mode = (
+                getattr(new_prompt, "execution_mode", None)
+                or prompt.execution_mode
+                or PromptExecutionMode.CONVERSATIONAL.value
+            )
             prompt.filename = new_prompt.filename
             prompt.custom_fields = new_prompt.custom_fields
             prompt.output_schema = new_prompt.output_schema
@@ -189,6 +183,10 @@ class LLMQueryRepo:
             prompt.llm_request_options = dict(new_prompt.llm_request_options or {})
             prompt.tool_policy = dict(new_prompt.tool_policy or {})
         else:
+            if new_prompt.visible_in_chat is None:
+                new_prompt.visible_in_chat = True
+            if not new_prompt.execution_mode:
+                new_prompt.execution_mode = PromptExecutionMode.CONVERSATIONAL.value
             if not new_prompt.output_schema_mode:
                 new_prompt.output_schema_mode = "best_effort"
             if not new_prompt.output_response_mode:

{iatoolkit-2.2.4 → iatoolkit-2.3.0}/src/iatoolkit/repositories/models.py

@@ -30,9 +30,15 @@ class DocumentStatus(str, enum.Enum):
     ACTIVE = "active"
     FAILED = "failed"
 
-class PromptType(str, enum.Enum):
-    COMPANY = "company"
-    AGENT = "agent"
+
+class PromptExecutionMode(str, enum.Enum):
+    CONVERSATIONAL = "conversational"
+    AGENTIC = "agentic"
+
+
+class PromptResourceType(str, enum.Enum):
+    SQL_SOURCE = "sql_source"
+    RAG_COLLECTION = "rag_collection"
 
 
 class MemoryItemType(str, enum.Enum):
@@ -545,7 +551,8 @@ class Prompt(Base):
     description = Column(String, nullable=False)
     filename = Column(String, nullable=False)
     active = Column(Boolean, default=True)
-    prompt_type = Column(String, default=PromptType.COMPANY.value, nullable=False)
+    visible_in_chat = Column(Boolean, default=True, nullable=False)
+    execution_mode = Column(String, default=PromptExecutionMode.CONVERSATIONAL.value, nullable=False)
     order = Column(Integer, nullable=True, default=0)
     category_id = Column(Integer, ForeignKey(f'{ORM_SCHEMA}.iat_prompt_categories.id', ondelete='SET NULL'), nullable=True)
     custom_fields = Column(JSON, nullable=False, default=[])
@@ -560,11 +567,51 @@ class Prompt(Base):
     llm_request_options = Column(JSON_NATIVE, nullable=False, default=dict)
     tool_policy = Column(JSON_NATIVE, nullable=False, default=dict)
     created_at = Column(DateTime, default=datetime.now)
+
     def to_dict(self):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
 
     company = relationship("Company", back_populates="prompts")
     category = relationship("PromptCategory", back_populates="prompts")
+    resource_bindings = relationship(
+        "PromptResourceBinding",
+        back_populates="prompt",
+        cascade="all, delete-orphan",
+        order_by="PromptResourceBinding.binding_order",
+    )
+
+
+class PromptResourceBinding(Base):
+    __tablename__ = "iat_prompt_resource_bindings"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    prompt_id = Column(
+        Integer,
+        ForeignKey(f"{ORM_SCHEMA}.iat_prompt.id", ondelete="CASCADE"),
+        nullable=False,
+        index=True,
+    )
+    resource_type = Column(String(32), nullable=False, index=True)
+    resource_key = Column(String(255), nullable=False)
+    binding_order = Column(Integer, nullable=False, default=0)
+    metadata_json = Column(JSON_NATIVE, nullable=False, default=dict)
+    created_at = Column(DateTime, default=datetime.now)
+    updated_at = Column(DateTime, default=datetime.now, onupdate=datetime.now)
+    updated_by = Column(String(100), nullable=True)
+
+    __table_args__ = (
+        UniqueConstraint(
+            "prompt_id",
+            "resource_type",
+            "resource_key",
+            name="uix_prompt_resource_binding_resource_key",
+        ),
+    )
+
+    prompt = relationship("Prompt", back_populates="resource_bindings")
+
+    def to_dict(self):
+        return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
 
 
 class SqlSource(Base):

iatoolkit-2.3.0/src/iatoolkit/repositories/prompt_resource_repo.py

@@ -0,0 +1,40 @@
+# Copyright (c) 2024 Fernando Libedinsky
+# Product: IAToolkit
+#
+# IAToolkit is open source software.
+
+from __future__ import annotations
+
+from injector import inject
+
+from iatoolkit.repositories.database_manager import DatabaseManager
+from iatoolkit.repositories.models import PromptResourceBinding
+
+
+class PromptResourceRepo:
+    @inject
+    def __init__(self, db_manager: DatabaseManager):
+        self.session = db_manager.get_session()
+
+    def list_by_prompt(self, prompt_id: int) -> list[PromptResourceBinding]:
+        return (
+            self.session.query(PromptResourceBinding)
+            .filter(PromptResourceBinding.prompt_id == prompt_id)
+            .order_by(PromptResourceBinding.binding_order.asc(), PromptResourceBinding.id.asc())
+            .all()
+        )
+
+    def replace_bindings(
+        self,
+        prompt_id: int,
+        bindings: list[PromptResourceBinding],
+    ) -> list[PromptResourceBinding]:
+        (
+            self.session.query(PromptResourceBinding)
+            .filter(PromptResourceBinding.prompt_id == prompt_id)
+            .delete(synchronize_session="fetch")
+        )
+        for binding in bindings:
+            self.session.add(binding)
+        self.session.commit()
+        return bindings

{iatoolkit-2.2.4 → iatoolkit-2.3.0}/src/iatoolkit/services/company_context_service.py

@@ -66,8 +66,18 @@ class CompanyContextService:
         # Join all parts with a clear separator
         return "\n\n---\n\n".join(context_parts)
 
+    def get_sql_context(self, company_short_name: str, allowed_databases: List[str] | None = None) -> str:
+        try:
+            sql_context, _ = self._get_sql_enriched_context(
+                company_short_name,
+                allowed_databases=allowed_databases,
+            )
+            return sql_context
+        except Exception as e:
+            logging.warning(f"Could not generate SQL context for '{company_short_name}': {e}")
+            return ""
 
-    def _get_sql_enriched_context(self, company_short_name: str):
+    def _get_sql_enriched_context(self, company_short_name: str, allowed_databases: List[str] | None = None):
         """
         Generates the SQL context for the LLM using the enriched schema logic.
         It iterates over configured databases, fetches their enriched structure,
@@ -77,6 +87,14 @@ class CompanyContextService:
         if not sql_sources:
             return '', []
 
+        allowed_database_set = {
+            str(database or "").strip()
+            for database in (allowed_databases or [])
+            if str(database or "").strip()
+        }
+        if allowed_databases is not None and not allowed_database_set:
+            return "", []
+
         context_output = []
         db_tables=[]
 
@@ -84,6 +102,8 @@ class CompanyContextService:
             db_name = source.get('database')
             if not db_name:
                 continue
+            if allowed_database_set and db_name not in allowed_database_set:
+                continue
 
             try:
                 # 1. Get the Enriched Schema (Physical + YAML)

{iatoolkit-2.2.4 → iatoolkit-2.3.0}/src/iatoolkit/services/configuration_service.py

@@ -452,7 +452,7 @@ class ConfigurationService:
         prompt_list, categories_config = self._get_prompt_config(config)
 
         category_set = set(categories_config)
-        allowed_prompt_types = {"company", "agent"}
+        allowed_execution_modes = {"conversational", "agentic"}
         allowed_output_schema_modes = {"best_effort", "strict"}
         allowed_output_response_modes = {"chat_compatible", "structured_only"}
         allowed_attachment_modes = {"extracted_only", "native_only", "native_plus_extracted"}
@@ -485,18 +485,21 @@ class ConfigurationService:
                     add_error(f"prompts[{i}]", "Missing required key: 'description'")
 
             prompt_cat = prompt.get("category")
-            prompt_type = prompt.get("prompt_type", 'company').lower()
-            if prompt_type not in allowed_prompt_types:
+            execution_mode = str(prompt.get("execution_mode", "") or "").strip().lower()
+            if execution_mode and execution_mode not in allowed_execution_modes:
                 add_error(
                     f"prompts[{i}]",
-                    f"Unsupported prompt_type '{prompt_type}'. Must be one of: {sorted(allowed_prompt_types)}."
+                    f"Unsupported execution_mode '{execution_mode}'. Must be one of: {sorted(allowed_execution_modes)}."
                 )
                 continue
-            if prompt_type == 'company':
-                if not prompt_cat:
-                    add_error(f"prompts[{i}]", "Missing required key: 'category'")
-                elif prompt_cat not in category_set:
-                    add_error(f"prompts[{i}]", f"Category '{prompt_cat}' is not defined in 'prompt_categories'.")
+
+            visible_in_chat = prompt.get("visible_in_chat")
+            if visible_in_chat is not None and not isinstance(visible_in_chat, bool):
+                add_error(f"prompts[{i}].visible_in_chat", "Must be a boolean.")
+                continue
+
+            if prompt_cat and prompt_cat not in category_set:
+                add_error(f"prompts[{i}]", f"Category '{prompt_cat}' is not defined in 'prompt_categories'.")
 
             schema_mode = str(prompt.get("output_schema_mode", "best_effort")).strip().lower()
             if schema_mode not in allowed_output_schema_modes: