pyflutter-app 0.2.5__tar.gz → 0.2.7__tar.gz

{pyflutter_app-0.2.5 → pyflutter_app-0.2.7}/.idea/pyflutter_app.iml

@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
-    <orderEntry type="jdk" jdkName="uv (pyflutter)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="~/GIT/pyflutter/.venv" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

{pyflutter_app-0.2.5 → pyflutter_app-0.2.7}/PKG-INFO

@@ -1,15 +1,11 @@
 Metadata-Version: 2.5
 Name: pyflutter_app
-Version: 0.2.5
+Version: 0.2.7
 Summary: Bibliotecas Python para conversão de documentos, interface e processamento de tabelas.
 Requires-Python: >=3.12
-Requires-Dist: opencv-python>=5.0.0.93
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: pandas-stubs~=3.0.3
 Requires-Dist: pandas>=3.0.0
-Requires-Dist: playwright>=1.63.0
-Requires-Dist: pymupdf>=1.28.2
-Requires-Dist: pytesseract>=0.3.13
 Description-Content-Type: text/markdown
 
 # pyflutter

{pyflutter_app-0.2.5 → pyflutter_app-0.2.7}/cartas/__init__.py

@@ -1,5 +1,5 @@
 from .find_toi import extrair_uc_toi
-from .table_toi import HeaderTOI, TableTOI, LocalEntregaCarta, TipoCarta
+from ._table_toi import HeaderTOI, TableTOI, LocalEntregaCarta, TipoCarta
 from .common import BuilderConfigTOI, ConfigTOI
 from .relatorio import (
     CreateRelatorioTOI, TableTOI, ReadWriteTableTOI, load_files_toi

pyflutter_app-0.2.5/cartas/table_toi.py → pyflutter_app-0.2.7/cartas/_table_toi.py

@@ -5,7 +5,7 @@ from typing import Any, Callable, TypeVar
 from pandas import DataFrame
 
 from table_stream import (
-    ArrayList, HashMapDict, TableElements, ColumnV, RowH, PathElement, 
+    ArrayList, HashMapDict, TableMap, ColumnV, RowH, PathElement, 
     Directory, File, HeaderMetaData, concat_tables, ColumnNotFoundError,
 )
 
@@ -24,11 +24,11 @@ class HeaderTOI(StrEnum):
     TIPO_DOC = "tipo_carta"
     IS_FILE = "arquivo?"
     
-    FULL_PATH = HeaderMetaData.arquivo.value
-    SRC = HeaderMetaData.pasta_pai.value
-    FILE_EXTENSION = HeaderMetaData.extensao_arquivo.value
+    FULL_PATH = HeaderMetaData.FILE_PATH.value
+    SRC = HeaderMetaData.PARENT_DIR.value
+    FILE_EXTENSION = HeaderMetaData.FILE_EXTENSION.value
     
-    HASH_FILE = HeaderMetaData.md5.value
+    HASH_FILE = HeaderMetaData.HASH_FILE.value
     FILE_BASENAME = "basename"
     
 
@@ -45,7 +45,7 @@ class LocalEntregaCarta(StrEnum):
     PORTAO = "PORTÃO"
 
 
-class TableTOI(TableElements[HeaderTOI]):
+class TableTOI(TableMap[HeaderTOI]):
     """
         Tabela para representar dados de cartas TOI.
     """
@@ -133,7 +133,7 @@ class TableTOI(TableElements[HeaderTOI]):
             return cls()
 
         final = concat_tables(list_tables)
-        return cls(final.tb_map)
+        return cls(final._table_dict)
 
     @classmethod
     def create_from_data(cls, data: DataFrame) -> TableTOI:

{pyflutter_app-0.2.5 → pyflutter_app-0.2.7}/cartas/relatorio.py

@@ -1,18 +1,33 @@
 from ocrlib import (
-    TableOcr, HeaderOcr, DocumentInputStream, ReadWriteTableOCR,
-    CreateRelatorioExcelOcr, ColumnV,
+    TableOcr,
+    HeaderOcr,
+    DocumentInputStream,
+    ReadWriteTableOCR,
+    ControllerRelatorioOcr,
+    ColumnV,
+    ControllerOcr,
 )
 
 from whatsapp_files import TableWhatsApp, HeaderWhatsApp, CreateRelatorioWhatsApp
 
 from table_stream import (
-    File, Directory, HashMapDict, hashFile, ColumnNotFoundError,
-    ArrayList, PathElement, TableElements, RowH, load_file_hash,
-    concat_tables, create_table_from_file, create_void_table_files, BaseObjetct
+    File,
+    Directory,
+    HashMapDict,
+    hashFile,
+    ColumnNotFoundError,
+    ArrayList,
+    PathElement,
+    TableMap,
+    RowH,
+    load_file_hash,
+    concat_tables,
+    create_table_from_file,
+    create_void_table_files,
 )
 
 import pandas as pd
-from cartas.table_toi import HeaderTOI, TableTOI, TipoCarta, LocalEntregaCarta
+from cartas._table_toi import HeaderTOI, TableTOI, TipoCarta, LocalEntregaCarta
 from cartas.find_toi import extrair_uc_toi
 from cartas.common import ConfigTOI, BuilderConfigTOI
 from os import rename as rename_file
@@ -39,11 +54,11 @@ class ReadWriteTableTOI(object):
         super().__init__()
         self._initialized: bool = True
         self.builder: BuilderConfigTOI = BuilderConfigTOI()
-        
+
     @property
     def file_table_cache(self) -> File:
         return BuilderConfigTOI().builder().file_table_toi
-    
+
     def load_table_cache(self) -> TableTOI:
 
         f = self.file_table_cache
@@ -79,7 +94,7 @@ class CreateRelatorioTOI(object):
         Cria uma tabela de Cartas TOI apartir dos chats do WhatsApp.
     Conectando os arquivos das conversas aos textos extraídos via OCR.
 
-    TableWhatsApp() é usado para obter DATA e HORA do envio de um arquivo 
+    TableWhatsApp() é usado para obter DATA e HORA do envio de um arquivo
     no chat, pois a data de envio no chat e a data de entrega de uma carta em campo.
     """
 
@@ -94,53 +109,62 @@ class CreateRelatorioTOI(object):
 
     def __init__(self) -> None:
 
-        self.relatorio_ocr: CreateRelatorioExcelOcr = CreateRelatorioExcelOcr()
+        self.relatorio_ocr: ControllerRelatorioOcr = ControllerRelatorioOcr()
         self.relatorio_whatsapp: CreateRelatorioWhatsApp = CreateRelatorioWhatsApp()
 
     def load_table_whatsapp(self) -> TableWhatsApp:
         return self.relatorio_whatsapp.load_cache_table()
-    
+
     def find_on_cache(self, map: HashMapDict[hashFile, File]) -> TableTOI | None:
         """
             Gera uma tabela TOI apartir da tabela TOI em cache sem executar
-        o filtro de texto em OCR com expressão regular.
+        o filtro de texto em OCR com expressão regular. Apenas gera uma
+        tabela consultando a base TOI em cache
         """
-        
+
         if map.is_empty():
             return None
-        
+
         tb_cache = ReadWriteTableTOI().load_table_cache()
         final = TableTOI()
-        
+
         header = map.header()
         h: hashFile
-        
+
         for h in header:
             f = map.get_value(h)
-            
-            content = tb_cache.seach(HeaderTOI.HASH_FILE, h)
+
+            content = tb_cache.search(HeaderTOI.HASH_FILE, h)
             if content.empty():
                 continue
-            
+
             content_row = content.get_row_at(0)
-            content_row.set(HeaderTOI.FILE_EXTENSION, f.extension() or '.nan')
+            content_row.set(HeaderTOI.FILE_EXTENSION, f.extension() or ".nan")
             content_row.set(HeaderTOI.FILE_BASENAME, f.basename())
             content_row.set(HeaderTOI.IS_FILE, "S" if f.is_file() else "N")
             content_row.set(HeaderTOI.FULL_PATH, f.absolute())
             content_row.set(HeaderTOI.SRC, f.parent().absolute())
             final.add_row(content_row)
-            
+
         return final
 
-    def create_from_map(self, map: HashMapDict[hashFile, File], *, ignore_null: bool = True) -> TableTOI | None:
+    def create_from_map(
+        self, map: HashMapDict[hashFile, File], *, ignore_null: bool = True
+    ) -> TableTOI | None:
         """
         I) Usa a HASH MD5 dos arquivos para buscar a data de envio do arquivo na
-        tabela whatsapp; 
-        
-        II) Gera um relatório OCR [CreateRelatorioExcelOcr()] com os metadados básicos 
-        de cada arquivo; 
-        
+        tabela whatsapp;
+
+        II) Gera um relatório OCR [CreateRelatorioExcelOcr()] com os metadados básicos
+        de cada arquivo;
+
         III) Obtem a UC e TOI de cada arquivo.
+
+        IV) Retorna uma tabela apartir dos dados gerados.
+
+        Observação:
+            Se o parametro ignore_null for True as linhas que contém UC e TOI inválidos
+        serão ignorados.
         """
 
         if map.is_empty():
@@ -154,7 +178,7 @@ class CreateRelatorioTOI(object):
         if table_ocr is None:
             return None
 
-        if table_ocr.empty():
+        if table_ocr.is_empty():
             return None
 
         # Cada arquivo gera/extrai a sua própria tabela, ao final essa
@@ -163,7 +187,7 @@ class CreateRelatorioTOI(object):
         keys = map.header()
         total = keys.size()
 
-        print(f'Criando relatório TOI de {total} arquivos')
+        print(f"Criando relatório TOI de {total} arquivos")
         k: hashFile
         f: File
 
@@ -172,14 +196,16 @@ class CreateRelatorioTOI(object):
 
             print(f"[FILTRANDO] [{n+1}/{total}] {f.basename()}")
 
-            current_table_ocr: TableOcr = table_ocr.seach(HeaderOcr.HASH_FILE, k)
+            current_table_ocr: TableOcr = table_ocr.search(HeaderOcr.HASH_FILE, k)
             text_ocr: str = None
-            
-            if not current_table_ocr.empty():
+
+            if not current_table_ocr.is_empty():
                 text_ocr = current_table_ocr.to_string(HeaderOcr.TEXT)
 
-            txt_uc_toi: tuple | None = extrair_uc_toi(text_ocr) if text_ocr is not None else None
-            
+            txt_uc_toi: tuple | None = (
+                extrair_uc_toi(text_ocr) if text_ocr is not None else None
+            )
+
             if txt_uc_toi is None:
                 if ignore_null:
                     continue
@@ -194,39 +220,47 @@ class CreateRelatorioTOI(object):
             if txt_uc_toi is not None:
                 uc = txt_uc_toi[0]
                 toi = txt_uc_toi[1]
-                
-            current_table_whatsapp = table_whatsapp.seach(HeaderWhatsApp.hash_md5, k)
-            
+
+            current_table_whatsapp = table_whatsapp.search(HeaderWhatsApp.hash_md5, k)
+
             if not current_table_whatsapp.empty():
                 dt = current_table_whatsapp.get_row_at(0).get_date().get_first()
-                day = dt.split(' ')[0]
-                mon = dt.split(' ')[1]
-                year = dt.split(' ')[2]
+                day = dt.split(" ")[0]
+                mon = dt.split(" ")[1]
+                year = dt.split(" ")[2]
 
             tb_toi = TableTOI()
-            
+
             tb_toi.add(ColumnV(HeaderTOI.UC, ArrayList([uc])))
             tb_toi.add(ColumnV(HeaderTOI.TOI, ArrayList([toi])))
             tb_toi.add(ColumnV(HeaderTOI.YEAR, ArrayList([year])))
             tb_toi.add(ColumnV(HeaderTOI.MON, ArrayList([mon])))
             tb_toi.add(ColumnV(HeaderTOI.DAY, ArrayList([day])))
             tb_toi.add(ColumnV(HeaderTOI.DATE, ArrayList([dt])))
-            
-            tb_toi.add(ColumnV(HeaderTOI.FILE_EXTENSION, ArrayList([f.extension() or '.nan'])))
+
+            tb_toi.add(
+                ColumnV(HeaderTOI.FILE_EXTENSION, ArrayList([f.extension() or ".nan"]))
+            )
             tb_toi.add(ColumnV(HeaderTOI.FILE_BASENAME, ArrayList([f.basename()])))
             tb_toi.add(ColumnV(HeaderTOI.HASH_FILE, ArrayList([k])))
             tb_toi.add(ColumnV(HeaderTOI.FULL_PATH, ArrayList([f.absolute()])))
-            tb_toi.add(ColumnV(HeaderTOI.IS_FILE, ArrayList(['S' if f.is_file() else "N"])))
+            tb_toi.add(
+                ColumnV(HeaderTOI.IS_FILE, ArrayList(["S" if f.is_file() else "N"]))
+            )
             tb_toi.add(ColumnV(HeaderTOI.SRC, ArrayList([f.dirname()])))
-            
-            tb_toi.add(ColumnV(HeaderTOI.TIPO_DOC, ArrayList([TipoCarta.CARTA_CALCULO])))
-            tb_toi.add(ColumnV(HeaderTOI.LOCAL_ENTREGA, ArrayList([LocalEntregaCarta.OUTRO])))
-            
+
+            tb_toi.add(
+                ColumnV(HeaderTOI.TIPO_DOC, ArrayList([TipoCarta.CARTA_CALCULO]))
+            )
+            tb_toi.add(
+                ColumnV(HeaderTOI.LOCAL_ENTREGA, ArrayList([LocalEntregaCarta.OUTRO]))
+            )
+
             list_tables_toi.add(tb_toi)
-    
+
         if list_tables_toi.empty():
             return None
-        
+
         final = TableTOI.create_void_table()
         list_tables_toi.for_each(lambda t: final.merge(t))
         return final
@@ -236,11 +270,11 @@ class CreateRelatorioTOI(object):
         """
         Filtra UC e TOI de uma carta apartir do texto OCR extraído.
         """
-        tb_current_hash = table_ocr_file.seach(HeaderOcr.HASH_FILE, hf)
-        if tb_current_hash.empty():
+        tb_current_hash = table_ocr_file.search(HeaderOcr.HASH_FILE, hf)
+        if tb_current_hash.is_empty():
             return None
 
-        values = tb_current_hash.get(HeaderOcr.TEXT).elements
+        values = tb_current_hash.get(HeaderOcr.TEXT)._elements
 
         for v in values:
             txt = extrair_uc_toi(v)
@@ -257,34 +291,60 @@ def load_files_toi(files: ArrayList[File]) -> TableTOI | None:
     if files.empty():
         print(f"[DEBUG]: load_files_toi() lista de arquivos vazia!")
         return None
-    
+
     map = HashMapDict[hashFile, File]()
     files.for_each(lambda f: map.set_value(load_file_hash(f), f))
-    
+
     content_table = CreateRelatorioTOI().create_from_map(map)
     if content_table is None:
         return None
     if content_table.empty():
         return None
-    
+
     # Selecionar apenas algumas colunas para salvar em cache.
-    content_tb_merge = content_table.select_columns([
-        HeaderTOI.UC, HeaderTOI.TOI, HeaderTOI.YEAR, HeaderTOI.MON,
-        HeaderTOI.DAY, HeaderTOI.DATE, HeaderTOI.LOCAL_ENTREGA,
-        HeaderTOI.TIPO_DOC, HeaderTOI.HASH_FILE,
-    ])
-    
+    content_tb_merge = content_table.select_columns(
+        [
+            HeaderTOI.UC,
+            HeaderTOI.TOI,
+            HeaderTOI.YEAR,
+            HeaderTOI.MON,
+            HeaderTOI.DAY,
+            HeaderTOI.DATE,
+            HeaderTOI.LOCAL_ENTREGA,
+            HeaderTOI.TIPO_DOC,
+            HeaderTOI.HASH_FILE,
+        ]
+    )
+
     # Filtar UCs validas
     df_merge = content_tb_merge.to_dataframe().astype(str)
     df_merge = df_merge[df_merge[HeaderTOI.UC] != TableTOI.NULL_STRING]
     df_merge.drop_duplicates(subset=[HeaderTOI.HASH_FILE], inplace=True)
-    
+
     rw = ReadWriteTableTOI()
     tb_cache_toi: TableTOI = rw.load_table_cache()
-    df_cache_toi = pd.DataFrame() if tb_cache_toi.empty() else tb_cache_toi.to_dataframe().astype(str)
-    
-    df_cache = pd.concat([df_cache_toi, df_merge.astype(str)]) if not df_cache_toi.empty else df_merge.astype(str)
+    df_cache_toi = (
+        pd.DataFrame()
+        if tb_cache_toi.empty()
+        else tb_cache_toi.to_dataframe().astype(str)
+    )
+
+    df_cache = (
+        pd.concat([df_cache_toi, df_merge.astype(str)])
+        if not df_cache_toi.empty
+        else df_merge.astype(str)
+    )
     df_cache.drop_duplicates(subset=[HeaderTOI.HASH_FILE]).astype(str)
-    
+
     rw.save_table_cache(TableTOI.create_from_data(df_cache))
     return content_table
+
+
+class ControllerToi(object):
+
+    def __init__(self) -> None:
+        self.conf: ConfigTOI = BuilderConfigTOI().builder()
+        self.ocr: ControllerOcr = ControllerOcr()
+
+    def load_files_toi(self):
+        pass

{pyflutter_app-0.2.5 → pyflutter_app-0.2.7}/converter/page_forms/common.py

@@ -7,7 +7,7 @@ from typing import Any
 
 import pandas as pd
 
-from table_stream import HashMapDict, ArrayList, File, TableElements, RowH
+from table_stream import HashMapDict, ArrayList, File, TableMap, RowH
 from cartas import TableTOI, HeaderTOI, TipoCarta, LocalEntregaCarta
 
 
@@ -43,7 +43,7 @@ class ResultStatus:
 
 
 # ---------------------------------------------------------------------- normalização
-_EMPTY = {"", "nan", "NaN", "None", "NaT", TableElements.NULL_STRING}
+_EMPTY = {"", "nan", "NaN", "None", "NaT", TableMap.NULL_STRING}
 _DATE_FORMATS = (
     "%d %m %Y",            # DateValues.DATE_TOI (saída do relatório TOI)
     "%d/%m/%Y",
@@ -70,11 +70,13 @@ def normalize_date(value: Any) -> str:
     s = clean_text(value)
     if not s:
         raise ValueError("data de entrega vazia")
+    
     for fmt in _DATE_FORMATS:
         try:
             return datetime.strptime(s, fmt).strftime("%d/%m/%Y")
         except ValueError:
             continue
+        
     raise ValueError(f"data de entrega inválida: {s}")
 
 
@@ -104,8 +106,8 @@ class MapRows(HashMapDict[int, RowH[HeaderForms, Any]]):
             self.update_status(idx, StatusForms.PENDING)
 
     # ---- conversões
-    def to_table(self) -> TableElements[HeaderForms]:
-        tb = TableElements()
+    def to_table(self) -> TableMap[HeaderForms]:
+        tb = TableMap()
         for idx in self.header():
             tb.add_row(self.get_value(idx))
         return tb
@@ -117,9 +119,11 @@ class MapRows(HashMapDict[int, RowH[HeaderForms, Any]]):
     def to_view_data(self) -> pd.DataFrame:
         """DataFrame enxuto para exibir na tabela da UI."""
         records = []
+        
         for idx in self.header():
             r = self[idx]
             path = clean_text(r.get(HeaderForms.FULL_PATH))
+            
             records.append({
                 "#": idx + 1,
                 "STATUS": str(r.get(HeaderForms.STATUS)),
@@ -131,12 +135,14 @@ class MapRows(HashMapDict[int, RowH[HeaderForms, Any]]):
                 "TIPO": r.get(HeaderForms.TIPO),
                 "ARQUIVO": os.path.basename(path) if path else "-",
             })
+            
         return pd.DataFrame(records)
 
     def save(self, file: File) -> None:
         df = self.to_data()
         if df is None:
             return
+        
         df.to_excel(file.absolute(), index=False)
 
     # ---- criação a partir da tabela TOI
@@ -165,8 +171,6 @@ class MapRows(HashMapDict[int, RowH[HeaderForms, Any]]):
 
     @classmethod
     def create_from_table(cls, tb: TableTOI) -> MapRows:
-        # NOTA: não usa tb.rows(): TableElements.rows() usa range(total-1)
-        # e descarta a ÚLTIMA linha da tabela.
         mp = cls()
         for n in range(tb.size()):
             mp.set_value(n, cls.convert_row(tb.get_row_at(n)))

{pyflutter_app-0.2.5 → pyflutter_app-0.2.7}/converter/page_forms/controller_forms.py

@@ -197,19 +197,29 @@ class ControllerForms(ChangeNotifier):
 
         self.save_result(silent=True)
         self.notify_listeners()
+        
+    def get_dir_datetime(self) -> str:
+        t = datetime.now()
+        d = f"{t.year}-{t.month}-{t.day}"
+        return d
 
     # ------------------------------------------------------------------ resultado
     def save_result(self, *, silent: bool = False) -> None:
+        
         if self.map_rows.is_empty():
             if not silent:
                 self.show_info("Nada para salvar.")
             return
 
         out = self.result_file
+        
         if out is None:
             out_dir: Directory = self.get_config().value.work_dir.concat("Forms", True).concat("Resultados", True)
-            out = out_dir.join_file(f"resultado-forms-{datetime.now():%Y%m%d-%H%M%S}.xlsx")
+            out_dir = out_dir.concat(self.get_dir_datetime(), True)
+            
+            out = out_dir.join_file(f"LogForms-{datetime.now():%Y%m%d-%H%M%S}.xlsx")
             self.result_file = out
+            
         try:
             # grava em arquivo temporário e renomeia: nunca deixa um .xlsx corrompido/0 bytes
             tmp = File(f"{out.absolute()}-tmp.xlsx")

{pyflutter_app-0.2.5 → pyflutter_app-0.2.7}/converter/page_forms/model_forms.py

@@ -127,14 +127,17 @@ class ModelForms(object):
 
     # ------------------------------------------------------------------ execução
     def start(
-        self,
-        jobs: dict[int, FormsSubmission],
-        config: FormsConfig,
-        cb: FormsCallbacks,
-    ) -> None:
+                self,
+                jobs: dict[int, FormsSubmission],
+                config: FormsConfig,
+                cb: FormsCallbacks,
+            ) -> None:
+        
         if self.is_running():
             raise RuntimeError("Já existe um lançamento em andamento")
+        
         self._stop.clear()
+        
         self._thread = threading.Thread(
             target=self._worker, args=(jobs, config, cb), daemon=True, name="forms-worker",
         )