iatoolkit 2.3.2__tar.gz → 2.3.4__tar.gz

{iatoolkit-2.3.2/src/iatoolkit.egg-info → iatoolkit-2.3.4}/PKG-INFO

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

{iatoolkit-2.3.2 → iatoolkit-2.3.4}/src/iatoolkit/__init__.py

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

{iatoolkit-2.3.2 → iatoolkit-2.3.4}/src/iatoolkit/config/system_prompts_pack.yaml

@@ -2,42 +2,47 @@ version: 2
 prompts:
   - key: core_identity
     filename: core_identity.prompt
+    section: identity
     include:
       execution_modes:
         - chat
         - agent
   - key: chat_user_profile
     filename: chat_user_profile.prompt
+    section: identity
     include:
       execution_modes:
         - chat
   - key: chat_state_rules
     filename: chat_state_rules.prompt
+    section: conversation_rules
     include:
       execution_modes:
         - chat
   - key: links_documents
     filename: links_documents.prompt
+    section: conversation_rules
     include:
       execution_modes:
         - chat
         - agent
   - key: memory_usage
     filename: memory_usage.prompt
+    section: conversation_rules
     include:
       execution_modes:
         - chat
-        - agent
       all_capabilities:
         - can_use_memory
   - key: multimodal_basics
     filename: multimodal_basics.prompt
+    section: conversation_rules
     include:
       execution_modes:
         - chat
-        - agent
   - key: output_basics
     filename: output_basics.prompt
+    section: output_contract
     include:
       execution_modes:
         - chat
@@ -46,6 +51,7 @@ prompts:
         - chat_compatible
   - key: presentation_formatting
     filename: presentation_formatting.prompt
+    section: output_contract
     include:
       execution_modes:
         - chat
@@ -53,6 +59,7 @@ prompts:
         - chat_compatible
   - key: html_structures
     filename: html_structures.prompt
+    section: output_contract
     include:
       execution_modes:
         - chat
@@ -60,12 +67,14 @@ prompts:
         - chat_compatible
   - key: tool_html_passthrough
     filename: tool_html_passthrough.prompt
+    section: output_contract
     include:
       execution_modes:
         - chat
         - agent
   - key: file_download_output
     filename: file_download_output.prompt
+    section: output_contract
     include:
       execution_modes:
         - chat
@@ -74,6 +83,7 @@ prompts:
         - can_generate_files
   - key: email_output
     filename: email_output.prompt
+    section: output_contract
     include:
       execution_modes:
         - chat
@@ -82,6 +92,7 @@ prompts:
         - can_send_email
   - key: sql_core
     filename: sql_core.prompt
+    section: data_access_rules
     include:
       execution_modes:
         - chat
@@ -90,6 +101,7 @@ prompts:
         - can_query_sql
   - key: sql_jsonb
     filename: sql_jsonb.prompt
+    section: data_access_rules
     include:
       execution_modes:
         - chat
@@ -98,6 +110,7 @@ prompts:
         - can_query_sql
   - key: sql_casting
     filename: sql_casting.prompt
+    section: data_access_rules
     include:
       execution_modes:
         - chat
@@ -106,6 +119,7 @@ prompts:
         - can_query_sql
   - key: sql_aggregation_scope
     filename: sql_aggregation_scope.prompt
+    section: data_access_rules
     include:
       execution_modes:
         - chat

{iatoolkit-2.3.2 → iatoolkit-2.3.4}/src/iatoolkit/locales/en.yaml

@@ -760,6 +760,7 @@ ui:
     col_base: "Base"
     col_markup: "Markup"
     col_tax: "Tax"
+    col_cost_per_1000_runs: "Cost / 1000"
     col_total: "Total"
     col_currency: "Currency"
     col_subtotal: "Subtotal"

{iatoolkit-2.3.2 → iatoolkit-2.3.4}/src/iatoolkit/locales/es.yaml

@@ -761,6 +761,7 @@ ui:
     col_base: "Base"
     col_markup: "Recargo"
     col_tax: "Impuestos"
+    col_cost_per_1000_runs: "Costo / 1000"
     col_total: "Total"
     col_currency: "Moneda"
     col_subtotal: "Subtotal"

{iatoolkit-2.3.2 → iatoolkit-2.3.4}/src/iatoolkit/services/company_context_service.py

@@ -31,46 +31,56 @@ class CompanyContextService:
         self.asset_repo = asset_repo
 
     def get_company_context(self, company_short_name: str) -> str:
+        blocks = self.get_company_context_blocks(company_short_name)
+        return "\n\n---\n\n".join(
+            section
+            for section in (
+                blocks.get("markdown_context"),
+                blocks.get("sql_context"),
+                blocks.get("yaml_context"),
+            )
+            if section
+        )
+
+    def get_company_context_blocks(self, company_short_name: str) -> dict[str, str]:
         """
         Builds the full context by aggregating three sources:
         1. Static context files (Markdown).
         2. Physical SQL schemas and enriched metadata.
         3. Residual schema files (YAML files not already covered by SQL enrichment).
         """
-        context_parts = []
+        md_context = ""
+        sql_context = ""
+        yaml_context = ""
         db_tables = []
 
         # 1. Context from Markdown (context/*.md)  files
         try:
-            md_context = self._get_static_file_context(company_short_name)
-            if md_context:
-                context_parts.append(md_context)
+            md_context = self._get_static_file_context(company_short_name).strip()
         except Exception as e:
             logging.warning(f"Could not load Markdown context for '{company_short_name}': {e}")
 
         # 2. Resolve company-specific SQL databases. We collect them first so YAML
         # context can avoid duplicating table definitions already covered by SQL.
-        sql_context = ""
         try:
             sql_context, db_tables = self._get_sql_enriched_context(company_short_name)
+            sql_context = sql_context.strip()
         except Exception as e:
             logging.warning(f"Could not generate SQL context for '{company_short_name}': {e}")
 
-        # 3. Append physical SQL context after markdown. Table-level YAML metadata
-        # is already merged inline inside the enriched SQL definitions.
-        if sql_context:
-            context_parts.append(sql_context)
-
         # 4. Context from residual yaml (schema/*.yaml) files
         try:
-            yaml_schema_context = self._get_yaml_schema_context(company_short_name, db_tables)
+            yaml_schema_context = self._get_yaml_schema_context(company_short_name, db_tables).strip()
             if yaml_schema_context:
-                context_parts.append(f"## Esquemas adicionales\n\n{yaml_schema_context.strip()}")
+                yaml_context = f"## Esquemas adicionales\n\n{yaml_schema_context}"
         except Exception as e:
             logging.warning(f"Could not load Yaml context for '{company_short_name}': {e}")
 
-        # Join all parts with a clear separator
-        return "\n\n---\n\n".join(context_parts)
+        return {
+            "markdown_context": md_context,
+            "sql_context": sql_context,
+            "yaml_context": yaml_context,
+        }
 
     def get_sql_context(self, company_short_name: str, allowed_databases: List[str] | None = None) -> str:
         try:

{iatoolkit-2.3.2 → iatoolkit-2.3.4}/src/iatoolkit/services/context_builder_service.py

@@ -27,6 +27,14 @@ class ContextBuilderService:
     MEMORY_TOOL_NAMES = {"iat_memory_search", "iat_memory_get_page"}
     FILE_GENERATION_TOOL_NAMES = {"iat_generate_excel", "iat_generate_pdf"}
     EMAIL_TOOL_NAME = "iat_send_email"
+    SYSTEM_PROMPT_SECTION_ORDER = (
+        "identity",
+        "business_context",
+        "conversation_rules",
+        "retrieval_guidance",
+        "data_access_rules",
+        "output_contract",
+    )
 
     """
     Service responsible for constructing the text contexts and prompts used by the LLM.
@@ -175,28 +183,30 @@ class ContextBuilderService:
             execution_mode="chat",
             response_mode="chat_compatible",
         )
-        system_prompt_template = system_prompt_payload.get("content", "")
         selected_system_prompt_keys = system_prompt_payload.get("selected_keys")
         if not isinstance(selected_system_prompt_keys, list):
             selected_system_prompt_keys = []
-        rendered_system_prompt = self.util.render_prompt_from_string(
-            template_string=system_prompt_template,
-            question=None,
+        rendered_sections = self._render_system_prompt_sections(
+            system_prompt_payload=system_prompt_payload,
             client_data=user_profile,
             company=company,
             service_list=available_tools,
         )
 
         # 3. Get company specific context (DB Schemas, Docs, etc.)
-        company_specific_context = self.company_context_service.get_company_context(company_short_name)
+        company_context_blocks = self.company_context_service.get_company_context_blocks(company_short_name)
         collection_context = self._build_collection_context(company_short_name)
 
-        # 4. Merge contexts. Conversational chat sees behavior and identity first,
-        # then retrieval hints, and only then the heavier company data blocks.
-        final_system_context = "\n\n".join(
-            section
-            for section in (rendered_system_prompt, collection_context, company_specific_context)
-            if section
+        final_system_context = self._join_context_sections(
+            rendered_sections.get("identity"),
+            company_context_blocks.get("markdown_context"),
+            rendered_sections.get("conversation_rules"),
+            rendered_sections.get("retrieval_guidance"),
+            collection_context,
+            rendered_sections.get("data_access_rules"),
+            company_context_blocks.get("sql_context"),
+            company_context_blocks.get("yaml_context"),
+            rendered_sections.get("output_contract"),
         )
 
         return final_system_context, user_profile, selected_system_prompt_keys
@@ -284,14 +294,11 @@ class ContextBuilderService:
             execution_mode="agent",
             response_mode=str(resolved_contract.get("response_mode") or "chat_compatible").strip().lower() or "chat_compatible",
         )
-        system_prompt_template = system_prompt_payload.get("content", "")
         selected_system_prompt_keys = system_prompt_payload.get("selected_keys")
         if not isinstance(selected_system_prompt_keys, list):
             selected_system_prompt_keys = []
-
-        rendered_system_prompt = self.util.render_prompt_from_string(
-            template_string=system_prompt_template,
-            question=None,
+        rendered_sections = self._render_system_prompt_sections(
+            system_prompt_payload=system_prompt_payload,
             client_data=user_profile,
             company=company,
             service_list=enabled_tools,
@@ -311,14 +318,67 @@ class ContextBuilderService:
                 collection_names=rag_collections,
             )
 
-        final_system_context = "\n\n".join(
-            section
-            for section in (rendered_system_prompt, collection_context, sql_context)
-            if section
+        final_system_context = self._join_context_sections(
+            rendered_sections.get("identity"),
+            rendered_sections.get("conversation_rules"),
+            rendered_sections.get("retrieval_guidance"),
+            collection_context,
+            rendered_sections.get("data_access_rules"),
+            sql_context,
+            rendered_sections.get("output_contract"),
         )
 
         return final_system_context, user_profile, selected_system_prompt_keys
 
+    def _render_system_prompt_sections(
+        self,
+        *,
+        system_prompt_payload: dict | None,
+        client_data: dict | None,
+        company: Company,
+        service_list: list[dict] | None,
+    ) -> dict[str, str]:
+        payload = system_prompt_payload or {}
+        raw_sections = payload.get("sections")
+        rendered_sections: dict[str, str] = {}
+
+        if isinstance(raw_sections, list) and raw_sections:
+            for item in raw_sections:
+                if not isinstance(item, dict):
+                    continue
+                section_name = str(item.get("section") or "").strip().lower()
+                template_string = str(item.get("content") or "").strip()
+                if not section_name or not template_string:
+                    continue
+                rendered_sections[section_name] = self.util.render_prompt_from_string(
+                    template_string=template_string,
+                    question=None,
+                    client_data=client_data,
+                    company=company,
+                    service_list=service_list,
+                ).strip()
+
+        if rendered_sections:
+            return rendered_sections
+
+        fallback_content = str(payload.get("content") or "").strip()
+        if not fallback_content:
+            return {}
+
+        return {
+            "identity": self.util.render_prompt_from_string(
+                template_string=fallback_content,
+                question=None,
+                client_data=client_data,
+                company=company,
+                service_list=service_list,
+            ).strip()
+        }
+
+    @staticmethod
+    def _join_context_sections(*sections: str | None) -> str:
+        return "\n\n".join(section for section in sections if section)
+
     def _build_collection_context(self, company_short_name: str, collection_names: list[str] | None = None) -> str:
         try:
             descriptors = self.knowledge_base_service.get_collection_descriptors(company_short_name)

{iatoolkit-2.3.2 → iatoolkit-2.3.4}/src/iatoolkit/services/prompt_service.py

@@ -674,10 +674,14 @@ class PromptService:
             selected_keys = payload.get("selected_keys")
             if not isinstance(selected_keys, list):
                 selected_keys = []
+            sections = payload.get("sections")
+            if not isinstance(sections, list):
+                sections = []
 
             return {
                 "content": payload.get("content", ""),
                 "selected_keys": selected_keys,
+                "sections": sections,
             }
 
         except IAToolkitException:

{iatoolkit-2.3.2 → iatoolkit-2.3.4}/src/iatoolkit/services/system_prompt_catalog.py

@@ -11,6 +11,15 @@ import yaml
 SYSTEM_PROMPTS_CONFIG_PACKAGE = "iatoolkit.config"
 SYSTEM_PROMPTS_CONFIG_FILENAME = "system_prompts_pack.yaml"
 SYSTEM_PROMPTS_PACKAGE = "iatoolkit.system_prompts"
+SYSTEM_PROMPT_SECTION_ORDER = (
+    "identity",
+    "business_context",
+    "conversation_rules",
+    "retrieval_guidance",
+    "data_access_rules",
+    "output_contract",
+)
+SYSTEM_PROMPT_ALLOWED_SECTIONS = set(SYSTEM_PROMPT_SECTION_ORDER)
 
 
 def _read_catalog_text() -> str:
@@ -81,6 +90,17 @@ def _normalize_pattern_list(value: Any, index: int) -> list[str]:
     return normalized
 
 
+def _normalize_section(value: Any, index: int) -> str:
+    section = str(value or "").strip().lower()
+    if not section:
+        raise ValueError(f"prompts[{index}].section is required")
+    if section not in SYSTEM_PROMPT_ALLOWED_SECTIONS:
+        raise ValueError(
+            f"prompts[{index}].section must be one of {list(SYSTEM_PROMPT_SECTION_ORDER)}"
+        )
+    return section
+
+
 def _normalize_include_rule(value: Any, index: int) -> dict:
     if value in (None, "always"):
         return {
@@ -165,6 +185,7 @@ def _parse_catalog(text: str) -> list[dict]:
         filename = str(raw_prompt.get("filename") or "").strip()
         if not filename:
             raise ValueError(f"prompts[{index}].filename is required")
+        section = _normalize_section(raw_prompt.get("section"), index)
 
         include_rule = _normalize_include_rule(raw_prompt.get("include"), index)
 
@@ -172,6 +193,7 @@ def _parse_catalog(text: str) -> list[dict]:
             {
                 "key": key,
                 "filename": filename,
+                "section": section,
                 "include": include_rule,
             }
         )
@@ -279,14 +301,42 @@ def build_system_prompt_payload(
     for entry in selected_entries:
         filename = str(entry.get("filename") or "").strip()
         key = str(entry.get("key") or "").strip()
+        section = str(entry.get("section") or "").strip().lower()
         if not filename or not key:
             continue
         content_parts.append(_read_prompt_text(filename))
         selected_keys.append(key)
 
+    section_buckets: dict[str, dict[str, Any]] = {
+        section: {"section": section, "content_parts": [], "selected_keys": []}
+        for section in SYSTEM_PROMPT_SECTION_ORDER
+    }
+    for entry in selected_entries:
+        filename = str(entry.get("filename") or "").strip()
+        key = str(entry.get("key") or "").strip()
+        section = str(entry.get("section") or "").strip().lower()
+        if not filename or not key or section not in section_buckets:
+            continue
+        section_buckets[section]["content_parts"].append(_read_prompt_text(filename))
+        section_buckets[section]["selected_keys"].append(key)
+
+    sections: list[dict] = []
+    for section in SYSTEM_PROMPT_SECTION_ORDER:
+        bucket = section_buckets[section]
+        if not bucket["content_parts"]:
+            continue
+        sections.append(
+            {
+                "section": section,
+                "content": "\n\n".join(bucket["content_parts"]),
+                "selected_keys": list(bucket["selected_keys"]),
+            }
+        )
+
     return {
-        "content": "\n\n".join(content_parts),
+        "content": "\n\n".join(section["content"] for section in sections),
         "selected_keys": selected_keys,
+        "sections": sections,
     }
 
 

{iatoolkit-2.3.2 → iatoolkit-2.3.4/src/iatoolkit.egg-info}/PKG-INFO

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