code styling

app/main.py

@@ -134,7 +134,7 @@ async def client_token():
         "service_instance_public_key_configuration": {
             "service_instance_public_key_me": {
                 "mod": hex(INSTANCE_KEY_PUB.public_key().n)[2:],
-                "exp": INSTANCE_KEY_PUB.public_key().e,
+                "exp": int(INSTANCE_KEY_PUB.public_key().e),
             },
             "service_instance_public_key_pem": INSTANCE_KEY_PUB.export_key().decode('utf-8'),
             "key_retention_mode": "LATEST_ONLY"
@@ -154,7 +154,7 @@ async def client_token():
 # {"candidate_origin_ref":"00112233-4455-6677-8899-aabbccddeeff","environment":{"fingerprint":{"mac_address_list":["ff:ff:ff:ff:ff:ff"]},"hostname":"my-hostname","ip_address_list":["192.168.178.123","fe80::","fe80::1%enp6s18"],"guest_driver_version":"510.85.02","os_platform":"Debian GNU/Linux 11 (bullseye) 11","os_version":"11 (bullseye)"},"registration_pending":false,"update_pending":false}
 @app.post('/auth/v1/origin')
 async def auth_v1_origin(request: Request):
-    j = json.loads((await request.body()).decode('utf-8'))
+    j, cur_time = json.loads((await request.body()).decode('utf-8')), datetime.utcnow()
 
     origin_ref = j['candidate_origin_ref']
     logging.info(f'> [  origin  ]: {origin_ref}: {j}')
@@ -168,7 +168,6 @@ async def auth_v1_origin(request: Request):
 
     db['origin'].upsert(data, ['origin_ref'])
 
-    cur_time = datetime.utcnow()
     response = {
         "origin_ref": origin_ref,
         "environment": j['environment'],
@@ -187,12 +186,11 @@ async def auth_v1_origin(request: Request):
 # {"code_challenge":"...","origin_ref":"00112233-4455-6677-8899-aabbccddeeff"}
 @app.post('/auth/v1/code')
 async def auth_v1_code(request: Request):
-    j = json.loads((await request.body()).decode('utf-8'))
+    j, cur_time = json.loads((await request.body()).decode('utf-8')), datetime.utcnow()
 
     origin_ref = j['origin_ref']
     logging.info(f'> [   code   ]: {origin_ref}: {j}')
 
-    cur_time = datetime.utcnow()
     delta = relativedelta(minutes=15)
     expires = cur_time + delta
 
@@ -221,7 +219,7 @@ async def auth_v1_code(request: Request):
 # {"auth_code":"...","code_verifier":"..."}
 @app.post('/auth/v1/token')
 async def auth_v1_token(request: Request):
-    j = json.loads((await request.body()).decode('utf-8'))
+    j, cur_time = json.loads((await request.body()).decode('utf-8')), datetime.utcnow()
     payload = jwt.decode(token=j['auth_code'], key=jwt_decode_key)
 
     origin_ref = payload['origin_ref']
@@ -231,7 +229,6 @@ async def auth_v1_token(request: Request):
     if payload['challenge'] != b64enc(sha256(j['code_verifier'].encode('utf-8')).digest()).rstrip(b'=').decode('utf-8'):
         raise HTTPException(status_code=401, detail='expected challenge did not match verifier')
 
-    cur_time = datetime.utcnow()
     access_expires_on = cur_time + TOKEN_EXPIRE_DELTA
 
     new_payload = {
@@ -259,13 +256,12 @@ async def auth_v1_token(request: Request):
 # {'fulfillment_context': {'fulfillment_class_ref_list': []}, 'lease_proposal_list': [{'license_type_qualifiers': {'count': 1}, 'product': {'name': 'NVIDIA RTX Virtual Workstation'}}], 'proposal_evaluation_mode': 'ALL_OF', 'scope_ref_list': ['00112233-4455-6677-8899-aabbccddeeff']}
 @app.post('/leasing/v1/lessor')
 async def leasing_v1_lessor(request: Request):
-    j, token = json.loads((await request.body()).decode('utf-8')), get_token(request)
+    j, token, cur_time = json.loads((await request.body()).decode('utf-8')), get_token(request), datetime.utcnow()
 
     origin_ref = token['origin_ref']
     scope_ref_list = j['scope_ref_list']
     logging.info(f'> [  create  ]: {origin_ref}: create leases for scope_ref_list {scope_ref_list}')
 
-    cur_time = datetime.utcnow()
     lease_result_list = []
     for scope_ref in scope_ref_list:
         expires = cur_time + LEASE_EXPIRE_DELTA
@@ -300,14 +296,13 @@ async def leasing_v1_lessor(request: Request):
 # venv/lib/python3.9/site-packages/nls_dal_service_instance_dls/schema/service_instance/V1_0_21__product_mapping.sql
 @app.get('/leasing/v1/lessor/leases')
 async def leasing_v1_lessor_lease(request: Request):
-    token = get_token(request)
+    token, cur_time = get_token(request), datetime.utcnow()
 
     origin_ref = token['origin_ref']
 
     active_lease_list = list(map(lambda x: x['lease_ref'], db['lease'].find(origin_ref=origin_ref)))
     logging.info(f'> [  leases  ]: {origin_ref}: found {len(active_lease_list)} active leases')
 
-    cur_time = datetime.utcnow()
     response = {
         "active_lease_list": active_lease_list,
         "sync_timestamp": cur_time.isoformat(),
@@ -320,7 +315,7 @@ async def leasing_v1_lessor_lease(request: Request):
 # venv/lib/python3.9/site-packages/nls_core_lease/lease_single.py
 @app.put('/leasing/v1/lease/{lease_ref}')
 async def leasing_v1_lease_renew(request: Request, lease_ref: str):
-    token = get_token(request)
+    token, cur_time = get_token(request), datetime.utcnow()
 
     origin_ref = token['origin_ref']
     logging.info(f'> [  renew   ]: {origin_ref}: renew {lease_ref}')
@@ -328,8 +323,11 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str):
     if db['lease'].count(origin_ref=origin_ref, lease_ref=lease_ref) == 0:
         raise HTTPException(status_code=404, detail='requested lease not available')
 
-    cur_time = datetime.utcnow()
     expires = cur_time + LEASE_EXPIRE_DELTA
+
+    data = dict(origin_ref=origin_ref, lease_ref=lease_ref, lease_expires=expires, lease_last_update=cur_time)
+    db['lease'].update(data, ['origin_ref', 'lease_ref'])
+
     response = {
         "lease_ref": lease_ref,
         "expires": expires.isoformat(),
@@ -339,15 +337,12 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str):
         "sync_timestamp": cur_time.isoformat(),
     }
 
-    data = dict(origin_ref=origin_ref, lease_ref=lease_ref, lease_expires=expires, lease_last_update=cur_time)
-    db['lease'].update(data, ['origin_ref', 'lease_ref'])
-
     return JSONResponse(response)
 
 
 @app.delete('/leasing/v1/lessor/leases')
 async def leasing_v1_lessor_lease_remove(request: Request):
-    token = get_token(request)
+    token, cur_time = get_token(request), datetime.utcnow()
 
     origin_ref = token['origin_ref']
 
@@ -355,13 +350,13 @@ async def leasing_v1_lessor_lease_remove(request: Request):
     deletions = db['lease'].delete(origin_ref=origin_ref)
     logging.info(f'> [  remove  ]: {origin_ref}: removed {deletions} leases')
 
-    cur_time = datetime.utcnow()
     response = {
         "released_lease_list": released_lease_list,
         "release_failure_list": None,
         "sync_timestamp": cur_time.isoformat(),
         "prompts": None
     }
+
     return JSONResponse(response)