openmetadata-ingestion 1.8.10.0__py3-none-any.whl → 1.9.1.0__py3-none-any.whl

metadata/ingestion/lineage/sql_lineage.py

@@ -75,70 +75,71 @@ search_cache = LRUCache(LRU_CACHE_SIZE)
 
 def search_table_entities(
     metadata: OpenMetadata,
-    service_name: str,
+    service_names: Union[str, List[str]],
     database: Optional[str],
     database_schema: Optional[str],
     table: str,
 ) -> Optional[List[Table]]:
     """
     Method to get table entity from database, database_schema & table name.
-
-    It will try to search first in ES and doing an extra call to get Table entities
-    with the needed fields like columns for column lineage.
-
-    If the ES result is empty, it will try by running
-    a request against the API to find the Entity.
+    Now supports searching across multiple services (cross-database lineage).
 
     Args:
         metadata: OMeta client
-        service_name: service name
+        service_names: service name or list of service names (current + cross db)
         database: database name
         database_schema: schema name
         table: table name
 
     Returns:
-        A list of Table entities, otherwise, None
+        A list of Table entities from the first service where found, otherwise None
     """
-    search_tuple = (service_name, database, database_schema, table)
-    if search_tuple in search_cache:
-        return search_cache.get(search_tuple)
-    try:
-        table_entities: Optional[List[Table]] = []
-        # search on ES first
-        fqn_search_string = build_es_fqn_search_string(
-            database, database_schema, service_name, table
-        )
-        es_result_entities = metadata.es_search_from_fqn(
-            entity_type=Table,
-            fqn_search_string=fqn_search_string,
-        )
-        if es_result_entities:
-            table_entities = es_result_entities
-        else:
-            # build FQNs and search with the API in case ES response is empty
-            table_fqns = fqn.build(
-                metadata,
+    if isinstance(service_names, str):
+        service_names = [service_names]
+    for service_name in service_names:
+        search_tuple = (service_name, database, database_schema, table)
+        if search_tuple in search_cache:
+            result = search_cache.get(search_tuple)
+            if result:
+                return result
+        try:
+            table_entities: Optional[List[Table]] = []
+            # search on ES first
+            fqn_search_string = build_es_fqn_search_string(
+                database, database_schema, service_name, table
+            )
+            es_result_entities = metadata.es_search_from_fqn(
                 entity_type=Table,
-                service_name=service_name,
-                database_name=database,
-                schema_name=database_schema,
-                table_name=table,
-                fetch_multiple_entities=True,
-                skip_es_search=True,
+                fqn_search_string=fqn_search_string,
             )
-            for table_fqn in table_fqns or []:
-                table_entity: Table = metadata.get_by_name(Table, fqn=table_fqn)
-                if table_entity:
-                    table_entities.append(table_entity)
-        # added the search tuple to the cache
-        search_cache.put(search_tuple, table_entities)
-        return table_entities
-    except Exception as exc:
-        logger.debug(traceback.format_exc())
-        logger.error(
-            f"Error searching for table entities for service [{service_name}]: {exc}"
-        )
-        return None
+            if es_result_entities:
+                table_entities = es_result_entities
+            else:
+                # build FQNs and search with the API in case ES response is empty
+                table_fqns = fqn.build(
+                    metadata,
+                    entity_type=Table,
+                    service_name=service_name,
+                    database_name=database,
+                    schema_name=database_schema,
+                    table_name=table,
+                    fetch_multiple_entities=True,
+                    skip_es_search=True,
+                )
+                for table_fqn in table_fqns or []:
+                    table_entity: Table = metadata.get_by_name(Table, fqn=table_fqn)
+                    if table_entity:
+                        table_entities.append(table_entity)
+            # added the search tuple to the cache
+            search_cache.put(search_tuple, table_entities)
+            if table_entities:
+                return table_entities
+        except Exception as exc:
+            logger.debug(traceback.format_exc())
+            logger.error(
+                f"Error searching for table entities for service [{service_name}]: {exc}"
+            )
+    return None
 
 
 def get_table_fqn_from_query_name(
@@ -360,18 +361,18 @@ def get_source_table_names(
 
 def get_table_entities_from_query(
     metadata: OpenMetadata,
-    service_name: str,
+    service_names: Union[str, List[str]],
     database_name: str,
     database_schema: str,
     table_name: str,
+    schema_fallback: bool = False,
 ) -> Optional[List[Table]]:
     """
     Fetch data from API and ES with a fallback strategy.
 
     If the sys data is incorrect, use the table name ingredients.
 
-    :param metadata: OpenMetadata client
-    :param service_name: Service being ingested.
+    :param service_names: Service(s) being ingested (current + cross db)
     :param database_name: Name of the database informed on db sys results
     :param database_schema: Name of the schema informed on db sys results
     :param table_name: Table name extracted from query. Can be `table`, `schema.table` or `db.schema.table`
@@ -385,7 +386,7 @@ def get_table_entities_from_query(
 
     table_entities = search_table_entities(
         metadata=metadata,
-        service_name=service_name,
+        service_names=service_names,
         database=database_query if database_query else database_name,
         database_schema=schema_query if schema_query else database_schema,
         table=table,
@@ -394,6 +395,17 @@ def get_table_entities_from_query(
     if table_entities:
         return table_entities
 
+    if schema_fallback:
+        table_entities = search_table_entities(
+            metadata=metadata,
+            service_name=service_name,
+            database=database_query if database_query else database_name,
+            database_schema=None,
+            table=table,
+        )
+        if table_entities:
+            return table_entities
+
     return None
 
 
@@ -516,6 +528,7 @@ def _create_lineage_by_table_name(
     lineage_source: LineageSource = LineageSource.QueryLineage,
     procedure: Optional[EntityReference] = None,
     graph: DiGraph = None,
+    schema_fallback: bool = False,
 ) -> Iterable[Either[AddLineageRequest]]:
     """
     This method is to create a lineage between two tables
@@ -523,18 +536,20 @@ def _create_lineage_by_table_name(
     try:
         from_table_entities = get_table_entities_from_query(
             metadata=metadata,
-            service_name=service_name,
+            service_names=service_name,
             database_name=database_name,
             database_schema=schema_name,
             table_name=from_table,
+            schema_fallback=schema_fallback,
         )
 
         to_table_entities = get_table_entities_from_query(
             metadata=metadata,
-            service_name=service_name,
+            service_names=service_name,
             database_name=database_name,
             database_schema=schema_name,
             table_name=to_table,
+            schema_fallback=schema_fallback,
         )
 
         for table_name, entity in (
@@ -625,7 +640,7 @@ def populate_column_lineage_map(raw_column_lineage):
 # pylint: disable=too-many-locals
 def get_lineage_by_query(
     metadata: OpenMetadata,
-    service_name: str,
+    service_names: Union[str, List[str]],
     database_name: Optional[str],
     schema_name: Optional[str],
     query: str,
@@ -633,14 +648,24 @@ def get_lineage_by_query(
     timeout_seconds: int = LINEAGE_PARSING_TIMEOUT,
     lineage_source: LineageSource = LineageSource.QueryLineage,
     graph: DiGraph = None,
+    schema_fallback: bool = False,
+    service_name: Optional[str] = None,  # backward compatibility for python sdk
 ) -> Iterable[Either[AddLineageRequest]]:
     """
     This method parses the query to get source, target and intermediate table names to create lineage,
     and returns True if target table is found to create lineage otherwise returns False.
+
+    Now supports cross-database lineage by accepting a list of service names.
     """
     column_lineage = {}
     query_parsing_failures = QueryParsingFailures()
-
+    if service_name and isinstance(service_name, str):
+        service_names = [service_name]
+        logger.warning(
+            "Deprecated: service_name is deprecated, use service_names instead"
+        )
+    if isinstance(service_names, str):
+        service_names = [service_names]
     try:
         lineage_parser = LineageParser(query, dialect, timeout_seconds=timeout_seconds)
         masked_query = lineage_parser.masked_query
@@ -657,7 +682,7 @@ def get_lineage_by_query(
                     source_table=source_table,
                     database_name=database_name,
                     schema_name=schema_name,
-                    service_name=service_name,
+                    service_name=service_names,
                     timeout_seconds=timeout_seconds,
                     column_lineage=column_lineage,
                 ):
@@ -665,7 +690,7 @@ def get_lineage_by_query(
                         metadata,
                         from_table=str(from_table_name),
                         to_table=str(intermediate_table),
-                        service_name=service_name,
+                        service_name=service_names,
                         database_name=database_name,
                         schema_name=schema_name,
                         masked_query=masked_query,
@@ -673,18 +698,21 @@ def get_lineage_by_query(
                         lineage_source=lineage_source,
                         procedure=procedure,
                         graph=graph,
+                        schema_fallback=schema_fallback,
                     )
             for target_table in lineage_parser.target_tables:
                 yield from _create_lineage_by_table_name(
                     metadata,
                     from_table=str(intermediate_table),
                     to_table=str(target_table),
-                    service_name=service_name,
+                    service_name=service_names,
                     database_name=database_name,
                     schema_name=schema_name,
                     masked_query=masked_query,
                     column_lineage_map=column_lineage,
                     lineage_source=lineage_source,
+                    schema_fallback=schema_fallback,
+                    graph=graph,
                 )
         if not lineage_parser.intermediate_tables:
             for target_table in lineage_parser.target_tables:
@@ -695,7 +723,7 @@ def get_lineage_by_query(
                         source_table=source_table,
                         database_name=database_name,
                         schema_name=schema_name,
-                        service_name=service_name,
+                        service_name=service_names,
                         timeout_seconds=timeout_seconds,
                         column_lineage=column_lineage,
                     ):
@@ -703,7 +731,7 @@ def get_lineage_by_query(
                             metadata,
                             from_table=str(from_table_name),
                             to_table=str(target_table),
-                            service_name=service_name,
+                            service_name=service_names,
                             database_name=database_name,
                             schema_name=schema_name,
                             masked_query=masked_query,
@@ -711,6 +739,7 @@ def get_lineage_by_query(
                             lineage_source=lineage_source,
                             procedure=procedure,
                             graph=graph,
+                            schema_fallback=schema_fallback,
                         )
         if not lineage_parser.query_parsing_success:
             query_parsing_failures.add(
@@ -723,7 +752,7 @@ def get_lineage_by_query(
         yield Either(
             left=StackTraceError(
                 name="Lineage",
-                error=f"Ingesting lineage failed for service [{service_name}]: {exc}",
+                error=f"Ingesting lineage failed for service(s) [{service_names}]: {exc}",
                 stackTrace=traceback.format_exc(),
             )
         )
@@ -734,17 +763,20 @@ def get_lineage_via_table_entity(
     table_entity: Table,
     database_name: str,
     schema_name: str,
-    service_name: str,
+    service_names: Union[str, List[str]],
     query: str,
     dialect: Dialect,
     timeout_seconds: int = LINEAGE_PARSING_TIMEOUT,
     lineage_source: LineageSource = LineageSource.QueryLineage,
     graph: DiGraph = None,
+    schema_fallback: bool = False,
 ) -> Iterable[Either[AddLineageRequest]]:
     """Get lineage from table entity"""
     column_lineage = {}
     query_parsing_failures = QueryParsingFailures()
 
+    if isinstance(service_names, str):
+        service_names = [service_names]
     try:
         lineage_parser = LineageParser(query, dialect, timeout_seconds=timeout_seconds)
         masked_query = lineage_parser.masked_query
@@ -760,7 +792,7 @@ def get_lineage_via_table_entity(
                 source_table=from_table_name,
                 database_name=database_name,
                 schema_name=schema_name,
-                service_name=service_name,
+                service_name=service_names,
                 timeout_seconds=timeout_seconds,
                 column_lineage=column_lineage,
             ):
@@ -768,7 +800,7 @@ def get_lineage_via_table_entity(
                     metadata,
                     from_table=str(source_table),
                     to_table=f"{schema_name}.{to_table_name}",
-                    service_name=service_name,
+                    service_name=service_names,
                     database_name=database_name,
                     schema_name=schema_name,
                     masked_query=masked_query,
@@ -776,6 +808,7 @@ def get_lineage_via_table_entity(
                     lineage_source=lineage_source,
                     procedure=procedure,
                     graph=graph,
+                    schema_fallback=schema_fallback,
                 ) or []
         if not lineage_parser.query_parsing_success:
             query_parsing_failures.add(
@@ -788,7 +821,7 @@ def get_lineage_via_table_entity(
         Either(
             left=StackTraceError(
                 name="Lineage",
-                error=f"Failed to create view lineage for database [{database_name}] and table [{table_entity}]: {exc}",
+                error=f"Failed to create view lineage for database [{database_name}] and table [{table_entity}] with service(s) [{service_names}]: {exc}",
                 stackTrace=traceback.format_exc(),
             )
         )

metadata/ingestion/models/custom_properties.py

@@ -28,13 +28,13 @@ class CustomPropertyDataTypes(Enum):
     STRING = "string"
     INTEGER = "integer"
     MARKDOWN = "markdown"
-    DATE = "date"
-    DATETIME = "dateTime"
+    DATE = "date-cp"
+    DATETIME = "dateTime-cp"
     DURATION = "duration"
     EMAIL = "email"
     NUMBER = "number"
     SQLQUERY = "sqlQuery"
-    TIME = "time"
+    TIME = "time-cp"
     TIMEINTERVAL = "timeInterval"
     TIMESTAMP = "timestamp"
     ENUM = "enum"

metadata/ingestion/models/patch_request.py

@@ -342,6 +342,7 @@ def build_patch(
     array_entity_fields: Optional[List] = None,
     remove_change_description: bool = True,
     override_metadata: Optional[bool] = False,
+    skip_on_failure: Optional[bool] = True,
 ) -> Optional[jsonpatch.JsonPatch]:
     """
     Given an Entity type and Source entity and Destination entity,
@@ -352,6 +353,10 @@ def build_patch(
         destination: payload with changes applied to the source.
         allowed_fields: List of field names to filter from source and destination models
         restrict_update_fields: List of field names which will only support add operation
+        array_entity_fields: List of array fields to sort for consistent patching
+        remove_change_description: Whether to remove change description from entities
+        override_metadata: Whether to override existing metadata fields
+        skip_on_failure: Whether to skip the patch operation on failure (default: True)
 
     Returns
         Updated Entity
@@ -421,10 +426,37 @@ def build_patch(
             patch.patch = updated_operations
 
         return patch
-    except Exception:
+    except Exception as exc:
         logger.debug(traceback.format_exc())
-        logger.warning("Couldn't build patch for Entity.")
-        return None
+        if skip_on_failure:
+            entity_info = ""
+            try:
+                if hasattr(source, "fullyQualifiedName"):
+                    entity_info = f" for '{source.fullyQualifiedName.root}'"
+                elif hasattr(source, "name"):
+                    entity_info = f" for '{source.name.root}'"
+            except Exception:
+                pass
+
+            logger.warning(
+                f"Failed to build patch{entity_info}. The patch generation was skipped. "
+                f"Reason: {exc}"
+            )
+            return None
+        else:
+            entity_info = ""
+            try:
+                if hasattr(source, "fullyQualifiedName"):
+                    entity_info = f" for '{source.fullyQualifiedName.root}'"
+                elif hasattr(source, "name"):
+                    entity_info = f" for '{source.name.root}'"
+            except Exception:
+                pass
+
+            raise RuntimeError(
+                f"Failed to build patch{entity_info}. The patch generation failed. "
+                f"Set 'skip_on_failure=True' to skip failed patch operations. Error: {exc}"
+            ) from exc
 
 
 def _get_attribute_name(attr: T) -> str:
@@ -534,7 +566,7 @@ def _remove_change_description(entity: T) -> T:
     We never want to patch that, and we won't have that information
     from the source. It's fully handled in the server.
     """
-    if getattr(entity, "changeDescription"):
+    if hasattr(entity, "changeDescription") and getattr(entity, "changeDescription"):
         entity.changeDescription = None
 
     return entity

metadata/ingestion/ometa/mixins/data_contract_mixin.py

@@ -0,0 +1,205 @@
+#  Copyright 2025 Collate
+#  Licensed under the Collate Community License, Version 1.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  https://github.com/open-metadata/OpenMetadata/blob/main/ingestion/LICENSE
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""
+Mixin class containing Data Contract specific methods
+
+To be used by OpenMetadata class
+"""
+import traceback
+from typing import Optional
+
+from metadata.generated.schema.entity.data.dataContract import DataContract
+from metadata.generated.schema.entity.datacontract.dataContractResult import (
+    DataContractResult,
+)
+from metadata.generated.schema.type.basic import Uuid
+from metadata.ingestion.ometa.client import REST
+from metadata.ingestion.ometa.utils import model_str
+from metadata.utils.logger import ometa_logger
+
+logger = ometa_logger()
+
+
+class OMetaDataContractMixin:
+    """
+    OpenMetadata API methods related to Data Contracts.
+    To be inherited by OpenMetadata
+    """
+
+    client: REST
+
+    def put_data_contract_result(
+        self, data_contract_id: Uuid, result: DataContractResult
+    ) -> Optional[DataContractResult]:
+        """
+        Create or update a data contract execution result
+
+        Args:
+            data_contract_id: UUID of the data contract
+            result: DataContractResult object containing execution details
+
+        Returns:
+            DataContractResult if successful, None otherwise
+        """
+        try:
+            resp = self.client.put(
+                f"{self.get_suffix(DataContract)}/{model_str(data_contract_id)}/results",
+                data=result.model_dump_json(),
+            )
+            if resp:
+                return DataContractResult(**resp)
+        except Exception as err:
+            logger.debug(traceback.format_exc())
+            logger.warning(
+                f"Error creating data contract result for {model_str(data_contract_id)}: {err}"
+            )
+        return None
+
+    def get_data_contract_results(
+        self,
+        data_contract_id: Uuid,
+        limit: int = 10,
+        start_ts: Optional[int] = None,
+        end_ts: Optional[int] = None,
+    ) -> Optional[list]:
+        """
+        Get data contract execution results
+
+        Args:
+            data_contract_id: UUID of the data contract
+            limit: Maximum number of results to return
+            start_ts: Start timestamp filter
+            end_ts: End timestamp filter
+
+        Returns:
+            List of DataContractResult objects if successful, None otherwise
+        """
+        try:
+            # Build query parameters
+            query_params = [f"limit={limit}"]
+            if start_ts:
+                query_params.append(f"startTs={start_ts}")
+            if end_ts:
+                query_params.append(f"endTs={end_ts}")
+
+            query_string = "&".join(query_params)
+            url = f"{self.get_suffix(DataContract)}/{model_str(data_contract_id)}/results?{query_string}"
+
+            resp = self.client.get(url)
+            if resp:
+                return [DataContractResult(**result) for result in resp.get("data", [])]
+        except Exception as err:
+            logger.debug(traceback.format_exc())
+            logger.warning(
+                f"Error getting data contract results for {model_str(data_contract_id)}: {err}"
+            )
+        return None
+
+    def get_latest_data_contract_result(
+        self, data_contract_id: Uuid
+    ) -> Optional[DataContractResult]:
+        """
+        Get the latest data contract execution result
+
+        Args:
+            data_contract_id: UUID of the data contract
+
+        Returns:
+            DataContractResult if successful, None otherwise
+        """
+        try:
+            resp = self.client.get(
+                f"{self.get_suffix(DataContract)}/{model_str(data_contract_id)}/results/latest"
+            )
+            if resp:
+                return DataContractResult(**resp)
+        except Exception as err:
+            logger.debug(traceback.format_exc())
+            logger.warning(
+                f"Error getting latest data contract result for {model_str(data_contract_id)}: {err}"
+            )
+        return None
+
+    def get_data_contract_result_by_id(
+        self, data_contract_id: Uuid, result_id: Uuid
+    ) -> Optional[DataContractResult]:
+        """
+        Get a specific data contract execution result by ID
+
+        Args:
+            data_contract_id: UUID of the data contract
+            result_id: UUID of the specific result
+
+        Returns:
+            DataContractResult if successful, None otherwise
+        """
+        try:
+            resp = self.client.get(
+                f"{self.get_suffix(DataContract)}/{model_str(data_contract_id)}/results/{model_str(result_id)}"
+            )
+            if resp:
+                return DataContractResult(**resp)
+        except Exception as err:
+            logger.debug(traceback.format_exc())
+            logger.warning(
+                f"Error getting data contract result {model_str(result_id)} for {model_str(data_contract_id)}: {err}"
+            )
+        return None
+
+    def delete_data_contract_result(
+        self, data_contract_id: Uuid, timestamp: int
+    ) -> bool:
+        """
+        Delete a data contract result at a specific timestamp
+
+        Args:
+            data_contract_id: UUID of the data contract
+            timestamp: Timestamp of the result to delete
+
+        Returns:
+            True if successful, False otherwise
+        """
+        try:
+            self.client.delete(
+                f"{self.get_suffix(DataContract)}/{model_str(data_contract_id)}/results/{timestamp}"
+            )
+            return True
+        except Exception as err:
+            logger.debug(traceback.format_exc())
+            logger.warning(
+                f"Error deleting data contract result at {timestamp} for {model_str(data_contract_id)}: {err}"
+            )
+        return False
+
+    def validate_data_contract(
+        self, data_contract_id: Uuid
+    ) -> Optional[DataContractResult]:
+        """
+        Trigger on-demand validation of a data contract
+
+        Args:
+            data_contract_id: UUID of the data contract to validate
+
+        Returns:
+            DataContractResult if successful, None otherwise
+        """
+        try:
+            resp = self.client.post(
+                f"{self.get_suffix(DataContract)}/{model_str(data_contract_id)}/validate"
+            )
+            if resp:
+                return DataContractResult(**resp)
+        except Exception as err:
+            logger.debug(traceback.format_exc())
+            logger.warning(
+                f"Error validating data contract {model_str(data_contract_id)}: {err}"
+            )
+        return None

metadata/ingestion/ometa/mixins/lineage_mixin.py

@@ -383,7 +383,7 @@ class OMetaLineageMixin(Generic[T]):
             connection_type = database_service.serviceType.value
             add_lineage_request = get_lineage_by_query(
                 metadata=self,
-                service_name=database_service.name.root,
+                service_names=database_service.name.root,
                 dialect=ConnectionTypeDialectMapper.dialect_of(connection_type),
                 query=sql,
                 database_name=database_name,