acryl-datahub 1.2.0.9rc2__py3-none-any.whl → 1.2.0.10__py3-none-any.whl

datahub/sdk/entity_client.py

@@ -98,11 +98,14 @@ class EntityClient:
         except KeyError as e:
             # Try to import cloud-specific entities if not found
             try:
-                from acryl_datahub_cloud._sdk_extras.entities.assertion import Assertion
-                from acryl_datahub_cloud._sdk_extras.entities.monitor import Monitor
+                from acryl_datahub_cloud.sdk.entities.assertion import Assertion
+                from acryl_datahub_cloud.sdk.entities.monitor import Monitor
+                from acryl_datahub_cloud.sdk.entities.subscription import Subscription
 
                 if urn.entity_type == "assertion":
                     EntityClass = Assertion
+                elif urn.entity_type == "subscription":
+                    EntityClass = Subscription
                 elif urn.entity_type == "monitor":
                     EntityClass = Monitor
                 else:
@@ -124,13 +127,17 @@ class EntityClient:
 
         # Type narrowing for cloud-specific entities
         if urn.entity_type == "assertion":
-            from acryl_datahub_cloud._sdk_extras.entities.assertion import Assertion
+            from acryl_datahub_cloud.sdk.entities.assertion import Assertion
 
             assert isinstance(entity, Assertion)
         elif urn.entity_type == "monitor":
-            from acryl_datahub_cloud._sdk_extras.entities.monitor import Monitor
+            from acryl_datahub_cloud.sdk.entities.monitor import Monitor
 
             assert isinstance(entity, Monitor)
+        elif urn.entity_type == "subscription":
+            from acryl_datahub_cloud.sdk.entities.subscription import Subscription
+
+            assert isinstance(entity, Subscription)
 
         return entity
 

datahub/sdk/lineage_client.py

@@ -905,9 +905,9 @@ class LineageClient:
         direction: Literal["upstream", "downstream"],
     ) -> LineageResult:
         """Create a LineageResult from entity and entry data."""
-        platform = entity.get("platform", {}).get("name") or entity.get(
-            "dataPlatformInstance", {}
-        ).get("platform", {}).get("name")
+        platform = (entity.get("platform") or {}).get("name") or (
+            (entity.get("dataPlatformInstance") or {}).get("platform") or {}
+        ).get("name")
 
         result = LineageResult(
             urn=entity["urn"],

datahub/sdk/search_filters.py

@@ -39,13 +39,7 @@ _OrFilters = List[_AndSearchFilterRule]
 
 
 class _BaseFilter(ConfigModel):
-    class Config:
-        # We can't wrap this in a TYPE_CHECKING block because the pydantic plugin
-        # doesn't recognize it properly. So unfortunately we'll need to live
-        # with the deprecation warning w/ pydantic v2.
-        allow_population_by_field_name = True
-        if PYDANTIC_VERSION_2:
-            populate_by_name = True
+    model_config = pydantic.ConfigDict(populate_by_name=True)
 
     @abc.abstractmethod
     def compile(self) -> _OrFilters: ...

datahub/sql_parsing/split_statements.py

@@ -52,6 +52,7 @@ class ParserState(Enum):
     STRING = 2
     COMMENT = 3
     MULTILINE_COMMENT = 4
+    BRACKETED_IDENTIFIER = 5
 
 
 class _StatementSplitter:
@@ -141,6 +142,10 @@ class _StatementSplitter:
                     self.state = ParserState.STRING
                     self.current_statement.append(c)
                     prev_real_char = c
+                elif c == "[":
+                    self.state = ParserState.BRACKETED_IDENTIFIER
+                    self.current_statement.append(c)
+                    prev_real_char = c
                 elif c == "-" and next_char == "-":
                     self.state = ParserState.COMMENT
                     self.current_statement.append(c)
@@ -172,6 +177,14 @@ class _StatementSplitter:
                 elif c == "'":
                     self.state = ParserState.NORMAL
 
+            elif self.state == ParserState.BRACKETED_IDENTIFIER:
+                self.current_statement.append(c)
+                if c == "]" and next_char == "]":
+                    self.current_statement.append(next_char)
+                    self.i += 1
+                elif c == "]":
+                    self.state = ParserState.NORMAL
+
             elif self.state == ParserState.COMMENT:
                 self.current_statement.append(c)
                 if c == "\n":