iatoolkit 2.56.0__tar.gz → 2.58.0__tar.gz

{iatoolkit-2.56.0/src/iatoolkit.egg-info → iatoolkit-2.58.0}/PKG-INFO

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

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/__init__.py

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

iatoolkit-2.58.0/src/iatoolkit/base_company.py

@@ -0,0 +1,48 @@
+# Copyright (c) 2024 Fernando Libedinsky
+# Product: IAToolkit
+#
+# IAToolkit is open source software.
+
+# companies/base_company.py
+from abc import ABC, abstractmethod
+from pathlib import Path
+from typing import Optional
+
+from flask import Blueprint
+
+class BaseCompany(ABC):
+
+    @abstractmethod
+    # execute the specific action configured in the intent table
+    def handle_request(self, tag: str, params: dict) -> dict:
+        raise NotImplementedError("La subclase debe implementar el método handle_request()")
+
+    def register_cli_commands(self, app):
+        # Optional extension point. Community/Enterprise can override as needed.
+        return None
+
+    def get_blueprint(self) -> Optional[Blueprint]:
+        """
+        Optional extension point: the web routes, templates and static files this
+        company owns. The core registers the blueprint at boot for every company
+        that is loaded, so the host application never imports a company's views.
+
+        The blueprint must be named after the company short name: that name is
+        the namespace of its endpoints (``url_for('<company>.<endpoint>')``).
+        URLs are not prefixed by the core; the company chooses them.
+        """
+        return None
+
+    @classmethod
+    def get_resource_root(cls) -> Optional[Path]:
+        """
+        Directory that holds this company's files (config, prompts, schemas,
+        context, templates). ``None`` keeps the classic layout,
+        ``companies/<company_short_name>`` under the working directory. A company
+        installed as a package returns its own directory, usually
+        ``Path(__file__).resolve().parent``.
+        """
+        return None
+
+    def unsupported_operation(self, tag):
+        raise NotImplementedError(f"La operación '{tag}' no está soportada por esta empresa.")

iatoolkit-2.58.0/src/iatoolkit/common/company_paths.py

@@ -0,0 +1,25 @@
+# Copyright (c) 2024 Fernando Libedinsky
+# Product: IAToolkit
+#
+# IAToolkit is open source software.
+
+from pathlib import Path
+
+
+def get_company_root(company_short_name: str) -> Path:
+    """
+    Directory that holds a company's files: config, prompts, schemas, context,
+    templates.
+
+    A company module installed as a package declares it through
+    ``BaseCompany.get_resource_root()``. Every other company keeps the classic
+    layout, ``companies/<company_short_name>`` relative to the working directory,
+    which is why that is the fallback and not an error.
+    """
+    from iatoolkit.company_registry import get_registered_companies
+
+    company_class = get_registered_companies().get((company_short_name or "").lower())
+    root = company_class.get_resource_root() if company_class else None
+    if root:
+        return Path(root)
+    return Path("companies") / company_short_name

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/common/routes.py

@@ -5,6 +5,7 @@
 
 from io import BytesIO
 import mimetypes
+import os
 from flask import render_template, redirect, url_for, current_app, abort, send_file
 from flask import jsonify
 from iatoolkit.common.exceptions import IAToolkitException
@@ -59,6 +60,18 @@ def register_views(app):
     # must stay reachable even if the company registry or DB is degraded.
     app.add_url_rule('/', endpoint='liveness', view_func=lambda: ("ok", 200))
 
+    # Browsers and MCP clients (Claude shows it as the connector icon) ask the
+    # host for /favicon.ico regardless of the page.
+    app.add_url_rule(
+        '/favicon.ico',
+        endpoint='favicon',
+        view_func=lambda: send_file(
+            os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'static', 'images', 'favicon.ico'),
+            mimetype='image/vnd.microsoft.icon',
+            max_age=86400,
+        ),
+    )
+
     # assign root '/' to our new redirect logic
     app.add_url_rule('/home', view_func=RootRedirectView.as_view('root_redirect'))
 

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/common/util.py

@@ -98,7 +98,8 @@ class Utility:
 
     def get_company_template(self, company_short_name: str, template_name: str) -> str:
         # 1. get the path to the company specific template
-        template_path = os.path.join(os.getcwd(), f'companies/{company_short_name}/templates/{template_name}')
+        from iatoolkit.common.company_paths import get_company_root
+        template_path = os.path.join(os.getcwd(), str(get_company_root(company_short_name) / 'templates' / template_name))
         if not os.path.exists(template_path):
             return None
 

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/core.py

@@ -114,6 +114,9 @@ class IAToolkit:
         # Step 7: load company configuration file
         self._hydrate_company_configuration()
 
+        # Step 7b: web routes, templates and static files owned by each company
+        self._register_company_blueprints()
+
         # Step 8: Finalize setup within the application context
         self._setup_redis_sessions()
 
@@ -560,6 +563,31 @@ class IAToolkit:
                 logging.error(f"❌ Failed to register configuration for '{company_short_name}': {e}")
                 raise e
 
+    def _register_company_blueprints(self):
+        from iatoolkit.company_registry import get_company_registry
+
+        registered = []
+        for company_short_name, company_instance in get_company_registry().get_all_company_instances().items():
+            blueprint = company_instance.get_blueprint()
+            if blueprint is None:
+                continue
+            # The blueprint name is the namespace of the company's endpoints, so
+            # it must be the company itself: anything else could collide with
+            # another tenant or with the platform.
+            if blueprint.name != company_short_name:
+                raise RuntimeError(
+                    f"Company '{company_short_name}' returned a blueprint named "
+                    f"'{blueprint.name}'; it must be named '{company_short_name}'."
+                )
+            self.app.register_blueprint(blueprint)
+            registered.append(company_short_name)
+
+        if registered:
+            # FlaskInjector wraps the views that exist when it runs, and the first
+            # pass ran before any company was loaded.
+            FlaskInjector(app=self.app, injector=self._injector)
+            logging.info(f"✅ Company blueprints registered: {', '.join(registered)}")
+
     def _setup_cli_commands(self):
         from iatoolkit.cli_commands import register_core_commands
         from iatoolkit.company_registry import get_company_registry

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/infra/llm_providers/gemini_adapter.py

@@ -700,23 +700,34 @@ class GeminiAdapter:
         return {}
 
     def _extract_usage_metadata(self, gemini_response) -> Usage:
-        """Extraer información de uso de tokens de manera segura"""
+        """Extraer información de uso de tokens de manera segura.
+
+        Gemini reports the tokens it bills in four counters. `candidates_token_count`
+        excludes the model's reasoning (`thoughts_token_count`), which Google bills as
+        output, and `prompt_token_count` excludes the results of its built-in tools
+        (`tool_use_prompt_token_count`), billed as input. Reading only the first two
+        priced every thinking model's reasoning at zero.
+        """
         input_tokens = 0
         output_tokens = 0
         total_tokens = 0
 
+        def _count(metadata, name: str) -> int:
+            value = getattr(metadata, name, None)
+            return value if isinstance(value, int) and value > 0 else 0
+
         try:
-            # Verificar si existe usage_metadata
-            if hasattr(gemini_response, 'usage_metadata') and gemini_response.usage_metadata:
-                usage_metadata = gemini_response.usage_metadata
-
-                # Acceder a los atributos directamente, no con .get()
-                if hasattr(usage_metadata, 'prompt_token_count'):
-                    input_tokens = usage_metadata.prompt_token_count
-                if hasattr(usage_metadata, 'candidates_token_count'):
-                    output_tokens = usage_metadata.candidates_token_count
-                if hasattr(usage_metadata, 'total_token_count'):
-                    total_tokens = usage_metadata.total_token_count
+            usage_metadata = getattr(gemini_response, 'usage_metadata', None)
+            if usage_metadata:
+                input_tokens = (
+                    _count(usage_metadata, 'prompt_token_count')
+                    + _count(usage_metadata, 'tool_use_prompt_token_count')
+                )
+                output_tokens = (
+                    _count(usage_metadata, 'candidates_token_count')
+                    + _count(usage_metadata, 'thoughts_token_count')
+                )
+                total_tokens = _count(usage_metadata, 'total_token_count')
 
         except Exception as e:
             logging.warning(f"No se pudo extraer usage_metadata de Gemini: {e}")

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/repositories/filesystem_asset_repository.py

@@ -1,10 +1,11 @@
 from iatoolkit.common.interfaces.asset_storage import AssetRepository, AssetType
+from iatoolkit.common.company_paths import get_company_root
 from pathlib import Path
 
 
 class FileSystemAssetRepository(AssetRepository):
     def _get_path(self, company_short_name: str, asset_type: AssetType, filename: str = "") -> Path:
-        return Path("companies") / company_short_name / asset_type.value / filename
+        return get_company_root(company_short_name) / asset_type.value / filename
 
     def exists(self, company_short_name: str, asset_type: AssetType, filename: str) -> bool:
         return self._get_path(company_short_name, asset_type, filename).is_file()

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/repositories/llm_query_repo.py

@@ -14,6 +14,7 @@ from iatoolkit.repositories.models import (
 from injector import inject
 from iatoolkit.repositories.database_manager import DatabaseManager
 from sqlalchemy import or_, and_
+from iatoolkit.repositories.models import CONTEXT_INIT_REQUEST_SOURCE
 from typing import List
 
 
@@ -34,10 +35,17 @@ class LLMQueryRepo:
         self.session.commit()
         return query
 
+    @staticmethod
+    def not_context_init():
+        """Filter for rows that are a conversation turn, not a context initialization."""
+        request_source = LLMQuery.stats["request_source"].as_string()
+        return or_(request_source.is_(None), request_source != CONTEXT_INIT_REQUEST_SOURCE)
+
     # 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,
+            self.not_context_init(),
         ).filter_by(company_id=company.id).order_by(LLMQuery.created_at.desc()).limit(limit).all()
 
 

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/repositories/models.py

@@ -593,6 +593,12 @@ class MemoryPageSource(Base):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
 
 
+#: request_source of the iat_queries row that records a context initialization:
+#: the company context sent once to start a server-side conversation. Its tokens
+#: are billed, but it is not a question, so conversation readers skip it.
+CONTEXT_INIT_REQUEST_SOURCE = "context_init"
+
+
 class LLMQuery(Base):
     """Logs a query made to the LLM, including input, output, and metadata."""
     __tablename__ = 'iat_queries'
@@ -622,6 +628,10 @@ class LLMQuery(Base):
 
     __table_args__ = (
         Index('ix_iat_queries_company_prompt_created', 'company_id', 'prompt_name', 'created_at'),
+        # Executions that did not run as a task (synchronous agent calls). They are a
+        # tiny fraction of the table, which the Agents monitor would otherwise scan whole.
+        Index('ix_iat_queries_company_created_untasked', company_id, created_at.desc(),
+              postgresql_where=task_id.is_(None)),
     )
 
     company = relationship("Company", back_populates="llm_queries")

{iatoolkit-2.56.0 → iatoolkit-2.58.0}/src/iatoolkit/services/history_manager_service.py

@@ -60,7 +60,8 @@ class HistoryManagerService:
             response_id = self.llm_client.set_company_context(
                 company=company,
                 company_base_context=prepared_context,
-                model=model
+                model=model,
+                user_identifier=user_identifier,
             )
             self.session_context.save_last_response_id(company_short_name, user_identifier, response_id, model=model)
             self.session_context.save_initial_response_id(company_short_name, user_identifier, response_id, model=model)