From 2fc21a8aaf32bd5988f1c8b257edc39f48c88b04 Mon Sep 17 00:00:00 2001 From: Dwight Gunning Date: Sun, 17 Nov 2024 06:19:43 -0500 Subject: [PATCH] Slight improvements to color scheme of Entity --- edgar/entities.py | 32 ++++++++++++++++---------------- tests/batch/batch_entity.py | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/edgar/entities.py b/edgar/entities.py index 4946c3c4..e4bb9829 100644 --- a/edgar/entities.py +++ b/edgar/entities.py @@ -4,9 +4,9 @@ import re from dataclasses import dataclass from functools import lru_cache, cached_property +from itertools import zip_longest from pathlib import Path from typing import List, Dict, Optional, Union, Tuple, Any -from itertools import zip_longest import httpx import numpy as np @@ -20,13 +20,15 @@ from rich.panel import Panel from rich.table import Table, Column from rich.text import Text +from rich.padding import Padding + from edgar._filings import Filing, Filings, FilingsState +from edgar.company_reports import TenK, TenQ from edgar.core import (log, Result, display_size, listify, is_using_local_storage, - filter_by_date, IntString, InvalidDateException, reverse_name, get_edgar_data_directory, datefmt) + filter_by_date, IntString, InvalidDateException, reverse_name, get_edgar_data_directory, + datefmt) from edgar.financials import Financials -from edgar.company_reports import TenK, TenQ from edgar.httprequests import download_json, download_text, download_bulk_data -from edgar.reference import states from edgar.reference.tickers import get_company_tickers, get_icon_from_ticker, find_cik from edgar.richtools import df_to_rich_table, repr_rich from edgar.search.datasearch import FastSearch, company_ticker_preprocess, company_ticker_score @@ -425,7 +427,7 @@ def financials(self) -> Optional[Financials]: return tenk_filing.financials @property - def quarterly_financials(self)-> Optional[Financials]: + def quarterly_financials(self) -> Optional[Financials]: """ Get the latest 10-Q financials """ @@ -646,7 +648,6 @@ def to_dict(self, include_filings: bool = False): company_dict['filings'] = self.filings.to_dict() return company_dict - @staticmethod def get_operating_type_emoticon(entity_type: str) -> str: """ @@ -708,17 +709,16 @@ def __rich__(self) -> Panel: # Primary entity identification section if self.is_company: ticker_display = f" ({self.ticker_display})" if self.ticker_display else "" - entity_title = Text.assemble("🏢", (f"{self.display_name}{ticker_display}", "bold green")) + entity_title = Text.assemble("🏢", (f"{self.display_name}{ticker_display}", "bold deep_sky_blue3")) else: - entity_title = Text.assemble("👤", (self.display_name, "bold deep_sky_blue3")) - + entity_title = Text.assemble("👤", (self.display_name, "bold green")) # Primary Information Table main_info = Table(box=box.SIMPLE_HEAVY, show_header=False, padding=(0, 1)) main_info.add_column("Row", style="") # Single column for the entire row row_parts = [] - row_parts.extend([Text("CIK", style="grey60"), Text(str(self.cik), style="bold green")]) + row_parts.extend([Text("CIK", style="grey60"), Text(str(self.cik), style="bold deep_sky_blue3")]) if self.entity_type: if self.is_individual: row_parts.extend([Text("Type", style="grey60"), @@ -748,7 +748,7 @@ def __rich__(self) -> Panel: basic_info_renderables = [main_info] basic_info_panel = Panel( Group(*basic_info_renderables), - title="📋 Basic Information", + title="📋 Entity", border_style="grey50" ) @@ -756,14 +756,14 @@ def __rich__(self) -> Panel: if self.tickers and self.exchanges: trading_info = Table(box=box.SIMPLE, show_header=True, padding=(0, 1)) trading_info.add_column("Exchange", style="bold grey70") - trading_info.add_column("Symbol", style="bold green") + trading_info.add_column("Symbol", style="bold deep_sky_blue3") for exchange, ticker in zip_longest(self.exchanges, self.tickers, fillvalue="-"): trading_info.add_row(exchange, ticker) trading_panel = Panel( trading_info, - title="📈 Trading Information", + title="📈 Exchanges", border_style="grey50" ) else: @@ -816,7 +816,7 @@ def __rich__(self) -> Panel: for former_name in self.former_names: from_date = datefmt(former_name['from'], '%B %Y') to_date = datefmt(former_name['to'], '%B %Y') - former_names_table.add_row(Text(former_name['name'], style="italic"), f"{from_date} to {to_date}" ) + former_names_table.add_row(Text(former_name['name'], style="italic"), f"{from_date} to {to_date}") former_names_panel = Panel( former_names_table, @@ -828,14 +828,14 @@ def __rich__(self) -> Panel: # Combine all sections using Group if self.is_company: - content_renderables = [basic_info_panel, trading_panel] + content_renderables = [Padding("", (1, 0, 0, 0)), basic_info_panel, trading_panel] if len(content_renderables): contact_and_addresses = Columns(contact_renderables, equal=True, expand=True) content_renderables.append(contact_and_addresses) if former_names_panel: content_renderables.append(former_names_panel) else: - content_renderables = [basic_info_panel] + content_renderables = [Padding("", (1, 0, 0, 0)), basic_info_panel] if len(contact_renderables): contact_and_addresses = Columns(contact_renderables, equal=True, expand=True) content_renderables.append(contact_and_addresses) diff --git a/tests/batch/batch_entity.py b/tests/batch/batch_entity.py index 3ee82cc1..7787fd17 100644 --- a/tests/batch/batch_entity.py +++ b/tests/batch/batch_entity.py @@ -8,7 +8,7 @@ def view_entities(): entities = get_cik_lookup_data().sample(200) for entity in tqdm(entities.itertuples(), total=len(entities)): try: - entity = Entity(entity.cik, include_old_filings=False) + entity = Entity(entity.cik) print() print(entity) except Exception as e: