iatoolkit 2.15.4__tar.gz → 2.16.1__tar.gz

{iatoolkit-2.15.4/src/iatoolkit.egg-info → iatoolkit-2.16.1}/PKG-INFO

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

{iatoolkit-2.15.4 → iatoolkit-2.16.1}/src/iatoolkit/__init__.py

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

{iatoolkit-2.15.4 → iatoolkit-2.16.1}/src/iatoolkit/core.py

@@ -355,7 +355,7 @@ class IAToolkit:
         from iatoolkit.repositories.profile_repo import ProfileRepo
         from iatoolkit.repositories.llm_query_repo import LLMQueryRepo
         from iatoolkit.repositories.memory_repo import MemoryRepo
-        from iatoolkit.repositories.mcp_personal_access_token_repo import McpPersonalAccessTokenRepo
+        from iatoolkit.repositories.mcp_token_repo import McpTokenRepo
         from iatoolkit.repositories.sql_dataset_repo import SqlDatasetRepo
         from iatoolkit.repositories.sql_source_repo import SqlSourceRepo
         from iatoolkit.repositories.vs_repo import VSRepo
@@ -372,7 +372,7 @@ class IAToolkit:
         binder.bind(ProfileRepo, to=ProfileRepo)
         binder.bind(LLMQueryRepo, to=LLMQueryRepo)
         binder.bind(MemoryRepo, to=MemoryRepo)
-        binder.bind(McpPersonalAccessTokenRepo, to=McpPersonalAccessTokenRepo)
+        binder.bind(McpTokenRepo, to=McpTokenRepo)
         binder.bind(SqlDatasetRepo, to=SqlDatasetRepo)
         binder.bind(SqlSourceRepo, to=SqlSourceRepo)
         binder.bind(VSRepo, to=VSRepo)
@@ -405,7 +405,7 @@ class IAToolkit:
         from iatoolkit.services.mail_service import MailService
         from iatoolkit.services.memory_compiler_service import MemoryCompilerService
         from iatoolkit.services.memory_service import MemoryService
-        from iatoolkit.services.mcp_personal_access_token_service import McpPersonalAccessTokenService
+        from iatoolkit.services.mcp_token_service import McpTokenService
         from iatoolkit.services.memory_wiki_service import MemoryWikiService
         from iatoolkit.services.profile_service import ProfileService
         from iatoolkit.services.jwt_service import JWTService
@@ -449,7 +449,7 @@ class IAToolkit:
         binder.bind(MemoryWikiService, to=MemoryWikiService)
         binder.bind(MemoryCompilerService, to=MemoryCompilerService)
         binder.bind(MemoryService, to=MemoryService)
-        binder.bind(McpPersonalAccessTokenService, to=McpPersonalAccessTokenService)
+        binder.bind(McpTokenService, to=McpTokenService)
         binder.bind(ProfileService, to=ProfileService)
         binder.bind(JWTService, to=JWTService)
         binder.bind(SqlDatasetService, to=SqlDatasetService)

{iatoolkit-2.15.4 → iatoolkit-2.16.1}/src/iatoolkit/locales/en.yaml

@@ -314,15 +314,15 @@ ui:
     general_profile_label: "Profile"
     general_tokens_label: "Integrations"
     general_tokens_title: "MCP access tokens"
-    general_tokens_description: "Create and manage bearer tokens for MCP clients that do not complete the OAuth flow directly."
+    general_tokens_description: "Create and manage your personal bearer tokens for MCP clients that do not complete the OAuth flow directly."
     general_tokens_action: "Open MCP tokens"
     mcp_tokens_create_title: "Create MCP token"
-    mcp_tokens_create_description: "Generate a personal access token for MCP clients that require a bearer token."
+    mcp_tokens_create_description: "Generate personal MCP tokens. The bearer token and full JSON config are shown only when the token is created."
     mcp_tokens_list_title: "MCP access tokens"
     mcp_tokens_count_suffix: "tokens"
     mcp_tokens_empty: "You have not created any MCP tokens yet."
-    mcp_connection_title: "Connection snippets"
-    mcp_connection_description: "Use these snippets with MCP clients that connect through a fixed bearer token instead of completing OAuth in-app."
+    mcp_connection_title: "Connection snippet"
+    mcp_connection_description: "The full snippet is shown when a personal MCP token is created."
     mcp_connection_tag: "Ready to paste"
     mcp_connection_server_url: "Server URL"
     mcp_connection_json_label: "JSON config"
@@ -331,7 +331,7 @@ ui:
     mcp_connection_url_copy_success: "Server URL copied."
     mcp_connection_json_copy_success: "JSON config copied."
     mcp_connection_copy_error: "Could not copy the MCP connection snippet."
-    mcp_connection_placeholder_help: "Replace <YOUR_MCP_TOKEN> with one of your active MCP personal access tokens."
+    mcp_connection_placeholder_help: "The bearer token cannot be recovered later; create a new token if you need to generate the JSON again."
     mcp_token_name: "Token name"
     mcp_token_name_placeholder: "Claude Desktop, PyCharm, Codex..."
     mcp_token_expiry_days: "Expires in (days)"
@@ -1412,6 +1412,10 @@ ui:
     execution_mode_label: "Execution Mode"
     agent_profile_label: "Agent profile"
     agent_profile_help: "Mark this agent to govern persistent conversations such as WhatsApp, campaigns, or collections."
+    queue_tier_label: "Queue Priority"
+    queue_tier_default: "Default"
+    queue_tier_low: "Low priority"
+    queue_tier_help: "Low priority agents run only after the normal agents queue is empty."
     active_label: "Active"
     output_type_label: "Output Type"
     output_type_free_text: "Free text"
@@ -1612,6 +1616,50 @@ ui:
     save_error: "Error saving API key."
     delete_error: "Error deleting API key."
 
+  mcp_service_tokens:
+    menu_label: "MCP Tokens"
+    title: "MCP Tokens"
+    subtitle: "Manage tenant-level MCP bearer tokens for services and users."
+    new_btn: "New MCP Token"
+    search_placeholder: "Filter MCP tokens..."
+    empty_state: "No MCP tokens registered yet."
+    name: "Name"
+    name_placeholder: "e.g. claude_prod"
+    name_required: "Token name is required."
+    subject_type: "Type"
+    subject_type_service: "Service"
+    subject_type_user: "User"
+    subject_identifier: "Subject"
+    subject_identifier_placeholder: "e.g. service:mcp or user@company.com"
+    created_by_identifier: "Created by"
+    service_subject_placeholder: "e.g. service:mcp"
+    user_subject_placeholder: "e.g. user@company.com"
+    service_subject_help: "Use a service subject with the service: prefix."
+    user_subject_help: "Use an existing user_identifier in this tenant."
+    subject_required: "Token subject is required."
+    key_value: "Token"
+    key_value_masked: "••••••••••••"
+    copy_tooltip: "Copy token"
+    copy_success: "MCP token copied to clipboard."
+    copy_error: "Could not copy MCP token."
+    status: "Status"
+    active: "Active"
+    inactive: "Inactive"
+    created_at: "Created"
+    expires_at: "Expires"
+    last_used_at: "Last Used"
+    create_modal_title: "Create MCP Token"
+    delete_confirmation: "Delete MCP Token?"
+    delete_message: "This action cannot be undone. The MCP token will be permanently revoked."
+    create_success: "MCP token created successfully."
+    delete_success: "MCP token revoked successfully."
+    load_error: "Error loading MCP tokens."
+    save_error: "Error saving MCP token."
+    delete_error: "Error deleting MCP token."
+    connection_title: "Connection snippet"
+    connection_description: "Use this bearer token to connect an MCP client directly to the tenant endpoint."
+    server_url: "Server URL"
+
   secrets:
     title: "Secrets"
     subtitle: "Manage company secrets used by integrations and services."
@@ -1833,6 +1881,10 @@ errors:
     mcp_pat_expiry_invalid: "Invalid expiration value."
     mcp_pat_invalid: "Invalid, expired, or revoked MCP token."
     mcp_pat_not_found: "MCP token not found."
+    mcp_pat_subject_required: "Token subject is required."
+    mcp_pat_created_by_required: "The identifier of the user creating the token is required."
+    mcp_pat_service_subject_invalid: "Service token subjects must start with 'service:'."
+    mcp_pat_token_unavailable: "The bearer token is not available to view. Create or rotate the token to store it encrypted."
     no_company_permissions: "Do not have permissions to admin this company."
   templates:
     company_not_found: "Company not found."

{iatoolkit-2.15.4 → iatoolkit-2.16.1}/src/iatoolkit/locales/es.yaml

@@ -315,15 +315,15 @@ ui:
     general_profile_label: "Perfil"
     general_tokens_label: "Integraciones"
     general_tokens_title: "Tokens de acceso MCP"
-    general_tokens_description: "Crea y administra bearer tokens para clientes MCP que no completan el flujo OAuth directamente."
+    general_tokens_description: "Crea y administra tus bearer tokens personales para clientes MCP que no completan el flujo OAuth directamente."
     general_tokens_action: "Abrir tokens MCP"
     mcp_tokens_create_title: "Crear token MCP"
-    mcp_tokens_create_description: "Genera un token de acceso personal para clientes MCP que requieren un bearer token."
+    mcp_tokens_create_description: "Genera tokens MCP personales. El bearer token y el JSON completo se muestran sólo al crearlo."
     mcp_tokens_list_title: "Tokens de acceso MCP"
     mcp_tokens_count_suffix: "tokens"
     mcp_tokens_empty: "Todavía no has creado tokens MCP."
-    mcp_connection_title: "Snippets de conexión"
-    mcp_connection_description: "Usa estos snippets con clientes MCP que se conectan con un bearer token fijo en vez de completar OAuth dentro de la app."
+    mcp_connection_title: "Snippet de conexión"
+    mcp_connection_description: "El snippet completo se muestra al crear un token MCP personal."
     mcp_connection_tag: "Listo para pegar"
     mcp_connection_server_url: "URL del servidor"
     mcp_connection_json_label: "Configuración JSON"
@@ -332,7 +332,7 @@ ui:
     mcp_connection_url_copy_success: "URL del servidor copiada."
     mcp_connection_json_copy_success: "Configuración JSON copiada."
     mcp_connection_copy_error: "No se pudo copiar el snippet de conexión MCP."
-    mcp_connection_placeholder_help: "Reemplaza <YOUR_MCP_TOKEN> por uno de tus tokens MCP activos."
+    mcp_connection_placeholder_help: "El bearer token no se puede recuperar después; crea uno nuevo si necesitas volver a generar el JSON."
     mcp_token_name: "Nombre del token"
     mcp_token_name_placeholder: "Claude Desktop, PyCharm, Codex..."
     mcp_token_expiry_days: "Expira en (días)"
@@ -1415,6 +1415,10 @@ ui:
     execution_mode_label: "Modo de ejecución"
     agent_profile_label: "Agent profile"
     agent_profile_help: "Marca este agente para gobernar conversaciones persistentes como WhatsApp, campañas o cobranza."
+    queue_tier_label: "Prioridad de Cola"
+    queue_tier_default: "Por defecto"
+    queue_tier_low: "Baja prioridad"
+    queue_tier_help: "Los agentes de baja prioridad solo se ejecutan cuando la cola normal de agentes está vacía."
     active_label: "Activo"
     output_type_label: "Tipo de Salida"
     output_type_free_text: "Texto libre"
@@ -1616,6 +1620,50 @@ ui:
     save_error: "Error al guardar la API key."
     delete_error: "Error al eliminar la API key."
 
+  mcp_service_tokens:
+    menu_label: "Tokens MCP"
+    title: "Tokens MCP"
+    subtitle: "Administra tokens bearer MCP a nivel de tenant para servicios y usuarios."
+    new_btn: "Nuevo token MCP"
+    search_placeholder: "Filtrar tokens MCP..."
+    empty_state: "Todavía no hay tokens MCP registrados."
+    name: "Nombre"
+    name_placeholder: "ej. claude_prod"
+    name_required: "El nombre del token es obligatorio."
+    subject_type: "Tipo"
+    subject_type_service: "Servicio"
+    subject_type_user: "Usuario"
+    subject_identifier: "Subject"
+    subject_identifier_placeholder: "ej. service:mcp o usuario@empresa.com"
+    created_by_identifier: "Creado por"
+    service_subject_placeholder: "ej. service:mcp"
+    user_subject_placeholder: "ej. usuario@empresa.com"
+    service_subject_help: "Usa un subject de servicio con prefijo service:."
+    user_subject_help: "Usa un user_identifier existente en este tenant."
+    subject_required: "El subject del token es obligatorio."
+    key_value: "Token"
+    key_value_masked: "••••••••••••"
+    copy_tooltip: "Copiar token"
+    copy_success: "Token MCP copiado al portapapeles."
+    copy_error: "No se pudo copiar el token MCP."
+    status: "Estado"
+    active: "Activo"
+    inactive: "Inactivo"
+    created_at: "Creado"
+    expires_at: "Expira"
+    last_used_at: "Último uso"
+    create_modal_title: "Crear token MCP"
+    delete_confirmation: "¿Eliminar token MCP?"
+    delete_message: "Esta acción no se puede deshacer. El token MCP será revocado permanentemente."
+    create_success: "Token MCP creado correctamente."
+    delete_success: "Token MCP revocado correctamente."
+    load_error: "Error al cargar los tokens MCP."
+    save_error: "Error al guardar el token MCP."
+    delete_error: "Error al eliminar el token MCP."
+    connection_title: "Snippet de conexión"
+    connection_description: "Usa este bearer token para conectar un cliente MCP directamente al endpoint del tenant."
+    server_url: "URL del servidor"
+
   secrets:
     title: "Secrets"
     subtitle: "Administra los secrets de la empresa usados por integraciones y servicios."
@@ -1835,6 +1883,10 @@ errors:
     mcp_pat_expiry_invalid: "El valor de expiración es inválido."
     mcp_pat_invalid: "Token MCP inválido, expirado o revocado."
     mcp_pat_not_found: "Token MCP no encontrado."
+    mcp_pat_subject_required: "El subject del token es obligatorio."
+    mcp_pat_created_by_required: "El identificador del usuario que crea el token es obligatorio."
+    mcp_pat_service_subject_invalid: "Los subjects de tokens de servicio deben comenzar con 'service:'."
+    mcp_pat_token_unavailable: "El bearer token no está disponible para visualizar. Crea o rota el token para guardarlo cifrado."
 
   templates:
     company_not_found: "Empresa no encontrada."

{iatoolkit-2.15.4 → iatoolkit-2.16.1}/src/iatoolkit/repositories/llm_query_repo.py

@@ -37,14 +37,9 @@ class LLMQueryRepo:
 
     # get user query history
     def get_history(self, company: Company, user_identifier: str, limit: int = 100) -> list[LLMQuery]:
-        return (
-            self.session.query(LLMQuery)
-            .filter(LLMQuery.user_identifier == user_identifier)
-            .filter_by(company_id=company.id)
-            .order_by(LLMQuery.created_at.desc())
-            .limit(limit)
-            .all()
-        )
+        return self.session.query(LLMQuery).filter(
+            LLMQuery.user_identifier == user_identifier,
+        ).filter_by(company_id=company.id).order_by(LLMQuery.created_at.desc()).limit(limit).all()
 
 
     ## --- Tools related methods
@@ -195,6 +190,7 @@ class LLMQueryRepo:
             )
             prompt.attachment_fallback = new_prompt.attachment_fallback or prompt.attachment_fallback or "extract"
             prompt.llm_model = new_prompt.llm_model
+            prompt.queue_tier = getattr(new_prompt, "queue_tier", None) or prompt.queue_tier or "default"
             prompt.llm_request_options = dict(new_prompt.llm_request_options or {})
             prompt.tool_policy = dict(new_prompt.tool_policy or {})
         else:
@@ -218,6 +214,8 @@ class LLMQueryRepo:
                 new_prompt.attachment_parser_provider = "basic"
             if not new_prompt.attachment_fallback:
                 new_prompt.attachment_fallback = "extract"
+            if not getattr(new_prompt, "queue_tier", None):
+                new_prompt.queue_tier = "default"
             if new_prompt.llm_request_options is None:
                 new_prompt.llm_request_options = {}
             if new_prompt.tool_policy is None:

iatoolkit-2.16.1/src/iatoolkit/repositories/mcp_token_repo.py

@@ -0,0 +1,110 @@
+from __future__ import annotations
+
+from datetime import datetime
+
+from injector import inject
+
+from iatoolkit.repositories.database_manager import DatabaseManager
+from iatoolkit.repositories.models import McpToken
+
+
+class McpTokenRepo:
+    @inject
+    def __init__(self, db_manager: DatabaseManager):
+        self.db_manager = db_manager
+        self.session = db_manager.get_session()
+
+    def create_token(self, token: McpToken) -> McpToken:
+        self.session.add(token)
+        self.session.commit()
+        return token
+
+    def save_token(self, token: McpToken) -> McpToken:
+        self.session.add(token)
+        self.session.commit()
+        return token
+
+    def rollback(self) -> None:
+        self.session.rollback()
+
+    def list_tokens(
+        self,
+        company_id: int,
+        *,
+        subject_type: str | None = None,
+        subject_identifier: str | None = None,
+    ) -> list[McpToken]:
+        query = self.session.query(McpToken).filter_by(company_id=company_id)
+        if subject_type:
+            query = query.filter_by(subject_type=subject_type)
+        if subject_identifier:
+            query = query.filter_by(subject_identifier=subject_identifier)
+        return query.order_by(McpToken.created_at.desc()).all()
+
+    def list_tokens_for_user(self, company_id: int, user_identifier: str) -> list[McpToken]:
+        return self.list_tokens(
+            company_id,
+            subject_type=McpToken.SUBJECT_TYPE_USER,
+            subject_identifier=user_identifier,
+        )
+
+    def list_service_tokens(self, company_id: int) -> list[McpToken]:
+        return self.list_tokens(company_id, subject_type=McpToken.SUBJECT_TYPE_SERVICE)
+
+    def get_token_by_id(
+        self,
+        company_id: int,
+        token_id: int,
+        *,
+        subject_type: str | None = None,
+        subject_identifier: str | None = None,
+    ) -> McpToken | None:
+        query = self.session.query(McpToken).filter_by(company_id=company_id, id=token_id)
+        if subject_type:
+            query = query.filter_by(subject_type=subject_type)
+        if subject_identifier:
+            query = query.filter_by(subject_identifier=subject_identifier)
+        return query.first()
+
+    def get_token_for_user(self, company_id: int, user_identifier: str, token_id: int) -> McpToken | None:
+        return self.get_token_by_id(
+            company_id,
+            token_id,
+            subject_type=McpToken.SUBJECT_TYPE_USER,
+            subject_identifier=user_identifier,
+        )
+
+    def get_service_token_by_id(self, company_id: int, token_id: int) -> McpToken | None:
+        return self.get_token_by_id(company_id, token_id, subject_type=McpToken.SUBJECT_TYPE_SERVICE)
+
+    def get_token_by_name(
+        self,
+        company_id: int,
+        name: str,
+        *,
+        subject_type: str,
+        subject_identifier: str,
+    ) -> McpToken | None:
+        return (
+            self.session.query(McpToken)
+            .filter_by(
+                company_id=company_id,
+                subject_type=subject_type,
+                subject_identifier=subject_identifier,
+                name=name,
+            )
+            .first()
+        )
+
+    def get_active_token_by_hash(self, company_id: int, token_hash: str) -> McpToken | None:
+        now = datetime.now()
+        return (
+            self.session.query(McpToken)
+            .filter(
+                McpToken.company_id == company_id,
+                McpToken.token_hash == token_hash,
+                McpToken.revoked_at.is_(None),
+                McpToken.expires_at > now,
+            )
+            .first()
+        )

{iatoolkit-2.15.4 → iatoolkit-2.16.1}/src/iatoolkit/repositories/models.py

@@ -160,8 +160,8 @@ class Company(Base):
         back_populates="company",
         cascade="all, delete-orphan",
     )
-    mcp_personal_access_tokens = relationship(
-        "McpPersonalAccessToken",
+    mcp_tokens = relationship(
+        "McpToken",
         back_populates="company",
         cascade="all, delete-orphan",
     )
@@ -576,6 +576,7 @@ class Prompt(Base):
     attachment_parser_provider = Column(String, nullable=False, default="basic")
     attachment_fallback = Column(String, nullable=False, default="extract")
     llm_model = Column(String, nullable=True, default=None)
+    queue_tier = Column(String, nullable=False, default="default")
     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)
@@ -712,24 +713,36 @@ class SqlDataset(Base):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
 
 
-class McpPersonalAccessToken(Base):
-    __tablename__ = "iat_mcp_personal_access_tokens"
+class McpToken(Base):
+    SUBJECT_TYPE_USER = "user"
+    SUBJECT_TYPE_SERVICE = "service"
+
+    __tablename__ = "iat_mcp_tokens"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     company_id = Column(Integer, ForeignKey(f"{ORM_SCHEMA}.iat_companies.id", ondelete="CASCADE"), nullable=False, index=True)
-    user_identifier = Column(String, nullable=False, index=True)
+    subject_type = Column(String, nullable=False, index=True, default=SUBJECT_TYPE_USER)
+    subject_identifier = Column(String, nullable=False, index=True)
+    created_by_identifier = Column(String, nullable=False, index=True)
     name = Column(String, nullable=False)
     token_hash = Column(String(64), nullable=False, unique=True, index=True)
+    token_encrypted = Column(Text, nullable=True)
     created_at = Column(DateTime, default=datetime.now, nullable=False)
     expires_at = Column(DateTime, nullable=False)
     revoked_at = Column(DateTime, nullable=True)
     last_used_at = Column(DateTime, nullable=True)
 
     __table_args__ = (
-        UniqueConstraint("company_id", "user_identifier", "name", name="uix_mcp_pat_company_user_name"),
+        UniqueConstraint(
+            "company_id",
+            "subject_type",
+            "subject_identifier",
+            "name",
+            name="uix_mcp_token_company_subject_name",
+        ),
     )
 
-    company = relationship("Company", back_populates="mcp_personal_access_tokens")
+    company = relationship("Company", back_populates="mcp_tokens")
 
     def to_dict(self):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}

{iatoolkit-2.15.4 → iatoolkit-2.16.1}/src/iatoolkit/services/company_context_service.py

@@ -42,7 +42,7 @@ class CompanyContextService:
             if section
         )
 
-    def get_company_context_blocks(self, company_short_name: str) -> dict[str, str]:
+    def get_company_context_blocks(self, company_short_name: str, *, include_sql_context: bool = True) -> dict[str, str]:
         """
         Builds the full context by aggregating three sources:
         1. Static context files (Markdown).
@@ -61,14 +61,15 @@ class CompanyContextService:
         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.
-        try:
-            sql_context, db_tables = self._get_sql_enriched_context(company_short_name)
-            sql_context = sql_context.strip()
-            sql_source_table_scopes = self._get_sql_source_table_scopes(company_short_name)
-        except Exception as e:
-            logging.warning(f"Could not generate SQL context for '{company_short_name}': {e}")
+        # 2. Resolve company-specific SQL databases. MCP can skip this expensive
+        # schema expansion and expose SQL through dedicated schema/query tools.
+        if include_sql_context:
+            try:
+                sql_context, db_tables = self._get_sql_enriched_context(company_short_name)
+                sql_context = sql_context.strip()
+                sql_source_table_scopes = self._get_sql_source_table_scopes(company_short_name)
+            except Exception as e:
+                logging.warning(f"Could not generate SQL context for '{company_short_name}': {e}")
 
         # 4. Context from residual yaml (schema/*.yaml) files
         try: