iatoolkit 0.71.4__py3-none-any.whl → 1.4.2__py3-none-any.whl

iatoolkit/repositories/document_repo.py

@@ -26,6 +26,13 @@ class DocumentRepo:
 
         return self.session.query(Document).filter_by(company_id=company_id, filename=filename).first()
 
+    def get_by_hash(self, company_id: int, file_hash: str) -> Document:
+        """Find a document by its content hash within a company."""
+        if not company_id or not file_hash:
+            return None
+
+        return self.session.query(Document).filter_by(company_id=company_id, hash=file_hash).first()
+
     def get_by_id(self, document_id: int) -> Document:
         if not document_id:
             return None

iatoolkit/repositories/filesystem_asset_repository.py

@@ -0,0 +1,36 @@
+from iatoolkit.common.interfaces.asset_storage import AssetRepository, AssetType
+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
+
+    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()
+
+    def read_text(self, company_short_name: str, asset_type: AssetType, filename: str) -> str:
+        path = self._get_path(company_short_name, asset_type, filename)
+        if not path.is_file():
+            raise FileNotFoundError(f"File not found: {path}")
+        return path.read_text(encoding="utf-8")
+
+    def list_files(self, company_short_name: str, asset_type: AssetType, extension: str = None) -> list[str]:
+        directory = self._get_path(company_short_name, asset_type)
+        if not directory.exists():
+            return []
+        files = [f.name for f in directory.iterdir() if f.is_file()]
+        if extension:
+            files = [f for f in files if f.endswith(extension)]
+        return files
+
+    def write_text(self, company_short_name: str, asset_type: AssetType, filename: str, content: str) -> None:
+        path = self._get_path(company_short_name, asset_type, filename)
+        # Ensure the directory exists (e.g. creating a new company structure)
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_text(content, encoding="utf-8")
+
+    def delete(self, company_short_name: str, asset_type: AssetType, filename: str) -> None:
+        path = self._get_path(company_short_name, asset_type, filename)
+        if path.exists():
+            path.unlink()

iatoolkit/repositories/llm_query_repo.py

@@ -3,7 +3,7 @@
 #
 # IAToolkit is open source software.
 
-from iatoolkit.repositories.models import LLMQuery, Function, Company, Prompt, PromptCategory
+from iatoolkit.repositories.models import LLMQuery, Tool, Company, Prompt, PromptCategory
 from injector import inject
 from iatoolkit.repositories.database_manager import DatabaseManager
 from sqlalchemy import or_
@@ -13,38 +13,52 @@ class LLMQueryRepo:
     def __init__(self, db_manager: DatabaseManager):
         self.session = db_manager.get_session()
 
+    def commit(self):
+        self.session.commit()
+
+    def rollback(self):
+        self.session.rollback()
+
     def add_query(self, query: LLMQuery):
         self.session.add(query)
         self.session.commit()
         return query
 
 
-    def get_company_functions(self, company: Company) -> list[Function]:
+    def get_company_tools(self, company: Company) -> list[Tool]:
         return (
-            self.session.query(Function)
+            self.session.query(Tool)
             .filter(
-                Function.is_active.is_(True),
+                Tool.is_active.is_(True),
                 or_(
-                    Function.company_id == company.id,
-                    Function.system_function.is_(True)
+                    Tool.company_id == company.id,
+                    Tool.system_function.is_(True)
                 )
             )
+            # Ordenamos descendente: True (System) va primero, False (Company) va después
+            .order_by(Tool.system_function.desc())
             .all()
         )
 
-    def create_or_update_function(self, new_function: Function):
-        function = self.session.query(Function).filter_by(company_id=new_function.company_id,
-                                                 name=new_function.name).first()
-        if function:
-            function.description = new_function.description
-            function.parameters = new_function.parameters
-            function.system_function = new_function.system_function
+    def delete_system_tools(self):
+        self.session.query(Tool).filter_by(system_function=True).delete(synchronize_session=False)
+
+    def create_or_update_tool(self, new_tool: Tool):
+        tool = self.session.query(Tool).filter_by(company_id=new_tool.company_id,
+                                                  name=new_tool.name).first()
+        if tool:
+            tool.description = new_tool.description
+            tool.parameters = new_tool.parameters
+            tool.system_function = new_tool.system_function
         else:
-            self.session.add(new_function)
-            function = new_function
+            self.session.add(new_tool)
+            tool = new_tool
 
-        self.session.commit()
-        return function
+        self.session.flush()
+        return tool
+
+    def delete_tool(self, tool: Tool):
+        self.session.query(Tool).filter_by(id=tool.id).delete(synchronize_session=False)
 
     def create_or_update_prompt(self, new_prompt: Prompt):
         prompt = self.session.query(Prompt).filter_by(company_id=new_prompt.company_id,
@@ -53,7 +67,6 @@ class LLMQueryRepo:
             prompt.category_id = new_prompt.category_id
             prompt.description = new_prompt.description
             prompt.order = new_prompt.order
-            prompt.active = new_prompt.active
             prompt.is_system_prompt = new_prompt.is_system_prompt
             prompt.filename = new_prompt.filename
             prompt.custom_fields = new_prompt.custom_fields
@@ -61,7 +74,7 @@ class LLMQueryRepo:
             self.session.add(new_prompt)
             prompt = new_prompt
 
-        self.session.commit()
+        self.session.flush()
         return prompt
 
     def create_or_update_prompt_category(self, new_category: PromptCategory):
@@ -73,7 +86,7 @@ class LLMQueryRepo:
             self.session.add(new_category)
             category = new_category
 
-        self.session.commit()
+        self.session.flush()
         return category
 
     def get_history(self, company: Company, user_identifier: str) -> list[LLMQuery]:
@@ -84,8 +97,9 @@ class LLMQueryRepo:
     def get_prompts(self, company: Company) -> list[Prompt]:
         return self.session.query(Prompt).filter_by(company_id=company.id, is_system_prompt=False).all()
 
+    def get_prompt_by_name(self, company: Company, prompt_name: str):
+        return self.session.query(Prompt).filter_by(company_id=company.id, name=prompt_name).first()
+
     def get_system_prompts(self) -> list[Prompt]:
         return self.session.query(Prompt).filter_by(is_system_prompt=True, active=True).order_by(Prompt.order).all()
 
-    def get_prompt_by_name(self, company: Company, prompt_name: str):
-        return self.session.query(Prompt).filter_by(company_id=company.id, name=prompt_name).first()

iatoolkit/repositories/models.py

@@ -5,12 +5,11 @@
 
 from sqlalchemy import Column, Integer, BigInteger, String, DateTime, Enum, Text, JSON, Boolean, ForeignKey, Table
 from sqlalchemy.orm import DeclarativeBase
-from sqlalchemy.orm import relationship, class_mapper, declarative_base
+from sqlalchemy.orm import relationship, class_mapper
 from sqlalchemy.sql import func
+from sqlalchemy import UniqueConstraint
 from datetime import datetime
 from pgvector.sqlalchemy import Vector
-from enum import Enum as PyEnum
-import secrets
 import enum
 
 
@@ -27,8 +26,7 @@ user_company = Table('iat_user_company',
                      Column('company_id', Integer,
                             ForeignKey('iat_companies.id',ondelete='CASCADE'),
                                 primary_key=True),
-                     Column('is_active', Boolean, default=True),
-                     Column('role', String(50), default='user'),  # Para manejar roles por empresa
+                     Column('role', String, nullable=True, default='user'),
                      Column('created_at', DateTime, default=datetime.now)
                      )
 
@@ -36,9 +34,10 @@ class ApiKey(Base):
     """Represents an API key for a company to authenticate against the system."""
     __tablename__ = 'iat_api_keys'
 
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     company_id = Column(Integer, ForeignKey('iat_companies.id', ondelete='CASCADE'), nullable=False)
-    key = Column(String(128), unique=True, nullable=False, index=True) # La API Key en sí
+    key_name = Column(String, nullable=False)
+    key = Column(String, unique=True, nullable=False, index=True) # La API Key en sí
     is_active = Column(Boolean, default=True, nullable=False)
     created_at = Column(DateTime, default=datetime.now)
     last_used_at = Column(DateTime, nullable=True) # Opcional: para rastrear uso
@@ -50,13 +49,10 @@ class Company(Base):
     """Represents a company or tenant in the multi-tenant system."""
     __tablename__ = 'iat_companies'
 
-    id = Column(Integer, primary_key=True)
-    short_name = Column(String(20), nullable=False, unique=True, index=True)
-    name = Column(String(256), nullable=False)
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    short_name = Column(String, nullable=False, unique=True, index=True)
+    name = Column(String, nullable=False)
 
-    # encrypted api-key
-    openai_api_key = Column(String, nullable=True)
-    gemini_api_key = Column(String, nullable=True)
     parameters = Column(JSON, nullable=True)
     created_at = Column(DateTime, default=datetime.now)
 
@@ -64,7 +60,7 @@ class Company(Base):
                              back_populates="company",
                              cascade="all, delete-orphan",
                              lazy='dynamic')
-    functions = relationship("Function",
+    tools = relationship("Tool",
                            back_populates="company",
                            cascade="all, delete-orphan")
     vsdocs = relationship("VSDoc",
@@ -80,13 +76,18 @@ class Company(Base):
                             back_populates="company",
                             cascade="all, delete-orphan")
 
-    tasks = relationship("Task", back_populates="company")
     feedbacks = relationship("UserFeedback",
                                back_populates="company",
                                cascade="all, delete-orphan")
     prompts = relationship("Prompt",
                              back_populates="company",
                              cascade="all, delete-orphan")
+    collection_types = relationship(
+        "CollectionType",
+        back_populates="company",
+        cascade="all, delete-orphan"
+    )
+
 
     def to_dict(self):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
@@ -96,14 +97,14 @@ class User(Base):
     """Represents an IAToolkit user who can be associated with multiple companies."""
     __tablename__ = 'iat_users'
 
-    id = Column(Integer, primary_key=True)
-    email = Column(String(80), unique=True, nullable=False)
-    first_name = Column(String(50), nullable=False)
-    last_name = Column(String(50), nullable=False)
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    email = Column(String, unique=True, nullable=False)
+    first_name = Column(String, nullable=False)
+    last_name = Column(String, nullable=False)
     created_at = Column(DateTime, default=datetime.now)
     password = Column(String, nullable=False)
     verified = Column(Boolean, nullable=False, default=False)
-    preferred_language = Column(String(5), nullable=True)
+    preferred_language = Column(String, nullable=True)
     verification_url = Column(String, nullable=True)
     temp_code = Column(String, nullable=True)
 
@@ -127,27 +128,50 @@ class User(Base):
             'companies': [company.to_dict() for company in self.companies]
         }
 
-class Function(Base):
+class Tool(Base):
     """Represents a custom or system function that the LLM can call (tool)."""
-    __tablename__ = 'iat_functions'
+    __tablename__ = 'iat_tools'
 
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     company_id = Column(Integer,
                         ForeignKey('iat_companies.id',ondelete='CASCADE'),
                         nullable=True)
-    name = Column(String(255), nullable=False)
+    name = Column(String, nullable=False)
     system_function = Column(Boolean, default=False)
     description = Column(Text, nullable=False)
     parameters = Column(JSON, nullable=False)
     is_active = Column(Boolean, default=True)
     created_at = Column(DateTime, default=datetime.now)
 
-    company = relationship('Company', back_populates='functions')
+    company = relationship('Company', back_populates='tools')
 
     def to_dict(self):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
 
 
+class DocumentStatus(str, enum.Enum):
+    PENDING = "pending"
+    PROCESSING = "processing"
+    ACTIVE = "active"
+    FAILED = "failed"
+
+
+class CollectionType(Base):
+    """Defines the available document collections/categories for a company."""
+    __tablename__ = 'iat_collection_types'
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    company_id = Column(Integer, ForeignKey('iat_companies.id', ondelete='CASCADE'), nullable=False)
+    name = Column(String, nullable=False)  # e.g., "Contracts", "Manuals"
+
+    # description - optional for the LLM to understand what's inside'
+    description = Column(Text, nullable=True)
+
+    __table_args__ = (UniqueConstraint('company_id', 'name', name='uix_company_collection_name'),)
+
+    company = relationship("Company", back_populates="collection_types")
+    documents = relationship("Document", back_populates="collection_type")
+
 class Document(Base):
     """Represents a file or document uploaded by a company for context."""
     __tablename__ = 'iat_documents'
@@ -155,27 +179,41 @@ class Document(Base):
     id = Column(Integer, primary_key=True, autoincrement=True)
     company_id = Column(Integer, ForeignKey('iat_companies.id',
                     ondelete='CASCADE'), nullable=False)
-    filename = Column(String(256), nullable=False, index=True)
+    collection_type_id = Column(Integer, ForeignKey('iat_collection_types.id', ondelete='SET NULL'), nullable=True)
+
+    user_identifier = Column(String, nullable=True)
+    filename = Column(String, nullable=False, index=True)
+    status = Column(Enum(DocumentStatus), default=DocumentStatus.PENDING, nullable=False)
     meta = Column(JSON, nullable=True)
     created_at = Column(DateTime, default=datetime.now)
     content = Column(Text, nullable=False)
     content_b64 = Column(Text, nullable=False)
 
+    # For feedback if OCR or embedding fails
+    error_message = Column(Text, nullable=True)
+
+    # Hash column for deduplication (SHA-256 hex digest)
+    hash = Column(String(64), index=True, nullable=True)
+
     company = relationship("Company", back_populates="documents")
+    collection_type = relationship("CollectionType", back_populates="documents")
 
     def to_dict(self):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
 
+    @property
+    def description(self):
+        collection_type = self.collection_type.name if self.collection_type else None
+        return f"Document ID {self.id}: {self.filename} ({collection_type})"
 
 class LLMQuery(Base):
     """Logs a query made to the LLM, including input, output, and metadata."""
     __tablename__ = 'iat_queries'
 
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     company_id = Column(Integer, ForeignKey('iat_companies.id',
                             ondelete='CASCADE'), nullable=False)
-    user_identifier = Column(String(128), nullable=False)
-    task_id = Column(Integer, default=0, nullable=True)
+    user_identifier = Column(String, nullable=False)
     query = Column(Text, nullable=False)
     output = Column(Text, nullable=False)
     response = Column(JSON, nullable=True, default={})
@@ -186,7 +224,6 @@ class LLMQuery(Base):
     created_at = Column(DateTime, default=datetime.now)
 
     company = relationship("Company", back_populates="llm_queries")
-    tasks = relationship("Task", back_populates="llm_query")
 
     def to_dict(self):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
@@ -196,7 +233,7 @@ class VSDoc(Base):
     """Stores a text chunk and its corresponding vector embedding for similarity search."""
     __tablename__ = "iat_vsdocs"
 
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     company_id = Column(Integer, ForeignKey('iat_companies.id',
                     ondelete='CASCADE'), nullable=False)
     document_id = Column(Integer, ForeignKey('iat_documents.id',
@@ -205,68 +242,22 @@ class VSDoc(Base):
 
     # the size of this vector should be set depending on the embedding model used
     # for OpenAI is 1536, and for huggingface is 384
-    embedding = Column(Vector(1536), nullable=False)
+    embedding = Column(Vector(384), nullable=False)
 
     company = relationship("Company", back_populates="vsdocs")
 
     def to_dict(self):
         return {column.key: getattr(self, column.key) for column in class_mapper(self.__class__).columns}
 
-class TaskStatus(PyEnum):
-    """Enumeration for the possible statuses of a Task."""
-    pendiente = "pendiente"  # task created and waiting to be executed.
-    ejecutado = "ejecutado"  # the IA algorithm has been executed.
-    aprobada = "aprobada"  # validated and approved by human.
-    rechazada = "rechazada"  # validated and rejected by human.
-    fallida = "fallida"  # error executing the IA algorithm.
-
-class TaskType(Base):
-    """Defines a type of task that can be executed, including its prompt template."""
-    __tablename__ = 'iat_task_types'
-
-    id = Column(Integer, primary_key=True)
-    name = Column(String(100), unique=True, nullable=False)
-    prompt_template = Column(String(100), nullable=True)  # Plantilla de prompt por defecto.
-    template_args = Column(JSON, nullable=True)  # Argumentos/prefijos de configuración para el template.
-
-class Task(Base):
-    """Represents an asynchronous task to be executed by the system, often involving an LLM."""
-    __tablename__ = 'iat_tasks'
-
-    id = Column(Integer, primary_key=True)
-    company_id = Column(Integer, ForeignKey("iat_companies.id"))
-
-    user_id = Column(Integer, nullable=True, default=0)
-    task_type_id = Column(Integer, ForeignKey('iat_task_types.id'), nullable=False)
-    status = Column(Enum(TaskStatus, name="task_status_enum"),
-                    default=TaskStatus.pendiente, nullable=False)
-    client_data = Column(JSON, nullable=True, default={})
-    company_task_id = Column(Integer, nullable=True, default=0)
-    execute_at = Column(DateTime, default=datetime.now, nullable=True)
-    llm_query_id = Column(Integer, ForeignKey('iat_queries.id'), nullable=True)
-    callback_url = Column(String(512), default=None, nullable=True)
-    files = Column(JSON, default=[], nullable=True)
-
-    review_user = Column(String(128), nullable=True, default='')
-    review_date = Column(DateTime, nullable=True)
-    comment = Column(Text, nullable=True)
-    approved = Column(Boolean, nullable=False, default=False)
-
-    created_at = Column(DateTime, default=datetime.now)
-    updated_at = Column(DateTime, default=datetime.now)
-
-    task_type = relationship("TaskType")
-    llm_query = relationship("LLMQuery", back_populates="tasks", uselist=False)
-    company = relationship("Company", back_populates="tasks")
 
 class UserFeedback(Base):
     """Stores feedback and ratings submitted by users for specific interactions."""
     __tablename__ = 'iat_feedback'
 
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     company_id = Column(Integer, ForeignKey('iat_companies.id',
                                             ondelete='CASCADE'), nullable=False)
-    user_identifier = Column(String(128), default='', nullable=True)
+    user_identifier = Column(String, default='', nullable=True)
     message = Column(Text, nullable=False)
     rating = Column(Integer, nullable=False)
     created_at = Column(DateTime, default=datetime.now)
@@ -277,7 +268,7 @@ class UserFeedback(Base):
 class PromptCategory(Base):
     """Represents a category to group and organize prompts."""
     __tablename__ = 'iat_prompt_categories'
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     name = Column(String, nullable=False)
     order = Column(Integer, nullable=False, default=0)
     company_id = Column(Integer, ForeignKey('iat_companies.id'), nullable=False)
@@ -292,15 +283,15 @@ class Prompt(Base):
     """Represents a system or user-defined prompt template for the LLM."""
     __tablename__ = 'iat_prompt'
 
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     company_id = Column(Integer, ForeignKey('iat_companies.id',
                                             ondelete='CASCADE'), nullable=True)
-    name = Column(String(64), nullable=False)
-    description = Column(String(256), nullable=False)
-    filename = Column(String(256), nullable=False)
+    name = Column(String, nullable=False)
+    description = Column(String, nullable=False)
+    filename = Column(String, nullable=False)
     active = Column(Boolean, default=True)
     is_system_prompt = Column(Boolean, default=False)
-    order = Column(Integer, nullable=False, default=0)  # Nuevo campo para el orden
+    order = Column(Integer, nullable=True, default=0)
     category_id = Column(Integer, ForeignKey('iat_prompt_categories.id'), nullable=True)
     custom_fields = Column(JSON, nullable=False, default=[])
 
@@ -313,21 +304,21 @@ class AccessLog(Base):
     # Modelo ORM para registrar cada intento de acceso a la plataforma.
     __tablename__ = 'iat_access_log'
 
-    id = Column(BigInteger, primary_key=True)
+    id = Column(BigInteger, primary_key=True, autoincrement=True)
 
     timestamp = Column(DateTime(timezone=True), server_default=func.now(), nullable=False, index=True)
-    company_short_name = Column(String(100), nullable=False, index=True)
-    user_identifier = Column(String(255), index=True)
+    company_short_name = Column(String, nullable=False, index=True)
+    user_identifier = Column(String, index=True)
 
     # Cómo y el Resultado
-    auth_type = Column(String(20), nullable=False) # 'local', 'external_api', 'redeem_token', etc.
-    outcome = Column(String(10), nullable=False)   # 'success' o 'failure'
-    reason_code = Column(String(50))               # Causa de fallo, ej: 'INVALID_CREDENTIALS'
+    auth_type = Column(String, nullable=False) # 'local', 'external_api', 'redeem_token', etc.
+    outcome = Column(String, nullable=False)   # 'success' o 'failure'
+    reason_code = Column(String)               # Causa de fallo, ej: 'INVALID_CREDENTIALS'
 
     # Contexto de la Petición
-    source_ip = Column(String(45), nullable=False)
-    user_agent_hash = Column(String(16))           # Hash corto del User-Agent
-    request_path = Column(String(255), nullable=False)
+    source_ip = Column(String, nullable=False)
+    user_agent_hash = Column(String)           # Hash corto del User-Agent
+    request_path = Column(String, nullable=False)
 
     def __repr__(self):
         return (f"<AccessLog(id={self.id}, company='{self.company_short_name}', "

iatoolkit/repositories/profile_repo.py

@@ -3,10 +3,11 @@
 #
 # IAToolkit is open source software.
 
-from iatoolkit.repositories.models import User, Company, ApiKey, UserFeedback
+from iatoolkit.repositories.models import (User, Company, user_company,
+                                           ApiKey, UserFeedback, AccessLog)
 from injector import inject
 from iatoolkit.repositories.database_manager import DatabaseManager
-from sqlalchemy.orm import joinedload # Para cargar la relación eficientemente
+from sqlalchemy import select, func, and_
 
 
 class ProfileRepo:
@@ -69,8 +70,63 @@ class ProfileRepo:
     def get_companies(self) -> list[Company]:
         return self.session.query(Company).all()
 
+    def get_user_role_in_company(self, company_id, user_id, ):
+        stmt = (
+            select(user_company.c.role)
+            .where(
+                user_company.c.user_id == user_id,
+                user_company.c.company_id == company_id,
+            )
+        )
+        result = self.session.execute(stmt).scalar_one_or_none()
+        return result
+
+    def get_companies_by_user_identifier(self, user_identifier: str) -> list:
+        """
+        Return all the companies to which the user belongs (by email),
+        and the role he has in each company.
+        """
+        return (
+            self.session.query(Company, user_company.c.role)
+            .join(user_company, Company.id == user_company.c.company_id)
+            .join(User, User.id == user_company.c.user_id)
+            .filter(User.email == user_identifier)
+            .all()
+        )
+
+    def get_company_users_with_details(self, company_short_name: str) -> list[dict]:
+        # returns the list of users in the company with their role and last access date
+
+        # subquery for last access date
+        last_access_sq = (
+            self.session.query(
+                AccessLog.user_identifier,
+                func.max(AccessLog.timestamp).label("max_ts")
+            )
+            .filter(AccessLog.company_short_name == company_short_name)
+            .group_by(AccessLog.user_identifier)
+            .subquery()
+        )
+
+        # main query
+        stmt = (
+            self.session.query(
+                User,
+                user_company.c.role,
+                last_access_sq.c.max_ts
+            )
+            .join(user_company, User.id == user_company.c.user_id)
+            .join(Company, Company.id == user_company.c.company_id)
+            .outerjoin(last_access_sq, User.email == last_access_sq.c.user_identifier)
+            .filter(Company.short_name == company_short_name)
+        )
+
+        results = stmt.all()
+
+        return results
+
     def create_company(self, new_company: Company):
-        company = self.session.query(Company).filter_by(name=new_company.name).first()
+        company = self.session.query(Company).filter_by(short_name=new_company.short_name).first()
         if company:
             if company.parameters != new_company.parameters:
                 company.parameters = new_company.parameters
@@ -98,16 +154,11 @@ class ProfileRepo:
         search for an active API Key by its value.
         returns the entry if found and is active, None otherwise.
         """
-        try:
-            # Usamos joinedload para cargar la compañía en la misma consulta
-            api_key_entry = self.session.query(ApiKey)\
-                .options(joinedload(ApiKey.company))\
-                .filter(ApiKey.key == api_key_value, ApiKey.is_active == True)\
-                .first()
-            return api_key_entry
-        except Exception:
-            self.session.rollback() # Asegura que la sesión esté limpia tras un error
-            return None
+        api_key_entry = (self.session.query(ApiKey).filter
+                             (ApiKey.key == api_key_value, ApiKey.is_active == True).first())
+
+        return api_key_entry
+
 
     def get_active_api_key_by_company(self, company: Company) -> ApiKey | None:
         return self.session.query(ApiKey)\