iatoolkit 2.11.0__tar.gz → 2.11.2__tar.gz

{iatoolkit-2.11.0/src/iatoolkit.egg-info → iatoolkit-2.11.2}/PKG-INFO

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

{iatoolkit-2.11.0 → iatoolkit-2.11.2}/src/iatoolkit/__init__.py

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

iatoolkit-2.11.2/src/iatoolkit/config/system_prompts/sql_mysql_casting.prompt

@@ -0,0 +1,10 @@
+### SQL MySQL: casting y tipos
+
+- Usa `CAST(... AS SIGNED)` para enteros cuando corresponda.
+- Usa `CAST(... AS DECIMAL(18, 4))` para montos o numeros con decimales.
+- No uses casts de PostgreSQL como `::NUMERIC`, `::INTEGER`, `::DATE` o `::BOOLEAN`.
+- Si un valor JSON puede venir vacio, primero conviertelo a texto con `JSON_UNQUOTE(...)`
+  y luego usa `NULLIF(..., '')` antes del `CAST(...)`.
+- Para fechas en texto usa `STR_TO_DATE(texto, '%d-%m-%Y')` o el formato que
+  corresponda a los datos reales.
+- No uses `TO_DATE(...)`, `date_trunc(...)` ni operadores exclusivos de PostgreSQL.

iatoolkit-2.11.2/src/iatoolkit/config/system_prompts/sql_mysql_json.prompt

@@ -0,0 +1,9 @@
+### SQL MySQL: JSON
+
+- Si un campo JSON contiene claves anidadas, usa `JSON_EXTRACT(json_col, '$.campo')`.
+- Si necesitas comparar o proyectar texto desde JSON, usa
+  `JSON_UNQUOTE(JSON_EXTRACT(json_col, '$.campo'))`.
+- No uses operadores de PostgreSQL como `->`, `->>`, `jsonb_each`,
+  `jsonb_array_elements` ni tipos `jsonb`.
+- Si necesitas contar o expandir arrays JSON, usa funciones compatibles con MySQL 8
+  y evita sintaxis especifica de PostgreSQL.

{iatoolkit-2.11.0 → iatoolkit-2.11.2}/src/iatoolkit/locales/en.yaml

@@ -941,6 +941,10 @@ ui:
     sql_sources_form_bridge_id: "Bridge ID"
     sql_sources_form_description: "Description"
     sql_sources_form_active: "Active"
+    sql_context_scope_title: "SQL Context"
+    sql_context_scope_empty: "Select a database to define which tables belong to the SQL context."
+    sql_context_scope_loading: "Load the database schema to choose the tables that should appear in context."
+    sql_context_scope_all_tables: "Include all tables"
     sql_sources_save_source: "Save Source"
     sql_sources_delete_title: "Delete SQL Source"
     sql_sources_delete_message: "Are you sure you want to delete this SQL source?"
@@ -1752,6 +1756,15 @@ js_messages:
   sql_sources_deleting: "Deleting..."
   sql_sources_delete_failed: "Error deleting SQL source"
   sql_sources_deleted_ok: "SQL source deleted."
+  sql_context_scope_save: "Save"
+  sql_context_scope_saving: "Saving..."
+  sql_context_scope_saved_ok: "SQL context scope updated."
+  sql_context_scope_save_failed: "Error saving SQL context scope."
+  sql_context_scope_empty: "Select a database to define which tables belong to the SQL context."
+  sql_context_scope_loading: "Load the database schema to choose the tables that should appear in context."
+  sql_context_scope_all_tables_hint: "All detected tables will be included in the SQL context."
+  sql_context_scope_selected_tables_hint: "{selected} of {total} tables selected for context."
+  sql_context_scope_table_toggle: "Include table in SQL context"
   prompts_polling_attempt: "Polling attempt {attempt}"
   prompts_polling_started: "Polling started"
   prompts_task_queued_waiting: "Task #{id} queued. Waiting for execution result..."

{iatoolkit-2.11.0 → iatoolkit-2.11.2}/src/iatoolkit/locales/es.yaml

@@ -943,6 +943,10 @@ ui:
     sql_sources_form_bridge_id: "Bridge ID"
     sql_sources_form_description: "Descripción"
     sql_sources_form_active: "Activa"
+    sql_context_scope_title: "Contexto SQL"
+    sql_context_scope_empty: "Selecciona una base para definir qué tablas pertenecen al contexto SQL."
+    sql_context_scope_loading: "Carga el esquema de la base para elegir las tablas que deben aparecer en el contexto."
+    sql_context_scope_all_tables: "Incluir todas las tablas"
     sql_sources_save_source: "Guardar fuente"
     sql_sources_delete_title: "Eliminar fuente SQL"
     sql_sources_delete_message: "¿Seguro que quieres eliminar esta fuente SQL?"
@@ -1754,6 +1758,15 @@ js_messages:
   sql_sources_deleting: "Eliminando..."
   sql_sources_delete_failed: "Error al eliminar la fuente SQL"
   sql_sources_deleted_ok: "Fuente SQL eliminada."
+  sql_context_scope_save: "Guardar"
+  sql_context_scope_saving: "Guardando..."
+  sql_context_scope_saved_ok: "Scope de contexto SQL actualizado."
+  sql_context_scope_save_failed: "Error al guardar el scope del contexto SQL."
+  sql_context_scope_empty: "Selecciona una base para definir qué tablas pertenecen al contexto SQL."
+  sql_context_scope_loading: "Carga el esquema de la base para elegir las tablas que deben aparecer en el contexto."
+  sql_context_scope_all_tables_hint: "Todas las tablas detectadas se incluirán en el contexto SQL."
+  sql_context_scope_selected_tables_hint: "{selected} de {total} tablas seleccionadas para contexto."
+  sql_context_scope_table_toggle: "Incluir tabla en el contexto SQL"
   prompts_polling_attempt: "Intento de consulta {attempt}"
   prompts_polling_started: "Consulta iniciada"
   prompts_task_queued_waiting: "Tarea #{id} en cola. Esperando resultado de ejecución..."

{iatoolkit-2.11.0 → iatoolkit-2.11.2}/src/iatoolkit/repositories/models.py

@@ -641,6 +641,8 @@ class SqlSource(Base):
     schema = Column(String, nullable=False, default="public")
     description = Column(Text, nullable=True)
     bridge_id = Column(String, nullable=True)
+    include_all_tables = Column(Boolean, nullable=False, default=True)
+    included_tables = Column(JSON_NATIVE, nullable=False, default=list)
 
     source = Column(String(16), nullable=False, default=SOURCE_YAML)
     is_active = Column(Boolean, nullable=False, default=True)

{iatoolkit-2.11.0 → iatoolkit-2.11.2}/src/iatoolkit/services/company_context_service.py

@@ -53,6 +53,7 @@ class CompanyContextService:
         sql_context = ""
         yaml_context = ""
         db_tables = []
+        sql_source_table_scopes = {}
 
         # 1. Context from Markdown (context/*.md)  files
         try:
@@ -65,12 +66,17 @@ class CompanyContextService:
         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:
-            yaml_schema_context = self._get_yaml_schema_context(company_short_name, db_tables).strip()
+            yaml_schema_context = self._get_yaml_schema_context(
+                company_short_name,
+                db_tables,
+                sql_source_table_scopes=sql_source_table_scopes,
+            ).strip()
             if yaml_schema_context:
                 yaml_context = f"## Esquemas adicionales\n\n{yaml_schema_context}"
         except Exception as e:
@@ -93,6 +99,34 @@ class CompanyContextService:
             logging.warning(f"Could not generate SQL context for '{company_short_name}': {e}")
             return ""
 
+    def _get_sql_source_table_scopes(self, company_short_name: str) -> dict[str, set[str] | None]:
+        scopes: dict[str, set[str] | None] = {}
+        sql_sources = self.sql_source_service.list_sources(company_short_name, include_inactive=False)
+
+        for source in sql_sources:
+            db_name = str(source.get("database") or "").strip()
+            if not db_name:
+                continue
+            scopes[db_name] = self._resolve_allowed_tables_for_source(source)
+        return scopes
+
+    def _resolve_allowed_tables_for_source(self, source: dict) -> set[str] | None:
+        if bool(source.get("include_all_tables", True)):
+            return None
+
+        normalized_tables: set[str] = set()
+        for table_name in source.get("included_tables") or []:
+            normalized_tables.update(self._table_name_candidates(str(table_name or "")))
+        return normalized_tables
+
+    @classmethod
+    def _table_is_allowed(cls, table_name: str, allowed_tables: set[str] | None) -> bool:
+        if allowed_tables is None:
+            return True
+        if not allowed_tables:
+            return False
+        return bool(cls._table_name_candidates(table_name) & allowed_tables)
+
     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.
@@ -121,12 +155,23 @@ class CompanyContextService:
             if allowed_database_set and db_name not in allowed_database_set:
                 continue
 
+            allowed_tables = self._resolve_allowed_tables_for_source(source)
+
             try:
                 # 1. Get the Enriched Schema (Physical + YAML)
                 enriched_structure = self.get_enriched_database_schema(company_short_name, db_name)
                 if not enriched_structure:
                     continue
 
+                if allowed_tables is not None:
+                    enriched_structure = {
+                        table_name: table_data
+                        for table_name, table_data in enriched_structure.items()
+                        if self._table_is_allowed(table_name, allowed_tables)
+                    }
+                    if not enriched_structure:
+                        continue
+
                 # 2. Build Header for this Database
                 dialect = self.sql_service.get_database_dialect(company_short_name, db_name)
                 dialect_suffix = f" [dialect={dialect}]" if dialect else ""
@@ -196,9 +241,15 @@ class CompanyContextService:
         return header + "\n\n---\n\n".join(context_output), db_tables
 
 
-    def _get_yaml_schema_context(self, company_short_name: str, db_tables: List[Dict]) -> str:
+    def _get_yaml_schema_context(
+        self,
+        company_short_name: str,
+        db_tables: List[Dict],
+        sql_source_table_scopes: dict[str, set[str] | None] | None = None,
+    ) -> str:
         # Get context from .yaml schema files using the repository
         yaml_schema_context = ''
+        sql_source_table_scopes = sql_source_table_scopes or {}
 
         try:
             # 1. List yaml files in the schema "folder"
@@ -211,12 +262,17 @@ class CompanyContextService:
                     table_name = f.split('.')[0]
 
                     exists = any(
-                        item["db_name"] == dbname and item["table_name"] == table_name
+                        item["db_name"] == dbname
+                        and bool(self._table_name_candidates(item["table_name"]) & self._table_name_candidates(table_name))
                         for item in db_tables
                     )
                     if exists:
                         continue
 
+                    allowed_tables = sql_source_table_scopes.get(dbname)
+                    if dbname in sql_source_table_scopes and not self._table_is_allowed(table_name, allowed_tables):
+                        continue
+
                 try:
                     # 2. Read content
                     content = self.asset_repo.read_text(company_short_name, AssetType.SCHEMA, filename)

{iatoolkit-2.11.0 → iatoolkit-2.11.2}/src/iatoolkit/services/sql_source_service.py

@@ -70,6 +70,26 @@ class SqlSourceService:
         normalized = str(value or "").strip()
         return normalized or None
 
+    @staticmethod
+    def _normalize_included_tables(value) -> list[str]:
+        if value in (None, ""):
+            return []
+        if not isinstance(value, list):
+            raise IAToolkitException(
+                IAToolkitException.ErrorType.INVALID_PARAMETER,
+                "included_tables must be a list",
+            )
+
+        normalized: list[str] = []
+        seen: set[str] = set()
+        for item in value:
+            table_name = str(item or "").strip()
+            if not table_name or table_name in seen:
+                continue
+            seen.add(table_name)
+            normalized.append(table_name)
+        return normalized
+
     def _validate_source_fields(
         self,
         *,
@@ -133,9 +153,13 @@ class SqlSourceService:
             schema=self._normalize_schema(payload.get("schema")),
             description=self._normalize_optional_text(payload.get("description")),
             bridge_id=bridge_id,
+            include_all_tables=bool(payload.get("include_all_tables", True)),
+            included_tables=self._normalize_included_tables(payload.get("included_tables")),
             source=self._normalize_source(payload.get("source") or SqlSource.SOURCE_USER),
             is_active=bool(payload.get("is_active", True)),
         )
+        if source.include_all_tables:
+            source.included_tables = []
 
         persisted = self.sql_source_repo.create_or_update(source)
         self.refresh_runtime(company_short_name)
@@ -181,11 +205,19 @@ class SqlSourceService:
         if "bridge_id" in payload:
             source.bridge_id = self._normalize_optional_text(payload.get("bridge_id"))
 
+        if "include_all_tables" in payload:
+            source.include_all_tables = bool(payload.get("include_all_tables"))
+
+        if "included_tables" in payload:
+            source.included_tables = self._normalize_included_tables(payload.get("included_tables"))
+
         if "is_active" in payload:
             source.is_active = bool(payload.get("is_active"))
 
         # Once edited via API, ownership moves to USER.
         source.source = SqlSource.SOURCE_USER
+        if bool(getattr(source, "include_all_tables", True)):
+            source.included_tables = []
 
         self._validate_source_fields(
             database=self._normalize_database(source.database),
@@ -270,8 +302,12 @@ class SqlSourceService:
             target.schema = self._normalize_schema(raw.get("schema"))
             target.description = self._normalize_optional_text(raw.get("description"))
             target.bridge_id = bridge_id
+            target.include_all_tables = bool(raw.get("include_all_tables", True))
+            target.included_tables = self._normalize_included_tables(raw.get("included_tables"))
             target.source = SqlSource.SOURCE_YAML
             target.is_active = bool(raw.get("is_active", True))
+            if target.include_all_tables:
+                target.included_tables = []
 
             persisted = self.sql_source_repo.create_or_update(target)
             by_database[database] = persisted
@@ -341,4 +377,3 @@ class SqlSourceService:
             registered += 1
 
         return {"registered": registered, "skipped": skipped}
-

{iatoolkit-2.11.0 → iatoolkit-2.11.2/src/iatoolkit.egg-info}/PKG-INFO

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

{iatoolkit-2.11.0 → iatoolkit-2.11.2}/src/iatoolkit.egg-info/SOURCES.txt

@@ -49,6 +49,8 @@ src/iatoolkit/config/system_prompts/sql_aggregation_scope.prompt
 src/iatoolkit/config/system_prompts/sql_casting.prompt
 src/iatoolkit/config/system_prompts/sql_core.prompt
 src/iatoolkit/config/system_prompts/sql_jsonb.prompt
+src/iatoolkit/config/system_prompts/sql_mysql_casting.prompt
+src/iatoolkit/config/system_prompts/sql_mysql_json.prompt
 src/iatoolkit/config/system_prompts/sql_rules.prompt
 src/iatoolkit/config/system_prompts/tool_html_passthrough.prompt
 src/iatoolkit/infra/__init__.py