Skip to content

Commit 74ac221

Browse files
committed
refactor: use delphi_utils.logger instead of copied file
* remove duplicate logger.py in this repo
1 parent 694d89a commit 74ac221

18 files changed

+29
-284
lines changed

src/acquisition/covid_hosp/common/database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# first party
1313
import delphi.operations.secrets as secrets
14-
from delphi.epidata.common.logger import get_structured_logger
14+
from delphi_utils import get_structured_logger
1515

1616
Columndef = namedtuple("Columndef", "csv_name sql_name dtype")
1717

src/acquisition/covidcast/csv_importer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
import pandas as pd
1414

1515
# first party
16-
from delphi_utils import Nans
16+
from delphi_utils import get_structured_logger, Nans
1717
from delphi.utils.epiweek import delta_epiweeks
1818
from delphi.epidata.common.covidcast_row import CovidcastRow
19-
from delphi.epidata.common.logger import get_structured_logger
2019

2120
DataFrameRow = NamedTuple('DFRow', [
2221
('geo_id', str),

src/acquisition/covidcast/csv_to_database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from delphi.epidata.acquisition.covidcast.csv_importer import CsvImporter, PathDetails
1212
from delphi.epidata.acquisition.covidcast.database import Database, DBLoadStateException
1313
from delphi.epidata.acquisition.covidcast.file_archiver import FileArchiver
14-
from delphi.epidata.common.logger import get_structured_logger
14+
from delphi_utils import get_structured_logger
1515

1616

1717
def get_argument_parser():

src/acquisition/covidcast/database.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# first party
1616
import delphi.operations.secrets as secrets
17-
from delphi.epidata.common.logger import get_structured_logger
17+
from delphi_utils import get_structured_logger
1818
from delphi.epidata.common.covidcast_row import CovidcastRow
1919

2020

@@ -117,28 +117,28 @@ def insert_or_update_batch(self, cc_rows: List[CovidcastRow], batch_size=2**20,
117117
get_structured_logger("insert_or_update_batch").fatal(err_msg)
118118
raise DBLoadStateException(err_msg)
119119

120-
# NOTE: `value_update_timestamp` is hardcoded to "NOW" (which is appropriate) and
120+
# NOTE: `value_update_timestamp` is hardcoded to "NOW" (which is appropriate) and
121121
# `is_latest_issue` is hardcoded to 1 (which is temporary and addressed later in this method)
122122
insert_into_loader_sql = f'''
123123
INSERT INTO `{self.load_table}`
124124
(`source`, `signal`, `time_type`, `geo_type`, `time_value`, `geo_value`,
125-
`value_updated_timestamp`, `value`, `stderr`, `sample_size`, `issue`, `lag`,
125+
`value_updated_timestamp`, `value`, `stderr`, `sample_size`, `issue`, `lag`,
126126
`is_latest_issue`, `missing_value`, `missing_stderr`, `missing_sample_size`)
127127
VALUES
128-
(%s, %s, %s, %s, %s, %s,
129-
UNIX_TIMESTAMP(NOW()), %s, %s, %s, %s, %s,
128+
(%s, %s, %s, %s, %s, %s,
129+
UNIX_TIMESTAMP(NOW()), %s, %s, %s, %s, %s,
130130
1, %s, %s, %s)
131131
'''
132132

133133
# all load table entries are already marked "is_latest_issue".
134134
# if an entry in the load table is NOT in the latest table, it is clearly now the latest value for that key (so we do nothing (thanks to INNER join)).
135135
# if an entry *IS* in both load and latest tables, but latest table issue is newer, unmark is_latest_issue in load.
136136
fix_is_latest_issue_sql = f'''
137-
UPDATE
138-
`{self.load_table}` JOIN `{self.latest_view}`
139-
USING (`source`, `signal`, `geo_type`, `geo_value`, `time_type`, `time_value`)
140-
SET `{self.load_table}`.`is_latest_issue`=0
141-
WHERE `{self.load_table}`.`issue` < `{self.latest_view}`.`issue`
137+
UPDATE
138+
`{self.load_table}` JOIN `{self.latest_view}`
139+
USING (`source`, `signal`, `geo_type`, `geo_value`, `time_type`, `time_value`)
140+
SET `{self.load_table}`.`is_latest_issue`=0
141+
WHERE `{self.load_table}`.`issue` < `{self.latest_view}`.`issue`
142142
'''
143143

144144
# TODO: consider handling cc_rows as a generator instead of a list

src/acquisition/covidcast/file_archiver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import shutil
77

88
# first party
9-
from delphi.epidata.common.logger import get_structured_logger
9+
from delphi_utils import get_structured_logger
1010

1111
class FileArchiver:
1212
"""Archives files by moving and compressing."""

src/client/delphi_epidata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from aiohttp import ClientSession, TCPConnector, BasicAuth
1818

19-
from delphi_utils.logger import get_structured_logger
19+
from delphi_utils import get_structured_logger
2020

2121
__version__ = "4.1.23"
2222

src/common/logger.py

Lines changed: 0 additions & 254 deletions
This file was deleted.

src/maintenance/covidcast_meta_cache_updater.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# first party
99
from delphi.epidata.acquisition.covidcast.database import Database
10-
from delphi.epidata.common.logger import get_structured_logger
10+
from delphi_utils import get_structured_logger
1111
from delphi.epidata.client.delphi_epidata import Epidata
1212

1313
def get_argument_parser():

src/maintenance/delete_batch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# first party
1010
from delphi.epidata.acquisition.covidcast.database import Database
11-
from delphi.epidata.common.logger import get_structured_logger
11+
from delphi_utils import get_structured_logger
1212

1313

1414
def get_argument_parser():

src/maintenance/signal_dash_data_generator.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# first party
1616
import covidcast
1717
import delphi.operations.secrets as secrets
18-
from delphi.epidata.common.logger import get_structured_logger
18+
from delphi_utils import get_structured_logger
1919

2020

2121
LOOKBACK_DAYS_FOR_COVERAGE = 56
@@ -150,11 +150,11 @@ def write_coverage(
150150

151151
def get_enabled_signals(self) -> List[DashboardSignal]:
152152
"""Retrieve all enabled signals from the database"""
153-
select_statement = f'''SELECT `id`,
153+
select_statement = f'''SELECT `id`,
154154
`name`,
155155
`source`,
156156
`covidcast_signal`,
157-
`latest_coverage_update`,
157+
`latest_coverage_update`,
158158
`latest_status_update`
159159
FROM `{Database.SIGNAL_TABLE_NAME}`
160160
WHERE `enabled`
@@ -208,7 +208,7 @@ def get_coverage(dashboard_signal: DashboardSignal) -> List[DashboardSignalCover
208208
lambda x: pd.to_datetime(Week(x // 100, x % 100).startdate()))
209209

210210
signal_coverage_list = []
211-
211+
212212
for _, row in count_by_geo_type_df.iterrows():
213213
signal_coverage = DashboardSignalCoverage(
214214
signal_id=dashboard_signal.db_id,

0 commit comments

Comments
 (0)