Skip to content

Replace application prints and bare excepts with logging #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrhoads merged 1 commit into from
Sep 30, 2026
Merged

Replace application prints and bare excepts with logging #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions rorapi/common/create_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import logging

logger = logging.getLogger(__name__)

import copy
import functools
import json
Expand Down Expand Up @@ -60,10 +64,10 @@ def update_locations(locations):
for location in locations:
if 'geonames_id' in location:
try:
print(location['geonames_id'])
logger.info(location['geonames_id'])
updated_location = ua.new_geonames_v2(str(location['geonames_id']))
updated_locations.append(updated_location['location'])
except:
except Exception:
error = "Error retrieving Geonames data for ID {}. Please check that this is a valid Geonames ID".format(location['geonames_id'])
return error, updated_locations

Expand All @@ -90,7 +94,7 @@ def new_record_from_json(json_input, version):
new_record['locations'] = updated_locations
new_record = add_created_last_mod(new_record)
new_ror_id = check_ror_id()
print("new ror id: " + new_ror_id)
logger.info("new ror id: " + new_ror_id)
new_record['id'] = new_ror_id
error, valid_data = validate_record(sort_list_fields(new_record), get_v2_schema())
return error, valid_data
Expand Down
14 changes: 9 additions & 5 deletions rorapi/common/csv_bulk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import logging

logger = logging.getLogger(__name__)

import csv
import json
import io
Expand Down Expand Up @@ -43,7 +47,7 @@ def save_report_file(report, report_fields, csv_file, dir_name, validate_only):
f.write(chunk)

def process_csv(csv_file, version, validate_only):
print("Processing CSV")
logger.info("Processing CSV")
dir_name = datetime.now().strftime("%Y-%m-%d_%H_%M_%S") + "-ror-records"
success_msg = None
error = None
Expand All @@ -53,15 +57,15 @@ def process_csv(csv_file, version, validate_only):
updated_count = 0
new_count = 0
read_file = csv_file.read().decode('utf-8')
print(read_file)
logger.info(read_file)
reader = csv.DictReader(io.StringIO(read_file))
row_num = 2
for row in reader:
html_url = None
ror_id = None
updated = False
print("Row data")
print(row)
logger.info("Row data")
logger.info(row)
if row['html_url']:
html_url = row['html_url']
if row['id']:
Expand All @@ -80,7 +84,7 @@ def process_csv(csv_file, version, validate_only):
ror_id = v2_record['id']
serializer = OrganizationSerializerV2(v2_record)
json_obj = json.loads(JSONRenderer().render(serializer.data))
print(json_obj)
logger.info(json_obj)
if not validate_only:
#create file
file = save_record_file(ror_id, updated, json_obj, dir_name)
Expand Down
12 changes: 8 additions & 4 deletions rorapi/common/csv_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import logging

logger = logging.getLogger(__name__)

import copy
from rorapi.common.record_utils import *
from rorapi.common.csv_utils import *
Expand Down Expand Up @@ -74,8 +78,8 @@ def new_record_from_csv(csv_data, version):
"lang": lang_code
}
temp_names.append(name_obj)
print("temp names 1:")
print(temp_names)
logger.info("temp names 1:")
logger.info(temp_names)
name_vals = [n['value'] for n in temp_names]
dup_names = []
for n in name_vals:
Expand All @@ -99,8 +103,8 @@ def new_record_from_csv(csv_data, version):
if name_obj not in temp_names:
temp_names = [t for t in temp_names if t not in name_lang_dups]
temp_names.append(name_obj)
print("temp names 2:")
print(temp_names)
logger.info("temp names 2:")
logger.info(temp_names)
v2_data['names'] = temp_names

#status
Expand Down
84 changes: 44 additions & 40 deletions rorapi/common/csv_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import logging

logger = logging.getLogger(__name__)

import copy
from rorapi.common.record_utils import *
from rorapi.v2.record_constants import *
Expand All @@ -12,29 +16,29 @@
def update_record_from_csv(csv_data, version):
errors = []
updated_record = None
print("updating record from csv")
logger.info("updating record from csv")
existing_org_errors, existing_org = retrieve_organization(csv_data['id'])
print(existing_org)
logger.info(existing_org)
if existing_org is None:
errors.append("No existing record found for ROR ID '{}'".format(csv_data['id']))
else:
row_validation_errors = validate_csv_row_update_syntax(csv_data)
if row_validation_errors:
errors.extend(row_validation_errors)
print("row validation errors:")
print(errors)
logger.info("row validation errors:")
logger.info(errors)
else:
serializer = OrganizationSerializerV2(existing_org)
existing_record = serializer.data
print(existing_record)
logger.info(existing_record)
update_data = {}

#domains
if csv_data['domains']:
actions_values = get_actions_values(csv_data['domains'])
temp_domains = copy.deepcopy(existing_record['domains'])
print("initial temp domains:")
print(temp_domains)
logger.info("initial temp domains:")
logger.info(temp_domains)
if UPDATE_ACTIONS['DELETE'] in actions_values:
delete_values = actions_values[UPDATE_ACTIONS['DELETE']]
if delete_values is None:
Expand All @@ -45,23 +49,23 @@ def update_record_from_csv(csv_data, version):
errors.append("Attempting to delete domain(s) that don't exist: {}".format(d))

temp_domains = [d for d in temp_domains if d not in delete_values]
print("temp domains delete")
print(temp_domains)
logger.info("temp domains delete")
logger.info(temp_domains)
if UPDATE_ACTIONS['ADD'] in actions_values:
add_values = actions_values[UPDATE_ACTIONS['ADD']]
for a in add_values:
if a in temp_domains:
errors.append("Attempting to add domain(s) that already exist: {}".format(a))
print(add_values)
logger.info(add_values)
temp_domains.extend(add_values)
print("temp domains add")
print(temp_domains)
logger.info("temp domains add")
logger.info(temp_domains)
if UPDATE_ACTIONS['REPLACE'] in actions_values:
temp_domains = actions_values[UPDATE_ACTIONS['REPLACE']]
print("temp domains replace")
print(temp_domains)
print("final temp domains:")
print(temp_domains)
logger.info("temp domains replace")
logger.info(temp_domains)
logger.info("final temp domains:")
logger.info(temp_domains)
update_data['domains'] = temp_domains

#established
Expand Down Expand Up @@ -180,18 +184,18 @@ def update_record_from_csv(csv_data, version):
"value": r
}
temp_links.append(link_obj)
print("final temp links:")
print(temp_links)
logger.info("final temp links:")
logger.info(temp_links)
update_data['links'] = temp_links

#locations
if csv_data['locations.geonames_id']:
actions_values = get_actions_values(csv_data['locations.geonames_id'])
temp_locations = copy.deepcopy(existing_record['locations'])
print("initial temp locations:")
print(temp_locations)
logger.info("initial temp locations:")
logger.info(temp_locations)
existing_geonames_ids = [tl['geonames_id'] for tl in temp_locations]
print(existing_geonames_ids)
logger.info(existing_geonames_ids)
if UPDATE_ACTIONS['DELETE'] in actions_values:
delete_values = [int(d) for d in actions_values[UPDATE_ACTIONS['DELETE']]]
for d in delete_values:
Expand Down Expand Up @@ -219,29 +223,29 @@ def update_record_from_csv(csv_data, version):
"geonames_details": {}
}
temp_locations.append(location_obj)
print("final temp locations:")
print(temp_locations)
logger.info("final temp locations:")
logger.info(temp_locations)
update_data['locations'] = temp_locations

#names
updated_name_types = []
for k,v in V2_NAME_TYPES.items():
if csv_data['names.types.' + v]:
updated_name_types.append(v)
print("updated name types")
print(updated_name_types)
logger.info("updated name types")
logger.info(updated_name_types)
if updated_name_types:
temp_names = copy.deepcopy(existing_record['names'])
for t in updated_name_types:
print("updating name type " + t)
logger.info("updating name type " + t)
if csv_data['names.types.' + t]:
actions_values = get_actions_values(csv_data['names.types.' + t])
for k, v in actions_values.items():
if v:
vals_obj_list = []
for val in v:
print("val is")
print(val)
logger.info("val is")
logger.info(val)
vals_obj = {
"value": None,
"lang": None
Expand All @@ -263,12 +267,12 @@ def update_record_from_csv(csv_data, version):
if vals_obj["value"]:
vals_obj_list.append(vals_obj)
actions_values[k] = vals_obj_list
print("updated actions values")
print(actions_values)
logger.info("updated actions values")
logger.info(actions_values)
if UPDATE_ACTIONS['DELETE'] in actions_values:
print("delete in actions")
logger.info("delete in actions")
delete_values = actions_values[UPDATE_ACTIONS['DELETE']]
print(delete_values)
logger.info(delete_values)
if delete_values is None:
temp_names = [tn for tn in temp_names if t not in tn['types']]
else:
Expand Down Expand Up @@ -299,8 +303,8 @@ def update_record_from_csv(csv_data, version):
else:
name_vals_match = [tn for tn in temp_names if (tn['value'] == a['value'] and tn['lang'] == a['lang'])]
if name_vals_match:
print("name vals match")
print(name_vals_match)
logger.info("name vals match")
logger.info(name_vals_match)
for nvm in name_vals_match:
# if value and lang exist but not type, add type only
if len(nvm['types']) > 0:
Expand Down Expand Up @@ -346,8 +350,8 @@ def update_record_from_csv(csv_data, version):
}
temp_names.append(name_obj)

print("final temp names:")
print(temp_names)
logger.info("final temp names:")
logger.info(temp_names)
update_data['names'] = temp_names

#status
Expand All @@ -362,8 +366,8 @@ def update_record_from_csv(csv_data, version):
if csv_data['types']:
actions_values = get_actions_values(csv_data['types'])
temp_types = copy.deepcopy(existing_record['types'])
print("initial temp types:")
print(temp_types)
logger.info("initial temp types:")
logger.info(temp_types)
if UPDATE_ACTIONS['DELETE'] in actions_values:
delete_values = [av.lower() for av in actions_values[UPDATE_ACTIONS['DELETE']]]
for d in delete_values:
Expand All @@ -380,8 +384,8 @@ def update_record_from_csv(csv_data, version):
temp_types.extend(add_values)
if UPDATE_ACTIONS['REPLACE'] in actions_values:
temp_types = [av.lower() for av in actions_values[UPDATE_ACTIONS['REPLACE']]]
print("final temp types:")
print(temp_types)
logger.info("final temp types:")
logger.info(temp_types)
update_data['types'] = temp_types

if not errors:
Expand Down
Loading
Loading