iatoolkit 0.68.0__tar.gz → 0.69.0__tar.gz

{iatoolkit-0.68.0/src/iatoolkit.egg-info → iatoolkit-0.69.0}/PKG-INFO

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

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "iatoolkit"
-version = "0.68.0"
+version = "0.69.0"
 requires-python = ">=3.12"
 description = "IAToolkit"
 readme = "readme.md"

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/__init__.py

@@ -10,10 +10,8 @@ from .iatoolkit import IAToolkit, current_iatoolkit, create_app
 # for registering the client companies
 from .company_registry import register_company
 from .base_company import BaseCompany
-from iatoolkit.repositories.database_manager import DatabaseManager
 
 # --- Services ---
-from iatoolkit.services.configuration_service import ConfigurationService
 from iatoolkit.services.query_service import QueryService
 from iatoolkit.services.sql_service import SqlService
 from iatoolkit.services.document_service import DocumentService
@@ -28,9 +26,7 @@ __all__ = [
     'current_iatoolkit',
     'register_company',
     'BaseCompany',
-    'DatabaseManager',
     'QueryService',
-    'ConfigurationService',
     'SqlService',
     'ExcelService',
     'DocumentService',

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/iatoolkit.py

@@ -19,7 +19,7 @@ from werkzeug.middleware.proxy_fix import ProxyFix
 from injector import Binder, Injector, singleton
 from importlib.metadata import version as _pkg_version, PackageNotFoundError
 
-IATOOLKIT_VERSION = "0.68.0"
+IATOOLKIT_VERSION = "0.69.0"
 
 # global variable for the unique instance of IAToolkit
 _iatoolkit_instance: Optional['IAToolkit'] = None
@@ -360,7 +360,7 @@ class IAToolkit:
         # instantiate all the registered companies
         get_company_registry().instantiate_companies(self._injector)
 
-        # use the dispatcher to load the company config and prepare the execution
+        # use the dispatcher to load the company config.yaml file and prepare the execution
         dispatcher = self._injector.get(Dispatcher)
         dispatcher.load_company_configs()
 

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/repositories/database_manager.py

@@ -70,6 +70,11 @@ class DatabaseManager:
     def remove_session(self):
         self.scoped_session.remove()
 
+    def get_all_table_names(self) -> list[str]:
+        # Returns a list of all table names in the database
+        inspector = inspect(self._engine)
+        return inspector.get_table_names()
+
     def get_table_schema(self,
                          table_name: str,
                          schema_name: str | None = None,

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/services/branding_service.py

@@ -75,7 +75,7 @@ class BrandingService:
         fusionando los valores por defecto con los personalizados.
         """
         final_branding_values = self._default_branding.copy()
-        branding_data = self.config_service.get_company_content(company_short_name, 'branding')
+        branding_data = self.config_service.get_configuration(company_short_name, 'branding')
         final_branding_values.update(branding_data)
 
 
@@ -140,7 +140,7 @@ class BrandingService:
         """
 
         # get the company name from configuration for the branding render
-        company_name = self.config_service.get_company_content(company_short_name, 'name')
+        company_name = self.config_service.get_configuration(company_short_name, 'name')
 
         return {
             "name": company_name,

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/services/company_context_service.py

@@ -79,23 +79,22 @@ class CompanyContextService:
         return static_context
 
     def _get_sql_schema_context(self, company_short_name: str) -> str:
-        # generate schema from the live DB connection.
-        # get the configuration for 'data_sources' from the ConfigurationService
-        data_sources_config = self.config_service.get_company_content(company_short_name, 'data_sources')
+        """
+        Generates the SQL schema context by inspecting live database connections
+        based on the flexible company.yaml configuration.
+        It supports including all tables and providing specific overrides for a subset of them.
+        """
+        data_sources_config = self.config_service.get_configuration(company_short_name, 'data_sources')
         if not data_sources_config or not data_sources_config.get('sql'):
-            return ''       # No SQL data sources configured for this company
+            return ''
 
         sql_context = ''
-        sql_sources = data_sources_config.get('sql', [])
-
-        # iterate over all SQL sources defined in the YAML configuration
-        for source in sql_sources:
+        for source in data_sources_config.get('sql', []):
             db_name = source.get('database')
             if not db_name:
                 continue
 
             try:
-                # get a handle to the DB manager
                 db_manager = self.sql_service.get_database_manager(db_name)
             except IAToolkitException as e:
                 logging.warning(f"Could not get DB manager for '{db_name}': {e}")
@@ -104,22 +103,43 @@ class CompanyContextService:
             db_description = source.get('description', '')
             sql_context += f"{db_description}\n" if db_description else ""
 
-            # iterate over all tables defined in the SQL source
-            for table_info in source.get('tables', []):
+            # 1. get the list of tables to process.
+            tables_to_process = []
+            if source.get('include_all_tables', False):
+                all_tables = db_manager.get_all_table_names()
+                tables_to_exclude = set(source.get('exclude_tables', []))
+                tables_to_process = [t for t in all_tables if t not in tables_to_exclude]
+            elif 'tables' in source:
+                # if not include_all_tables, use the list of tables explicitly specified in the map.
+                tables_to_process = list(source['tables'].keys())
+
+            # 2. get the global list of columns to exclude.
+            global_exclude_columns = source.get('exclude_columns', [])
+
+            # 3. get the overrides for specific tables.
+            table_overrides = source.get('tables', {})
+
+            # 3. iterate over the tables.
+            for table_name in tables_to_process:
                 try:
-                    table_name = table_info['table_name']
+                    # 4. get the table specific configuration.
+                    table_config = table_overrides.get(table_name, {})
+
+                    # 5. define the schema name, using the override if it exists.
+                    schema_name = table_config.get('schema_name', table_name)
 
-                    # if schema_name is not defined, use table_name as default value.
-                    schema_name = table_info.get('schema_name', table_name)
+                    # 6. define the list of columns to exclude, (local vs. global).
+                    local_exclude_columns = table_config.get('exclude_columns')
+                    final_exclude_columns = local_exclude_columns if local_exclude_columns is not None else global_exclude_columns
 
-                    # get the schema definition for the table, using ispector
+                    # 7. get the table schema definition.
                     table_definition = db_manager.get_table_schema(
                         table_name=table_name,
                         schema_name=schema_name,
-                        exclude_columns=[]
+                        exclude_columns=final_exclude_columns
                     )
                     sql_context += table_definition
                 except (KeyError, RuntimeError) as e:
-                    logging.warning(f"Could not generate schema for table '{table_info.get('table_name')}': {e}")
+                    logging.warning(f"Could not generate schema for table '{table_name}': {e}")
 
         return sql_context

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/services/configuration_service.py

@@ -20,7 +20,7 @@ class ConfigurationService:
         self.utility = utility
         self._loaded_configs = {}   # cache for store loaded configurations
 
-    def get_company_content(self, company_short_name: str, content_key: str):
+    def get_configuration(self, company_short_name: str, content_key: str):
         """
         Public method to provide a specific section of a company's configuration.
         It uses a cache to avoid reading files from disk on every call.
@@ -28,7 +28,7 @@ class ConfigurationService:
         self._ensure_config_loaded(company_short_name)
         return self._loaded_configs[company_short_name].get(content_key)
 
-    def register_company(self, company_short_name: str, company_instance):
+    def load_configuration(self, company_short_name: str, company_instance):
         """
         Main entry point for configuring a company instance.
         This method is invoked by the dispatcher for each registered company.

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/services/dispatcher_service.py

@@ -68,7 +68,7 @@ class Dispatcher:
         for company_name, company_instance in self.company_instances.items():
             try:
                 # read company configuration from company.yaml
-                self.config_service.register_company(company_name, company_instance)
+                self.config_service.load_configuration(company_name, company_instance)
 
                 # register the company databases
                 self._register_company_databases(company_name)
@@ -85,7 +85,7 @@ class Dispatcher:
         database with the central SqlService.
         """
         logging.info(f"  -> Registering databases for '{company_name}'...")
-        data_sources_config = self.config_service.get_company_content(company_name, 'data_sources')
+        data_sources_config = self.config_service.get_configuration(company_name, 'data_sources')
 
         if not data_sources_config or not data_sources_config.get('sql'):
             logging.info(f"  -> No SQL data sources to register for '{company_name}'.")

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/services/language_service.py

@@ -68,7 +68,7 @@ class LanguageService:
             # Priority 2: Company's default language
             company_short_name = self._get_company_short_name()
             if company_short_name:
-                locale = self.config_service.get_company_content(company_short_name, 'locale')
+                locale = self.config_service.get_configuration(company_short_name, 'locale')
                 if locale:
                     company_language = locale.split('_')[0]
                     g.lang = company_language

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/services/search_service.py

@@ -5,19 +5,22 @@
 
 from iatoolkit.repositories.vs_repo import VSRepo
 from iatoolkit.repositories.document_repo import DocumentRepo
+from iatoolkit.repositories.profile_repo import ProfileRepo
+from iatoolkit.repositories.models import Company
 from injector import inject
 
 
 class SearchService:
     @inject
     def __init__(self,
+                 profile_repo: ProfileRepo,
                  doc_repo: DocumentRepo,
                  vs_repo: VSRepo):
-        super().__init__()
+        self.profile_repo = profile_repo
         self.vs_repo = vs_repo
         self.doc_repo = doc_repo
 
-    def search(self, company_id:  int, query: str, metadata_filter: dict = None) -> str:
+    def search(self, company_short_name: str, query: str, metadata_filter: dict = None) -> str:
         """
         Performs a semantic search for a given query within a company's documents.
 
@@ -26,7 +29,7 @@ class SearchService:
         content of the retrieved documents, which can be used as context for an LLM.
 
         Args:
-            company_id: The ID of the company to search within.
+            company_short_name: The  company to search within.
             query: The text query to search for.
             metadata_filter: An optional dictionary to filter documents by their metadata.
 
@@ -34,7 +37,11 @@ class SearchService:
             A string containing the concatenated content of the found documents,
             formatted to be used as a context.
         """
-        document_list = self.vs_repo.query(company_id=company_id,
+        company = self.profile_repo.get_company_by_short_name(company_short_name)
+        if not company:
+            return f"error: company {company_short_name} not found"
+
+        document_list = self.vs_repo.query(company_id=company.id,
                                            query_text=query,
                                            metadata_filter=metadata_filter)
 

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/views/base_login_view.py

@@ -57,7 +57,7 @@ class BaseLoginView(MethodView):
         """
         # --- Get the company branding and onboarding_cards
         branding_data = self.branding_service.get_company_branding(company_short_name)
-        onboarding_cards = self.config_service.get_company_content(company_short_name, 'onboarding_cards')
+        onboarding_cards = self.config_service.get_configuration(company_short_name, 'onboarding_cards')
 
         # this service decides is the context needs to be rebuilt or not
         prep_result = self.query_service.prepare_context(

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/views/help_content_api_view.py

@@ -37,7 +37,7 @@ class HelpContentApiView(MethodView):
             user_identifier = auth_result.get('user_identifier')
 
             # 2. Call the config service with the unified identifier.
-            response = self.config_service.get_company_content(
+            response = self.config_service.get_configuration(
                 company_short_name=company_short_name,
                 content_key='help_content'      # specific key for this service
             )

{iatoolkit-0.68.0 → iatoolkit-0.69.0}/src/iatoolkit/views/login_view.py

@@ -129,7 +129,7 @@ class FinalizeContextView(MethodView):
 
             # 3. render the chat page.
             prompts = self.prompt_service.get_user_prompts(company_short_name)
-            onboarding_cards = self.config_service.get_company_content(company_short_name, 'onboarding_cards')
+            onboarding_cards = self.config_service.get_configuration(company_short_name, 'onboarding_cards')
 
             # Get the entire 'js_messages' block in the correct language.
             js_translations = self.i18n_service.get_translation_block('js_messages')

{iatoolkit-0.68.0 → iatoolkit-0.69.0/src/iatoolkit.egg-info}/PKG-INFO

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