mlrun 1.5.0rc5__py3-none-any.whl → 1.5.0rc6__py3-none-any.whl

mlrun/api/db/sqldb/db.py

@@ -110,7 +110,6 @@ def retry_on_conflict(function):
             try:
                 return function(*args, **kwargs)
             except Exception as exc:
-
                 if mlrun.utils.helpers.are_strings_in_exception_chain_messages(
                     exc, conflict_messages
                 ):
@@ -140,11 +139,8 @@ def retry_on_conflict(function):
 
 
 class SQLDB(DBInterface):
-    def __init__(self, dsn):
+    def __init__(self, dsn=""):
         self.dsn = dsn
-        self._cache = {
-            "project_resources_counters": {"value": None, "ttl": datetime.min}
-        }
         self._name_with_iter_regex = re.compile("^[0-9]+-.+$")
 
     def initialize(self, session):
@@ -1102,7 +1098,6 @@ class SQLDB(DBInterface):
             if not tag:
                 function_tags = self._list_function_tags(session, project, function.id)
                 if len(function_tags) == 0:
-
                     # function status should be added only to tagged functions
                     function_dict["status"] = None
 
@@ -1244,7 +1239,6 @@ class SQLDB(DBInterface):
         labels: Dict = None,
         next_run_time: datetime = None,
     ) -> mlrun.common.schemas.ScheduleRecord:
-
         schedule_record = self._create_schedule_db_record(
             project=project,
             name=name,
@@ -2216,7 +2210,6 @@ class SQLDB(DBInterface):
         partition_order: mlrun.common.schemas.OrderType,
         max_partitions: int = 0,
     ):
-
         partition_field = partition_by.to_partition_by_db_field(cls)
         sort_by_field = partition_sort_by.to_db_field(cls)
 
@@ -2484,7 +2477,6 @@ class SQLDB(DBInterface):
             if uid == existing_feature_set.uid or always_overwrite:
                 db_feature_set = existing_feature_set
             else:
-
                 # In case an object with the given tag (or 'latest' which is the default) and name, but different uid
                 # was found - Check If an object with the same computed uid but different tag already exists
                 # and re-tag it.
@@ -2814,7 +2806,6 @@ class SQLDB(DBInterface):
             if uid == existing_feature_vector.uid or always_overwrite:
                 db_feature_vector = existing_feature_vector
             else:
-
                 # In case an object with the given tag (or 'latest' which is the default) and name, but different uid
                 # was found - Check If an object with the same computed uid but different tag already exists
                 # and re-tag it.
@@ -3862,7 +3853,6 @@ class SQLDB(DBInterface):
         run_uid: str,
         project: str = "",
     ) -> typing.List[mlrun.model.Notification]:
-
         # iteration is 0, as we don't support multiple notifications per hyper param run, only for the whole run
         run = self._get_run(session, run_uid, project, 0)
         if not run:
@@ -3885,7 +3875,6 @@ class SQLDB(DBInterface):
     ):
         run_id = None
         if run_uid:
-
             # iteration is 0, as we don't support multiple notifications per hyper param run, only for the whole run
             run = self._get_run(session, run_uid, project, 0)
             if not run:
@@ -3947,6 +3936,17 @@ class SQLDB(DBInterface):
             )
         self._commit(session, [run], ignore=True)
 
+    @staticmethod
+    def _transform_datastore_profile_model_to_schema(
+        db_object,
+    ) -> mlrun.common.schemas.DatastoreProfile:
+        return mlrun.common.schemas.DatastoreProfile(
+            name=db_object.name,
+            type=db_object.type,
+            object=db_object.full_object,
+            project=db_object.project,
+        )
+
     def store_datastore_profile(
         self, session, info: mlrun.common.schemas.DatastoreProfile
     ):
@@ -3959,18 +3959,17 @@ class SQLDB(DBInterface):
         info.project = info.project or config.default_project
         profile = self._query(
             session, DatastoreProfile, name=info.name, project=info.project
-        )
-        first = profile.first()
-        if first:
-            first.type = info.type
-            first.body = info.body
+        ).one_or_none()
+        if profile:
+            profile.type = info.type
+            profile.full_object = info.object
             self._commit(session, [profile])
         else:
             profile = DatastoreProfile(
                 name=info.name,
                 type=info.type,
                 project=info.project,
-                body=info.body,
+                full_object=info.object,
             )
             self._upsert(session, [profile])
 
@@ -3990,8 +3989,7 @@ class SQLDB(DBInterface):
         project = project or config.default_project
         res = self._query(session, DatastoreProfile, name=profile, project=project)
         if res.first():
-            r = res.first().to_dict(exclude=["id"])
-            return mlrun.common.schemas.DatastoreProfile(**r)
+            return self._transform_datastore_profile_model_to_schema(res.first())
         else:
             raise mlrun.errors.MLRunNotFoundError(
                 f"Datastore profile '{profile}' not found in project '{project}'"
@@ -4027,7 +4025,7 @@ class SQLDB(DBInterface):
         project = project or config.default_project
         query_results = self._query(session, DatastoreProfile, project=project)
         return [
-            mlrun.common.schemas.DatastoreProfile(**query.to_dict(exclude=["id"]))
+            self._transform_datastore_profile_model_to_schema(query)
             for query in query_results
         ]
 

mlrun/api/db/sqldb/models/models_mysql.py

@@ -532,7 +532,16 @@ with warnings.catch_warnings():
         name = Column(String(255, collation=SQLCollationUtil.collation()))
         project = Column(String(255, collation=SQLCollationUtil.collation()))
         type = Column(String(255, collation=SQLCollationUtil.collation()))
-        body = Column(String(1024, collation=SQLCollationUtil.collation()))
+        _full_object = Column("object", JSON)
+
+        @property
+        def full_object(self):
+            if self._full_object:
+                return json.loads(self._full_object)
+
+        @full_object.setter
+        def full_object(self, value):
+            self._full_object = json.dumps(value, default=str)
 
 
 # Must be after all table definitions

mlrun/api/db/sqldb/models/models_sqlite.py

@@ -488,7 +488,17 @@ with warnings.catch_warnings():
         name = Column(String(255, collation=SQLCollationUtil.collation()))
         type = Column(String(255, collation=SQLCollationUtil.collation()))
         project = Column(String(255, collation=SQLCollationUtil.collation()))
-        body = Column(String(1024, collation=SQLCollationUtil.collation()))
+
+        _full_object = Column("object", JSON)
+
+        @property
+        def full_object(self):
+            if self._full_object:
+                return json.loads(self._full_object)
+
+        @full_object.setter
+        def full_object(self, value):
+            self._full_object = json.dumps(value, default=str)
 
 
 # Must be after all table definitions

mlrun/api/initial_data.py

@@ -192,7 +192,7 @@ def _perform_schema_migrations(alembic_util: mlrun.api.utils.db.alembic.AlembicU
 
 def _is_latest_data_version():
     db_session = create_session()
-    db = mlrun.api.db.sqldb.db.SQLDB("")
+    db = mlrun.api.db.sqldb.db.SQLDB()
 
     try:
         current_data_version = _resolve_current_data_version(db, db_session)
@@ -214,8 +214,7 @@ def _perform_database_migration(
 
 def _perform_data_migrations(db_session: sqlalchemy.orm.Session):
     if config.httpdb.db.data_migrations_mode == "enabled":
-        # FileDB is not really a thing anymore, so using SQLDB directly
-        db = mlrun.api.db.sqldb.db.SQLDB("")
+        db = mlrun.api.db.sqldb.db.SQLDB()
         current_data_version = int(db.get_current_data_version(db_session))
         if current_data_version != latest_data_version:
             logger.info(
@@ -235,8 +234,7 @@ def _perform_data_migrations(db_session: sqlalchemy.orm.Session):
 
 
 def _add_initial_data(db_session: sqlalchemy.orm.Session):
-    # FileDB is not really a thing anymore, so using SQLDB directly
-    db = mlrun.api.db.sqldb.db.SQLDB("")
+    db = mlrun.api.db.sqldb.db.SQLDB()
     _add_default_hub_source_if_needed(db, db_session)
     _add_data_version(db, db_session)
 

mlrun/api/launcher.py

@@ -203,8 +203,9 @@ class ServerSideLauncher(launcher.BaseLauncher):
         # in normal use cases if no project is found we will get an error
         if project:
             project = mlrun.projects.project.MlrunProject.from_dict(project.dict())
+            # there is no need to auto mount here as it was already done in the full spec enrichment with the auth info
             mlrun.projects.pipelines.enrich_function_object(
-                project, runtime, copy_function=False
+                project, runtime, copy_function=False, try_auto_mount=False
             )
 
     def _enrich_full_spec(

mlrun/api/migrations_mysql/versions/026c947c4487_altering_table_datastore_profiles_2.py

@@ -0,0 +1,46 @@
+# Copyright 2023 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+
+"""altering table datastore_profiles 2
+
+Revision ID: 026c947c4487
+Revises: b1d1e7ab5dec
+Create Date: 2023-08-10 14:15:30.523729
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "026c947c4487"
+down_revision = "b1d1e7ab5dec"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("datastore_profiles", sa.Column("object", sa.JSON(), nullable=True))
+    op.drop_column("datastore_profiles", "body")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "datastore_profiles", sa.Column("body", sa.String(length=1024), nullable=True)
+    )
+    op.drop_column("datastore_profiles", "object")
+    # ### end Alembic commands ###

mlrun/api/migrations_sqlite/versions/026c947c4487_altering_table_datastore_profiles_2.py

@@ -0,0 +1,46 @@
+# Copyright 2023 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+
+"""altering table datastore_profiles 2
+
+Revision ID: 026c947c4487
+Revises: 6e0c9531edc7
+Create Date: 2023-08-10 14:15:30.523729
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "026c947c4487"
+down_revision = "6e0c9531edc7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("datastore_profiles") as batch_op:
+        batch_op.add_column(sa.Column("object", sa.JSON(), nullable=True))
+        batch_op.drop_column("body")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("datastore_profiles") as batch_op:
+        batch_op.add_column(sa.Column("body", sa.String(length=1024), nullable=True))
+        batch_op.drop_column("object")
+    # ### end Alembic commands ###

mlrun/api/rundb/sqldb.py

@@ -717,6 +717,20 @@ class SQLRunDB(RunDBInterface):
             function,
         )
 
+    def list_hub_sources(
+        self,
+        item_name: Optional[str] = None,
+        tag: Optional[str] = None,
+        version: Optional[str] = None,
+    ):
+        return self._transform_db_error(
+            mlrun.api.crud.Hub().list_hub_sources,
+            self.session,
+            item_name,
+            tag,
+            version,
+        )
+
     def list_pipelines(
         self,
         project: str,
@@ -842,14 +856,6 @@ class SQLRunDB(RunDBInterface):
     ):
         raise NotImplementedError()
 
-    def list_hub_sources(
-        self,
-        item_name: Optional[str] = None,
-        tag: Optional[str] = None,
-        version: Optional[str] = None,
-    ):
-        raise NotImplementedError()
-
     def get_hub_source(self, source_name: str):
         raise NotImplementedError()
 
@@ -894,7 +900,7 @@ class SQLRunDB(RunDBInterface):
     def delete_datastore_profile(self, name: str, project: str):
         raise NotImplementedError()
 
-    def list_datastore_profile(
+    def list_datastore_profiles(
         self, project: str
     ) -> List[mlrun.common.schemas.DatastoreProfile]:
         raise NotImplementedError()

mlrun/api/utils/db/sqlite_migration.py

@@ -57,6 +57,7 @@ class SQLiteMigrationUtil(object):
         "projects_labels",
         "data_versions",
         "background_tasks",
+        "datastore_profiles",
     ]
 
     def __init__(self):

mlrun/common/model_monitoring/helpers.py

@@ -65,5 +65,7 @@ def parse_monitoring_stream_path(stream_uri: str, project: str):
 
     elif stream_uri.startswith("v3io://") and mlrun.mlconf.is_ce_mode():
         # V3IO is not supported in CE mode, generating a default http stream path
-        stream_uri = mlrun.mlconf.model_endpoint_monitoring.default_http_sink
+        stream_uri = mlrun.mlconf.model_endpoint_monitoring.default_http_sink.format(
+            project=project
+        )
     return stream_uri

mlrun/common/schemas/client_spec.py

@@ -57,6 +57,7 @@ class ClientSpec(pydantic.BaseModel):
     redis_type: typing.Optional[str]
     sql_url: typing.Optional[str]
     model_endpoint_monitoring_store_type: typing.Optional[str]
+    model_endpoint_monitoring_endpoint_store_connection: typing.Optional[str]
     # ce_mode is deprecated, we will use the full ce config instead and ce_mode will be removed in 1.6.0
     ce_mode: typing.Optional[str]
     ce: typing.Optional[dict]

mlrun/common/schemas/datastore_profile.py

@@ -19,5 +19,5 @@ from pydantic import BaseModel
 class DatastoreProfile(BaseModel):
     name: str
     type: str
-    body: str
+    object: str
     project: str

mlrun/common/schemas/frontend_spec.py

@@ -60,7 +60,7 @@ class FrontendSpec(pydantic.BaseModel):
     function_deployment_target_image_template: typing.Optional[str]
     function_deployment_target_image_name_prefix_template: str
     function_deployment_target_image_registries_to_enforce_prefix: typing.List[str] = []
-    function_deployment_mlrun_command: typing.Optional[str]
+    function_deployment_mlrun_requirement: typing.Optional[str]
     auto_mount_type: typing.Optional[str]
     auto_mount_params: typing.Dict[str, str] = {}
     default_artifact_path: str

mlrun/config.py

@@ -453,7 +453,8 @@ default_config = {
         "data_prefixes": {
             "default": "v3io:///projects/{project}/FeatureStore/{name}/{kind}",
             "nosql": "v3io:///projects/{project}/FeatureStore/{name}/{kind}",
-            "redisnosql": "redis:///projects/{project}/FeatureStore/{name}/{kind}",
+            # "authority" is optional and generalizes [userinfo "@"] host [":" port]
+            "redisnosql": "redis://{authority}/projects/{project}/FeatureStore/{name}/{kind}",
         },
         "default_targets": "parquet,nosql",
         "default_job_image": "mlrun/mlrun",
@@ -1010,7 +1011,7 @@ class Config:
             if artifact_path[-1] != "/":
                 artifact_path += "/"
 
-            return mlrun.utils.helpers.fill_artifact_path_template(
+            return mlrun.utils.helpers.fill_project_path_template(
                 artifact_path=artifact_path + file_path, project=project
             )
 

mlrun/datastore/datastore_profile.py

@@ -26,18 +26,10 @@ import mlrun.errors
 from ..secrets import get_secret_or_env
 
 
-class PrivateValue(pydantic.BaseModel):
-    value: str
-
-    def get(self):
-        if self.value == "None":
-            return None
-        return ast.literal_eval(self.value)["value"]
-
-
 class DatastoreProfile(pydantic.BaseModel):
     type: str
     name: str
+    _private_attributes: typing.List = ()
 
     @pydantic.validator("name")
     def lower_case(cls, v):
@@ -58,21 +50,19 @@ class DatastoreProfile(pydantic.BaseModel):
 
 class DatastoreProfileRedis(DatastoreProfile):
     type: str = pydantic.Field("redis")
+    _private_attributes = ("username", "password")
     endpoint_url: str
-    username: typing.Optional[PrivateValue]
-    password: typing.Optional[PrivateValue]
-
-    @pydantic.validator("username", "password", pre=True)
-    def convert_to_private(cls, v):
-        return PrivateValue(value=v)
+    username: typing.Optional[str] = None
+    password: typing.Optional[str] = None
 
     def is_secured(self):
         return self.endpoint_url.startswith("rediss://")
 
     def url_with_credentials(self):
         parsed_url = urlparse(self.endpoint_url)
-        username = self.username.get() if self.username else None
-        password = self.password.get() if self.password else None
+        username = self.username
+        password = self.password
+        netloc = parsed_url.hostname
         if username:
             if password:
                 netloc = f"{username}:{password}@{parsed_url.hostname}"
@@ -106,13 +96,21 @@ class DatastoreProfile2Json(pydantic.BaseModel):
     @staticmethod
     def get_json_public(profile: DatastoreProfile) -> str:
         return DatastoreProfile2Json._to_json(
-            {k: v for k, v in profile.dict().items() if not isinstance(v, dict)}
+            {
+                k: v
+                for k, v in profile.dict().items()
+                if not str(k) in profile._private_attributes
+            }
         )
 
     @staticmethod
     def get_json_private(profile: DatastoreProfile) -> str:
         return DatastoreProfile2Json._to_json(
-            {k: v for k, v in profile.dict().items() if isinstance(v, dict)}
+            {
+                k: v
+                for k, v in profile.dict().items()
+                if str(k) in profile._private_attributes
+            }
         )
 
     @staticmethod
@@ -123,9 +121,18 @@ class DatastoreProfile2Json(pydantic.BaseModel):
         decoded_dict = {
             k: base64.b64decode(str(v).encode()).decode() for k, v in attributes.items()
         }
+
+        def safe_literal_eval(value):
+            try:
+                return ast.literal_eval(value)
+            except (ValueError, SyntaxError):
+                return value
+
+        decoded_dict = {k: safe_literal_eval(v) for k, v in decoded_dict.items()}
         datastore_type = decoded_dict.get("type")
-        if datastore_type == "redis":
-            return DatastoreProfileRedis.parse_obj(decoded_dict)
+        ds_profile_factory = {"redis": DatastoreProfileRedis}
+        if datastore_type in ds_profile_factory:
+            return ds_profile_factory[datastore_type].parse_obj(decoded_dict)
         else:
             if datastore_type:
                 reason = f"unexpected type '{decoded_dict['type']}'"
@@ -148,6 +155,11 @@ def datastore_profile_read(url):
     public_profile = mlrun.db.get_run_db().get_datastore_profile(
         profile_name, project_name
     )
+    if not public_profile:
+        raise mlrun.errors.MLRunInvalidArgumentError(
+            f"Failed to fetch datastore profile '{url}' "
+        )
+
     project_ds_name_private = DatastoreProfile.generate_secret_key(
         profile_name, project_name
     )

mlrun/datastore/dbfs_store.py

@@ -82,9 +82,10 @@ class DatabricksFileSystemDisableCache(DatabricksFileSystem):
 # dbfs objects will be represented with the following URL: dbfs://<path>
 class DBFSStore(DataStore):
     def __init__(self, parent, schema, name, endpoint="", secrets: dict = None):
-        if not endpoint:
-            endpoint = mlrun.get_secret_or_env("DATABRICKS_HOST")
         super().__init__(parent, name, schema, endpoint, secrets=secrets)
+        if not endpoint:
+            endpoint = self._get_secret_or_env("DATABRICKS_HOST")
+        self.endpoint = endpoint
         self.get_filesystem(silent=False)
 
     def get_filesystem(self, silent=True):
@@ -96,7 +97,7 @@ class DBFSStore(DataStore):
     def get_storage_options(self):
         return dict(
             token=self._get_secret_or_env("DATABRICKS_TOKEN"),
-            instance=mlrun.get_secret_or_env("DATABRICKS_HOST"),
+            instance=self._get_secret_or_env("DATABRICKS_HOST"),
         )
 
     def _verify_filesystem_and_key(self, key: str):

mlrun/datastore/redis.py

@@ -36,6 +36,12 @@ class RedisStore(DataStore):
         self.endpoint = self.endpoint or mlrun.mlconf.redis.url
         if schema == "ds":
             datastore_profile = datastore_profile_read(name)
+            if not datastore_profile:
+                raise ValueError(f"Failed to load datastore profile '{name}'")
+            if datastore_profile.type != "redis":
+                raise ValueError(
+                    f"Trying to use profile of type '{datastore_profile.type}' as redis datastore"
+                )
             self._redis_url = datastore_profile.url_with_credentials()
             self.secure = datastore_profile.is_secured()
         else:

mlrun/datastore/targets.py

@@ -600,7 +600,12 @@ class BaseStoreTarget(DataTargetBase):
 
     def get_target_path(self):
         path_object = self._target_path_object
-        return path_object.get_absolute_path() if path_object else None
+        project_name = self._resource.metadata.project if self._resource else None
+        return (
+            path_object.get_absolute_path(project_name=project_name)
+            if path_object
+            else None
+        )
 
     def get_target_path_with_credentials(self):
         return self.get_target_path()
@@ -1174,6 +1179,12 @@ class RedisNoSqlTarget(NoSqlBaseTarget):
         endpoint = endpoint or mlrun.mlconf.redis.url
         if endpoint.startswith("ds"):
             datastore_profile = datastore_profile_read(endpoint)
+            if not datastore_profile:
+                raise ValueError(f"Failed to load datastore profile '{endpoint}'")
+            if datastore_profile.type != "redis":
+                raise ValueError(
+                    f"Trying to use profile of type '{datastore_profile.type}' as redis datastore"
+                )
             endpoint = datastore_profile.url_with_credentials()
         else:
             parsed_endpoint = urlparse(endpoint)

mlrun/db/base.py

@@ -649,7 +649,7 @@ class RunDBInterface(ABC):
     ) -> mlrun.common.schemas.DatastoreProfile:
         pass
 
-    def list_datastore_profile(
+    def list_datastore_profiles(
         self, project: str
     ) -> List[mlrun.common.schemas.DatastoreProfile]:
         pass

mlrun/db/httpdb.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 import enum
 import http
-import json
 import re
 import tempfile
 import time
@@ -440,6 +439,10 @@ class HTTPRunDB(RunDBInterface):
                 server_cfg.get("model_endpoint_monitoring_store_type")
                 or config.model_endpoint_monitoring.store_type
             )
+            config.model_endpoint_monitoring.endpoint_store_connection = (
+                server_cfg.get("model_endpoint_monitoring_endpoint_store_connection")
+                or config.model_endpoint_monitoring.endpoint_store_connection
+            )
             config.packagers = server_cfg.get("packagers") or config.packagers
             server_data_prefixes = server_cfg.get("feature_store_data_prefixes") or {}
             for prefix in ["default", "nosql", "redisnosql"]:
@@ -1673,7 +1676,6 @@ class HTTPRunDB(RunDBInterface):
         order,
         max_partitions=None,
     ):
-
         partition_params = {
             "partition-by": partition_by,
             "rows-per-partition": rows_per_partition,
@@ -2186,7 +2188,6 @@ class HTTPRunDB(RunDBInterface):
         error_message = f"Failed listing projects, query: {params}"
         response = self.api_call("GET", "projects", error_message, params=params)
         if format_ == mlrun.common.schemas.ProjectsFormat.name_only:
-
             # projects is just a list of strings
             return response.json()["projects"]
 
@@ -3299,11 +3300,11 @@ class HTTPRunDB(RunDBInterface):
         self, name: str, project: str
     ) -> Optional[mlrun.common.schemas.DatastoreProfile]:
         project = project or config.default_project
-        path = self._path_of("projects", project, "datastore_profiles") + f"/{name}"
+        path = self._path_of("projects", project, "datastore-profiles") + f"/{name}"
 
         res = self.api_call(method="GET", path=path)
-        if res and res._content:
-            public_wrapper = json.loads(res._content)
+        if res:
+            public_wrapper = res.json()
             datastore = DatastoreProfile2Json.create_from_json(
                 public_json=public_wrapper["body"]
             )
@@ -3313,7 +3314,7 @@ class HTTPRunDB(RunDBInterface):
     def delete_datastore_profile(self, name: str, project: str):
         pass
 
-    def list_datastore_profile(
+    def list_datastore_profiles(
         self, project: str
     ) -> List[mlrun.common.schemas.DatastoreProfile]:
         pass
@@ -3326,9 +3327,9 @@ class HTTPRunDB(RunDBInterface):
         :returns: None
         """
         project = project or config.default_project
-        path = self._path_of("projects", project, "datastore_profiles")
+        path = self._path_of("projects", project, "datastore-profiles")
 
-        self.api_call(method="PUT", path=path, body=json.dumps(profile.dict()))
+        self.api_call(method="PUT", path=path, json=profile.dict())
 
 
 def _as_json(obj):