openmetadata-ingestion 1.4.6.0rc1__py3-none-any.whl → 1.5.0.0rc1__py3-none-any.whl

metadata/ingestion/ometa/mixins/patch_mixin.py

@@ -30,8 +30,9 @@ from metadata.generated.schema.entity.services.connections.testConnectionResult
     TestConnectionResult,
 )
 from metadata.generated.schema.tests.testCase import TestCase, TestCaseParameterValue
-from metadata.generated.schema.type.basic import EntityLink
+from metadata.generated.schema.type.basic import EntityLink, Markdown
 from metadata.generated.schema.type.entityReference import EntityReference
+from metadata.generated.schema.type.entityReferenceList import EntityReferenceList
 from metadata.generated.schema.type.lifeCycle import LifeCycle
 from metadata.generated.schema.type.tagLabel import TagLabel
 from metadata.ingestion.api.models import Entity
@@ -64,10 +65,7 @@ def update_column_tags(
     Inplace update for the incoming column list
     """
     for col in columns:
-        if (
-            str(col.fullyQualifiedName.__root__).lower()
-            == column_tag.column_fqn.lower()
-        ):
+        if str(col.fullyQualifiedName.root).lower() == column_tag.column_fqn.lower():
             if operation == PatchOperation.REMOVE:
                 for tag in col.tags:
                     if tag.tagFQN == column_tag.tag_label.tagFQN:
@@ -92,14 +90,14 @@ def update_column_description(
     for col in columns:
         # For dbt the column names in OM and dbt are not always in the same case.
         # We'll match the column names in case insensitive way
-        desc_column = col_dict.get(col.fullyQualifiedName.__root__.lower())
+        desc_column = col_dict.get(col.fullyQualifiedName.root.lower())
         if desc_column:
             if col.description and not force:
                 # If the description is already present and force is not passed,
                 # description will not be overridden
                 continue
 
-            col.description = desc_column.__root__
+            col.description = desc_column  # Keep the Markdown type
 
         if col.children:
             update_column_description(col.children, column_descriptions, force)
@@ -114,7 +112,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
 
     client: REST
 
-    def patch(
+    def patch(  # pylint: disable=too-many-arguments
         self,
         entity: Type[T],
         source: T,
@@ -122,6 +120,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         allowed_fields: Optional[Dict] = None,
         restrict_update_fields: Optional[List] = None,
         array_entity_fields: Optional[List] = None,
+        override_metadata: Optional[bool] = False,
     ) -> Optional[T]:
         """
         Given an Entity type and Source entity and Destination entity,
@@ -144,6 +143,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
                 allowed_fields=allowed_fields,
                 restrict_update_fields=restrict_update_fields,
                 array_entity_fields=array_entity_fields,
+                override_metadata=override_metadata,
             )
 
             if not patch:
@@ -200,8 +200,8 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
             return None
 
         # https://docs.pydantic.dev/latest/usage/exporting_models/#modelcopy
-        destination = source.copy(deep=True)
-        destination.description = description
+        destination = source.model_copy(deep=True)
+        destination.description = Markdown(description)
 
         return self.patch(entity=entity, source=source, destination=destination)
 
@@ -229,7 +229,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
 
         table.tableConstraints = instance.tableConstraints
 
-        destination = table.copy(deep=True)
+        destination = table.model_copy(deep=True)
         destination.tableConstraints = constraints
 
         return self.patch(entity=Table, source=table, destination=destination)
@@ -254,9 +254,9 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         if not source:
             return None
 
-        destination = source.copy(deep=True)
+        destination = source.model_copy(deep=True)
 
-        destination.entityLink = EntityLink(__root__=entity_link)
+        destination.entityLink = EntityLink(entity_link)
         if test_case_parameter_values:
             destination.parameterValues = test_case_parameter_values
         if compute_passed_failed_row_count != source.computePassedFailedRowCount:
@@ -292,13 +292,13 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
 
         # Initialize empty tag list or the last updated tags
         source.tags = instance.tags or []
-        destination = source.copy(deep=True)
+        destination = source.model_copy(deep=True)
 
-        tag_fqns = {label.tagFQN.__root__ for label in tag_labels}
+        tag_fqns = {label.tagFQN.root for label in tag_labels}
 
         if operation == PatchOperation.REMOVE:
             for tag in destination.tags:
-                if tag.tagFQN.__root__ in tag_fqns:
+                if tag.tagFQN.root in tag_fqns:
                     destination.tags.remove(tag)
         else:
             destination.tags.extend(tag_labels)
@@ -324,7 +324,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         self,
         entity: Type[T],
         source: T,
-        owner: EntityReference = None,
+        owners: EntityReferenceList = None,
         force: bool = False,
     ) -> Optional[T]:
         """
@@ -341,20 +341,20 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
             Updated Entity
         """
         instance: Optional[T] = self._fetch_entity_if_exists(
-            entity=entity, entity_id=source.id, fields=["owner"]
+            entity=entity, entity_id=source.id, fields=["owners"]
         )
 
         if not instance:
             return None
 
         # Don't change existing data without force
-        if instance.owner and not force:
+        if instance.owners and instance.owners.root and not force:
             # If a owner is already present and force is not passed,
             # owner will not be overridden
             return None
 
         destination = deepcopy(instance)
-        destination.owner = owner
+        destination.owners = owners
 
         return self.patch(entity=entity, source=instance, destination=destination)
 
@@ -386,7 +386,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         # Make sure we run the patch against the last updated data from the API
         table.columns = instance.columns
 
-        destination = table.copy(deep=True)
+        destination = table.model_copy(deep=True)
         for column_tag in column_tags or []:
             update_column_tags(destination.columns, column_tag, operation)
 
@@ -394,7 +394,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         if patched_entity is None:
             logger.debug(
                 f"Empty PATCH result. Either everything is up to date or the "
-                f"column names are  not in [{table.fullyQualifiedName.__root__}]"
+                f"column names are  not in [{table.fullyQualifiedName.root}]"
             )
 
         return patched_entity
@@ -440,7 +440,9 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         return self.patch_column_descriptions(
             table=table,
             column_descriptions=[
-                ColumnDescription(column_fqn=column_fqn, description=description)
+                ColumnDescription(
+                    column_fqn=column_fqn, description=Markdown(description)
+                )
             ],
             force=force,
         )
@@ -471,14 +473,14 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         # Make sure we run the patch against the last updated data from the API
         table.columns = instance.columns
 
-        destination = table.copy(deep=True)
+        destination = table.model_copy(deep=True)
         update_column_description(destination.columns, column_descriptions, force)
 
         patched_entity = self.patch(entity=Table, source=table, destination=destination)
         if patched_entity is None:
             logger.debug(
                 f"Empty PATCH result. Either everything is up to date or "
-                f"columns are not matching for [{table.fullyQualifiedName.__root__}]"
+                f"columns are not matching for [{table.fullyQualifiedName.root}]"
             )
 
         return patched_entity
@@ -494,7 +496,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         """
         result_data: Dict = {
             PatchField.PATH: PatchPath.RESPONSE,
-            PatchField.VALUE: test_connection_result.dict(),
+            PatchField.VALUE: test_connection_result.model_dump(),
             PatchField.OPERATION: PatchOperation.ADD,
         }
 
@@ -530,7 +532,7 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         :param life_cycle_data: Life Cycle data to add
         """
         try:
-            destination = entity.copy(deep=True)
+            destination = entity.model_copy(deep=True)
             destination.lifeCycle = life_cycle
             return self.patch(
                 entity=type(entity), source=entity, destination=destination
@@ -538,14 +540,14 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         except Exception as exc:
             logger.debug(traceback.format_exc())
             logger.warning(
-                f"Error trying to Patch life cycle data for {entity.fullyQualifiedName.__root__}: {exc}"
+                f"Error trying to Patch life cycle data for {entity.fullyQualifiedName.root}: {exc}"
             )
             return None
 
     def patch_domain(self, entity: Entity, domain: Domain) -> Optional[Entity]:
         """Patch domain data for an Entity"""
         try:
-            destination: Entity = entity.copy(deep=True)
+            destination: Entity = entity.model_copy(deep=True)
             destination.domain = EntityReference(id=domain.id, type="domain")
             return self.patch(
                 entity=type(entity), source=entity, destination=destination
@@ -553,6 +555,6 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
         except Exception as exc:
             logger.debug(traceback.format_exc())
             logger.warning(
-                f"Error trying to Patch Domain for {entity.fullyQualifiedName.__root__}: {exc}"
+                f"Error trying to Patch Domain for {entity.fullyQualifiedName.root}: {exc}"
             )
             return None

metadata/ingestion/ometa/mixins/pipeline_mixin.py

@@ -43,7 +43,7 @@ class OMetaPipelineMixin:
         """
         resp = self.client.put(
             f"{self.get_suffix(Pipeline)}/{fqn}/status",
-            data=status.json(),
+            data=status.model_dump_json(),
         )
 
         return Pipeline(**resp)
@@ -86,7 +86,7 @@ class OMetaPipelineMixin:
             startDate=pipeline.startDate,
             service=pipeline.service.fullyQualifiedName,
             tasks=all_tasks,
-            owner=pipeline.owner,
+            owners=pipeline.owners,
             tags=pipeline.tags,
         )
 
@@ -113,7 +113,7 @@ class OMetaPipelineMixin:
             startDate=pipeline.startDate,
             service=pipeline.service.fullyQualifiedName,
             tasks=[task for task in pipeline.tasks if task.name in task_ids],
-            owner=pipeline.owner,
+            owners=pipeline.owners,
             tags=pipeline.tags,
         )
 

metadata/ingestion/ometa/mixins/query_mixin.py

@@ -41,10 +41,10 @@ class OMetaQueryMixin:
         return str(result.hexdigest())
 
     def _get_or_create_query(self, query: CreateQueryRequest) -> Optional[Query]:
-        query_hash = self._get_query_hash(query=query.query.__root__)
+        query_hash = self._get_query_hash(query=query.query.root)
         query_entity = self.get_by_name(entity=Query, fqn=query_hash)
         if query_entity is None:
-            resp = self.client.put(self.get_suffix(Query), data=query.json())
+            resp = self.client.put(self.get_suffix(Query), data=query.model_dump_json())
             if resp and resp.get("id"):
                 query_entity = Query(**resp)
         return query_entity
@@ -63,9 +63,9 @@ class OMetaQueryMixin:
                 query = self._get_or_create_query(create_query)
                 if query:
                     # Add Query Usage
-                    table_ref = EntityReference(id=entity.id.__root__, type="table")
+                    table_ref = EntityReference(id=entity.id.root, type="table")
                     # convert object to json array string
-                    table_ref_json = "[" + table_ref.json() + "]"
+                    table_ref_json = "[" + table_ref.model_dump_json() + "]"
                     self.client.put(
                         f"{self.get_suffix(Query)}/{model_str(query.id)}/usage",
                         data=table_ref_json,

metadata/ingestion/ometa/mixins/role_policy_mixin.py

@@ -125,7 +125,7 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
                     if previous is None
                     else PatchOperation.REPLACE,
                     PatchField.PATH: path.format(rule_index=rule_index),
-                    PatchField.VALUE: str(current.__root__),
+                    PatchField.VALUE: str(current.root),
                 }
             ]
         return data
@@ -158,10 +158,10 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
         if not instance:
             return None
 
-        policy_index: int = len(instance.policies.__root__) - 1
+        policy_index: int = len(instance.policies.root) - 1
         data: List
         if operation is PatchOperation.REMOVE:
-            if len(instance.policies.__root__) == 1:
+            if len(instance.policies.root) == 1:
                 logger.error(
                     f"The Role with id [{model_str(entity_id)}] has only one (1)"
                     f" policy. Unable to remove."
@@ -177,7 +177,7 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
 
             index: int = 0
             is_policy_found: bool = False
-            for policy in instance.policies.__root__:
+            for policy in instance.policies.root:
                 if model_str(policy.id) == model_str(policy_id):
                     is_policy_found = True
                     continue
@@ -187,7 +187,7 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
                         PatchField.PATH: PatchPath.POLICIES_DESCRIPTION.format(
                             index=index
                         ),
-                        PatchField.VALUE: model_str(policy.description.__root__),
+                        PatchField.VALUE: model_str(policy.description.root),
                     }
                 )
                 data.append(
@@ -294,7 +294,7 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
         if not instance:
             return None
 
-        rule_index: int = len(instance.rules.__root__) - 1
+        rule_index: int = len(instance.rules.root) - 1
         data: List[Dict]
         if operation == PatchOperation.ADD:
             data = [
@@ -303,7 +303,7 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
                     PatchField.PATH: PatchPath.RULES.format(rule_index=rule_index + 1),
                     PatchField.VALUE: {
                         PatchValue.NAME: rule.name,
-                        PatchValue.CONDITION: rule.condition.__root__,
+                        PatchValue.CONDITION: rule.condition.root,
                         PatchValue.EFFECT: rule.effect.name,
                         PatchValue.OPERATIONS: [
                             operation.name for operation in rule.operations
@@ -314,12 +314,12 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
             ]
             if rule.description is not None:
                 data[0][PatchField.VALUE][PatchValue.DESCRIPTION] = str(
-                    rule.description.__root__
+                    rule.description.root
                 )
 
             if rule.fullyQualifiedName is not None:
                 data[0][PatchField.VALUE][PatchValue.FQN] = str(
-                    rule.fullyQualifiedName.__root__
+                    rule.fullyQualifiedName.root
                 )
 
         else:
@@ -334,8 +334,8 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
                 }
             ]
 
-            for rule_index in range(len(instance.rules.__root__) - 1, -1, -1):
-                current_rule: Rule = instance.rules.__root__[rule_index]
+            for rule_index in range(len(instance.rules.root) - 1, -1, -1):
+                current_rule: Rule = instance.rules.root[rule_index]
                 if current_rule.name == rule.name:
                     break
 
@@ -345,7 +345,7 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
                     )
                     return None
 
-                previous_rule: Rule = instance.rules.__root__[rule_index - 1]
+                previous_rule: Rule = instance.rules.root[rule_index - 1]
                 # Condition
                 data.append(
                     {
@@ -353,7 +353,7 @@ class OMetaRolePolicyMixin(OMetaPatchMixinBase):
                         PatchField.PATH: PatchPath.RULES_CONDITION.format(
                             rule_index=rule_index - 1
                         ),
-                        PatchField.VALUE: current_rule.condition.__root__,
+                        PatchField.VALUE: current_rule.condition.root,
                     }
                 )
                 # Description - Optional

metadata/ingestion/ometa/mixins/search_index_mixin.py

@@ -47,13 +47,13 @@ class OMetaSearchIndexMixin:
         resp = None
         try:
             resp = self.client.put(
-                f"{self.get_suffix(SearchIndex)}/{search_index.id.__root__}/sampleData",
-                data=sample_data.json(),
+                f"{self.get_suffix(SearchIndex)}/{search_index.id.root}/sampleData",
+                data=sample_data.model_dump_json(),
             )
         except Exception as exc:
             logger.debug(traceback.format_exc())
             logger.warning(
-                f"Error trying to PUT sample data for {search_index.fullyQualifiedName.__root__}: {exc}"
+                f"Error trying to PUT sample data for {search_index.fullyQualifiedName.root}: {exc}"
             )
 
         if resp:
@@ -63,13 +63,13 @@ class OMetaSearchIndexMixin:
                 logger.debug(traceback.format_exc())
                 logger.warning(
                     "Unicode Error parsing the sample data response "
-                    f"from {search_index.fullyQualifiedName.__root__}: {err}"
+                    f"from {search_index.fullyQualifiedName.root}: {err}"
                 )
             except Exception as exc:
                 logger.debug(traceback.format_exc())
                 logger.warning(
                     "Error trying to parse sample data results"
-                    f"from {search_index.fullyQualifiedName.__root__}: {exc}"
+                    f"from {search_index.fullyQualifiedName.root}: {exc}"
                 )
 
         return None

metadata/ingestion/ometa/mixins/server_mixin.py

@@ -21,7 +21,6 @@ from metadata.__version__ import (
     match_versions,
 )
 from metadata.generated.schema.settings.settings import Settings, SettingType
-from metadata.ingestion.models.encoders import show_secrets_encoder
 from metadata.ingestion.ometa.client import REST
 from metadata.ingestion.ometa.routes import ROUTES
 from metadata.utils.logger import ometa_logger
@@ -91,9 +90,9 @@ class OMetaServerMixin:
         Returns:
             Settings
         """
-        data = settings.json(encoder=show_secrets_encoder)
+        data = settings.model_dump_json()
         response = self.client.put(ROUTES.get(Settings.__name__), data)
-        return Settings.parse_obj(response)
+        return Settings.model_validate(response)
 
     def get_settings_by_name(self, setting_type: SettingType) -> Optional[Settings]:
         """Get setting by name
@@ -106,7 +105,7 @@ class OMetaServerMixin:
         )
         if not response:
             return None
-        return Settings.parse_obj(response)
+        return Settings.model_validate(response)
 
     def get_profiler_config_settings(self) -> Optional[Settings]:
         """Get profiler config setting
@@ -117,4 +116,4 @@ class OMetaServerMixin:
         response = self.client.get("/system/settings/profilerConfiguration")
         if not response:
             return None
-        return Settings.parse_obj(response)
+        return Settings.model_validate(response)

metadata/ingestion/ometa/mixins/service_mixin.py

@@ -55,8 +55,8 @@ class OMetaServiceMixin:
         create_entity_class = self.get_create_entity_type(entity=entity)
         return create_entity_class(
             name=config.serviceName,
-            serviceType=config.serviceConnection.__root__.config.type.value,
-            connection=config.serviceConnection.__root__
+            serviceType=config.serviceConnection.root.config.type.value,
+            connection=config.serviceConnection.root
             if self.config.storeServiceConnection
             else None,
         )

metadata/ingestion/ometa/mixins/suggestions_mixin.py

@@ -34,8 +34,8 @@ class OMetaSuggestionsMixin:
         Update an existing Suggestion with new fields
         """
         resp = self.client.put(
-            f"{self.get_suffix(Suggestion)}/{str(suggestion.id.__root__)}",
-            data=suggestion.json(),
+            f"{self.get_suffix(Suggestion)}/{str(suggestion.root.id.root)}",
+            data=suggestion.model_dump_json(),
         )
 
         return Suggestion(**resp)

metadata/ingestion/ometa/mixins/table_mixin.py

@@ -69,13 +69,13 @@ class OMetaTableMixin:
         resp = None
         try:
             resp = self.client.put(
-                f"{self.get_suffix(Table)}/{table.id.__root__}/sampleData",
-                data=sample_data.json(),
+                f"{self.get_suffix(Table)}/{table.id.root}/sampleData",
+                data=sample_data.model_dump_json(),
             )
         except Exception as exc:
             logger.debug(traceback.format_exc())
             logger.warning(
-                f"Error trying to PUT sample data for {table.fullyQualifiedName.__root__}: {exc}"
+                f"Error trying to PUT sample data for {table.fullyQualifiedName.root}: {exc}"
             )
 
         if resp:
@@ -84,12 +84,12 @@ class OMetaTableMixin:
             except UnicodeError as err:
                 logger.debug(traceback.format_exc())
                 logger.warning(
-                    f"Unicode Error parsing the sample data response from {table.fullyQualifiedName.__root__}: {err}"
+                    f"Unicode Error parsing the sample data response from {table.fullyQualifiedName.root}: {err}"
                 )
             except Exception as exc:
                 logger.debug(traceback.format_exc())
                 logger.warning(
-                    f"Error trying to parse sample data results from {table.fullyQualifiedName.__root__}: {exc}"
+                    f"Error trying to parse sample data results from {table.fullyQualifiedName.root}: {exc}"
                 )
 
         return None
@@ -103,12 +103,12 @@ class OMetaTableMixin:
         resp = None
         try:
             resp = self.client.get(
-                f"{self.get_suffix(Table)}/{table.id.__root__}/sampleData",
+                f"{self.get_suffix(Table)}/{table.id.root}/sampleData",
             )
         except Exception as exc:
             logger.debug(traceback.format_exc())
             logger.warning(
-                f"Error trying to GET sample data for {table.fullyQualifiedName.__root__}: {exc}"
+                f"Error trying to GET sample data for {table.fullyQualifiedName.root}: {exc}"
             )
 
         if resp:
@@ -117,12 +117,12 @@ class OMetaTableMixin:
             except UnicodeError as err:
                 logger.debug(traceback.format_exc())
                 logger.warning(
-                    f"Unicode Error parsing the sample data response from {table.fullyQualifiedName.__root__}: {err}"
+                    f"Unicode Error parsing the sample data response from {table.fullyQualifiedName.root}: {err}"
                 )
             except Exception as exc:
                 logger.debug(traceback.format_exc())
                 logger.warning(
-                    f"Error trying to parse sample data results from {table.fullyQualifiedName.__root__}: {exc}"
+                    f"Error trying to parse sample data results from {table.fullyQualifiedName.root}: {exc}"
                 )
 
         return None
@@ -137,8 +137,8 @@ class OMetaTableMixin:
         :param table_profile: Profile data to add
         """
         resp = self.client.put(
-            f"{self.get_suffix(Table)}/{table.id.__root__}/tableProfile",
-            data=profile_request.json(),
+            f"{self.get_suffix(Table)}/{table.id.root}/tableProfile",
+            data=profile_request.model_dump_json(),
         )
         return Table(**resp)
 
@@ -150,8 +150,8 @@ class OMetaTableMixin:
         :param data_model: Model to add
         """
         resp = self.client.put(
-            f"{self.get_suffix(Table)}/{table.id.__root__}/dataModel",
-            data=data_model.json(),
+            f"{self.get_suffix(Table)}/{table.id.root}/dataModel",
+            data=data_model.model_dump_json(),
         )
         return Table(**resp)
 
@@ -165,7 +165,7 @@ class OMetaTableMixin:
         :param table_usage_request: Usage data to add
         """
         resp = self.client.post(
-            f"/usage/table/{table.id.__root__}", data=table_usage_request.json()
+            f"/usage/table/{table.id.root}", data=table_usage_request.model_dump_json()
         )
         logger.debug("published table usage %s", resp)
 
@@ -179,10 +179,10 @@ class OMetaTableMixin:
         :param table_join_request: Join data to add
         """
 
-        logger.info("table join request %s", table_join_request.json())
+        logger.info("table join request %s", table_join_request.model_dump_json())
         resp = self.client.put(
-            f"{self.get_suffix(Table)}/{table.id.__root__}/joins",
-            data=table_join_request.json(),
+            f"{self.get_suffix(Table)}/{table.id.root}/joins",
+            data=table_join_request.model_dump_json(),
         )
         logger.debug("published frequently joined with %s", resp)
 
@@ -203,7 +203,7 @@ class OMetaTableMixin:
         """
         resp = self.client.put(
             f"{self.get_suffix(Table)}/{model_str(table_id)}/tableProfilerConfig",
-            data=table_profiler_config.json(),
+            data=table_profiler_config.model_dump_json(),
         )
         return Table(**resp)
 
@@ -290,7 +290,7 @@ class OMetaTableMixin:
         Returns:
             Optional[Table]: OM table object
         """
-        return self._get(Table, f"{quote(model_str(fqn))}/tableProfile/latest")
+        return self._get(Table, f"{quote(model_str(fqn), safe='')}/tableProfile/latest")
 
     def create_or_update_custom_metric(
         self, custom_metric: CreateCustomMetricRequest, table_id: str
@@ -303,6 +303,6 @@ class OMetaTableMixin:
         """
         resp = self.client.put(
             f"{self.get_suffix(Table)}/{table_id}/customMetric",
-            data=custom_metric.json(),
+            data=custom_metric.model_dump_json(),
         )
         return Table(**resp)