epstein-files 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

epstein_files/__init__.py

@@ -4,6 +4,7 @@ Reformat Epstein text message files for readability and count email senders.
 
     Run: 'EPSTEIN_DOCS_DIR=/path/to/TXT epstein_generate'
 """
+import re
 from sys import exit
 
 from dotenv import load_dotenv
@@ -15,16 +16,17 @@ from rich.text import Text
 
 from epstein_files.epstein_files import EpsteinFiles, document_cls
 from epstein_files.documents.document import INFO_PADDING, Document
+from epstein_files.documents.doj_file import DojFile
 from epstein_files.documents.email import Email
 from epstein_files.documents.messenger_log import MessengerLog
 from epstein_files.documents.other_file import OtherFile
 from epstein_files.util.constant.output_files import make_clean
-from epstein_files.util.constant.strings import ID_REGEX
+from epstein_files.util.constant.strings import HOUSE_OVERSIGHT_NOV_2025_ID_REGEX
 from epstein_files.util.data import flatten
 from epstein_files.util.env import args
 from epstein_files.util.file_helper import coerce_file_path, extract_file_id
 from epstein_files.util.logging import exit_with_error, logger
-from epstein_files.util.output import (print_emails_section, print_json_files, print_json_stats,
+from epstein_files.util.output import (print_doj_files, print_emails_section, print_json_files, print_stats,
      print_other_files_section, print_text_messages_section, print_email_timeline, print_emailers_info,
      print_json_metadata, write_urls)
 from epstein_files.util.rich import (build_highlighter, console, highlighter, print_color_key, print_json,
@@ -62,6 +64,10 @@ def generate_html() -> None:
     if args.colors_only:
         exit()
 
+    if args.output_doj_files:
+        printed_doj_files = print_doj_files(epstein_files)
+        timer.log_section_complete('DojFile', epstein_files.doj_files, printed_doj_files)
+
     if args.output_texts:
         printed_logs = print_text_messages_section(epstein_files)
         timer.log_section_complete('MessengerLog', epstein_files.imessage_logs, printed_logs)
@@ -83,9 +89,8 @@ def generate_html() -> None:
     if args.debug:
         highlighter.print_highlight_counts(console)
 
-    # JSON stats (mostly used for building pytest checks)
-    if args.json_stats:
-        print_json_stats(epstein_files)
+    if args.stats:
+        print_stats(epstein_files)  # Used for building pytest checks
 
 
 def epstein_diff():
@@ -97,7 +102,7 @@ def epstein_grep():
     """Search the cleaned up text of the files."""
     epstein_files = EpsteinFiles.get_files()
 
-    if ID_REGEX.match(args.positional_args[0]):
+    if HOUSE_OVERSIGHT_NOV_2025_ID_REGEX.match(args.positional_args[0]):
         logger.warning(f"'{args.positional_args[0]}' seems to be an ID, running epstein_show instead...")
         epstein_show()
         return
@@ -113,7 +118,7 @@ def epstein_grep():
             lines = search_result.lines
 
             if (isinstance(doc, Email) and not args.output_emails) \
-                    or (isinstance(doc, OtherFile) and not args.output_other) \
+                    or (isinstance(doc, (DojFile, OtherFile)) and not args.output_other) \
                     or (isinstance(doc, MessengerLog) and not args.output_texts):
                 doc.log(f"{type(doc).__name__} Skipping search result...")
                 continue
@@ -124,22 +129,23 @@ def epstein_grep():
                     doc.log(f"None of the matches for '{search_term}' seem to be in the body of the email")
                     continue
 
-            if doc.is_duplicate():
-                if last_document and not last_document.is_duplicate():
+            if doc.is_duplicate:
+                if last_document and not last_document.is_duplicate:
                     console.line()
 
                 last_document = doc
-                console.print(doc.duplicate_file_txt())
+                console.print(doc.duplicate_file_txt)
             elif args.whole_file:
                 console.print(doc)
             else:
-                console.print(doc.summary_panel())
+                console.print(doc.summary_panel)
 
                 for matching_line in lines:
                     line_txt = matching_line.__rich__()
                     console.print(Padding(temp_highlighter(line_txt), INFO_PADDING), style='gray37')
 
             console.line()
+            console.print(doc.local_path_and_url + '\n', style='dim')
 
 
 def epstein_show():
@@ -153,28 +159,35 @@ def epstein_show():
             raw_docs = [doc for doc in flatten([p.emails for p in people])]
         else:
             ids = [extract_file_id(arg.strip().strip('_')) for arg in args.positional_args]
-            raw_docs = [Document(coerce_file_path(id)) for id in ids]
+            logger.info(f"extracted IDs: {ids}")
+            raw_docs = [Document.from_file_id(id) for id in ids]
+            logger.info(f"raw docs: {raw_docs}")
 
+        # Rebuild the Document objs so we can see result of latest processing
         docs = Document.sort_by_timestamp([document_cls(doc)(doc.file_path) for doc in raw_docs])
+        logger.info(f"Document types: {[doc._class_name for doc in docs]}")
     except Exception as e:
+        console.print_exception()
         exit_with_error(str(e))
 
     for doc in docs:
         console.print('\n', doc, '\n')
 
         if args.raw:
-            console.print(Panel(Text("RAW: ").append(doc.summary()), expand=False, style=doc._border_style()))
+            console.print(Panel(Text("RAW: ").append(doc.summary()), expand=False, style=doc.border_style))
             console.print(escape(doc.raw_text()), '\n')
 
             if isinstance(doc, Email):
-                console.print(Panel(Text("actual_text: ").append(doc.summary()), expand=False, style=doc._border_style()))
-                console.print(escape(doc._actual_text()), '\n')
-                metadata = doc.metadata()
-                metadata['is_fwded_article'] = doc.is_fwded_article()
-                metadata['is_word_count_worthy'] = doc.is_word_count_worthy()
+                console.print(Panel(Text("actual_text: ").append(doc.summary()), expand=False, style=doc.border_style))
+                console.print(escape(doc._extract_actual_text()), '\n')
+                metadata = doc.metadata
+                metadata['is_fwded_article'] = doc.is_fwded_article
+                metadata['is_word_count_worthy'] = doc.is_word_count_worthy
                 metadata['_is_first_for_user'] = doc._is_first_for_user
                 print_json(f"{doc.file_id} Metadata", metadata)
 
+        console.print(doc.local_path_and_url, style='dim')
+
 
 def epstein_word_count() -> None:
     write_word_counts_html()

epstein_files/documents/communication.py

@@ -21,26 +21,30 @@ class Communication(Document):
     config: CommunicationCfg | None = None
     timestamp: datetime = FALLBACK_TIMESTAMP  # TODO this default sucks (though it never happens)
 
+    @property
     def author_or_unknown(self) -> str:
         return self.author or UNKNOWN
 
+    @property
     def author_style(self) -> str:
         return get_style_for_name(self.author)
 
+    @property
     def author_txt(self) -> Text:
         return styled_name(self.author)
 
+    @property
+    def timestamp_without_seconds(self) -> str:
+        return TIMESTAMP_SECONDS_REGEX.sub('', str(self.timestamp))
+
     def external_links_txt(self, _style: str = '', include_alt_links: bool = True) -> Text:
         """Overrides super() method to apply self.author_style."""
-        return super().external_links_txt(self.author_style(), include_alt_links=include_alt_links)
+        return super().external_links_txt(self.author_style, include_alt_links=include_alt_links)
 
     def summary(self) -> Text:
         return self._summary().append(CLOSE_PROPERTIES_CHAR)
 
-    def timestamp_without_seconds(self) -> str:
-        return TIMESTAMP_SECONDS_REGEX.sub('', str(self.timestamp))
-
     def _summary(self) -> Text:
         """One line summary mostly for logging."""
         txt = super().summary().append(', ')
-        return txt.append(key_value_txt('author', Text(f"'{self.author_or_unknown()}'", style=self.author_style())))
+        return txt.append(key_value_txt('author', Text(f"'{self.author_or_unknown}'", style=self.author_style)))