Skip to content
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

Jump to bottom

ICBC Upload Fix #959

Merged
merged 2 commits into from
Nov 30, 2021
Merged

ICBC Upload Fix #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6386b80
Changed how the csv is being read
amichard Nov 29, 2021
eaadc1f
Further performance optimization
amichard Nov 30, 2021
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
160 changes: 93 additions & 67 deletions backend/api/services/icbc_upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import pandas as pd
import math
from django.db import transaction

from api.models.icbc_registration_data import IcbcRegistrationData
from api.models.icbc_vehicle import IcbcVehicle
Expand All @@ -14,78 +16,102 @@ def trim_all_columns(df):
return df.applymap(trim_strings)


@transaction.atomic
def ingest_icbc_spreadsheet(excelfile, requesting_user, dateCurrentTo):
current_to_date = IcbcUploadDate.objects.create(
upload_date=dateCurrentTo,
create_user=requesting_user.username,
update_user=requesting_user.username,
)

for df in pd.read_csv(
excelfile, sep="|", error_bad_lines=False, iterator=True,
chunksize=1000
):
# This is to tell postgres that we're still processing and keep the
# connection alive
_ = IcbcUploadDate.objects.get(
id=current_to_date.id
)
df = df[(df.MODEL_YEAR > 2018)]
df = df[
(df.HYBRID_VEHICLE_FLAG != 'N') |
(df.ELECTRIC_VEHICLE_FLAG != 'N') |
(df.FUEL_TYPE.str.upper() == 'ELECTRIC') |
(df.FUEL_TYPE.str.upper() == 'HYDROGEN') |
(df.FUEL_TYPE.str.upper() == 'GASOLINEELECTRIC')
]
df['MODEL_YEAR'].fillna(0, inplace=True)
df['VIN'].fillna(0, inplace=True)
df = df[(df.VIN != 0)]

# pd.options.display.float_format = '{:.0f}'.format
try:
# iterate through df and check if vehicle exists, if it doesn't,
# add it!
for _, row in df.iterrows():
icbc_vehicle_model = str(row['MODEL']).upper().strip()
icbc_vehicle_year = str(int(row['MODEL_YEAR'])).strip()
icbc_vehicle_make = str(row['MAKE']).upper().strip()
icbc_vehicle_vin = str(row['VIN']).upper().strip()

(model_year, _) = ModelYear.objects.get_or_create(
name=icbc_vehicle_year,
defaults={
'create_user': requesting_user.username,
'update_user': requesting_user.username
})
icbc_vehicle_year_id = model_year.id

(vehicle, _) = IcbcVehicle.objects.get_or_create(
model_name=icbc_vehicle_model,
model_year_id=icbc_vehicle_year_id,
make=icbc_vehicle_make,
defaults={
'create_user': requesting_user.username,
'update_user': requesting_user.username
})
vehicle_id = vehicle.id

(row, created) = IcbcRegistrationData.objects.update_or_create(
vin=icbc_vehicle_vin,
defaults={
'create_user': requesting_user.username,
'update_user': requesting_user.username,
'icbc_vehicle_id': vehicle_id,
'icbc_upload_date_id': current_to_date.id
})

if not created and row.icbc_vehicle_id != vehicle_id:
row.icbc_vehicle_id = vehicle_id
row.icbc_upload_date_id = current_to_date.id
row.update_user = requesting_user.username
row.save()

except Exception as e:
print(e)

page_count = 0

df = pd.read_csv(excelfile, sep="|", memory_map=True, nrows=1)
df.columns = map(str.upper, df.columns)
header_names = list(df.columns.values)

number_of_rows = sum(1 for _ in open(excelfile))
number_of_pages = 1
if number_of_rows > 50000:
number_of_pages = int(math.ceil(number_of_rows / 50000))

x = range(number_of_pages)
for n in x:
for df in pd.read_csv(
excelfile, sep="|", error_bad_lines=False, iterator=True,
chunksize=50000, memory_map=True, nrows=50000,
header=None,
names=header_names,
skiprows=(n * 50000) + 1
):
print('Processing page: ' + str(page_count))
page_count += 1

df['MODEL_YEAR'].fillna(0, inplace=True)
df['VIN'].fillna(0, inplace=True)

df.query('MODEL_YEAR > 2018', inplace=True)
# df = df[(df.MODEL_YEAR > 2018)]
df.query('MODEL_YEAR > 2018', inplace=True)
df.query('HYBRID_VEHICLE_FLAG != "N"', inplace=True)
df.query('ELECTRIC_VEHICLE_FLAG != "N"', inplace=True)
df['FUEL_TYPE'] = df['FUEL_TYPE'].str.upper()
df.query('FUEL_TYPE in ["ELECTRIC", "HYDROGEN", "GASOLINEELECTRIC"]')
# df = df[
# (df.HYBRID_VEHICLE_FLAG != 'N') |
# (df.ELECTRIC_VEHICLE_FLAG != 'N') |
# (df.FUEL_TYPE.str.upper() == 'ELECTRIC') |
# (df.FUEL_TYPE.str.upper() == 'HYDROGEN') |
# (df.FUEL_TYPE.str.upper() == 'GASOLINEELECTRIC')
# ]
df.query('VIN != 0')
# df = df[(df.VIN != 0)]

# pd.options.display.float_format = '{:.0f}'.format
try:
# iterate through df and check if vehicle exists, if it doesn't,
# add it!
with transaction.atomic():
for _, row in df.iterrows():
icbc_vehicle_model = str(row['MODEL']).upper().strip()
icbc_vehicle_year = str(int(row['MODEL_YEAR'])).strip()
icbc_vehicle_make = str(row['MAKE']).upper().strip()
icbc_vehicle_vin = str(row['VIN']).upper().strip()

(model_year, _) = ModelYear.objects.get_or_create(
name=icbc_vehicle_year,
defaults={
'create_user': requesting_user.username,
'update_user': requesting_user.username
})
icbc_vehicle_year_id = model_year.id

(vehicle, _) = IcbcVehicle.objects.get_or_create(
model_name=icbc_vehicle_model,
model_year_id=icbc_vehicle_year_id,
make=icbc_vehicle_make,
defaults={
'create_user': requesting_user.username,
'update_user': requesting_user.username
})
vehicle_id = vehicle.id

(row, created) = IcbcRegistrationData.objects.get_or_create(
vin=icbc_vehicle_vin,
defaults={
'create_user': requesting_user.username,
'update_user': requesting_user.username,
'icbc_vehicle_id': vehicle_id,
'icbc_upload_date_id': current_to_date.id
})

if not created and row.icbc_vehicle_id != vehicle_id:
row.icbc_vehicle_id = vehicle_id
row.icbc_upload_date_id = current_to_date.id
row.update_user = requesting_user.username
row.save()

except Exception as e:
print(e)

return True
1 change: 1 addition & 0 deletions backend/api/viewsets/icbc_verification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def upload(self, request):
done = ingest_icbc_spreadsheet(filename, user, date_current_to)

if done:
print('Done processing')
os.remove(filename)
minio_remove_object(filename)

Expand Down