Spaces:
Running
Running
ksvmuralidhar
commited on
Commit
•
7094c14
1
Parent(s):
7fbebb7
Update app.py
Browse files
app.py
CHANGED
@@ -18,7 +18,7 @@ app = Flask(__name__)
|
|
18 |
CORS(app)
|
19 |
redis_client = redis.Redis(host='localhost', port=6379, decode_responses=True)
|
20 |
logging.basicConfig(format='%(asctime)s %(message)s')
|
21 |
-
logging.
|
22 |
db = DBOperations()
|
23 |
session_id = None
|
24 |
|
@@ -28,7 +28,7 @@ REFRESH_FREQ = 300 # 300 secs = 5 mins
|
|
28 |
def is_db_fetch_reqd():
|
29 |
try:
|
30 |
env_news_time = redis_client.get('NEWSFETCHTIME')
|
31 |
-
logging.
|
32 |
fetch_flag = 1
|
33 |
if env_news_time is None:
|
34 |
redis_client.set("NEWSFETCHTIME", str(datetime.now()))
|
@@ -49,7 +49,7 @@ def is_db_fetch_reqd():
|
|
49 |
|
50 |
def correct_date(x):
|
51 |
if (not isinstance(x, str)) or (str(x).find(":") == -1):
|
52 |
-
logging.
|
53 |
return "2020-11-07 00:36:44+05:30"
|
54 |
return x
|
55 |
|
@@ -62,7 +62,7 @@ def date_time_parser(dt):
|
|
62 |
try:
|
63 |
return int(np.round((dt.now(dt.tz) - dt).total_seconds() / 60, 0))
|
64 |
except:
|
65 |
-
logging.
|
66 |
return 100000
|
67 |
|
68 |
|
@@ -107,11 +107,11 @@ def elapsed_time_str(mins):
|
|
107 |
|
108 |
def fetch_from_db(fetch_flag):
|
109 |
try:
|
110 |
-
logging.
|
111 |
if fetch_flag == 1:
|
112 |
final_df = db.read_news_from_db()
|
113 |
freq_tokens = get_frequent_words_html(final_df)
|
114 |
-
logging.
|
115 |
|
116 |
final_df['_id'] = final_df['_id'].astype('str')
|
117 |
|
@@ -120,7 +120,7 @@ def fetch_from_db(fetch_flag):
|
|
120 |
else:
|
121 |
final_df = pd.read_json(redis_client.get("NEWSDF"))
|
122 |
freq_tokens = redis_client.get("NEWSWORDCLOUD")
|
123 |
-
logging.
|
124 |
|
125 |
except Exception as e:
|
126 |
print(e)
|
@@ -162,7 +162,7 @@ def index():
|
|
162 |
except Exception as e:
|
163 |
final_df = pd.DataFrame({'title': '', 'url': '',
|
164 |
'description': '', 'src_time': ''}, index=[0])
|
165 |
-
logging.
|
166 |
|
167 |
result_str = f'''
|
168 |
<div class="box" id="main">
|
|
|
18 |
CORS(app)
|
19 |
redis_client = redis.Redis(host='localhost', port=6379, decode_responses=True)
|
20 |
logging.basicConfig(format='%(asctime)s %(message)s')
|
21 |
+
logging.info(f'Is Redis available?: {redis_client.ping()}')
|
22 |
db = DBOperations()
|
23 |
session_id = None
|
24 |
|
|
|
28 |
def is_db_fetch_reqd():
|
29 |
try:
|
30 |
env_news_time = redis_client.get('NEWSFETCHTIME')
|
31 |
+
logging.info(f'[session_id: {session_id}] fetch_time_env_var: {env_news_time}')
|
32 |
fetch_flag = 1
|
33 |
if env_news_time is None:
|
34 |
redis_client.set("NEWSFETCHTIME", str(datetime.now()))
|
|
|
49 |
|
50 |
def correct_date(x):
|
51 |
if (not isinstance(x, str)) or (str(x).find(":") == -1):
|
52 |
+
logging.error(f'[session_id: {session_id}] correct_date() error: {x} is not the right date format')
|
53 |
return "2020-11-07 00:36:44+05:30"
|
54 |
return x
|
55 |
|
|
|
62 |
try:
|
63 |
return int(np.round((dt.now(dt.tz) - dt).total_seconds() / 60, 0))
|
64 |
except:
|
65 |
+
logging.error(f'[session_id: {session_id}] date_time_parser() error: {dt} is not the right date format')
|
66 |
return 100000
|
67 |
|
68 |
|
|
|
107 |
|
108 |
def fetch_from_db(fetch_flag):
|
109 |
try:
|
110 |
+
logging.info(f'[session_id: {session_id}] fetch_flag: {fetch_flag}')
|
111 |
if fetch_flag == 1:
|
112 |
final_df = db.read_news_from_db()
|
113 |
freq_tokens = get_frequent_words_html(final_df)
|
114 |
+
logging.info(f'[session_id: {session_id}] Fetched From DB')
|
115 |
|
116 |
final_df['_id'] = final_df['_id'].astype('str')
|
117 |
|
|
|
120 |
else:
|
121 |
final_df = pd.read_json(redis_client.get("NEWSDF"))
|
122 |
freq_tokens = redis_client.get("NEWSWORDCLOUD")
|
123 |
+
logging.info(f'[session_id: {session_id}] Fetched From Cache')
|
124 |
|
125 |
except Exception as e:
|
126 |
print(e)
|
|
|
162 |
except Exception as e:
|
163 |
final_df = pd.DataFrame({'title': '', 'url': '',
|
164 |
'description': '', 'src_time': ''}, index=[0])
|
165 |
+
logging.error(f'[session_id: {session_id}] {traceback.print_exc()}')
|
166 |
|
167 |
result_str = f'''
|
168 |
<div class="box" id="main">
|