refactor(core): remove various LocalClient mixins (#3109)

Co-authored-by: Ralf Grubenmann <[email protected]>

Author: mohammad-alisafaee

conftest.py

@@ -77,3 +77,4 @@ def pytest_configure(config):
         )
 
     os.environ["RENKU_SKIP_MIN_VERSION_CHECK"] = "1"
+    os.environ["RENKU_DISABLE_VERSION_CHECK"] = "1"

docs/cheatsheet/conf.py

@@ -191,7 +191,6 @@
     ("py:class", "DynamicProxy"),
     ("py:class", "IActivityGateway"),
     ("py:class", "IClientDispatcher"),
-    ("py:class", "IDatabaseDispatcher"),
     ("py:class", "IDatasetGateway"),
     ("py:class", "IPlanGateway"),
     ("py:class", "LocalClient"),

docs/conf.py

@@ -356,7 +356,6 @@
     ("py:class", "DynamicProxy"),
     ("py:class", "IActivityGateway"),
     ("py:class", "IClientDispatcher"),
-    ("py:class", "IDatabaseDispatcher"),
     ("py:class", "IDatasetGateway"),
     ("py:class", "IPlanGateway"),
     ("py:class", "IStorageFactory"),

docs/reference/core.rst

@@ -89,10 +89,6 @@ Datasets
    :members:
    :show-inheritance:
 
-.. automodule:: renku.core.dataset.constant
-   :members:
-   :show-inheritance:
-
 .. automodule:: renku.core.dataset.context
    :members:
    :show-inheritance:
@@ -288,16 +284,10 @@ Utilities
    :members:
    :show-inheritance:
 
-Repository
-----------
-
-.. automodule:: renku.core.management.repository
-   :members:
-
 Git Internals
 -------------
 
-.. automodule:: renku.core.management.git
+.. automodule:: renku.core.git
    :members:
 
 .. automodule:: renku.domain_model.git

docs/reference/gateways.rst

@@ -35,10 +35,6 @@ Interfaces that the Gateways implement.
    :members:
    :show-inheritance:
 
-.. automodule:: renku.core.interface.database_dispatcher
-   :members:
-   :show-inheritance:
-
 .. automodule:: renku.core.interface.database_gateway
    :members:
    :show-inheritance:

renku/command/checks/activities.py

@@ -24,21 +24,19 @@
 from renku.command.command_builder import inject
 from renku.command.echo import WARNING
 from renku.core.interface.activity_gateway import IActivityGateway
-from renku.core.interface.database_dispatcher import IDatabaseDispatcher
 from renku.core.util import communication
+from renku.domain_model.project_context import project_context
 
 
-@inject.autoparams("activity_gateway", "database_dispatcher")
-def check_migrated_activity_ids(
-    client, fix, activity_gateway: IActivityGateway, database_dispatcher: IDatabaseDispatcher, **kwargs
-):
+@inject.autoparams("activity_gateway")
+def check_migrated_activity_ids(client, fix, activity_gateway: IActivityGateway, **kwargs):
     """Check that activity ids were correctly migrated in the past."""
     activities = activity_gateway.get_all_activities(include_deleted=True)
 
     wrong_activities = [a for a in activities if not a.id.startswith("/activities/")]
 
     if fix:
-        current_database = database_dispatcher.current_database
+        current_database = project_context.database
         for activity in wrong_activities:
             communication.info(f"Fixing activity '{activity.id}'")
 

renku/command/checks/datasets.py

@@ -28,9 +28,9 @@
 from renku.core.dataset.dataset_add import add_to_dataset
 from renku.core.interface.dataset_gateway import IDatasetGateway
 from renku.core.migration.utils import get_pre_0_3_4_datasets_metadata
-from renku.core.project.project_properties import project_properties
 from renku.core.util import communication
 from renku.core.util.os import get_safe_relative_path
+from renku.domain_model.project_context import project_context
 
 
 def check_dataset_old_metadata_location(client, **kwargs):
@@ -43,15 +43,15 @@ def check_dataset_old_metadata_location(client, **kwargs):
     Returns:
         Tuple of whether dataset metadata location is valid and string of found problems.
     """
-    old_metadata = get_pre_0_3_4_datasets_metadata(client)
+    old_metadata = get_pre_0_3_4_datasets_metadata()
 
     if not old_metadata:
         return True, None
 
     problems = (
         WARNING + "There are metadata files in the old location."
         '\n  (use "renku migrate" to move them)\n\n\t'
-        + "\n\t".join(click.style(str(path.relative_to(project_properties.path)), fg="yellow") for path in old_metadata)
+        + "\n\t".join(click.style(str(path.relative_to(project_context.path)), fg="yellow") for path in old_metadata)
         + "\n"
     )
 
@@ -74,7 +74,7 @@ def check_missing_files(client, dataset_gateway: IDatasetGateway, **kwargs):
 
     for dataset in dataset_gateway.get_all_active_datasets():
         for file_ in dataset.files:
-            path = project_properties.path / file_.entity.path
+            path = project_context.path / file_.entity.path
             file_exists = path.exists() or (file_.is_external and os.path.lexists(path))
             if not file_exists:
                 missing[dataset.name].append(file_.entity.path)
@@ -163,15 +163,15 @@ def check_dataset_files_outside_datadir(client, fix, dataset_gateway: IDatasetGa
         if dataset.date_removed:
             continue
 
-        data_dir = dataset.get_datadir(client=client)
+        data_dir = dataset.get_datadir()
 
         detected_files = []
 
         for file in dataset.files:
             if file.is_external:
                 continue
             try:
-                get_safe_relative_path(project_properties.path / file.entity.path, project_properties.path / data_dir)
+                get_safe_relative_path(project_context.path / file.entity.path, project_context.path / data_dir)
             except ValueError:
                 detected_files.append(file)
 

renku/command/checks/external.py

@@ -21,7 +21,7 @@
 from renku.command.command_builder import inject
 from renku.command.echo import WARNING
 from renku.core.interface.dataset_gateway import IDatasetGateway
-from renku.core.project.project_properties import project_properties
+from renku.domain_model.project_context import project_context
 
 
 @inject.autoparams("dataset_gateway")
@@ -41,7 +41,7 @@ def check_missing_external_files(client, dataset_gateway: IDatasetGateway, **kwa
     for dataset in dataset_gateway.get_all_active_datasets():
         for file_ in dataset.files:
             if file_.is_external:
-                target = (project_properties.path / file_.entity.path).resolve()
+                target = (project_context.path / file_.entity.path).resolve()
                 if not target.exists():
                     missing.append((file_.entity.path, str(target)))
 

renku/command/checks/githooks.py

@@ -20,8 +20,9 @@
 from io import StringIO
 
 from renku.command.echo import WARNING
-from renku.core.management.githooks import HOOKS
+from renku.core.githooks import HOOKS
 from renku.core.util.git import get_hook_path
+from renku.domain_model.project_context import project_context
 
 try:
     import importlib_resources
@@ -40,7 +41,7 @@ def check_git_hooks_installed(client, **kwargs):
         Tuple of whether git hooks are valid and string of found problems.
     """
     for hook in HOOKS:
-        hook_path = get_hook_path(name=hook, repository=client.repository)
+        hook_path = get_hook_path(name=hook, path=project_context.path)
         if not hook_path.exists():
             message = WARNING + "Git hooks are not installed. " 'Use "renku githooks install" to install them. \n'
             return False, message

renku/command/checks/project.py

@@ -37,9 +37,9 @@ def check_project_id_group(client, fix, project_gateway: IProjectGateway, **kwar
     Returns:
         Tuple of whether project id is valid.
     """
-    current_project = client.project
+    current_project = project_gateway.get_project()
 
-    namespace, name = Project.get_namespace_and_name(client=client)
+    namespace, name = Project.get_namespace_and_name(use_project_context=True)
 
     if namespace is None or name is None:
         return True, None