move guid to hex id to new utils module

varun-edachali-dbx · varun-edachali-dbx · commit bc5e71668798 · 2025-05-29T15:57:10.000Z
Signed-off-by: varun-edachali-dbx &lt;varun.edachali@databricks.com&gt;
diff --git a/src/databricks/sql/backend/thrift_backend.py b/src/databricks/sql/backend/thrift_backend.py
@@ -15,8 +15,8 @@
     SessionId,
     CommandId,
     BackendType,
-    guid_to_hex_id,
 )
+from databricks.sql.backend.utils import guid_to_hex_id
 
 try:
     import pyarrow
diff --git a/src/databricks/sql/backend/types.py b/src/databricks/sql/backend/types.py
@@ -1,26 +1,10 @@
 from enum import Enum
 from typing import Dict, Optional, Any, Union
-import uuid
 import logging
 
-logger = logging.getLogger(__name__)
-
-
-def guid_to_hex_id(guid: bytes) -> str:
-    """Return a hexadecimal string instead of bytes
+from databricks.sql.backend.utils import guid_to_hex_id
 
-    Example:
-        IN   b'\x01\xee\x1d)\xa4\x19\x1d\xb6\xa9\xc0\x8d\xf1\xfe\xbaB\xdd'
-        OUT  '01ee1d29-a419-1db6-a9c0-8df1feba42dd'
-
-    If conversion to hexadecimal fails, the original bytes are returned
-    """
-    try:
-        this_uuid = uuid.UUID(bytes=guid)
-    except Exception as e:
-        logger.debug(f"Unable to convert bytes to UUID: {guid!r} -- {str(e)}")
-        return str(guid)
-    return str(this_uuid)
+logger = logging.getLogger(__name__)
 
 
 class BackendType(Enum):
diff --git a/src/databricks/sql/backend/utils/__init__.py b/src/databricks/sql/backend/utils/__init__.py
@@ -0,0 +1,3 @@
+from .guid_utils import guid_to_hex_id
+
+__all__ = ["guid_to_hex_id"] 
diff --git a/src/databricks/sql/backend/utils/guid_utils.py b/src/databricks/sql/backend/utils/guid_utils.py
@@ -0,0 +1,21 @@
+import uuid
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def guid_to_hex_id(guid: bytes) -> str:
+    """Return a hexadecimal string instead of bytes
+
+    Example:
+        IN   b'\x01\xee\x1d)\xa4\x19\x1d\xb6\xa9\xc0\x8d\xf1\xfe\xbaB\xdd'
+        OUT  '01ee1d29-a419-1db6-a9c0-8df1feba42dd'
+
+    If conversion to hexadecimal fails, the original bytes are returned
+    """
+    try:
+        this_uuid = uuid.UUID(bytes=guid)
+    except Exception as e:
+        logger.debug(f"Unable to convert bytes to UUID: {guid!r} -- {str(e)}")
+        return str(guid)
+    return str(this_uuid) 

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`SessionId,`
`16`	`16`	`CommandId,`
`17`	`17`	`BackendType,`
`18`		`- guid_to_hex_id,`
`19`	`18`	`)`
	`19`	`+from databricks.sql.backend.utils import guid_to_hex_id`
`20`	`20`
`21`	`21`	`try:`
`22`	`22`	`import pyarrow`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from .guid_utils import guid_to_hex_id`
	`2`	`+`
	`3`	`+__all__ = ["guid_to_hex_id"]`