From a5f3774c2ec778c32809dba82da079ec3664f7ba Mon Sep 17 00:00:00 2001 From: Plaintextnerds Date: Mon, 23 Oct 2023 14:54:59 +0100 Subject: [PATCH 1/4] Fix for UUID --- cloudquery/sdk/scalar/uuid.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cloudquery/sdk/scalar/uuid.py b/cloudquery/sdk/scalar/uuid.py index 4e49f9f..57a486b 100644 --- a/cloudquery/sdk/scalar/uuid.py +++ b/cloudquery/sdk/scalar/uuid.py @@ -4,6 +4,8 @@ class UUID(Scalar): def __init__(self, valid: bool = False, value: uuid.UUID = None): + if isinstance(value, uuid.UUID): + value = value.bytes super().__init__(valid, value) def __eq__(self, scalar: Scalar) -> bool: @@ -27,13 +29,15 @@ def set(self, value: any): self._value = value.value return - if isinstance(value, uuid.UUID): + if isinstance(value, bytes): self._value = value + elif isinstance(value, uuid.UUID): + self._value = value.bytes elif isinstance(value, str): try: - self._value = uuid.UUID(value) + self._value = uuid.UUID(value).bytes except ValueError as e: raise ScalarInvalidTypeError("Invalid type for UUID scalar") from e else: raise ScalarInvalidTypeError(f"Invalid type {type(value)} for UUID scalar") - self._valid = True + self._valid = True \ No newline at end of file From d8a96cd6de7338bb89ac58e3494e0f346701c314 Mon Sep 17 00:00:00 2001 From: Plaintextnerds Date: Mon, 23 Oct 2023 15:03:25 +0100 Subject: [PATCH 2/4] Fix formatting --- cloudquery/sdk/scalar/uuid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudquery/sdk/scalar/uuid.py b/cloudquery/sdk/scalar/uuid.py index 57a486b..052633f 100644 --- a/cloudquery/sdk/scalar/uuid.py +++ b/cloudquery/sdk/scalar/uuid.py @@ -40,4 +40,4 @@ def set(self, value: any): raise ScalarInvalidTypeError("Invalid type for UUID scalar") from e else: raise ScalarInvalidTypeError(f"Invalid type {type(value)} for UUID scalar") - self._valid = True \ No newline at end of file + self._valid = True From 29eb455d91842dce35d32fbbbc02ce2fc4770053 Mon Sep 17 00:00:00 2001 From: Plaintextnerds Date: Fri, 8 Mar 2024 00:35:13 +0000 Subject: [PATCH 3/4] correct exc_info source --- cloudquery/sdk/scheduler/scheduler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudquery/sdk/scheduler/scheduler.py b/cloudquery/sdk/scheduler/scheduler.py index cfd37b2..4517f53 100644 --- a/cloudquery/sdk/scheduler/scheduler.py +++ b/cloudquery/sdk/scheduler/scheduler.py @@ -145,14 +145,14 @@ def resolve_table( resources=total_resources, depth=depth, ) - except Exception: + except Exception as e: self._logger.error( "table resolver finished with error", client_id=client.id(), table=resolver.table.name, resources=total_resources, depth=depth, - exc_info=True, + exc_info=e, ) finally: res.put(TableResolverFinished()) From 914f900a5f93e392520a53be0cd7f20bdfbb8f6f Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Mon, 11 Mar 2024 13:46:32 +0200 Subject: [PATCH 4/4] Update scheduler.py --- cloudquery/sdk/scheduler/scheduler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudquery/sdk/scheduler/scheduler.py b/cloudquery/sdk/scheduler/scheduler.py index 4517f53..0a5d157 100644 --- a/cloudquery/sdk/scheduler/scheduler.py +++ b/cloudquery/sdk/scheduler/scheduler.py @@ -108,13 +108,13 @@ def resolve_table( resource = self.resolve_resource( resolver, client, parent_item, item ) - except Exception: + except Exception as e: self._logger.error( "failed to resolve resource", client_id=client.id(), table=resolver.table.name, depth=depth, - exc_info=True, + exc_info=e, ) continue res.put(SyncInsertMessage(resource.to_arrow_record()))