epstein-files 1.0.15__py3-none-any.whl → 1.1.0__py3-none-any.whl

epstein_files/__init__.py

@@ -16,13 +16,13 @@ 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.email import Email
-from epstein_files.util.constant.output_files import ALL_EMAILS_PATH, TEXT_MSGS_HTML_PATH, make_clean
+from epstein_files.util.constant.output_files import ALL_EMAILS_PATH, CHRONOLOGICAL_EMAILS_PATH, TEXT_MSGS_HTML_PATH, make_clean
 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 logger
 from epstein_files.util.output import (print_emails_section, print_json_files, print_json_stats,
-     print_other_files_section, print_text_messages_section, write_json_metadata, write_urls)
-from epstein_files.util.rich import build_highlighter, console, print_header, print_panel, write_html
+     print_other_files_section, print_text_messages_section, write_complete_emails_timeline, write_json_metadata, write_urls)
+from epstein_files.util.rich import build_highlighter, console, print_title_page_header, print_title_page_tables, print_panel, write_html
 from epstein_files.util.timer import Timer
 from epstein_files.util.word_count import write_word_counts_html
 
@@ -43,7 +43,10 @@ def generate_html() -> None:
         print_json_files(epstein_files)
         exit()
 
-    print_header(epstein_files)
+    print_title_page_header(epstein_files)
+
+    if not args.email_timeline:
+        print_title_page_tables(epstein_files)
 
     if args.colors_only:
         exit()
@@ -55,6 +58,9 @@ def generate_html() -> None:
     if args.output_emails:
         emails_that_were_printed = print_emails_section(epstein_files)
         timer.print_at_checkpoint(f"Printed {len(emails_that_were_printed):,} emails")
+    elif args.email_timeline:
+        write_complete_emails_timeline(epstein_files)
+        timer.print_at_checkpoint(f"Printed chronological emails table")
 
     if args.output_other:
         if args.uninteresting:
@@ -66,7 +72,14 @@ def generate_html() -> None:
         timer.print_at_checkpoint(f"Printed {len(files)} other files (skipped {len(epstein_files.other_files) - len(files)})")
 
     # Save output
-    write_html(ALL_EMAILS_PATH if args.all_emails else TEXT_MSGS_HTML_PATH)
+    if args.all_emails:
+        output_path = ALL_EMAILS_PATH
+    elif args.email_timeline:
+        output_path = CHRONOLOGICAL_EMAILS_PATH
+    else:
+        output_path = TEXT_MSGS_HTML_PATH
+
+    write_html(output_path)
     logger.warning(f"Total time: {timer.seconds_since_start_str()}")
 
     # JSON stats (mostly used for building pytest checks)

epstein_files/documents/document.py

@@ -244,6 +244,10 @@ class Document:
 
         return (self.timestamp or FALLBACK_TIMESTAMP, sort_id, dupe_idx)
 
+    def source_file_id(self) -> str:
+        """Strip off the _1, _2, etc. suffixes for extracted documents."""
+        return self.file_id[0:6]
+
     def summary(self) -> Text:
         """Summary of this file for logging. Brackets are left open for subclasses to add stuff."""
         txt = Text('').append(self._class_name(), style=self._class_style())

epstein_files/documents/email.py

@@ -135,6 +135,7 @@ JUNK_EMAILERS = [
 ]
 
 MAILING_LISTS = [
+    CAROLYN_RANGEL,
     INTELLIGENCE_SQUARED,
     'middle.east.update@hotmail.com',
     JP_MORGAN_USGIO,
@@ -342,6 +343,9 @@ class Email(Communication):
             else:
                 for recipient in self.header.recipients():
                     self.recipients.extend(self._emailer_names(recipient))
+
+                if self.author in MAILING_LISTS and (len(self.recipients) == 0 or self.recipients == [self.author]):
+                    self.recipients = [JEFFREY_EPSTEIN]   # Assume mailing list emails are to Epstein
         except Exception as e:
             console.print_exception()
             console.line(2)
@@ -362,7 +366,7 @@ class Email(Communication):
     def info_txt(self) -> Text:
         email_type = 'fwded article' if self.is_fwded_article() else 'email'
         txt = Text(f"OCR text of {email_type} from ", style='grey46').append(self.author_txt).append(' to ')
-        return txt.append(self._recipients_txt()).append(highlighter(f" probably sent at {self.timestamp}"))
+        return txt.append(self.recipients_txt()).append(highlighter(f" probably sent at {self.timestamp}"))
 
     def is_fwded_article(self) -> bool:
         return bool(self.config and self.config.is_fwded_article)
@@ -378,6 +382,16 @@ class Email(Communication):
         metadata.update({k: v for k, v in local_metadata.items() if v and k in METADATA_FIELDS})
         return metadata
 
+    def recipients_txt(self, max_full_names: int = 2) -> Text:
+        """Text object with comma separated colored versions of all recipients."""
+        recipients = [r or UNKNOWN for r in self.recipients] if len(self.recipients) > 0 else [UNKNOWN]
+
+        # Use just the last name for each recipient if there's 3 or more recipients
+        return join_texts([
+            Text(r if len(recipients) <= max_full_names else extract_last_name(r), style=get_style_for_name(r))
+            for r in recipients
+        ], join=', ')
+
     def subject(self) -> str:
         return self.header.subject or ''
 
@@ -386,7 +400,7 @@ class Email(Communication):
         txt = self._summary()
 
         if len(self.recipients) > 0:
-            txt.append(', ').append(key_value_txt('recipients', self._recipients_txt()))
+            txt.append(', ').append(key_value_txt('recipients', self.recipients_txt()))
 
         return txt.append(CLOSE_PROPERTIES_CHAR)
 
@@ -549,16 +563,6 @@ class Email(Communication):
 
         return collapse_newlines(text).strip()
 
-    def _recipients_txt(self) -> Text:
-        """Text object with comma separated colored versions of all recipients."""
-        recipients = [r or UNKNOWN for r in self.recipients] if len(self.recipients) > 0 else [UNKNOWN]
-
-        # Use just the last name for each recipient if there's 3 or more recipients
-        return join_texts([
-            Text(r if len(recipients) < 3 else extract_last_name(r), style=get_style_for_name(r))
-            for r in recipients
-        ], join=', ')
-
     def _remove_line(self, idx: int) -> None:
         """Remove a line from self.lines."""
         num_lines = idx * 2
@@ -590,7 +594,7 @@ class Email(Communication):
             self._merge_lines(3)  # Merge 4th and 5th rows
         elif self.file_id in '026609 029402 032405 022695'.split():
             self._merge_lines(4)  # Merge 5th and 6th rows
-        elif self.file_id in ['019407', '031980', '030384', '033144', '030999', '033575', '029835', '030381', '033357']:
+        elif self.file_id in ['019407', '031980', '030384', '033144', '030999', '033575', '029835', '030381', '033357', '026924']:
             self._merge_lines(2, 4)
         elif self.file_id in ['029154', '029163']:
             self._merge_lines(2, 5)
@@ -693,7 +697,7 @@ class Email(Communication):
             self.config.description = extracted_description
 
         self.config.is_interesting = self.config.is_interesting or extracted_from_doc_cfg.is_interesting
-        self.warn(f"Constructed synthetic config: {self.config}")
+        self.log(f"Constructed synthetic config: {self.config}")
 
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         logger.debug(f"Printing '{self.filename}'...")

epstein_files/documents/imessage/text_message.py

@@ -75,7 +75,7 @@ class TextMessage:
         return msg_txt
 
     def __rich__(self) -> Text:
+        timestamp_txt = Text(f"[{self.timestamp_str}]", style=TIMESTAMP_DIM).append(' ')
         author_style = get_style_for_name(self.author_str if self.author_str.startswith('+') else self.author)
         author_txt = Text(self.author_str, style=author_style)
-        timestamp_txt = Text(f"[{self.timestamp_str}]", style=TIMESTAMP_DIM).append(' ')
         return Text('').append(timestamp_txt).append(author_txt).append(': ', style='dim').append(self._message())

epstein_files/documents/messenger_log.py

@@ -12,7 +12,7 @@ from epstein_files.documents.communication import Communication
 from epstein_files.documents.imessage.text_message import TextMessage
 from epstein_files.util.constant.names import JEFFREY_EPSTEIN, UNKNOWN
 from epstein_files.util.constant.strings import AUTHOR, TIMESTAMP_STYLE
-from epstein_files.util.data import days_between, days_between_str, iso_timestamp, listify, sort_dict
+from epstein_files.util.data import days_between, days_between_str, iso_timestamp, sort_dict
 from epstein_files.util.doc_cfg import Metadata, TextCfg
 from epstein_files.util.highlighted_group import get_style_for_name
 from epstein_files.util.logging import logger

epstein_files/epstein_files.py

@@ -29,7 +29,7 @@ from epstein_files.util.env import DOCS_DIR, args, logger
 from epstein_files.util.file_helper import file_size_str
 from epstein_files.util.highlighted_group import HIGHLIGHTED_NAMES, HighlightedNames, get_info_for_name, get_style_for_name
 from epstein_files.util.rich import (DEFAULT_NAME_STYLE, LAST_TIMESTAMP_STYLE, NA_TXT, add_cols_to_table,
-     print_all_files_page_link, build_table, console, highlighter, link_text_obj, link_markup, print_author_header, print_centered,
+     print_other_page_link, build_table, console, highlighter, link_text_obj, link_markup, print_author_panel, print_centered,
      print_panel, print_section_header, vertically_pad)
 from epstein_files.util.search_result import SearchResult
 from epstein_files.util.timer import Timer
@@ -256,7 +256,7 @@ class EpsteinFiles:
         unique_emails = [email for email in emails if not email.is_duplicate()]
         author = _author or UNKNOWN
 
-        print_author_header(
+        print_author_panel(
             f"Found {len(unique_emails)} {author} emails starting {emails[0].timestamp.date()} over {conversation_length:,} days",
             get_style_for_name(author),
             get_info_for_name(author)

epstein_files/util/constant/html.py

@@ -5,6 +5,14 @@ from epstein_files.util.env import args
 
 PAGE_TITLE = '   ∞ Michel de Cryptadamus ∞   '
 
+if args.all_emails:
+    page_type = 'Emails'
+elif args.email_timeline:
+    page_type = 'Chronological Emails'
+else:
+    page_type = 'Text Messages'
+
+
 CONSOLE_HTML_FORMAT = """<!DOCTYPE html>
 <html>
 <head>
@@ -18,7 +26,7 @@ CONSOLE_HTML_FORMAT = """<!DOCTYPE html>
             background-color: {background};
         }}
     </style>
-""" + f"<title>Epstein {'Emails' if args.all_emails else 'Text Messages'}</title>" + """
+""" + f"<title>Epstein {page_type}</title>" + """
 </head>
 <body>
     <pre style="font-family: Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace; white-space: pre-wrap; overflow-wrap: break-word;">

epstein_files/util/constant/names.py

@@ -38,6 +38,7 @@ BRAD_EDWARDS = 'Brad Edwards'
 BRAD_KARP = 'Brad Karp'
 BRAD_WECHSLER = 'Brad Wechsler'
 BORIS_NIKOLIC = 'Boris Nikolic'
+CAROLYN_RANGEL = 'Carolyn Rangel'
 CECILE_DE_JONGH = 'Cecile de Jongh'
 CECILIA_STEEN = 'Cecilia Steen'
 CELINA_DUBIN = 'Celina Dubin'
@@ -238,7 +239,7 @@ OTHER_NAMES = NAMES_TO_NOT_HIGHLIGHT + """
     gardner gary geoff geoffrey gilbert gloria goldberg gonzalez gould graham greene guarino gwyneth
     hancock harold harrison harry hay helen hill hirsch hofstadter horowitz hussein
     ian isaac isaacson
-    james jamie jane janet jason jen jim joe johnson jones josh julie justin
+    james jamie jane janet jason jeffrey jen jim joe johnson jones josh julie justin
     karl kate kathy kelly kim kruger kyle
     laurie lawrence leo leonard lenny leslie lieberman louis lynch lynn
     marcus marianne matt matthew melissa michele michelle moore moscowitz

epstein_files/util/constant/output_files.py

@@ -6,6 +6,7 @@ from epstein_files.util.constant.strings import EMAIL, TEXT_MESSAGE, SiteType
 HTML_DIR = Path('docs')
 EPSTEIN_FILES_NOV_2025 = 'epstein_files_nov_2025'
 ALL_EMAILS_PATH = HTML_DIR.joinpath(f'all_emails_{EPSTEIN_FILES_NOV_2025}.html')
+CHRONOLOGICAL_EMAILS_PATH = HTML_DIR.joinpath(f'chronological_emails_{EPSTEIN_FILES_NOV_2025}.html')
 JSON_FILES_JSON_PATH = HTML_DIR.joinpath(f'json_files_from_{EPSTEIN_FILES_NOV_2025}.json')
 JSON_METADATA_PATH = HTML_DIR.joinpath(f'file_metadata_{EPSTEIN_FILES_NOV_2025}.json')
 TEXT_MSGS_HTML_PATH = HTML_DIR.joinpath('index.html')
@@ -18,6 +19,7 @@ URLS_ENV = '.urls.env'
 GH_PAGES_BASE_URL = 'https://michelcrypt4d4mus.github.io'
 TEXT_MSGS_URL = f"{GH_PAGES_BASE_URL}/epstein_text_messages"
 ALL_EMAILS_URL = f"{TEXT_MSGS_URL}/{ALL_EMAILS_PATH.name}"
+CHRONOLOGICAL_EMAILS_URL = f"{TEXT_MSGS_URL}/{CHRONOLOGICAL_EMAILS_PATH.name}"
 JSON_FILES_URL = f"{TEXT_MSGS_URL}/{JSON_FILES_JSON_PATH.name}"
 JSON_METADATA_URL = f"{TEXT_MSGS_URL}/{JSON_METADATA_PATH.name}"
 WORD_COUNT_URL = f"{TEXT_MSGS_URL}/{WORD_COUNT_HTML_PATH.name}"
@@ -29,6 +31,7 @@ SITE_URLS: dict[SiteType, str] = {
 
 BUILD_ARTIFACTS = [
     ALL_EMAILS_PATH,
+    CHRONOLOGICAL_EMAILS_PATH,
     # EPSTEIN_WORD_COUNT_HTML_PATH,
     JSON_FILES_JSON_PATH,
     JSON_METADATA_PATH,

epstein_files/util/constant/urls.py

@@ -6,6 +6,7 @@ from inflection import parameterize
 from rich.text import Text
 
 from epstein_files.util.constant.output_files import *
+from epstein_files.util.env import args
 from epstein_files.util.file_helper import coerce_file_stem
 
 # Style stuff
@@ -101,4 +102,12 @@ def link_text_obj(url: str, link_text: str | None = None, style: str = ARCHIVE_L
     return Text.from_markup(link_markup(url, link_text, style))
 
 
+def other_site_type() -> SiteType:
+    return TEXT_MESSAGE if args.all_emails else EMAIL
+
+
+def other_site_url() -> str:
+    return SITE_URLS[other_site_type()]
+
+
 CRYPTADAMUS_TWITTER = link_markup('https://x.com/cryptadamist', '@cryptadamist')

epstein_files/util/constants.py

@@ -198,7 +198,7 @@ EMAILERS = [
     'Vladimir Yudashkin',
 ]
 
-EMAILER_REGEXES = deepcopy(EMAILER_ID_REGEXES)
+EMAILER_REGEXES = deepcopy(EMAILER_ID_REGEXES)  # Keep a copy without the simple EMAILERS regexes
 
 # Add simple matching regexes for EMAILERS entries to EMAILER_REGEXES
 for emailer in EMAILERS:
@@ -536,6 +536,7 @@ EMAILS_CONFIG = [
     EmailCfg(id='033274', recipients=[JEFFREY_EPSTEIN]),  # this is a note sent to self
     EmailCfg(id='032780', recipients=[JEFFREY_EPSTEIN]),  # Bad OCR (nofix)
     EmailCfg(id='029324', recipients=[JEFFREY_EPSTEIN, "Jojo Fontanilla", "Lyn Fontanilla"]),  # Bad OCR (nofix)
+    EmailCfg(id='013482', recipients=[JEFFREY_EPSTEIN], is_fwded_article=True),  # other recipients redacted. "The view from the US: Stem cell therapy steps up a gear with firs"
     EmailCfg(id='033456', recipients=["Joel"], attribution_reason='Reply'),
     EmailCfg(id='033458', recipients=["Joel"], attribution_reason='Reply'),
     EmailCfg(id='033460', recipients=["Joel"], attribution_reason='Reply'),
@@ -626,7 +627,6 @@ EMAILS_CONFIG = [
     EmailCfg(id='021740', is_fwded_article=True),  # Miami Herald article about Epstein prosecutor
     EmailCfg(id='023126', is_fwded_article=True),  # Miami Herald on Alex Acosta
     EmailCfg(id='029625', is_fwded_article=True),  # Conchita Sarnoff Daily Beast Articles - Epstein Sex Trafficking Investigation and Settlement
-    EmailCfg(id='013482', is_fwded_article=True),  # The view from the US: Stem cell therapy steps up a gear with firs
     EmailCfg(id='029505', is_fwded_article=True),  # Foreign Policy Middle Eastern Monarchs Look at the Trump
     EmailCfg(id='029859', is_fwded_article=True),  # Palm Beach Post: Epstein paid three women $5.5 million to end lawsuits
     EmailCfg(id='031988', is_fwded_article=True),  # NYT review of Inside Job
@@ -1005,7 +1005,7 @@ OTHER_FILES_ARTICLES = [
     DocCfg(id='023046', author=VI_DAILY_NEWS, description='article', date='2019-02-27'),
     DocCfg(id='031170', author=VI_DAILY_NEWS, description='article', date='2019-03-06'),
     DocCfg(id='016506', author=VI_DAILY_NEWS, description='article', date='2019-02-28'),
-    DocCfg(id='016507', author=VI_DAILY_NEWS, description=f"'Perversion of Justice' by {JULIE_K_BROWN}", date='2018-12-19'),
+    DocCfg(id='016507', author=VI_DAILY_NEWS, description=f'"Perversion of Justice" by {JULIE_K_BROWN}', date='2018-12-19'),
     DocCfg(id='019212', author=WAPO, description=f'and Times Tribune articles about Bannon, Trump, and healthcare execs'),
     DocCfg(id='033379', author=WAPO, description=f'"How Washington Pivoted From Finger-Wagging to Appeasement" (about Viktor Orban)', date='2018-05-25'),
     DocCfg(
@@ -1020,12 +1020,12 @@ OTHER_FILES_ARTICLES = [
     DocCfg(id='026648', description=f'article about {JASTA} lawsuit against Saudi Arabia by 9/11 victims (Russian propaganda?)', date='2017-05-13'),
     DocCfg(id='032159', description=f"article about microfinance and cell phones in Zimbabwe, Strive Masiyiwa (Econet Wireless)"),
     DocCfg(id='030825', description=f'{ARTICLE_DRAFT} Syria'),
-    DocCfg(id='027051', description=f"German language article about the 2013 Lifeball / AIDS Gala", date='2013-01-01'),
+    DocCfg(id='027051', description=f"German article about the 2013 Lifeball / AIDS Gala", date='2013-01-01', attached_to_email_id='027049'),
     DocCfg(id='033480', description=f"John Bolton press clipping", date='2018-04-06', duplicate_ids=['033481']),
     DocCfg(id='013403', description=f"{LEXIS_NEXIS} result from The Evening Standard about Bernie Madoff", date='2009-12-24'),
     DocCfg(id='021093', description=f"page of unknown article about Epstein and Maxwell"),
     DocCfg(id='031191', description=f"single page of unknown article about Epstein and Trump's relationship in 1997"),
-    DocCfg(id='026520', description=f'Spanish language article about {SULTAN_BIN_SULAYEM}', date='2013-09-27'),
+    DocCfg(id='026520', description=f'Spanish article about {SULTAN_BIN_SULAYEM}', date='2013-09-27'),
     DocCfg(
         id='031736',
         description=f"{TRANSLATION} Arabic article by Abdulnaser Salamah 'Trump; Prince of Believers (Caliph)!'",
@@ -1418,7 +1418,7 @@ OTHER_FILES_POLITICS = [
     DocCfg(
         id='025849',
         author='US Office of Government Information Services',
-        description=f"Building a Bridge Between FOIA Requesters & Agencies",
+        description=f'"Building a Bridge Between FOIA Requesters & Agencies"',
     ),
     DocCfg(id='031670', description=f"letter from General Mike Flynn's lawyers to senators Mark Warner & Richard Burr about subpoena"),
     DocCfg(
@@ -1496,6 +1496,13 @@ OTHER_FILES_RESUMES = [
 OTHER_FILES_ARTS = [
     DocCfg(id='018703', author=ANDRES_SERRANO, description=f"artist statement about Trump objects"),
     DocCfg(id='023438', author=BROCKMAN_INC, description=f"announcement of auction of 'Noise' by Daniel Kahneman, Olivier Sibony, and Cass Sunstein"),
+    DocCfg(
+        id='025147',
+        author=BROCKMAN_INC,
+        description=f'hot list Frankfurt Book Fair (includes article about Silk Road/Ross Ulbricht)',
+        date='2016-10-23',
+        is_interesting=True,
+    ),
     DocCfg(id='030769', author='Independent Filmmaker Project (IFP)', description=f"2017 Gotham Awards invitation"),
     DocCfg(
         id='025205',
@@ -1520,12 +1527,6 @@ OTHER_FILES_MISC = [
         author=f'linkspirit (French?) and {LAWRENCE_KRAUSS}',
         is_interesting=True,  # we don't know who linkspirit is yet
     ),
-    DocCfg(
-        id='025147',
-        author=BROCKMAN_INC,
-        description=f'hot list Frankfurt Book Fair (includes article about Silk Road/Ross Ulbricht)',
-        date='2016-10-23',
-    ),
     DocCfg(id='022494', author='DOJ', description=f'Foreign Corrupt Practices Act (FCPA) Resource Guide'),
     DocCfg(id='023096', author=EPSTEIN_FOUNDATION, description=f'blog post', date='2012-11-15'),
     DocCfg(id='029326', author=EPSTEIN_FOUNDATION, description=f'{PRESS_RELEASE}', date='2013-02-15'),
@@ -1533,7 +1534,7 @@ OTHER_FILES_MISC = [
     DocCfg(id='027071', author=FEMALE_HEALTH_COMPANY, description=f"brochure requesting donations for female condoms in Uganda"),
     DocCfg(id='027074', author=FEMALE_HEALTH_COMPANY, description=f"pitch deck (USAID was a customer)"),
     DocCfg(id='032735', author=GORDON_GETTY, description=f"on Trump", date='2018-03-20'),  # Dated based on concurrent emails from Getty
-    DocCfg(id='025540', author=JEFFREY_EPSTEIN, description=f"rough draft of Epstein's side of the story?"),
+    DocCfg(id='025540', author=JEFFREY_EPSTEIN, description=f"rough draft of his side of the story"),
     DocCfg(id='026634', author='Michael Carrier', description=f"comments about an Apollo linked hedge fund 'DE Fund VIII'"),
     DocCfg(id='031425', author=SCOTT_J_LINK, description=f'completely redacted email from', is_interesting=False),
     DocCfg(id='020447', author='Working Group on Chinese Influence Activities in the U.S.', description=f'Promoting Constructive Vigilance'),

epstein_files/util/env.py

@@ -22,6 +22,7 @@ output = parser.add_argument_group('OUTPUT', 'Options used by epstein_generate.'
 output.add_argument('--all-emails', '-ae', action='store_true', help='all the emails instead of just the interesting ones')
 output.add_argument('--all-other-files', '-ao', action='store_true', help='all the non-email, non-text msg files instead of just the interesting ones')
 output.add_argument('--build', '-b', action='store_true', help='write HTML output to a file')
+output.add_argument('--email-timeline', action='store_true', help='print a table of all emails in chronological order')
 output.add_argument('--json-files', action='store_true', help='pretty print all the raw JSON data files in the collection and exit')
 output.add_argument('--json-metadata', action='store_true', help='dump JSON metadata for all files and exit')
 output.add_argument('--output-emails', '-oe', action='store_true', help='generate emails section')
@@ -70,7 +71,7 @@ args.output_other = args.output_other or args.all_other_files or args.uninterest
 args.overwrite_pickle = args.overwrite_pickle or (is_env_var_set('OVERWRITE_PICKLE') and not is_env_var_set('PICKLED'))
 args.width = args.width if is_html_script else None
 is_any_output_selected = any([arg.startswith('output_') and value for arg, value in vars(args).items()])
-is_any_output_selected = is_any_output_selected or args.json_metadata or args.colors_only
+is_any_output_selected = is_any_output_selected or args.colors_only or args.email_timeline or args.json_metadata
 
 # Log level args
 if args.deep_debug:

epstein_files/util/highlighted_group.py

@@ -15,7 +15,7 @@ from epstein_files.util.data import extract_last_name, listify, without_falsey
 CIVIL_ATTORNEY = 'civil attorney'
 CRIMINAL_DEFENSE_ATTORNEY = 'criminal defense attorney'
 CRIMINAL_DEFENSE_2008 = f"{CRIMINAL_DEFENSE_ATTORNEY} on 2008 case"
-EPSTEIN_LAWYER = 'epstein_lawyer'
+EPSTEIN_LAWYER = 'Epstein lawyer'
 EPSTEIN_V_ROTHSTEIN_EDWARDS_ATTORNEY = f"{CIVIL_ATTORNEY} working on {EPSTEIN_V_ROTHSTEIN_EDWARDS}"
 ESTATE_EXECUTOR = 'estate executor'
 EPSTEIN_ESTATE_EXECUTOR = f"Epstein {ESTATE_EXECUTOR}"
@@ -103,7 +103,7 @@ class HighlightedNames(HighlightedText):
     def get_info(self, name: str) -> str | None:
         """Label and additional info for 'name' if 'name' is in self.emailers."""
         info_pieces = [
-            None if len(self.emailers) == 1 else (self.category or self.label.title()),
+            None if len(self.emailers) == 1 else (self.category or self.label.replace('_', ' ')),
             self.emailers.get(name),
         ]
 
@@ -111,7 +111,7 @@ class HighlightedNames(HighlightedText):
         return ', '.join(info_pieces) if info_pieces else None
 
     def _emailer_pattern(self, name: str) -> str:
-        """Pattern matching 'name'. Extends value in EMAILER_ID_REGEXES with last name if it exists."""
+        """Pattern matching 'name'. Extends value in EMAILER_ID_REGEXES with first/last name if it exists."""
         name = remove_question_marks(name)
         last_name = extract_last_name(name)
         first_name = name.removesuffix(f" {last_name}")
@@ -141,11 +141,12 @@ class HighlightedNames(HighlightedText):
 
 HIGHLIGHTED_NAMES = [
     HighlightedNames(
-        label='africa',
+        label='Africa',
         style='light_pink4',
-        pattern=r'Econet(\s*Wireless)|Ghana(ian)?|Johannesburg|Kenya|Nigerian?|Senegal(ese)?|Serengeti|(South\s*)?African?|(Strive\s*)?Masiyiwa|Tanzania|Ugandan?|Zimbabwe(an)?',
+        pattern=r'Buhari|Econet(\s*Wireless)|Ghana(ian)?|Glencore|Goodluck Jonathan|Johannesburg|Kenya|Nigerian?|Okey Enelamah|Senegal(ese)?|Serengeti|(South\s*)?African?|(Strive\s*)?Masiyiwa|Tanzania|Ugandan?|Zimbabwe(an)?',
         emailers={
             'Abdoulaye Wade': 'former president of Senegal, father of Karim Wade',
+            'Ivan Glasenberg': "South African former CEO of Glencore, one of the world's largest commodity trading and mining companies",
             'Karim Wade': 'son of the president of Senegal, facing arrest for corruption, email handle is "Afri zp"',
             'Miles Alexander': 'Operations Manager Michaelhouse Balgowan KwaZulu-Natal South Africa',  # TODO: what's up with this person?
             'Macky Sall': 'prime minister of Senegal, defeated Abdoulaye Wade',
@@ -154,8 +155,9 @@ HIGHLIGHTED_NAMES = [
     HighlightedNames(
         label='bitcoin',
         style='orange1 bold',
-        pattern=r'Balaji|bitcoin|block ?chain(\s*capital)?|Brock(\s*Pierce)?|coins?|cr[iy]?pto(currenc(y|ies))?|e-currency|(Gavin )?Andressen|(Howard\s+)?Lutnic?k|(jeffrey\s+)?wernick|Libra|Madars|(Patrick\s*)?Murck|(Ross\s*)?Ulbricht|Silk\s*Road|SpanCash|Tether|virtual\s*currenc(ies|y)|(zero\s+knowledge\s+|zk)pro(of|tocols?)',
+        pattern=r'Balaji|bitcoin|block ?chain(\s*capital)?|Brock(\s*Pierce)?|coins?|cr[iy]?pto(currenc(y|ies))?|e-currency|(Gavin )?Andressen|(Howard\s+)?Lutnic?k|Libra|Madars|(Patrick\s*)?Murck|(Ross\s*)?Ulbricht|Silk\s*Road|SpanCash|Tether|virtual\s*currenc(ies|y)|(zero\s+knowledge\s+|zk)pro(of|tocols?)',
         emailers = {
+            'Jeffrey Wernick': 'former COO of Parler, involved in numerous crypto companies like Bitforex',
             JEREMY_RUBIN: 'developer/researcher',
             ANTHONY_SCARAMUCCI: 'Skybridge Capital, FTX investor',
         },
@@ -183,12 +185,15 @@ HIGHLIGHTED_NAMES = [
         pattern=r"CBD|cannabis|marijuana|THC|WEED(guide|maps)?[^s]?",
     ),
     HighlightedNames(
-        label='china',
+        label='China',
         style='bright_red',
-        pattern=r"Ali.?baba|Beijing|CCP|Chin(a|e?se)(?! Daily)|DPRK|Gino\s+Yu|Global Times|Guo|Hong|Huaw[ae]i|Kim\s*Jong\s*Un|Kong|Jack\s+Ma|Kwok|Ministry\sof\sState\sSecurity|Mongolian?|MSS|North\s*Korea|Peking|PRC|SCMP|Tai(pei|wan)|Xi(aomi)?|Jinping",
+        pattern=r"Ali.?baba|Beijing|CCP|Chin(a|e?se)(?! Daily)|DPRK|Global Times|Guo|Hong|Huaw[ae]i|Kim\s*Jong\s*Un|Kong|Jack\s+Ma|Kwok|Ministry\sof\sState\sSecurity|Mongolian?|MSS|North\s*Korea|Peking|PRC|SCMP|Tai(pei|wan)|Xi(aomi)?|Jinping",
+        emailers={
+            'Gino Yu': 'professor / game designer in Hong Kong',
+        }
     ),
     HighlightedNames(
-        label='deepak_chopra',
+        label='Deepak Chopra',
         style='dark_sea_green4',
         emailers = {
             'Carolyn Rangel': 'assistant',
@@ -196,7 +201,7 @@ HIGHLIGHTED_NAMES = [
         }
     ),
     HighlightedNames(
-        label='democrats',
+        label='Democrats',
         style='sky_blue1',
         pattern=r'(Al\s*)?Franken|((Bill|Hillart?y)\s*)?Clinton|((Chuck|Charles)\s*)?S(ch|hc)umer|(Diana\s*)?DeGette|DNC|Elena\s*Kagan|(Eliott?\s*)?Spitzer(, Eliot)?|George\s*Mitchell|(George\s*)?Soros|Hill?ary|Dem(ocrat(ic)?)?|(Jo(e|seph)\s*)?Biden|(John\s*)?Kerry|Lisa Monaco|(Matteo\s*)?Salvini|Maxine\s*Waters|(Barac?k )?Obama|(Nancy )?Pelosi|Ron\s*Dellums|Schumer|(Tim\s*)?Geithner|Vernon\s*Jordan',
     ),
@@ -271,7 +276,7 @@ HIGHLIGHTED_NAMES = [
     HighlightedNames(
         label=ESTATE_EXECUTOR,
         style='purple3 bold',
-        category='epstein lawyer',
+        category='Epstein lawyer',
         emailers = {
             DARREN_INDYKE: EPSTEIN_ESTATE_EXECUTOR,
             RICHARD_KAHN: EPSTEIN_ESTATE_EXECUTOR,
@@ -280,7 +285,7 @@ HIGHLIGHTED_NAMES = [
     HighlightedNames(
         label='europe',
         style='light_sky_blue3',
-        pattern=r'(Angela )?Merk(el|le)|Austria|(Benjamin\s*)?Harnwell|Berlin|Borge|Boris\s*Johnson|Brexit(eers?)?|Brit(ain|ish)|Brussels|Cannes|(Caroline|Jack)?\s*Lang(, Caroline)?|Cypr(iot|us)|Davos|ECB|England|EU|Europe(an)?(\s*Union)?|Fr(ance|ench)|Geneva|Germany?|Gillard|Gree(ce|k)|Ital(ian|y)|Jacques|(Kevin\s*)?Rudd|Le\s*Pen|London|Macron|Melusine|Munich|(Natalia\s*)?Veselnitskaya|(Nicholas\s*)?Sarkozy|Nigel(\s*Farage)?|Norw(ay|egian)|Oslo|Paris|Polish|(Sebastian )?Kurz|(Vi(c|k)tor\s+)?Orbah?n|Edward Rod Larsen|Strasbourg|Strauss[- ]?Kahn|Swed(en|ish)(?![-\s]+America)|Switzerland|(Tony\s)?Blair|U\.?K\.?|Ukrain(e|ian)|Vienna|(Vitaly\s*)?Churkin|Zug',
+        pattern=r'(Angela )?Merk(el|le)|Austria|(Benjamin\s*)?Harnwell|Berlin|Borge|Boris\s*Johnson|Brexit(eers?)?|Brit(ain|ish)|Brussels|Cannes|(Caroline|Jack)?\s*Lang(, Caroline)?|Cypr(iot|us)|Davos|ECB|England|EU|Europe(an)?(\s*Union)?|Fr(ance|ench)|Geneva|Germany?|Gillard|Gree(ce|k)|Ital(ian|y)|Jacques|(Kevin\s*)?Rudd|Le\s*Pen|London|Macron|Melusine|Munich|(Natalia\s*)?Veselnitskaya|(Nicholas\s*)?Sarkozy|Nigel(\s*Farage)?|Norw(ay|egian)|Oslo|Paris|Polish|pope|(Sebastian )?Kurz|(Vi(c|k)tor\s+)?Orbah?n|Edward Rod Larsen|Strasbourg|Strauss[- ]?Kahn|Swed(en|ish)(?![-\s]+America)|Switzerland|(Tony\s)?Blair|U\.?K\.?|Ukrain(e|ian)|Vienna|(Vitaly\s*)?Churkin|Zug',
         emailers = {
             ANDRZEJ_DUDA: 'former president of Poland',
             MIROSLAV_LAJCAK: 'Russia-friendly Slovakian politician, friend of Steve Bannon',
@@ -290,9 +295,8 @@ HIGHLIGHTED_NAMES = [
         }
     ),
     HighlightedNames(
-        label='famous_lawyer',
+        label='famous lawyer',
         style='medium_purple3',
-        category='famous_lawyer',
         pattern=r'(David\s*)?Bo[il]es|dersh|(Gloria\s*)?Allred|(Mi(chael|ke)\s*)?Avenatti',
         emailers = {
             ALAN_DERSHOWITZ: 'Harvard Law School professor and all around (in)famous American lawyer',
@@ -316,7 +320,8 @@ HIGHLIGHTED_NAMES = [
             MELANIE_SPINELLA: f'representative of {LEON_BLACK}',
             MORTIMER_ZUCKERMAN: 'business partner of Epstein',
             PAUL_BARRETT: None,
-            PAUL_MORRIS: 'Deutsche Bank',
+            PAUL_MORRIS: DEUTSCHE_BANK,
+            'Steven Elkman': DEUTSCHE_BANK,
         }
     ),
     HighlightedNames(
@@ -334,7 +339,7 @@ HIGHLIGHTED_NAMES = [
         },
     ),
     HighlightedNames(
-        label=HARVARD.lower(),
+        label=HARVARD,
         style='light_goldenrod3',
         pattern=r'Cambridge|(Derek\s*)?Bok|Elisa(\s*New)?|Harvard(\s*(Business|Law|University)(\s*School)?)?|(Jonathan\s*)?Zittrain|(Stephen\s*)?Kosslyn',
         emailers = {
@@ -349,9 +354,9 @@ HIGHLIGHTED_NAMES = [
         }
     ),
     HighlightedNames(
-        label='india',
+        label='India',
         style='bright_green',
-        pattern=r'Abraaj|Anna\s*Hazare|(Arif\s*)?Naqvi|(Arvind\s*)?Kejriwal|Hardeep( Pur[ei]e)?|Indian?|InsightsPod|Modi|Mumbai|Tranchulas',
+        pattern=r'Abraaj|Anna\s*Hazare|(Arif\s*)?Naqvi|(Arvind\s*)?Kejriwal|Bangalore|Hardeep( Pur[ei]e)?|Indian?|InsightsPod|Modi|Mumbai|(New\s*)?Delhi|Tranchulas',
         emailers = {
             ANIL_AMBANI: 'chairman of Reliance Group',
             VINIT_SAHNI: None,
@@ -359,7 +364,7 @@ HIGHLIGHTED_NAMES = [
         }
     ),
     HighlightedNames(
-        label='israel',
+        label='Israel',
         style='dodger_blue2',
         pattern=r"AIPAC|Bibi|(eh|(Ehud|Nili Priell) )?barak|Ehud\s*Barack|Israeli?|Jerusalem|J\s*Street|Mossad|Netanyahu|(Sheldon\s*)?Adelson|Tel\s*Aviv|(The\s*)?Shimon\s*Post|Yitzhak|Rabin|YIVO|zionist",
         emailers={
@@ -369,7 +374,7 @@ HIGHLIGHTED_NAMES = [
         }
     ),
     HighlightedNames(
-        label='japan',
+        label='Japan',
         style='color(168)',
         pattern=r'BOJ|(Bank\s+of\s+)?Japan(ese)?|jpy?(?! Morgan)|SG|Singapore|Toky[op]',
     ),
@@ -389,7 +394,7 @@ HIGHLIGHTED_NAMES = [
         }
     ),
     HighlightedNames(
-        label='latin america',
+        label='Latin America',
         style='yellow',
         pattern=r'Argentin(a|ian)|Bolsonar[aio]|Bra[sz]il(ian)?|Bukele|Caracas|Castro|Colombian?|Cuban?|El\s*Salvador|((Enrique )?Pena )?Nieto|LatAm|Lula|Mexic(an|o)|(Nicolas\s+)?Maduro|Panama( Papers)?|Peru|Venezuelan?|Zambrano',
     ),
@@ -419,8 +424,8 @@ HIGHLIGHTED_NAMES = [
     HighlightedNames(
         label='mideast',
         style='dark_sea_green4',
-        # this won't match ever because of word boundary: [-\s]9/11[\s.]
-        pattern=r"Abdulmalik Al-Makhlafi|Abdullah|Abu\s+Dhabi|Afghanistan|Al[-\s]?Qa[ei]da|Ahmadinejad|Arab|Aramco|Assad|Bahrain|Basiji?|Benghazi|Cairo|Chagoury|Dj[iu]bo?uti|Doha|Dubai|Egypt(ian)?|Emir(at(es?|i))?|Erdogan|Fashi|Gaddafi|(Hamid\s*)?Karzai|Hamad\s*bin\s*Jassim|HBJ|Houthi|Imran\s+Khan|Iran(ian)?|Isi[ls]|Islam(abad|ic|ist)?|Istanbul|Kh?ashoggi|(Kairat\s*)?Kelimbetov|kasshohgi|Kaz(akh|ich)stan|Kazakh?|Kh[ao]menei|Khalid\s*Sheikh\s*Mohammed|KSA|Leban(ese|on)|Libyan?|Mahmoud|Marra[hk]e[cs]h|MB(N|S|Z)|Mohammed\s+bin\s+Salman|Morocco|Mubarak|Muslim|Nayaf|Pakistani?|Omar|(Osama\s*)?Bin\s*Laden|Osama(?! al)|Palestin(e|ian)|Persian?|Riya(dh|nd)|Saddam|Salman|Saudi(\s+Arabian?)?|Shariah?|SHC|sheikh|shia|(Sultan\s*)?Yacoub|Syrian?|(Tarek\s*)?El\s*Sayed|Tehran|Tunisian?|Turk(ey|ish)|UAE|((Iraq|Iran|Kuwait|Qatar|Yemen)i?)",
+        # something like this won't match ever because of word boundary: [-\s]9/11[\s.]
+        pattern=r"Abdulmalik Al-Makhlafi|Abdullah|Abu\s+Dhabi|Afghanistan|Al[-\s]?Qa[ei]da|Ahmadinejad|Arab|Aramco|Assad|Bahrain|Basiji?|Benghazi|Cairo|Chagoury|Dj[iu]bo?uti|Doha|[DB]ubai|Egypt(ian)?|Emir(at(es?|i))?|Erdogan|Fashi|Gaddafi|(Hamid\s*)?Karzai|Hamad\s*bin\s*Jassim|HBJ|Houthi|Imran\s+Khan|Iran(ian)?|Isi[ls]|Islam(abad|ic|ist)?|Istanbul|Kh?ashoggi|(Kairat\s*)?Kelimbetov|kasshohgi|Kaz(akh|ich)stan|Kazakh?|Kh[ao]menei|Khalid\s*Sheikh\s*Mohammed|KSA|Leban(ese|on)|Libyan?|Mahmoud|Marra[hk]e[cs]h|MB(N|S|Z)|Mid(dle)?\s*East|Mohammed\s+bin\s+Salman|Morocco|Mubarak|Muslim|Nayaf|Pakistani?|Omar|(Osama\s*)?Bin\s*Laden|Osama(?! al)|Palestin(e|ian)|Persian?|Riya(dh|nd)|Saddam|Salman|Saudi(\s+Arabian?)?|Shariah?|SHC|sheikh|shia|(Sultan\s*)?Yacoub|Syrian?|(Tarek\s*)?El\s*Sayed|Tehran|Tunisian?|Turk(ey|ish)|UAE|((Iraq|Iran|Kuwait|Qatar|Yemen)i?)",
         emailers = {
             ANAS_ALRASHEED: f'former information minister of Kuwait {QUESTION_MARKS}',
             AZIZA_ALAHMADI: 'Abu Dhabi Department of Culture & Tourism',
@@ -463,7 +468,7 @@ HIGHLIGHTED_NAMES = [
         }
     ),
     HighlightedNames(
-        label='republicans',
+        label='Republicans',
         style='bold dark_red',
         pattern=r'Alberto\sGonzale[sz]|(Alex\s*)?Acosta|(Bill\s*)?Barr|Bill\s*Shine|(Bob\s*)?Corker|(John\s*(R.?\s*)?)Bolton|Broidy|(Chris\s)?Christie|Devin\s*Nunes|(Don\s*)?McGa[hn]n|McMaster|(George\s*)?Nader|GOP|(Brett\s*)?Kavanaugh|Kissinger|Kobach|Koch\s*Brothers|Kolfage|Kudlow|Lewandowski|(Marco\s)?Rubio|(Mark\s*)Meadows|Mattis|McCain|(?<!Merwin Dela )Cruz|(Michael\s)?Hayden|((General|Mike)\s*)?(Flynn|Pence)|(Mitt\s*)?Romney|Mnuchin|Nikki|Haley|(Paul\s+)?(Manafort|Volcker)|(Peter\s)?Navarro|Pompeo|Reagan|Reince|Priebus|Republican|(Rex\s*)?Tillerson|(?<!Cynthia )(Richard\s*)?Nixon|Sasse|Tea\s*Party',
         # There's no emails from these people, they're just here to automate the regex creation for both first + last names
@@ -481,7 +486,7 @@ HIGHLIGHTED_NAMES = [
         },
     ),
     HighlightedNames(
-        label='russia',
+        label='Russia',
         style='red bold',
         pattern=r'Alfa\s*Bank|Anya\s*Rasulova|Chernobyl|Day\s+One\s+Ventures|(Dmitry\s)?(Kiselyov|(Lana\s*)?Pozhidaeva|Medvedev|Rybolo(o?l?ev|vlev))|Dmitry|FSB|GRU|KGB|Kislyak|Kremlin|Kuznetsova|Lavrov|Lukoil|Moscow|(Oleg\s*)?Deripaska|Oleksandr Vilkul|Rosneft|RT|St.?\s*?Petersburg|Russian?|Sberbank|Soviet(\s*Union)?|USSR|Vladimir|(Vladimir\s*)?(Putin|Yudashkin)|Women\s*Empowerment|Xitrans',
         emailers = {
@@ -511,7 +516,7 @@ HIGHLIGHTED_NAMES = [
         },
     ),
     HighlightedNames(
-        label='southeast_asia',
+        label='southeast Asia',
         style='light_salmon3 bold',
         pattern=r'Bangkok|Burm(a|ese)|Cambodian?|Laos|Malaysian?|Myan?mar|Thai(land)?|Vietnam(ese)?',
     ),
@@ -541,7 +546,7 @@ HIGHLIGHTED_NAMES = [
         pattern=r'BVI|(Jane|Tiffany)\s*Doe|Katie\s*Johnson|(Virginia\s+((L\.?|Roberts)\s+)?)?Giuffre|Virginia\s+Roberts',
     ),
     HighlightedNames(
-        label='victim_lawyer',
+        label='victim lawyer',
         style='dark_magenta bold',
         pattern=r'(Alan(\s*P.)?|MINTZ)\s*FRAADE|Paul\s*(G.\s*)?Cassell|Rothstein\s*Rosenfeldt\s*Adler|(Scott\s*)?Rothstein|(J\.?\s*)?(Stan(ley)?\s*)?Pottinger',
         emailers = {
@@ -554,7 +559,7 @@ HIGHLIGHTED_NAMES = [
         style='sea_green1',
         pattern=r'Antigua|Bahamas|Caribb?ean|Dominican\s*Republic|(Great|Little)\s*St.?\s*James|Haiti(an)?|(John\s*)deJongh(\s*Jr\.?)|(Kenneth E\. )?Mapp|Palm\s*Beach(?!\s*Post)|PBI|S(ain)?t.?\s*Thomas|USVI|(?<!Epstein )VI|(The\s*)?Virgin\s*Islands(\s*Daily\s*News)?',  # TODO: VI Daily News should be yellow but it's hard bc Daily News xists
         emailers = {
-            CECILE_DE_JONGH: f'First lady 2007-2015',
+            CECILE_DE_JONGH: f'first lady 2007-2015',
             STACEY_PLASKETT: 'non-voting member of Congress',
             KENNETH_E_MAPP: 'Governor',
         },
@@ -573,6 +578,9 @@ HIGHLIGHTED_NAMES = [
         label=STEVE_BANNON,
         style='color(58)',
         pattern=r'((Steve|Sean)\s*)?Bannon?|(American\s*)?Dharma',
+        emailers = {
+            STEVE_BANNON: 'Trump campaign manager, memecoin grifter, convicted criminal',
+        }
     ),
     HighlightedNames(
         emailers={STEVEN_HOFFENBERG: HEADER_ABBREVIATIONS['Hoffenberg']},
@@ -646,7 +654,7 @@ ALL_HIGHLIGHTS = HIGHLIGHTED_NAMES + HIGHLIGHTED_TEXTS
 
 
 class EpsteinHighlighter(RegexHighlighter):
-    """rich.highlighter that finds and colors interesting keywords based on the above config."""
+    """Finds and colors interesting keywords based on the above config."""
     base_style = f"{REGEX_STYLE_PREFIX}."
     highlights = [highlight_group.regex for highlight_group in ALL_HIGHLIGHTS]
 
@@ -666,10 +674,8 @@ def get_style_for_category(category: str) -> str | None:
     elif category == SOCIAL:
         return get_style_for_category(PUBLICIST)
 
-    category = CATEGORY_STYLE_MAPPING.get(category, category)
-
     for highlight_group in HIGHLIGHTED_NAMES:
-        if highlight_group.label == category:
+        if highlight_group.label == CATEGORY_STYLE_MAPPING.get(category, category):
             return highlight_group.style
 
 

epstein_files/util/output.py

@@ -2,6 +2,7 @@ import json
 
 from rich.padding import Padding
 
+from epstein_files.documents.document import Document
 from epstein_files.documents.email import Email
 from epstein_files.documents.messenger_log import MessengerLog
 from epstein_files.documents.other_file import FIRST_FEW_LINES, OtherFile
@@ -10,6 +11,7 @@ from epstein_files.util.constant import output_files
 from epstein_files.util.constant.html import *
 from epstein_files.util.constant.names import *
 from epstein_files.util.constant.output_files import JSON_FILES_JSON_PATH, JSON_METADATA_PATH
+from epstein_files.util.constant.strings import TIMESTAMP_DIM
 from epstein_files.util.data import dict_sets_to_lists
 from epstein_files.util.env import args
 from epstein_files.util.file_helper import log_file_write
@@ -27,13 +29,12 @@ DEFAULT_EMAILERS = [
     AL_SECKEL,
     DANIEL_SIAD,
     JEAN_LUC_BRUNEL,
-    STEVEN_HOFFENBERG,
     RENATA_BOLOTOVA,
+    STEVEN_HOFFENBERG,
     MASHA_DROKOVA,
     EHUD_BARAK,
     MARTIN_NOWAK,
     STEVE_BANNON,
-    PRINCE_ANDREW,
     JIDE_ZEITLIN,
     DAVID_STERN,
     MOHAMED_WAHEED_HASSAN,
@@ -47,9 +48,8 @@ DEFAULT_EMAILERS = [
 # Order matters. Default names to print tables w/email subject, timestamp, etc for. # TODO: get rid of this ?
 DEFAULT_EMAILER_TABLES: list[str | None] = [
     GHISLAINE_MAXWELL,
-    LEON_BLACK,
+    PRINCE_ANDREW,
     SULTAN_BIN_SULAYEM,
-    DEEPAK_CHOPRA,
     ARIANE_DE_ROTHSCHILD,
 ]
 
@@ -60,7 +60,7 @@ if len(set(DEFAULT_EMAILERS).intersection(set(DEFAULT_EMAILER_TABLES))) > 0:
 def print_emails_section(epstein_files: EpsteinFiles) -> list[Email]:
     """Returns emails that were printed (may contain dupes if printed for both author and recipient)."""
     print_section_header(('Selections from ' if not args.all_emails else '') + 'His Emails')
-    print_all_files_page_link(epstein_files)
+    print_other_page_link(epstein_files)
     emailers_to_print: list[str | None]
     emailer_tables: list[str | None] = []
     already_printed_emails: list[Email] = []
@@ -94,7 +94,7 @@ def print_emails_section(epstein_files: EpsteinFiles) -> list[Email]:
             num_emails_printed_since_last_color_key = 0
 
     if emailer_tables:
-        print_author_header(f"Email Tables for {len(emailer_tables)} Other People", 'white')
+        print_author_panel(f"Email Tables for {len(emailer_tables)} Other People", 'white')
 
         for name in DEFAULT_EMAILER_TABLES:
             epstein_files.print_emails_table_for(name)
@@ -148,7 +148,7 @@ def print_other_files_section(files: list[OtherFile], epstein_files: EpsteinFile
     if args.all_other_files:
         console.line(1)
     else:
-        print_all_files_page_link(epstein_files)
+        print_other_page_link(epstein_files)
         console.line(2)
 
         for table in [category_table, other_files_preview_table]:
@@ -171,6 +171,32 @@ def print_text_messages_section(epstein_files: EpsteinFiles) -> None:
     print_centered(MessengerLog.summary_table(epstein_files.imessage_logs))
 
 
+def write_complete_emails_timeline(epstein_files: EpsteinFiles) -> None:
+    table = build_table('All Non-Junk Emails In Chronological Order', highlight=True)
+    table.add_column('ID', style='dim')
+    table.add_column('Sent At', style=TIMESTAMP_DIM)
+    table.add_column('Author', max_width=22)
+    table.add_column('Recipients', max_width=30)
+    table.add_column('Length', justify='right', style='wheat4')
+    table.add_column('Subject')
+
+    for email in Document.sort_by_timestamp(epstein_files.non_duplicate_emails()):
+        if email.is_junk_mail():
+            continue
+
+        table.add_row(
+            email.source_file_id(),
+            email.epstein_media_link(link_txt=email.timestamp_without_seconds()),
+            email.author_txt,
+            email.recipients_txt(max_full_names=1),
+            f"{email.length()}",
+            email.subject(),
+        )
+
+    console.line(2)
+    console.print(table)
+
+
 def write_json_metadata(epstein_files: EpsteinFiles) -> None:
     json_str = epstein_files.json_metadata()
 

epstein_files/util/rich.py

@@ -14,8 +14,7 @@ from rich.theme import Theme
 
 from epstein_files.util.constant.html import CONSOLE_HTML_FORMAT, HTML_TERMINAL_THEME, PAGE_TITLE
 from epstein_files.util.constant.names import UNKNOWN
-from epstein_files.util.constant.output_files import SITE_URLS
-from epstein_files.util.constant.strings import DEFAULT, EMAIL, NA, QUESTION_MARKS, TEXT_MESSAGE, SiteType
+from epstein_files.util.constant.strings import DEFAULT, EMAIL, NA, QUESTION_MARKS, TEXT_MESSAGE
 from epstein_files.util.constant.urls import *
 from epstein_files.util.constants import FALLBACK_TIMESTAMP, HEADER_ABBREVIATIONS
 from epstein_files.util.data import json_safe
@@ -143,14 +142,8 @@ def parenthesize(msg: str | Text, style: str = '') -> Text:
     return Text('(', style=style).append(txt).append(')')
 
 
-def print_all_files_page_link(epstein_files: 'EpsteinFiles') -> None:
-    markup_msg = link_markup(SITE_URLS[EMAIL], 'the other page', style='light_slate_grey bold')
-    txt = Text.from_markup(markup_msg).append(f' is uncurated and has all {len(epstein_files.other_files)}')
-    txt.append(f" unclassifiable files and {len(epstein_files.emails):,} emails")
-    print_centered(parenthesize(txt), style='dim')
-
-
-def print_author_header(msg: str, color: str | None, footer: str | None = None) -> None:
+def print_author_panel(msg: str, color: str | None, footer: str | None = None) -> None:
+    """Print a panel with the name of an emailer and a few tidbits of information about them."""
     txt = Text(msg, justify='center')
     color = color or 'white'
     color = 'white' if color == DEFAULT else color
@@ -187,28 +180,32 @@ def print_color_key() -> None:
     print_centered(vertically_pad(color_table))
 
 
-def print_header(epstein_files: 'EpsteinFiles') -> None:
-    not_optimized_msg = f"This site isn't optimized for mobile"
+def print_title_page_header(epstein_files: 'EpsteinFiles') -> None:
+    not_optimized_msg = f"This page isn't optimized for mobile"
 
     if not args.all_emails:
         not_optimized_msg += f" but if you get past the header it should be readable"
 
     console.print(f"{not_optimized_msg}.\n", style='dim')
     print_page_title(width=TITLE_WIDTH)
-    site_type: SiteType = EMAIL if args.all_emails else TEXT_MESSAGE
-    print_starred_header(f"This is the Epstein {site_type.title()}s site", num_spaces=4, num_stars=14)
-    other_site_type: SiteType = TEXT_MESSAGE if site_type == EMAIL else EMAIL
-    other_site_msg = "another site with" + (' all of' if other_site_type == EMAIL else '')
-    other_site_msg += f" Epstein's {other_site_type}s also generated by this code"
-
-    markup_msg = link_markup(SITE_URLS[other_site_type], other_site_msg, OTHER_SITE_LINK_STYLE)
-    print_centered(parenthesize(Text.from_markup(markup_msg)), style='bold')
-    word_count_link = link_text_obj(WORD_COUNT_URL, 'most frequently used words in the emails and texts', AUX_SITE_LINK_STYLE)
-    print_centered(parenthesize(word_count_link))
-    metadata_link = link_text_obj(JSON_METADATA_URL, 'author attribution explanations', AUX_SITE_LINK_STYLE)
-    print_centered(parenthesize(metadata_link))
-    json_link = link_text_obj(WORD_COUNT_URL, "epstein's json files", AUX_SITE_LINK_STYLE)
-    print_centered(parenthesize(json_link))
+    site_type = EMAIL if (args.all_emails or args.email_timeline) else TEXT_MESSAGE
+    title = f"This is the " + ('chronological ' if args.email_timeline else '') + f"Epstein {site_type.title()}s page"
+    print_starred_header(title, num_spaces=4, num_stars=14)
+    other_site_msg = "another page with" + (' all of' if other_site_type() == EMAIL else '')
+    other_site_msg += f" Epstein's {other_site_type()}s also generated by this code"
+
+    links = [
+        Text.from_markup(link_markup(other_site_url(), other_site_msg, f"{OTHER_SITE_LINK_STYLE} bold")),
+        link_text_obj(WORD_COUNT_URL, 'most frequently used words in the emails and texts', AUX_SITE_LINK_STYLE),
+        link_text_obj(JSON_METADATA_URL, 'author attribution explanations', AUX_SITE_LINK_STYLE),
+        link_text_obj(WORD_COUNT_URL, "epstein's json files", AUX_SITE_LINK_STYLE),
+    ]
+
+    for link in links:
+        print_centered(parenthesize(link))
+
+
+def print_title_page_tables(epstein_files: 'EpsteinFiles') -> None:
     _print_external_links()
     console.line()
     _print_abbreviations_table()
@@ -272,6 +269,23 @@ def print_numbered_list_of_emailers(_list: list[str | None], epstein_files = Non
     console.line()
 
 
+def print_other_page_link(epstein_files: 'EpsteinFiles') -> None:
+    markup_msg = link_markup(other_site_url(), 'the other page', style='light_slate_grey bold')
+
+    if other_site_type() == EMAIL:
+        txt = Text.from_markup(markup_msg).append(f' is uncurated and has all {len(epstein_files.other_files)}')
+        txt.append(f" unclassifiable files and {len(epstein_files.emails):,} emails")
+    else:
+        txt = Text.from_markup(markup_msg).append(f' displays only a small collection of emails and')
+        txt.append(" unclassifiable files of particular interest")
+
+    print_centered(parenthesize(txt), style='dim')
+    chrono_emails_markup = link_text_obj(CHRONOLOGICAL_EMAILS_URL, 'a page', style='light_slate_grey bold')
+    chrono_emails_txt = Text(f"there's also ").append(chrono_emails_markup)
+    chrono_emails_txt.append(' with a table of all the emails in chronological order')
+    print_centered(parenthesize(chrono_emails_txt), style='dim')
+
+
 def print_page_title(expand: bool = True, width: int | None = None) -> None:
     title_panel = Panel(Text(PAGE_TITLE, justify='center'), expand=expand, style=TITLE_STYLE, width=width)
     console.print(Align.center(vertically_pad(title_panel)))

{epstein_files-1.0.15.dist-info → epstein_files-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: epstein-files
-Version: 1.0.15
+Version: 1.1.0
 Summary: Tools for working with the Jeffrey Epstein documents released in November 2025.
 Home-page: https://michelcrypt4d4mus.github.io/epstein_text_messages/
 License: GPL-3.0-or-later

epstein_files-1.1.0.dist-info/RECORD

@@ -0,0 +1,33 @@
+epstein_files/__init__.py,sha256=Roo3XeVQXkgMOQMdq74-dBdkRGeY3sAv7LihZwaGvaY,5538
+epstein_files/documents/communication.py,sha256=oqNsSDWe-N0jSmchIHxpihihzIWha-foFqMwKZlxyng,2057
+epstein_files/documents/document.py,sha256=s77ZQwwYmm-PDc2rZqg01FY4hpBh-XF5OHcgTVZZBes,17395
+epstein_files/documents/email.py,sha256=rGnJjRzLnq70jZpWU3oslNW-FhztlcszS3v7mwEcmzY,41222
+epstein_files/documents/emails/email_header.py,sha256=wkPfSLbmzkAeQwvhf0bAeFDLPbQT-EeG0v8vNNLYktM,7502
+epstein_files/documents/imessage/text_message.py,sha256=icIiKRRuZapkV9r_PID_7hEfy7YvPrIm9Emc4QiYxbw,2806
+epstein_files/documents/json_file.py,sha256=WcZW5NNqA67rHTdopbOGtup00muNaLlvrNgKb-K4zO8,1504
+epstein_files/documents/messenger_log.py,sha256=zRVVe82cNmNmg50kqScH38yGGoSx8NjCWfLwFGUb0rs,6501
+epstein_files/documents/other_file.py,sha256=CCwOYsipYTWZj8pSTl0kgUy_LRu7Z5ZuWygQEYhilNA,9778
+epstein_files/epstein_files.py,sha256=LsvD9O1YNp9xFIVOrswOfnbfafxgbS9ve9cqSfQENy8,17881
+epstein_files/util/constant/common_words.py,sha256=aR0UjoWmxyR49XS-DtHECQ1CiA_bK8hNP6CQ1TS9yZA,3696
+epstein_files/util/constant/html.py,sha256=ebBgoUAnKnOGSK-kMF-ybvc_2sUgAuJKiH1L4rx5kYY,1526
+epstein_files/util/constant/names.py,sha256=ceFaok_1azCzTvlsE3t-urYiKu7YNc8PumwXpkE3dmc,10513
+epstein_files/util/constant/output_files.py,sha256=et1y3AzkxKqK0k-wDhMEsQFMfoXrUpoJCn6nQONurkU,1911
+epstein_files/util/constant/strings.py,sha256=rOKmYrGIZFPQbhCgd8z7mUF0CbQQBO4ij8kXvGTDkoE,1857
+epstein_files/util/constant/urls.py,sha256=-cylNL7xJi18a6fawVTF8MO3oEdjMvo9Hg1MwC-7ydI,5098
+epstein_files/util/constants.py,sha256=4WABkEBshduSV4cZkxv0MwgJci9g6MxjhtJfPjersEo,112495
+epstein_files/util/data.py,sha256=JccGFZGiCGm7XtwpQTocIjGYOr6hTUpEPwHhjyW9Xnc,3164
+epstein_files/util/doc_cfg.py,sha256=aBIm0hyxf-aeMsb8ZUNiQFVsPFimjVUIkrVdDrg1iQU,9105
+epstein_files/util/env.py,sha256=AWZYDHQ6JRHobY1o7BHRbVObYpBejhsUN4TrOyZbzgQ,5783
+epstein_files/util/file_helper.py,sha256=uJzNHihuAi2-XMNbUdjdovgppcIt-fVIIrXHXVShA6Q,2904
+epstein_files/util/highlighted_group.py,sha256=4r-asWz53zVHKckONxTOluFCRqbX92nAID1gdXqf08g,37047
+epstein_files/util/logging.py,sha256=fuREq06xUUI3DfCV2JE-8QM-sQKxpLDj0_AYFO6qR1M,1983
+epstein_files/util/output.py,sha256=WK37ZbTvhPHczH8GNly2Pjw9IwAsiF_yn43u7Q2jf7k,10051
+epstein_files/util/rich.py,sha256=oic1wcqipTSj9G1YYP8HTzsJvGeIgrK8vN95uGOJ8sU,15715
+epstein_files/util/search_result.py,sha256=1fxe0KPBQXBk4dLfu6m0QXIzYfZCzvaSkWqvghJGzxY,567
+epstein_files/util/timer.py,sha256=8hxW4Y1JcTUfnBrHh7sL2pM9xu1sL4HFQM4CmmzTarU,837
+epstein_files/util/word_count.py,sha256=o_-HnfzHdPDPR8oA_dv6fjy1dbsHee8p_aoe62PEQHw,9213
+epstein_files-1.1.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+epstein_files-1.1.0.dist-info/METADATA,sha256=X3RI8102moyBUsT1h6TXPrNdMp6uSokA_d-g5x2GGAA,5866
+epstein_files-1.1.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+epstein_files-1.1.0.dist-info/entry_points.txt,sha256=5qYgwAXpxegeAicD_rzda_trDRnUC51F5UVDpcZ7j6Q,240
+epstein_files-1.1.0.dist-info/RECORD,,

epstein_files-1.0.15.dist-info/RECORD

@@ -1,33 +0,0 @@
-epstein_files/__init__.py,sha256=nOJ26LghS0sCdQ4qGwklVm18kbuFRn6Uu1-JDE8jwd4,5050
-epstein_files/documents/communication.py,sha256=oqNsSDWe-N0jSmchIHxpihihzIWha-foFqMwKZlxyng,2057
-epstein_files/documents/document.py,sha256=5GdM8grhaaefmXeV26XwYRZvMNqFETFnE7mFpVGGNik,17249
-epstein_files/documents/email.py,sha256=h8V-20JAw2U_7mIWfnt3phvnykf-ioCdML8dAYoFVMc,40937
-epstein_files/documents/emails/email_header.py,sha256=wkPfSLbmzkAeQwvhf0bAeFDLPbQT-EeG0v8vNNLYktM,7502
-epstein_files/documents/imessage/text_message.py,sha256=JPHlO-5Xgt5V5E9fDsgCEr3XOp7FyzlhIHmZhFNZcmg,2806
-epstein_files/documents/json_file.py,sha256=WcZW5NNqA67rHTdopbOGtup00muNaLlvrNgKb-K4zO8,1504
-epstein_files/documents/messenger_log.py,sha256=yFw5ScyP3KM8AoV9D36GUxLIT3pLsDdpi5F61Dw7fwQ,6510
-epstein_files/documents/other_file.py,sha256=CCwOYsipYTWZj8pSTl0kgUy_LRu7Z5ZuWygQEYhilNA,9778
-epstein_files/epstein_files.py,sha256=pBtrcEGZAMUDO_Xghxt-bd_RZp6JQlDj770EaM9oEZ4,17887
-epstein_files/util/constant/common_words.py,sha256=aR0UjoWmxyR49XS-DtHECQ1CiA_bK8hNP6CQ1TS9yZA,3696
-epstein_files/util/constant/html.py,sha256=9U098TGzlghGg4WfxLYHyub5JGR17Dv7VP5i2MSu8Kk,1415
-epstein_files/util/constant/names.py,sha256=nk_kuOtIo_UTl4R4klUGJRfCRNDZZkqKkjbJx6XCOzQ,10471
-epstein_files/util/constant/output_files.py,sha256=BkV4_gmdj46RfGy5SFYp6dgTty3FtlBth5YGmaGutls,1700
-epstein_files/util/constant/strings.py,sha256=rOKmYrGIZFPQbhCgd8z7mUF0CbQQBO4ij8kXvGTDkoE,1857
-epstein_files/util/constant/urls.py,sha256=Rpr9QQfjk2-8YGTXSQYg2oNA2ZxWrkedr5tL_53Z6ak,4896
-epstein_files/util/constants.py,sha256=cIFDxq7-t6UE_qs2RtcyY2R3BAZmVV3glgTgKVkrG0c,112348
-epstein_files/util/data.py,sha256=JccGFZGiCGm7XtwpQTocIjGYOr6hTUpEPwHhjyW9Xnc,3164
-epstein_files/util/doc_cfg.py,sha256=aBIm0hyxf-aeMsb8ZUNiQFVsPFimjVUIkrVdDrg1iQU,9105
-epstein_files/util/env.py,sha256=aSUC_TwdtKB8z6PCDaLeu3k5qZE3AgcsP9jU2p9eaP0,5640
-epstein_files/util/file_helper.py,sha256=uJzNHihuAi2-XMNbUdjdovgppcIt-fVIIrXHXVShA6Q,2904
-epstein_files/util/highlighted_group.py,sha256=ACDwLratRV9bemDyHY528JMFDf0ZDjm9HBfFJiqDgyY,36535
-epstein_files/util/logging.py,sha256=fuREq06xUUI3DfCV2JE-8QM-sQKxpLDj0_AYFO6qR1M,1983
-epstein_files/util/output.py,sha256=2YKpL2gGhS2SI5nC2yan0vNHvYMg1Ayq_ptzx9Gi9E4,9055
-epstein_files/util/rich.py,sha256=bQPlOEZ6qTpVF4yPnwmlBk4K11zH5RJjwbWeBIOUUGE,15191
-epstein_files/util/search_result.py,sha256=1fxe0KPBQXBk4dLfu6m0QXIzYfZCzvaSkWqvghJGzxY,567
-epstein_files/util/timer.py,sha256=8hxW4Y1JcTUfnBrHh7sL2pM9xu1sL4HFQM4CmmzTarU,837
-epstein_files/util/word_count.py,sha256=o_-HnfzHdPDPR8oA_dv6fjy1dbsHee8p_aoe62PEQHw,9213
-epstein_files-1.0.15.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-epstein_files-1.0.15.dist-info/METADATA,sha256=yELMsoWwHhLiDjU7OFOYDAmifBak0h6xGLEu-3nwiHc,5867
-epstein_files-1.0.15.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-epstein_files-1.0.15.dist-info/entry_points.txt,sha256=5qYgwAXpxegeAicD_rzda_trDRnUC51F5UVDpcZ7j6Q,240
-epstein_files-1.0.15.dist-info/RECORD,,