Merge pull request #3686 from msabramo/msabramo/fix-datetime-utcnow-deprecation-warnings

Fix `datetime.datetime.utcnow` `DeprecationWarning`
This commit is contained in:
Ishaan Jaff 2024-05-16 12:19:06 -07:00 committed by GitHub
commit bccc38acad

View file

@ -2865,19 +2865,19 @@ async def generate_key_helper_fn(
expires = None expires = None
else: else:
duration_s = _duration_in_seconds(duration=duration) duration_s = _duration_in_seconds(duration=duration)
expires = datetime.utcnow() + timedelta(seconds=duration_s) expires = datetime.now(timezone.utc) + timedelta(seconds=duration_s)
if key_budget_duration is None: # one-time budget if key_budget_duration is None: # one-time budget
key_reset_at = None key_reset_at = None
else: else:
duration_s = _duration_in_seconds(duration=key_budget_duration) duration_s = _duration_in_seconds(duration=key_budget_duration)
key_reset_at = datetime.utcnow() + timedelta(seconds=duration_s) key_reset_at = datetime.now(timezone.utc) + timedelta(seconds=duration_s)
if budget_duration is None: # one-time budget if budget_duration is None: # one-time budget
reset_at = None reset_at = None
else: else:
duration_s = _duration_in_seconds(duration=budget_duration) duration_s = _duration_in_seconds(duration=budget_duration)
reset_at = datetime.utcnow() + timedelta(seconds=duration_s) reset_at = datetime.now(timezone.utc) + timedelta(seconds=duration_s)
aliases_json = json.dumps(aliases) aliases_json = json.dumps(aliases)
config_json = json.dumps(config) config_json = json.dumps(config)
@ -4976,7 +4976,7 @@ async def update_key_fn(request: Request, data: UpdateKeyRequest):
if "duration" in non_default_values: if "duration" in non_default_values:
duration = non_default_values.pop("duration") duration = non_default_values.pop("duration")
duration_s = _duration_in_seconds(duration=duration) duration_s = _duration_in_seconds(duration=duration)
expires = datetime.utcnow() + timedelta(seconds=duration_s) expires = datetime.datetime.now(timezone.utc) + timedelta(seconds=duration_s)
non_default_values["expires"] = expires non_default_values["expires"] = expires
response = await prisma_client.update_data( response = await prisma_client.update_data(