fix on Encoder for UUIDs

phenobarbital · Apr 5, 2022 · 82d73e7 · 82d73e7
1 parent be3fe1b
commit 82d73e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/asyncdb/models/base.py b/asyncdb/models/base.py
@@ -7,6 +7,7 @@
 import logging
 import inspect
 import traceback
+import operator
 import rapidjson as to_json
 from dataclasses import Field as ff
 from dataclasses import (
@@ -26,7 +27,8 @@
     Dict,
     Optional,
     Union,
-    Any
+    Any,
+    Iterable
 )
 from asyncdb.utils import Msg
 from asyncdb.utils.types import (

diff --git a/asyncdb/utils/encoders.py b/asyncdb/utils/encoders.py
@@ -108,9 +108,10 @@ def default(self, obj):
                 return str(obj.value)
         elif isinstance(obj, uuid.UUID):
             try:
+                if uobj := uuid.UUID(obj, version=4):
+                    return str(uobj)
+            except ValueError:
                 return str(obj)
-            except Exception as e:
-                return obj.hex
         elif isinstance(obj, decimal.Decimal):
             return float(obj)
         elif isinstance(obj, Decimal):

diff --git a/asyncdb/version.py b/asyncdb/version.py
@@ -3,7 +3,7 @@
 __title__ = 'asyncdb'
 __description__ = ('Library for Asynchronous data source connections '
                    'Collection of asyncio drivers.')
-__version__ = '2.0.23'
+__version__ = '2.0.24'
 __author__ = 'Jesus Lara'
 __author_email__ = 'jesuslarag@gmail.com'
 __license__ = 'BSD'