Merge branch 'main' into support/3.2

zatosource · Dec 20, 2024 · f3f2e6a · f3f2e6a
2 parents 6bf3a64 + d4abf82
commit f3f2e6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/code/requirements.txt b/code/requirements.txt
@@ -23,7 +23,7 @@ decorator==5.1.0
 dictalchemy==0.1.2.6
 dill==0.2.5
 distro==1.5.0
-Django==4.2.16
+Django==4.2.17
 django-csp==3.8
 docformatter==0.8
 dropbox==10.10.0

diff --git a/code/zato-common/src/zato/common/util/time_.py b/code/zato-common/src/zato/common/util/time_.py
@@ -8,7 +8,7 @@
 
 # stdlib
 from datetime import datetime, timedelta, timezone
-from time import time
+from time import time, time_ns
 import logging
 
 # Arrow
@@ -84,6 +84,11 @@ def utcnow_as_ms(_time=time):
 
 # ################################################################################################################################
 
+def utcnow_from_ns():
+    return time_ns() // 1_000_000
+
+# ################################################################################################################################
+
 def datetime_from_ms(ms:'float', isoformat:'bool'=True) -> 'str | datetime':
     """ Converts a number of milliseconds since UNIX epoch to a datetime object.
     """