Merge remote-tracking branch 'origin/cambios_llm'

This commit is contained in:
2025-06-21 02:17:56 +02:00
108 changed files with 655 additions and 1229 deletions
+5 -3
View File
@@ -1,4 +1,6 @@
cd ./frontend
npm run dev
cd ..
# Inicia el frontend en una nueva ventana de PowerShell
Start-Process powershell -ArgumentList "-NoExit", "-Command", 'cd ./frontend; npm run dev; pause'
# Inicia el backend en una nueva ventana de PowerShell
Start-Process powershell -ArgumentList "-NoExit", "-Command", 'cd ./backend; uvicorn backend.main:app --reload --host 0.0.0.0 --port 8000; pause'
@@ -0,0 +1,44 @@
# backend/domains/llm/agent_endpoints.py
from fastapi import APIRouter, HTTPException
from fastapi.responses import StreamingResponse
from pydantic import BaseModel
from fastapi.concurrency import run_in_threadpool
from backend.backend_domains.llms.llm_chat_srvc import construir_agente_llm, responder, responder_stream
from domains.Logger.logger_db import LoggerDB, logger
from entrypoint.init_db import db_credencial
LoggerDB(db_credencial, "logger_llm", created_by="sistema")
router = APIRouter()
agente = construir_agente_llm() # inicializa el agente una vez
# 📥 Schema para entrada de prompt
class ChatInput(BaseModel):
prompt: str
# ✅ Endpoint de respuesta simple
@router.post("/chat", summary="Enviar prompt y obtener respuesta completa del agente")
async def chat_endpoint(data: ChatInput):
try:
return await responder(data.prompt, agente)
except ValueError as e:
raise HTTPException(status_code=400, detail=str(e))
except Exception as e:
logger.exception("[ERROR] Fallo durante respuesta del agente:")
raise HTTPException(status_code=500, detail="Error interno al procesar la solicitud.")
# 🔁 Endpoint de streaming
@router.post("/chat-stream", summary="Enviar prompt y recibir respuesta del agente en streaming")
async def chat_stream_endpoint(data: ChatInput):
try:
return StreamingResponse(
responder_stream(data.prompt, agente),
media_type="text/plain"
)
except ValueError as e:
raise HTTPException(status_code=400, detail=str(e))
except Exception as e:
logger.exception("[ERROR] Fallo durante respuesta en streaming:")
raise HTTPException(status_code=500, detail="Error interno en el agente.")
@@ -0,0 +1,84 @@
# src/services/agent_service.py
from domains.ApiKeys.openai_apikey_mmr import OpenAICredencialRepo
from domains.ConexionSql.Postgres_conexion import PostgresConexion
from domains.ConexionApis.OpenAi_conexion import OpenAICliente
from domains.Llms.Modelos.Openai_model import ModeloOpenAI
from domains.Llms.Agente import AgenteAI
from domains.Llms.Memory.postgres_MemoryConv import MemoryConvPostgres
from domains.Llms.MCPs.McpClient import MCPClient
from domains.Llms.MCPs.McpClient_Registry import ClientRegistry
from entrypoint.init_db import db_credencial
from domains.Logger.logger_db import LoggerDB, logger
LoggerDB(db_credencial, "logger_llm", created_by="sistema")
from typing import AsyncGenerator
# 🔧 Inicialización única del agente
def construir_agente_llm() -> AgenteAI:
logger.info("[INICIO] Inicializando agente LLM...")
conexion = PostgresConexion(db_credencial)
# Paso 1: Obtener credencial
repo = OpenAICredencialRepo(conexion)
credencial = repo.get_by_id("OPAK20250513-61b29978b7604031014")
if not credencial:
raise ValueError("No se encontró la credencial OpenAI")
logger.debug(f"[OK] Credencial OpenAI cargada: {credencial.titulo}")
# Paso 2: Crear cliente
cliente = OpenAICliente(credencial)
# Paso 3: Instanciar modelo
modelo = ModeloOpenAI(
cliente=cliente,
model="gpt-4o",
temperature=1
)
# Paso 4: Memoria en PostgreSQL
memoria = MemoryConvPostgres(
credencial=db_credencial,
nombre_tabla="memoria_conversacion_pruebas",
k=10
)
# Paso 5: Herramientas MCP (ej. archivos)
archivos = MCPClient.from_http(
name="files",
url="http://127.0.0.1:4201/fs"
)
registry = ClientRegistry()
registry.add("files", archivos)
# Paso 6: Agente
agente = AgenteAI(
modelo=modelo,
nombre="Asistente Inteligente",
descripcion="",
system_prompt="",
rol="asistente",
objetivos=[],
max_iterations=0,
memoria=memoria,
mcp=registry
)
logger.success("[OK] Agente LLM listo.")
return agente
# ⚡ Función simple
async def responder(prompt: str, agente: AgenteAI) -> str:
logger.info(f"[Petición] Prompt recibido: {prompt[:50]}...")
respuesta = await agente.interactuar_en_bucle(prompt=prompt, stream=False)
logger.debug(f"[Respuesta] {respuesta[:100]}...")
return respuesta
# 🔁 Función en streaming
async def responder_stream(prompt: str, agente: AgenteAI) -> AsyncGenerator[str, None]:
logger.info(f"[Streaming] Prompt recibido: {prompt[:50]}...")
async for token in agente.interactuar_en_bucle(prompt=prompt, stream=True):
yield token
@@ -0,0 +1,35 @@
from fastapi import WebSocket, APIRouter, WebSocketDisconnect
from backend.backend_domains.llms.llm_chat_srvc import construir_agente_llm
from domains.Logger.logger_db import LoggerDB, logger
from entrypoint.init_db import db_credencial
import json
LoggerDB(db_credencial, "logger_llm_ws", created_by="sistema")
router = APIRouter()
agente = construir_agente_llm()
@router.websocket("/ws/chat")
async def chat_ws(websocket: WebSocket):
await websocket.accept()
try:
data = await websocket.receive_text()
parsed = json.loads(data)
prompt = parsed.get("prompt")
if not prompt:
await websocket.send_text("⚠️ Prompt vacío.")
await websocket.close()
return
# ✅ Solución: hacer await antes de iterar
respuesta_gen = await agente.interactuar_en_bucle(prompt=prompt, stream=True)
async for token in respuesta_gen:
await websocket.send_text(token)
await websocket.close()
except WebSocketDisconnect:
logger.info("🔌 WebSocket desconectado por el cliente.")
except Exception as e:
logger.exception("❌ Error en WebSocket:")
await websocket.close()
@@ -1,15 +1,15 @@
from fastapi import APIRouter, Depends, HTTPException
from fastapi import Path
from backend.domains.text_manager.text_manager_schema import BibliotecaInput, NotaInput
from backend.backend_domains.text_manager.text_manager_schema import BibliotecaInput, NotaInput
from fastapi.concurrency import run_in_threadpool
from backend.db.conexion import get_conexion
from backend.domains.text_manager.text_manager_srvc import *
from src.ConexionSql.Postgres_conexion import PostgresConexion
from backend.backend_domains.text_manager.text_manager_srvc import *
from domains.ConexionSql.Postgres_conexion import PostgresConexion
from entrypoint.init_db import db_credencial
from src.Logger.logger_db import LoggerDB, logger
from domains.Logger.logger_db import LoggerDB, logger
LoggerDB(db_credencial, "logger_textos", created_by="sistema")
router = APIRouter()
@@ -1,15 +1,15 @@
from src.TextManager.biblioteca import Biblioteca
from src.TextManager.biblioteca_mmr import BibliotecaRepo
from src.Llms.Embedders.Openai_embedder import OpenAIEmbedder
from src.ApiKeys.openai_apikey_mmr import OpenAICredencialRepo
from src.ConexionSql.Postgres_conexion import PostgresConexion
from src.TextManager.nota import Nota
from src.TextManager.notas_mmr import generar_tabla_nota_para_biblioteca, NotaRepo
from domains.TextManager.biblioteca import Biblioteca
from domains.TextManager.biblioteca_mmr import BibliotecaRepo
from domains.Llms.Embedders.Openai_embedder import OpenAIEmbedder
from domains.ApiKeys.openai_apikey_mmr import OpenAICredencialRepo
from domains.ConexionSql.Postgres_conexion import PostgresConexion
from domains.TextManager.nota import Nota
from domains.TextManager.notas_mmr import generar_tabla_nota_para_biblioteca, NotaRepo
from sqlalchemy import MetaData
from backend.domains.text_manager.text_manager_schema import NotaInput
from backend.backend_domains.text_manager.text_manager_schema import NotaInput
from entrypoint.init_db import db_credencial
from src.Logger.logger_db import LoggerDB, logger
from domains.Logger.logger_db import LoggerDB, logger
LoggerDB(db_credencial, "logger_textos", created_by="sistema")
def crear_biblioteca(nombre_biblioteca: str, conexion: PostgresConexion, descripcion: str = None):
@@ -0,0 +1,35 @@
from fastapi import APIRouter, Depends, HTTPException
from sqlalchemy.orm import Session
from domains.Usuario.usuario_mmr import UsuarioRepo, Usuario, UsuarioModel
from backend.db.conexion import get_conexion
router = APIRouter()
@router.post("/usuarios/", response_model=dict)
def crear_usuario(nombre: str, email: str, db: Session = Depends(get_conexion)):
repo = UsuarioRepo(db)
usuario = Usuario(id=None, nombre=nombre, email=email)
usuario_id = repo.add(usuario)
return {"id": usuario_id}
@router.get("/usuarios/{usuario_id}", response_model=dict)
def obtener_usuario(usuario_id: int, db: Session = Depends(get_conexion)):
repo = UsuarioRepo(db)
usuario = repo.get_by_id(usuario_id)
if not usuario:
raise HTTPException(status_code=404, detail="Usuario no encontrado")
return {"id": usuario.id, "nombre": usuario.nombre, "email": usuario.email, "activo": usuario.activo}
@router.get("/usuarios/", response_model=list)
def listar_usuarios(db: Session = Depends(get_conexion)):
repo = UsuarioRepo(db)
usuarios = repo.get_all()
return [{"id": u.id, "nombre": u.nombre, "email": u.email, "activo": u.activo} for u in usuarios]
@router.delete("/usuarios/{usuario_id}", response_model=dict)
def eliminar_usuario(usuario_id: int, db: Session = Depends(get_conexion)):
repo = UsuarioRepo(db)
exito = repo.delete_by_id(usuario_id)
if not exito:
raise HTTPException(status_code=404, detail="Usuario no encontrado")
return {"ok": True}
+1 -1
View File
@@ -1,6 +1,6 @@
# backend/db/conexion.py
from entrypoint.init_db import db_credencial
from src.ConexionSql.Postgres_conexion import PostgresConexion
from domains.ConexionSql.Postgres_conexion import PostgresConexion
def get_conexion():
conexion = PostgresConexion(db_credencial)
+4 -1
View File
@@ -3,6 +3,8 @@
from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
from backend.router_v1 import router
from backend.backend_domains.llms import llm_chat_ws_endpoint_v1
app = FastAPI(
title="Fitz Backend",
@@ -21,4 +23,5 @@ app.add_middleware(
# Incluye las rutas de tu API
app.include_router(router, prefix="/api/v1", tags=["v1"])
app.include_router(router, prefix="/api/v1", tags=["v1"])
app.include_router(llm_chat_ws_endpoint_v1.router)
+7 -4
View File
@@ -1,12 +1,15 @@
# backend/api/router_v1.py
from fastapi import APIRouter
from backend.domains.experiments import charts_examples_endpoint_v1 as charts
from backend.domains.experiments import ping_endpoint_v1
from backend.domains.text_manager import text_manager_endpoint_v1
from backend.backend_domains.experiments import charts_examples_endpoint_v1 as charts
from backend.backend_domains.experiments import ping_endpoint_v1
from backend.backend_domains.text_manager import text_manager_endpoint_v1
from backend.backend_domains.llms import llm_chat_endpoint_v1
from backend.backend_domains.usuarios_endpoint_v1 import router as usuarios_router
router = APIRouter()
router.include_router(ping_endpoint_v1.router, prefix="/ping")
router.include_router(text_manager_endpoint_v1.router, prefix="/text_manager")
router.include_router(charts.router, prefix="/charts")
router.include_router(llm_chat_endpoint_v1.router, prefix="/llm", tags=["Agente LLM"])
router.include_router(usuarios_router, prefix="/usuarios", tags=["Usuarios"])
+26 -1016
View File
File diff suppressed because it is too large Load Diff
@@ -1,4 +1,4 @@
from src.Security.GenerarIDs import GeneradorIDUnico
from domains.Security.GenerarIDs import GeneradorIDUnico
class OpenAICredencial:
def __init__(self, titulo: str, api_key: str, organizacion: str = None, id: str = None):
@@ -3,17 +3,17 @@ import base64
from dotenv import load_dotenv
from sqlalchemy import Column, Integer, String
from src.ConexionSql.Base_conexion import ConexionBase
from src.base import Base
from src.ApiKeys.openai_apikey import OpenAICredencial
from src.Security.Encriptar import Encriptar_fernet
from domains.ConexionSql.Base_conexion import ConexionBase
from domains.base import Base
from domains.ApiKeys.openai_apikey import OpenAICredencial
from domains.Security.Encriptar import Encriptar_fernet
from entrypoint import ENV_PATH
from src.ArquitectureLayer.Mapper import Mapper_base
from domains.ArquitectureLayer.Mapper import Mapper_base
from sqlalchemy import Column, String
from src.ArquitectureLayer.Model import Model_base
from src.ArquitectureLayer.Repo import Repo_base
from domains.ArquitectureLayer.Model import Model_base
from domains.ArquitectureLayer.Repo import Repo_base
# ----------------------
@@ -6,7 +6,7 @@ from sqlalchemy.orm import Session
from sqlalchemy import func
from datetime import datetime
from src.ArquitectureLayer.Mapper import Mapper_base # Asegúrate de importar tu ABC base
from domains.ArquitectureLayer.Mapper import Mapper_base # Asegúrate de importar tu ABC base
TModelo = TypeVar("TModelo")
TDominio = TypeVar("TDominio")
@@ -1,5 +1,5 @@
import requests
from src.Credenciales.ollama_credencial import OllamaCredencial
from domains.Credenciales.ollama_credencial import OllamaCredencial
class OllamaCliente:
def __init__(self, credencial: OllamaCredencial):
@@ -1,5 +1,5 @@
from openai import OpenAI
from src.ApiKeys.openai_apikey import OpenAICredencial
from domains.ApiKeys.openai_apikey import OpenAICredencial
class OpenAICliente:
def __init__(self, credencial: OpenAICredencial):
@@ -4,8 +4,8 @@ from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm import sessionmaker, Session
from sqlalchemy.engine import Engine
from src.ConexionSql.Base_conexion import ConexionBase
from src.Credenciales.postgres_credencial import PostgresCredencial
from domains.ConexionSql.Base_conexion import ConexionBase
from domains.Credenciales.postgres_credencial import PostgresCredencial
class PostgresConexion(ConexionBase):
def __init__(self, *args, **kwargs):
@@ -1,4 +1,4 @@
from src.Security.GenerarIDs import GeneradorIDUnico
from domains.Security.GenerarIDs import GeneradorIDUnico
class OllamaCredencial:
def __init__(self, titulo: str, base_url: str = "http://localhost:11434", id: str = None):
@@ -1,4 +1,4 @@
from src.Security.GenerarIDs import GeneradorIDUnico
from domains.Security.GenerarIDs import GeneradorIDUnico
class PostgresCredencial:
def __init__(self, titulo: str, host: str, port: int, dbname: str, user: str, password: str, id: str = None):
@@ -6,14 +6,14 @@ from sqlalchemy import DateTime, Text, func
import base64
from src.ArquitectureLayer.Mapper import Mapper_base
from src.ArquitectureLayer.Model import Model_base
from src.ArquitectureLayer.Repo import Repo_base
from domains.ArquitectureLayer.Mapper import Mapper_base
from domains.ArquitectureLayer.Model import Model_base
from domains.ArquitectureLayer.Repo import Repo_base
from src.ConexionSql.Base_conexion import ConexionBase
from src.base import Base
from src.Credenciales.postgres_credencial import PostgresCredencial
from src.Security.Encriptar import Encriptar_fernet
from domains.ConexionSql.Base_conexion import ConexionBase
from domains.base import Base
from domains.Credenciales.postgres_credencial import PostgresCredencial
from domains.Security.Encriptar import Encriptar_fernet
# ----------------------
# Cargar clave maestra
@@ -1,13 +1,13 @@
from src.Llms.Modelos.Base_model import ModeloABC
from src.Llms.Memory.Base_MemoryConv import MemoryConvABC
from src.Llms.MCPs.McpClient_Registry import ClientRegistry
from domains.Llms.Modelos.Base_model import ModeloABC
from domains.Llms.Memory.Base_MemoryConv import MemoryConvABC
from domains.Llms.MCPs.McpClient_Registry import ClientRegistry
from datetime import datetime
from typing import Optional, List, Union, AsyncGenerator
import re
import json
from entrypoint.init_db import db_credencial
from src.Logger.logger_db import LoggerDB, logger
from domains.Logger.logger_db import LoggerDB, logger
LoggerDB(db_credencial, "logger_agentes", created_by="sistema")
@@ -1,8 +1,8 @@
from typing import List
from src.Llms.Embedders.Base_Embedder import EmbedderABC # Asegúrate de que EmbedderABC esté en este módulo
from src.ApiKeys.openai_apikey import OpenAICredencial
from src.ConexionApis.OpenAi_conexion import OpenAICliente
from src.Security.GenerarIDs import GeneradorIDUnico
from domains.Llms.Embedders.Base_Embedder import EmbedderABC # Asegúrate de que EmbedderABC esté en este módulo
from domains.ApiKeys.openai_apikey import OpenAICredencial
from domains.ConexionApis.OpenAi_conexion import OpenAICliente
from domains.Security.GenerarIDs import GeneradorIDUnico
class OpenAIEmbedder(EmbedderABC):
def __init__(self, credencial: OpenAICredencial,
@@ -3,15 +3,15 @@ from dotenv import load_dotenv
from sqlalchemy import Column, String
from sqlalchemy import Column, String, ForeignKey
from src.ArquitectureLayer.Mapper import Mapper_base
from src.ArquitectureLayer.Model import Model_base
from src.ArquitectureLayer.Repo import Repo_base
from domains.ArquitectureLayer.Mapper import Mapper_base
from domains.ArquitectureLayer.Model import Model_base
from domains.ArquitectureLayer.Repo import Repo_base
from src.ConexionSql.Base_conexion import ConexionBase
from src.base import Base
from src.Security.GenerarIDs import GeneradorIDUnico
from src.Llms.Embedders.Openai_embedder import OpenAIEmbedder
from src.ApiKeys.openai_apikey import OpenAICredencial
from domains.ConexionSql.Base_conexion import ConexionBase
from domains.base import Base
from domains.Security.GenerarIDs import GeneradorIDUnico
from domains.Llms.Embedders.Openai_embedder import OpenAIEmbedder
from domains.ApiKeys.openai_apikey import OpenAICredencial
# ----------------------
# Cargar configuración desde .env si se requiere
@@ -1,4 +1,4 @@
from src.Llms.MCPs.McpClient import MCPClient
from domains.Llms.MCPs.McpClient import MCPClient
from typing import Any
class ClientRegistry:
@@ -1,9 +1,9 @@
from sqlalchemy import Table, Column, Integer, String, MetaData, insert, select, delete
from typing import Literal
from src.Credenciales.postgres_credencial import PostgresCredencial
from src.ConexionSql.Postgres_conexion import PostgresConexion # Usamos la clase específica
from src.Llms.Memory.Base_MemoryConv import MemoryConvABC
from domains.Credenciales.postgres_credencial import PostgresCredencial
from domains.ConexionSql.Postgres_conexion import PostgresConexion # Usamos la clase específica
from domains.Llms.Memory.Base_MemoryConv import MemoryConvABC
class MemoryConvPostgres(MemoryConvABC):
@@ -1,7 +1,7 @@
from src.Llms.Modelos.Base_model import ModeloABC
from src.Security.GenerarIDs import GeneradorIDUnico
from domains.Llms.Modelos.Base_model import ModeloABC
from domains.Security.GenerarIDs import GeneradorIDUnico
from typing import AsyncGenerator, Union
from src.ConexionApis.Ollama_cliente import OllamaCliente # Asegúrate de importar correctamente
from domains.ConexionApis.Ollama_cliente import OllamaCliente # Asegúrate de importar correctamente
import asyncio
class ModeloOllama(ModeloABC):
@@ -1,6 +1,6 @@
from src.Llms.Modelos.Base_model import ModeloABC
from src.ConexionApis.OpenAi_conexion import OpenAICliente
from src.Security.GenerarIDs import GeneradorIDUnico
from domains.Llms.Modelos.Base_model import ModeloABC
from domains.ConexionApis.OpenAi_conexion import OpenAICliente
from domains.Security.GenerarIDs import GeneradorIDUnico
import asyncio
from typing import AsyncGenerator, Union
@@ -2,15 +2,15 @@ import os
from dotenv import load_dotenv
from sqlalchemy import Column, Integer, String, Float, Boolean
from src.ArquitectureLayer.Mapper import Mapper_base
from src.ArquitectureLayer.Model import Model_base
from src.ArquitectureLayer.Repo import Repo_base
from domains.ArquitectureLayer.Mapper import Mapper_base
from domains.ArquitectureLayer.Model import Model_base
from domains.ArquitectureLayer.Repo import Repo_base
from typing import Optional
from src.ConexionSql.Base_conexion import ConexionBase
from src.base import Base
from src.Llms.Modelos.Openai_model import ModeloOpenAI # Clase real de lógica
from domains.ConexionSql.Base_conexion import ConexionBase
from domains.base import Base
from domains.Llms.Modelos.Openai_model import ModeloOpenAI # Clase real de lógica
# ----------------------
# Cargar clave maestra
@@ -3,9 +3,9 @@ from sqlalchemy import Column, Integer, String, Text, TIMESTAMP
from sqlalchemy.orm import sessionmaker
from sqlalchemy.exc import SQLAlchemyError
from src.ArquitectureLayer.Model import Model_base
from src.ConexionSql.Postgres_conexion import PostgresConexion
from src.Credenciales.postgres_credencial import PostgresCredencial
from domains.ArquitectureLayer.Model import Model_base
from domains.ConexionSql.Postgres_conexion import PostgresConexion
from domains.Credenciales.postgres_credencial import PostgresCredencial
class LoggerDB:
_sink_removido = False # ← evita múltiples remove() si se crean varias instancias
@@ -1,11 +1,11 @@
from src.Security.GenerarIDs import GeneradorIDUnico
from src.Llms.Embedders.Base_Embedder import EmbedderABC # Asegúrate de que esta ruta sea correcta
from domains.Security.GenerarIDs import GeneradorIDUnico
from domains.Llms.Embedders.Base_Embedder import EmbedderABC # Asegúrate de que esta ruta sea correcta
from typing import List, Optional
from src.ConexionSql.Base_conexion import ConexionBase
from domains.ConexionSql.Base_conexion import ConexionBase
from sqlalchemy import MetaData # Asegúrate de importar esto
from src.TextManager.notas_mmr import generar_tabla_nota_para_biblioteca # Ajusta si es necesario
from domains.TextManager.notas_mmr import generar_tabla_nota_para_biblioteca # Ajusta si es necesario
from sqlalchemy import inspect
from src.base import Base
from domains.base import Base
class Biblioteca:
@@ -3,16 +3,16 @@ import base64
from dotenv import load_dotenv
from sqlalchemy import Column, String, Integer
from src.ArquitectureLayer.Mapper import Mapper_base
from src.ArquitectureLayer.Model import Model_base
from src.ArquitectureLayer.Repo import Repo_base
from domains.ArquitectureLayer.Mapper import Mapper_base
from domains.ArquitectureLayer.Model import Model_base
from domains.ArquitectureLayer.Repo import Repo_base
from src.ConexionSql.Base_conexion import ConexionBase
from src.base import Base
from src.Security.Encriptar import Encriptar_fernet
from src.Security.GenerarIDs import GeneradorIDUnico
from src.Llms.Embedders.Base_Embedder import EmbedderABC
from src.TextManager.biblioteca import Biblioteca # Suponiendo que defines la clase lógica Biblioteca aquí
from domains.ConexionSql.Base_conexion import ConexionBase
from domains.base import Base
from domains.Security.Encriptar import Encriptar_fernet
from domains.Security.GenerarIDs import GeneradorIDUnico
from domains.Llms.Embedders.Base_Embedder import EmbedderABC
from domains.TextManager.biblioteca import Biblioteca # Suponiendo que defines la clase lógica Biblioteca aquí
# ----------------------
# Cargar clave maestra
@@ -1,4 +1,4 @@
from src.Security.GenerarIDs import GeneradorIDUnico
from domains.Security.GenerarIDs import GeneradorIDUnico
from typing import List
class Nota:
@@ -3,17 +3,17 @@ from dotenv import load_dotenv
from sqlalchemy import Table, Column, String, Text, MetaData
from pgvector.sqlalchemy import Vector
from sqlalchemy.orm import registry, Session
from src.TextManager.nota import Nota
from src.ConexionSql.Base_conexion import ConexionBase
from domains.TextManager.nota import Nota
from domains.ConexionSql.Base_conexion import ConexionBase
from typing import Tuple
import re
from src.ArquitectureLayer.Mapper import Mapper_base
from src.ArquitectureLayer.Model import Model_base
from src.ArquitectureLayer.Repo import Repo_base
from domains.ArquitectureLayer.Mapper import Mapper_base
from domains.ArquitectureLayer.Model import Model_base
from domains.ArquitectureLayer.Repo import Repo_base
from src.Credenciales.postgres_credencial import PostgresCredencial # Asegúrate de tener esta clase implementada correctamente
from domains.Credenciales.postgres_credencial import PostgresCredencial # Asegúrate de tener esta clase implementada correctamente
titulo = os.getenv('DB_TITLE')
@@ -34,11 +34,11 @@ db_credencial = PostgresCredencial(
)
# from entrypoint.init_db import db_credencial
from src.Logger.logger_db import LoggerDB, logger
from domains.Logger.logger_db import LoggerDB, logger
LoggerDB(db_credencial, "logger_textos", created_by="sistema")
from src.base import Base # Este es tu declarative_base()
from domains.base import Base # Este es tu declarative_base()
# ----------------------
# Cargar .env
+15
View File
@@ -0,0 +1,15 @@
class Usuario:
def __init__(self, id: int, nombre: str, email: str, activo: bool = True):
self.id = id
self.nombre = nombre
self.email = email
self.activo = activo
def activar(self):
self.activo = True
def desactivar(self):
self.activo = False
def __repr__(self):
return f"Usuario(id={self.id}, nombre='{self.nombre}', email='{self.email}', activo={self.activo})"
+82
View File
@@ -0,0 +1,82 @@
from sqlalchemy import Column, Integer, String, Boolean
from domains.ArquitectureLayer.Model import Model_base
from domains.ArquitectureLayer.Mapper import Mapper_base
from domains.ArquitectureLayer.Repo import Repo_base
from domains.Usuario.usuario import Usuario
# ----------------------
# MODELO (SQLAlchemy)
# ----------------------
class UsuarioModel(Model_base):
__tablename__ = 'usuarios'
id = Column(Integer, primary_key=True, autoincrement=True)
nombre = Column(String, nullable=False)
email = Column(String, unique=True, nullable=False)
activo = Column(Boolean, default=True, nullable=False)
# ----------------------
# MAPPER
# ----------------------
class UsuarioMapper(Mapper_base[Usuario, UsuarioModel]):
@staticmethod
def to_model(obj: Usuario) -> UsuarioModel:
return UsuarioModel(
id=obj.id,
nombre=obj.nombre,
email=obj.email,
activo=obj.activo
)
@staticmethod
def from_model(model: UsuarioModel) -> Usuario:
return Usuario(
id=model.id,
nombre=model.nombre,
email=model.email,
activo=model.activo
)
@staticmethod
def to_dict(obj: Usuario) -> dict:
return {
'id': obj.id,
'nombre': obj.nombre,
'email': obj.email,
'activo': obj.activo
}
@staticmethod
def from_dict(data: dict) -> Usuario:
return Usuario(
id=data['id'],
nombre=data['nombre'],
email=data['email'],
activo=data.get('activo', True)
)
@staticmethod
def from_model_list(models: list[UsuarioModel]) -> list[Usuario]:
return [UsuarioMapper.from_model(m) for m in models]
# ----------------------
# REPO
# ----------------------
class UsuarioRepo(Repo_base[UsuarioModel, Usuario]):
def __init__(self, session):
super().__init__(
session=session,
modelo=UsuarioModel,
mapper=UsuarioMapper
)
def get_by_email(self, email: str) -> Usuario | None:
model = (
self.session.query(self.Modelo)
.filter_by(email=email, sys_deleted_at=None)
.first()
)
return self.Mapper.from_model(model) if model else None
View File
+8 -8
View File
@@ -1,14 +1,14 @@
# entrypoint/init_db.py
from src.base import Base
from src.ConexionSql.Postgres_conexion import PostgresConexion # Asegúrate de tener esta clase implementada correctamente
from src.Credenciales.postgres_credencial import PostgresCredencial # Asegúrate de tener esta clase implementada correctamente
from domains.base import Base
from domains.ConexionSql.Postgres_conexion import PostgresConexion # Asegúrate de tener esta clase implementada correctamente
from domains.Credenciales.postgres_credencial import PostgresCredencial # Asegúrate de tener esta clase implementada correctamente
from src.Credenciales.postgres_credencial_mmr import PostgresCredencialModel
from src.ApiKeys.openai_apikey_mmr import OpenAICredencialModel
from src.Llms.Modelos.Openai_model_mmr import ModeloOpenAIConfigModel
from src.Llms.Embedders.Openai_embedder_mmr import OpenAIEmbedderModel
from src.TextManager.biblioteca_mmr import BibliotecaModel
from domains.Credenciales.postgres_credencial_mmr import PostgresCredencialModel
from domains.ApiKeys.openai_apikey_mmr import OpenAICredencialModel
from domains.Llms.Modelos.Openai_model_mmr import ModeloOpenAIConfigModel
from domains.Llms.Embedders.Openai_embedder_mmr import OpenAIEmbedderModel
from domains.TextManager.biblioteca_mmr import BibliotecaModel
from dotenv import load_dotenv
-17
View File
@@ -14,7 +14,6 @@
"@mantine/tiptap": "^8.0.1",
"@react-three/fiber": "^9.1.2",
"@tabler/icons": "^3.31.0",
"@tabler/icons-react": "^3.31.0",
"@tiptap/react": "^2.12.0",
"@tiptap/starter-kit": "^2.12.0",
"@uiw/react-markdown-preview": "^5.1.4",
@@ -2425,22 +2424,6 @@
"url": "https://github.com/sponsors/codecalm"
}
},
"node_modules/@tabler/icons-react": {
"version": "3.31.0",
"resolved": "https://registry.npmjs.org/@tabler/icons-react/-/icons-react-3.31.0.tgz",
"integrity": "sha512-2rrCM5y/VnaVKnORpDdAua9SEGuJKVqPtWxeQ/vUVsgaUx30LDgBZph7/lterXxDY1IKR6NO//HDhWiifXTi3w==",
"license": "MIT",
"dependencies": {
"@tabler/icons": "3.31.0"
},
"funding": {
"type": "github",
"url": "https://github.com/sponsors/codecalm"
},
"peerDependencies": {
"react": ">= 16"
}
},
"node_modules/@testing-library/dom": {
"version": "10.4.0",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
-1
View File
@@ -26,7 +26,6 @@
"@mantine/tiptap": "^8.0.1",
"@react-three/fiber": "^9.1.2",
"@tabler/icons": "^3.31.0",
"@tabler/icons-react": "^3.31.0",
"@tiptap/react": "^2.12.0",
"@tiptap/starter-kit": "^2.12.0",
"@uiw/react-markdown-preview": "^5.1.4",
+16 -9
View File
@@ -1,13 +1,14 @@
import { createBrowserRouter, RouterProvider } from 'react-router-dom';
import { HomePage } from './domains/Home/Home.page';
import { Consulta_API } from './domains/Experiments/Consulta_api';
import { Error_404 } from './domains/FitzStudio/404/404'; // Ajusta si está en otra carpeta
import { Grid_Dashboard } from './domains/Experiments/Grid_dashboard'; // Ajusta si está en otra carpeta
import { Biblioteca } from './domains/TextEditor/Biblioteca';
import { VisualizacionesRandom } from './domains/Experiments/Visualizaciones_Random';
import { Camara_noir } from './domains/CamaraNoir/Camaras_noir';
import EditorTest from "./domains/TextEditor/Editor_Test";
import { ChatPage } from './domains/Llms/Chat/ChatPage';
import { HomePage } from './frontend_domains/Home/Home.page';
import { Consulta_API } from './frontend_domains/Experiments/Consulta_api';
import { Error_404 } from './frontend_domains/FitzStudio/404/404'; // Ajusta si está en otra carpeta
import { Grid_Dashboard } from './frontend_domains/Experiments/Grid_dashboard'; // Ajusta si está en otra carpeta
import { Biblioteca } from './frontend_domains/TextEditor/Biblioteca';
import { VisualizacionesRandom } from './frontend_domains/Experiments/Visualizaciones_Random';
import { Camara_noir } from './frontend_domains/CamaraNoir/Camaras_noir';
import EditorTest from "./frontend_domains/TextEditor/Editor_Test";
import { ChatPage } from './frontend_domains/Llms/Chat/ChatPage';
import { LoginPage } from './frontend_domains/Usuarios/Login.page';
const router = createBrowserRouter([
@@ -69,6 +70,12 @@ const router = createBrowserRouter([
},
// Login
{
path: '/login',
element: <LoginPage />,
},
// FitzStudio Pages -------------------------------------------------------
// Error 404
+1 -1
View File
@@ -1,6 +1,6 @@
// src/data/submenuLinks.ts
import { Biblioteca } from "@/domains/TextEditor/Biblioteca";
import { Biblioteca } from "@/frontend_domains/TextEditor/Biblioteca";
export const submenuLinks = {
@@ -1,41 +0,0 @@
import { useState } from "react";
import { Container, Stack, Paper, ScrollArea, Title } from "@mantine/core";
import { ChatInput } from "./ChatInput";
import { MessageList } from "./MessageList";
import { AppShellWithMenu } from "../../FitzStudio/Appshell/Appshell";
export function ChatPage() {
const [messages, setMessages] = useState([
{ sender: "bot", content: "Hola, ¿en qué puedo ayudarte hoy?" },
]);
const handleSend = async (content: string) => {
const newMessages = [...messages, { sender: "user", content }];
setMessages(newMessages);
const response = await fetch("/api/chat", {
method: "POST",
body: JSON.stringify({ messages: newMessages }),
headers: { "Content-Type": "application/json" },
});
const data = await response.json();
setMessages([...newMessages, { sender: "bot", content: data.reply }]);
};
return (
<AppShellWithMenu>
<Container size="sm" p="md">
<Stack>
<Title order={2}>Chat LLM</Title>
<Paper shadow="xs" p="md" withBorder>
<ScrollArea h={400}>
<MessageList messages={messages} />
</ScrollArea>
</Paper>
<ChatInput onSend={handleSend} />
</Stack>
</Container>
</AppShellWithMenu>
);
}
@@ -3,7 +3,7 @@ import { useMantineTheme } from '@mantine/core';
import { IconArrowLeft } from '../../../assets/icons';
import { Link } from 'react-router-dom';
import { MantineCardWithShader } from './HoloShader_404'; // Ajusta ruta si es necesario
import { AppShellWithMenu } from '../../FitzStudio/Appshell/Appshell';
import { AppShellWithMenu } from '../Appshell/Appshell';
@@ -1,4 +1,4 @@
import { AppShellWithMenu } from '../FitzStudio/Appshell/Appshell';
import { AppShellWithMenu } from './Appshell/Appshell';
export function Plantilla() {
@@ -1,6 +1,6 @@
import { AppShellWithMenu } from '../FitzStudio/Appshell/Appshell';
import { Welcome } from '@/domains/FitzStudio/Welcome/Welcome';
import { ColorSchemeToggle } from '@/domains/FitzStudio/ColorSchemeToggle/ColorSchemeToggle';
import { Welcome } from '@/frontend_domains/FitzStudio/Welcome/Welcome';
import { ColorSchemeToggle } from '@/frontend_domains/FitzStudio/ColorSchemeToggle/ColorSchemeToggle';
export function HomePage() {
@@ -0,0 +1,64 @@
import { useState, useRef } from "react";
import { Container, Stack, Paper, ScrollArea, Title } from "@mantine/core";
import { ChatInput } from "./ChatInput";
import { MessageList } from "./MessageList";
import { AppShellWithMenu } from "../../FitzStudio/Appshell/Appshell";
export function ChatPage() {
const [messages, setMessages] = useState([
{ sender: "bot", content: "Hola, ¿en qué puedo ayudarte hoy?" },
]);
const wsRef = useRef<WebSocket | null>(null);
const handleSend = async (content: string) => {
const newMessages = [...messages, { sender: "user", content }];
setMessages(newMessages);
let currentResponse = "";
setMessages((prev) => [...prev, { sender: "bot", content: "" }]);
wsRef.current = new WebSocket("ws://localhost:8000/ws/chat");
wsRef.current.onopen = () => {
wsRef.current?.send(JSON.stringify({ prompt: content }));
};
wsRef.current.onmessage = (event) => {
const token = event.data;
currentResponse += token;
setMessages((prev) => {
const updated = [...prev];
updated[updated.length - 1] = { sender: "bot", content: currentResponse };
return updated;
});
};
wsRef.current.onerror = (err) => {
console.error("WebSocket error:", err);
setMessages((prev) => [
...prev.slice(0, -1),
{ sender: "bot", content: "⚠️ Error al comunicarse con el servidor." },
]);
};
wsRef.current.onclose = () => {
wsRef.current = null;
};
};
return (
<AppShellWithMenu>
<Container size="sm" p="md">
<Stack>
<Title order={2}>Chat LLM</Title>
<Paper shadow="xs" p="md" withBorder>
<ScrollArea h={400}>
<MessageList messages={messages} />
</ScrollArea>
</Paper>
<ChatInput onSend={handleSend} />
</Stack>
</Container>
</AppShellWithMenu>
);
}
@@ -2,6 +2,7 @@ import { RichTextEditor } from '@mantine/tiptap';
import { useEditor } from '@tiptap/react';
import StarterKit from '@tiptap/starter-kit';
import '@mantine/tiptap/styles.css';
import { AppShellWithMenu } from '../FitzStudio/Appshell/Appshell';
export default function EditorTest() {
const editor = useEditor({
@@ -10,8 +11,9 @@ export default function EditorTest() {
});
return (
<div style={{ padding: 40 }}>
{editor && (
{editor && ( <AppShellWithMenu>
<RichTextEditor editor={editor}>
<RichTextEditor.Toolbar sticky stickyOffset={0}>
<RichTextEditor.ControlsGroup>
@@ -21,7 +23,10 @@ export default function EditorTest() {
</RichTextEditor.Toolbar>
<RichTextEditor.Content />
</RichTextEditor>
</AppShellWithMenu>
)}
</div>
);
}
@@ -0,0 +1,66 @@
import { useState } from 'react';
import { TextInput, PasswordInput, Button, Paper, Title, Container, Group, Alert } from '@mantine/core';
import UserIcon from '../../assets/icons/outlined/user.svg?react';
import LockIcon from '../../assets/icons/outlined/lock.svg?react';
export function LoginPage() {
const [email, setEmail] = useState('');
const [password, setPassword] = useState('');
const [error, setError] = useState('');
const [loading, setLoading] = useState(false);
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
setLoading(true);
setError('');
// Aquí deberías llamar a tu endpoint de login (ajusta la URL y payload)
try {
const res = await fetch('/api/v1/usuarios/login', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ email, password })
});
if (!res.ok) throw new Error('Credenciales incorrectas');
// Aquí puedes guardar el usuario/token en el estado global o localStorage
window.location.href = '/';
} catch (err: any) {
setError(err.message);
} finally {
setLoading(false);
}
};
return (
<Container size={420} my={40}>
<Title align="center" mb={20}>Iniciar sesión</Title>
<Paper withBorder shadow="md" p={30} mt={30} radius="md">
<form onSubmit={handleSubmit}>
<TextInput
label="Email"
placeholder="tucorreo@ejemplo.com"
icon={<UserIcon style={{ width: 18, height: 18 }} />}
value={email}
onChange={e => setEmail(e.target.value)}
required
mb={10}
/>
<PasswordInput
label="Contraseña"
placeholder="Tu contraseña"
icon={<LockIcon style={{ width: 18, height: 18 }} />}
value={password}
onChange={e => setPassword(e.target.value)}
required
mb={20}
/>
{error && <Alert color="red" mb={10}>{error}</Alert>}
<Group mt="md">
<Button type="submit" loading={loading} fullWidth>
Entrar
</Button>
</Group>
</form>
</Paper>
</Container>
);
}
+2 -9
View File
@@ -737,14 +737,7 @@
"@svgr/hast-util-to-babel-ast" "8.0.0"
svg-parser "^2.0.4"
"@tabler/icons-react@^3.31.0":
version "3.31.0"
resolved "https://registry.npmjs.org/@tabler/icons-react/-/icons-react-3.31.0.tgz"
integrity sha512-2rrCM5y/VnaVKnORpDdAua9SEGuJKVqPtWxeQ/vUVsgaUx30LDgBZph7/lterXxDY1IKR6NO//HDhWiifXTi3w==
dependencies:
"@tabler/icons" "3.31.0"
"@tabler/icons@^3.31.0", "@tabler/icons@3.31.0":
"@tabler/icons@^3.31.0":
version "3.31.0"
resolved "https://registry.npmjs.org/@tabler/icons/-/icons-3.31.0.tgz"
integrity sha512-dblAdeKY3+GA1U+Q9eziZ0ooVlZMHsE8dqP0RkwvRtEsAULoKOYaCUOcJ4oW1DjWegdxk++UAt2SlQVnmeHv+g==
@@ -5198,7 +5191,7 @@ react-use-measure@^2.1.7:
resolved "https://registry.npmjs.org/react-use-measure/-/react-use-measure-2.1.7.tgz"
integrity sha512-KrvcAo13I/60HpwGO5jpW7E9DfusKyLPLvuHlUyP5zqnmAPhNc6qTRjUQrdTADl0lpPpDVU2/Gg51UlOGHXbdg==
"react@^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^15.0.0 || >=16.0.0", "react@^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", "react@^17.0.0 || ^18.0.0 || ^19.0.0", "react@^18.0.0 || ^19.0.0", "react@^18.x || ^19.x", react@^19.0.0, react@^19.1.0, "react@>= 16", "react@>= 16.3.0", react@>=16.13, react@>=16.3.0, react@>=16.8.0, react@>=17.0, react@>=18, react@>=18.0.0:
"react@^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^15.0.0 || >=16.0.0", "react@^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react@^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", "react@^17.0.0 || ^18.0.0 || ^19.0.0", "react@^18.0.0 || ^19.0.0", "react@^18.x || ^19.x", react@^19.0.0, react@^19.1.0, "react@>= 16.3.0", react@>=16.13, react@>=16.3.0, react@>=16.8.0, react@>=17.0, react@>=18, react@>=18.0.0:
version "19.1.0"
resolved "https://registry.npmjs.org/react/-/react-19.1.0.tgz"
integrity sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==

Some files were not shown because too many files have changed in this diff Show More