g360-cli 1.6.0 → 1.7.0

package/src/assets/templates/python-flet/src/ui/ingestion_panel.py

@@ -0,0 +1,221 @@
+import threading
+from pathlib import Path
+
+import flet as ft
+import pandas as pd
+
+try:
+    from g360_core.ingestion import estabilizar_excel_crudo
+except ImportError:
+    from core.ingestion import estabilizar_excel_crudo
+
+
+class IngestionPanel(ft.Container):
+    def __init__(self, theme, on_data_loaded=None):
+        super().__init__()
+        self.theme = theme
+        self.on_data_loaded = on_data_loaded
+        self.df: pd.DataFrame | None = None
+        self.metadata: dict | None = None
+        self._build()
+
+    def _build(self):
+        self.file_picker = ft.FilePicker(on_result=self._on_file_result)
+        self.status_text = ft.Text(
+            "Selecciona un archivo .xls o .xlsx del ERP",
+            size=14,
+            color=self.theme.muted,
+        )
+        self.stats_container = ft.Column(spacing=4, visible=False)
+        self.alertas_container = ft.Column(spacing=2, visible=False)
+        self.preview_table = ft.Column(scroll=ft.ScrollMode.AUTO, visible=False)
+
+        self.content = ft.Column(
+            controls=[
+                self.file_picker,
+                ft.Row(
+                    controls=[
+                        self.theme.accent_button(
+                            text="Cargar Archivo Excel",
+                            on_click=self._open_picker,
+                        ),
+                        ft.Container(width=12),
+                        self.status_text,
+                    ],
+                    alignment=ft.MainAxisAlignment.START,
+                    vertical_alignment=ft.CrossAxisAlignment.CENTER,
+                ),
+                ft.Container(height=12),
+                self.stats_container,
+                ft.Container(height=8),
+                self.alertas_container,
+                ft.Container(height=8),
+                self.preview_table,
+            ],
+            spacing=0,
+        )
+        self.bgcolor = self.theme.surface
+        self.border_radius = self.theme.rounded
+        self.padding = 20
+        self.expand = True
+
+    def _open_picker(self, e):
+        self.file_picker.pick_files(
+            file_type=ft.FilePickerFileType.CUSTOM,
+            allowed_extensions=["xls", "xlsx", "xlsm"],
+            dialog_title="Seleccionar reporte del ERP",
+        )
+
+    def _on_file_result(self, e: ft.FilePickerResultEvent):
+        if not e.files:
+            self.status_text.value = "No se selecciono ningun archivo."
+            self.status_text.color = self.theme.warning
+            self.update()
+            return
+
+        archivo = e.files[0]
+        ruta = archivo.path
+        nombre = archivo.name
+        self.status_text.value = f"Procesando: {nombre}..."
+        self.status_text.color = self.theme.text
+        self.update()
+
+        self._show_loading(True)
+
+        def _procesar():
+            try:
+                df, metadata = estabilizar_excel_crudo(ruta)
+                self.df = df
+                self.metadata = metadata
+                self._mostrar_resultado(df, metadata, nombre)
+                if self.on_data_loaded:
+                    self.on_data_loaded(df, metadata)
+            except Exception as exc:
+                self.status_text.value = f"Error: {exc}"
+                self.status_text.color = self.theme.error
+                self._show_loading(False)
+                self.update()
+
+        thread = threading.Thread(target=_procesar, daemon=True)
+        thread.start()
+
+    def _show_loading(self, visible: bool):
+        pass
+
+    def _mostrar_resultado(self, df: pd.DataFrame, metadata: dict, nombre: str):
+        self.status_text.value = f"OK: {nombre} ({len(df):,} filas)"
+        self.status_text.color = self.theme.success
+
+        columnas = metadata.get("columnas_finales", metadata.get("columnas", []))
+        transformaciones = metadata.get("transformaciones", [])
+        alertas = metadata.get("alertas", [])
+        columnas_nuevas = metadata.get("columnas_nuevas", [])
+
+        self.stats_container.controls = [
+            ft.Text("Resumen de Ingesta", size=16, weight=ft.FontWeight.BOLD, color=self.theme.text),
+            ft.Text(f"Filas estabilizadas: {len(df):,}", size=13, color=self.theme.muted),
+            ft.Text(f"Columnas originales: {metadata.get('filas_originales', 0)}", size=13, color=self.theme.muted),
+            ft.Text(f"Columnas finales: {len(columnas)}", size=13, color=self.theme.muted),
+            ft.Text(f"Archivo: {metadata.get('archivo', 'N/A')}", size=13, color=self.theme.muted),
+            ft.Text(f"Moneda: {metadata.get('moneda', 'N/A')}", size=13, color=self.theme.muted),
+            ft.Divider(color=self.theme.bg, height=8),
+        ]
+
+        if columnas_nuevas:
+            nuevas_text = ft.Text(
+                "Columnas derivadas:",
+                size=13, weight=ft.FontWeight.BOLD, color=self.theme.accent,
+            )
+            chips = ft.Row(
+                controls=[
+                    ft.Container(
+                        content=ft.Text(col, size=10, color=self.theme.bg),
+                        bgcolor=self.theme.accent,
+                        border_radius=12,
+                        padding=ft.padding.only(left=8, right=8, top=3, bottom=3),
+                    )
+                    for col in columnas_nuevas
+                ],
+                spacing=6,
+                wrap=True,
+            )
+            self.stats_container.controls.extend([nuevas_text, chips])
+
+        if transformaciones:
+            self.stats_container.controls.append(
+                ft.Divider(color=self.theme.bg, height=8)
+            )
+            self.stats_container.controls.append(
+                ft.Text("Transformaciones:", size=13, weight=ft.FontWeight.BOLD, color=self.theme.text)
+            )
+            for t in transformaciones[-8:]:
+                self.stats_container.controls.append(
+                    ft.Row(
+                        controls=[
+                            ft.Container(
+                                content=ft.Text(">", size=11, color=self.theme.accent),
+                                width=16,
+                            ),
+                            ft.Text(t, size=11, color=self.theme.muted),
+                        ],
+                        spacing=0,
+                    )
+                )
+
+        self.stats_container.visible = True
+
+        if alertas:
+            self.alertas_container.controls = [
+                ft.Divider(color=self.theme.bg, height=4),
+                ft.Text("Alertas:", size=13, weight=ft.FontWeight.BOLD, color=self.theme.warning),
+            ]
+            for a in alertas:
+                self.alertas_container.controls.append(
+                    ft.Row(
+                        controls=[
+                            ft.Icon(ft.icons.WARNING_AMBER_ROUNDED, size=14, color=self.theme.warning),
+                            ft.Text(a, size=11, color=self.theme.warning),
+                        ],
+                        spacing=4,
+                    )
+                )
+            self.alertas_container.visible = True
+
+        filas_preview = df.head(5)
+        columnas_preview = columnas[:8]
+
+        data_rows = []
+        for _, row in filas_preview.iterrows():
+            cells = []
+            for col in columnas_preview:
+                val = row.get(col, "")
+                v_str = str(val)[:30] if not pd.isna(val) else "-"
+                cells.append(
+                    ft.DataCell(ft.Text(v_str, size=10, color=self.theme.text))
+                )
+            data_rows.append(ft.DataRow(cells=cells))
+
+        header_cells = [
+            ft.DataColumn(ft.Text(col[:16], size=10, color=self.theme.accent, weight=ft.FontWeight.BOLD))
+            for col in columnas_preview
+        ]
+
+        tabla = ft.DataTable(
+            columns=header_cells,
+            rows=data_rows,
+            heading_text_color=self.theme.accent,
+            horizontal_margin=4,
+            column_spacing=16,
+        )
+
+        self.preview_table.controls = [
+            ft.Text("Vista previa (5 primeras filas):", size=13, weight=ft.FontWeight.BOLD, color=self.theme.text),
+            ft.Container(
+                content=tabla,
+                bgcolor=self.theme.bg,
+                border_radius=8,
+                padding=8,
+            ),
+        ]
+        self.preview_table.visible = True
+        self.update()

package/src/commands/bring.js

@@ -5,6 +5,12 @@ import { fileURLToPath } from 'url';
 import { progress } from '../lib/progress.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const INGESTION_FILES = [
+  { src: 'ingestion/core/ingestion.py', dest: 'src/core/ingestion.py' },
+  { src: 'ingestion/core/__init__.py', dest: 'src/core/__init__.py' },
+  { src: 'ingestion/ui/ingestion_panel.py', dest: 'src/ui/ingestion_panel.py' },
+  { src: 'ingestion/ui/__init__.py', dest: 'src/ui/__init__.py' },
+];
 
 export async function bring(asset, options) {
   const { path: targetPath = '.', dryRun = false, force = false } = options;
@@ -26,6 +32,10 @@ export async function bring(asset, options) {
     return;
   }
 
+  if (asset === 'ingestion') {
+    return installIngestion(targetDir, dryRun, force);
+  }
+
   await copyAssets(assetPath, targetDir, dryRun, force);
 
   if (asset.startsWith('brand')) {
@@ -104,6 +114,83 @@ async function applyBrand(targetDir, brandName, dryRun) {
   console.log(chalk.gray(`   Signature: ${brand.signature?.text || 'none'}`));
 }
 
+async function installIngestion(targetDir, dryRun, force) {
+  const assetsPath = path.join(__dirname, '../assets');
+  const ingestionDir = path.join(assetsPath, 'ingestion');
+
+  if (!fs.existsSync(ingestionDir)) {
+    console.error(chalk.red('❌ Ingestion asset not found in package.'));
+    return;
+  }
+
+  const hasFlet = (
+    fs.existsSync(path.join(targetDir, 'pyproject.toml')) &&
+    fs.existsSync(path.join(targetDir, 'src', 'main.py'))
+  );
+
+  if (!hasFlet) {
+    console.error(chalk.red('❌ This command requires a G360 Flet project.'));
+    console.log(chalk.gray('   Run "g360 init <name> --template python-flet" first.'));
+    return;
+  }
+
+  const srcCore = path.join(targetDir, 'src', 'core');
+  const srcUi = path.join(targetDir, 'src', 'ui');
+
+  if (!fs.existsSync(srcCore)) {
+    if (!dryRun) fs.mkdirpSync(srcCore);
+    console.log(chalk.gray('   Created src/core/'));
+  }
+  if (!fs.existsSync(srcUi)) {
+    if (!dryRun) fs.mkdirpSync(srcUi);
+    console.log(chalk.gray('   Created src/ui/'));
+  }
+
+  if (dryRun) {
+    console.log(chalk.yellow('\n📋 DRY RUN - Would install:'));
+    for (const f of INGESTION_FILES) {
+      console.log(chalk.gray(`   ${f.dest}`));
+    }
+    return;
+  }
+
+  console.log(chalk.cyan('\n📦 Option A — Install via pip (recommended):'));
+  console.log(chalk.white('     pip install g360-core'));
+
+  const progressBar = progress('Installing local fallback files...');
+
+  try {
+    let copied = 0;
+    for (const f of INGESTION_FILES) {
+      const srcFile = path.join(assetsPath, f.src);
+      const destFile = path.join(targetDir, f.dest);
+
+      if (fs.existsSync(destFile) && !force) {
+        console.log(chalk.yellow(`\n⚠ ${f.dest} exists. Use --force to overwrite.`));
+        continue;
+      }
+
+      await fs.copy(srcFile, destFile, { overwrite: force });
+      copied++;
+    }
+
+    progressBar.stop();
+
+    if (copied > 0) {
+      console.log(chalk.green(`\n✅ ${copied} local fallback file(s) installed\n`));
+      console.log(chalk.gray('   These files are used when g360-core pip package is not available.'));
+      console.log(chalk.cyan('\n   Import (auto-detects pip package → local fallback):'));
+      console.log(chalk.white('     from ui.ingestion_panel import IngestionPanel'));
+    }
+
+    console.log(chalk.cyan('\n   Or add to your pyproject.toml:'));
+    console.log(chalk.white('     "g360-core>=0.1.0"'));
+  } catch (error) {
+    progressBar.stop();
+    console.error(chalk.red(`\n❌ Error: ${error.message}`));
+  }
+}
+
 async function copyAssets(src, dest, dryRun, force) {
   if (dryRun) {
     console.log(chalk.yellow('📋 DRY RUN - No files will be copied\n'));

package/src/commands/list.js

@@ -15,7 +15,8 @@ export async function list(type, options) {
     templates: [],
     components: [],
     skills: [],
-    brands: []
+    brands: [],
+    ingestion: []
   };
 
   const templatesPath = path.join(assetsPath, 'templates');
@@ -47,6 +48,11 @@ export async function list(type, options) {
     }
   }
   
+  const ingestionPath = path.join(assetsPath, 'ingestion');
+  if (fs.existsSync(ingestionPath)) {
+    assets.ingestion = ['ingestion'];
+  }
+
   if (fs.existsSync(snippetsPath)) {
     const snippetsJsonPath = path.join(snippetsPath, 'snippets.json');
     if (fs.existsSync(snippetsJsonPath)) {
@@ -115,6 +121,17 @@ export async function list(type, options) {
     }
   }
 
+  if (!type || type === 'all' || type === 'ingestion') {
+    console.log(chalk.bold.yellow('\n📥 Ingestion Modules:'));
+    const ingestionPath = path.join(assetsPath, 'ingestion');
+    if (fs.existsSync(ingestionPath)) {
+      console.log(chalk.gray('  - ingestion (ERP data normalizer for Flet)'));
+      console.log(chalk.gray('    Run: g360 bring ingestion'));
+    } else {
+      console.log(chalk.gray('  No ingestion module found'));
+    }
+  }
+
   if (!type || type === 'all' || type === 'brands') {
     console.log(chalk.bold.yellow('\n🎨 Brands:'));
     if (assets.brands.length) {

package/src/commands/signature.js

@@ -231,12 +231,29 @@ async function installFlet(targetDir, { force, mode, version, position }) {
         footerCode = `\n    # Firma G360\n    page.add(g360_footer(${versionAttr.trim() ? versionAttr : ''}))\n`;
     }
 
-    if (!mainContent.includes('g360_signature')) {
-      mainContent = mainContent.replace(
-        /(from\s+core\.\w+.*\n)/,
-        `$1${importLine}\n`
-      );
+    if (!mainContent.includes('from core.components.g360_signature')) {
+      // Intentar agregar import despues de otros imports de core
+      const importRegex = /(from\s+core\.\w+.*\n)/;
+      if (importRegex.test(mainContent)) {
+        mainContent = mainContent.replace(importRegex, `$1${importLine}\n`);
+      } else {
+        // Si no hay imports de core, agregar despues del ultimo import
+        const lastImport = mainContent.lastIndexOf('import ');
+        if (lastImport !== -1) {
+          const endOfLine = mainContent.indexOf('\n', lastImport);
+          if (endOfLine !== -1) {
+            mainContent = mainContent.slice(0, endOfLine + 1) + importLine + '\n' + mainContent.slice(endOfLine + 1);
+          } else {
+            mainContent = mainContent + '\n' + importLine + '\n';
+          }
+        } else {
+          // Si no hay imports, agregar al inicio
+          mainContent = importLine + '\n\n' + mainContent;
+        }
+      }
+    }
 
+    if (!mainContent.includes('g360_footer()') && !mainContent.includes('G360Signature')) {
       if (mainContent.includes('page.add')) {
         const lastAdd = mainContent.lastIndexOf('page.add');
         const endOfLine = mainContent.indexOf('\n', lastAdd);
@@ -244,9 +261,9 @@ async function installFlet(targetDir, { force, mode, version, position }) {
       } else {
         mainContent += footerCode;
       }
-
-      fs.writeFileSync(mainPyPath, mainContent, 'utf8');
-      console.log(chalk.gray('  main.py actualizado'));
     }
+
+    fs.writeFileSync(mainPyPath, mainContent, 'utf8');
+    console.log(chalk.gray('  main.py actualizado'));
   }
 }